From 061796f57546142b79be6b1d24126b0a745d9ab4 Mon Sep 17 00:00:00 2001 From: Peng Xiao Date: Tue, 17 May 2022 23:33:52 +0800 Subject: [PATCH] fix: only show tabs when needed --- package.json | 16 +-- pnpm-lock.yaml | 355 +++++++++++++++++++++++++------------------------ src/main.tsx | 3 - src/utils.ts | 34 ++++- 4 files changed, 220 insertions(+), 188 deletions(-) diff --git a/package.json b/package.json index f59c792..f769420 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "@logseq/libs": "^0.0.6", "fast-deep-equal": "^3.1.3", - "immer": "^9.0.12", + "immer": "^9.0.14", "react": "^18.1.0", "react-dom": "^18.1.0", "react-use": "^17.3.2" @@ -22,21 +22,21 @@ "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "10.0.1", "@semantic-release/npm": "9.0.1", - "@types/react": "18.0.8", - "@types/react-dom": "18.0.3", - "@typescript-eslint/eslint-plugin": "^5.22.0", - "@typescript-eslint/parser": "^5.22.0", + "@types/react": "18.0.9", + "@types/react-dom": "18.0.4", + "@typescript-eslint/eslint-plugin": "^5.24.0", + "@typescript-eslint/parser": "^5.24.0", "@vitejs/plugin-react": "^1.3.2", "conventional-changelog-conventionalcommits": "4.6.3", - "eslint": "^8.14.0", + "eslint": "^8.15.0", "eslint-plugin-react": "^7.29.4", "eslint-plugin-react-hooks": "^4.5.0", "semantic-release": "^19.0.2", "typescript": "4.6.4", - "vite": "2.9.8", + "vite": "2.9.9", "vite-plugin-logseq": "^1.1.2", "vite-plugin-windicss": "1.8.4", - "windicss": "3.5.1" + "windicss": "3.5.3" }, "logseq": { "id": "_pengx17-logseq-tabs" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 43fc930..9038662 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: 5.3 +lockfileVersion: 5.4 specifiers: '@logseq/libs': ^0.0.6 @@ -6,55 +6,55 @@ specifiers: '@semantic-release/exec': ^6.0.3 '@semantic-release/git': 10.0.1 '@semantic-release/npm': 9.0.1 - '@types/react': 18.0.8 - '@types/react-dom': 18.0.3 - '@typescript-eslint/eslint-plugin': ^5.22.0 - '@typescript-eslint/parser': ^5.22.0 + '@types/react': 18.0.9 + '@types/react-dom': 18.0.4 + '@typescript-eslint/eslint-plugin': ^5.24.0 + '@typescript-eslint/parser': ^5.24.0 '@vitejs/plugin-react': ^1.3.2 conventional-changelog-conventionalcommits: 4.6.3 - eslint: ^8.14.0 + eslint: ^8.15.0 eslint-plugin-react: ^7.29.4 eslint-plugin-react-hooks: ^4.5.0 fast-deep-equal: ^3.1.3 - immer: ^9.0.12 + immer: ^9.0.14 react: ^18.1.0 react-dom: ^18.1.0 react-use: ^17.3.2 semantic-release: ^19.0.2 typescript: 4.6.4 - vite: 2.9.8 + vite: 2.9.9 vite-plugin-logseq: ^1.1.2 vite-plugin-windicss: 1.8.4 - windicss: 3.5.1 + windicss: 3.5.3 dependencies: '@logseq/libs': 0.0.6 fast-deep-equal: 3.1.3 - immer: 9.0.12 + immer: 9.0.14 react: 18.1.0 react-dom: 18.1.0_react@18.1.0 - react-use: 17.3.2_react-dom@18.1.0+react@18.1.0 + react-use: 17.3.2_ef5jwxihqo6n7gxfmzogljlgcm devDependencies: '@semantic-release/changelog': 6.0.1_semantic-release@19.0.2 '@semantic-release/exec': 6.0.3_semantic-release@19.0.2 '@semantic-release/git': 10.0.1_semantic-release@19.0.2 '@semantic-release/npm': 9.0.1_semantic-release@19.0.2 - '@types/react': 18.0.8 - '@types/react-dom': 18.0.3 - '@typescript-eslint/eslint-plugin': 5.22.0_5b52bb1e77494a9627aef8db6adb10bc - '@typescript-eslint/parser': 5.22.0_eslint@8.14.0+typescript@4.6.4 + '@types/react': 18.0.9 + '@types/react-dom': 18.0.4 + '@typescript-eslint/eslint-plugin': 5.24.0_w4ec7awddsetq6k5phhi6huiuu + '@typescript-eslint/parser': 5.24.0_hcfsmds2fshutdssjqluwm76uu '@vitejs/plugin-react': 1.3.2 conventional-changelog-conventionalcommits: 4.6.3 - eslint: 8.14.0 - eslint-plugin-react: 7.29.4_eslint@8.14.0 - eslint-plugin-react-hooks: 4.5.0_eslint@8.14.0 + eslint: 8.15.0 + eslint-plugin-react: 7.29.4_eslint@8.15.0 + eslint-plugin-react-hooks: 4.5.0_eslint@8.15.0 semantic-release: 19.0.2 typescript: 4.6.4 - vite: 2.9.8 + vite: 2.9.9 vite-plugin-logseq: 1.1.2 - vite-plugin-windicss: 1.8.4_vite@2.9.8 - windicss: 3.5.1 + vite-plugin-windicss: 1.8.4_vite@2.9.9 + windicss: 3.5.3 packages: @@ -232,6 +232,8 @@ packages: resolution: {integrity: sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==} engines: {node: '>=6.0.0'} hasBin: true + dependencies: + '@babel/types': 7.17.10 dev: true /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.17.10: @@ -330,14 +332,14 @@ packages: to-fast-properties: 2.0.0 dev: true - /@eslint/eslintrc/1.2.2: - resolution: {integrity: sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==} + /@eslint/eslintrc/1.2.3: + resolution: {integrity: sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4 - espree: 9.3.1 - globals: 13.13.0 + espree: 9.3.2 + globals: 13.15.0 ignore: 5.2.0 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -718,18 +720,18 @@ packages: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} dev: true - /@types/react-dom/18.0.3: - resolution: {integrity: sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==} + /@types/react-dom/18.0.4: + resolution: {integrity: sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q==} dependencies: - '@types/react': 18.0.8 + '@types/react': 18.0.9 dev: true - /@types/react/18.0.8: - resolution: {integrity: sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==} + /@types/react/18.0.9: + resolution: {integrity: sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 - csstype: 3.0.11 + csstype: 3.1.0 dev: true /@types/retry/0.12.1: @@ -740,8 +742,8 @@ packages: resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==} dev: true - /@typescript-eslint/eslint-plugin/5.22.0_5b52bb1e77494a9627aef8db6adb10bc: - resolution: {integrity: sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==} + /@typescript-eslint/eslint-plugin/5.24.0_w4ec7awddsetq6k5phhi6huiuu: + resolution: {integrity: sha512-6bqFGk6wa9+6RrU++eLknKyDqXU1Oc8nyoLu5a1fU17PNRJd9UBr56rMF7c4DRaRtnarlkQ4jwxUbvBo8cNlpw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -751,12 +753,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.22.0_eslint@8.14.0+typescript@4.6.4 - '@typescript-eslint/scope-manager': 5.22.0 - '@typescript-eslint/type-utils': 5.22.0_eslint@8.14.0+typescript@4.6.4 - '@typescript-eslint/utils': 5.22.0_eslint@8.14.0+typescript@4.6.4 + '@typescript-eslint/parser': 5.24.0_hcfsmds2fshutdssjqluwm76uu + '@typescript-eslint/scope-manager': 5.24.0 + '@typescript-eslint/type-utils': 5.24.0_hcfsmds2fshutdssjqluwm76uu + '@typescript-eslint/utils': 5.24.0_hcfsmds2fshutdssjqluwm76uu debug: 4.3.4 - eslint: 8.14.0 + eslint: 8.15.0 functional-red-black-tree: 1.0.1 ignore: 5.2.0 regexpp: 3.2.0 @@ -767,8 +769,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.22.0_eslint@8.14.0+typescript@4.6.4: - resolution: {integrity: sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ==} + /@typescript-eslint/parser/5.24.0_hcfsmds2fshutdssjqluwm76uu: + resolution: {integrity: sha512-4q29C6xFYZ5B2CXqSBBdcS0lPyfM9M09DoQLtHS5kf+WbpV8pBBhHDLNhXfgyVwFnhrhYzOu7xmg02DzxeF2Uw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -777,26 +779,26 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.22.0 - '@typescript-eslint/types': 5.22.0 - '@typescript-eslint/typescript-estree': 5.22.0_typescript@4.6.4 + '@typescript-eslint/scope-manager': 5.24.0 + '@typescript-eslint/types': 5.24.0 + '@typescript-eslint/typescript-estree': 5.24.0_typescript@4.6.4 debug: 4.3.4 - eslint: 8.14.0 + eslint: 8.15.0 typescript: 4.6.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager/5.22.0: - resolution: {integrity: sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==} + /@typescript-eslint/scope-manager/5.24.0: + resolution: {integrity: sha512-WpMWipcDzGmMzdT7NtTjRXFabx10WleLUGrJpuJLGaxSqpcyq5ACpKSD5VE40h2nz3melQ91aP4Du7lh9FliCA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.22.0 - '@typescript-eslint/visitor-keys': 5.22.0 + '@typescript-eslint/types': 5.24.0 + '@typescript-eslint/visitor-keys': 5.24.0 dev: true - /@typescript-eslint/type-utils/5.22.0_eslint@8.14.0+typescript@4.6.4: - resolution: {integrity: sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==} + /@typescript-eslint/type-utils/5.24.0_hcfsmds2fshutdssjqluwm76uu: + resolution: {integrity: sha512-uGi+sQiM6E5CeCZYBXiaIvIChBXru4LZ1tMoeKbh1Lze+8BO9syUG07594C4lvN2YPT4KVeIupOJkVI+9/DAmQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -805,22 +807,22 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.22.0_eslint@8.14.0+typescript@4.6.4 + '@typescript-eslint/utils': 5.24.0_hcfsmds2fshutdssjqluwm76uu debug: 4.3.4 - eslint: 8.14.0 + eslint: 8.15.0 tsutils: 3.21.0_typescript@4.6.4 typescript: 4.6.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/types/5.22.0: - resolution: {integrity: sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==} + /@typescript-eslint/types/5.24.0: + resolution: {integrity: sha512-Tpg1c3shTDgTmZd3qdUyd+16r/pGmVaVEbLs+ufuWP0EruVbUiEOmpBBQxBb9a8iPRxi8Rb2oiwOxuZJzSq11A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.22.0_typescript@4.6.4: - resolution: {integrity: sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==} + /@typescript-eslint/typescript-estree/5.24.0_typescript@4.6.4: + resolution: {integrity: sha512-zcor6vQkQmZAQfebSPVwUk/FD+CvnsnlfKXYeQDsWXRF+t7SBPmIfNia/wQxCSeu1h1JIjwV2i9f5/DdSp/uDw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -828,8 +830,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.22.0 - '@typescript-eslint/visitor-keys': 5.22.0 + '@typescript-eslint/types': 5.24.0 + '@typescript-eslint/visitor-keys': 5.24.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -840,29 +842,29 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.22.0_eslint@8.14.0+typescript@4.6.4: - resolution: {integrity: sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==} + /@typescript-eslint/utils/5.24.0_hcfsmds2fshutdssjqluwm76uu: + resolution: {integrity: sha512-K05sbWoeCBJH8KXu6hetBJ+ukG0k2u2KlgD3bN+v+oBKm8adJqVHpSSLHNzqyuv0Lh4GVSAUgZ5lB4icmPmWLw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: '@types/json-schema': 7.0.11 - '@typescript-eslint/scope-manager': 5.22.0 - '@typescript-eslint/types': 5.22.0 - '@typescript-eslint/typescript-estree': 5.22.0_typescript@4.6.4 - eslint: 8.14.0 + '@typescript-eslint/scope-manager': 5.24.0 + '@typescript-eslint/types': 5.24.0 + '@typescript-eslint/typescript-estree': 5.24.0_typescript@4.6.4 + eslint: 8.15.0 eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@8.14.0 + eslint-utils: 3.0.0_eslint@8.15.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/visitor-keys/5.22.0: - resolution: {integrity: sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==} + /@typescript-eslint/visitor-keys/5.24.0: + resolution: {integrity: sha512-qzGwSXMyMnogcAo+/2fU+jhlPPVMXlIH2PeAonIKjJSoDKl1+lJVvG5Z5Oud36yU0TWK2cs1p/FaSN5J2OUFYA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.22.0 + '@typescript-eslint/types': 5.24.0 eslint-visitor-keys: 3.3.0 dev: true @@ -887,7 +889,7 @@ packages: dependencies: debug: 4.3.4 jiti: 1.13.0 - windicss: 3.5.1 + windicss: 3.5.3 transitivePeerDependencies: - supports-color dev: true @@ -901,7 +903,7 @@ packages: fast-glob: 3.2.11 magic-string: 0.26.1 micromatch: 4.0.5 - windicss: 3.5.1 + windicss: 3.5.3 transitivePeerDependencies: - supports-color dev: true @@ -918,16 +920,16 @@ packages: through: 2.3.8 dev: true - /acorn-jsx/5.3.2_acorn@8.7.0: + /acorn-jsx/5.3.2_acorn@8.7.1: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.7.0 + acorn: 8.7.1 dev: true - /acorn/8.7.0: - resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==} + /acorn/8.7.1: + resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==} engines: {node: '>=0.4.0'} hasBin: true dev: true @@ -1306,11 +1308,16 @@ packages: /csstype/3.0.11: resolution: {integrity: sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==} + dev: false /csstype/3.0.8: resolution: {integrity: sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==} dev: false + /csstype/3.1.0: + resolution: {integrity: sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==} + dev: true + /dateformat/3.0.3: resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==} dev: true @@ -1519,8 +1526,8 @@ packages: is-symbol: 1.0.4 dev: true - /esbuild-android-64/0.14.38: - resolution: {integrity: sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==} + /esbuild-android-64/0.14.39: + resolution: {integrity: sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -1528,8 +1535,8 @@ packages: dev: true optional: true - /esbuild-android-arm64/0.14.38: - resolution: {integrity: sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==} + /esbuild-android-arm64/0.14.39: + resolution: {integrity: sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -1537,8 +1544,8 @@ packages: dev: true optional: true - /esbuild-darwin-64/0.14.38: - resolution: {integrity: sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==} + /esbuild-darwin-64/0.14.39: + resolution: {integrity: sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -1546,8 +1553,8 @@ packages: dev: true optional: true - /esbuild-darwin-arm64/0.14.38: - resolution: {integrity: sha512-eqF+OejMI3mC5Dlo9Kdq/Ilbki9sQBw3QlHW3wjLmsLh+quNfHmGMp3Ly1eWm981iGBMdbtSS9+LRvR2T8B3eQ==} + /esbuild-darwin-arm64/0.14.39: + resolution: {integrity: sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -1555,8 +1562,8 @@ packages: dev: true optional: true - /esbuild-freebsd-64/0.14.38: - resolution: {integrity: sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==} + /esbuild-freebsd-64/0.14.39: + resolution: {integrity: sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -1564,8 +1571,8 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64/0.14.38: - resolution: {integrity: sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==} + /esbuild-freebsd-arm64/0.14.39: + resolution: {integrity: sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -1573,8 +1580,8 @@ packages: dev: true optional: true - /esbuild-linux-32/0.14.38: - resolution: {integrity: sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==} + /esbuild-linux-32/0.14.39: + resolution: {integrity: sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -1582,8 +1589,8 @@ packages: dev: true optional: true - /esbuild-linux-64/0.14.38: - resolution: {integrity: sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==} + /esbuild-linux-64/0.14.39: + resolution: {integrity: sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -1591,8 +1598,8 @@ packages: dev: true optional: true - /esbuild-linux-arm/0.14.38: - resolution: {integrity: sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==} + /esbuild-linux-arm/0.14.39: + resolution: {integrity: sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -1600,8 +1607,8 @@ packages: dev: true optional: true - /esbuild-linux-arm64/0.14.38: - resolution: {integrity: sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==} + /esbuild-linux-arm64/0.14.39: + resolution: {integrity: sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -1609,8 +1616,8 @@ packages: dev: true optional: true - /esbuild-linux-mips64le/0.14.38: - resolution: {integrity: sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==} + /esbuild-linux-mips64le/0.14.39: + resolution: {integrity: sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -1618,8 +1625,8 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le/0.14.38: - resolution: {integrity: sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==} + /esbuild-linux-ppc64le/0.14.39: + resolution: {integrity: sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -1627,8 +1634,8 @@ packages: dev: true optional: true - /esbuild-linux-riscv64/0.14.38: - resolution: {integrity: sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==} + /esbuild-linux-riscv64/0.14.39: + resolution: {integrity: sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -1636,8 +1643,8 @@ packages: dev: true optional: true - /esbuild-linux-s390x/0.14.38: - resolution: {integrity: sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==} + /esbuild-linux-s390x/0.14.39: + resolution: {integrity: sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -1645,8 +1652,8 @@ packages: dev: true optional: true - /esbuild-netbsd-64/0.14.38: - resolution: {integrity: sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==} + /esbuild-netbsd-64/0.14.39: + resolution: {integrity: sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -1654,8 +1661,8 @@ packages: dev: true optional: true - /esbuild-openbsd-64/0.14.38: - resolution: {integrity: sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==} + /esbuild-openbsd-64/0.14.39: + resolution: {integrity: sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -1663,8 +1670,8 @@ packages: dev: true optional: true - /esbuild-sunos-64/0.14.38: - resolution: {integrity: sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==} + /esbuild-sunos-64/0.14.39: + resolution: {integrity: sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -1672,8 +1679,8 @@ packages: dev: true optional: true - /esbuild-windows-32/0.14.38: - resolution: {integrity: sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==} + /esbuild-windows-32/0.14.39: + resolution: {integrity: sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -1681,8 +1688,8 @@ packages: dev: true optional: true - /esbuild-windows-64/0.14.38: - resolution: {integrity: sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==} + /esbuild-windows-64/0.14.39: + resolution: {integrity: sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -1690,8 +1697,8 @@ packages: dev: true optional: true - /esbuild-windows-arm64/0.14.38: - resolution: {integrity: sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==} + /esbuild-windows-arm64/0.14.39: + resolution: {integrity: sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -1699,32 +1706,32 @@ packages: dev: true optional: true - /esbuild/0.14.38: - resolution: {integrity: sha512-12fzJ0fsm7gVZX1YQ1InkOE5f9Tl7cgf6JPYXRJtPIoE0zkWAbHdPHVPPaLi9tYAcEBqheGzqLn/3RdTOyBfcA==} + /esbuild/0.14.39: + resolution: {integrity: sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.38 - esbuild-android-arm64: 0.14.38 - esbuild-darwin-64: 0.14.38 - esbuild-darwin-arm64: 0.14.38 - esbuild-freebsd-64: 0.14.38 - esbuild-freebsd-arm64: 0.14.38 - esbuild-linux-32: 0.14.38 - esbuild-linux-64: 0.14.38 - esbuild-linux-arm: 0.14.38 - esbuild-linux-arm64: 0.14.38 - esbuild-linux-mips64le: 0.14.38 - esbuild-linux-ppc64le: 0.14.38 - esbuild-linux-riscv64: 0.14.38 - esbuild-linux-s390x: 0.14.38 - esbuild-netbsd-64: 0.14.38 - esbuild-openbsd-64: 0.14.38 - esbuild-sunos-64: 0.14.38 - esbuild-windows-32: 0.14.38 - esbuild-windows-64: 0.14.38 - esbuild-windows-arm64: 0.14.38 + esbuild-android-64: 0.14.39 + esbuild-android-arm64: 0.14.39 + esbuild-darwin-64: 0.14.39 + esbuild-darwin-arm64: 0.14.39 + esbuild-freebsd-64: 0.14.39 + esbuild-freebsd-arm64: 0.14.39 + esbuild-linux-32: 0.14.39 + esbuild-linux-64: 0.14.39 + esbuild-linux-arm: 0.14.39 + esbuild-linux-arm64: 0.14.39 + esbuild-linux-mips64le: 0.14.39 + esbuild-linux-ppc64le: 0.14.39 + esbuild-linux-riscv64: 0.14.39 + esbuild-linux-s390x: 0.14.39 + esbuild-netbsd-64: 0.14.39 + esbuild-openbsd-64: 0.14.39 + esbuild-sunos-64: 0.14.39 + esbuild-windows-32: 0.14.39 + esbuild-windows-64: 0.14.39 + esbuild-windows-arm64: 0.14.39 dev: true /escalade/3.1.1: @@ -1742,16 +1749,16 @@ packages: engines: {node: '>=10'} dev: true - /eslint-plugin-react-hooks/4.5.0_eslint@8.14.0: + /eslint-plugin-react-hooks/4.5.0_eslint@8.15.0: resolution: {integrity: sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==} engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 dependencies: - eslint: 8.14.0 + eslint: 8.15.0 dev: true - /eslint-plugin-react/7.29.4_eslint@8.14.0: + /eslint-plugin-react/7.29.4_eslint@8.15.0: resolution: {integrity: sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==} engines: {node: '>=4'} peerDependencies: @@ -1760,7 +1767,7 @@ packages: array-includes: 3.1.4 array.prototype.flatmap: 1.2.5 doctrine: 2.1.0 - eslint: 8.14.0 + eslint: 8.15.0 estraverse: 5.3.0 jsx-ast-utils: 3.2.2 minimatch: 3.1.2 @@ -1790,13 +1797,13 @@ packages: estraverse: 5.3.0 dev: true - /eslint-utils/3.0.0_eslint@8.14.0: + /eslint-utils/3.0.0_eslint@8.15.0: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.14.0 + eslint: 8.15.0 eslint-visitor-keys: 2.1.0 dev: true @@ -1810,12 +1817,12 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint/8.14.0: - resolution: {integrity: sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==} + /eslint/8.15.0: + resolution: {integrity: sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint/eslintrc': 1.2.2 + '@eslint/eslintrc': 1.2.3 '@humanwhocodes/config-array': 0.9.5 ajv: 6.12.6 chalk: 4.1.2 @@ -1824,16 +1831,16 @@ packages: doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.1.1 - eslint-utils: 3.0.0_eslint@8.14.0 + eslint-utils: 3.0.0_eslint@8.15.0 eslint-visitor-keys: 3.3.0 - espree: 9.3.1 + espree: 9.3.2 esquery: 1.4.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 file-entry-cache: 6.0.1 functional-red-black-tree: 1.0.1 glob-parent: 6.0.2 - globals: 13.13.0 + globals: 13.15.0 ignore: 5.2.0 import-fresh: 3.3.0 imurmurhash: 0.1.4 @@ -1854,12 +1861,12 @@ packages: - supports-color dev: true - /espree/9.3.1: - resolution: {integrity: sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==} + /espree/9.3.2: + resolution: {integrity: sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.7.0 - acorn-jsx: 5.3.2_acorn@8.7.0 + acorn: 8.7.1 + acorn-jsx: 5.3.2_acorn@8.7.1 eslint-visitor-keys: 3.3.0 dev: true @@ -2141,8 +2148,8 @@ packages: engines: {node: '>=4'} dev: true - /globals/13.13.0: - resolution: {integrity: sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==} + /globals/13.15.0: + resolution: {integrity: sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -2178,7 +2185,7 @@ packages: source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: 3.15.4 + uglify-js: 3.15.5 dev: true /hard-rejection/2.1.0: @@ -2270,8 +2277,8 @@ packages: engines: {node: '>= 4'} dev: true - /immer/9.0.12: - resolution: {integrity: sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==} + /immer/9.0.14: + resolution: {integrity: sha512-ubBeqQutOSLIFCUBN03jGeOS6a3DoYlSYwYJTa+gSKEZKU5redJIqkIdZ3JVv/4RZpfcXdAWH5zCNLWPRv2WDw==} dev: false /import-fresh/3.3.0: @@ -2565,7 +2572,7 @@ packages: dependencies: universalify: 2.0.0 optionalDependencies: - graceful-fs: 4.2.9 + graceful-fs: 4.2.8 dev: true /jsonparse/1.3.1: @@ -2809,7 +2816,7 @@ packages: /ms/2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - /nano-css/5.3.4_react-dom@18.1.0+react@18.1.0: + /nano-css/5.3.4_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-wfcviJB6NOxDIDfr7RFn/GlaN7I/Bhe4d39ZRCJ3xvZX60LVe2qZ+rDqM49nm4YT81gAjzS+ZklhKP/Gnfnubg==} peerDependencies: react: '*' @@ -3323,7 +3330,7 @@ packages: tslib: 2.3.1 dev: false - /react-use/17.3.2_react-dom@18.1.0+react@18.1.0: + /react-use/17.3.2_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-bj7OD0/1wL03KyWmzFXAFe425zziuTf7q8olwCYBfOeFHY1qfO1FAMjROQLsLZYwG4Rx63xAfb7XAbBrJsZmEw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -3335,7 +3342,7 @@ packages: fast-deep-equal: 3.1.3 fast-shallow-equal: 1.0.0 js-cookie: 2.2.1 - nano-css: 5.3.4_react-dom@18.1.0+react@18.1.0 + nano-css: 5.3.4_ef5jwxihqo6n7gxfmzogljlgcm react: 18.1.0 react-dom: 18.1.0_react@18.1.0 react-universal-interface: 0.6.2_react@18.1.0+tslib@2.3.1 @@ -3484,8 +3491,8 @@ packages: glob: 7.2.0 dev: true - /rollup/2.72.0: - resolution: {integrity: sha512-KqtR2YcO35/KKijg4nx4STO3569aqCUeGRkKWnJ6r+AvBBrVY9L4pmf4NHVrQr4mTOq6msbohflxr2kpihhaOA==} + /rollup/2.73.0: + resolution: {integrity: sha512-h/UngC3S4Zt28mB3g0+2YCMegT5yoftnQplwzPqGZcKvlld5e+kT/QRmJiL+qxGyZKOYpgirWGdLyEO1b0dpLQ==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: @@ -4000,8 +4007,8 @@ packages: hasBin: true dev: true - /uglify-js/3.15.4: - resolution: {integrity: sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==} + /uglify-js/3.15.5: + resolution: {integrity: sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==} engines: {node: '>=0.8.0'} hasBin: true requiresBuild: true @@ -4070,7 +4077,7 @@ packages: magic-string: 0.26.1 dev: true - /vite-plugin-windicss/1.8.4_vite@2.9.8: + /vite-plugin-windicss/1.8.4_vite@2.9.9: resolution: {integrity: sha512-LSZAO8BZn3x406GRbYX5t5ONXXJVdqiQtN1qrznLA/Dy5/NzZVhfcrL6N1qEYYO7HsCDT4pLAjTzObvDnM9Y8A==} peerDependencies: vite: ^2.0.1 @@ -4078,14 +4085,14 @@ packages: '@windicss/plugin-utils': 1.8.4 debug: 4.3.4 kolorist: 1.5.1 - vite: 2.9.8 - windicss: 3.5.1 + vite: 2.9.9 + windicss: 3.5.3 transitivePeerDependencies: - supports-color dev: true - /vite/2.9.8: - resolution: {integrity: sha512-zsBGwn5UT3YS0NLSJ7hnR54+vUKfgzMUh/Z9CxF1YKEBVIe213+63jrFLmZphgGI5zXwQCSmqIdbPuE8NJywPw==} + /vite/2.9.9: + resolution: {integrity: sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==} engines: {node: '>=12.2.0'} hasBin: true peerDependencies: @@ -4100,10 +4107,10 @@ packages: stylus: optional: true dependencies: - esbuild: 0.14.38 + esbuild: 0.14.39 postcss: 8.4.13 resolve: 1.22.0 - rollup: 2.72.0 + rollup: 2.73.0 optionalDependencies: fsevents: 2.3.2 dev: true @@ -4137,8 +4144,8 @@ packages: isexe: 2.0.0 dev: true - /windicss/3.5.1: - resolution: {integrity: sha512-E1hYZATcZFci/XhGS0sJAMRxULjnK+glNukE78Ku7xeb3jxgMY55fFOdIrav+GjQCsgR+IZxPq9/DwmO6eyc4Q==} + /windicss/3.5.3: + resolution: {integrity: sha512-Zsb38RscfZJa218GUREJyFu6EF1xD5DZ+b0XL1Kac3BGDtYwVmXJMmOahMK4mZSEy3gWO8aqUQMny0nbJFG6yA==} engines: {node: '>= 12'} hasBin: true dev: true diff --git a/src/main.tsx b/src/main.tsx index d722c79..065c1ba 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -17,9 +17,6 @@ function main() { :is(.block-ref,.page-ref,a.tag) { cursor: n-resize } - #main-content-container { - padding-top: 64px; - } `); const root = ReactDOM.createRoot(document.getElementById("app")!); diff --git a/src/utils.ts b/src/utils.ts index a97da8c..161eb5e 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -160,12 +160,40 @@ export function useDebounceFn any>( ); } +interface RouteState { + template: string; + path: string; +} + +function useRouteState(): RouteState { + const [state, setState] = React.useState( + // @ts-expect-error getStateFromStore sames not working properly + top?.logseq.api.get_state_from_store("route-match") + ); + + React.useEffect(() => { + return logseq.App.onRouteChanged(setState); + }, []); + + return state; +} + export function useAdaptMainUIStyle(show: boolean, tabsWidth?: number | null) { + const { template } = useRouteState(); + const shouldShow = + show && ["/all-journals", "/page/:name", "/file/:path"].includes(template); const docRef = React.useRef(document.documentElement); const isHovering = useHoverDirty(docRef); React.useEffect(() => { - logseq.showMainUI({ autoFocus: false }); // always on + logseq.provideStyle({ + key: "tabs--top-padding", + style: ` + #main-content-container { + padding-top: ${shouldShow ? "64px" : ""}; + }`, + }); + logseq.showMainUI({ autoFocus: false }); const headerEl = top!.document.querySelector( "#head.cp__header" )! as HTMLElement; @@ -183,7 +211,7 @@ export function useAdaptMainUIStyle(show: boolean, tabsWidth?: number | null) { position: "fixed", left: `${leftOffset}px`, top: `${headerEl.offsetHeight + 2}px`, - height: show ? "28px" : "0px", + height: shouldShow ? "28px" : "0px", width: isHovering ? "100%" : tabsWidth + "px", // 10 is the width of the scrollbar maxWidth: maxWidth + "px", }); @@ -194,7 +222,7 @@ export function useAdaptMainUIStyle(show: boolean, tabsWidth?: number | null) { return () => { ob.disconnect(); }; - }, [show, tabsWidth, isHovering]); + }, [shouldShow, tabsWidth, isHovering]); } export const isMac = () => {