diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a50798f..6451af2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -106,8 +106,8 @@ specifier: ^20.10.4 version: 20.10.4 '@types/react': - specifier: ^18.2.42 - version: 18.2.42 + specifier: ^18.2.43 + version: 18.2.43 '@types/react-dom': specifier: ^18.2.17 version: 18.2.17 @@ -170,7 +170,7 @@ version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.55.0)(react@18.2.0)(sass@1.69.5)(typescript@5.3.3) react-textarea-autosize: specifier: ^8.5.3 - version: 8.5.3(@types/react@18.2.42)(react@18.2.0) + version: 8.5.3(@types/react@18.2.43)(react@18.2.0) react-toastify: specifier: ^9.1.3 version: 9.1.3(react-dom@18.2.0)(react@18.2.0) @@ -200,8 +200,8 @@ specifier: ^20.10.4 version: 20.10.4 '@types/react': - specifier: ^18.2.42 - version: 18.2.42 + specifier: ^18.2.43 + version: 18.2.43 '@types/react-dom': specifier: ^18.2.17 version: 18.2.17 @@ -227,8 +227,8 @@ specifier: ^6.9.10 version: 6.9.10 '@types/react': - specifier: ^18.2.42 - version: 18.2.42 + specifier: ^18.2.43 + version: 18.2.43 dayjs: specifier: ^1.11.10 version: 1.11.10 @@ -3203,14 +3203,14 @@ /@types/react-dom@18.2.17: resolution: {integrity: sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==} dependencies: - '@types/react': 18.2.42 + '@types/react': 18.2.43 dev: true /@types/react-router-dom@5.3.3: resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.2.42 + '@types/react': 18.2.43 '@types/react-router': 5.1.20 dev: true @@ -3218,11 +3218,11 @@ resolution: {integrity: sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.2.42 + '@types/react': 18.2.43 dev: true - /@types/react@18.2.42: - resolution: {integrity: sha512-c1zEr96MjakLYus/wPnuWDo1/zErfdU9rNsIGmE+NV71nx88FG9Ttgo5dqorXTu/LImX2f63WBP986gJkMPNbA==} + /@types/react@18.2.43: + resolution: {integrity: sha512-nvOV01ZdBdd/KW6FahSbcNplt2jCJfyWdTos61RYHV+FVv5L/g9AOX1bmbVcWcLFL8+KHQfh1zVIQrud6ihyQA==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.3 @@ -9645,7 +9645,7 @@ react-dom: 18.2.0(react@18.2.0) dev: false - /react-textarea-autosize@8.5.3(@types/react@18.2.42)(react@18.2.0): + /react-textarea-autosize@8.5.3(@types/react@18.2.43)(react@18.2.0): resolution: {integrity: sha512-XT1024o2pqCuZSuBt9FwHlaDeNtVrtCXu0Rnz88t1jUGheCLa3PhjE1GH8Ctm2axEtvdCl5SUHYschyQ0L5QHQ==} engines: {node: '>=10'} peerDependencies: @@ -9654,7 +9654,7 @@ '@babel/runtime': 7.22.6 react: 18.2.0 use-composed-ref: 1.3.0(react@18.2.0) - use-latest: 1.2.1(@types/react@18.2.42)(react@18.2.0) + use-latest: 1.2.1(@types/react@18.2.43)(react@18.2.0) transitivePeerDependencies: - '@types/react' dev: false @@ -11007,7 +11007,7 @@ react: 18.2.0 dev: false - /use-isomorphic-layout-effect@1.1.2(@types/react@18.2.42)(react@18.2.0): + /use-isomorphic-layout-effect@1.1.2(@types/react@18.2.43)(react@18.2.0): resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' @@ -11016,11 +11016,11 @@ '@types/react': optional: true dependencies: - '@types/react': 18.2.42 + '@types/react': 18.2.43 react: 18.2.0 dev: false - /use-latest@1.2.1(@types/react@18.2.42)(react@18.2.0): + /use-latest@1.2.1(@types/react@18.2.43)(react@18.2.0): resolution: {integrity: sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==} peerDependencies: '@types/react': '*' @@ -11029,9 +11029,9 @@ '@types/react': optional: true dependencies: - '@types/react': 18.2.42 + '@types/react': 18.2.43 react: 18.2.0 - use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.42)(react@18.2.0) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.43)(react@18.2.0) dev: false /use-sync-external-store@1.2.0(react@18.2.0): diff --git a/qwilight-fe/package.json b/qwilight-fe/package.json index 27718b0..5cfd14a 100644 --- a/qwilight-fe/package.json +++ b/qwilight-fe/package.json @@ -31,7 +31,7 @@ "@types/dompurify": "^3.0.5", "@types/jest": "^29.5.11", "@types/node": "^20.10.4", - "@types/react": "^18.2.42", + "@types/react": "^18.2.43", "@types/react-dom": "^18.2.17", "@types/react-router-dom": "^5.3.3", "@types/sprintf-js": "^1.1.4", diff --git a/qwilight-fe/src/AvatarDrawing.module.scss b/qwilight-fe/src/AvatarDrawing.module.scss index ce8ba71..596d6c8 100644 --- a/qwilight-fe/src/AvatarDrawing.module.scss +++ b/qwilight-fe/src/AvatarDrawing.module.scss @@ -1,45 +1,16 @@ div { &.drawing { position: relative; - width: 3rem; - height: 3rem; - } - - &.largeDrawing { - position: relative; - width: 11.25rem; - height: 11.25rem; } } img { &.avatar { position: absolute; - width: 3rem; - height: 3rem; } &.edge { position: absolute; border: none; - left: -0.375rem; - top: -0.375rem; - width: 3.75rem; - height: 3.75rem; - } - - &.largeAvatar { - position: absolute; - left: 1.125rem; - top: 1.125rem; - width: 9rem; - height: 9rem; - } - - &.largeEdge { - position: absolute; - border: none; - width: 11.25rem; - height: 11.25rem; } } diff --git a/qwilight-fe/src/AvatarDrawing.tsx b/qwilight-fe/src/AvatarDrawing.tsx index b2aa24e..b331976 100644 --- a/qwilight-fe/src/AvatarDrawing.tsx +++ b/qwilight-fe/src/AvatarDrawing.tsx @@ -3,28 +3,47 @@ import scss from "src/AvatarDrawing.module.scss"; +const EDGE_MARGIN = 1.25; +const EDGE_XY = (EDGE_MARGIN - 1.0) / 2; + export default function AvatarDrawing({ avatarID, - isLarge, + drawingLength = 48, + drawingHeight = 48, }: { avatarID: string; - isLarge?: boolean; + drawingLength?: number; + drawingHeight?: number; }) { return ( -
+
(e.currentTarget.hidden = true)} />
diff --git a/qwilight-fe/src/avatar/AvatarView.tsx b/qwilight-fe/src/avatar/AvatarView.tsx index b175b47..a6452b4 100644 --- a/qwilight-fe/src/avatar/AvatarView.tsx +++ b/qwilight-fe/src/avatar/AvatarView.tsx @@ -285,7 +285,11 @@ <> - + {" "} diff --git a/taehui-fe/package.json b/taehui-fe/package.json index e5d76a4..6761ad6 100644 --- a/taehui-fe/package.json +++ b/taehui-fe/package.json @@ -30,7 +30,7 @@ "@types/dompurify": "^3.0.5", "@types/jest": "^29.5.11", "@types/node": "^20.10.4", - "@types/react": "^18.2.42", + "@types/react": "^18.2.43", "@types/react-dom": "^18.2.17", "@types/showdown": "^2.0.6", "@types/sprintf-js": "^1.1.4", diff --git a/taehui-ts/package.json b/taehui-ts/package.json index c605ec8..90e6445 100644 --- a/taehui-ts/package.json +++ b/taehui-ts/package.json @@ -23,7 +23,7 @@ "devDependencies": { "@rollup/plugin-typescript": "^11.1.5", "@types/qs": "^6.9.10", - "@types/react": "^18.2.42", + "@types/react": "^18.2.43", "dayjs": "^1.11.10", "qs": "^6.11.2", "react": "^18.2.0",