diff --git a/package.json b/package.json index 9ab3625e..e44a1df1 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "react-is": "^18.2.0", "react-router-dom": "^6.22.0", "rimraf": "^5.0.5", - "rollup": "^4.9.6", + "rollup": "^4.10.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-delete": "^2.0.0", @@ -140,7 +140,7 @@ "stylelint-order": "^6.0.4", "stylelint-processor-styled-components": "^1.10.0", "typescript": "^5.3.3", - "typescript-plugin-css-modules": "^5.0.2", + "typescript-plugin-css-modules": "^5.1.0", "typescript-plugin-styled-components": "^3.0.0", "vite": "^5.1.1", "vite-tsconfig-paths": "^4.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea03b388..409e181e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,25 +53,25 @@ devDependencies: version: 29.6.3 '@rollup/plugin-babel': specifier: ^6.0.4 - version: 6.0.4(@babel/core@7.23.9)(rollup@4.9.6) + version: 6.0.4(@babel/core@7.23.9)(rollup@4.10.0) '@rollup/plugin-buble': specifier: ^1.0.3 - version: 1.0.3(rollup@4.9.6) + version: 1.0.3(rollup@4.10.0) '@rollup/plugin-commonjs': specifier: ^25.0.7 - version: 25.0.7(rollup@4.9.6) + version: 25.0.7(rollup@4.10.0) '@rollup/plugin-eslint': specifier: ^9.0.5 - version: 9.0.5(rollup@4.9.6) + version: 9.0.5(rollup@4.10.0) '@rollup/plugin-node-resolve': specifier: ^15.2.3 - version: 15.2.3(rollup@4.9.6) + version: 15.2.3(rollup@4.10.0) '@rollup/plugin-strip': specifier: ^3.0.4 - version: 3.0.4(rollup@4.9.6) + version: 3.0.4(rollup@4.10.0) '@rollup/plugin-terser': specifier: ^0.4.4 - version: 0.4.4(rollup@4.9.6) + version: 0.4.4(rollup@4.10.0) '@size-limit/preset-big-lib': specifier: ^11.0.2 version: 11.0.2(size-limit@11.0.2) @@ -214,8 +214,8 @@ devDependencies: specifier: ^5.0.5 version: 5.0.5 rollup: - specifier: ^4.9.6 - version: 4.9.6 + specifier: ^4.10.0 + version: 4.10.0 rollup-plugin-analyzer: specifier: ^4.0.0 version: 4.0.0 @@ -230,16 +230,16 @@ devDependencies: version: 10.0.0 rollup-plugin-peer-deps-external: specifier: ^2.2.4 - version: 2.2.4(rollup@4.9.6) + version: 2.2.4(rollup@4.10.0) rollup-plugin-postcss: specifier: ^4.0.2 version: 4.0.2(postcss@8.4.35) rollup-plugin-typescript2: specifier: ^0.36.0 - version: 0.36.0(rollup@4.9.6)(typescript@5.3.3) + version: 0.36.0(rollup@4.10.0)(typescript@5.3.3) rollup-plugin-visualizer: specifier: ^5.12.0 - version: 5.12.0(rollup@4.9.6) + version: 5.12.0(rollup@4.10.0) sass: specifier: ^1.70.0 version: 1.70.0 @@ -280,8 +280,8 @@ devDependencies: specifier: ^5.3.3 version: 5.3.3 typescript-plugin-css-modules: - specifier: ^5.0.2 - version: 5.0.2(typescript@5.3.3) + specifier: ^5.1.0 + version: 5.1.0(typescript@5.3.3) typescript-plugin-styled-components: specifier: ^3.0.0 version: 3.0.0(typescript@5.3.3) @@ -364,7 +364,7 @@ packages: resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.23.9 dev: true /@babel/helper-builder-binary-assignment-operator-visitor@7.22.15: @@ -1721,15 +1721,6 @@ packages: - supports-color dev: true - /@babel/types@7.23.6: - resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-string-parser': 7.23.4 - '@babel/helper-validator-identifier': 7.22.20 - to-fast-properties: 2.0.0 - dev: true - /@babel/types@7.23.9: resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==} engines: {node: '>=6.9.0'} @@ -2757,7 +2748,7 @@ packages: engines: {node: '>=14.0.0'} dev: true - /@rollup/plugin-babel@6.0.4(@babel/core@7.23.9)(rollup@4.9.6): + /@rollup/plugin-babel@6.0.4(@babel/core@7.23.9)(rollup@4.10.0): resolution: {integrity: sha512-YF7Y52kFdFT/xVSuVdjkV5ZdX/3YtmX0QulG+x0taQOtJdHYzVU61aSSkAgVJ7NOv6qPkIYiJSgSWWN/DM5sGw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2772,11 +2763,11 @@ packages: dependencies: '@babel/core': 7.23.9 '@babel/helper-module-imports': 7.22.15 - '@rollup/pluginutils': 5.0.5(rollup@4.9.6) - rollup: 4.9.6 + '@rollup/pluginutils': 5.0.5(rollup@4.10.0) + rollup: 4.10.0 dev: true - /@rollup/plugin-buble@1.0.3(rollup@4.9.6): + /@rollup/plugin-buble@1.0.3(rollup@4.10.0): resolution: {integrity: sha512-QYD9BKkJoof0FdCFeSYYhF6/Y8e0Mnf+098xGgmWOFJ4UPHlWujjqOYeVwEm2hJPOmlR5k7HPUdAjqtOWhN64Q==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2785,13 +2776,13 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.5(rollup@4.9.6) + '@rollup/pluginutils': 5.0.5(rollup@4.10.0) '@types/buble': 0.19.2 buble: 0.20.0 - rollup: 4.9.6 + rollup: 4.10.0 dev: true - /@rollup/plugin-commonjs@25.0.7(rollup@4.9.6): + /@rollup/plugin-commonjs@25.0.7(rollup@4.10.0): resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2800,16 +2791,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.5(rollup@4.9.6) + '@rollup/pluginutils': 5.0.5(rollup@4.10.0) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.5 - rollup: 4.9.6 + rollup: 4.10.0 dev: true - /@rollup/plugin-eslint@9.0.5(rollup@4.9.6): + /@rollup/plugin-eslint@9.0.5(rollup@4.10.0): resolution: {integrity: sha512-C4nh0sSeJuxVW5u5tDX+dCMjKcNfHm4hS+zeUVh1si7gttnhgGbrmPkUxIX7iZgYABwdEh/ewyMbZB+WXjSJdA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2818,14 +2809,14 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.5(rollup@4.9.6) + '@rollup/pluginutils': 5.0.5(rollup@4.10.0) eslint: 8.56.0 - rollup: 4.9.6 + rollup: 4.10.0 transitivePeerDependencies: - supports-color dev: true - /@rollup/plugin-node-resolve@15.2.3(rollup@4.9.6): + /@rollup/plugin-node-resolve@15.2.3(rollup@4.10.0): resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2834,16 +2825,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.5(rollup@4.9.6) + '@rollup/pluginutils': 5.0.5(rollup@4.10.0) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.8 - rollup: 4.9.6 + rollup: 4.10.0 dev: true - /@rollup/plugin-strip@3.0.4(rollup@4.9.6): + /@rollup/plugin-strip@3.0.4(rollup@4.10.0): resolution: {integrity: sha512-LDRV49ZaavxUo2YoKKMQjCxzCxugu1rCPQa0lDYBOWLj6vtzBMr8DcoJjsmg+s450RbKbe3qI9ZLaSO+O1oNbg==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2852,13 +2843,13 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.5(rollup@4.9.6) + '@rollup/pluginutils': 5.0.5(rollup@4.10.0) estree-walker: 2.0.2 magic-string: 0.30.5 - rollup: 4.9.6 + rollup: 4.10.0 dev: true - /@rollup/plugin-terser@0.4.4(rollup@4.9.6): + /@rollup/plugin-terser@0.4.4(rollup@4.10.0): resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2867,7 +2858,7 @@ packages: rollup: optional: true dependencies: - rollup: 4.9.6 + rollup: 4.10.0 serialize-javascript: 6.0.1 smob: 1.4.1 terser: 5.21.0 @@ -2881,7 +2872,7 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/pluginutils@5.0.5(rollup@4.9.6): + /@rollup/pluginutils@5.0.5(rollup@4.10.0): resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2893,107 +2884,107 @@ packages: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 4.9.6 + rollup: 4.10.0 dev: true - /@rollup/rollup-android-arm-eabi@4.9.6: - resolution: {integrity: sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==} + /@rollup/rollup-android-arm-eabi@4.10.0: + resolution: {integrity: sha512-/MeDQmcD96nVoRumKUljsYOLqfv1YFJps+0pTrb2Z9Nl/w5qNUysMaWQsrd1mvAlNT4yza1iVyIu4Q4AgF6V3A==} cpu: [arm] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-android-arm64@4.9.6: - resolution: {integrity: sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==} + /@rollup/rollup-android-arm64@4.10.0: + resolution: {integrity: sha512-lvu0jK97mZDJdpZKDnZI93I0Om8lSDaiPx3OiCk0RXn3E8CMPJNS/wxjAvSJJzhhZpfjXsjLWL8LnS6qET4VNQ==} cpu: [arm64] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-arm64@4.9.6: - resolution: {integrity: sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==} + /@rollup/rollup-darwin-arm64@4.10.0: + resolution: {integrity: sha512-uFpayx8I8tyOvDkD7X6n0PriDRWxcqEjqgtlxnUA/G9oS93ur9aZ8c8BEpzFmsed1TH5WZNG5IONB8IiW90TQg==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-x64@4.9.6: - resolution: {integrity: sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==} + /@rollup/rollup-darwin-x64@4.10.0: + resolution: {integrity: sha512-nIdCX03qFKoR/MwQegQBK+qZoSpO3LESurVAC6s6jazLA1Mpmgzo3Nj3H1vydXp/JM29bkCiuF7tDuToj4+U9Q==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.9.6: - resolution: {integrity: sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==} + /@rollup/rollup-linux-arm-gnueabihf@4.10.0: + resolution: {integrity: sha512-Fz7a+y5sYhYZMQFRkOyCs4PLhICAnxRX/GnWYReaAoruUzuRtcf+Qnw+T0CoAWbHCuz2gBUwmWnUgQ67fb3FYw==} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.9.6: - resolution: {integrity: sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==} + /@rollup/rollup-linux-arm64-gnu@4.10.0: + resolution: {integrity: sha512-yPtF9jIix88orwfTi0lJiqINnlWo6p93MtZEoaehZnmCzEmLL0eqjA3eGVeyQhMtxdV+Mlsgfwhh0+M/k1/V7Q==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.9.6: - resolution: {integrity: sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==} + /@rollup/rollup-linux-arm64-musl@4.10.0: + resolution: {integrity: sha512-9GW9yA30ib+vfFiwjX+N7PnjTnCMiUffhWj4vkG4ukYv1kJ4T9gHNg8zw+ChsOccM27G9yXrEtMScf1LaCuoWQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.9.6: - resolution: {integrity: sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==} + /@rollup/rollup-linux-riscv64-gnu@4.10.0: + resolution: {integrity: sha512-X1ES+V4bMq2ws5fF4zHornxebNxMXye0ZZjUrzOrf7UMx1d6wMQtfcchZ8SqUnQPPHdOyOLW6fTcUiFgHFadRA==} cpu: [riscv64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.9.6: - resolution: {integrity: sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==} + /@rollup/rollup-linux-x64-gnu@4.10.0: + resolution: {integrity: sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.9.6: - resolution: {integrity: sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==} + /@rollup/rollup-linux-x64-musl@4.10.0: + resolution: {integrity: sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.9.6: - resolution: {integrity: sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==} + /@rollup/rollup-win32-arm64-msvc@4.10.0: + resolution: {integrity: sha512-NrR6667wlUfP0BHaEIKgYM/2va+Oj+RjZSASbBMnszM9k+1AmliRjHc3lJIiOehtSSjqYiO7R6KLNrWOX+YNSQ==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.9.6: - resolution: {integrity: sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==} + /@rollup/rollup-win32-ia32-msvc@4.10.0: + resolution: {integrity: sha512-FV0Tpt84LPYDduIDcXvEC7HKtyXxdvhdAOvOeWMWbQNulxViH2O07QXkT/FffX4FqEI02jEbCJbr+YcuKdyyMg==} cpu: [ia32] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.9.6: - resolution: {integrity: sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==} + /@rollup/rollup-win32-x64-msvc@4.10.0: + resolution: {integrity: sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ==} cpu: [x64] os: [win32] requiresBuild: true @@ -5688,8 +5679,8 @@ packages: domhandler: 5.0.3 dev: true - /dotenv@16.3.1: - resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==} + /dotenv@16.4.2: + resolution: {integrity: sha512-rZSSFxke7d9nYQ5NeMIwp5PP+f8wXgKNljpOb7KtH6SKW1cEqcXAz9VSJYVLKe7Jhup/gUYOkaeSVyK8GJ+nBg==} engines: {node: '>=12'} dev: true @@ -9735,8 +9726,8 @@ packages: postcss: 8.4.35 dev: true - /postcss-modules-local-by-default@4.0.0(postcss@8.4.35): - resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==} + /postcss-modules-local-by-default@4.0.4(postcss@8.4.35): + resolution: {integrity: sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 @@ -9747,8 +9738,8 @@ packages: postcss-value-parser: 4.2.0 dev: true - /postcss-modules-scope@3.0.0(postcss@8.4.35): - resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==} + /postcss-modules-scope@3.1.1(postcss@8.4.35): + resolution: {integrity: sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 @@ -9777,8 +9768,8 @@ packages: lodash.camelcase: 4.3.0 postcss: 8.4.35 postcss-modules-extract-imports: 3.0.0(postcss@8.4.35) - postcss-modules-local-by-default: 4.0.0(postcss@8.4.35) - postcss-modules-scope: 3.0.0(postcss@8.4.35) + postcss-modules-local-by-default: 4.0.4(postcss@8.4.35) + postcss-modules-scope: 3.1.1(postcss@8.4.35) postcss-modules-values: 4.0.0(postcss@8.4.35) string-hash: 1.1.3 dev: true @@ -10883,12 +10874,12 @@ packages: - supports-color dev: true - /rollup-plugin-peer-deps-external@2.2.4(rollup@4.9.6): + /rollup-plugin-peer-deps-external@2.2.4(rollup@4.10.0): resolution: {integrity: sha512-AWdukIM1+k5JDdAqV/Cxd+nejvno2FVLVeZ74NKggm3Q5s9cbbcOgUPGdbxPi4BXu7xGaZ8HG12F+thImYu/0g==} peerDependencies: rollup: '*' dependencies: - rollup: 4.9.6 + rollup: 4.10.0 dev: true /rollup-plugin-postcss@4.0.2(postcss@8.4.35): @@ -10915,7 +10906,7 @@ packages: - ts-node dev: true - /rollup-plugin-typescript2@0.36.0(rollup@4.9.6)(typescript@5.3.3): + /rollup-plugin-typescript2@0.36.0(rollup@4.10.0)(typescript@5.3.3): resolution: {integrity: sha512-NB2CSQDxSe9+Oe2ahZbf+B4bh7pHwjV5L+RSYpCu7Q5ROuN94F9b6ioWwKfz3ueL3KTtmX4o2MUH2cgHDIEUsw==} peerDependencies: rollup: '>=1.26.3' @@ -10924,13 +10915,13 @@ packages: '@rollup/pluginutils': 4.2.1 find-cache-dir: 3.3.2 fs-extra: 10.1.0 - rollup: 4.9.6 + rollup: 4.10.0 semver: 7.5.4 tslib: 2.6.2 typescript: 5.3.3 dev: true - /rollup-plugin-visualizer@5.12.0(rollup@4.9.6): + /rollup-plugin-visualizer@5.12.0(rollup@4.10.0): resolution: {integrity: sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==} engines: {node: '>=14'} hasBin: true @@ -10942,7 +10933,7 @@ packages: dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: 4.9.6 + rollup: 4.10.0 source-map: 0.7.4 yargs: 17.7.2 dev: true @@ -10953,26 +10944,26 @@ packages: estree-walker: 0.6.1 dev: true - /rollup@4.9.6: - resolution: {integrity: sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==} + /rollup@4.10.0: + resolution: {integrity: sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.9.6 - '@rollup/rollup-android-arm64': 4.9.6 - '@rollup/rollup-darwin-arm64': 4.9.6 - '@rollup/rollup-darwin-x64': 4.9.6 - '@rollup/rollup-linux-arm-gnueabihf': 4.9.6 - '@rollup/rollup-linux-arm64-gnu': 4.9.6 - '@rollup/rollup-linux-arm64-musl': 4.9.6 - '@rollup/rollup-linux-riscv64-gnu': 4.9.6 - '@rollup/rollup-linux-x64-gnu': 4.9.6 - '@rollup/rollup-linux-x64-musl': 4.9.6 - '@rollup/rollup-win32-arm64-msvc': 4.9.6 - '@rollup/rollup-win32-ia32-msvc': 4.9.6 - '@rollup/rollup-win32-x64-msvc': 4.9.6 + '@rollup/rollup-android-arm-eabi': 4.10.0 + '@rollup/rollup-android-arm64': 4.10.0 + '@rollup/rollup-darwin-arm64': 4.10.0 + '@rollup/rollup-darwin-x64': 4.10.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.10.0 + '@rollup/rollup-linux-arm64-gnu': 4.10.0 + '@rollup/rollup-linux-arm64-musl': 4.10.0 + '@rollup/rollup-linux-riscv64-gnu': 4.10.0 + '@rollup/rollup-linux-x64-gnu': 4.10.0 + '@rollup/rollup-linux-x64-musl': 4.10.0 + '@rollup/rollup-win32-arm64-msvc': 4.10.0 + '@rollup/rollup-win32-ia32-msvc': 4.10.0 + '@rollup/rollup-win32-x64-msvc': 4.10.0 fsevents: 2.3.3 dev: true @@ -11042,15 +11033,10 @@ packages: source-map-js: 1.0.2 dev: true - /sax@1.2.4: - resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} - dev: true - /sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} requiresBuild: true dev: true - optional: true /saxes@6.0.0: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} @@ -11766,14 +11752,14 @@ packages: /stylis@4.3.1: resolution: {integrity: sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==} - /stylus@0.59.0: - resolution: {integrity: sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==} + /stylus@0.62.0: + resolution: {integrity: sha512-v3YCf31atbwJQIMtPNX8hcQ+okD4NQaTuKGUWfII8eaqn+3otrbttGL1zSMZAAtiPsBztQnujVBugg/cXFUpyg==} hasBin: true dependencies: '@adobe/css-tools': 4.3.3 debug: 4.3.4(supports-color@8.1.1) glob: 7.2.3 - sax: 1.2.4 + sax: 1.3.0 source-map: 0.7.4 transitivePeerDependencies: - supports-color @@ -12195,26 +12181,26 @@ packages: is-typed-array: 1.1.12 dev: true - /typescript-plugin-css-modules@5.0.2(typescript@5.3.3): - resolution: {integrity: sha512-ej/Og4Y8mF+43P14P9Ik1MGqNXcXBVgO1TltkESegdnZsaaRXnaJ5CoJmTPRkg25ysQlOV6P94wNhI4VxIzlkw==} + /typescript-plugin-css-modules@5.1.0(typescript@5.3.3): + resolution: {integrity: sha512-6h+sLBa4l+XYSTn/31vZHd/1c3SvAbLpobY6FxDiUOHJQG1eD9Gh3eCs12+Eqc+TCOAdxcO+zAPvUq0jBfdciw==} peerDependencies: typescript: '>=4.0.0' dependencies: '@types/postcss-modules-local-by-default': 4.0.2 '@types/postcss-modules-scope': 3.0.4 - dotenv: 16.3.1 + dotenv: 16.4.2 icss-utils: 5.1.0(postcss@8.4.35) less: 4.2.0 lodash.camelcase: 4.3.0 postcss: 8.4.35 postcss-load-config: 3.1.4(postcss@8.4.35) postcss-modules-extract-imports: 3.0.0(postcss@8.4.35) - postcss-modules-local-by-default: 4.0.0(postcss@8.4.35) - postcss-modules-scope: 3.0.0(postcss@8.4.35) + postcss-modules-local-by-default: 4.0.4(postcss@8.4.35) + postcss-modules-scope: 3.1.1(postcss@8.4.35) reserved-words: 0.1.2 sass: 1.70.0 source-map-js: 1.0.2 - stylus: 0.59.0 + stylus: 0.62.0 tsconfig-paths: 4.2.0 typescript: 5.3.3 transitivePeerDependencies: @@ -12519,7 +12505,7 @@ packages: '@types/node': 20.11.17 esbuild: 0.19.12 postcss: 8.4.35 - rollup: 4.9.6 + rollup: 4.10.0 sass: 1.70.0 optionalDependencies: fsevents: 2.3.3 diff --git a/src/components/common/themes/index.ts b/src/components/common/themes/index.ts index 07e2d970..b855f6d7 100644 --- a/src/components/common/themes/index.ts +++ b/src/components/common/themes/index.ts @@ -41,7 +41,7 @@ export const darkTheme: Theme = { secondary: '#ffdf00', titleColor: '#007FFF', titleColorActive: '#007FFF', - toolbarBgColor: '#333333', - toolbarBtnBgColor: '#111', + toolbarBgColor: '#555', + toolbarBtnBgColor: '#222', toolbarTextColor: '#ffffff', }; diff --git a/src/components/list/list.styles.ts b/src/components/list/list.styles.ts index 4661a19f..07f5691e 100644 --- a/src/components/list/list.styles.ts +++ b/src/components/list/list.styles.ts @@ -30,7 +30,7 @@ export const ListStyle = styled.ul` justify-content: flex-start; list-style: none; margin: 0; - padding: 0; + padding: 0;popo width: 100%; `; @@ -49,6 +49,7 @@ export const ListItemStyle = styled.li<{ border: 1px solid ${(p) => p.theme.primary}; cursor: pointer; } + user-select: none; `; // Title styles diff --git a/src/components/popover/index.tsx b/src/components/popover/index.tsx index ba62cea7..bce6d84c 100644 --- a/src/components/popover/index.tsx +++ b/src/components/popover/index.tsx @@ -1,7 +1,7 @@ -import { Theme } from '@models/Theme'; -import { FunctionComponent, ReactNode, useRef, useState } from 'react'; +import { FunctionComponent, useEffect, useRef, useState } from 'react'; import useCloseClickOutside from '../effects/useCloseClickOutside'; -import { ChevronDown, ChevronUp, CloseIcon } from '../icons'; +import { ChevronDown, CloseIcon } from '../icons'; +import { PopOverModel } from './popover.model'; import { CloseButton, Content, @@ -13,37 +13,46 @@ import { SelecterLabel, } from './popover.styles'; -export type PopoverPosition = 'up' | 'down' | 'left' | 'right'; - -export type PopOverModel = { - children: ReactNode | ReactNode[]; - placeholder?: string; - position: PopoverPosition; - theme?: Theme; - width?: string | number; -}; - const PopOver: FunctionComponent = ({ children, position, placeholder, theme, width = '300px', + isDarkMode = false, }) => { const [open, setOpen] = useState(false); const toggleOpen = () => setOpen(!open); const closePopover = () => setOpen(false); + const [isVisible, setIsVisible] = useState(false); + const ref = useRef(null); useCloseClickOutside(ref, closePopover); + useEffect(() => { + if (open) { + setTimeout(() => { + setIsVisible(true); + }, 10); + } else { + setIsVisible(false); + } + }, [open]); + return ( - - - {open ? : } + + + {placeholder} @@ -52,6 +61,7 @@ const PopOver: FunctionComponent = ({ position={position} style={{ width: `${width}` }} theme={theme} + visible={isVisible} >
diff --git a/src/components/popover/popover.model.ts b/src/components/popover/popover.model.ts new file mode 100644 index 00000000..0e8d1079 --- /dev/null +++ b/src/components/popover/popover.model.ts @@ -0,0 +1,13 @@ +import { Theme } from '@models/Theme'; +import { ReactNode } from 'react'; + +export type PopOverModel = { + children: ReactNode | ReactNode[]; + isDarkMode?: boolean; + placeholder?: string; + position: PopoverPosition; + theme?: Theme; + width?: string | number; +}; + +export type PopoverPosition = 'up' | 'down' | 'left' | 'right'; diff --git a/src/components/popover/popover.styles.ts b/src/components/popover/popover.styles.ts index 42a1c376..fa57aa83 100644 --- a/src/components/popover/popover.styles.ts +++ b/src/components/popover/popover.styles.ts @@ -1,18 +1,19 @@ import { Theme } from '@models/Theme'; import styled from 'styled-components'; -import { PopoverPosition } from '.'; +import { PopoverPosition } from './popover.model'; export const PopoverWrapper = styled.div``; export const PopoverHolder = styled.div<{ position: PopoverPosition; theme?: Theme; + visible?: boolean; }>` align-items: flex-start; background: ${({ theme }) => theme.toolbarBgColor}; background:; border-radius: 6px; - box-shadow: 0px 5px 16px rgba(0, 0, 0, 0.2); + box-shadow: 0px 5px 16px rgba(0, 0, 0, 0.5); display: flex; flex-direction: column; justify-content: space-between; @@ -23,30 +24,40 @@ export const PopoverHolder = styled.div<{ top: 3.5rem; width: 100%; z-index: 100; + opacity: ${({ visible }) => (visible ? 1 : 0)}; + transition: opacity 0.1s ease-in-out; `; -export const Selecter = styled.div<{ theme: Theme }>` +export const Selecter = styled.div<{ + isDarkMode: boolean; + open?: boolean; + theme: Theme; +}>` align-items: center; background: ${({ theme }) => theme.toolbarBtnBgColor}; color: ${({ theme }) => theme.toolbarTextColor}; border-radius: 25px; - box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: ${({ open, isDarkMode }) => + !open + ? `0px 1px 1px rgba(0, 0, 0, ${isDarkMode ? '0.85' : '0.2'})` + : 'inset 0 0 1px 1px rgba(0, 0, 0, 0.2)'}; cursor: pointer; display: flex; - font-size: 1rem; font-weight: normal; justify-content: space-between; - padding: 0.35rem 0.75rem 0.35rem 0.5rem; + padding: 0.4rem 0.75rem 0.4rem 0.5rem; user-select: none; `; -export const SelecterIcon = styled.span<{ theme: Theme }>` +export const SelecterIcon = styled.span<{ open: boolean; theme: Theme }>` align-items: center; - color: ${({ theme }) => theme.toolbarTextColor}; + color: ${({ theme }) => theme.primary}; display: flex; - height: 1.5rem; + height: 1.25rem; justify-content: center; - width: 1.5rem; + width: 1.25rem; + transform: ${({ open }) => (open ? 'rotate(180deg)' : 'rotate(0deg)')}; + transition: transform 0.2s ease-in-out; & svg { height: 100%; @@ -55,7 +66,7 @@ export const SelecterIcon = styled.span<{ theme: Theme }>` `; export const SelecterLabel = styled.span` - font-size: 1rem; + font-size: 0.9rem; text-align: left; `; diff --git a/src/components/timeline-elements/timeline-control/timeline-control.styles.ts b/src/components/timeline-elements/timeline-control/timeline-control.styles.ts index ee90f3b2..069ed0bc 100644 --- a/src/components/timeline-elements/timeline-control/timeline-control.styles.ts +++ b/src/components/timeline-elements/timeline-control/timeline-control.styles.ts @@ -55,8 +55,8 @@ export const TimelineNavButton = styled.button<{ } svg { - width: 80%; - height: 80%; + width: 60%; + height: 60%; } `; @@ -80,8 +80,8 @@ export const ControlButton = styled.button<{ theme?: Theme }>` color: #fff; svg { - width: 70%; - height: 70%; + width: 80%; + height: 80%; } `; diff --git a/src/components/timeline/timeline-popover-elements.tsx b/src/components/timeline/timeline-popover-elements.tsx index 5019937c..af6ea28a 100644 --- a/src/components/timeline/timeline-popover-elements.tsx +++ b/src/components/timeline/timeline-popover-elements.tsx @@ -8,6 +8,7 @@ import { PopOver } from '../popover'; type LayoutSwitcherProp = { initialTimelineMode?: TimelineMode | 'HORIZONTAL_ALL'; + isDarkMode: boolean; mode?: TimelineMode; onUpdateTimelineMode: (s: string) => void; theme: Theme; @@ -17,6 +18,7 @@ const LayoutSwitcher: FunctionComponent = ({ onUpdateTimelineMode, theme, mode, + isDarkMode, }: LayoutSwitcherProp) => { const { showAllCardsHorizontal } = useContext(GlobalContext); @@ -64,7 +66,12 @@ const LayoutSwitcher: FunctionComponent = ({ ); return ( - + = ({ type QuickJumpProp = { activeItem: number; + isDarkMode: boolean; items: ListItemModel[]; onActivateItem: (id: string) => void; theme: Theme; @@ -86,6 +94,7 @@ const QuickJump: FunctionComponent = ({ items, theme, onActivateItem, + isDarkMode, }: QuickJumpProp) => { return ( = ({ position="down" theme={theme} width={'400px'} + isDarkMode={isDarkMode} > ({ diff --git a/src/components/timeline/timeline-toolbar.tsx b/src/components/timeline/timeline-toolbar.tsx index 61848146..593dd388 100644 --- a/src/components/timeline/timeline-toolbar.tsx +++ b/src/components/timeline/timeline-toolbar.tsx @@ -9,7 +9,6 @@ const TimelineToolbar: FunctionComponent = ({ activeTimelineItem, slideShowEnabled, slideShowRunning, - darkMode, flipLayout, toggleDarkMode, onPaused, @@ -25,9 +24,9 @@ const TimelineToolbar: FunctionComponent = ({ onUpdateTimelineMode, mode, }) => { - const { theme, cardLess, enableQuickJump } = useContext(GlobalContext); + const { theme, cardLess, enableQuickJump, darkMode } = + useContext(GlobalContext); - console.log(theme); const toolbarItems = useMemo(() => { return [ { @@ -80,6 +79,7 @@ const TimelineToolbar: FunctionComponent = ({ {enableQuickJump ? ( ({ ...item, description: item.cardSubtitle, @@ -90,6 +90,7 @@ const TimelineToolbar: FunctionComponent = ({ ) : null} {!cardLess ? ( ` height: 100%; padding: 10px 20px; border-radius: 6px; + flex-wrap: wrap; `; export const ToolbarListItem = styled.li`