Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
refactor: unify components
Johnny493832aeb44f
diff --git a/web/components.json b/web/components.jsonnew file mode 100644index 000000000..a1de0a8db--- /dev/null+++ b/web/components.json@@ -0,0 +1,21 @@+{+ "$schema": "https://ui.shadcn.com/schema.json",+ "style": "new-york",+ "rsc": false,+ "tsx": true,+ "tailwind": {+ "config": "",+ "css": "src/style.css",+ "baseColor": "zinc",+ "cssVariables": true,+ "prefix": ""+ },+ "aliases": {+ "components": "@/components",+ "utils": "@/lib/utils",+ "ui": "@/components/ui",+ "lib": "@/lib",+ "hooks": "@/hooks"+ },+ "iconLibrary": "lucide"+}\ No newline at end of filediff --git a/web/package.json b/web/package.jsonindex f5fda8ac0..76db97cb8 100644--- a/web/package.json+++ b/web/package.json@@ -15,11 +15,20 @@"@emotion/styled": "^11.14.0","@github/relative-time-element": "^4.4.8","@matejmazur/react-katex": "^3.1.3",- "@mui/joy": "5.0.0-beta.52",+ "@radix-ui/react-checkbox": "^1.3.2",+ "@radix-ui/react-dialog": "^1.1.14",+ "@radix-ui/react-label": "^2.1.7","@radix-ui/react-popover": "^1.1.14",+ "@radix-ui/react-radio-group": "^1.3.7",+ "@radix-ui/react-select": "^2.2.5",+ "@radix-ui/react-separator": "^1.1.7",+ "@radix-ui/react-slot": "^1.2.3",+ "@radix-ui/react-switch": "^1.2.5",+ "@radix-ui/react-tooltip": "^1.2.7","@tailwindcss/vite": "^4.1.8",- "@usememos/mui": "0.1.0-20250607013227",+ "class-variance-authority": "^0.7.1","clsx": "^2.1.1",+ "cmdk": "^1.1.1","copy-to-clipboard": "^3.3.3","dayjs": "^1.11.13","fuse.js": "^7.1.0",@@ -70,6 +79,7 @@"nice-grpc-web": "^3.3.7","prettier": "^3.5.3","terser": "^5.40.0",+ "tw-animate-css": "^1.3.4","typescript": "^5.8.3","typescript-eslint": "^8.33.0","vite": "^6.3.5"diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yamlindex 8305ec2cc..4ea7e2975 100644--- a/web/pnpm-lock.yaml+++ b/web/pnpm-lock.yaml@@ -22,28 +22,55 @@ importers:version: 11.14.0(@types/[email protected])([email protected])'@emotion/styled':specifier: ^11.14.0- version: 11.14.0(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ version: 11.14.1(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])'@github/relative-time-element':specifier: ^4.4.8version: 4.4.8'@matejmazur/react-katex':specifier: ^3.1.3version: 3.1.3([email protected])([email protected])- '@mui/joy':- specifier: 5.0.0-beta.52- version: 5.0.0-beta.52(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-checkbox':+ specifier: ^1.3.2+ version: 1.3.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-dialog':+ specifier: ^1.1.14+ version: 1.1.14(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-label':+ specifier: ^2.1.7+ version: 2.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-popover':specifier: ^1.1.14version: 1.1.14(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-radio-group':+ specifier: ^1.3.7+ version: 1.3.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-select':+ specifier: ^2.2.5+ version: 2.2.5(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-separator':+ specifier: ^1.1.7+ version: 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slot':+ specifier: ^1.2.3+ version: 1.2.3(@types/[email protected])([email protected])+ '@radix-ui/react-switch':+ specifier: ^1.2.5+ version: 1.2.5(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-tooltip':+ specifier: ^1.2.7+ version: 1.2.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@tailwindcss/vite':specifier: ^4.1.8- version: 4.1.8([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))- '@usememos/mui':- specifier: 0.1.0-20250607013227+ version: 4.1.11([email protected](@types/[email protected])([email protected])([email protected])([email protected]))+ class-variance-authority:+ specifier: ^0.7.1+ version: 0.7.1clsx:specifier: ^2.1.1version: 2.1.1+ cmdk:+ specifier: ^1.1.1+ version: 1.1.1(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])copy-to-clipboard:specifier: ^3.3.3version: 3.3.3@@ -73,7 +100,7 @@ importers:version: 0.486.0([email protected])mermaid:specifier: ^11.6.0- version: 11.6.0+ version: 11.7.0mobx:specifier: ^6.13.7version: 6.13.7@@ -94,13 +121,13 @@ importers:react-i18next:specifier: ^15.5.2- version: 15.5.2([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected])+ version: 15.5.3([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected])react-leaflet:specifier: ^4.2.1react-router-dom:specifier: ^7.6.1react-simple-pull-to-refresh:specifier: ^1.3.3@@ -112,7 +139,7 @@ importers:version: 2.6.0tailwindcss:specifier: ^4.1.8- version: 4.1.8+ version: 4.1.11textarea-caret:specifier: ^3.1.0version: 3.1.0@@ -122,13 +149,13 @@ importers:devDependencies:'@bufbuild/protobuf':specifier: ^2.5.1- version: 2.5.1+ version: 2.6.0'@eslint/js':specifier: ^9.28.0- version: 9.28.0+ version: 9.30.0'@trivago/prettier-plugin-sort-imports':specifier: ^5.2.2- version: 5.2.2([email protected])+ version: 5.2.2([email protected])'@types/d3':specifier: ^7.4.3version: 7.4.3@@ -137,13 +164,13 @@ importers:version: 0.16.7'@types/leaflet':specifier: ^1.9.18- version: 1.9.18+ version: 1.9.19'@types/lodash-es':specifier: ^4.17.12version: 4.17.12'@types/node':specifier: ^22.15.29- version: 22.15.29+ version: 22.15.34'@types/qs':specifier: ^6.14.0version: 6.14.0@@ -161,43 +188,46 @@ importers:version: 10.0.0'@vitejs/plugin-react':specifier: ^4.5.0- version: 4.5.0([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))+ version: 4.6.0([email protected](@types/[email protected])([email protected])([email protected])([email protected]))code-inspector-plugin:specifier: ^0.18.3version: 0.18.3eslint:specifier: ^9.28.0- version: 9.28.0([email protected])+ version: 9.30.0([email protected])eslint-config-prettier:specifier: ^10.1.5- version: 10.1.5([email protected]([email protected]))+ version: 10.1.5([email protected]([email protected]))eslint-plugin-prettier:specifier: ^5.4.1- version: 5.4.1([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected])+ version: 5.5.1([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected])eslint-plugin-react:specifier: ^7.37.5- version: 7.37.5([email protected]([email protected]))+ version: 7.37.5([email protected]([email protected]))long:specifier: ^5.3.2version: 5.3.2nice-grpc-web:specifier: ^3.3.7- version: 3.3.7([email protected])+ version: 3.3.7([email protected])prettier:specifier: ^3.5.3- version: 3.5.3+ version: 3.6.2terser:specifier: ^5.40.0- version: 5.40.0+ version: 5.43.1+ tw-animate-css:+ specifier: ^1.3.4+ version: 1.3.4typescript:specifier: ^5.8.3version: 5.8.3typescript-eslint:specifier: ^8.33.0vite:specifier: ^6.3.5- version: 6.3.5(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages:@@ -215,16 +245,16 @@ packages:resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-xgu/ySj2mTiUFmdE9yCMfBxLp4DHd5DwmbbD05YAuICfodYT3VvRxbrh81LGQ/8UpSdtMdfKMn3KouYDX59DGQ==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-BU2f9tlKQ5CAthiMIgpzAh4eDTLWo1mqi9jqE2OxMG0E/OM199VJt2q8BztTxpnSW0i1ymdwLXRJnYzvDM5r2w==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==}engines: {node: '>=6.9.0'}'@babel/[email protected]':@@ -257,12 +287,12 @@ packages:resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-Y+bO6U+I7ZKaM5G5rDUZiYfUvQPUibYmAFe7EnKdnKBbVXDZxvp+MWOH5gYciY0EPk4EScsuFMQBbEfpdRKSCQ==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-BRmLHGwpUqLFR2jzx9orBuX/ABDkj2jLKOXrHDTN2aOKL+jFDDKaRNo9nyYsIl9h/UE/7lMKdDjKQQyxKKDZ7g==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-qnzXzDXdr/po3bOTbTIQZ7+TxNKxpkN5IifVLXS+r7qwynkZfPyjZfE7hCXbo7IoO9TNcSyibgONsf2HauUd3Q==}engines: {node: '>=6.0.0'}hasBin: true@@ -278,27 +308,27 @@ packages:peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-t3yaEOuGu9NlIZ+hIeGbBjFtZT7j2cb2tg0fuaJKeGotchRjjLfrBA9Kwf8quhpP1EUuxModQg04q/mBwyg8uA==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==}engines: {node: '>=6.9.0'}'@babel/[email protected]':resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-X6ZlfR/O/s5EQ/SnUSLzr+6kGnkg8HXGMzpgsMsrJVcfDtH1vIp6ctCN4eZ1LS5c0+te5Cb6Y514fASjMRJ1nw==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==}+ '@babel/[email protected]':+ resolution: {integrity: sha512-8OLQgDScAOHXnAz2cV+RfzzNMipuLVBz2biuAJFMV9bfkNf393je3VM8CLkjQodW5+iWsSJdSgSWT6rsZoXHPw==}engines: {node: '>=6.9.0'}'@braintree/[email protected]':resolution: {integrity: sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==}- '@bufbuild/[email protected]':- resolution: {integrity: sha512-lut4UTvKL8tqtend0UDu7R79/n9jA7Jtxf77RNPbxtmWqfWI4qQ9bTjf7KCS4vfqLmpQbuHr1ciqJumAgJODdw==}+ '@bufbuild/[email protected]':+ resolution: {integrity: sha512-6cuonJVNOIL7lTj5zgo/Rc2bKAo4/GvN+rKCrUj7GdEHRzCk8zKOfFwUsL9nAVk5rSIsRmlgcpLzTRysopEeeg==}'@chevrotain/[email protected]':resolution: {integrity: sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==}@@ -367,8 +397,8 @@ packages:'@emotion/[email protected]':resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}- '@emotion/[email protected]':- resolution: {integrity: sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==}+ '@emotion/[email protected]':+ resolution: {integrity: sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==}peerDependencies:'@emotion/react': ^11.0.0-rc.0'@types/react': '*'@@ -551,48 +581,52 @@ packages:resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}- '@eslint/[email protected]':- resolution: {integrity: sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==}+ '@eslint/[email protected]':+ resolution: {integrity: sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@eslint/[email protected]':- resolution: {integrity: sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==}+ '@eslint/[email protected]':+ resolution: {integrity: sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}'@eslint/[email protected]':resolution: {integrity: sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+ '@eslint/[email protected]':+ resolution: {integrity: sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==}+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+'@eslint/[email protected]':resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@eslint/[email protected]':- resolution: {integrity: sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==}+ '@eslint/[email protected]':+ resolution: {integrity: sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}'@eslint/[email protected]':resolution: {integrity: sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@eslint/[email protected]':- resolution: {integrity: sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==}+ '@eslint/[email protected]':+ resolution: {integrity: sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@floating-ui/[email protected]':- resolution: {integrity: sha512-FRdBLykrPPA6P76GGGqlex/e7fbe0F1ykgxHYNXQsH/iTEtjMj/f9bpY5oQqbjt5VgZvgz/uKXbGuROijh3VLA==}+ '@floating-ui/[email protected]':+ resolution: {integrity: sha512-wNB5ooIKHQc+Kui96jE/n69rHFWAVoxn5CAzL1Xdd8FG03cgY3MLO+GF9U3W737fYDSgPWA6MReKhBQBop6Pcw==}- '@floating-ui/[email protected]':- resolution: {integrity: sha512-lGTor4VlXcesUMh1cupTUTDoCxMb0V6bm3CnxHzQcw8Eaf1jQbgQX4i02fYgT0vJ82tb5MZ4CZk1LRGkktJCzg==}+ '@floating-ui/[email protected]':+ resolution: {integrity: sha512-7cfaOQuCS27HD7DX+6ib2OrnW+b4ZBwDNnCcT0uTyidcmyWb03FnQqJybDBoCnpdxwBSfA94UAYlRCt7mV+TbA==}- '@floating-ui/[email protected]':- resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==}+ '@floating-ui/[email protected]':+ resolution: {integrity: sha512-JbbpPhp38UmXDDAu60RJmbeme37Jbgsm7NrHGgzYYFKmblzRUh6Pa641dII6LsjwF4XlScDrde2UAzDo/b9KPw==}peerDependencies:react: '>=16.8.0'react-dom: '>=16.8.0'- '@floating-ui/[email protected]':- resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==}+ '@floating-ui/[email protected]':+ resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}'@github/[email protected]':resolution: {integrity: sha512-FSLYm6F3TSQnqHE1EMQUVVgi2XjbCvsESwwXfugHFpBnhyF1uhJOtu0Psp/BB/qqazfdkk7f5fVcu7WuXl3t8Q==}@@ -627,26 +661,21 @@ packages:resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}engines: {node: '>=18.0.0'}- '@jridgewell/[email protected]':- resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}- engines: {node: '>=6.0.0'}+ '@jridgewell/[email protected]':+ resolution: {integrity: sha512-HM2F4B9N4cA0RH2KQiIZOHAZqtP4xGS4IZ+SFe1SIbO4dyjf9MTY2Bo3vHYnm0hglWfXqBrzUBSa+cJfl3Xvrg==}'@jridgewell/[email protected]':resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}engines: {node: '>=6.0.0'}- '@jridgewell/[email protected]':- resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}- engines: {node: '>=6.0.0'}-- '@jridgewell/[email protected]':- resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}+ '@jridgewell/[email protected]':+ resolution: {integrity: sha512-3EDAPd0B8X1gsQQgGHU8vyxSp2MB414z3roN67fY7nI0GV3GDthHfaWcbCfrC95tpAzA5xUvAuoO9Dxx/ywwRQ==}- '@jridgewell/[email protected]':- resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}+ '@jridgewell/[email protected]':+ resolution: {integrity: sha512-gKYheCylLIedI+CSZoDtGkFV9YEBxRRVcfCH7OfAqh4TyUyRjEE6WVE/aXDXX0p8BIe/QgLcaAoI0220KRRFgg==}- '@jridgewell/[email protected]':- resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}+ '@jridgewell/[email protected]':+ resolution: {integrity: sha512-VO95AxtSFMelbg3ouljAYnfvTEwSWVt/2YLf+U5Ejd8iT5mXE2Sa/1LGyvySMne2CGsepGLI7KpF3EzE3Aq9Mg==}'@matejmazur/[email protected]':resolution: {integrity: sha512-rBp7mJ9An7ktNoU653BWOYdO4FoR4YNwofHZi+vaytX/nWbIlmHVIF+X8VFOn6c3WYmrLT5FFBjKqCZ1sjR5uQ==}@@ -655,97 +684,8 @@ packages:katex: '>=0.9'react: '>=16'- '@mermaid-js/[email protected]':- resolution: {integrity: sha512-wla8XOWvQAwuqy+gxiZqY+c7FokraOTHRWMsbB4AgRx9Sy7zKslNyejy7E+a77qHfey5GXw/ik3IXv/NHMJgaA==}-- '@mui/[email protected]':- resolution: {integrity: sha512-agKXuNNy0bHUmeU7pNmoZwNFr7Hiyhojkb9+2PVyDG5+6RafYuyMgbrav8CndsB7KUc/U51JAw9vKNDLYBzaUA==}- engines: {node: '>=12.0.0'}- deprecated: This package has been replaced by @base-ui-components/react- peerDependencies:- '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0- react: ^17.0.0 || ^18.0.0 || ^19.0.0- react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0- peerDependenciesMeta:- '@types/react':- optional: true-- '@mui/[email protected]':- resolution: {integrity: sha512-OcZj+cs6EfUD39IoPBOgN61zf1XFVY+imsGoBDwXeSq2UHJZE3N59zzBOVjclck91Ne3e9gudONOeILvHCIhUA==}-- '@mui/[email protected]':- resolution: {integrity: sha512-e8jQanA5M1f/X52mJrw0UIW8Er7EAHuLuigmGFw7yIsAgIluhIP4rZ7JcbVrUi6z5Gk0weC9QWUUtjLejAbO8g==}- engines: {node: '>=12.0.0'}- peerDependencies:- '@emotion/react': ^11.5.0- '@emotion/styled': ^11.3.0- '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0- react: ^17.0.0 || ^18.0.0 || ^19.0.0- react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0- peerDependenciesMeta:- '@emotion/react':- optional: true- '@emotion/styled':- optional: true- '@types/react':- optional: true-- '@mui/[email protected]':- resolution: {integrity: sha512-XMxU0NTYcKqdsG8LRmSoxERPXwMbp16sIXPcLVgLGII/bVNagX0xaheWAwFv8+zDK7tI3ajllkuD3GZZE++ICQ==}- engines: {node: '>=12.0.0'}- peerDependencies:- '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0- react: ^17.0.0 || ^18.0.0 || ^19.0.0- peerDependenciesMeta:- '@types/react':- optional: true-- '@mui/[email protected]':- resolution: {integrity: sha512-UAiMPZABZ7p8mUW4akDV6O7N3+4DatStpXMZwPlt+H/dA0lt67qawN021MNND+4QTpjaiMYxbhKZeQcyWCbuKw==}- engines: {node: '>=12.0.0'}- peerDependencies:- '@emotion/react': ^11.4.1- '@emotion/styled': ^11.3.0- react: ^17.0.0 || ^18.0.0 || ^19.0.0- peerDependenciesMeta:- '@emotion/react':- optional: true- '@emotion/styled':- optional: true-- '@mui/[email protected]':- resolution: {integrity: sha512-aJrmGfQpyF0U4D4xYwA6ueVtQcEMebET43CUmKMP7e7iFh3sMIF3sBR0l8Urb4pqx1CBjHAaWgB0ojpND4Q3Jg==}- engines: {node: '>=12.0.0'}- peerDependencies:- '@emotion/react': ^11.5.0- '@emotion/styled': ^11.3.0- '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0- react: ^17.0.0 || ^18.0.0 || ^19.0.0- peerDependenciesMeta:- '@emotion/react':- optional: true- '@emotion/styled':- optional: true- '@types/react':- optional: true-- '@mui/[email protected]':- resolution: {integrity: sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==}- peerDependencies:- '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0- peerDependenciesMeta:- '@types/react':- optional: true-- '@mui/[email protected]':- resolution: {integrity: sha512-jEZ8FTqInt2WzxDV8bhImWBqeQRD99c/id/fq83H0ER9tFl+sfZlaAoCdznGvbSQQ9ividMxqSV2c7cC1vBcQg==}- engines: {node: '>=12.0.0'}- peerDependencies:- '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0- react: ^17.0.0 || ^18.0.0 || ^19.0.0- peerDependenciesMeta:- '@types/react':- optional: true+ '@mermaid-js/[email protected]':+ resolution: {integrity: sha512-AiaN7+VjXC+3BYE+GwNezkpjIcCI2qIMB/K4S2/vMWe0q/XJCBbx5+K7iteuz7VyltX9iAK4FmVTvGc9kjOV4w==}'@nodelib/[email protected]':resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}@@ -759,12 +699,12 @@ packages:resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}engines: {node: '>= 8'}- '@pkgr/[email protected]':- resolution: {integrity: sha512-+wqKUm/rrCEYmJHMB+p8BHNH35IUgjW7FoTqBITGoOJnw24EApmrxy1A8i5FFsCUoAgnFsaFgJ+HWV8vyp76DQ==}+ '@pkgr/[email protected]':+ resolution: {integrity: sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==}engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}- '@popperjs/[email protected]':- resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}'@radix-ui/[email protected]':resolution: {integrity: sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==}@@ -782,6 +722,32 @@ packages:'@types/react-dom':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-yd+dI56KZqawxKZrJ31eENUwqc1QSqg4OZ15rybGjF2ZNwMO+wCyHzAVLRp9qoYJf7kYy0YpZ2b0JCzJ42HZpA==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true++ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==}peerDependencies:@@ -800,6 +766,28 @@ packages:'@types/react':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-+CpweKjqpzTmwRwcYECQcNYbI8V9VSQt0SNFKeEBLgfucbsLssU6Ppq7wUdNXEGb573bMjFhVjKVll8rmV6zMw==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true++ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==}+ peerDependencies:+ '@types/react': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-IM1zzRV4W3HtVgftdQiiOmA0AdJlCtMLe00FXaHwgt3rAnNsIyDqshvkIW3hj/iu5hu8ERP7KIYki6NkqDxAwQ==}peerDependencies:@@ -844,6 +832,19 @@ packages:'@types/react':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-YT1GqPSL8kJn20djelMX7/cTRp/Y9w5IZHvfxQTVHrOqa2yMl7i/UfMqKRU5V7mEyKTrUVgJXhNQPVCG8PBLoQ==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-ODz16+1iIbGUfFEfKx2HTPKizg2MN39uIOV8MXeHnmdd3i/N9Wt7vU46wbHsqA0xoaQyXVcs0KIlBdOA2Y95bw==}peerDependencies:@@ -909,6 +910,58 @@ packages:'@types/react-dom':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-9w5XhD0KPOrm92OTTE0SysH3sYzHsSTHNvZgUBo/VZ80VdYyB5RneDbc0dKpURS24IxkoFRu/hI0i4XyfFwY6g==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true++ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-dT9aOXUen9JSsxnMPv/0VqySQf5eDQ6LCk5Sw28kamz8wSOW2bJdlX2Bg5VUIIcV+6XlHpWTIuTPCf/UNIyq8Q==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true++ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-HnMTdXEVuuyzx63ME0ut4+sEMYW6oouHWNGUZc7ddvUWIcfCva/AMoqEW/3wnEllriMWBa0RHspCYnfCWJQYmA==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true++ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-0HEb8R9E8A+jZjvmFCy/J4xhbXy3TV+9XSnGJ3KvTtjlIUy/YQ/p6UYZvi7YbeoeXdyU9+Y3scizK6hkY37baA==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}peerDependencies:@@ -918,6 +971,32 @@ packages:'@types/react':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-5ijLkak6ZMylXsaImpZ8u4Rlf5grRmoc0p0QeX9VJtlrM4f5m3nCTX8tWga/zOA8PZYIR/t0p2Mnvd7InrJ6yQ==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true++ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-Ap+fNYwKTYJ9pzqW+Xe2HtMRbQ/EeWkj2qykZ6SuEV4iS/o1bZI5ssJbk4D2r8XuDuOBVz/tIx2JObtuqU+5Zw==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==}peerDependencies:@@ -963,6 +1042,15 @@ packages:'@types/react':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==}+ peerDependencies:+ '@types/react': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==}peerDependencies:@@ -981,6 +1069,19 @@ packages:'@types/react':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}@@ -991,168 +1092,168 @@ packages:react: ^18.0.0react-dom: ^18.0.0- '@rolldown/[email protected]':- resolution: {integrity: sha512-e9MeMtVWo186sgvFFJOPGy7/d2j2mZhLJIdVW0C/xDluuOvymEATqz6zKsP0ZmXGzQtqlyjz5sC1sYQUoJG98w==}+ '@rolldown/[email protected]':+ resolution: {integrity: sha512-3FL3mnMbPu0muGOCaKAhhFEYmqv9eTfPSJRJmANrCwtgK8VuxpsZDGK+m0LYAGoyO8+0j5uRe4PeyPDK1yA/hA==}- '@rollup/[email protected]':- resolution: {integrity: sha512-NELNvyEWZ6R9QMkiytB4/L4zSEaBC03KIXEghptLGLZWJ6VPrL63ooZQCOnlx36aQPGhzuOMwDerC1Eb2VmrLw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-JAcBr1+fgqx20m7Fwe1DxPUl/hPkee6jA6Pl7n1v2EFiktAHenTaXl5aIFjUIEsfn9w3HE4gK1lEgNGMzBDs1w==}cpu: [arm]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-DXdQe1BJ6TK47ukAoZLehRHhfKnKg9BjnQYUu9gzhI8Mwa1d2fzxA1aw2JixHVl403bwp1+/o/NhhHtxWJBgEA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-RurZetXqTu4p+G0ChbnkwBuAtwAbIwJkycw1n6GvlGlBuS4u5qlr5opix8cBAYFJgaY05TWtM+LaoFggUmbZEQ==}cpu: [arm64]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-5afxvwszzdulsU2w8JKWwY8/sJOLPzf0e1bFuvcW5h9zsEg+RQAojdW0ux2zyYAz7R8HvvzKCjLNJhVq965U7w==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-fM/xPesi7g2M7chk37LOnmnSTHLG/v2ggWqKj3CCA1rMA4mm5KVBT1fNoswbo1JhPuNNZrVwpTvlCVggv8A2zg==}cpu: [arm64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-egpJACny8QOdHNNMZKf8xY0Is6gIMz+tuqXlusxquWu3F833DcMwmGM7WlvCO9sB3OsPjdC4U0wHw5FabzCGZg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-gDnWk57urJrkrHQ2WVx9TSVTH7lSlU7E3AFqiko+bgjlh78aJ88/3nycMax52VIVjIm3ObXnDL2H00e/xzoipw==}cpu: [x64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-DBVMZH5vbjgRk3r0OzgjS38z+atlupJ7xfKIDJdZZL6sM6wjfDNo64aowcLPKIx7LMQi8vybB56uh1Ftck/Atg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-wnFQmJ/zPThM5zEGcnDcCJeYJgtSLjh1d//WuHzhf6zT3Md1BvvhJnWoy+HECKu2bMxaIcfWiu3bJgx6z4g2XA==}cpu: [arm64]os: [freebsd]- '@rollup/[email protected]':- resolution: {integrity: sha512-3FkydeohozEskBxNWEIbPfOE0aqQgB6ttTkJ159uWOFn42VLyfAiyD9UK5mhu+ItWzft60DycIN1Xdgiy8o/SA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-uBmIxoJ4493YATvU2c0upGz87f99e3wop7TJgOA/bXMFd2SvKCI7xkxY/5k50bv7J6dw1SXT4MQBQSLn8Bb/Uw==}cpu: [x64]os: [freebsd]- '@rollup/[email protected]':- resolution: {integrity: sha512-wC53ZNDgt0pqx5xCAgNunkTzFE8GTgdZ9EwYGVcg+jEjJdZGtq9xPjDnFgfFozQI/Xm1mh+D9YlYtl+ueswNEg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-n0edDmSHlXFhrlmTK7XBuwKlG5MbS7yleS1cQ9nn4kIeW+dJH+ExqNgQ0RrFRew8Y+0V/x6C5IjsHrJmiHtkxQ==}cpu: [arm]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-jwKCca1gbZkZLhLRtsrka5N8sFAaxrGz/7wRJ8Wwvq3jug7toO21vWlViihG85ei7uJTpzbXZRcORotE+xyrLA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-8WVUPy3FtAsKSpyk21kV52HCxB+me6YkbkFHATzC2Yd3yuqHwy2lbFL4alJOLXKljoRw08Zk8/xEj89cLQ/4Nw==}cpu: [arm]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-g0UBcNknsmmNQ8V2d/zD2P7WWfJKU0F1nu0k5pW4rvdb+BIqMm8ToluW/eeRmxCared5dD76lS04uL4UaNgpNA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-yuktAOaeOgorWDeFJggjuCkMGeITfqvPgkIXhDqsfKX8J3jGyxdDZgBV/2kj/2DyPaLiX6bPdjJDTu9RB8lUPQ==}cpu: [arm64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-XZpeGB5TKEZWzIrj7sXr+BEaSgo/ma/kCgrZgL0oo5qdB1JlTzIYQKel/RmhT6vMAvOdM2teYlAaOGJpJ9lahg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-W+GBM4ifET1Plw8pdVaecwUgxmiH23CfAUj32u8knq0JPFyK4weRy6H7ooxYFD19YxBulL0Ktsflg5XS7+7u9g==}cpu: [arm64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-bkCfDJ4qzWfFRCNt5RVV4DOw6KEgFTUZi2r2RuYhGWC8WhCA8lCAJhDeAmrM/fdiAH54m0mA0Vk2FGRPyzI+tw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-1zqnUEMWp9WrGVuVak6jWTl4fEtrVKfZY7CvcBmUUpxAJ7WcSowPSAWIKa/0o5mBL/Ij50SIf9tuirGx63Ovew==}cpu: [loong64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-3mr3Xm+gvMX+/8EKogIZSIEF0WUu0HL9di+YWlJpO8CQBnoLAEL/roTCxuLncEdgcfJcvA4UMOf+2dnjl4Ut1A==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-Rl3JKaRu0LHIx7ExBAAnf0JcOQetQffaw34T8vLlg9b1IhzcBgaIdnvEbbsZq9uZp3uAH+JkHd20Nwn0h9zPjA==}cpu: [ppc64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-3rwCIh6MQ1LGrvKJitQjZFuQnT2wxfU+ivhNBzmxXTXPllewOF7JR1s2vMX/tWtUYFgphygxjqMl76q4aMotGw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-j5akelU3snyL6K3N/iX7otLBIl347fGwmd95U5gS/7z6T4ftK288jKq3A5lcFKcx7wwzb5rgNvAg3ZbV4BqUSw==}cpu: [riscv64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-LdIUOb3gvfmpkgFZuccNa2uYiqtgZAz3PTzjuM5bH3nvuy9ty6RGc/Q0+HDFrHrizJGVpjnTZ1yS5TNNjFlklw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-ppn5llVGgrZw7yxbIm8TTvtj1EoPgYUAbfw0uDjIOzzoqlZlZrLJ/KuiE7uf5EpTpCTrNt1EdtzF0naMm0wGYg==}cpu: [riscv64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-oIE6M8WC9ma6xYqjvPhzZYk6NbobIURvP/lEbh7FWplcMO6gn7MM2yHKA1eC/GvYwzNKK/1LYgqzdkZ8YFxR8g==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-Hu6hEdix0oxtUma99jSP7xbvjkUM/ycke/AQQ4EC5g7jNRLLIwjcNwaUy95ZKBJJwg1ZowsclNnjYqzN4zwkAw==}cpu: [s390x]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-cWBOvayNvA+SyeQMp79BHPK8ws6sHSsYnK5zDcsC3Hsxr1dgTABKjMnMslPq1DvZIp6uO7kIWhiGwaTdR4Og9A==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-EtnsrmZGomz9WxK1bR5079zee3+7a+AdFlghyd6VbAjgRJDbTANJ9dcPIPAi76uG05micpEL+gPGmAKYTschQw==}cpu: [x64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-y5CbN44M+pUCdGDlZFzGGBSKCA4A/J2ZH4edTYSSxFg7ce1Xt3GtydbVKWLlzL+INfFIZAEg1ZV6hh9+QQf9YQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-iAS4p+J1az6Usn0f8xhgL4PaU878KEtutP4hqw52I4IO6AGoyOkHCxcc4bqufv1tQLdDWFx8lR9YlwxKuv3/3g==}cpu: [x64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-lZkCxIrjlJlMt1dLO/FbpZbzt6J/A8p4DnqzSa4PWqPEUUUnzXLeki/iyPLfV0BmHItlYgHUqJe+3KiyydmiNQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-NtSJVKcXwcqozOl+FwI41OH3OApDyLk3kqTJgx8+gp6On9ZEt5mYhIsKNPGuaZr3p9T6NWPKGU/03Vw4CNU9qg==}cpu: [arm64]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-+psFT9+pIh2iuGsxFYYa/LhS5MFKmuivRsx9iPJWNSGbh2XVEjk90fmpUEjCnILPEPJnikAU6SFDiEUyOv90Pg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-JYA3qvCOLXSsnTR3oiyGws1Dm0YTuxAAeaYGVlGpUsHqloPcFjPg+X0Fj2qODGLNwQOAcCiQmHub/V007kiH5A==}cpu: [ia32]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-Wq2zpapRYLfi4aKxf2Xff0tN+7slj2d4R87WEzqw7ZLsVvO5zwYCIuEGSZYiK41+GlwUo1HiR+GdkLEJnCKTCw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-J8o22LuF0kTe7m+8PvW9wk3/bRq5+mRo5Dqo6+vXb7otCm3TPhYOJqOaQtGU9YMWQSL3krMnoOxMr0+9E6F3Ug==}cpu: [x64]os: [win32]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-OWwBsbC9BFAJelmnNcrKuf+bka2ZxCE2A4Ft53Tkg4uoiE67r/PMEYwCsourC26E+kmxfwE0hVzMdxqeW+xu7Q==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-yzhzuGRmv5QyU9qLNg4GTlYI6STedBWRE7NjxP45CsFYYq9taI0zJXZBMqIC/c8fViNLhmrbpSFS57EoxUmD6Q==}- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-Fbz7qni62uKYceWYvUjRqhGfZKwhZDQhlrJKGtnZfuNtHFqa8wmr+Wn74CTWERiW2hn3mN5gTpOoxWKk0jRxjg==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-3IfFuATVRUMZZprEIx9OGDjG3Ou3jG4xQzNTvjDoKmU9JdmoCohQJ83MYd0GPnQIu89YoJqvMM0G3uqLRFtetg==}engines: {node: '>= 10'}cpu: [arm64]os: [android]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-RdRvedGsT0vwVVDztvyXhKpsU2ark/BjgG0huo4+2BluxdXo8NDgzl77qh0T1nUxmM11eXwR8jA39ibvSTbi7A==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-ESgStEOEsyg8J5YcMb1xl8WFOXfeBmrhAwGsFxxB2CxY9evy63+AtpbDLAyRkJnxLy2WsD1qF13E97uQyP1lfQ==}engines: {node: '>= 10'}cpu: [arm64]os: [darwin]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-t6PgxjEMLp5Ovf7uMb2OFmb3kqzVTPPakWpBIFzppk4JE4ix0yEtbtSjPbU8+PZETpaYMtXvss2Sdkx8Vs4XRw==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-EgnK8kRchgmgzG6jE10UQNaH9Mwi2n+yw1jWmof9Vyg2lpKNX2ioe7CJdf9M5f8V9uaQxInenZkOxnTVL3fhAw==}engines: {node: '>= 10'}cpu: [x64]os: [darwin]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-g8C8eGEyhHTqwPStSwZNSrOlyx0bhK/V/+zX0Y+n7DoRUzyS8eMbVshVOLJTDDC+Qn9IJnilYbIKzpB9n4aBsg==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-xdqKtbpHs7pQhIKmqVpxStnY1skuNh4CtbcyOHeX1YBE0hArj2romsFGb6yUmzkq/6M24nkxDqU8GYrKrz+UcA==}engines: {node: '>= 10'}cpu: [x64]os: [freebsd]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-Jmzr3FA4S2tHhaC6yCjac3rGf7hG9R6Gf2z9i9JFcuyy0u79HfQsh/thifbYTF2ic82KJovKKkIB6Z9TdNhCXQ==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-ryHQK2eyDYYMwB5wZL46uoxz2zzDZsFBwfjssgB7pzytAeCCa6glsiJGjhTEddq/4OsIjsLNMAiMlHNYnkEEeg==}engines: {node: '>= 10'}cpu: [arm]os: [linux]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-qq7jXtO1+UEtCmCeBBIRDrPFIVI4ilEQ97qgBGdwXAARrUqSn/L9fUrkb1XP/mvVtoVeR2bt/0L77xx53bPZ/Q==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-mYwqheq4BXF83j/w75ewkPJmPZIqqP1nhoghS9D57CLjsh3Nfq0m4ftTotRYtGnZd3eCztgbSPJ9QhfC91gDZQ==}engines: {node: '>= 10'}cpu: [arm64]os: [linux]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-O6b8QesPbJCRshsNApsOIpzKt3ztG35gfX9tEf4arD7mwNinsoCKxkj8TgEE0YRjmjtO3r9FlJnT/ENd9EVefQ==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-m/NVRFNGlEHJrNVk3O6I9ggVuNjXHIPoD6bqay/pubtYC9QIdAMpS+cswZQPBLvVvEF6GtSNONbDkZrjWZXYNQ==}engines: {node: '>= 10'}cpu: [arm64]os: [linux]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-32iEXX/pXwikshNOGnERAFwFSfiltmijMIAbUhnNyjFr3tmWmMJWQKU2vNcFX0DACSXJ3ZWcSkzNbaKTdngH6g==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-YW6sblI7xukSD2TdbbaeQVDysIm/UPJtObHJHKxDEcW2exAtY47j52f8jZXkqE1krdnkhCMGqP3dbniu1Te2Fg==}engines: {node: '>= 10'}cpu: [x64]os: [linux]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-s+VSSD+TfZeMEsCaFaHTaY5YNj3Dri8rST09gMvYQKwPphacRG7wbuQ5ZJMIJXN/puxPcg/nU+ucvWguPpvBDg==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-e3C/RRhGunWYNC3aSF7exsQkdXzQ/M+aYuZHKnw4U7KQwTJotnWsGOIVih0s2qQzmEzOFIJ3+xt7iq67K/p56Q==}engines: {node: '>= 10'}cpu: [x64]os: [linux]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-CXBPVFkpDjM67sS1psWohZ6g/2/cd+cq56vPxK4JeawelxwK4YECgl9Y9TjkE2qfF+9/s1tHHJqrC4SS6cVvSg==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-Xo1+/GU0JEN/C/dvcammKHzeM6NqKovG+6921MR6oadee5XPBaKOumrJCXvopJ/Qb5TH7LX/UAywbqrP4lax0g==}engines: {node: '>=14.0.0'}cpu: [wasm32]bundledDependencies:@@ -1163,26 +1264,26 @@ packages:- '@emnapi/wasi-threads'- tslib- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-7GmYk1n28teDHUjPlIx4Z6Z4hHEgvP5ZW2QS9ygnDAdI/myh3HTHjDqtSqgu1BpRoI4OiLx+fThAyA1JePoENA==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-UgKYx5PwEKrac3GPNPf6HVMNhUIGuUh4wlDFR2jYYdkX6pL/rn73zTq/4pzUm8fOjAn5L8zDeHp9iXmUGOXZ+w==}engines: {node: '>= 10'}cpu: [arm64]os: [win32]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-fou+U20j+Jl0EHwK92spoWISON2OBnCazIc038Xj2TdweYV33ZRkS9nwqiUi2d/Wba5xg5UoHfvynnb/UB49cQ==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-YfHoggn1j0LK7wR82TOucWc5LDCguHnoS879idHekmmiR7g9HUtMw9MI0NHatS28u/Xlkfi9w5RJWgz2Dl+5Qg==}engines: {node: '>= 10'}cpu: [x64]os: [win32]- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-d7qvv9PsM5N3VNKhwVUhpK6r4h9wtLkJ6lz9ZY9aeZgrUWk1Z8VPyqyDT9MZlem7GTGseRQHkeB1j3tC7W1P+A==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-Q69XzrtAhuyfHo+5/HMgr1lAiPP/G40OMFAnws7xcFEYqcypZmdW8eGXaOUIeOl1dzPJBPENXgbjsOyhg2nkrg==}engines: {node: '>= 10'}- '@tailwindcss/[email protected]':- resolution: {integrity: sha512-CQ+I8yxNV5/6uGaJjiuymgw0kEQiNKRinYbZXPdx1fk5WgiyReG0VaUx/Xq6aVNSUNJFzxm6o8FNKS5aMaim5A==}+ '@tailwindcss/[email protected]':+ resolution: {integrity: sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw==}peerDependencies:- vite: ^5.2.0 || ^6+ vite: ^5.2.0 || ^6 || ^7'@trivago/[email protected]':resolution: {integrity: sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==}@@ -1308,8 +1409,8 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==}- '@types/[email protected]':- resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}'@types/[email protected]':resolution: {integrity: sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==}@@ -1323,23 +1424,23 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==}- '@types/[email protected]':- resolution: {integrity: sha512-ht2vsoPjezor5Pmzi5hdsA7F++v5UGq9OlUduWHmMZiuQGIpJ2WS5+Gg9HaAA79gNh1AIPtCqhzejcIZ3lPzXQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-pB+n2daHcZPF2FDaWa+6B0a0mSDf4dPU35y5iTXsx7x/PzzshiX5atYiS1jlBn43X7XvM8AP+AB26lnSk0J4GA==}'@types/[email protected]':resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}- '@types/[email protected]':- resolution: {integrity: sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-NYqRyg/hIQrYPT9lbOeYc3kIRabJDn/k4qQHIXUpx88CBDww2fD15Sg5kbXlW86zm2XEW4g0QxkTI3/Kfkc7xQ==}- '@types/[email protected]':- resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==}'@types/[email protected]':resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}- '@types/[email protected]':- resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}'@types/[email protected]':resolution: {integrity: sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==}@@ -1361,83 +1462,79 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-CACyQuqSHt7ma3Ns601xykeBK/rDeZa3w6IS6UtMQbixO5DWy+8TilKkviGDH6jtWCo8FGRKEK5cLLkPvEammQ==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:- '@typescript-eslint/parser': ^8.33.0+ '@typescript-eslint/parser': ^8.35.0eslint: ^8.57.0 || ^9.0.0typescript: '>=4.8.4 <5.9.0'- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-JaehZvf6m0yqYp34+RVnihBAChkqeH+tqqhS0GuX1qgPpwLvmTPheKEs6OeCK6hVJgXZHJ2vbjnC9j119auStQ==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:eslint: ^8.57.0 || ^9.0.0typescript: '>=4.8.4 <5.9.0'- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-d1hz0u9l6N+u/gcrk6s6gYdl7/+pp8yHheRTqP6X5hVDKALEaTn8WfGiit7G511yueBEL3OpOEpD+3/MBdoN+A==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+ peerDependencies:+ typescript: '>=4.8.4 <5.9.0'- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-LMi/oqrzpqxyO72ltP+dBSP6V0xiUb4saY7WLtxSfiNEBI8m321LLVFU9/QDJxjDQG9/tjSqKz/E3380TEqSTw==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-sTkETlbqhEoiFmGr1gsdq5HyVbSOF0145SYDJ/EQmXHtKViCaGvnyLqWFFHtEXoS0J1yU8Wyou2UGmgW88fEug==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:typescript: '>=4.8.4 <5.9.0'- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-lScnHNCBqL1QayuSrWeqAL5GmqNdVUQAAMTaCwdYEdWfIrSrOGzyLGRCHXcCixa5NK6i5l0AfSO2oBSjCjf4XQ==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:eslint: ^8.57.0 || ^9.0.0typescript: '>=4.8.4 <5.9.0'- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-DKuXOKpM5IDT1FA2g9x9x1Ug81YuKrzf4mYX8FAVSNu5Wo/LELHWQyM1pQaDkI42bX15PWl0vNPt1uGiIFUOpg==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-vegY4FQoB6jL97Tu/lWRsAiUUp8qJTqzAmENH2k59SJhw0Th1oszb9Idq/FyyONLuNqT1OADJPXfyUNOR8SzAQ==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:typescript: '>=4.8.4 <5.9.0'- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-lPFuQaLA9aSNa7D5u2EpRiqdAUhzShwGg/nhpBlc4GR6kcTABttCuyjFs8BcEZ8VWrjCBof/bePhP3Q3fS+Yrw==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:eslint: ^8.57.0 || ^9.0.0typescript: '>=4.8.4 <5.9.0'- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-7RW7CMYoskiz5OOGAWjJFxgb7c5UNjTG292gYhWeOAcFmYCtVCSqjqSBj5zMhxbXo2JOW95YYrUWJfU0zrpaGQ==}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@usememos/[email protected]':- resolution: {integrity: sha512-83psuDXb/q9czm4cJfMYfNv3DY0LbACYSY7hk50Ickq0QpqXqBqUUjL7Py+f2xxG1JWeJv8aV663OjrFn5j48w==}- peerDependencies:- react: '>=18.0.0'- react-dom: '>=18.0.0'-- '@vitejs/[email protected]':- resolution: {integrity: sha512-JuLWaEqypaJmOJPLWwO335Ig6jSgC1FTONCWAxnqcQthLTK/Yc9aH6hr9z/87xciejbQcnP3GnA1FWUSWeXaeg==}+ '@vitejs/[email protected]':+ resolution: {integrity: sha512-5Kgff+m8e2PB+9j51eGHEpn5kUzRKH2Ry0qGoe8ItJg7pqnkPrYPkDQZGgGmTa0EGarHrkjLvOdU3b1fzI8otQ==}engines: {node: ^14.18.0 || >=16.0.0}peerDependencies:- vite: ^4.2.0 || ^5.0.0 || ^6.0.0+ vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0- '@vue/[email protected]':- resolution: {integrity: sha512-AOQS2eaQOaaZQoL1u+2rCJIKDruNXVBZSiUD3chnUrsoX5ZTQMaCvXlWNIfxBJuU15r1o7+mpo5223KVtIhAgQ==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==}- '@vue/[email protected]':- resolution: {integrity: sha512-SSJIhBr/teipXiXjmWOVWLnxjNGo65Oj/8wTEQz0nqwQeP75jWZ0n4sF24Zxoht1cuJoWopwj0J0exYwCJ0dCQ==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==}- '@vue/[email protected]':- resolution: {integrity: sha512-c/0fWy3Jw6Z8L9FmTyYfkpM5zklnqqa9+a6dz3DvONRKW2NEbh46BP0FHuLFSWi2TnQEtp91Z6zOWNrU6QiyPg==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==}'@xobotyi/[email protected]':resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==}@@ -1454,8 +1551,8 @@ packages:peerDependencies:acorn: ^6.0.0 || ^7.0.0 || ^8.0.0- resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==}+ resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}engines: {node: '>=0.4.0'}hasBin: true@@ -1477,8 +1574,8 @@ packages:resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}+ resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}engines: {node: '>= 0.4'}@@ -1522,18 +1619,18 @@ packages:resolution: {integrity: sha512-PA0FW9ZpcHbojUCMu28z9Vg/fNkwTj5YhusSAjHHDfHDGLxJ6YUKrAN2vk1fP2MMOxVw4Oko16FMlRGVBGqLKg==}- resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}+ resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}- resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}+ resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}engines: {node: '>=8'}- resolution: {integrity: sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==}+ resolution: {integrity: sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==}engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}hasBin: true@@ -1556,8 +1653,8 @@ packages:resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}engines: {node: '>=6'}- resolution: {integrity: sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==}+ resolution: {integrity: sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==}resolution: {integrity: sha512-ryQkDX26yJ3CXzb3hxUVNlg1NKE4REc5crLBq661Nxzr8TNd236SaEf2ffYLXyI5tSABSeguHLqcVq4vf9L3Zg==}@@ -1583,10 +1680,19 @@ packages:resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}engines: {node: '>=18'}+ resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}+resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}engines: {node: '>=6'}+ resolution: {integrity: sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==}+ peerDependencies:+ react: ^18 || ^19 || ^19.0.0-rc+ react-dom: ^18 || ^19 || ^19.0.0-rc+resolution: {integrity: sha512-60pT2cPoguMTUYdN1MMpjoPUnuF0ud/u7M2y+Vqit/bniLEit9dySEWAVxLU/Ukc5ILrDeLKEttc6fCMl9RUrA==}@@ -1630,9 +1736,6 @@ packages:resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==}engines: {node: '>=18'}- resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==}-resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}@@ -1878,29 +1981,25 @@ packages:resolution: {integrity: sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==}- resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==}+ resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}engines: {node: '>=12'}resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==}+ resolution: {integrity: sha512-7EH2G59nLsEMj97fpDuvVcYi6lwTcM1xuWw3PssD8xzboAW7zj7iB3COEEEATUfjLHrs5uKBLQT03V/8URx06g==}- resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}+ resolution: {integrity: sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==}engines: {node: '>=10.13.0'}resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}engines: {node: '>=0.12'}- resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}- hasBin: true-resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}@@ -1961,8 +2060,8 @@ packages:peerDependencies:eslint: '>=7.0.0'- resolution: {integrity: sha512-9dF+KuU/Ilkq27A8idRP7N2DH8iUR6qXcjF3FR2wETY21PZdBrIjwCau8oboyGj9b7etWmTGEeM8e7oOed6ZWg==}+ resolution: {integrity: sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==}engines: {node: ^14.18.0 || >=16.0.0}peerDependencies:'@types/eslint': '>=8.0.0'@@ -1981,20 +2080,20 @@ packages:peerDependencies:eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7- resolution: {integrity: sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==}+ resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}+ resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- resolution: {integrity: sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==}+ resolution: {integrity: sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}hasBin: truepeerDependencies:@@ -2003,8 +2102,8 @@ packages:jiti:optional: true- resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}+ resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}@@ -2026,8 +2125,8 @@ packages:resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==}+ resolution: {integrity: sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==}resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}@@ -2054,8 +2153,8 @@ packages:resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}- resolution: {integrity: sha512-4BG7puHpVsIYxZUbiUE3RqGloLaSSwzYie5jvasC4LWuBWzZawynvYouhjbQKw2JuIGYdm0DzIxl8iVidKlUEw==}+ resolution: {integrity: sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==}peerDependencies:picomatch: ^3 || ^4peerDependenciesMeta:@@ -2237,11 +2336,6 @@ packages:resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}engines: {node: '>= 4'}- resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}- engines: {node: '>=0.10.0'}- hasBin: true-resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}engines: {node: '>=6'}@@ -2371,9 +2465,6 @@ packages:resolution: {integrity: sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==}-resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}@@ -2472,11 +2563,6 @@ packages:resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}- resolution: {integrity: sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==}- engines: {node: '>=6'}- hasBin: true-resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}engines: {node: '>= 0.8.0'}@@ -2583,10 +2669,6 @@ packages:resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}- resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}- engines: {node: '>=6'}-resolution: {integrity: sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==}engines: {node: '>= 18'}@@ -2603,18 +2685,13 @@ packages:resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}engines: {node: '>= 8'}- resolution: {integrity: sha512-PE8hGUy1LDlWIHWBP05SFdqUHGmRcCcK4IzpOKPE35eOw+G9zZgcnMpyunJVUEOgb//KBORPjysKndw8bFLuRg==}+ resolution: {integrity: sha512-/1/5R0rt0Z1Ak0CuznAnCF3HtQgayRXUz6SguzOwN4L+DuCobz0UxnQ+ZdTSZ3AugKVVh78tiVmsHpHWV25TCw==}resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}engines: {node: '>=8.6'}- resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}- engines: {node: '>=4'}- hasBin: true-resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}@@ -2671,11 +2748,6 @@ packages:resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}- resolution: {integrity: sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==}- engines: {node: '>= 4.4.x'}- hasBin: true-resolution: {integrity: sha512-7RNWbls5kAL1QVUOXvBsv1uO0wPQK3lHv+cY1gwkTzirnG1Nop4cBJZubpgziNbaVc/bl9QJcyvsf/NQxa3rjQ==}@@ -2740,10 +2812,6 @@ packages:resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}engines: {node: '>=8'}- resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}- engines: {node: '>= 0.10'}-resolution: {integrity: sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==}@@ -2776,15 +2844,11 @@ packages:resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}engines: {node: '>=12'}- resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}- engines: {node: '>=6'}-resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}- resolution: {integrity: sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==}+ resolution: {integrity: sha512-eY0QFb6eSwc9+0d/5D2lFFUq+A3n3QNGSy/X2Nvp+6MfzGw2u6EbA7S80actgjY1lkvvI0pqB+a4hioMh443Ew==}resolution: {integrity: sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==}@@ -2800,12 +2864,12 @@ packages:resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==}+ resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}engines: {node: ^10 || ^12 || >=14}- resolution: {integrity: sha512-1nMfdFjucm5hKvq0IClqZwK4FJkGXhRrQstOQ3P4vp8HxKrJEMFcY6RdBRVTdfQS/UlnX6gfbPuTvaqx/bDoeQ==}+ resolution: {integrity: sha512-SSjF9vcnF27mJK1XyFMNJzFd5u3pQiATFqoaDy03XuN00u4ziveVVEGt5RKJrDR8MHE/wJo9Nnad56RLzS2RMA==}resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}@@ -2815,17 +2879,14 @@ packages:resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}engines: {node: '>=6.0.0'}- resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==}+ resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}engines: {node: '>=14'}hasBin: trueresolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}- resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}-resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}engines: {node: '>=6'}@@ -2854,8 +2915,8 @@ packages:react: '>=16'react-dom: '>=16'- resolution: {integrity: sha512-ePODyXgmZQAOYTbZXQn5rRsSBu3Gszo69jxW6aKmlSgxKAI1fOhDwSu6bT4EKHciWPKQ7v7lPrjeiadR6Gi+1A==}+ resolution: {integrity: sha512-ypYmOKOnjqPEJZO4m1BI0kS8kWqkBNsKYyhVUfij0gvjy9xJNoG/VcGkxq5dRlVwzmrmY1BQMAmpbbUBLwC4Kw==}peerDependencies:i18next: '>= 23.2.3'react: '>= 16.8.0'@@ -2873,9 +2934,6 @@ packages:resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}- resolution: {integrity: sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg==}-resolution: {integrity: sha512-kifAF4ZPD77qZKc4CKLmozq6GY1sBzPEJTIJb0wWFK6HsePJatK3jXplZn2eeAt3x67CDozgi7/rO8fNQ/AL7A==}engines: {node: '>=12'}@@ -2913,15 +2971,15 @@ packages:'@types/react':optional: true- resolution: {integrity: sha512-vxU7ei//UfPYQ3iZvHuO1D/5fX3/JOqhNTbRR+WjSBWxf9bIvpWK+ftjmdfJHzPOuMQKe2fiEdG+dZX6E8uUpA==}+ resolution: {integrity: sha512-DiWJm9qdUAmiJrVWaeJdu4TKu13+iB/8IEi0EW/XgaHCjW/vWGrwzup0GVvaMteuZjKnh5bEvJP/K0MDnzawHw==}engines: {node: '>=20.0.0'}peerDependencies:react: '>=18'react-dom: '>=18'- resolution: {integrity: sha512-hPJXXxHJZEsPFNVbtATH7+MMX43UDeOauz+EAU4cgqTn7ojdI9qQORqS8Z0qmDlL1TclO/6jLRYUEtbWidtdHQ==}+ resolution: {integrity: sha512-zf45LZp5skDC6I3jDLXQUu0u26jtuP4lEGbc7BbdyxenBN1vJSTA18czM2D+h5qyMBuMrD+9uB+mU37HIoKGRA==}engines: {node: '>=20.0.0'}peerDependencies:react: '>=18'@@ -2993,8 +3051,8 @@ packages:resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==}- resolution: {integrity: sha512-cPmwD3FnFv8rKMBc1MxWCwVQFxwf1JEmSX3iQXrRVVG15zerAIXRjMFVWnd5Q5QvgKF7Aj+5ykXFhUl+QGnyOw==}+ resolution: {integrity: sha512-x8H8aPvD+xbl0Do8oez5f5o8eMS3trfCghc4HhLAnCkj7Vl0d1JWGs0UF/D886zLW2rOj2QymV/JcSSsw+XDNg==}engines: {node: '>=18.0.0', npm: '>=8.0.0'}hasBin: true@@ -3025,9 +3083,6 @@ packages:resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}- resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==}-resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}@@ -3035,10 +3090,6 @@ packages:resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}- hasBin: true-resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}hasBin: true@@ -3170,8 +3221,8 @@ packages:resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}- resolution: {integrity: sha512-kjeW8gjdxasbmFKpVGrGd5T4i40mV5J2Rasw48QARfYeQ8YS9x02ON9SFWax3Qf616rt4Cp3nVNIj6Hd1mP3og==}+ resolution: {integrity: sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==}resolution: {integrity: sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==}@@ -3181,8 +3232,8 @@ packages:resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}engines: {node: '>=18'}- resolution: {integrity: sha512-cfeKl/jjwSR5ar7d0FGmave9hFGJT8obyo0z+CrQOylLDbk7X81nPU6vq9VORa5jU30SkDnT2FXjLbR8HLP+xA==}+ resolution: {integrity: sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==}engines: {node: '>=10'}hasBin: true@@ -3229,6 +3280,9 @@ packages:resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}+ resolution: {integrity: sha512-dd1Ht6/YQHcNbq0znIT6dG8uhO7Ce+VIIhZUhjsryXsMPJQz3bZg7Q2eNzLwipb25bRZslGb2myio5mScd1TFg==}+resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}engines: {node: '>= 0.8.0'}@@ -3249,8 +3303,8 @@ packages:resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-5YmNhF24ylCsvdNW2oJwMzTbaeO4bg90KeGtMjUw0AGtHksgEPLRTUil+coHwCfiu4QjVJFnjp94DmU6zV7DhQ==}+ resolution: {integrity: sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:eslint: ^8.57.0 || ^9.0.0@@ -3404,8 +3458,8 @@ packages:resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==}+ resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}engines: {node: '>=10.0.0'}peerDependencies:bufferutil: ^4.0.1@@ -3427,11 +3481,6 @@ packages:resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}engines: {node: '>= 6'}- resolution: {integrity: sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==}- engines: {node: '>= 14.6'}- hasBin: true-resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}engines: {node: '>=10'}@@ -3440,8 +3489,8 @@ snapshots:'@ampproject/[email protected]':dependencies:- '@jridgewell/gen-mapping': 0.3.8- '@jridgewell/trace-mapping': 0.3.25+ '@jridgewell/gen-mapping': 0.3.10+ '@jridgewell/trace-mapping': 0.3.27'@antfu/[email protected]':dependencies:@@ -3456,20 +3505,20 @@ snapshots:js-tokens: 4.0.0picocolors: 1.1.1- '@babel/[email protected]': {}+ '@babel/[email protected]': {}- '@babel/[email protected]':+ '@babel/[email protected]':dependencies:'@ampproject/remapping': 2.3.0'@babel/code-frame': 7.27.1- '@babel/generator': 7.27.3+ '@babel/generator': 7.27.5'@babel/helper-compilation-targets': 7.27.2- '@babel/helper-module-transforms': 7.27.3(@babel/[email protected])- '@babel/helpers': 7.27.4- '@babel/parser': 7.27.4+ '@babel/helper-module-transforms': 7.27.3(@babel/[email protected])+ '@babel/helpers': 7.27.6+ '@babel/parser': 7.27.7'@babel/template': 7.27.2- '@babel/traverse': 7.27.4- '@babel/types': 7.27.3+ '@babel/traverse': 7.27.7+ '@babel/types': 7.27.7convert-source-map: 2.0.0debug: 4.4.1gensync: 1.0.0-beta.2@@ -3478,35 +3527,35 @@ snapshots:transitivePeerDependencies:- supports-color- '@babel/[email protected]':+ '@babel/[email protected]':dependencies:- '@babel/parser': 7.27.4- '@babel/types': 7.27.3- '@jridgewell/gen-mapping': 0.3.8- '@jridgewell/trace-mapping': 0.3.25+ '@babel/parser': 7.27.7+ '@babel/types': 7.27.7+ '@jridgewell/gen-mapping': 0.3.10+ '@jridgewell/trace-mapping': 0.3.27jsesc: 3.1.0'@babel/[email protected]':dependencies:- '@babel/compat-data': 7.27.3+ '@babel/compat-data': 7.27.7'@babel/helper-validator-option': 7.27.1- browserslist: 4.25.0+ browserslist: 4.25.1lru-cache: 5.1.1semver: 6.3.1'@babel/[email protected]':dependencies:- '@babel/traverse': 7.27.4- '@babel/types': 7.27.3+ '@babel/traverse': 7.27.7+ '@babel/types': 7.27.7transitivePeerDependencies:- supports-color- '@babel/[email protected](@babel/[email protected])':+ '@babel/[email protected](@babel/[email protected])':dependencies:- '@babel/core': 7.27.4+ '@babel/core': 7.27.7'@babel/helper-module-imports': 7.27.1'@babel/helper-validator-identifier': 7.27.1- '@babel/traverse': 7.27.4+ '@babel/traverse': 7.27.7transitivePeerDependencies:- supports-color@@ -3518,53 +3567,53 @@ snapshots:'@babel/[email protected]': {}- '@babel/[email protected]':+ '@babel/[email protected]':dependencies:'@babel/template': 7.27.2- '@babel/types': 7.27.3+ '@babel/types': 7.27.7- '@babel/[email protected]':+ '@babel/[email protected]':dependencies:- '@babel/types': 7.27.3+ '@babel/types': 7.27.7- '@babel/[email protected](@babel/[email protected])':+ '@babel/[email protected](@babel/[email protected])':dependencies:- '@babel/core': 7.27.4+ '@babel/core': 7.27.7'@babel/helper-plugin-utils': 7.27.1- '@babel/[email protected](@babel/[email protected])':+ '@babel/[email protected](@babel/[email protected])':dependencies:- '@babel/core': 7.27.4+ '@babel/core': 7.27.7'@babel/helper-plugin-utils': 7.27.1- '@babel/[email protected]': {}+ '@babel/[email protected]': {}'@babel/[email protected]':dependencies:'@babel/code-frame': 7.27.1- '@babel/parser': 7.27.4- '@babel/types': 7.27.3+ '@babel/parser': 7.27.7+ '@babel/types': 7.27.7- '@babel/[email protected]':+ '@babel/[email protected]':dependencies:'@babel/code-frame': 7.27.1- '@babel/generator': 7.27.3- '@babel/parser': 7.27.4+ '@babel/generator': 7.27.5+ '@babel/parser': 7.27.7'@babel/template': 7.27.2- '@babel/types': 7.27.3+ '@babel/types': 7.27.7debug: 4.4.1globals: 11.12.0transitivePeerDependencies:- supports-color- '@babel/[email protected]':+ '@babel/[email protected]':dependencies:'@babel/helper-string-parser': 7.27.1'@babel/helper-validator-identifier': 7.27.1'@braintree/[email protected]': {}- '@bufbuild/[email protected]': {}+ '@bufbuild/[email protected]': {}'@chevrotain/[email protected]':dependencies:@@ -3611,7 +3660,7 @@ snapshots:'@emotion/[email protected]':dependencies:'@babel/helper-module-imports': 7.27.1- '@babel/runtime': 7.27.4+ '@babel/runtime': 7.27.6'@emotion/hash': 0.9.2'@emotion/memoize': 0.9.0'@emotion/serialize': 1.3.3@@ -3642,7 +3691,7 @@ snapshots:dependencies:- '@babel/runtime': 7.27.4+ '@babel/runtime': 7.27.6'@emotion/babel-plugin': 11.13.5'@emotion/cache': 11.14.0'@emotion/serialize': 1.3.3@@ -3666,9 +3715,9 @@ snapshots:'@emotion/[email protected]': {}- '@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])':+ '@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])':dependencies:- '@babel/runtime': 7.27.4+ '@babel/runtime': 7.27.6'@emotion/babel-plugin': 11.13.5'@emotion/is-prop-valid': 1.3.1'@emotion/react': 11.14.0(@types/[email protected])([email protected])@@ -3766,14 +3815,14 @@ snapshots:'@esbuild/[email protected]':optional: truedependencies:- eslint: 9.28.0([email protected])+ eslint: 9.30.0([email protected])eslint-visitor-keys: 3.4.3'@eslint-community/[email protected]': {}- '@eslint/[email protected]':+ '@eslint/[email protected]':dependencies:'@eslint/object-schema': 2.1.6debug: 4.4.1@@ -3781,17 +3830,21 @@ snapshots:transitivePeerDependencies:- supports-color- '@eslint/[email protected]': {}+ '@eslint/[email protected]': {}'@eslint/[email protected]':dependencies:'@types/json-schema': 7.0.15+ '@eslint/[email protected]':+ dependencies:+ '@types/json-schema': 7.0.15+'@eslint/[email protected]':dependencies:ajv: 6.12.6debug: 4.4.1- espree: 10.3.0+ espree: 10.4.0globals: 14.0.0ignore: 5.3.2import-fresh: 3.3.1@@ -3801,31 +3854,31 @@ snapshots:transitivePeerDependencies:- supports-color- '@eslint/[email protected]': {}+ '@eslint/[email protected]': {}'@eslint/[email protected]': {}- '@eslint/[email protected]':+ '@eslint/[email protected]':dependencies:- '@eslint/core': 0.14.0+ '@eslint/core': 0.15.1levn: 0.4.1- '@floating-ui/[email protected]':+ '@floating-ui/[email protected]':dependencies:- '@floating-ui/utils': 0.2.9+ '@floating-ui/utils': 0.2.10- '@floating-ui/[email protected]':+ '@floating-ui/[email protected]':dependencies:- '@floating-ui/core': 1.7.0- '@floating-ui/utils': 0.2.9+ '@floating-ui/core': 1.7.2+ '@floating-ui/utils': 0.2.10dependencies:- '@floating-ui/dom': 1.7.0+ '@floating-ui/dom': 1.7.2react: 18.3.1react-dom: 18.3.1([email protected])- '@floating-ui/[email protected]': {}+ '@floating-ui/[email protected]': {}'@github/[email protected]': {}@@ -3861,156 +3914,124 @@ snapshots:dependencies:minipass: 7.1.2- '@jridgewell/[email protected]':+ '@jridgewell/[email protected]':dependencies:- '@jridgewell/set-array': 1.2.1- '@jridgewell/sourcemap-codec': 1.5.0- '@jridgewell/trace-mapping': 0.3.25+ '@jridgewell/sourcemap-codec': 1.5.2+ '@jridgewell/trace-mapping': 0.3.27'@jridgewell/[email protected]': {}- '@jridgewell/[email protected]': {}-- '@jridgewell/[email protected]':+ '@jridgewell/[email protected]':dependencies:- '@jridgewell/gen-mapping': 0.3.8- '@jridgewell/trace-mapping': 0.3.25+ '@jridgewell/gen-mapping': 0.3.10+ '@jridgewell/trace-mapping': 0.3.27- '@jridgewell/[email protected]': {}+ '@jridgewell/[email protected]': {}- '@jridgewell/[email protected]':+ '@jridgewell/[email protected]':dependencies:'@jridgewell/resolve-uri': 3.1.2- '@jridgewell/sourcemap-codec': 1.5.0+ '@jridgewell/sourcemap-codec': 1.5.2dependencies:katex: 0.16.22react: 18.3.1- '@mermaid-js/[email protected]':+ '@mermaid-js/[email protected]':dependencies:langium: 3.3.1- '@mui/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@nodelib/[email protected]':dependencies:- '@babel/runtime': 7.27.4- '@mui/types': 7.2.24(@types/[email protected])- '@mui/utils': 5.17.1(@types/[email protected])([email protected])- '@popperjs/core': 2.11.8- clsx: 2.1.1- prop-types: 15.8.1- react: 18.3.1- react-dom: 18.3.1([email protected])- optionalDependencies:- '@types/react': 18.3.23+ '@nodelib/fs.stat': 2.0.5+ run-parallel: 1.2.0- '@mui/[email protected]': {}+ '@nodelib/[email protected]': {}- '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ '@nodelib/[email protected]':dependencies:- '@babel/runtime': 7.27.4- '@mui/base': 5.0.0-beta.40-1(@types/[email protected])([email protected]([email protected]))([email protected])- '@mui/core-downloads-tracker': 5.17.1- '@mui/system': 5.17.1(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])- '@mui/types': 7.2.24(@types/[email protected])- '@mui/utils': 5.17.1(@types/[email protected])([email protected])- clsx: 2.1.1- prop-types: 15.8.1+ '@nodelib/fs.scandir': 2.1.5+ fastq: 1.19.1++ '@pkgr/[email protected]': {}++ '@radix-ui/[email protected]': {}++ '@radix-ui/[email protected]': {}++ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])react: 18.3.1react-dom: 18.3.1([email protected])optionalDependencies:- '@emotion/react': 11.14.0(@types/[email protected])([email protected])- '@emotion/styled': 11.14.0(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])'@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:- '@babel/runtime': 7.27.4- '@mui/utils': 5.17.1(@types/[email protected])([email protected])- prop-types: 15.8.1+ '@radix-ui/primitive': 1.1.2+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-presence': 1.1.4(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ '@radix-ui/react-use-previous': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-size': 1.1.1(@types/[email protected])([email protected])react: 18.3.1+ react-dom: 18.3.1([email protected])optionalDependencies:'@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])- '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])':+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:- '@babel/runtime': 7.27.4- '@emotion/cache': 11.14.0- csstype: 3.1.3- prop-types: 15.8.1+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])react: 18.3.1+ react-dom: 18.3.1([email protected])optionalDependencies:- '@emotion/react': 11.14.0(@types/[email protected])([email protected])- '@emotion/styled': 11.14.0(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])- '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])':dependencies:- '@babel/runtime': 7.27.4- '@mui/private-theming': 5.17.1(@types/[email protected])([email protected])- '@mui/styled-engine': 5.16.14(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])- '@mui/types': 7.2.24(@types/[email protected])- '@mui/utils': 5.17.1(@types/[email protected])([email protected])- clsx: 2.1.1- csstype: 3.1.3- prop-types: 15.8.1react: 18.3.1- optionalDependencies:- '@emotion/react': 11.14.0(@types/[email protected])([email protected])- '@emotion/styled': 11.14.0(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])- '@types/react': 18.3.23-- '@mui/[email protected](@types/[email protected])':optionalDependencies:'@types/react': 18.3.23dependencies:- '@babel/runtime': 7.27.4- '@mui/types': 7.2.24(@types/[email protected])- '@types/prop-types': 15.7.14- clsx: 2.1.1- prop-types: 15.8.1react: 18.3.1- react-is: 19.1.0optionalDependencies:'@types/react': 18.3.23- '@nodelib/[email protected]':- dependencies:- '@nodelib/fs.stat': 2.0.5- run-parallel: 1.2.0-- '@nodelib/[email protected]': {}-- '@nodelib/[email protected]':- dependencies:- '@nodelib/fs.scandir': 2.1.5- fastq: 1.19.1-- '@pkgr/[email protected]': {}-- '@popperjs/[email protected]': {}-- '@radix-ui/[email protected]': {}-- '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:+ '@radix-ui/primitive': 1.1.2+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-dismissable-layer': 1.1.10(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-focus-guards': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-focus-scope': 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-portal': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-presence': 1.1.4(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ aria-hidden: 1.2.6react: 18.3.1react-dom: 18.3.1([email protected])+ react-remove-scroll: 2.7.1(@types/[email protected])([email protected])optionalDependencies:'@types/react': 18.3.23'@types/react-dom': 18.3.7(@types/[email protected])- dependencies:- react: 18.3.1- optionalDependencies:- '@types/react': 18.3.23-dependencies:react: 18.3.1optionalDependencies:@@ -4053,6 +4074,15 @@ snapshots:optionalDependencies:'@types/react': 18.3.23+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])+'@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@radix-ui/primitive': 1.1.2@@ -4078,7 +4108,7 @@ snapshots:'@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@radix-ui/react-arrow': 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])@@ -4123,6 +4153,79 @@ snapshots:'@types/react': 18.3.23'@types/react-dom': 18.3.7(@types/[email protected])+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/primitive': 1.1.2+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-presence': 1.1.4(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-roving-focus': 1.1.10(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ '@radix-ui/react-use-previous': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-size': 1.1.1(@types/[email protected])([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])++ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/primitive': 1.1.2+ '@radix-ui/react-collection': 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])++ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/number': 1.1.1+ '@radix-ui/primitive': 1.1.2+ '@radix-ui/react-collection': 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-dismissable-layer': 1.1.10(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-focus-guards': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-focus-scope': 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-popper': 1.2.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-portal': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])+ '@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ '@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-previous': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-visually-hidden': 1.2.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ aria-hidden: 1.2.6+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ react-remove-scroll: 2.7.1(@types/[email protected])([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])++ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])+dependencies:'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])@@ -4130,6 +4233,41 @@ snapshots:optionalDependencies:'@types/react': 18.3.23+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/primitive': 1.1.2+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ '@radix-ui/react-use-previous': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-size': 1.1.1(@types/[email protected])([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])++ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/primitive': 1.1.2+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-dismissable-layer': 1.1.10(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-popper': 1.2.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-portal': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-presence': 1.1.4(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ '@radix-ui/react-visually-hidden': 1.2.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])+dependencies:react: 18.3.1@@ -4164,6 +4302,12 @@ snapshots:optionalDependencies:'@types/react': 18.3.23+ dependencies:+ react: 18.3.1+ optionalDependencies:+ '@types/react': 18.3.23+dependencies:'@radix-ui/rect': 1.1.1@@ -4178,6 +4322,15 @@ snapshots:optionalDependencies:'@types/react': 18.3.23+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.23+ '@types/react-dom': 18.3.7(@types/[email protected])+'@radix-ui/[email protected]': {}'@react-leaflet/[email protected]([email protected])([email protected]([email protected]))([email protected])':@@ -4186,148 +4339,148 @@ snapshots:react: 18.3.1react-dom: 18.3.1([email protected])- '@rolldown/[email protected]': {}+ '@rolldown/[email protected]': {}- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':dependencies:'@ampproject/remapping': 2.3.0- enhanced-resolve: 5.18.1+ enhanced-resolve: 5.18.2jiti: 2.4.2lightningcss: 1.30.1magic-string: 0.30.17source-map-js: 1.2.1- tailwindcss: 4.1.8+ tailwindcss: 4.1.11- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':optional: true- '@tailwindcss/[email protected]':+ '@tailwindcss/[email protected]':dependencies:detect-libc: 2.0.4tar: 7.4.3optionalDependencies:- '@tailwindcss/oxide-android-arm64': 4.1.8- '@tailwindcss/oxide-darwin-arm64': 4.1.8- '@tailwindcss/oxide-darwin-x64': 4.1.8- '@tailwindcss/oxide-freebsd-x64': 4.1.8- '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.8- '@tailwindcss/oxide-linux-arm64-gnu': 4.1.8- '@tailwindcss/oxide-linux-arm64-musl': 4.1.8- '@tailwindcss/oxide-linux-x64-gnu': 4.1.8- '@tailwindcss/oxide-linux-x64-musl': 4.1.8- '@tailwindcss/oxide-wasm32-wasi': 4.1.8- '@tailwindcss/oxide-win32-arm64-msvc': 4.1.8- '@tailwindcss/oxide-win32-x64-msvc': 4.1.8-- '@tailwindcss/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))':- dependencies:- '@tailwindcss/node': 4.1.8- '@tailwindcss/oxide': 4.1.8- tailwindcss: 4.1.8- vite: 6.3.5(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])-- '@trivago/[email protected]([email protected])':- dependencies:- '@babel/generator': 7.27.3- '@babel/parser': 7.27.4- '@babel/traverse': 7.27.4- '@babel/types': 7.27.3+ '@tailwindcss/oxide-android-arm64': 4.1.11+ '@tailwindcss/oxide-darwin-arm64': 4.1.11+ '@tailwindcss/oxide-darwin-x64': 4.1.11+ '@tailwindcss/oxide-freebsd-x64': 4.1.11+ '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.11+ '@tailwindcss/oxide-linux-arm64-gnu': 4.1.11+ '@tailwindcss/oxide-linux-arm64-musl': 4.1.11+ '@tailwindcss/oxide-linux-x64-gnu': 4.1.11+ '@tailwindcss/oxide-linux-x64-musl': 4.1.11+ '@tailwindcss/oxide-wasm32-wasi': 4.1.11+ '@tailwindcss/oxide-win32-arm64-msvc': 4.1.11+ '@tailwindcss/oxide-win32-x64-msvc': 4.1.11++ '@tailwindcss/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected]))':+ dependencies:+ '@tailwindcss/node': 4.1.11+ '@tailwindcss/oxide': 4.1.11+ tailwindcss: 4.1.11++ '@trivago/[email protected]([email protected])':+ dependencies:+ '@babel/generator': 7.27.5+ '@babel/parser': 7.27.7+ '@babel/traverse': 7.27.7+ '@babel/types': 7.27.7javascript-natural-sort: 0.7.1lodash: 4.17.21- prettier: 3.5.3+ prettier: 3.6.2transitivePeerDependencies:- supports-color@@ -4335,24 +4488,24 @@ snapshots:'@types/[email protected]':dependencies:- '@babel/parser': 7.27.4- '@babel/types': 7.27.3+ '@babel/parser': 7.27.7+ '@babel/types': 7.27.7'@types/babel__generator': 7.27.0'@types/babel__template': 7.4.4'@types/babel__traverse': 7.20.7'@types/[email protected]':dependencies:- '@babel/types': 7.27.3+ '@babel/types': 7.27.7'@types/[email protected]':dependencies:- '@babel/parser': 7.27.4- '@babel/types': 7.27.3+ '@babel/parser': 7.27.7+ '@babel/types': 7.27.7'@types/[email protected]':dependencies:- '@babel/types': 7.27.3+ '@babel/types': 7.27.7'@types/[email protected]': {}@@ -4471,7 +4624,7 @@ snapshots:'@types/d3-transition': 3.0.9'@types/d3-zoom': 3.0.8- '@types/[email protected]': {}+ '@types/[email protected]': {}'@types/[email protected]': {}@@ -4481,23 +4634,23 @@ snapshots:'@types/[email protected]': {}- '@types/[email protected]':+ '@types/[email protected]':dependencies:'@types/geojson': 7946.0.16'@types/[email protected]':dependencies:- '@types/lodash': 4.17.17+ '@types/lodash': 4.17.19- '@types/[email protected]': {}+ '@types/[email protected]': {}- '@types/[email protected]':+ '@types/[email protected]':dependencies:undici-types: 6.21.0'@types/[email protected]': {}- '@types/[email protected]': {}+ '@types/[email protected]': {}'@types/[email protected]': {}@@ -4507,7 +4660,7 @@ snapshots:'@types/[email protected]':dependencies:- '@types/prop-types': 15.7.14+ '@types/prop-types': 15.7.15csstype: 3.1.3'@types/[email protected]': {}@@ -4517,15 +4670,15 @@ snapshots:'@types/[email protected]': {}- '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])':+ '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])':dependencies:'@eslint-community/regexpp': 4.12.1- '@typescript-eslint/scope-manager': 8.33.0- '@typescript-eslint/visitor-keys': 8.33.0- eslint: 9.28.0([email protected])+ '@typescript-eslint/scope-manager': 8.35.0+ '@typescript-eslint/visitor-keys': 8.35.0+ eslint: 9.30.0([email protected])graphemer: 1.4.0ignore: 7.0.5natural-compare: 1.4.0@@ -4534,55 +4687,55 @@ snapshots:transitivePeerDependencies:- supports-colordependencies:- '@typescript-eslint/scope-manager': 8.33.0- '@typescript-eslint/types': 8.33.0- '@typescript-eslint/typescript-estree': 8.33.0([email protected])- '@typescript-eslint/visitor-keys': 8.33.0+ '@typescript-eslint/scope-manager': 8.35.0+ '@typescript-eslint/types': 8.35.0+ '@typescript-eslint/typescript-estree': 8.35.0([email protected])+ '@typescript-eslint/visitor-keys': 8.35.0debug: 4.4.1- eslint: 9.28.0([email protected])+ eslint: 9.30.0([email protected])typescript: 5.8.3transitivePeerDependencies:- supports-color- '@typescript-eslint/[email protected]([email protected])':+ '@typescript-eslint/[email protected]([email protected])':dependencies:- '@typescript-eslint/tsconfig-utils': 8.33.0([email protected])- '@typescript-eslint/types': 8.33.0+ '@typescript-eslint/tsconfig-utils': 8.35.0([email protected])+ '@typescript-eslint/types': 8.35.0debug: 4.4.1+ typescript: 5.8.3transitivePeerDependencies:- supports-color- - typescript- '@typescript-eslint/[email protected]':+ '@typescript-eslint/[email protected]':dependencies:- '@typescript-eslint/types': 8.33.0- '@typescript-eslint/visitor-keys': 8.33.0+ '@typescript-eslint/types': 8.35.0+ '@typescript-eslint/visitor-keys': 8.35.0- '@typescript-eslint/[email protected]([email protected])':+ '@typescript-eslint/[email protected]([email protected])':dependencies:typescript: 5.8.3dependencies:- '@typescript-eslint/typescript-estree': 8.33.0([email protected])+ '@typescript-eslint/typescript-estree': 8.35.0([email protected])debug: 4.4.1- eslint: 9.28.0([email protected])+ eslint: 9.30.0([email protected])ts-api-utils: 2.1.0([email protected])typescript: 5.8.3transitivePeerDependencies:- supports-color- '@typescript-eslint/[email protected]': {}+ '@typescript-eslint/[email protected]': {}- '@typescript-eslint/[email protected]([email protected])':+ '@typescript-eslint/[email protected]([email protected])':dependencies:- '@typescript-eslint/project-service': 8.33.0([email protected])- '@typescript-eslint/tsconfig-utils': 8.33.0([email protected])- '@typescript-eslint/types': 8.33.0- '@typescript-eslint/visitor-keys': 8.33.0+ '@typescript-eslint/project-service': 8.35.0([email protected])+ '@typescript-eslint/tsconfig-utils': 8.35.0([email protected])+ '@typescript-eslint/types': 8.35.0+ '@typescript-eslint/visitor-keys': 8.35.0debug: 4.4.1fast-glob: 3.3.3is-glob: 4.0.3@@ -4593,53 +4746,48 @@ snapshots:transitivePeerDependencies:- supports-colordependencies:- '@eslint-community/eslint-utils': 4.7.0([email protected]([email protected]))- '@typescript-eslint/scope-manager': 8.33.0- '@typescript-eslint/types': 8.33.0- '@typescript-eslint/typescript-estree': 8.33.0([email protected])- eslint: 9.28.0([email protected])+ '@eslint-community/eslint-utils': 4.7.0([email protected]([email protected]))+ '@typescript-eslint/scope-manager': 8.35.0+ '@typescript-eslint/types': 8.35.0+ '@typescript-eslint/typescript-estree': 8.35.0([email protected])+ eslint: 9.30.0([email protected])typescript: 5.8.3transitivePeerDependencies:- supports-color- '@typescript-eslint/[email protected]':- dependencies:- '@typescript-eslint/types': 8.33.0- eslint-visitor-keys: 4.2.0-+ '@typescript-eslint/[email protected]':dependencies:- react: 18.3.1- react-dom: 18.3.1([email protected])+ '@typescript-eslint/types': 8.35.0+ eslint-visitor-keys: 4.2.1- '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))':+ '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected]))':dependencies:- '@babel/core': 7.27.4- '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/[email protected])- '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/[email protected])- '@rolldown/pluginutils': 1.0.0-beta.9+ '@babel/core': 7.27.7+ '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/[email protected])+ '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/[email protected])+ '@rolldown/pluginutils': 1.0.0-beta.19'@types/babel__core': 7.20.5react-refresh: 0.17.0- vite: 6.3.5(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])transitivePeerDependencies:- supports-color- '@vue/[email protected]':+ '@vue/[email protected]':dependencies:- '@babel/parser': 7.27.4- '@vue/shared': 3.5.16+ '@babel/parser': 7.27.7+ '@vue/shared': 3.5.17entities: 4.5.0estree-walker: 2.0.2source-map-js: 1.2.1- '@vue/[email protected]':+ '@vue/[email protected]':dependencies:- '@vue/compiler-core': 3.5.16- '@vue/shared': 3.5.16+ '@vue/compiler-core': 3.5.17+ '@vue/shared': 3.5.17- '@vue/[email protected]': {}+ '@vue/[email protected]': {}'@xobotyi/[email protected]': {}@@ -4647,11 +4795,11 @@ snapshots:dependencies:- acorn: 8.14.1+ acorn: 8.15.0- [email protected]: {}+ [email protected]: {}dependencies:@@ -4675,14 +4823,16 @@ snapshots:call-bound: 1.0.4is-array-buffer: 3.0.5dependencies:call-bind: 1.0.8+ call-bound: 1.0.4define-properties: 1.2.1es-abstract: 1.24.0es-object-atoms: 1.1.1get-intrinsic: 1.3.0is-string: 1.1.1+ math-intrinsics: 1.1.0dependencies:@@ -4735,7 +4885,7 @@ snapshots:dependencies:- '@babel/runtime': 7.27.4+ '@babel/runtime': 7.27.6cosmiconfig: 7.1.0resolve: 1.22.10@@ -4743,12 +4893,12 @@ snapshots:dependencies:balanced-match: 1.0.2concat-map: 0.0.1dependencies:balanced-match: 1.0.2@@ -4756,12 +4906,12 @@ snapshots:dependencies:fill-range: 7.1.1dependencies:- caniuse-lite: 1.0.30001720- electron-to-chromium: 1.5.161+ caniuse-lite: 1.0.30001726+ electron-to-chromium: 1.5.177node-releases: 2.0.19- update-browserslist-db: 1.1.3([email protected])+ update-browserslist-db: 1.1.3([email protected])@@ -4784,7 +4934,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}dependencies:@@ -4816,13 +4966,29 @@ snapshots:+ dependencies:+ clsx: 2.1.1++ [email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected]):+ dependencies:+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-dialog': 1.1.14(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ transitivePeerDependencies:+ - '@types/react'+ - '@types/react-dom'+dependencies:- '@vue/compiler-dom': 3.5.16+ '@vue/compiler-dom': 3.5.17chalk: 4.1.1- dotenv: 16.5.0+ dotenv: 16.6.1launch-ide: 1.0.1portfinder: 1.0.37transitivePeerDependencies:@@ -4832,7 +4998,7 @@ snapshots:dependencies:chalk: 4.1.1code-inspector-core: 0.18.3- dotenv: 16.5.0+ dotenv: 16.6.1esbuild-code-inspector-plugin: 0.18.3vite-code-inspector-plugin: 0.18.3webpack-code-inspector-plugin: 0.18.3@@ -4863,11 +5029,6 @@ snapshots:- dependencies:- is-what: 3.14.1- optional: true-dependencies:toggle-selection: 1.0.6@@ -5155,7 +5316,7 @@ snapshots:optionalDependencies:'@types/trusted-types': 2.0.7- [email protected]: {}+ [email protected]: {}dependencies:@@ -5163,20 +5324,15 @@ snapshots:es-errors: 1.3.0gopd: 1.2.0- [email protected]: {}+ [email protected]: {}dependencies:graceful-fs: 4.2.11tapable: 2.2.2- dependencies:- prr: 1.0.1- optional: true-dependencies:is-arrayish: 0.2.1@@ -5324,28 +5480,28 @@ snapshots:dependencies:- eslint: 9.28.0([email protected])+ eslint: 9.30.0([email protected])- [email protected]([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected]):+ [email protected]([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected]):dependencies:- eslint: 9.28.0([email protected])- prettier: 3.5.3+ eslint: 9.30.0([email protected])+ prettier: 3.6.2prettier-linter-helpers: 1.0.0synckit: 0.11.8optionalDependencies:- eslint-config-prettier: 10.1.5([email protected]([email protected]))+ eslint-config-prettier: 10.1.5([email protected]([email protected]))dependencies:- array-includes: 3.1.8+ array-includes: 3.1.9array.prototype.findlast: 1.2.5array.prototype.flatmap: 1.3.3array.prototype.tosorted: 1.1.4doctrine: 2.1.0es-iterator-helpers: 1.2.1- eslint: 9.28.0([email protected])+ eslint: 9.30.0([email protected])estraverse: 5.3.0hasown: 2.0.2jsx-ast-utils: 3.3.5@@ -5359,38 +5515,38 @@ snapshots:string.prototype.matchall: 4.0.12string.prototype.repeat: 1.0.0dependencies:esrecurse: 4.3.0estraverse: 5.3.0- [email protected]: {}+ [email protected]: {}dependencies:- '@eslint-community/eslint-utils': 4.7.0([email protected]([email protected]))+ '@eslint-community/eslint-utils': 4.7.0([email protected]([email protected]))'@eslint-community/regexpp': 4.12.1- '@eslint/config-array': 0.20.0- '@eslint/config-helpers': 0.2.2+ '@eslint/config-array': 0.21.0+ '@eslint/config-helpers': 0.3.0'@eslint/core': 0.14.0'@eslint/eslintrc': 3.3.1- '@eslint/js': 9.28.0- '@eslint/plugin-kit': 0.3.1+ '@eslint/js': 9.30.0+ '@eslint/plugin-kit': 0.3.3'@humanfs/node': 0.16.6'@humanwhocodes/module-importer': 1.0.1'@humanwhocodes/retry': 0.4.3- '@types/estree': 1.0.7+ '@types/estree': 1.0.8'@types/json-schema': 7.0.15ajv: 6.12.6chalk: 4.1.2cross-spawn: 7.0.6debug: 4.4.1escape-string-regexp: 4.0.0- eslint-scope: 8.3.0- eslint-visitor-keys: 4.2.0- espree: 10.3.0+ eslint-scope: 8.4.0+ eslint-visitor-keys: 4.2.1+ espree: 10.4.0esquery: 1.6.0esutils: 2.0.3fast-deep-equal: 3.1.3@@ -5410,11 +5566,11 @@ snapshots:transitivePeerDependencies:- supports-colordependencies:- acorn: 8.14.1- acorn-jsx: 5.3.2([email protected])- eslint-visitor-keys: 4.2.0+ acorn: 8.15.0+ acorn-jsx: 5.3.2([email protected])+ eslint-visitor-keys: 4.2.1dependencies:@@ -5430,7 +5586,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}@@ -5456,7 +5612,7 @@ snapshots:dependencies:reusify: 1.1.0optionalDependencies:picomatch: 4.0.2@@ -5486,7 +5642,7 @@ snapshots:dependencies:d3-selection: 3.0.0kapsule: 1.16.3- preact: 10.26.8+ preact: 10.26.9dependencies:@@ -5623,7 +5779,7 @@ snapshots:dependencies:- '@babel/runtime': 7.27.4+ '@babel/runtime': 7.27.6optionalDependencies:typescript: 5.8.3@@ -5635,9 +5791,6 @@ snapshots:- optional: true-dependencies:parent-module: 1.0.1@@ -5770,16 +5923,13 @@ snapshots:call-bound: 1.0.4get-intrinsic: 1.3.0- optional: true-dependencies:- ws: 8.17.0+ ws: 8.18.3dependencies:@@ -5820,7 +5970,7 @@ snapshots:dependencies:- array-includes: 3.1.8+ array-includes: 3.1.9array.prototype.flat: 1.3.3object.assign: 4.1.7object.values: 1.2.1@@ -5852,7 +6002,7 @@ snapshots:dependencies:chalk: 4.1.1- dotenv: 16.5.0+ dotenv: 16.6.1@@ -5860,21 +6010,6 @@ snapshots:- dependencies:- copy-anything: 2.0.6- parse-node-version: 1.0.1- tslib: 2.8.1- optionalDependencies:- errno: 0.1.8- graceful-fs: 4.2.11- image-size: 0.5.5- make-dir: 2.1.0- mime: 1.6.0- needle: 3.3.1- source-map: 0.6.1- optional: true-dependencies:prelude-ls: 1.2.1@@ -5930,7 +6065,7 @@ snapshots:dependencies:mlly: 1.7.4- pkg-types: 2.1.0+ pkg-types: 2.1.1quansync: 0.2.10@@ -5959,13 +6094,7 @@ snapshots:dependencies:- '@jridgewell/sourcemap-codec': 1.5.0-- dependencies:- pify: 4.0.1- semver: 5.7.2- optional: true+ '@jridgewell/sourcemap-codec': 1.5.2@@ -5975,11 +6104,11 @@ snapshots:dependencies:'@braintree/sanitize-url': 7.1.1'@iconify/utils': 2.3.0- '@mermaid-js/parser': 0.4.0+ '@mermaid-js/parser': 0.5.0'@types/d3': 7.4.3cytoscape: 3.32.0cytoscape-cose-bilkent: 4.1.0([email protected])@@ -6005,16 +6134,13 @@ snapshots:braces: 3.0.3picomatch: 2.3.1- optional: true-dependencies:- brace-expansion: 1.1.11+ brace-expansion: 1.1.12dependencies:- brace-expansion: 2.0.1+ brace-expansion: 2.0.2@@ -6026,7 +6152,7 @@ snapshots:dependencies:- acorn: 8.14.1+ acorn: 8.15.0pathe: 2.0.3pkg-types: 1.3.1ufo: 1.6.1@@ -6045,7 +6171,7 @@ snapshots:dependencies:- '@jridgewell/sourcemap-codec': 1.5.0+ '@jridgewell/sourcemap-codec': 1.5.2css-tree: 1.1.3csstype: 3.1.3fastest-stable-stringify: 2.0.2@@ -6060,20 +6186,14 @@ snapshots:- dependencies:- iconv-lite: 0.6.3- sax: 1.4.1- optional: true-dependencies:ts-error: 1.0.6dependencies:abort-controller-x: 0.4.3- isomorphic-ws: 5.0.0([email protected])+ isomorphic-ws: 5.0.0([email protected])js-base64: 3.7.7nice-grpc-common: 2.0.2transitivePeerDependencies:@@ -6153,9 +6273,6 @@ snapshots:json-parse-even-better-errors: 2.3.1lines-and-columns: 1.2.4- optional: true-@@ -6174,19 +6291,16 @@ snapshots:- optional: true-dependencies:confbox: 0.1.8mlly: 1.7.4pathe: 2.0.3dependencies:confbox: 0.2.2- exsolve: 1.0.5+ exsolve: 1.0.7pathe: 2.0.3@@ -6205,13 +6319,13 @@ snapshots:dependencies:nanoid: 3.3.11picocolors: 1.1.1source-map-js: 1.2.1- [email protected]: {}+ [email protected]: {}@@ -6219,7 +6333,7 @@ snapshots:dependencies:fast-diff: 1.3.0- [email protected]: {}+ [email protected]: {}dependencies:@@ -6227,9 +6341,6 @@ snapshots:object-assign: 4.1.1react-is: 16.13.1- optional: true-@@ -6256,9 +6367,9 @@ snapshots:react: 18.3.1react-dom: 18.3.1([email protected])- [email protected]([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected]):+ [email protected]([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected]):dependencies:- '@babel/runtime': 7.27.4+ '@babel/runtime': 7.27.6html-parse-stringify: 3.0.1i18next: 25.2.1([email protected])react: 18.3.1@@ -6268,8 +6379,6 @@ snapshots:- [email protected]: {}-dependencies:jerrypick: 1.1.2@@ -6303,13 +6412,13 @@ snapshots:optionalDependencies:'@types/react': 18.3.23dependencies:react: 18.3.1react-dom: 18.3.1([email protected])dependencies:cookie: 1.0.2react: 18.3.1@@ -6398,30 +6507,30 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8optionalDependencies:- '@rollup/rollup-android-arm-eabi': 4.41.1- '@rollup/rollup-android-arm64': 4.41.1- '@rollup/rollup-darwin-arm64': 4.41.1- '@rollup/rollup-darwin-x64': 4.41.1- '@rollup/rollup-freebsd-arm64': 4.41.1- '@rollup/rollup-freebsd-x64': 4.41.1- '@rollup/rollup-linux-arm-gnueabihf': 4.41.1- '@rollup/rollup-linux-arm-musleabihf': 4.41.1- '@rollup/rollup-linux-arm64-gnu': 4.41.1- '@rollup/rollup-linux-arm64-musl': 4.41.1- '@rollup/rollup-linux-loongarch64-gnu': 4.41.1- '@rollup/rollup-linux-powerpc64le-gnu': 4.41.1- '@rollup/rollup-linux-riscv64-gnu': 4.41.1- '@rollup/rollup-linux-riscv64-musl': 4.41.1- '@rollup/rollup-linux-s390x-gnu': 4.41.1- '@rollup/rollup-linux-x64-gnu': 4.41.1- '@rollup/rollup-linux-x64-musl': 4.41.1- '@rollup/rollup-win32-arm64-msvc': 4.41.1- '@rollup/rollup-win32-ia32-msvc': 4.41.1- '@rollup/rollup-win32-x64-msvc': 4.41.1+ '@rollup/rollup-android-arm-eabi': 4.44.1+ '@rollup/rollup-android-arm64': 4.44.1+ '@rollup/rollup-darwin-arm64': 4.44.1+ '@rollup/rollup-darwin-x64': 4.44.1+ '@rollup/rollup-freebsd-arm64': 4.44.1+ '@rollup/rollup-freebsd-x64': 4.44.1+ '@rollup/rollup-linux-arm-gnueabihf': 4.44.1+ '@rollup/rollup-linux-arm-musleabihf': 4.44.1+ '@rollup/rollup-linux-arm64-gnu': 4.44.1+ '@rollup/rollup-linux-arm64-musl': 4.44.1+ '@rollup/rollup-linux-loongarch64-gnu': 4.44.1+ '@rollup/rollup-linux-powerpc64le-gnu': 4.44.1+ '@rollup/rollup-linux-riscv64-gnu': 4.44.1+ '@rollup/rollup-linux-riscv64-musl': 4.44.1+ '@rollup/rollup-linux-s390x-gnu': 4.44.1+ '@rollup/rollup-linux-x64-gnu': 4.44.1+ '@rollup/rollup-linux-x64-musl': 4.44.1+ '@rollup/rollup-win32-arm64-msvc': 4.44.1+ '@rollup/rollup-win32-ia32-msvc': 4.44.1+ '@rollup/rollup-win32-x64-msvc': 4.44.1fsevents: 2.3.3@@ -6433,7 +6542,7 @@ snapshots:dependencies:- '@babel/runtime': 7.27.4+ '@babel/runtime': 7.27.6dependencies:@@ -6462,18 +6571,12 @@ snapshots:- optional: true-dependencies:loose-envify: 1.4.0- optional: true-@@ -6631,11 +6734,11 @@ snapshots:dependencies:- '@pkgr/core': 0.2.6+ '@pkgr/core': 0.2.7- [email protected]: {}+ [email protected]: {}@@ -6648,10 +6751,10 @@ snapshots:mkdirp: 3.0.1yallist: 5.0.0dependencies:- '@jridgewell/source-map': 0.3.6- acorn: 8.14.1+ '@jridgewell/source-map': 0.3.8+ acorn: 8.15.0commander: 2.20.3source-map-support: 0.5.21@@ -6665,7 +6768,7 @@ snapshots:dependencies:- fdir: 6.4.5([email protected])+ fdir: 6.4.6([email protected])picomatch: 4.0.2@@ -6686,6 +6789,8 @@ snapshots:+ [email protected]: {}+dependencies:prelude-ls: 1.2.1@@ -6723,12 +6828,12 @@ snapshots:possible-typed-array-names: 1.1.0reflect.getprototypeof: 1.0.10dependencies:- '@typescript-eslint/eslint-plugin': 8.33.0(@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])- eslint: 9.28.0([email protected])+ '@typescript-eslint/eslint-plugin': 8.35.0(@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])+ eslint: 9.30.0([email protected])typescript: 5.8.3transitivePeerDependencies:- supports-color@@ -6746,9 +6851,9 @@ snapshots:dependencies:- browserslist: 4.25.0+ browserslist: 4.25.1escalade: 3.2.0picocolors: 1.1.1@@ -6783,22 +6888,20 @@ snapshots:transitivePeerDependencies:- supports-color- [email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):+ [email protected](@types/[email protected])([email protected])([email protected])([email protected]):dependencies:esbuild: 0.25.5- fdir: 6.4.5([email protected])+ fdir: 6.4.6([email protected])picomatch: 4.0.2- postcss: 8.5.4- rollup: 4.41.1+ postcss: 8.5.6+ rollup: 4.44.1tinyglobby: 0.2.14optionalDependencies:- '@types/node': 22.15.29+ '@types/node': 22.15.34fsevents: 2.3.3jiti: 2.4.2- less: 4.2.2lightningcss: 1.30.1- terser: 5.40.0- yaml: 2.8.0+ terser: 5.43.1@@ -6872,7 +6975,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}@@ -6880,7 +6983,4 @@ snapshots:- optional: true-diff --git a/web/src/App.tsx b/web/src/App.tsxindex 7bbb99620..5f3547a13 100644--- a/web/src/App.tsx+++ b/web/src/App.tsx@@ -1,6 +1,5 @@-import { useColorScheme } from "@mui/joy";import { observer } from "mobx-react-lite";-import { useEffect } from "react";+import { useEffect, useState } from "react";import { useTranslation } from "react-i18next";import { Outlet } from "react-router-dom";import { getSystemColorScheme } from "./helpers/utils";@@ -10,7 +9,7 @@ import { userStore, workspaceStore } from "./store/v2";const App = observer(() => {const { i18n } = useTranslation();const navigateTo = useNavigateTo();- const { mode, setMode } = useColorScheme();+ const [mode, setMode] = useState<"light" | "dark">("light");const workspaceProfile = workspaceStore.state.profile;const userSetting = userStore.state.userSetting;const workspaceGeneralSetting = workspaceStore.state.generalSetting;diff --git a/web/src/components/ActivityCalendar/ActivityCalendar.tsx b/web/src/components/ActivityCalendar/ActivityCalendar.tsxindex a347f0a64..b7b6bfb4f 100644--- a/web/src/components/ActivityCalendar/ActivityCalendar.tsx+++ b/web/src/components/ActivityCalendar/ActivityCalendar.tsx@@ -1,10 +1,10 @@-import { Tooltip } from "@mui/joy";import dayjs from "dayjs";import { observer } from "mobx-react-lite";import { memo, useMemo } from "react";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";+import { cn } from "@/lib/utils";import { workspaceStore } from "@/store/v2";import type { ActivityCalendarProps, CalendarDay } from "@/types/statistics";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";const getCellOpacity = (ratio: number): string => {@@ -59,9 +59,16 @@ const CalendarCell = memo(}return (- <Tooltip className="shrink-0" title={tooltipText} placement="top" arrow>- {cellContent}- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <div className="shrink-0">{cellContent}</div>+ </TooltipTrigger>+ <TooltipContent>+ <p>{tooltipText}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>);},);diff --git a/web/src/components/AppearanceSelect.tsx b/web/src/components/AppearanceSelect.tsxindex c3859efa7..31838117d 100644--- a/web/src/components/AppearanceSelect.tsx+++ b/web/src/components/AppearanceSelect.tsx@@ -1,6 +1,6 @@-import { Option, Select } from "@mui/joy";import { SunIcon, MoonIcon, SmileIcon } from "lucide-react";import { FC } from "react";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";import { useTranslate } from "@/utils/i18n";interface Props {@@ -31,21 +31,20 @@ const AppearanceSelect: FC<Props> = (props: Props) => {};return (- <Select- className={`min-w-40! w-auto whitespace-nowrap ${className ?? ""}`}- value={value}- onChange={(_, appearance) => {- if (appearance) {- handleSelectChange(appearance);- }- }}- startDecorator={getPrefixIcon(value)}- >- {appearanceList.map((item) => (- <Option key={item} value={item} className="whitespace-nowrap">- {t(`setting.appearance-option.${item}`)}- </Option>- ))}+ <Select value={value} onValueChange={handleSelectChange}>+ <SelectTrigger className={`min-w-40 w-auto whitespace-nowrap ${className ?? ""}`}>+ <SelectValue placeholder="Select appearance" />+ </SelectTrigger>+ <SelectContent>+ {appearanceList.map((item) => (+ <SelectItem key={item} value={item} className="whitespace-nowrap">+ <div className="flex items-center gap-2">+ {getPrefixIcon(item)}+ {t(`setting.appearance-option.${item}`)}+ </div>+ </SelectItem>+ ))}+ </SelectContent></Select>);};diff --git a/web/src/components/AttachmentIcon.tsx b/web/src/components/AttachmentIcon.tsxindex 02153a3e1..f06c884e0 100644--- a/web/src/components/AttachmentIcon.tsx+++ b/web/src/components/AttachmentIcon.tsx@@ -10,8 +10,8 @@ import {SheetIcon,} from "lucide-react";import React from "react";+import { cn } from "@/lib/utils";import { Attachment } from "@/types/proto/api/v1/attachment_service";-import { cn } from "@/utils";import { getAttachmentType, getAttachmentUrl } from "@/utils/attachment";import showPreviewImageDialog from "./PreviewImageDialog";import SquareDiv from "./kit/SquareDiv";diff --git a/web/src/components/AuthFooter.tsx b/web/src/components/AuthFooter.tsxindex d08495758..db2eba004 100644--- a/web/src/components/AuthFooter.tsx+++ b/web/src/components/AuthFooter.tsx@@ -1,6 +1,6 @@import { observer } from "mobx-react-lite";+import { cn } from "@/lib/utils";import { workspaceStore } from "@/store/v2";-import { cn } from "@/utils";import AppearanceSelect from "./AppearanceSelect";import LocaleSelect from "./LocaleSelect";diff --git a/web/src/components/BrandBanner.tsx b/web/src/components/BrandBanner.tsxindex 97ac17ea5..4825fe300 100644--- a/web/src/components/BrandBanner.tsx+++ b/web/src/components/BrandBanner.tsx@@ -1,6 +1,6 @@import { observer } from "mobx-react-lite";+import { cn } from "@/lib/utils";import { workspaceStore } from "@/store/v2";-import { cn } from "@/utils";import UserAvatar from "./UserAvatar";interface Props {diff --git a/web/src/components/ChangeMemberPasswordDialog.tsx b/web/src/components/ChangeMemberPasswordDialog.tsxindex 1974d2279..f501295e1 100644--- a/web/src/components/ChangeMemberPasswordDialog.tsx+++ b/web/src/components/ChangeMemberPasswordDialog.tsx@@ -1,7 +1,8 @@-import { Button, Input } from "@usememos/mui";import { XIcon } from "lucide-react";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";import { userStore } from "@/store/v2";import { User } from "@/types/proto/api/v1/user_service";import { useTranslate } from "@/utils/i18n";@@ -69,7 +70,7 @@ const ChangeMemberPasswordDialog: React.FC<Props> = (props: Props) => {<p>{t("setting.account-section.change-password")} ({user.displayName})</p>- <Button variant="plain" onClick={handleCloseBtnClick}>+ <Button variant="ghost" onClick={handleCloseBtnClick}><XIcon className="w-5 h-auto" /></Button></div>@@ -91,7 +92,7 @@ const ChangeMemberPasswordDialog: React.FC<Props> = (props: Props) => {onChange={handleNewPasswordAgainChanged}/><div className="flex flex-row justify-end items-center mt-4 w-full gap-x-2">- <Button variant="plain" onClick={handleCloseBtnClick}>+ <Button variant="ghost" onClick={handleCloseBtnClick}>{t("common.cancel")}</Button><Button color="primary" onClick={handleSaveBtnClick}>diff --git a/web/src/components/CreateAccessTokenDialog.tsx b/web/src/components/CreateAccessTokenDialog.tsxindex e93306d61..b249f25bf 100644--- a/web/src/components/CreateAccessTokenDialog.tsx+++ b/web/src/components/CreateAccessTokenDialog.tsx@@ -1,8 +1,10 @@-import { Radio, RadioGroup } from "@mui/joy";-import { Button, Input } from "@usememos/mui";import { XIcon } from "lucide-react";import React, { useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";import { userServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import useLoading from "@/hooks/useLoading";@@ -56,9 +58,9 @@ const CreateAccessTokenDialog: React.FC<Props> = (props: Props) => {});};- const handleRoleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {+ const handleRoleInputChange = (value: string) => {setPartialState({- expiration: Number(e.target.value),+ expiration: Number(value),});};@@ -89,7 +91,7 @@ const CreateAccessTokenDialog: React.FC<Props> = (props: Props) => {<div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg"><div className="flex flex-row justify-between items-center w-full mb-4 gap-2"><p>{t("setting.access-token-section.create-dialog.create-access-token")}</p>- <Button variant="plain" onClick={() => destroy()}>+ <Button variant="ghost" onClick={() => destroy()}><XIcon className="w-5 h-auto" /></Button></div>@@ -113,18 +115,21 @@ const CreateAccessTokenDialog: React.FC<Props> = (props: Props) => {{t("setting.access-token-section.create-dialog.expiration")} <span className="text-red-600">*</span></span><div className="w-full flex flex-row justify-start items-center text-base">- <RadioGroup orientation="horizontal" value={state.expiration} onChange={handleRoleInputChange}>+ <RadioGroup value={state.expiration.toString()} onValueChange={handleRoleInputChange} className="flex flex-row gap-4">{expirationOptions.map((option) => (- <Radio key={option.value} value={option.value} checked={state.expiration === option.value} label={option.label} />+ <div key={option.value} className="flex items-center space-x-2">+ <RadioGroupItem value={option.value.toString()} id={`expiration-${option.value}`} />+ <Label htmlFor={`expiration-${option.value}`}>{option.label}</Label>+ </div>))}</RadioGroup></div></div><div className="w-full flex flex-row justify-end items-center mt-4 space-x-2">- <Button variant="plain" disabled={requestState.isLoading} onClick={destroy}>+ <Button variant="ghost" disabled={requestState.isLoading} onClick={destroy}>{t("common.cancel")}</Button>- <Button color="primary" disabled={requestState.isLoading} onClick={handleSaveBtnClick}>+ <Button disabled={requestState.isLoading} onClick={handleSaveBtnClick}>{t("common.create")}</Button></div>diff --git a/web/src/components/CreateIdentityProviderDialog.tsx b/web/src/components/CreateIdentityProviderDialog.tsxindex 67aed6802..b00fd0ebb 100644--- a/web/src/components/CreateIdentityProviderDialog.tsx+++ b/web/src/components/CreateIdentityProviderDialog.tsx@@ -1,8 +1,10 @@-import { Divider, Option, Select, Typography } from "@mui/joy";-import { Button, Input } from "@usememos/mui";import { XIcon } from "lucide-react";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";+import { Separator } from "@/components/ui/separator";import { identityProviderServiceClient } from "@/grpcweb";import { absolutifyLink } from "@/helpers/utils";import { FieldMapping, IdentityProvider, IdentityProvider_Type, OAuth2Config } from "@/types/proto/api/v1/idp_service";@@ -245,42 +247,48 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {<div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg"><div className="flex flex-row justify-between items-center mb-4 gap-2 w-full"><p>{t(isCreating ? "setting.sso-section.create-sso" : "setting.sso-section.update-sso")}</p>- <Button variant="plain" onClick={handleCloseBtnClick}>+ <Button variant="ghost" onClick={handleCloseBtnClick}><XIcon className="w-5 h-auto" /></Button></div><div className="flex flex-col justify-start items-start w-80">{isCreating && (<>- <Typography className="mb-1!" level="body-md">- {t("common.type")}- </Typography>- <Select className="w-full mb-4" value={type} onChange={(_, e) => setType(e ?? type)}>- {identityProviderTypes.map((kind) => (- <Option key={kind} value={kind}>- {kind}- </Option>- ))}+ <p className="mb-1!">{t("common.type")}</p>+ <Select value={String(type)} onValueChange={(value) => setType(parseInt(value) as unknown as IdentityProvider_Type)}>+ <SelectTrigger className="w-full mb-4">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ {identityProviderTypes.map((kind) => (+ <SelectItem key={kind} value={String(kind)}>+ {IdentityProvider_Type[kind] || kind}+ </SelectItem>+ ))}+ </SelectContent></Select>- <Typography className="mb-2" level="body-md">- {t("setting.sso-section.template")}- </Typography>- <Select className="mb-1 h-auto w-full" value={selectedTemplate} onChange={(_, e) => setSelectedTemplate(e ?? selectedTemplate)}>- {templateList.map((template) => (- <Option key={template.title} value={template.title}>- {template.title}- </Option>- ))}+ <p className="mb-2 text-sm font-medium">{t("setting.sso-section.template")}</p>+ <Select value={selectedTemplate} onValueChange={(value) => setSelectedTemplate(value)}>+ <SelectTrigger className="mb-1 h-auto w-full">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ {templateList.map((template) => (+ <SelectItem key={template.title} value={template.title}>+ {template.title}+ </SelectItem>+ ))}+ </SelectContent></Select>- <Divider className="my-2!" />+ <Separator className="my-2" /></>)}- <Typography className="mb-1!" level="body-md">+ <p className="mb-1 text-sm font-medium">{t("common.name")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("common.name")}value={basicInfo.title}onChange={(e) =>@@ -289,13 +297,10 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {title: e.target.value,})}- fullWidth/>- <Typography className="mb-1!" level="body-md">- {t("setting.sso-section.identifier-filter")}- </Typography>+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.identifier-filter")}</p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.identifier-filter")}value={basicInfo.identifierFilter}onChange={(e) =>@@ -304,9 +309,8 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {identifierFilter: e.target.value,})}- fullWidth/>- <Divider className="my-2!" />+ <Separator className="my-2" />{type === "OAUTH2" && (<>{isCreating && (@@ -314,129 +318,113 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {{t("setting.sso-section.redirect-url")}: {absolutifyLink("/auth/callback")}</p>)}- <Typography className="mb-1!" level="body-md">+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.client-id")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.client-id")}value={oauth2Config.clientId}onChange={(e) => setPartialOAuth2Config({ clientId: e.target.value })}- fullWidth/>- <Typography className="mb-1!" level="body-md">+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.client-secret")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.client-secret")}value={oauth2Config.clientSecret}onChange={(e) => setPartialOAuth2Config({ clientSecret: e.target.value })}- fullWidth/>- <Typography className="mb-1!" level="body-md">+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.authorization-endpoint")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.authorization-endpoint")}value={oauth2Config.authUrl}onChange={(e) => setPartialOAuth2Config({ authUrl: e.target.value })}- fullWidth/>- <Typography className="mb-1!" level="body-md">+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.token-endpoint")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.token-endpoint")}value={oauth2Config.tokenUrl}onChange={(e) => setPartialOAuth2Config({ tokenUrl: e.target.value })}- fullWidth/>- <Typography className="mb-1!" level="body-md">+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.user-endpoint")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.user-endpoint")}value={oauth2Config.userInfoUrl}onChange={(e) => setPartialOAuth2Config({ userInfoUrl: e.target.value })}- fullWidth/>- <Typography className="mb-1!" level="body-md">+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.scopes")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.scopes")}value={oauth2Scopes}onChange={(e) => setOAuth2Scopes(e.target.value)}- fullWidth/>- <Divider className="my-2!" />- <Typography className="mb-1!" level="body-md">+ <Separator className="my-2" />+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.identifier")}<span className="text-red-600">*</span>- </Typography>+ </p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.identifier")}value={oauth2Config.fieldMapping!.identifier}onChange={(e) =>setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, identifier: e.target.value } as FieldMapping })}- fullWidth/>- <Typography className="mb-1!" level="body-md">- {t("setting.sso-section.display-name")}- </Typography>+ <p className="mb-1 text-sm font-medium">{t("setting.sso-section.display-name")}</p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("setting.sso-section.display-name")}value={oauth2Config.fieldMapping!.displayName}onChange={(e) =>setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, displayName: e.target.value } as FieldMapping })}- fullWidth/>- <Typography className="mb-1!" level="body-md">- {t("common.email")}- </Typography>+ <p className="mb-1 text-sm font-medium">{t("common.email")}</p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={t("common.email")}value={oauth2Config.fieldMapping!.email}onChange={(e) =>setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, email: e.target.value } as FieldMapping })}- fullWidth/>- <Typography className="mb-1!" level="body-md">- Avatar URL- </Typography>+ <p className="mb-1 text-sm font-medium">Avatar URL</p><Input- className="mb-2"+ className="mb-2 w-full"placeholder={"Avatar URL"}value={oauth2Config.fieldMapping!.avatarUrl}onChange={(e) =>setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, avatarUrl: e.target.value } as FieldMapping })}- fullWidth/></>)}<div className="mt-2 w-full flex flex-row justify-end items-center space-x-1">- <Button variant="plain" onClick={handleCloseBtnClick}>+ <Button variant="ghost" onClick={handleCloseBtnClick}>{t("common.cancel")}</Button>- <Button color="primary" onClick={handleConfirmBtnClick} disabled={!allowConfirmAction()}>+ <Button onClick={handleConfirmBtnClick} disabled={!allowConfirmAction()}>{t(isCreating ? "common.create" : "common.update")}</Button></div>diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsxindex 066338327..a01a54026 100644--- a/web/src/components/CreateShortcutDialog.tsx+++ b/web/src/components/CreateShortcutDialog.tsx@@ -1,7 +1,9 @@-import { Input, Textarea, Button } from "@usememos/mui";import { XIcon } from "lucide-react";import React, { useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Textarea } from "@/components/ui/textarea";import { shortcutServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import useLoading from "@/hooks/useLoading";@@ -74,7 +76,7 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {<div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg"><div className="flex flex-row justify-between items-center mb-4 gap-2 w-full"><p className="title-text">{`${isCreating ? t("common.create") : t("common.edit")} ${t("common.shortcuts")}`}</p>- <Button variant="plain" onClick={() => destroy()}>+ <Button variant="ghost" onClick={() => destroy()}><XIcon className="w-5 h-auto" /></Button></div>@@ -84,8 +86,8 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {<Input className="w-full" type="text" placeholder="" value={shortcut.title} onChange={onShortcutTitleChange} /><span className="text-sm whitespace-nowrap mt-3 mb-1">{t("common.filter")}</span><Textarea+ className="w-full"rows={3}- fullWidthplaceholder={t("common.shortcut-filter")}value={shortcut.filter}onChange={onShortcutFilterChange}@@ -115,7 +117,7 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {</ul></div><div className="w-full flex flex-row justify-end items-center space-x-2 mt-2">- <Button variant="plain" disabled={requestState.isLoading} onClick={destroy}>+ <Button variant="ghost" disabled={requestState.isLoading} onClick={destroy}>{t("common.cancel")}</Button><Button color="primary" disabled={requestState.isLoading} onClick={handleConfirm}>diff --git a/web/src/components/CreateUserDialog.tsx b/web/src/components/CreateUserDialog.tsxindex 06155c85b..674141a8c 100644--- a/web/src/components/CreateUserDialog.tsx+++ b/web/src/components/CreateUserDialog.tsx@@ -1,8 +1,10 @@-import { Radio, RadioGroup } from "@mui/joy";-import { Button, Input } from "@usememos/mui";import { XIcon } from "lucide-react";import { useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";import { userServiceClient } from "@/grpcweb";import useLoading from "@/hooks/useLoading";import { User, User_Role } from "@/types/proto/api/v1/user_service";@@ -66,7 +68,7 @@ const CreateUserDialog: React.FC<Props> = (props: Props) => {<div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg"><div className="flex flex-row justify-between items-center mb-4 gap-2 w-full"><p className="title-text">{`${isCreating ? t("common.create") : t("common.edit")} ${t("common.user")}`}</p>- <Button variant="plain" onClick={() => destroy()}>+ <Button variant="ghost" onClick={() => destroy()}><XIcon className="w-5 h-auto" /></Button></div>@@ -99,16 +101,22 @@ const CreateUserDialog: React.FC<Props> = (props: Props) => {/><span className="text-sm whitespace-nowrap mt-3 mb-1">{t("common.role")}</span><RadioGroup- orientation="horizontal"- defaultValue={user.role}- onChange={(e) => setPartialUser({ role: e.target.value as User_Role })}+ value={user.role}+ onValueChange={(value) => setPartialUser({ role: value as User_Role })}+ className="flex flex-row gap-4">- <Radio value={User_Role.USER} label={t("setting.member-section.user")} />- <Radio value={User_Role.ADMIN} label={t("setting.member-section.admin")} />+ <div className="flex items-center space-x-2">+ <RadioGroupItem value={User_Role.USER} id="user" />+ <Label htmlFor="user">{t("setting.member-section.user")}</Label>+ </div>+ <div className="flex items-center space-x-2">+ <RadioGroupItem value={User_Role.ADMIN} id="admin" />+ <Label htmlFor="admin">{t("setting.member-section.admin")}</Label>+ </div></RadioGroup></div><div className="w-full flex flex-row justify-end items-center space-x-2 mt-2">- <Button variant="plain" disabled={requestState.isLoading} onClick={destroy}>+ <Button variant="ghost" disabled={requestState.isLoading} onClick={destroy}>{t("common.cancel")}</Button><Button color="primary" disabled={requestState.isLoading} onClick={handleConfirm}>diff --git a/web/src/components/CreateWebhookDialog.tsx b/web/src/components/CreateWebhookDialog.tsxindex aa73f13ee..fdc9b6cff 100644--- a/web/src/components/CreateWebhookDialog.tsx+++ b/web/src/components/CreateWebhookDialog.tsx@@ -1,7 +1,8 @@-import { Button, Input } from "@usememos/mui";import { XIcon } from "lucide-react";import React, { useEffect, useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";import { webhookServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import useLoading from "@/hooks/useLoading";@@ -108,7 +109,7 @@ const CreateWebhookDialog: React.FC<Props> = (props: Props) => {<p className="title-text">{isCreating ? t("setting.webhook-section.create-dialog.create-webhook") : t("setting.webhook-section.create-dialog.edit-webhook")}</p>- <Button variant="plain" onClick={() => destroy()}>+ <Button variant="ghost" onClick={() => destroy()}><XIcon className="w-5 h-auto" /></Button></div>@@ -142,7 +143,7 @@ const CreateWebhookDialog: React.FC<Props> = (props: Props) => {</div></div><div className="w-full flex flex-row justify-end items-center mt-2 space-x-2">- <Button variant="plain" disabled={requestState.isLoading} onClick={destroy}>+ <Button variant="ghost" disabled={requestState.isLoading} onClick={destroy}>{t("common.cancel")}</Button><Button color="primary" disabled={requestState.isLoading} onClick={handleSaveBtnClick}>diff --git a/web/src/components/DateTimeInput.tsx b/web/src/components/DateTimeInput.tsxindex beb0d06f6..6de4e9957 100644--- a/web/src/components/DateTimeInput.tsx+++ b/web/src/components/DateTimeInput.tsx@@ -1,6 +1,6 @@import dayjs from "dayjs";import toast from "react-hot-toast";-import { cn } from "@/utils";+import { cn } from "@/lib/utils";const DATE_TIME_FORMAT = "M/D/YYYY, H:mm:ss";diff --git a/web/src/components/Dialog/BaseDialog.tsx b/web/src/components/Dialog/BaseDialog.tsxindex 76d339dad..fd7ae8b07 100644--- a/web/src/components/Dialog/BaseDialog.tsx+++ b/web/src/components/Dialog/BaseDialog.tsx@@ -1,10 +1,8 @@-import { CssVarsProvider } from "@mui/joy";import { observer } from "mobx-react-lite";import { useEffect, useRef } from "react";import { createRoot } from "react-dom/client";+import { cn } from "@/lib/utils";import dialogStore from "@/store/v2/dialog";-import theme from "@/theme";-import { cn } from "@/utils";interface DialogConfig {dialogName: string;@@ -90,11 +88,9 @@ export function generateDialog<T extends DialogProps>(} as T;const Fragment = observer(() => (- <CssVarsProvider theme={theme}>- <BaseDialog destroy={cbs.destroy} clickSpaceDestroy={true} {...config}>- <DialogComponent {...dialogProps} />- </BaseDialog>- </CssVarsProvider>+ <BaseDialog destroy={cbs.destroy} clickSpaceDestroy={true} {...config}>+ <DialogComponent {...dialogProps} />+ </BaseDialog>));dialog.render(<Fragment />);diff --git a/web/src/components/HomeSidebar/HomeSidebar.tsx b/web/src/components/HomeSidebar/HomeSidebar.tsxindex 1a8cc2ef5..f939f48b2 100644--- a/web/src/components/HomeSidebar/HomeSidebar.tsx+++ b/web/src/components/HomeSidebar/HomeSidebar.tsx@@ -4,9 +4,9 @@ import { matchPath, useLocation } from "react-router-dom";import useDebounce from "react-use/lib/useDebounce";import SearchBar from "@/components/SearchBar";import useCurrentUser from "@/hooks/useCurrentUser";+import { cn } from "@/lib/utils";import { Routes } from "@/router";import { memoStore, userStore } from "@/store/v2";-import { cn } from "@/utils";import MemoFilters from "../MemoFilters";import StatisticsView from "../StatisticsView";import ShortcutsSection from "./ShortcutsSection";diff --git a/web/src/components/HomeSidebar/HomeSidebarDrawer.tsx b/web/src/components/HomeSidebar/HomeSidebarDrawer.tsxindex 8fcf3cd12..8eaf7b108 100644--- a/web/src/components/HomeSidebar/HomeSidebarDrawer.tsx+++ b/web/src/components/HomeSidebar/HomeSidebarDrawer.tsx@@ -1,8 +1,8 @@-import { Drawer } from "@mui/joy";-import { Button } from "@usememos/mui";import { MenuIcon } from "lucide-react";import { useEffect, useState } from "react";import { useLocation } from "react-router-dom";+import { Button } from "@/components/ui/button";+import { Sheet, SheetContent, SheetTrigger } from "@/components/ui/sheet";import HomeSidebar from "./HomeSidebar";const HomeSidebarDrawer = () => {@@ -13,25 +13,17 @@ const HomeSidebarDrawer = () => {setOpen(false);}, [location.pathname]);- const toggleDrawer = (inOpen: boolean) => (event: React.KeyboardEvent | React.MouseEvent) => {- if (event.type === "keydown" && ((event as React.KeyboardEvent).key === "Tab" || (event as React.KeyboardEvent).key === "Shift")) {- return;- }-- setOpen(inOpen);- };-return (- <>- <Button variant="plain" className="bg-transparent! px-2" onClick={toggleDrawer(true)}>- <MenuIcon className="w-6 h-auto dark:text-gray-400" />- </Button>- <Drawer anchor="right" size="sm" open={open} onClose={toggleDrawer(false)}>- <div className="w-full h-full bg-zinc-100 dark:bg-zinc-900">- <HomeSidebar className="px-4 py-4" />- </div>- </Drawer>- </>+ <Sheet open={open} onOpenChange={setOpen}>+ <SheetTrigger asChild>+ <Button variant="ghost" className="bg-transparent! px-2">+ <MenuIcon className="w-6 h-auto dark:text-gray-400" />+ </Button>+ </SheetTrigger>+ <SheetContent side="right" className="w-full sm:w-80 bg-zinc-100 dark:bg-zinc-900">+ <HomeSidebar className="px-4 py-4" />+ </SheetContent>+ </Sheet>);};diff --git a/web/src/components/HomeSidebar/ShortcutsSection.tsx b/web/src/components/HomeSidebar/ShortcutsSection.tsxindex e4e818010..901394e62 100644--- a/web/src/components/HomeSidebar/ShortcutsSection.tsx+++ b/web/src/components/HomeSidebar/ShortcutsSection.tsx@@ -1,15 +1,15 @@-import { Tooltip } from "@mui/joy";import { Edit3Icon, MoreVerticalIcon, TrashIcon, PlusIcon } from "lucide-react";import { observer } from "mobx-react-lite";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { shortcutServiceClient } from "@/grpcweb";import useAsyncEffect from "@/hooks/useAsyncEffect";+import { cn } from "@/lib/utils";import { userStore } from "@/store/v2";import memoFilterStore from "@/store/v2/memoFilter";import { Shortcut } from "@/types/proto/api/v1/shortcut_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import showCreateShortcutDialog from "../CreateShortcutDialog";-import { Popover, PopoverContent, PopoverTrigger } from "../ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";const emojiRegex = /^(\p{Emoji_Presentation}|\p{Emoji}\uFE0F)$/u;@@ -40,9 +40,16 @@ const ShortcutsSection = observer(() => {<div className="w-full flex flex-col justify-start items-start mt-3 px-1 h-auto shrink-0 flex-nowrap hide-scrollbar"><div className="flex flex-row justify-between items-center w-full gap-1 mb-1 text-sm leading-6 text-gray-400 select-none"><span>{t("common.shortcuts")}</span>- <Tooltip title={t("common.create")} placement="top">- <PlusIcon className="w-4 h-auto" onClick={() => showCreateShortcutDialog({})} />- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <PlusIcon className="w-4 h-auto cursor-pointer" onClick={() => showCreateShortcutDialog({})} />+ </TooltipTrigger>+ <TooltipContent>+ <p>{t("common.create")}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider></div><div className="w-full flex flex-row justify-start items-center relative flex-wrap gap-x-2 gap-y-1">{shortcuts.map((shortcut) => {diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsxindex da7df02ca..3d917a288 100644--- a/web/src/components/HomeSidebar/TagsSection.tsx+++ b/web/src/components/HomeSidebar/TagsSection.tsx@@ -1,16 +1,16 @@-import { Switch } from "@usememos/mui";import { Edit3Icon, HashIcon, MoreVerticalIcon, TagsIcon, TrashIcon } from "lucide-react";import { observer } from "mobx-react-lite";import toast from "react-hot-toast";import useLocalStorage from "react-use/lib/useLocalStorage";+import { Switch } from "@/components/ui/switch";import { memoServiceClient } from "@/grpcweb";+import { cn } from "@/lib/utils";import { userStore } from "@/store/v2";import memoFilterStore, { MemoFilter } from "@/store/v2/memoFilter";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import showRenameTagDialog from "../RenameTagDialog";import TagTree from "../TagTree";-import { Popover, PopoverContent, PopoverTrigger } from "../ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";interface Props {readonly?: boolean;@@ -58,7 +58,7 @@ const TagsSection = observer((props: Props) => {<PopoverContent align="end" alignOffset={-12}><div className="w-auto flex flex-row justify-between items-center gap-2 p-1"><span className="text-sm shrink-0 dark:text-zinc-400">{t("common.tree-mode")}</span>- <Switch size="sm" checked={treeMode} onChange={(event) => setTreeMode(event.target.checked)} />+ <Switch checked={treeMode} onCheckedChange={(checked) => setTreeMode(checked)} /></div></PopoverContent></Popover>diff --git a/web/src/components/Inbox/MemoCommentMessage.tsx b/web/src/components/Inbox/MemoCommentMessage.tsxindex 39b670566..930f7129f 100644--- a/web/src/components/Inbox/MemoCommentMessage.tsx+++ b/web/src/components/Inbox/MemoCommentMessage.tsx@@ -1,17 +1,17 @@-import { Tooltip } from "@mui/joy";import { InboxIcon, LoaderIcon, MessageCircleIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { useState } from "react";import toast from "react-hot-toast";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { activityServiceClient } from "@/grpcweb";import useAsyncEffect from "@/hooks/useAsyncEffect";import useNavigateTo from "@/hooks/useNavigateTo";+import { cn } from "@/lib/utils";import { activityNamePrefix } from "@/store/common";import { memoStore, userStore } from "@/store/v2";import { Inbox, Inbox_Status } from "@/types/proto/api/v1/inbox_service";import { Memo } from "@/types/proto/api/v1/memo_service";import { User } from "@/types/proto/api/v1/user_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";interface Props {@@ -79,9 +79,16 @@ const MemoCommentMessage = observer(({ inbox }: Props) => {: "border-gray-500 text-gray-500 bg-gray-50 dark:bg-zinc-800",)}>- <Tooltip title={"Comment"} placement="bottom">- <MessageCircleIcon className="w-4 sm:w-5 h-auto" />- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger>+ <MessageCircleIcon className="w-4 sm:w-5 h-auto" />+ </TooltipTrigger>+ <TooltipContent>+ <p>Comment</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider></div><divclassName={cn(@@ -95,12 +102,19 @@ const MemoCommentMessage = observer(({ inbox }: Props) => {<span className="text-sm text-gray-500">{inbox.createTime?.toLocaleString()}</span><div>{inbox.status === Inbox_Status.UNREAD && (- <Tooltip title={t("common.archive")} placement="top">- <InboxIcon- className="w-4 h-auto cursor-pointer text-gray-400 hover:text-blue-600"- onClick={() => handleArchiveMessage()}- />- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger>+ <InboxIcon+ className="w-4 h-auto cursor-pointer text-gray-400 hover:text-blue-600"+ onClick={() => handleArchiveMessage()}+ />+ </TooltipTrigger>+ <TooltipContent>+ <p>{t("common.archive")}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>)}</div></div>diff --git a/web/src/components/LearnMore.tsx b/web/src/components/LearnMore.tsxindex 3259b1a0f..0dbcc80bb 100644--- a/web/src/components/LearnMore.tsx+++ b/web/src/components/LearnMore.tsx@@ -1,5 +1,5 @@-import { Tooltip } from "@mui/joy";import { ExternalLinkIcon } from "lucide-react";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { useTranslate } from "@/utils/i18n";interface Props {@@ -13,11 +13,18 @@ const LearnMore: React.FC<Props> = (props: Props) => {const t = useTranslate();return (- <Tooltip title={title ?? t("common.learn-more")} placement="top">- <a className={`text-gray-500 dark:text-gray-400 hover:text-blue-600 ${className}`} href={url} target="_blank">- <ExternalLinkIcon className="w-4 h-auto" />- </a>- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <a className={`text-gray-500 dark:text-gray-400 hover:text-blue-600 ${className}`} href={url} target="_blank">+ <ExternalLinkIcon className="w-4 h-auto" />+ </a>+ </TooltipTrigger>+ <TooltipContent>+ <p>{title ?? t("common.learn-more")}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>);};diff --git a/web/src/components/LocaleSelect.tsx b/web/src/components/LocaleSelect.tsxindex 4d5120f18..64bd670d4 100644--- a/web/src/components/LocaleSelect.tsx+++ b/web/src/components/LocaleSelect.tsx@@ -1,6 +1,6 @@-import { Option, Select } from "@mui/joy";import { GlobeIcon } from "lucide-react";import { FC } from "react";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";import { locales } from "@/i18n";interface Props {@@ -17,32 +17,35 @@ const LocaleSelect: FC<Props> = (props: Props) => {};return (- <Select- className={`min-w-40! w-auto whitespace-nowrap ${className ?? ""}`}- startDecorator={<GlobeIcon className="w-4 h-auto" />}- value={value}- onChange={(_, value) => handleSelectChange(value as Locale)}- >- {locales.map((locale) => {- try {- const languageName = new Intl.DisplayNames([locale], { type: "language" }).of(locale);- if (languageName) {- return (- <Option key={locale} value={locale}>- {languageName.charAt(0).toUpperCase() + languageName.slice(1)}- </Option>- );+ <Select value={value} onValueChange={handleSelectChange}>+ <SelectTrigger className={`min-w-40 w-auto whitespace-nowrap ${className ?? ""}`}>+ <div className="flex items-center gap-2">+ <GlobeIcon className="w-4 h-auto" />+ <SelectValue placeholder="Select language" />+ </div>+ </SelectTrigger>+ <SelectContent>+ {locales.map((locale) => {+ try {+ const languageName = new Intl.DisplayNames([locale], { type: "language" }).of(locale);+ if (languageName) {+ return (+ <SelectItem key={locale} value={locale}>+ {languageName.charAt(0).toUpperCase() + languageName.slice(1)}+ </SelectItem>+ );+ }+ } catch {+ // do nth}- } catch {- // do nth- }- return (- <Option key={locale} value={locale}>- {locale}- </Option>- );- })}+ return (+ <SelectItem key={locale} value={locale}>+ {locale}+ </SelectItem>+ );+ })}+ </SelectContent></Select>);};diff --git a/web/src/components/MasonryView/MasonryView.tsx b/web/src/components/MasonryView/MasonryView.tsxindex 10aad9c79..aca8369d5 100644--- a/web/src/components/MasonryView/MasonryView.tsx+++ b/web/src/components/MasonryView/MasonryView.tsx@@ -1,6 +1,6 @@import { useCallback, useEffect, useRef, useState } from "react";+import { cn } from "@/lib/utils";import { Memo } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";interface Props {memoList: Memo[];diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsxindex 4d7ac7aef..57ee8fe4b 100644--- a/web/src/components/MemoActionMenu.tsx+++ b/web/src/components/MemoActionMenu.tsx@@ -15,13 +15,13 @@ import toast from "react-hot-toast";import { useLocation } from "react-router-dom";import { markdownServiceClient } from "@/grpcweb";import useNavigateTo from "@/hooks/useNavigateTo";+import { cn } from "@/lib/utils";import { memoStore, userStore } from "@/store/v2";import { State } from "@/types/proto/api/v1/common";import { NodeType } from "@/types/proto/api/v1/markdown_service";import { Memo } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";-import { Popover, PopoverContent, PopoverTrigger } from "./ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";interface Props {memo: Memo;diff --git a/web/src/components/MemoAttachmentListView.tsx b/web/src/components/MemoAttachmentListView.tsxindex 7f830e92f..70a5c8da5 100644--- a/web/src/components/MemoAttachmentListView.tsx+++ b/web/src/components/MemoAttachmentListView.tsx@@ -1,6 +1,6 @@import { memo } from "react";+import { cn } from "@/lib/utils";import { Attachment } from "@/types/proto/api/v1/attachment_service";-import { cn } from "@/utils";import { getAttachmentType, getAttachmentUrl } from "@/utils/attachment";import MemoAttachment from "./MemoAttachment";import showPreviewImageDialog from "./PreviewImageDialog";diff --git a/web/src/components/MemoContent/CodeBlock.tsx b/web/src/components/MemoContent/CodeBlock.tsxindex 77d33fa12..c5c4fcdf6 100644--- a/web/src/components/MemoContent/CodeBlock.tsx+++ b/web/src/components/MemoContent/CodeBlock.tsx@@ -3,7 +3,7 @@ import hljs from "highlight.js";import { CopyIcon } from "lucide-react";import { useCallback, useMemo } from "react";import toast from "react-hot-toast";-import { cn } from "@/utils";+import { cn } from "@/lib/utils";import MermaidBlock from "./MermaidBlock";import { BaseProps } from "./types";diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsxindex 179c94ce2..15d6438cf 100644--- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsx+++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsx@@ -2,8 +2,8 @@ import { observer } from "mobx-react-lite";import { useEffect } from "react";import MemoAttachmentListView from "@/components/MemoAttachmentListView";import useLoading from "@/hooks/useLoading";+import { cn } from "@/lib/utils";import { attachmentStore } from "@/store/v2";-import { cn } from "@/utils";import Error from "./Error";interface Props {diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsxindex 6566d319e..6b31add1e 100644--- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx+++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx@@ -6,9 +6,9 @@ import toast from "react-hot-toast";import { Link } from "react-router-dom";import MemoAttachmentListView from "@/components/MemoAttachmentListView";import useLoading from "@/hooks/useLoading";+import { cn } from "@/lib/utils";import { extractMemoIdFromName } from "@/store/common";import { memoStore } from "@/store/v2";-import { cn } from "@/utils";import MemoContent from "..";import { RendererContext } from "../types";import Error from "./Error";diff --git a/web/src/components/MemoContent/HorizontalRule.tsx b/web/src/components/MemoContent/HorizontalRule.tsxindex 89c0d785a..23834eb0b 100644--- a/web/src/components/MemoContent/HorizontalRule.tsx+++ b/web/src/components/MemoContent/HorizontalRule.tsx@@ -1,4 +1,4 @@-import { Divider } from "@mui/joy";+import { Separator } from "@/components/ui/separator";import { BaseProps } from "./types";interface Props extends BaseProps {@@ -6,7 +6,7 @@ interface Props extends BaseProps {}const HorizontalRule: React.FC<Props> = () => {- return <Divider className="my-3!" />;+ return <Separator className="my-3!" />;};export default HorizontalRule;diff --git a/web/src/components/MemoContent/Link.tsx b/web/src/components/MemoContent/Link.tsxindex f507efcce..face869b6 100644--- a/web/src/components/MemoContent/Link.tsx+++ b/web/src/components/MemoContent/Link.tsx@@ -1,5 +1,5 @@-import { Link as MLink, Tooltip } from "@mui/joy";import { useState } from "react";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { markdownServiceClient } from "@/grpcweb";import { workspaceStore } from "@/store/v2";import { LinkMetadata, Node } from "@/types/proto/api/v1/markdown_service";@@ -43,33 +43,38 @@ const Link: React.FC<Props> = ({ content, url }: Props) => {};return (- <Tooltip- variant="outlined"- title={- linkMetadata && (- <div className="w-full max-w-64 sm:max-w-96 p-1 flex flex-col">- <div className="w-full flex flex-row justify-start items-center gap-1">- <img className="w-5 h-5 rounded" src={getFaviconWithGoogleS2(url)} alt={linkMetadata?.title} />- <h3 className="text-base truncate dark:opacity-90">{linkMetadata?.title}</h3>+ <TooltipProvider>+ <Tooltip open={showTooltip}>+ <TooltipTrigger asChild>+ <a+ className="underline text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300"+ target="_blank"+ href={url}+ rel="noopener noreferrer"+ onMouseEnter={handleMouseEnter}+ onMouseLeave={() => setShowTooltip(false)}+ >+ {content ? content.map((child, index) => <Renderer key={`${child.type}-${index}`} index={String(index)} node={child} />) : url}+ </a>+ </TooltipTrigger>+ {linkMetadata && (+ <TooltipContent className="w-full max-w-64 sm:max-w-96 p-1">+ <div className="w-full flex flex-col">+ <div className="w-full flex flex-row justify-start items-center gap-1">+ <img className="w-5 h-5 rounded" src={getFaviconWithGoogleS2(url)} alt={linkMetadata?.title} />+ <h3 className="text-base truncate dark:opacity-90">{linkMetadata?.title}</h3>+ </div>+ {linkMetadata.description && (+ <p className="mt-1 w-full text-sm leading-snug opacity-80 line-clamp-3">{linkMetadata.description}</p>+ )}+ {linkMetadata.image && (+ <img className="mt-1 w-full h-32 object-cover rounded" src={linkMetadata.image} alt={linkMetadata.title} />+ )}</div>- {linkMetadata.description && (- <p className="mt-1 w-full text-sm leading-snug opacity-80 line-clamp-3">{linkMetadata.description}</p>- )}- {linkMetadata.image && (- <img className="mt-1 w-full h-32 object-cover rounded" src={linkMetadata.image} alt={linkMetadata.title} />- )}- </div>- )- }- open={showTooltip}- arrow- >- <MLink underline="always" target="_blank" href={url} rel="noopener noreferrer">- <span onMouseEnter={handleMouseEnter} onMouseLeave={() => setShowTooltip(false)}>- {content ? content.map((child, index) => <Renderer key={`${child.type}-${index}`} index={String(index)} node={child} />) : url}- </span>- </MLink>- </Tooltip>+ </TooltipContent>+ )}+ </Tooltip>+ </TooltipProvider>);};diff --git a/web/src/components/MemoContent/List.tsx b/web/src/components/MemoContent/List.tsxindex 41aec62ef..0c8b5daa2 100644--- a/web/src/components/MemoContent/List.tsx+++ b/web/src/components/MemoContent/List.tsx@@ -1,7 +1,7 @@import { head } from "lodash-es";import React from "react";+import { cn } from "@/lib/utils";import { ListNode_Kind, Node, NodeType } from "@/types/proto/api/v1/markdown_service";-import { cn } from "@/utils";import Renderer from "./Renderer";interface Props {diff --git a/web/src/components/MemoContent/Math.tsx b/web/src/components/MemoContent/Math.tsxindex fff1ff45c..ace2bbbf7 100644--- a/web/src/components/MemoContent/Math.tsx+++ b/web/src/components/MemoContent/Math.tsx@@ -1,5 +1,5 @@import TeX from "@matejmazur/react-katex";-import { cn } from "@/utils";+import { cn } from "@/lib/utils";import "katex/dist/katex.min.css";interface Props {diff --git a/web/src/components/MemoContent/MermaidBlock.tsx b/web/src/components/MemoContent/MermaidBlock.tsxindex ac5f377c3..32ebd9f3a 100644--- a/web/src/components/MemoContent/MermaidBlock.tsx+++ b/web/src/components/MemoContent/MermaidBlock.tsx@@ -1,14 +1,32 @@-import { useColorScheme } from "@mui/joy";-import { useEffect, useRef } from "react";+import { useEffect, useRef, useState } from "react";interface Props {content: string;}const MermaidBlock: React.FC<Props> = ({ content }: Props) => {- const { mode: colorMode } = useColorScheme();+ const [colorMode, setColorMode] = useState<"light" | "dark">("light");const mermaidDockBlock = useRef<null>(null);+ // Simple dark mode detection+ useEffect(() => {+ const updateMode = () => {+ const isDark = document.documentElement.classList.contains("dark");+ setColorMode(isDark ? "dark" : "light");+ };++ updateMode();++ // Watch for changes to the dark class+ const observer = new MutationObserver(updateMode);+ observer.observe(document.documentElement, {+ attributes: true,+ attributeFilter: ["class"],+ });++ return () => observer.disconnect();+ }, []);+useEffect(() => {// Dynamically import mermaid to ensure compatibility with Viteconst initializeMermaid = async () => {diff --git a/web/src/components/MemoContent/Spoiler.tsx b/web/src/components/MemoContent/Spoiler.tsxindex 364e8efac..96a40789f 100644--- a/web/src/components/MemoContent/Spoiler.tsx+++ b/web/src/components/MemoContent/Spoiler.tsx@@ -1,5 +1,5 @@import { useState } from "react";-import { cn } from "@/utils";+import { cn } from "@/lib/utils";interface Props {content: string;diff --git a/web/src/components/MemoContent/Tag.tsx b/web/src/components/MemoContent/Tag.tsxindex 560f8add6..1458b506c 100644--- a/web/src/components/MemoContent/Tag.tsx+++ b/web/src/components/MemoContent/Tag.tsx@@ -2,10 +2,10 @@ import { observer } from "mobx-react-lite";import { useContext } from "react";import { useLocation } from "react-router-dom";import useNavigateTo from "@/hooks/useNavigateTo";+import { cn } from "@/lib/utils";import { Routes } from "@/router";import { memoFilterStore } from "@/store/v2";import { stringifyFilters, MemoFilter } from "@/store/v2/memoFilter";-import { cn } from "@/utils";import { RendererContext } from "./types";interface Props {diff --git a/web/src/components/MemoContent/TaskListItem.tsx b/web/src/components/MemoContent/TaskListItem.tsxindex 560612579..b949f7aa1 100644--- a/web/src/components/MemoContent/TaskListItem.tsx+++ b/web/src/components/MemoContent/TaskListItem.tsx@@ -1,10 +1,10 @@-import { Checkbox } from "@usememos/mui";import { observer } from "mobx-react-lite";import { useContext } from "react";+import { Checkbox } from "@/components/ui/checkbox";import { markdownServiceClient } from "@/grpcweb";+import { cn } from "@/lib/utils";import { memoStore } from "@/store/v2";import { Node, TaskListItemNode } from "@/types/proto/api/v1/markdown_service";-import { cn } from "@/utils";import Renderer from "./Renderer";import { RendererContext } from "./types";@@ -39,7 +39,12 @@ const TaskListItem = observer(({ node, complete, children }: Props) => {return (<li className={cn("w-full grid grid-cols-[24px_1fr]")}><span className="w-6 h-6 flex justify-start items-center">- <Checkbox size="sm" checked={complete} disabled={context.readonly} onChange={(e) => handleCheckboxChange(e.target.checked)} />+ <Checkbox+ className="h-4 w-4"+ checked={complete}+ disabled={context.readonly}+ onCheckedChange={(checked) => handleCheckboxChange(checked === true)}+ /></span><p className={cn(complete && "line-through opacity-80")}>{children.map((child, index) => (diff --git a/web/src/components/MemoContent/index.tsx b/web/src/components/MemoContent/index.tsxindex 37170f096..bf0206d1d 100644--- a/web/src/components/MemoContent/index.tsx+++ b/web/src/components/MemoContent/index.tsx@@ -1,9 +1,9 @@import { observer } from "mobx-react-lite";import { memo, useEffect, useRef, useState } from "react";import useCurrentUser from "@/hooks/useCurrentUser";+import { cn } from "@/lib/utils";import { memoStore } from "@/store/v2";import { Node, NodeType } from "@/types/proto/api/v1/markdown_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import { isSuperUser } from "@/utils/user";import Renderer from "./Renderer";diff --git a/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx b/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsxindex ca4b6ac4e..b27f0c535 100644--- a/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx+++ b/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx@@ -1,7 +1,7 @@import { isEqual } from "lodash-es";import { CheckCircleIcon, Code2Icon, HashIcon, LinkIcon } from "lucide-react";+import { cn } from "@/lib/utils";import { Memo, MemoRelation_Type, Memo_Property } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import MemoRelationForceGraph from "../MemoRelationForceGraph";diff --git a/web/src/components/MemoDetailSidebar/MemoDetailSidebarDrawer.tsx b/web/src/components/MemoDetailSidebar/MemoDetailSidebarDrawer.tsxindex 3f8186c58..afe683e24 100644--- a/web/src/components/MemoDetailSidebar/MemoDetailSidebarDrawer.tsx+++ b/web/src/components/MemoDetailSidebar/MemoDetailSidebarDrawer.tsx@@ -1,8 +1,8 @@-import { Drawer } from "@mui/joy";-import { Button } from "@usememos/mui";import { GanttChartIcon } from "lucide-react";import { useEffect, useState } from "react";import { useLocation } from "react-router-dom";+import { Button } from "@/components/ui/button";+import { Sheet, SheetContent, SheetTrigger } from "@/components/ui/sheet";import { Memo } from "@/types/proto/api/v1/memo_service";import MemoDetailSidebar from "./MemoDetailSidebar";@@ -19,24 +19,17 @@ const MemoDetailSidebarDrawer = ({ memo, parentPage }: Props) => {setOpen(false);}, [location.pathname]);- const toggleDrawer = (inOpen: boolean) => (event: React.KeyboardEvent | React.MouseEvent) => {- if (event.type === "keydown" && ((event as React.KeyboardEvent).key === "Tab" || (event as React.KeyboardEvent).key === "Shift")) {- return;- }- setOpen(inOpen);- };-return (- <>- <Button variant="plain" className="bg-transparent! px-2" onClick={toggleDrawer(true)}>- <GanttChartIcon className="w-5 h-auto dark:text-gray-400" />- </Button>- <Drawer anchor="right" size="sm" open={open} onClose={toggleDrawer(false)}>- <div className="w-full h-full px-4 bg-zinc-100 dark:bg-zinc-900">- <MemoDetailSidebar className="py-4" memo={memo} parentPage={parentPage} />- </div>- </Drawer>- </>+ <Sheet open={open} onOpenChange={setOpen}>+ <SheetTrigger asChild>+ <Button variant="ghost" className="bg-transparent! px-2">+ <GanttChartIcon className="w-5 h-auto dark:text-gray-400" />+ </Button>+ </SheetTrigger>+ <SheetContent side="right" className="w-full sm:w-80 px-4 bg-zinc-100 dark:bg-zinc-900">+ <MemoDetailSidebar className="py-4" memo={memo} parentPage={parentPage} />+ </SheetContent>+ </Sheet>);};diff --git a/web/src/components/MemoDisplaySettingMenu.tsx b/web/src/components/MemoDisplaySettingMenu.tsxindex 127da16e4..5af342cb3 100644--- a/web/src/components/MemoDisplaySettingMenu.tsx+++ b/web/src/components/MemoDisplaySettingMenu.tsx@@ -1,10 +1,10 @@-import { Option, Select } from "@mui/joy";import { Settings2Icon } from "lucide-react";import { observer } from "mobx-react-lite";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";+import { cn } from "@/lib/utils";import { viewStore } from "@/store/v2";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";-import { Popover, PopoverContent, PopoverTrigger } from "./ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";interface Props {className?: string;@@ -26,29 +26,39 @@ const MemoDisplaySettingMenu = observer(({ className }: Props) => {<div className="w-full flex flex-row justify-between items-center"><span className="text-sm shrink-0 mr-3 dark:text-zinc-400">{t("memo.direction")}</span><Select- value={viewStore.state.orderByTimeAsc}- onChange={(_, value) =>+ value={viewStore.state.orderByTimeAsc.toString()}+ onValueChange={(value) =>viewStore.state.setPartial({- orderByTimeAsc: Boolean(value),+ orderByTimeAsc: value === "true",})}>- <Option value={false}>{t("memo.direction-desc")}</Option>- <Option value={true}>{t("memo.direction-asc")}</Option>+ <SelectTrigger className="w-32">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="false">{t("memo.direction-desc")}</SelectItem>+ <SelectItem value="true">{t("memo.direction-asc")}</SelectItem>+ </SelectContent></Select></div><div className="w-full flex flex-row justify-between items-center"><span className="text-sm shrink-0 mr-3 dark:text-zinc-400">{t("common.layout")}</span><Selectvalue={viewStore.state.layout}- onChange={(_, value) =>+ onValueChange={(value) =>viewStore.state.setPartial({layout: value as "LIST" | "MASONRY",})}>- <Option value={"LIST"}>{t("memo.list")}</Option>- <Option value={"MASONRY"}>{t("memo.masonry")}</Option>+ <SelectTrigger className="w-32">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="LIST">{t("memo.list")}</SelectItem>+ <SelectItem value="MASONRY">{t("memo.masonry")}</SelectItem>+ </SelectContent></Select></div></div>diff --git a/web/src/components/MemoEditor/ActionButton/AddMemoRelationPopover.tsx b/web/src/components/MemoEditor/ActionButton/AddMemoRelationPopover.tsxindex 66ee433d4..d1a210b43 100644--- a/web/src/components/MemoEditor/ActionButton/AddMemoRelationPopover.tsx+++ b/web/src/components/MemoEditor/ActionButton/AddMemoRelationPopover.tsx@@ -1,11 +1,13 @@-import { Autocomplete, AutocompleteOption, Chip } from "@mui/joy";-import { Button, Checkbox } from "@usememos/mui";import { uniqBy } from "lodash-es";-import { LinkIcon } from "lucide-react";+import { LinkIcon, X } from "lucide-react";import React, { useContext, useState } from "react";import { toast } from "react-hot-toast";import useDebounce from "react-use/lib/useDebounce";-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/Popover";+import { Badge } from "@/components/ui/badge";+import { Button } from "@/components/ui/button";+import { Checkbox } from "@/components/ui/checkbox";+import { Command, CommandInput, CommandItem, CommandList, CommandEmpty } from "@/components/ui/command";+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";import { memoServiceClient } from "@/grpcweb";import { DEFAULT_LIST_MEMOS_PAGE_SIZE } from "@/helpers/consts";import useCurrentUser from "@/hooks/useCurrentUser";@@ -129,52 +131,69 @@ const AddMemoRelationPopover = (props: Props) => {return (<Popover open={popoverOpen} onOpenChange={setPopoverOpen}>- <PopoverTrigger className="relative">- <Button className="flex items-center justify-center p-0" variant="plain" asChild>- <LinkIcon className="w-5 h-5 mx-auto p-0" />+ <PopoverTrigger asChild>+ <Button variant="ghost">+ <LinkIcon /></Button></PopoverTrigger><PopoverContent align="center"><div className="w-[16rem] p-1 flex flex-col justify-start items-start">- <Autocomplete- className="w-full"- size="md"- clearOnBlur- disableClearable- placeholder={t("reference.search-placeholder")}- noOptionsText={t("reference.no-memos-found")}- options={filteredMemos}- loading={isFetching}- inputValue={searchText}- value={selectedMemos}- multiple- onInputChange={(_, value) => setSearchText(value.trimStart())}- getOptionKey={(memo) => memo.name}- getOptionLabel={(memo) => memo.content}- isOptionEqualToValue={(memo, value) => memo.name === value.name}- renderOption={(props, memo) => (- <AutocompleteOption {...props} key={memo.name}>- <div className="w-full flex flex-col justify-start items-start">- <p className="text-xs text-gray-400 select-none">{memo.displayTime?.toLocaleString()}</p>- <p className="mt-0.5 text-sm leading-5 line-clamp-2">{searchText ? getHighlightedContent(memo.content) : memo.snippet}</p>- </div>- </AutocompleteOption>- )}- renderTags={(memos) =>- memos.map((memo) => (- <Chip key={memo.name} className="max-w-full! rounded!" variant="outlined" color="neutral">+ {/* Selected memos display */}+ {selectedMemos.length > 0 && (+ <div className="w-full mb-2 flex flex-wrap gap-1">+ {selectedMemos.map((memo) => (+ <Badge key={memo.name} variant="outline" className="max-w-full flex items-center gap-1 p-2">+ <div className="flex-1 min-w-0">+ <p className="text-xs text-gray-400 select-none">{memo.displayTime?.toLocaleString()}</p>+ <span className="text-sm leading-5 truncate block">{memo.content}</span>+ </div>+ <X+ className="w-3 h-3 cursor-pointer hover:text-red-500 flex-shrink-0"+ onClick={() => setSelectedMemos((memos) => memos.filter((m) => m.name !== memo.name))}+ />+ </Badge>+ ))}+ </div>+ )}++ {/* Search and selection interface */}+ <Command className="w-full">+ <CommandInput+ placeholder={t("reference.search-placeholder")}+ value={searchText}+ onValueChange={setSearchText}+ className="h-9"+ />+ <CommandList className="max-h-[200px]">+ <CommandEmpty>{isFetching ? "Loading..." : t("reference.no-memos-found")}</CommandEmpty>+ {filteredMemos.map((memo) => (+ <CommandItem+ key={memo.name}+ value={memo.name}+ onSelect={() => {+ setSelectedMemos((prev) => [...prev, memo]);+ }}+ className="cursor-pointer"+ ><div className="w-full flex flex-col justify-start items-start"><p className="text-xs text-gray-400 select-none">{memo.displayTime?.toLocaleString()}</p>- <span className="w-full text-sm leading-5 truncate">{memo.content}</span>+ <p className="mt-0.5 text-sm leading-5 line-clamp-2">+ {searchText ? getHighlightedContent(memo.content) : memo.snippet}+ </p></div>- </Chip>- ))- }- onChange={(_, value) => setSelectedMemos(value)}- />+ </CommandItem>+ ))}+ </CommandList>+ </Command>+<div className="mt-2 w-full flex flex-row justify-end items-center gap-2">- <Checkbox size="sm" label={"Embed"} checked={embedded} onChange={(e) => setEmbedded(e.target.checked)} />- <Button color="primary" onClick={addMemoRelations} disabled={selectedMemos.length === 0}>+ <div className="flex items-center space-x-2">+ <Checkbox id="embed-checkbox" checked={embedded} onCheckedChange={(checked) => setEmbedded(checked === true)} />+ <label htmlFor="embed-checkbox" className="text-sm">+ Embed+ </label>+ </div>+ <Button onClick={addMemoRelations} disabled={selectedMemos.length === 0}>{t("common.add")}</Button></div>diff --git a/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx b/web/src/components/MemoEditor/ActionButton/LocationSelector.tsxindex c206f3430..e28735b53 100644--- a/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx+++ b/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx@@ -1,10 +1,11 @@-import { Button, Input } from "@usememos/mui";import { LatLng } from "leaflet";import { MapPinIcon, XIcon } from "lucide-react";import { useEffect, useState } from "react";import toast from "react-hot-toast";import LeafletMap from "@/components/LeafletMap";-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/Popover";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";import { Location } from "@/types/proto/api/v1/memo_service";import { useTranslate } from "@/utils/i18n";@@ -86,6 +87,7 @@ const LocationSelector = (props: Props) => {};const removeLocation = (e: React.MouseEvent) => {+ console.log("here");e.preventDefault();e.stopPropagation();props.onChange(undefined);@@ -94,35 +96,39 @@ const LocationSelector = (props: Props) => {return (<Popover open={popoverOpen} onOpenChange={setPopoverOpen}><PopoverTrigger asChild>- <Button className="flex items-center justify-center p-0" size="sm" variant="plain">- <MapPinIcon className="w-5 h-5 mx-auto shrink-0" />- {props.location && (- <>- <span className="ml-0.5 text-sm text-ellipsis whitespace-nowrap overflow-hidden max-w-32">{props.location.placeholder}</span>- <XIcon className="w-5 h-5 mx-auto shrink-0 hidden group-hover:block opacity-60 hover:opacity-80" onClick={removeLocation} />- </>- )}+ <Button variant="ghost" asChild>+ <div>+ <MapPinIcon className="w-5 h-5 mx-auto shrink-0" />+ {props.location && (+ <>+ <span className="ml-0.5 text-sm text-ellipsis whitespace-nowrap overflow-hidden max-w-32">+ {props.location.placeholder}+ </span>+ <XIcon className="w-5 h-5 mx-auto shrink-0 opacity-60 hover:opacity-80" onClick={removeLocation} />+ </>+ )}+ </div></Button></PopoverTrigger><PopoverContent align="center"><div className="min-w-80 sm:w-lg p-1 flex flex-col justify-start items-start"><LeafletMap key={JSON.stringify(state.initilized)} latlng={state.position} onChange={onPositionChanged} /><div className="mt-2 w-full flex flex-row justify-between items-center gap-2">- <div className="flex flex-row items-center justify-start gap-2">- <Input- placeholder="Choose a position first."- value={state.placeholder}- size="sm"- startDecorator={- state.position && (- <div className="text-xs leading-6 opacity-60">- [{state.position.lat.toFixed(2)}, {state.position.lng.toFixed(2)}]- </div>- )- }- disabled={!state.position}- onChange={(e) => setState((state) => ({ ...state, placeholder: e.target.value }))}- />+ <div className="flex flex-row items-center justify-start gap-2 w-full">+ <div className="relative flex-1">+ {state.position && (+ <div className="absolute left-2 top-1/2 -translate-y-1/2 text-xs leading-6 opacity-60 z-10">+ [{state.position.lat.toFixed(2)}, {state.position.lng.toFixed(2)}]+ </div>+ )}+ <Input+ placeholder="Choose a position first."+ value={state.placeholder}+ disabled={!state.position}+ className={state.position ? "pl-24" : ""}+ onChange={(e) => setState((state) => ({ ...state, placeholder: e.target.value }))}+ />+ </div></div><ButtonclassName="shrink-0"diff --git a/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx b/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsxindex f98b2d4e0..21c02c7b5 100644--- a/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx+++ b/web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx@@ -1,8 +1,7 @@-import { Link } from "@mui/joy";-import { Button } from "@usememos/mui";import { CheckSquareIcon, Code2Icon, SquareSlashIcon } from "lucide-react";+import { Button } from "@/components/ui/button";import { useTranslate } from "@/utils/i18n";-import { Popover, PopoverContent, PopoverTrigger } from "../../ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "../../ui/popover";import { EditorRefActions } from "../Editor";interface Props {@@ -10,9 +9,8 @@ interface Props {}const MarkdownMenu = (props: Props) => {- const t = useTranslate();-const { editorRef } = props;+ const t = useTranslate();const handleCodeBlockClick = () => {if (!editorRef.current) {@@ -64,8 +62,8 @@ const MarkdownMenu = (props: Props) => {return (<Popover><PopoverTrigger asChild>- <Button variant="plain" className="p-0">- <SquareSlashIcon className="w-5 h-5" />+ <Button variant="ghost">+ <SquareSlashIcon /></Button></PopoverTrigger><PopoverContent align="start" className="text-sm p-1">@@ -85,9 +83,14 @@ const MarkdownMenu = (props: Props) => {<span>{t("markdown.checkbox")}</span></button><div className="pl-2">- <Link fontSize={12} href="https://www.usememos.com/docs/getting-started/content-syntax" target="_blank">+ <a+ className="text-xs text-blue-600 hover:underline"+ href="https://www.usememos.com/docs/getting-started/content-syntax"+ target="_blank"+ rel="noopener noreferrer"+ >{t("markdown.content-syntax")}- </Link>+ </a></div></div></PopoverContent>diff --git a/web/src/components/MemoEditor/ActionButton/TagSelector.tsx b/web/src/components/MemoEditor/ActionButton/TagSelector.tsxindex dbf66dfa4..12a960d58 100644--- a/web/src/components/MemoEditor/ActionButton/TagSelector.tsx+++ b/web/src/components/MemoEditor/ActionButton/TagSelector.tsx@@ -1,10 +1,10 @@-import { Button } from "@usememos/mui";import { HashIcon } from "lucide-react";import { observer } from "mobx-react-lite";import OverflowTip from "@/components/kit/OverflowTip";+import { Button } from "@/components/ui/button";import { userStore } from "@/store/v2";import { useTranslate } from "@/utils/i18n";-import { Popover, PopoverContent, PopoverTrigger } from "../../ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "../../ui/popover";import { EditorRefActions } from "../Editor";interface Props {@@ -35,8 +35,8 @@ const TagSelector = observer((props: Props) => {return (<Popover><PopoverTrigger asChild>- <Button variant="plain" className="p-0">- <HashIcon className="w-5 h-5" />+ <Button variant="ghost">+ <HashIcon /></Button></PopoverTrigger><PopoverContent align="start" sideOffset={2}>diff --git a/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsx b/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsxindex 6aab03092..5e9b9aeeb 100644--- a/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsx+++ b/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsx@@ -1,8 +1,8 @@-import { Button } from "@usememos/mui";import { LoaderIcon, PaperclipIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { useContext, useRef, useState } from "react";import toast from "react-hot-toast";+import { Button } from "@/components/ui/button";import { attachmentStore } from "@/store/v2";import { Attachment } from "@/types/proto/api/v1/attachment_service";import { MemoEditorContext } from "../types";@@ -73,7 +73,7 @@ const UploadAttachmentButton = observer((props: Props) => {const isUploading = state.uploadingFlag || props.isUploading;return (- <Button className="relative p-0" variant="plain" disabled={isUploading}>+ <Button className="relative" variant="ghost" disabled={isUploading}>{isUploading ? <LoaderIcon className="w-5 h-5 animate-spin" /> : <PaperclipIcon className="w-5 h-5" />}<inputclassName="absolute inset-0 w-full h-full opacity-0 cursor-pointer"diff --git a/web/src/components/MemoEditor/ActionButton/VisibilitySelector.tsx b/web/src/components/MemoEditor/ActionButton/VisibilitySelector.tsxindex 87b10b5e3..2060c1b7a 100644--- a/web/src/components/MemoEditor/ActionButton/VisibilitySelector.tsx+++ b/web/src/components/MemoEditor/ActionButton/VisibilitySelector.tsx@@ -1,9 +1,9 @@import { ChevronDownIcon } from "lucide-react";import { useState } from "react";import VisibilityIcon from "@/components/VisibilityIcon";-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";+import { cn } from "@/lib/utils";import { Visibility } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";interface Props {diff --git a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx b/web/src/components/MemoEditor/Editor/TagSuggestions.tsxindex ab86b9472..bdbec086c 100644--- a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx+++ b/web/src/components/MemoEditor/Editor/TagSuggestions.tsx@@ -3,8 +3,8 @@ import { observer } from "mobx-react-lite";import { useEffect, useRef, useState } from "react";import getCaretCoordinates from "textarea-caret";import OverflowTip from "@/components/kit/OverflowTip";+import { cn } from "@/lib/utils";import { userStore } from "@/store/v2";-import { cn } from "@/utils";import { EditorRefActions } from ".";type Props = {diff --git a/web/src/components/MemoEditor/Editor/index.tsx b/web/src/components/MemoEditor/Editor/index.tsxindex cb218ada7..89ac24fe6 100644--- a/web/src/components/MemoEditor/Editor/index.tsx+++ b/web/src/components/MemoEditor/Editor/index.tsx@@ -1,8 +1,8 @@import { last } from "lodash-es";import { forwardRef, ReactNode, useCallback, useEffect, useImperativeHandle, useRef, useState } from "react";import { markdownServiceClient } from "@/grpcweb";+import { cn } from "@/lib/utils";import { Node, NodeType, OrderedListItemNode, TaskListItemNode, UnorderedListItemNode } from "@/types/proto/api/v1/markdown_service";-import { cn } from "@/utils";import TagSuggestions from "./TagSuggestions";export interface EditorRefActions {diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsxindex 251bbe62c..ad90d3b96 100644--- a/web/src/components/MemoEditor/index.tsx+++ b/web/src/components/MemoEditor/index.tsx@@ -1,4 +1,3 @@-import { Button } from "@usememos/mui";import copy from "copy-to-clipboard";import { isEqual } from "lodash-es";import { LoaderIcon, SendIcon } from "lucide-react";@@ -7,17 +6,18 @@ import React, { useEffect, useMemo, useRef, useState } from "react";import { toast } from "react-hot-toast";import { useTranslation } from "react-i18next";import useLocalStorage from "react-use/lib/useLocalStorage";+import { Button } from "@/components/ui/button";import { memoServiceClient } from "@/grpcweb";import { TAB_SPACE_WIDTH } from "@/helpers/consts";import { isValidUrl } from "@/helpers/utils";import useAsyncEffect from "@/hooks/useAsyncEffect";import useCurrentUser from "@/hooks/useCurrentUser";+import { cn } from "@/lib/utils";import { extractMemoIdFromName } from "@/store/common";import { memoStore, attachmentStore, userStore, workspaceStore } from "@/store/v2";import { Attachment } from "@/types/proto/api/v1/attachment_service";import { Location, Memo, MemoRelation, MemoRelation_Type, Visibility } from "@/types/proto/api/v1/memo_service";import { UserSetting } from "@/types/proto/api/v1/user_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import { convertVisibilityFromString } from "@/utils/memo";import DateTimeInput from "../DateTimeInput";@@ -503,7 +503,7 @@ const MemoEditor = observer((props: Props) => {<AttachmentListView attachmentList={state.attachmentList} setAttachmentList={handleSetAttachmentList} /><RelationListView relationList={referenceRelations} setRelationList={handleSetRelationList} /><div className="relative w-full flex flex-row justify-between items-center py-1" onFocus={(e) => e.stopPropagation()}>- <div className="flex flex-row justify-start items-center opacity-80 dark:opacity-60 space-x-2">+ <div className="flex flex-row justify-start items-center opacity-80 dark:opacity-60 -space-x-2"><TagSelector editorRef={editorRef} /><MarkdownMenu editorRef={editorRef} /><UploadAttachmentButton isUploading={state.isUploadingAttachment} />@@ -520,7 +520,7 @@ const MemoEditor = observer((props: Props) => {</div><div className="shrink-0 -mr-1 flex flex-row justify-end items-center">{props.onCancel && (- <Button variant="plain" className="opacity-60" disabled={state.isRequesting} onClick={handleCancelBtnClick}>+ <Button variant="ghost" className="opacity-60" disabled={state.isRequesting} onClick={handleCancelBtnClick}>{t("common.cancel")}</Button>)}diff --git a/web/src/components/MemoLocationView.tsx b/web/src/components/MemoLocationView.tsxindex 2d94bc3fd..b7ef04587 100644--- a/web/src/components/MemoLocationView.tsx+++ b/web/src/components/MemoLocationView.tsx@@ -3,7 +3,7 @@ import { MapPinIcon } from "lucide-react";import { useState } from "react";import { Location } from "@/types/proto/api/v1/memo_service";import LeafletMap from "./LeafletMap";-import { Popover, PopoverContent, PopoverTrigger } from "./ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";interface Props {location: Location;diff --git a/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsx b/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsxindex 49df0e49b..e21d51eb9 100644--- a/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsx+++ b/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsx@@ -1,10 +1,9 @@-import { useColorScheme } from "@mui/joy";import { useEffect, useRef, useState } from "react";import ForceGraph2D, { ForceGraphMethods, LinkObject, NodeObject } from "react-force-graph-2d";import useNavigateTo from "@/hooks/useNavigateTo";+import { cn } from "@/lib/utils";import { extractMemoIdFromName } from "@/store/common";import { Memo, MemoRelation_Type } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";import { LinkType, NodeType } from "./types";import { convertMemoRelationsToGraphData } from "./utils";@@ -19,11 +18,30 @@ const DEFAULT_NODE_COLOR = "#a1a1aa";const MemoRelationForceGraph = ({ className, memo, parentPage }: Props) => {const navigateTo = useNavigateTo();- const { mode } = useColorScheme();+ const [mode, setMode] = useState<"light" | "dark">("light");const containerRef = useRef<HTMLDivElement>(null);const graphRef = useRef<ForceGraphMethods<NodeObject<NodeType>, LinkObject<NodeType, LinkType>> | undefined>(undefined);const [graphSize, setGraphSize] = useState({ width: 0, height: 0 });+ // Simple dark mode detection+ useEffect(() => {+ const updateMode = () => {+ const isDark = document.documentElement.classList.contains("dark");+ setMode(isDark ? "dark" : "light");+ };++ updateMode();++ // Watch for changes to the dark class+ const observer = new MutationObserver(updateMode);+ observer.observe(document.documentElement, {+ attributes: true,+ attributeFilter: ["class"],+ });++ return () => observer.disconnect();+ }, []);+useEffect(() => {if (!containerRef.current) return;setGraphSize(containerRef.current.getBoundingClientRect());diff --git a/web/src/components/MemoRelationListView.tsx b/web/src/components/MemoRelationListView.tsxindex 999c825d2..74d7aa65b 100644--- a/web/src/components/MemoRelationListView.tsx+++ b/web/src/components/MemoRelationListView.tsx@@ -1,9 +1,9 @@import { LinkIcon, MilestoneIcon } from "lucide-react";import { memo, useState } from "react";import { Link } from "react-router-dom";+import { cn } from "@/lib/utils";import { extractMemoIdFromName } from "@/store/common";import { Memo, MemoRelation } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";interface Props {diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsxindex d2b593c68..410da0728 100644--- a/web/src/components/MemoView.tsx+++ b/web/src/components/MemoView.tsx@@ -1,15 +1,15 @@-import { Tooltip } from "@mui/joy";import { BookmarkIcon, EyeOffIcon, MessageCircleMoreIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { memo, useCallback, useState } from "react";import { Link, useLocation } from "react-router-dom";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import useAsyncEffect from "@/hooks/useAsyncEffect";import useCurrentUser from "@/hooks/useCurrentUser";import useNavigateTo from "@/hooks/useNavigateTo";+import { cn } from "@/lib/utils";import { memoStore, userStore, workspaceStore } from "@/store/v2";import { State } from "@/types/proto/api/v1/common";import { Memo, MemoRelation_Type, Visibility } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import { convertVisibilityToString } from "@/utils/memo";import { isSuperUser } from "@/utils/user";@@ -170,10 +170,13 @@ const MemoView: React.FC<Props> = observer((props: Props) => {<div className="flex flex-row justify-end items-center select-none shrink-0 gap-2"><div className="w-auto invisible group-hover:visible flex flex-row justify-between items-center gap-2">{props.showVisibility && memo.visibility !== Visibility.PRIVATE && (- <Tooltip title={t(`memo.visibility.${convertVisibilityToString(memo.visibility).toLowerCase()}` as any)} placement="top">- <span className="flex justify-center items-center hover:opacity-70">- <VisibilityIcon visibility={memo.visibility} />- </span>+ <Tooltip>+ <TooltipTrigger>+ <span className="flex justify-center items-center hover:opacity-70">+ <VisibilityIcon visibility={memo.visibility} />+ </span>+ </TooltipTrigger>+ <TooltipContent>{t(`memo.visibility.${convertVisibilityToString(memo.visibility).toLowerCase()}` as any)}</TooltipContent></Tooltip>)}{currentUser && !isArchived && <ReactionSelector className="border-none w-auto h-auto" memo={memo} />}@@ -195,11 +198,18 @@ const MemoView: React.FC<Props> = observer((props: Props) => {</Link>)}{props.showPinned && memo.pinned && (- <Tooltip title={t("common.unpin")} placement="top">- <span className="cursor-pointer">- <BookmarkIcon className="w-4 h-auto text-amber-500" onClick={onPinIconClick} />- </span>- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="cursor-pointer">+ <BookmarkIcon className="w-4 h-auto text-amber-500" onClick={onPinIconClick} />+ </span>+ </TooltipTrigger>+ <TooltipContent>+ <p>{t("common.unpin")}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>)}{nsfw && showNSFWContent && (<span className="cursor-pointer">diff --git a/web/src/components/MobileHeader.tsx b/web/src/components/MobileHeader.tsxindex cdab245ab..255ec5c3c 100644--- a/web/src/components/MobileHeader.tsx+++ b/web/src/components/MobileHeader.tsx@@ -1,6 +1,6 @@import useWindowScroll from "react-use/lib/useWindowScroll";import useResponsiveWidth from "@/hooks/useResponsiveWidth";-import { cn } from "@/utils";+import { cn } from "@/lib/utils";import NavigationDrawer from "./NavigationDrawer";interface Props {diff --git a/web/src/components/Navigation.tsx b/web/src/components/Navigation.tsxindex 5977ffe8d..2ba3f9a58 100644--- a/web/src/components/Navigation.tsx+++ b/web/src/components/Navigation.tsx@@ -1,12 +1,12 @@-import { Tooltip } from "@mui/joy";import { EarthIcon, LibraryIcon, PaperclipIcon, UserCircleIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { useEffect } from "react";import { NavLink } from "react-router-dom";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import useCurrentUser from "@/hooks/useCurrentUser";+import { cn } from "@/lib/utils";import { Routes } from "@/router";import { userStore } from "@/store/v2";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import BrandBanner from "./BrandBanner";import UserBanner from "./UserBanner";@@ -89,9 +89,16 @@ const Navigation = observer((props: Props) => {viewTransition>{props.collapsed ? (- <Tooltip title={navLink.title} placement="right" arrow>- <div>{navLink.icon}</div>- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <div>{navLink.icon}</div>+ </TooltipTrigger>+ <TooltipContent side="right">+ <p>{navLink.title}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>) : (navLink.icon)}diff --git a/web/src/components/NavigationDrawer.tsx b/web/src/components/NavigationDrawer.tsxindex 5dde24e62..0454b06de 100644--- a/web/src/components/NavigationDrawer.tsx+++ b/web/src/components/NavigationDrawer.tsx@@ -1,8 +1,8 @@-import { Drawer } from "@mui/joy";-import { Button } from "@usememos/mui";import { observer } from "mobx-react-lite";import { useEffect, useState } from "react";import { useLocation } from "react-router-dom";+import { Button } from "@/components/ui/button";+import { Sheet, SheetContent, SheetTrigger } from "@/components/ui/sheet";import { workspaceStore } from "@/store/v2";import Navigation from "./Navigation";import UserAvatar from "./UserAvatar";@@ -18,28 +18,20 @@ const NavigationDrawer = observer(() => {setOpen(false);}, [location.pathname]);- const toggleDrawer = (inOpen: boolean) => (event: React.KeyboardEvent | React.MouseEvent) => {- if (event.type === "keydown" && ((event as React.KeyboardEvent).key === "Tab" || (event as React.KeyboardEvent).key === "Shift")) {- return;- }-- setOpen(inOpen);- };-return (- <>- <Button variant="plain" className="px-2" onClick={toggleDrawer(true)}>- <UserAvatar className="shrink-0 w-6 h-6 rounded-md" avatarUrl={avatarUrl} />- <span className="font-bold text-lg leading-10 ml-2 text-ellipsis shrink-0 cursor-pointer overflow-hidden text-gray-700 dark:text-gray-300">- {title}- </span>- </Button>- <Drawer anchor="left" size="sm" open={open} onClose={toggleDrawer(false)}>- <div className="w-full h-full overflow-auto px-2 bg-zinc-100 dark:bg-zinc-900">- <Navigation />- </div>- </Drawer>- </>+ <Sheet open={open} onOpenChange={setOpen}>+ <SheetTrigger asChild>+ <Button variant="ghost" className="px-2">+ <UserAvatar className="shrink-0 w-6 h-6 rounded-md" avatarUrl={avatarUrl} />+ <span className="font-bold text-lg leading-10 ml-2 text-ellipsis shrink-0 cursor-pointer overflow-hidden text-gray-700 dark:text-gray-300">+ {title}+ </span>+ </Button>+ </SheetTrigger>+ <SheetContent side="left" className="w-full sm:w-80 overflow-auto px-2 bg-zinc-100 dark:bg-zinc-900">+ <Navigation />+ </SheetContent>+ </Sheet>);});diff --git a/web/src/components/PagedMemoList/PagedMemoList.tsx b/web/src/components/PagedMemoList/PagedMemoList.tsxindex 17df16948..eab964ed7 100644--- a/web/src/components/PagedMemoList/PagedMemoList.tsx+++ b/web/src/components/PagedMemoList/PagedMemoList.tsx@@ -1,9 +1,9 @@-import { Button } from "@usememos/mui";import { ArrowUpIcon, LoaderIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { useCallback, useEffect, useRef, useState } from "react";import { matchPath } from "react-router-dom";import PullToRefresh from "react-simple-pull-to-refresh";+import { Button } from "@/components/ui/button";import { DEFAULT_LIST_MEMOS_PAGE_SIZE } from "@/helpers/consts";import useResponsiveWidth from "@/hooks/useResponsiveWidth";import { Routes } from "@/router";@@ -220,7 +220,7 @@ const BackToTop = () => {}return (- <Button variant="plain" onClick={scrollToTop}>+ <Button variant="ghost" onClick={scrollToTop}>{t("router.back-to-top")}<ArrowUpIcon className="ml-1 w-4 h-auto" /></Button>diff --git a/web/src/components/PasswordSignInForm.tsx b/web/src/components/PasswordSignInForm.tsxindex a4e8db3ea..108003231 100644--- a/web/src/components/PasswordSignInForm.tsx+++ b/web/src/components/PasswordSignInForm.tsx@@ -1,9 +1,10 @@-import { Button, Input } from "@usememos/mui";import { LoaderIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { ClientError } from "nice-grpc-web";import { useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";import { authServiceClient } from "@/grpcweb";import useLoading from "@/hooks/useLoading";import useNavigateTo from "@/hooks/useNavigateTo";@@ -62,8 +63,7 @@ const PasswordSignInForm = observer(() => {<div className="w-full flex flex-col justify-start items-start"><span className="leading-8 text-gray-600">{t("common.username")}</span><Input- className="w-full bg-white dark:bg-black"- size="lg"+ className="w-full bg-white dark:bg-black h-10"type="text"readOnly={actionBtnLoadingState.isLoading}placeholder={t("common.username")}@@ -78,8 +78,7 @@ const PasswordSignInForm = observer(() => {<div className="w-full flex flex-col justify-start items-start"><span className="leading-8 text-gray-600">{t("common.password")}</span><Input- className="w-full bg-white dark:bg-black"- size="lg"+ className="w-full bg-white dark:bg-black h-10"type="password"readOnly={actionBtnLoadingState.isLoading}placeholder={t("common.password")}@@ -93,14 +92,7 @@ const PasswordSignInForm = observer(() => {</div></div><div className="flex flex-row justify-end items-center w-full mt-6">- <Button- type="submit"- color="primary"- size="lg"- fullWidth- disabled={actionBtnLoadingState.isLoading}- onClick={handleSignInButtonClick}- >+ <Button type="submit" className="w-full h-10" disabled={actionBtnLoadingState.isLoading} onClick={handleSignInButtonClick}>{t("common.sign-in")}{actionBtnLoadingState.isLoading && <LoaderIcon className="w-5 h-auto ml-2 animate-spin opacity-60" />}</Button>diff --git a/web/src/components/PreviewImageDialog.tsx b/web/src/components/PreviewImageDialog.tsxindex a1d82ef94..7fbe8e63b 100644--- a/web/src/components/PreviewImageDialog.tsx+++ b/web/src/components/PreviewImageDialog.tsx@@ -1,6 +1,6 @@-import { Button } from "@usememos/mui";import { XIcon } from "lucide-react";import React, { useEffect, useState } from "react";+import { Button } from "@/components/ui/button";import { generateDialog } from "./Dialog";const MIN_SCALE = 0.5;diff --git a/web/src/components/ReactionSelector.tsx b/web/src/components/ReactionSelector.tsxindex 87b3d87f7..44fded7af 100644--- a/web/src/components/ReactionSelector.tsx+++ b/web/src/components/ReactionSelector.tsx@@ -4,10 +4,10 @@ import { useRef, useState } from "react";import useClickAway from "react-use/lib/useClickAway";import { memoServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";+import { cn } from "@/lib/utils";import { memoStore, workspaceStore } from "@/store/v2";import { Memo } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";-import { Popover, PopoverContent, PopoverTrigger } from "./ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";interface Props {memo: Memo;diff --git a/web/src/components/ReactionView.tsx b/web/src/components/ReactionView.tsxindex 0d20a0a44..56c300169 100644--- a/web/src/components/ReactionView.tsx+++ b/web/src/components/ReactionView.tsx@@ -1,12 +1,12 @@-import { Tooltip } from "@mui/joy";import { observer } from "mobx-react-lite";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { memoServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";+import { cn } from "@/lib/utils";import { memoStore } from "@/store/v2";import { State } from "@/types/proto/api/v1/common";import { Memo } from "@/types/proto/api/v1/memo_service";import { User } from "@/types/proto/api/v1/user_service";-import { cn } from "@/utils";interface Props {memo: Memo;@@ -65,20 +65,27 @@ const ReactionView = observer((props: Props) => {};return (- <Tooltip title={stringifyUsers(users, reactionType)} placement="top">- <div- className={cn(- "h-7 border border-zinc-200 px-2 py-0.5 rounded-full flex flex-row justify-center items-center gap-1 dark:border-zinc-700",- "text-sm text-gray-600 dark:text-gray-400",- currentUser && !readonly && "cursor-pointer",- hasReaction && "bg-blue-100 border-blue-200 dark:bg-zinc-900",- )}- onClick={handleReactionClick}- >- <span>{reactionType}</span>- <span className="opacity-60">{users.length}</span>- </div>- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <div+ className={cn(+ "h-7 border border-zinc-200 px-2 py-0.5 rounded-full flex flex-row justify-center items-center gap-1 dark:border-zinc-700",+ "text-sm text-gray-600 dark:text-gray-400",+ currentUser && !readonly && "cursor-pointer",+ hasReaction && "bg-blue-100 border-blue-200 dark:bg-zinc-900",+ )}+ onClick={handleReactionClick}+ >+ <span>{reactionType}</span>+ <span className="opacity-60">{users.length}</span>+ </div>+ </TooltipTrigger>+ <TooltipContent>+ <p>{stringifyUsers(users, reactionType)}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>);});diff --git a/web/src/components/RenameTagDialog.tsx b/web/src/components/RenameTagDialog.tsxindex 9f2dab7a6..9b13ef735 100644--- a/web/src/components/RenameTagDialog.tsx+++ b/web/src/components/RenameTagDialog.tsx@@ -1,8 +1,8 @@-import { List, ListItem } from "@mui/joy";-import { Button, Input } from "@usememos/mui";import { XIcon } from "lucide-react";import React, { useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";import { memoServiceClient } from "@/grpcweb";import useLoading from "@/hooks/useLoading";import { useTranslate } from "@/utils/i18n";@@ -50,7 +50,7 @@ const RenameTagDialog: React.FC<Props> = (props: Props) => {<div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg"><div className="flex flex-row justify-between items-center mb-4 gap-2 w-full"><p className="title-text">{t("tag.rename-tag")}</p>- <Button variant="plain" onClick={() => destroy()}>+ <Button variant="ghost" onClick={() => destroy()}><XIcon className="w-5 h-auto" /></Button></div>@@ -64,17 +64,17 @@ const RenameTagDialog: React.FC<Props> = (props: Props) => {<span className="w-20 text-sm whitespace-nowrap shrink-0 text-right">{t("tag.new-name")}</span><Input className="w-full" type="text" placeholder="A new tag name" value={newName} onChange={handleTagNameInputChange} /></div>- <List size="sm" marker="disc">- <ListItem>+ <ul className="list-disc list-inside text-sm ml-4">+ <li><p className="leading-5">{t("tag.rename-tip")}</p>- </ListItem>- </List>+ </li>+ </ul></div><div className="w-full flex flex-row justify-end items-center space-x-2">- <Button variant="plain" disabled={requestState.isLoading} onClick={destroy}>+ <Button variant="ghost" disabled={requestState.isLoading} onClick={destroy}>{t("common.cancel")}</Button>- <Button color="primary" disabled={requestState.isLoading} onClick={handleConfirm}>+ <Button disabled={requestState.isLoading} onClick={handleConfirm}>{t("common.confirm")}</Button></div>diff --git a/web/src/components/SearchBar.tsx b/web/src/components/SearchBar.tsxindex 71b4edd9e..696ef6343 100644--- a/web/src/components/SearchBar.tsx+++ b/web/src/components/SearchBar.tsx@@ -1,8 +1,8 @@import { SearchIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { useState } from "react";+import { cn } from "@/lib/utils";import { memoFilterStore } from "@/store/v2";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import MemoDisplaySettingMenu from "./MemoDisplaySettingMenu";diff --git a/web/src/components/Settings/AccessTokenSection.tsx b/web/src/components/Settings/AccessTokenSection.tsxindex cb9cdcbd0..34764a8f3 100644--- a/web/src/components/Settings/AccessTokenSection.tsx+++ b/web/src/components/Settings/AccessTokenSection.tsx@@ -1,8 +1,8 @@-import { Button } from "@usememos/mui";import copy from "copy-to-clipboard";import { ClipboardIcon, TrashIcon } from "lucide-react";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";import { userServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import { UserAccessToken } from "@/types/proto/api/v1/user_service";@@ -99,7 +99,7 @@ const AccessTokenSection = () => {<tr key={userAccessToken.accessToken}><td className="whitespace-nowrap px-3 py-2 text-sm text-gray-900 dark:text-gray-400 flex flex-row justify-start items-center gap-x-1"><span className="font-mono">{getFormatedAccessToken(userAccessToken.accessToken)}</span>- <Button variant="plain" onClick={() => copyAccessToken(userAccessToken.accessToken)}>+ <Button variant="ghost" onClick={() => copyAccessToken(userAccessToken.accessToken)}><ClipboardIcon className="w-4 h-auto text-gray-400" /></Button></td>@@ -114,7 +114,7 @@ const AccessTokenSection = () => {</td><td className="relative whitespace-nowrap py-2 pl-3 pr-4 text-right text-sm"><Button- variant="plain"+ variant="ghost"onClick={() => {handleDeleteAccessToken(userAccessToken);}}diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsxindex 8b68732d1..7bd8eeced 100644--- a/web/src/components/Settings/MemberSection.tsx+++ b/web/src/components/Settings/MemberSection.tsx@@ -1,10 +1,12 @@-import { Radio, RadioGroup } from "@mui/joy";-import { Button, Input } from "@usememos/mui";import { sortBy } from "lodash-es";import { MoreVerticalIcon } from "lucide-react";import { observer } from "mobx-react-lite";import React, { useEffect, useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";import { userServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import { userStore } from "@/store/v2";@@ -12,7 +14,7 @@ import { State } from "@/types/proto/api/v1/common";import { User, User_Role } from "@/types/proto/api/v1/user_service";import { useTranslate } from "@/utils/i18n";import showCreateUserDialog from "../CreateUserDialog";-import { Popover, PopoverContent, PopoverTrigger } from "../ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";interface LocalState {creatingUser: User;@@ -167,15 +169,23 @@ const MemberSection = observer(() => {</div><div className="flex flex-col justify-start items-start gap-1"><span>{t("common.role")}</span>- <RadioGroup orientation="horizontal" defaultValue={User_Role.USER} onChange={handleUserRoleInputChange}>- <Radio value={User_Role.USER} label={t("setting.member-section.user")} />- <Radio value={User_Role.ADMIN} label={t("setting.member-section.admin")} />+ <RadioGroup+ defaultValue={User_Role.USER}+ onValueChange={(value) => handleUserRoleInputChange({ target: { value } } as React.ChangeEvent<HTMLInputElement>)}+ className="flex flex-row gap-4"+ >+ <div className="flex items-center space-x-2">+ <RadioGroupItem value={User_Role.USER} id="user-role" />+ <Label htmlFor="user-role">{t("setting.member-section.user")}</Label>+ </div>+ <div className="flex items-center space-x-2">+ <RadioGroupItem value={User_Role.ADMIN} id="admin-role" />+ <Label htmlFor="admin-role">{t("setting.member-section.admin")}</Label>+ </div></RadioGroup></div><div className="mt-2">- <Button color="primary" onClick={handleCreateUserBtnClick}>- {t("common.create")}- </Button>+ <Button onClick={handleCreateUserBtnClick}>{t("common.create")}</Button></div></div><div className="w-full flex flex-row justify-between items-center mt-6">diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsxindex c63b4e659..13baec849 100644--- a/web/src/components/Settings/MemoRelatedSettings.tsx+++ b/web/src/components/Settings/MemoRelatedSettings.tsx@@ -1,10 +1,12 @@-import { Chip, ChipDelete } from "@mui/joy";-import { Button, Input, Switch } from "@usememos/mui";import { isEqual, uniq } from "lodash-es";-import { CheckIcon } from "lucide-react";+import { CheckIcon, X } from "lucide-react";import { observer } from "mobx-react-lite";import { useState } from "react";import { toast } from "react-hot-toast";+import { Badge } from "@/components/ui/badge";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Switch } from "@/components/ui/switch";import { workspaceSettingNamePrefix } from "@/store/common";import { workspaceStore } from "@/store/v2";import { WorkspaceSettingKey } from "@/store/v2/workspace";@@ -70,42 +72,42 @@ const MemoRelatedSettings = observer(() => {<span>{t("setting.system-section.disable-public-memos")}</span><Switchchecked={memoRelatedSetting.disallowPublicVisibility}- onChange={(event) => updatePartialSetting({ disallowPublicVisibility: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ disallowPublicVisibility: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.system-section.display-with-updated-time")}</span><Switchchecked={memoRelatedSetting.displayWithUpdateTime}- onChange={(event) => updatePartialSetting({ displayWithUpdateTime: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ displayWithUpdateTime: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.memo-related-settings.enable-link-preview")}</span><Switchchecked={memoRelatedSetting.enableLinkPreview}- onChange={(event) => updatePartialSetting({ enableLinkPreview: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ enableLinkPreview: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.memo-related-settings.enable-memo-comments")}</span><Switchchecked={memoRelatedSetting.enableComment}- onChange={(event) => updatePartialSetting({ enableComment: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ enableComment: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.system-section.enable-double-click-to-edit")}</span><Switchchecked={memoRelatedSetting.enableDoubleClickEdit}- onChange={(event) => updatePartialSetting({ enableDoubleClickEdit: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ enableDoubleClickEdit: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.system-section.disable-markdown-shortcuts-in-editor")}</span><Switchchecked={memoRelatedSetting.disableMarkdownShortcuts}- onChange={(event) => updatePartialSetting({ disableMarkdownShortcuts: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ disableMarkdownShortcuts: checked })}/></div><div className="w-full flex flex-row justify-between items-center">@@ -122,33 +124,27 @@ const MemoRelatedSettings = observer(() => {<div className="mt-2 w-full flex flex-row flex-wrap gap-1">{memoRelatedSetting.reactions.map((reactionType) => {return (- <Chip- className="h-8!"- key={reactionType}- variant="outlined"- size="lg"- endDecorator={- <ChipDelete- onDelete={() => updatePartialSetting({ reactions: memoRelatedSetting.reactions.filter((r) => r !== reactionType) })}- />- }- >+ <Badge key={reactionType} variant="outline" className="h-8 flex items-center gap-1">{reactionType}- </Chip>+ <X+ className="w-3 h-3 cursor-pointer hover:text-red-500"+ onClick={() => updatePartialSetting({ reactions: memoRelatedSetting.reactions.filter((r) => r !== reactionType) })}+ />+ </Badge>);})}- <Input- className="w-32 rounded-full! pl-1!"- placeholder={t("common.input")}- value={editingReaction}- onChange={(event) => setEditingReaction(event.target.value.trim())}- endDecorator={- <CheckIcon- className="w-5 h-5 text-gray-500 dark:text-gray-400 cursor-pointer hover:text-teal-600"- onClick={() => upsertReaction()}- />- }- />+ <div className="flex items-center gap-1">+ <Input+ className="w-32"+ placeholder={t("common.input")}+ value={editingReaction}+ onChange={(event) => setEditingReaction(event.target.value.trim())}+ />+ <CheckIcon+ className="w-5 h-5 text-gray-500 dark:text-gray-400 cursor-pointer hover:text-teal-600"+ onClick={() => upsertReaction()}+ />+ </div></div></div><div className="w-full">@@ -156,43 +152,37 @@ const MemoRelatedSettings = observer(() => {<span>{t("setting.memo-related-settings.enable-blur-nsfw-content")}</span><Switchchecked={memoRelatedSetting.enableBlurNsfwContent}- onChange={(event) => updatePartialSetting({ enableBlurNsfwContent: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ enableBlurNsfwContent: checked })}/></div><div className="mt-2 w-full flex flex-row flex-wrap gap-1">{memoRelatedSetting.nsfwTags.map((nsfwTag) => {return (- <Chip- className="h-8!"- key={nsfwTag}- variant="outlined"- size="lg"- endDecorator={- <ChipDelete- onDelete={() => updatePartialSetting({ nsfwTags: memoRelatedSetting.nsfwTags.filter((r) => r !== nsfwTag) })}- />- }- >+ <Badge key={nsfwTag} variant="outline" className="h-8 flex items-center gap-1">{nsfwTag}- </Chip>+ <X+ className="w-3 h-3 cursor-pointer hover:text-red-500"+ onClick={() => updatePartialSetting({ nsfwTags: memoRelatedSetting.nsfwTags.filter((r) => r !== nsfwTag) })}+ />+ </Badge>);})}- <Input- className="w-32 rounded-full! pl-1!"- placeholder={t("common.input")}- value={editingNsfwTag}- onChange={(event) => setEditingNsfwTag(event.target.value.trim())}- endDecorator={- <CheckIcon- className="w-5 h-5 text-gray-500 dark:text-gray-400 cursor-pointer hover:text-teal-600"- onClick={() => upsertNsfwTags()}- />- }- />+ <div className="flex items-center gap-1">+ <Input+ className="w-32"+ placeholder={t("common.input")}+ value={editingNsfwTag}+ onChange={(event) => setEditingNsfwTag(event.target.value.trim())}+ />+ <CheckIcon+ className="w-5 h-5 text-gray-500 dark:text-gray-400 cursor-pointer hover:text-teal-600"+ onClick={() => upsertNsfwTags()}+ />+ </div></div></div><div className="mt-2 w-full flex justify-end">- <Button color="primary" disabled={isEqual(memoRelatedSetting, originalSetting)} onClick={updateSetting}>+ <Button disabled={isEqual(memoRelatedSetting, originalSetting)} onClick={updateSetting}>{t("common.save")}</Button></div>diff --git a/web/src/components/Settings/MyAccountSection.tsx b/web/src/components/Settings/MyAccountSection.tsxindex 4b8ba4a38..a8fed8510 100644--- a/web/src/components/Settings/MyAccountSection.tsx+++ b/web/src/components/Settings/MyAccountSection.tsx@@ -1,11 +1,11 @@-import { Button } from "@usememos/mui";import { MoreVerticalIcon, PenLineIcon } from "lucide-react";+import { Button } from "@/components/ui/button";import useCurrentUser from "@/hooks/useCurrentUser";import { useTranslate } from "@/utils/i18n";import showChangeMemberPasswordDialog from "../ChangeMemberPasswordDialog";import showUpdateAccountDialog from "../UpdateAccountDialog";import UserAvatar from "../UserAvatar";-import { Popover, PopoverContent, PopoverTrigger } from "../ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";import AccessTokenSection from "./AccessTokenSection";import UserSessionsSection from "./UserSessionsSection";@@ -27,13 +27,13 @@ const MyAccountSection = () => {</div></div><div className="w-full flex flex-row justify-start items-center mt-2 space-x-2">- <Button variant="outlined" onClick={showUpdateAccountDialog}>+ <Button variant="outline" onClick={showUpdateAccountDialog}><PenLineIcon className="w-4 h-4 mx-auto mr-1" />{t("common.edit")}</Button><Popover><PopoverTrigger asChild>- <Button variant="outlined">+ <Button variant="outline"><MoreVerticalIcon className="w-4 h-4 mx-auto" /></Button></PopoverTrigger>diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsxindex e5aa2aa50..19d1ecb17 100644--- a/web/src/components/Settings/PreferencesSection.tsx+++ b/web/src/components/Settings/PreferencesSection.tsx@@ -1,5 +1,6 @@-import { Divider, Option, Select } from "@mui/joy";import { observer } from "mobx-react-lite";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";+import { Separator } from "@/components/ui/separator";import { userStore } from "@/store/v2";import { Visibility } from "@/types/proto/api/v1/memo_service";import { UserSetting } from "@/types/proto/api/v1/user_service";@@ -44,27 +45,26 @@ const PreferencesSection = observer(() => {<div className="w-full flex flex-row justify-between items-center"><span className="truncate">{t("setting.preference-section.default-memo-visibility")}</span>- <Select- className="min-w-fit!"- value={setting.memoVisibility}- startDecorator={<VisibilityIcon visibility={convertVisibilityFromString(setting.memoVisibility)} />}- onChange={(_, visibility) => {- if (visibility) {- handleDefaultMemoVisibilityChanged(visibility);- }- }}- >- {[Visibility.PRIVATE, Visibility.PROTECTED, Visibility.PUBLIC]- .map((v) => convertVisibilityToString(v))- .map((item) => (- <Option key={item} value={item} className="whitespace-nowrap">- {t(`memo.visibility.${item.toLowerCase() as Lowercase<typeof item>}`)}- </Option>- ))}+ <Select value={setting.memoVisibility} onValueChange={handleDefaultMemoVisibilityChanged}>+ <SelectTrigger className="min-w-fit">+ <div className="flex items-center gap-2">+ <VisibilityIcon visibility={convertVisibilityFromString(setting.memoVisibility)} />+ <SelectValue />+ </div>+ </SelectTrigger>+ <SelectContent>+ {[Visibility.PRIVATE, Visibility.PROTECTED, Visibility.PUBLIC]+ .map((v) => convertVisibilityToString(v))+ .map((item) => (+ <SelectItem key={item} value={item} className="whitespace-nowrap">+ {t(`memo.visibility.${item.toLowerCase() as Lowercase<typeof item>}`)}+ </SelectItem>+ ))}+ </SelectContent></Select></div>- <Divider className="my-3!" />+ <Separator className="my-3" /><WebhookSection /></div>diff --git a/web/src/components/Settings/SSOSection.tsx b/web/src/components/Settings/SSOSection.tsxindex 414aebc53..92d2dac76 100644--- a/web/src/components/Settings/SSOSection.tsx+++ b/web/src/components/Settings/SSOSection.tsx@@ -1,15 +1,15 @@-import { Divider, List, ListItem } from "@mui/joy";-import { Button } from "@usememos/mui";import { MoreVerticalIcon } from "lucide-react";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";import { Link } from "react-router-dom";+import { Button } from "@/components/ui/button";+import { Separator } from "@/components/ui/separator";import { identityProviderServiceClient } from "@/grpcweb";import { IdentityProvider } from "@/types/proto/api/v1/idp_service";import { useTranslate } from "@/utils/i18n";import showCreateIdentityProviderDialog from "../CreateIdentityProviderDialog";import LearnMore from "../LearnMore";-import { Popover, PopoverContent, PopoverTrigger } from "../ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";const SSOSection = () => {const t = useTranslate();@@ -48,7 +48,7 @@ const SSOSection = () => {{t("common.create")}</Button></div>- <Divider />+ <Separator />{identityProviderList.map((identityProvider) => (<divkey={identityProvider.name}@@ -95,8 +95,8 @@ const SSOSection = () => {<div className="w-full mt-4"><p className="text-sm">{t("common.learn-more")}:</p>- <List component="ul" marker="disc" size="sm">- <ListItem>+ <ul className="list-disc list-inside text-sm ml-4">+ <li><LinkclassName="text-sm text-blue-600 hover:underline"to="https://www.usememos.com/docs/advanced-settings/sso"@@ -104,8 +104,8 @@ const SSOSection = () => {>{t("setting.sso-section.single-sign-on")}</Link>- </ListItem>- </List>+ </li>+ </ul></div></div>);diff --git a/web/src/components/Settings/StorageSection.tsx b/web/src/components/Settings/StorageSection.tsxindex e55ddaebe..1c8bc0861 100644--- a/web/src/components/Settings/StorageSection.tsx+++ b/web/src/components/Settings/StorageSection.tsx@@ -1,11 +1,16 @@-import { Divider, List, ListItem, Radio, RadioGroup, Tooltip } from "@mui/joy";-import { Button, Input, Switch } from "@usememos/mui";import { isEqual } from "lodash-es";import { HelpCircleIcon } from "lucide-react";import { observer } from "mobx-react-lite";import React, { useEffect, useMemo, useState } from "react";import { toast } from "react-hot-toast";import { Link } from "react-router-dom";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";+import { Separator } from "@/components/ui/separator";+import { Switch } from "@/components/ui/switch";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { workspaceSettingNamePrefix } from "@/store/common";import { workspaceStore } from "@/store/v2";import { WorkspaceSettingKey } from "@/store/v2/workspace";@@ -131,23 +136,38 @@ const StorageSection = observer(() => {<div className="w-full flex flex-col gap-2 pt-2 pb-4"><div className="font-medium text-gray-700 dark:text-gray-500">{t("setting.storage-section.current-storage")}</div><RadioGroup- orientation="horizontal"- className="w-full"- value={workspaceStorageSetting.storageType}- onChange={(event) => {- handleStorageTypeChanged(event.target.value as WorkspaceStorageSetting_StorageType);+ value={workspaceStorageSetting.storageType.toString()}+ onValueChange={(value) => {+ handleStorageTypeChanged(parseInt(value) as unknown as WorkspaceStorageSetting_StorageType);}}+ className="flex flex-row gap-4">- <Radio value={WorkspaceStorageSetting_StorageType.DATABASE} label={t("setting.storage-section.type-database")} />- <Radio value={WorkspaceStorageSetting_StorageType.LOCAL} label={t("setting.storage-section.type-local")} />- <Radio value={WorkspaceStorageSetting_StorageType.S3} label={"S3"} />+ <div className="flex items-center space-x-2">+ <RadioGroupItem value={WorkspaceStorageSetting_StorageType.DATABASE.toString()} id="database" />+ <Label htmlFor="database">{t("setting.storage-section.type-database")}</Label>+ </div>+ <div className="flex items-center space-x-2">+ <RadioGroupItem value={WorkspaceStorageSetting_StorageType.LOCAL.toString()} id="local" />+ <Label htmlFor="local">{t("setting.storage-section.type-local")}</Label>+ </div>+ <div className="flex items-center space-x-2">+ <RadioGroupItem value={WorkspaceStorageSetting_StorageType.S3.toString()} id="s3" />+ <Label htmlFor="s3">S3</Label>+ </div></RadioGroup><div className="w-full flex flex-row justify-between items-center"><div className="flex flex-row items-center"><span className="text-gray-700 dark:text-gray-500 mr-1">{t("setting.system-section.max-upload-size")}</span>- <Tooltip title={t("setting.system-section.max-upload-size-hint")} placement="top">- <HelpCircleIcon className="w-4 h-auto" />- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger>+ <HelpCircleIcon className="w-4 h-auto" />+ </TooltipTrigger>+ <TooltipContent>+ <p>{t("setting.system-section.max-upload-size-hint")}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider></div><Input className="w-16 font-mono" value={workspaceStorageSetting.uploadSizeLimitMb} onChange={handleMaxUploadSizeChanged} /></div>@@ -189,20 +209,23 @@ const StorageSection = observer(() => {</div><div className="w-full flex flex-row justify-between items-center"><span className="text-gray-700 dark:text-gray-500 mr-1">Use Path Style</span>- <Switch checked={workspaceStorageSetting.s3Config?.usePathStyle} onChange={handleS3ConfigUsePathStyleChanged} />+ <Switch+ checked={workspaceStorageSetting.s3Config?.usePathStyle}+ onCheckedChange={(checked) => handleS3ConfigUsePathStyleChanged({ target: { checked } } as any)}+ /></div></>)}<div>- <Button color="primary" disabled={!allowSaveStorageSetting} onClick={saveWorkspaceStorageSetting}>+ <Button disabled={!allowSaveStorageSetting} onClick={saveWorkspaceStorageSetting}>{t("common.save")}</Button></div>- <Divider className="my-2!" />+ <Separator className="my-2" /><div className="w-full mt-4"><p className="text-sm">{t("common.learn-more")}:</p>- <List component="ul" marker="disc" size="sm">- <ListItem>+ <ul className="text-sm list-disc ml-4 space-y-1">+ <li><LinkclassName="text-sm text-blue-600 hover:underline"to="https://www.usememos.com/docs/advanced-settings/local-storage"@@ -210,8 +233,8 @@ const StorageSection = observer(() => {>Docs - Local storage</Link>- </ListItem>- <ListItem>+ </li>+ <li><LinkclassName="text-sm text-blue-600 hover:underline"to="https://www.usememos.com/blog/choosing-a-storage-for-your-resource"@@ -219,8 +242,8 @@ const StorageSection = observer(() => {>Choosing a Storage for Your Resource: Database, S3 or Local Storage?</Link>- </ListItem>- </List>+ </li>+ </ul></div></div>);diff --git a/web/src/components/Settings/UserSessionsSection.tsx b/web/src/components/Settings/UserSessionsSection.tsxindex 74e8c800a..7c307d2cc 100644--- a/web/src/components/Settings/UserSessionsSection.tsx+++ b/web/src/components/Settings/UserSessionsSection.tsx@@ -1,7 +1,7 @@-import { Button } from "@usememos/mui";import { ClockIcon, MonitorIcon, SmartphoneIcon, TabletIcon, TrashIcon, WifiIcon } from "lucide-react";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";import { userServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import { UserSession } from "@/types/proto/api/v1/user_service";@@ -124,7 +124,7 @@ const UserSessionsSection = () => {</td><td className="relative whitespace-nowrap py-2 pl-3 pr-4 text-right text-sm"><Button- variant="plain"+ variant="ghost"disabled={isCurrentSession(userSession)}onClick={() => {handleRevokeSession(userSession);diff --git a/web/src/components/Settings/WebhookSection.tsx b/web/src/components/Settings/WebhookSection.tsxindex 80715eb11..03280a0f1 100644--- a/web/src/components/Settings/WebhookSection.tsx+++ b/web/src/components/Settings/WebhookSection.tsx@@ -1,7 +1,7 @@-import { Button } from "@usememos/mui";import { ExternalLinkIcon, TrashIcon } from "lucide-react";import { useEffect, useState } from "react";import { Link } from "react-router-dom";+import { Button } from "@/components/ui/button";import { webhookServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import { Webhook } from "@/types/proto/api/v1/webhook_service";@@ -85,7 +85,7 @@ const WebhookSection = () => {</td><td className="relative whitespace-nowrap px-3 py-2 text-right text-sm"><Button- variant="plain"+ variant="ghost"onClick={() => {handleDeleteWebhook(webhook);}}diff --git a/web/src/components/Settings/WorkspaceSection.tsx b/web/src/components/Settings/WorkspaceSection.tsxindex 55801f5fb..314c498c2 100644--- a/web/src/components/Settings/WorkspaceSection.tsx+++ b/web/src/components/Settings/WorkspaceSection.tsx@@ -1,11 +1,14 @@-import { Select, Option, Divider } from "@mui/joy";-import { Button, Textarea, Switch } from "@usememos/mui";import { isEqual } from "lodash-es";import { ExternalLinkIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";import { Link } from "react-router-dom";+import { Button } from "@/components/ui/button";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";+import { Separator } from "@/components/ui/separator";+import { Switch } from "@/components/ui/switch";+import { Textarea } from "@/components/ui/textarea";import { identityProviderServiceClient } from "@/grpcweb";import { workspaceSettingNamePrefix } from "@/store/common";import { workspaceStore } from "@/store/v2";@@ -71,19 +74,18 @@ const WorkspaceSection = observer(() => {{t("setting.system-section.server-name")}:{" "}<span className="font-mono font-bold">{workspaceGeneralSetting.customProfile?.title || "Memos"}</span></div>- <Button variant="outlined" onClick={handleUpdateCustomizedProfileButtonClick}>+ <Button variant="outline" onClick={handleUpdateCustomizedProfileButtonClick}>{t("common.edit")}</Button></div>- <Divider />+ <Separator /><p className="font-medium text-gray-700 dark:text-gray-500">{t("setting.system-section.title")}</p><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.system-section.additional-style")}</span></div><Textarea- className="font-mono"+ className="font-mono w-full"rows={3}- fullWidthplaceholder={t("setting.system-section.additional-style-placeholder")}value={workspaceGeneralSetting.additionalStyle}onChange={(event) => updatePartialSetting({ additionalStyle: event.target.value })}@@ -92,9 +94,8 @@ const WorkspaceSection = observer(() => {<span>{t("setting.system-section.additional-script")}</span></div><Textarea- className="font-mono"+ className="font-mono w-full"rows={3}- fullWidthplaceholder={t("setting.system-section.additional-script-placeholder")}value={workspaceGeneralSetting.additionalScript}onChange={(event) => updatePartialSetting({ additionalScript: event.target.value })}@@ -114,7 +115,7 @@ const WorkspaceSection = observer(() => {<Switchdisabled={workspaceStore.state.profile.mode === "demo"}checked={workspaceGeneralSetting.disallowUserRegistration}- onChange={(event) => updatePartialSetting({ disallowUserRegistration: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ disallowUserRegistration: checked })}/></div><div className="w-full flex flex-row justify-between items-center">@@ -125,39 +126,43 @@ const WorkspaceSection = observer(() => {(identityProviderList.length === 0 && !workspaceGeneralSetting.disallowPasswordAuth)}checked={workspaceGeneralSetting.disallowPasswordAuth}- onChange={(event) => updatePartialSetting({ disallowPasswordAuth: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ disallowPasswordAuth: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.workspace-section.disallow-change-username")}</span><Switchchecked={workspaceGeneralSetting.disallowChangeUsername}- onChange={(event) => updatePartialSetting({ disallowChangeUsername: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ disallowChangeUsername: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span>{t("setting.workspace-section.disallow-change-nickname")}</span><Switchchecked={workspaceGeneralSetting.disallowChangeNickname}- onChange={(event) => updatePartialSetting({ disallowChangeNickname: event.target.checked })}+ onCheckedChange={(checked) => updatePartialSetting({ disallowChangeNickname: checked })}/></div><div className="w-full flex flex-row justify-between items-center"><span className="truncate">{t("setting.workspace-section.week-start-day")}</span><Select- className="min-w-fit!"- value={workspaceGeneralSetting.weekStartDayOffset}- onChange={(_, weekStartDayOffset) => {- updatePartialSetting({ weekStartDayOffset: weekStartDayOffset || 0 });+ value={workspaceGeneralSetting.weekStartDayOffset.toString()}+ onValueChange={(value) => {+ updatePartialSetting({ weekStartDayOffset: parseInt(value) || 0 });}}>- <Option value={-1}>{t("setting.workspace-section.saturday")}</Option>- <Option value={0}>{t("setting.workspace-section.sunday")}</Option>- <Option value={1}>{t("setting.workspace-section.monday")}</Option>+ <SelectTrigger className="min-w-fit">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="-1">{t("setting.workspace-section.saturday")}</SelectItem>+ <SelectItem value="0">{t("setting.workspace-section.sunday")}</SelectItem>+ <SelectItem value="1">{t("setting.workspace-section.monday")}</SelectItem>+ </SelectContent></Select></div><div className="mt-2 w-full flex justify-end">- <Button color="primary" disabled={isEqual(workspaceGeneralSetting, originalSetting)} onClick={handleSaveGeneralSetting}>+ <Button disabled={isEqual(workspaceGeneralSetting, originalSetting)} onClick={handleSaveGeneralSetting}>{t("common.save")}</Button></div>diff --git a/web/src/components/StatisticsView/StatCard.tsx b/web/src/components/StatisticsView/StatCard.tsxindex 3339ebeb0..f63320847 100644--- a/web/src/components/StatisticsView/StatCard.tsx+++ b/web/src/components/StatisticsView/StatCard.tsx@@ -1,6 +1,6 @@-import { Tooltip } from "@mui/joy";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";+import { cn } from "@/lib/utils";import type { StatCardProps } from "@/types/statistics";-import { cn } from "@/utils";export const StatCard = ({ icon, label, count, onClick, tooltip, className }: StatCardProps) => {const content = (@@ -22,9 +22,14 @@ export const StatCard = ({ icon, label, count, onClick, tooltip, className }: Stif (tooltip) {return (- <Tooltip title={tooltip} placement="top" arrow>- {content}- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>{content}</TooltipTrigger>+ <TooltipContent>+ <p>{tooltip}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>);}diff --git a/web/src/components/UpdateAccountDialog.tsx b/web/src/components/UpdateAccountDialog.tsxindex 6e25dbce1..4cbabb88c 100644--- a/web/src/components/UpdateAccountDialog.tsx+++ b/web/src/components/UpdateAccountDialog.tsx@@ -1,8 +1,10 @@-import { Button, Input, Textarea } from "@usememos/mui";import { isEqual } from "lodash-es";import { XIcon } from "lucide-react";import { useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Textarea } from "@/components/ui/textarea";import { convertFileToBase64 } from "@/helpers/utils";import useCurrentUser from "@/hooks/useCurrentUser";import { userStore, workspaceStore } from "@/store/v2";@@ -142,7 +144,7 @@ const UpdateAccountDialog = ({ destroy }: Props) => {<div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg"><div className="flex flex-row justify-between items-center mb-4 gap-2 w-full"><p className="title-text">{t("setting.account-section.update-information")}</p>- <Button variant="plain" onClick={handleCloseBtnClick}>+ <Button variant="ghost" onClick={handleCloseBtnClick}><XIcon className="w-5 h-auto" /></Button></div>@@ -188,16 +190,14 @@ const UpdateAccountDialog = ({ destroy }: Props) => {{t("common.email")}<span className="text-sm text-gray-400 ml-1">({t("setting.account-section.email-note")})</span></p>- <Input fullWidth type="email" value={state.email} onChange={handleEmailChanged} />+ <Input className="w-full" type="email" value={state.email} onChange={handleEmailChanged} /><p className="text-sm">{t("common.description")}</p>- <Textarea rows={2} fullWidth value={state.description} onChange={handleDescriptionChanged} />+ <Textarea className="w-full" rows={2} value={state.description} onChange={handleDescriptionChanged} /><div className="w-full flex flex-row justify-end items-center pt-4 space-x-2">- <Button variant="plain" onClick={handleCloseBtnClick}>+ <Button variant="ghost" onClick={handleCloseBtnClick}>{t("common.cancel")}</Button>- <Button color="primary" onClick={handleSaveBtnClick}>- {t("common.save")}- </Button>+ <Button onClick={handleSaveBtnClick}>{t("common.save")}</Button></div></div></div>diff --git a/web/src/components/UpdateCustomizedProfileDialog.tsx b/web/src/components/UpdateCustomizedProfileDialog.tsxindex b99994ea3..35e231617 100644--- a/web/src/components/UpdateCustomizedProfileDialog.tsx+++ b/web/src/components/UpdateCustomizedProfileDialog.tsx@@ -1,7 +1,9 @@-import { Button, Input, Textarea } from "@usememos/mui";import { XIcon } from "lucide-react";import { useState } from "react";import { toast } from "react-hot-toast";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Textarea } from "@/components/ui/textarea";import { workspaceSettingNamePrefix } from "@/store/common";import { workspaceStore } from "@/store/v2";import { WorkspaceSettingKey } from "@/store/v2/workspace";@@ -99,7 +101,7 @@ const UpdateCustomizedProfileDialog = ({ destroy }: Props) => {<div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg"><div className="flex flex-row justify-between items-center mb-4 gap-2 w-full"><p className="title-text">{t("setting.system-section.customize-server.title")}</p>- <Button variant="plain" onClick={handleCloseButtonClick}>+ <Button variant="ghost" onClick={handleCloseButtonClick}><XIcon className="w-5 h-auto" /></Button></div>@@ -109,19 +111,19 @@ const UpdateCustomizedProfileDialog = ({ destroy }: Props) => {<p className="text-sm mb-1 mt-2">{t("setting.system-section.customize-server.icon-url")}</p><Input className="w-full" type="text" value={customProfile.logoUrl} onChange={handleLogoUrlChanged} /><p className="text-sm mb-1 mt-2">{t("setting.system-section.customize-server.description")}</p>- <Textarea rows={3} fullWidth value={customProfile.description} onChange={handleDescriptionChanged} />+ <Textarea rows={3} value={customProfile.description} onChange={handleDescriptionChanged} /><p className="text-sm mb-1 mt-2">{t("setting.system-section.customize-server.locale")}</p><LocaleSelect className="w-full!" value={customProfile.locale} onChange={handleLocaleSelectChange} /><p className="text-sm mb-1 mt-2">{t("setting.system-section.customize-server.appearance")}</p><AppearanceSelect className="w-full!" value={customProfile.appearance as Appearance} onChange={handleAppearanceSelectChange} /><div className="mt-4 w-full flex flex-row justify-between items-center space-x-2"><div className="flex flex-row justify-start items-center">- <Button variant="outlined" onClick={handleRestoreButtonClick}>+ <Button variant="outline" onClick={handleRestoreButtonClick}>{t("common.restore")}</Button></div><div className="flex flex-row justify-end items-center gap-2">- <Button variant="plain" onClick={handleCloseButtonClick}>+ <Button variant="ghost" onClick={handleCloseButtonClick}>{t("common.cancel")}</Button><Button color="primary" onClick={handleSaveButtonClick}>diff --git a/web/src/components/UserAvatar.tsx b/web/src/components/UserAvatar.tsxindex eb5664847..c6a3f412e 100644--- a/web/src/components/UserAvatar.tsx+++ b/web/src/components/UserAvatar.tsx@@ -1,4 +1,4 @@-import { cn } from "@/utils";+import { cn } from "@/lib/utils";interface Props {avatarUrl?: string;diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsxindex bc4e3d3bc..035bd0e79 100644--- a/web/src/components/UserBanner.tsx+++ b/web/src/components/UserBanner.tsx@@ -2,11 +2,11 @@ import { ArchiveIcon, LogOutIcon, User2Icon, SquareUserIcon, SettingsIcon, BellIimport { authServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";import useNavigateTo from "@/hooks/useNavigateTo";+import { cn } from "@/lib/utils";import { Routes } from "@/router";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";import UserAvatar from "./UserAvatar";-import { Popover, PopoverContent, PopoverTrigger } from "./ui/Popover";+import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";interface Props {collapsed?: boolean;diff --git a/web/src/components/VisibilityIcon.tsx b/web/src/components/VisibilityIcon.tsxindex eef31a43b..e72e56c96 100644--- a/web/src/components/VisibilityIcon.tsx+++ b/web/src/components/VisibilityIcon.tsx@@ -1,6 +1,6 @@import { Globe2Icon, LockIcon, UsersIcon } from "lucide-react";+import { cn } from "@/lib/utils";import { Visibility } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";interface Props {visibility: Visibility;diff --git a/web/src/components/kit/OverflowTip.tsx b/web/src/components/kit/OverflowTip.tsxindex 5aafae8c7..9b13abcd1 100644--- a/web/src/components/kit/OverflowTip.tsx+++ b/web/src/components/kit/OverflowTip.tsx@@ -1,6 +1,6 @@-import { Tooltip } from "@mui/joy";import { useRef, useState, useEffect } from "react";-import { cn } from "@/utils";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";+import { cn } from "@/lib/utils";interface Props {children: React.ReactNode;@@ -20,11 +20,20 @@ const OverflowTip = ({ children, className }: Props) => {}, []);return (- <Tooltip title={children} placement="top" arrow disableHoverListener={!isOverflowed}>- <div ref={textElementRef} className={cn("truncate", className)}>- {children}- </div>- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <div ref={textElementRef} className={cn("truncate", className)}>+ {children}+ </div>+ </TooltipTrigger>+ {isOverflowed && (+ <TooltipContent>+ <p>{children}</p>+ </TooltipContent>+ )}+ </Tooltip>+ </TooltipProvider>);};diff --git a/web/src/components/ui/Popover.tsx b/web/src/components/ui/Popover.tsxindex 8e5736eb8..902cf7af0 100644--- a/web/src/components/ui/Popover.tsx+++ b/web/src/components/ui/Popover.tsx@@ -1,28 +1,34 @@import * as PopoverPrimitive from "@radix-ui/react-popover";import * as React from "react";-import { cn } from "@/utils";+import { cn } from "@/lib/utils";-const Popover = PopoverPrimitive.Root;+function Popover({ ...props }: React.ComponentProps<typeof PopoverPrimitive.Root>) {+ return <PopoverPrimitive.Root data-slot="popover" {...props} />;+}-const PopoverTrigger = PopoverPrimitive.Trigger;+function PopoverTrigger({ ...props }: React.ComponentProps<typeof PopoverPrimitive.Trigger>) {+ return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />;+}-const PopoverContent = React.forwardRef<- React.ElementRef<typeof PopoverPrimitive.Content>,- React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>->(({ className, align = "center", sideOffset = 4, ...props }, ref) => (- <PopoverPrimitive.Portal>- <PopoverPrimitive.Content- ref={ref}- align={align}- sideOffset={sideOffset}- className={cn(- "z-2000 w-auto rounded-md bg-white dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-800 p-1 shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",- className,- )}- {...props}- />- </PopoverPrimitive.Portal>-));-PopoverContent.displayName = PopoverPrimitive.Content.displayName;+function PopoverContent({ className, align = "center", sideOffset = 4, ...props }: React.ComponentProps<typeof PopoverPrimitive.Content>) {+ return (+ <PopoverPrimitive.Portal>+ <PopoverPrimitive.Content+ data-slot="popover-content"+ align={align}+ sideOffset={sideOffset}+ className={cn(+ "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-auto origin-(--radix-popover-content-transform-origin) rounded-md border p-1 shadow-md outline-hidden",+ className,+ )}+ {...props}+ />+ </PopoverPrimitive.Portal>+ );+}-export { Popover, PopoverTrigger, PopoverContent };+function PopoverAnchor({ ...props }: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {+ return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />;+}++export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };diff --git a/web/src/components/ui/badge.tsx b/web/src/components/ui/badge.tsxnew file mode 100644index 000000000..844f5c8c0--- /dev/null+++ b/web/src/components/ui/badge.tsx@@ -0,0 +1,35 @@+import { Slot } from "@radix-ui/react-slot";+import { cva, type VariantProps } from "class-variance-authority";+import * as React from "react";+import { cn } from "@/lib/utils";++const badgeVariants = cva(+ "inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden",+ {+ variants: {+ variant: {+ default: "border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",+ secondary: "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",+ destructive:+ "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",+ outline: "text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",+ },+ },+ defaultVariants: {+ variant: "default",+ },+ },+);++function Badge({+ className,+ variant,+ asChild = false,+ ...props+}: React.ComponentProps<"span"> & VariantProps<typeof badgeVariants> & { asChild?: boolean }) {+ const Comp = asChild ? Slot : "span";++ return <Comp data-slot="badge" className={cn(badgeVariants({ variant }), className)} {...props} />;+}++export { Badge, badgeVariants };diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsxnew file mode 100644index 000000000..abbb40de3--- /dev/null+++ b/web/src/components/ui/button.tsx@@ -0,0 +1,47 @@+import { Slot } from "@radix-ui/react-slot";+import { cva, type VariantProps } from "class-variance-authority";+import * as React from "react";+import { cn } from "@/lib/utils";++const buttonVariants = cva(+ "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",+ {+ variants: {+ variant: {+ default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",+ destructive:+ "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",+ outline:+ "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",+ secondary: "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",+ ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",+ link: "text-primary underline-offset-4 hover:underline",+ },+ size: {+ default: "h-8 px-3 py-2 has-[>svg]:px-3",+ sm: "h-7 rounded-md gap-1 px-2 has-[>svg]:px-2",+ lg: "h-9 rounded-md px-4 has-[>svg]:px-3",+ icon: "size-8",+ },+ },+ defaultVariants: {+ variant: "default",+ size: "default",+ },+ },+);++const Button = React.forwardRef<+ HTMLButtonElement,+ React.ComponentProps<"button"> &+ VariantProps<typeof buttonVariants> & {+ asChild?: boolean;+ }+>(({ className, variant, size, asChild = false, ...props }, ref) => {+ const Comp = asChild ? Slot : "button";++ return <Comp ref={ref} data-slot="button" className={cn(buttonVariants({ variant, size, className }))} {...props} />;+});+Button.displayName = "Button";++export { Button, buttonVariants };diff --git a/web/src/components/ui/checkbox.tsx b/web/src/components/ui/checkbox.tsxnew file mode 100644index 000000000..46f8d60a5--- /dev/null+++ b/web/src/components/ui/checkbox.tsx@@ -0,0 +1,23 @@+import * as CheckboxPrimitive from "@radix-ui/react-checkbox";+import { CheckIcon } from "lucide-react";+import * as React from "react";+import { cn } from "@/lib/utils";++function Checkbox({ className, ...props }: React.ComponentProps<typeof CheckboxPrimitive.Root>) {+ return (+ <CheckboxPrimitive.Root+ data-slot="checkbox"+ className={cn(+ "peer border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",+ className,+ )}+ {...props}+ >+ <CheckboxPrimitive.Indicator data-slot="checkbox-indicator" className="flex items-center justify-center text-current transition-none">+ <CheckIcon className="size-3.5" />+ </CheckboxPrimitive.Indicator>+ </CheckboxPrimitive.Root>+ );+}++export { Checkbox };diff --git a/web/src/components/ui/command.tsx b/web/src/components/ui/command.tsxnew file mode 100644index 000000000..fa516f9b8--- /dev/null+++ b/web/src/components/ui/command.tsx@@ -0,0 +1,111 @@+import { Command as CommandPrimitive } from "cmdk";+import { SearchIcon } from "lucide-react";+import * as React from "react";+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";+import { cn } from "@/lib/utils";++function Command({ className, ...props }: React.ComponentProps<typeof CommandPrimitive>) {+ return (+ <CommandPrimitive+ data-slot="command"+ className={cn("bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md", className)}+ {...props}+ />+ );+}++function CommandDialog({+ title = "Command Palette",+ description = "Search for a command to run...",+ children,+ className,+ showCloseButton = true,+ ...props+}: React.ComponentProps<typeof Dialog> & {+ title?: string;+ description?: string;+ className?: string;+ showCloseButton?: boolean;+}) {+ return (+ <Dialog {...props}>+ <DialogHeader className="sr-only">+ <DialogTitle>{title}</DialogTitle>+ <DialogDescription>{description}</DialogDescription>+ </DialogHeader>+ <DialogContent className={cn("overflow-hidden p-0", className)} showCloseButton={showCloseButton}>+ <Command className="[&_[cmdk-group-heading]]:text-muted-foreground **:data-[slot=command-input-wrapper]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">+ {children}+ </Command>+ </DialogContent>+ </Dialog>+ );+}++function CommandInput({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.Input>) {+ return (+ <div data-slot="command-input-wrapper" className="flex h-9 items-center gap-2 border-b px-3">+ <SearchIcon className="size-4 shrink-0 opacity-50" />+ <CommandPrimitive.Input+ data-slot="command-input"+ className={cn(+ "placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50",+ className,+ )}+ {...props}+ />+ </div>+ );+}++function CommandList({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.List>) {+ return (+ <CommandPrimitive.List+ data-slot="command-list"+ className={cn("max-h-[300px] scroll-py-1 overflow-x-hidden overflow-y-auto", className)}+ {...props}+ />+ );+}++function CommandEmpty({ ...props }: React.ComponentProps<typeof CommandPrimitive.Empty>) {+ return <CommandPrimitive.Empty data-slot="command-empty" className="py-6 text-center text-sm" {...props} />;+}++function CommandGroup({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.Group>) {+ return (+ <CommandPrimitive.Group+ data-slot="command-group"+ className={cn(+ "text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium",+ className,+ )}+ {...props}+ />+ );+}++function CommandSeparator({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.Separator>) {+ return <CommandPrimitive.Separator data-slot="command-separator" className={cn("bg-border -mx-1 h-px", className)} {...props} />;+}++function CommandItem({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.Item>) {+ return (+ <CommandPrimitive.Item+ data-slot="command-item"+ className={cn(+ "data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",+ className,+ )}+ {...props}+ />+ );+}++function CommandShortcut({ className, ...props }: React.ComponentProps<"span">) {+ return (+ <span data-slot="command-shortcut" className={cn("text-muted-foreground ml-auto text-xs tracking-widest", className)} {...props} />+ );+}++export { Command, CommandDialog, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem, CommandShortcut, CommandSeparator };diff --git a/web/src/components/ui/dialog.tsx b/web/src/components/ui/dialog.tsxnew file mode 100644index 000000000..84c00c66b--- /dev/null+++ b/web/src/components/ui/dialog.tsx@@ -0,0 +1,98 @@+import * as DialogPrimitive from "@radix-ui/react-dialog";+import { XIcon } from "lucide-react";+import * as React from "react";+import { cn } from "@/lib/utils";++function Dialog({ ...props }: React.ComponentProps<typeof DialogPrimitive.Root>) {+ return <DialogPrimitive.Root data-slot="dialog" {...props} />;+}++function DialogTrigger({ ...props }: React.ComponentProps<typeof DialogPrimitive.Trigger>) {+ return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;+}++function DialogPortal({ ...props }: React.ComponentProps<typeof DialogPrimitive.Portal>) {+ return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;+}++function DialogClose({ ...props }: React.ComponentProps<typeof DialogPrimitive.Close>) {+ return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;+}++function DialogOverlay({ className, ...props }: React.ComponentProps<typeof DialogPrimitive.Overlay>) {+ return (+ <DialogPrimitive.Overlay+ data-slot="dialog-overlay"+ className={cn(+ "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",+ className,+ )}+ {...props}+ />+ );+}++function DialogContent({+ className,+ children,+ showCloseButton = true,+ ...props+}: React.ComponentProps<typeof DialogPrimitive.Content> & {+ showCloseButton?: boolean;+}) {+ return (+ <DialogPortal data-slot="dialog-portal">+ <DialogOverlay />+ <DialogPrimitive.Content+ data-slot="dialog-content"+ className={cn(+ "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",+ className,+ )}+ {...props}+ >+ {children}+ {showCloseButton && (+ <DialogPrimitive.Close+ data-slot="dialog-close"+ className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"+ >+ <XIcon />+ <span className="sr-only">Close</span>+ </DialogPrimitive.Close>+ )}+ </DialogPrimitive.Content>+ </DialogPortal>+ );+}++function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {+ return <div data-slot="dialog-header" className={cn("flex flex-col gap-2 text-center sm:text-left", className)} {...props} />;+}++function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {+ return <div data-slot="dialog-footer" className={cn("flex flex-col-reverse gap-2 sm:flex-row sm:justify-end", className)} {...props} />;+}++function DialogTitle({ className, ...props }: React.ComponentProps<typeof DialogPrimitive.Title>) {+ return <DialogPrimitive.Title data-slot="dialog-title" className={cn("text-lg leading-none font-semibold", className)} {...props} />;+}++function DialogDescription({ className, ...props }: React.ComponentProps<typeof DialogPrimitive.Description>) {+ return (+ <DialogPrimitive.Description data-slot="dialog-description" className={cn("text-muted-foreground text-sm", className)} {...props} />+ );+}++export {+ Dialog,+ DialogClose,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogOverlay,+ DialogPortal,+ DialogTitle,+ DialogTrigger,+};diff --git a/web/src/components/ui/input.tsx b/web/src/components/ui/input.tsxnew file mode 100644index 000000000..e9d0e8ac5--- /dev/null+++ b/web/src/components/ui/input.tsx@@ -0,0 +1,20 @@+import * as React from "react";+import { cn } from "@/lib/utils";++function Input({ className, type, ...props }: React.ComponentProps<"input">) {+ return (+ <input+ type={type}+ data-slot="input"+ className={cn(+ "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",+ "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",+ "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",+ className,+ )}+ {...props}+ />+ );+}++export { Input };diff --git a/web/src/components/ui/label.tsx b/web/src/components/ui/label.tsxnew file mode 100644index 000000000..390d14675--- /dev/null+++ b/web/src/components/ui/label.tsx@@ -0,0 +1,18 @@+import * as LabelPrimitive from "@radix-ui/react-label";+import * as React from "react";+import { cn } from "@/lib/utils";++function Label({ className, ...props }: React.ComponentProps<typeof LabelPrimitive.Root>) {+ return (+ <LabelPrimitive.Root+ data-slot="label"+ className={cn(+ "flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",+ className,+ )}+ {...props}+ />+ );+}++export { Label };diff --git a/web/src/components/ui/radio-group.tsx b/web/src/components/ui/radio-group.tsxnew file mode 100644index 000000000..ef501355b--- /dev/null+++ b/web/src/components/ui/radio-group.tsx@@ -0,0 +1,27 @@+import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";+import { CircleIcon } from "lucide-react";+import * as React from "react";+import { cn } from "@/lib/utils";++function RadioGroup({ className, ...props }: React.ComponentProps<typeof RadioGroupPrimitive.Root>) {+ return <RadioGroupPrimitive.Root data-slot="radio-group" className={cn("grid gap-3", className)} {...props} />;+}++function RadioGroupItem({ className, ...props }: React.ComponentProps<typeof RadioGroupPrimitive.Item>) {+ return (+ <RadioGroupPrimitive.Item+ data-slot="radio-group-item"+ className={cn(+ "border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",+ className,+ )}+ {...props}+ >+ <RadioGroupPrimitive.Indicator data-slot="radio-group-indicator" className="relative flex items-center justify-center">+ <CircleIcon className="fill-primary absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2" />+ </RadioGroupPrimitive.Indicator>+ </RadioGroupPrimitive.Item>+ );+}++export { RadioGroup, RadioGroupItem };diff --git a/web/src/components/ui/select.tsx b/web/src/components/ui/select.tsxnew file mode 100644index 000000000..c1f65b451--- /dev/null+++ b/web/src/components/ui/select.tsx@@ -0,0 +1,144 @@+import * as SelectPrimitive from "@radix-ui/react-select";+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";+import * as React from "react";+import { cn } from "@/lib/utils";++function Select({ ...props }: React.ComponentProps<typeof SelectPrimitive.Root>) {+ return <SelectPrimitive.Root data-slot="select" {...props} />;+}++function SelectGroup({ ...props }: React.ComponentProps<typeof SelectPrimitive.Group>) {+ return <SelectPrimitive.Group data-slot="select-group" {...props} />;+}++function SelectValue({ ...props }: React.ComponentProps<typeof SelectPrimitive.Value>) {+ return <SelectPrimitive.Value data-slot="select-value" {...props} />;+}++function SelectTrigger({+ className,+ size = "default",+ children,+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {+ size?: "sm" | "default";+}) {+ return (+ <SelectPrimitive.Trigger+ data-slot="select-trigger"+ data-size={size}+ className={cn(+ "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",+ className,+ )}+ {...props}+ >+ {children}+ <SelectPrimitive.Icon asChild>+ <ChevronDownIcon className="size-4 opacity-50" />+ </SelectPrimitive.Icon>+ </SelectPrimitive.Trigger>+ );+}++function SelectContent({ className, children, position = "popper", ...props }: React.ComponentProps<typeof SelectPrimitive.Content>) {+ return (+ <SelectPrimitive.Portal>+ <SelectPrimitive.Content+ data-slot="select-content"+ className={cn(+ "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",+ position === "popper" &&+ "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",+ className,+ )}+ position={position}+ {...props}+ >+ <SelectScrollUpButton />+ <SelectPrimitive.Viewport+ className={cn(+ "p-1",+ position === "popper" && "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",+ )}+ >+ {children}+ </SelectPrimitive.Viewport>+ <SelectScrollDownButton />+ </SelectPrimitive.Content>+ </SelectPrimitive.Portal>+ );+}++function SelectLabel({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.Label>) {+ return (+ <SelectPrimitive.Label data-slot="select-label" className={cn("text-muted-foreground px-2 py-1.5 text-xs", className)} {...props} />+ );+}++function SelectItem({ className, children, ...props }: React.ComponentProps<typeof SelectPrimitive.Item>) {+ return (+ <SelectPrimitive.Item+ data-slot="select-item"+ className={cn(+ "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",+ className,+ )}+ {...props}+ >+ <span className="absolute right-2 flex size-3.5 items-center justify-center">+ <SelectPrimitive.ItemIndicator>+ <CheckIcon className="size-4" />+ </SelectPrimitive.ItemIndicator>+ </span>+ <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>+ </SelectPrimitive.Item>+ );+}++function SelectSeparator({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.Separator>) {+ return (+ <SelectPrimitive.Separator+ data-slot="select-separator"+ className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}+ {...props}+ />+ );+}++function SelectScrollUpButton({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {+ return (+ <SelectPrimitive.ScrollUpButton+ data-slot="select-scroll-up-button"+ className={cn("flex cursor-default items-center justify-center py-1", className)}+ {...props}+ >+ <ChevronUpIcon className="size-4" />+ </SelectPrimitive.ScrollUpButton>+ );+}++function SelectScrollDownButton({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {+ return (+ <SelectPrimitive.ScrollDownButton+ data-slot="select-scroll-down-button"+ className={cn("flex cursor-default items-center justify-center py-1", className)}+ {...props}+ >+ <ChevronDownIcon className="size-4" />+ </SelectPrimitive.ScrollDownButton>+ );+}++export {+ Select,+ SelectContent,+ SelectGroup,+ SelectItem,+ SelectLabel,+ SelectScrollDownButton,+ SelectScrollUpButton,+ SelectSeparator,+ SelectTrigger,+ SelectValue,+};diff --git a/web/src/components/ui/separator.tsx b/web/src/components/ui/separator.tsxnew file mode 100644index 000000000..7f7abe17f--- /dev/null+++ b/web/src/components/ui/separator.tsx@@ -0,0 +1,25 @@+import * as SeparatorPrimitive from "@radix-ui/react-separator";+import * as React from "react";+import { cn } from "@/lib/utils";++function Separator({+ className,+ orientation = "horizontal",+ decorative = true,+ ...props+}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {+ return (+ <SeparatorPrimitive.Root+ data-slot="separator"+ decorative={decorative}+ orientation={orientation}+ className={cn(+ "bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",+ className,+ )}+ {...props}+ />+ );+}++export { Separator };diff --git a/web/src/components/ui/sheet.tsx b/web/src/components/ui/sheet.tsxnew file mode 100644index 000000000..1b280208f--- /dev/null+++ b/web/src/components/ui/sheet.tsx@@ -0,0 +1,87 @@+import * as SheetPrimitive from "@radix-ui/react-dialog";+import { XIcon } from "lucide-react";+import * as React from "react";+import { cn } from "@/lib/utils";++function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {+ return <SheetPrimitive.Root data-slot="sheet" {...props} />;+}++function SheetTrigger({ ...props }: React.ComponentProps<typeof SheetPrimitive.Trigger>) {+ return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />;+}++function SheetClose({ ...props }: React.ComponentProps<typeof SheetPrimitive.Close>) {+ return <SheetPrimitive.Close data-slot="sheet-close" {...props} />;+}++function SheetPortal({ ...props }: React.ComponentProps<typeof SheetPrimitive.Portal>) {+ return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />;+}++function SheetOverlay({ className, ...props }: React.ComponentProps<typeof SheetPrimitive.Overlay>) {+ return (+ <SheetPrimitive.Overlay+ data-slot="sheet-overlay"+ className={cn(+ "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",+ className,+ )}+ {...props}+ />+ );+}++function SheetContent({+ className,+ children,+ side = "right",+ ...props+}: React.ComponentProps<typeof SheetPrimitive.Content> & {+ side?: "top" | "right" | "bottom" | "left";+}) {+ return (+ <SheetPortal>+ <SheetOverlay />+ <SheetPrimitive.Content+ data-slot="sheet-content"+ className={cn(+ "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",+ side === "right" &&+ "data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm",+ side === "left" &&+ "data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm",+ side === "top" && "data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b",+ side === "bottom" &&+ "data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t",+ className,+ )}+ {...props}+ >+ {children}+ <SheetPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none">+ <XIcon className="size-4" />+ <span className="sr-only">Close</span>+ </SheetPrimitive.Close>+ </SheetPrimitive.Content>+ </SheetPortal>+ );+}++function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {+ return <div data-slot="sheet-header" className={cn("flex flex-col gap-1.5 p-4", className)} {...props} />;+}++function SheetFooter({ className, ...props }: React.ComponentProps<"div">) {+ return <div data-slot="sheet-footer" className={cn("mt-auto flex flex-col gap-2 p-4", className)} {...props} />;+}++function SheetTitle({ className, ...props }: React.ComponentProps<typeof SheetPrimitive.Title>) {+ return <SheetPrimitive.Title data-slot="sheet-title" className={cn("text-foreground font-semibold", className)} {...props} />;+}++function SheetDescription({ className, ...props }: React.ComponentProps<typeof SheetPrimitive.Description>) {+ return <SheetPrimitive.Description data-slot="sheet-description" className={cn("text-muted-foreground text-sm", className)} {...props} />;+}++export { Sheet, SheetTrigger, SheetClose, SheetContent, SheetHeader, SheetFooter, SheetTitle, SheetDescription };diff --git a/web/src/components/ui/switch.tsx b/web/src/components/ui/switch.tsxnew file mode 100644index 000000000..605678b8d--- /dev/null+++ b/web/src/components/ui/switch.tsx@@ -0,0 +1,25 @@+import * as SwitchPrimitive from "@radix-ui/react-switch";+import * as React from "react";+import { cn } from "@/lib/utils";++function Switch({ className, ...props }: React.ComponentProps<typeof SwitchPrimitive.Root>) {+ return (+ <SwitchPrimitive.Root+ data-slot="switch"+ className={cn(+ "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",+ className,+ )}+ {...props}+ >+ <SwitchPrimitive.Thumb+ data-slot="switch-thumb"+ className={cn(+ "bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0",+ )}+ />+ </SwitchPrimitive.Root>+ );+}++export { Switch };diff --git a/web/src/components/ui/textarea.tsx b/web/src/components/ui/textarea.tsxnew file mode 100644index 000000000..c65b7dcad--- /dev/null+++ b/web/src/components/ui/textarea.tsx@@ -0,0 +1,17 @@+import * as React from "react";+import { cn } from "@/lib/utils";++function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {+ return (+ <textarea+ data-slot="textarea"+ className={cn(+ "border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",+ className,+ )}+ {...props}+ />+ );+}++export { Textarea };diff --git a/web/src/components/ui/tooltip.tsx b/web/src/components/ui/tooltip.tsxnew file mode 100644index 000000000..c304efd52--- /dev/null+++ b/web/src/components/ui/tooltip.tsx@@ -0,0 +1,40 @@+import * as TooltipPrimitive from "@radix-ui/react-tooltip";+import * as React from "react";+import { cn } from "@/lib/utils";++function TooltipProvider({ delayDuration = 0, ...props }: React.ComponentProps<typeof TooltipPrimitive.Provider>) {+ return <TooltipPrimitive.Provider data-slot="tooltip-provider" delayDuration={delayDuration} {...props} />;+}++function Tooltip({ ...props }: React.ComponentProps<typeof TooltipPrimitive.Root>) {+ return (+ <TooltipProvider>+ <TooltipPrimitive.Root data-slot="tooltip" {...props} />+ </TooltipProvider>+ );+}++function TooltipTrigger({ ...props }: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {+ return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;+}++function TooltipContent({ className, sideOffset = 0, children, ...props }: React.ComponentProps<typeof TooltipPrimitive.Content>) {+ return (+ <TooltipPrimitive.Portal>+ <TooltipPrimitive.Content+ data-slot="tooltip-content"+ sideOffset={sideOffset}+ className={cn(+ "bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",+ className,+ )}+ {...props}+ >+ {children}+ <TooltipPrimitive.Arrow className="bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]" />+ </TooltipPrimitive.Content>+ </TooltipPrimitive.Portal>+ );+}++export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };diff --git a/web/src/layouts/HomeLayout.tsx b/web/src/layouts/HomeLayout.tsxindex 8be2e178f..1d7171335 100644--- a/web/src/layouts/HomeLayout.tsx+++ b/web/src/layouts/HomeLayout.tsx@@ -3,7 +3,7 @@ import { Outlet } from "react-router-dom";import { HomeSidebar, HomeSidebarDrawer } from "@/components/HomeSidebar";import MobileHeader from "@/components/MobileHeader";import useResponsiveWidth from "@/hooks/useResponsiveWidth";-import { cn } from "@/utils";+import { cn } from "@/lib/utils";const HomeLayout = observer(() => {const { md, lg } = useResponsiveWidth();diff --git a/web/src/layouts/RootLayout.tsx b/web/src/layouts/RootLayout.tsxindex 3fd59227d..7bac4b9d9 100644--- a/web/src/layouts/RootLayout.tsx+++ b/web/src/layouts/RootLayout.tsx@@ -5,11 +5,11 @@ import usePrevious from "react-use/lib/usePrevious";import Navigation from "@/components/Navigation";import useCurrentUser from "@/hooks/useCurrentUser";import useResponsiveWidth from "@/hooks/useResponsiveWidth";+import { cn } from "@/lib/utils";import Loading from "@/pages/Loading";import { Routes } from "@/router";import { workspaceStore } from "@/store/v2";import memoFilterStore from "@/store/v2/memoFilter";-import { cn } from "@/utils";const RootLayout = observer(() => {const location = useLocation();diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.tsnew file mode 100644index 000000000..a5ef19350--- /dev/null+++ b/web/src/lib/utils.ts@@ -0,0 +1,6 @@+import { clsx, type ClassValue } from "clsx";+import { twMerge } from "tailwind-merge";++export function cn(...inputs: ClassValue[]) {+ return twMerge(clsx(inputs));+}diff --git a/web/src/main.tsx b/web/src/main.tsxindex 459a78449..e83009733 100644--- a/web/src/main.tsx+++ b/web/src/main.tsx@@ -1,5 +1,4 @@import "@github/relative-time-element";-import { CssVarsProvider } from "@mui/joy";import { observer } from "mobx-react-lite";import { createRoot } from "react-dom/client";import { Toaster } from "react-hot-toast";@@ -9,15 +8,13 @@ import router from "./router";import { initialUserStore } from "./store/v2/user";import { initialWorkspaceStore } from "./store/v2/workspace";import "./style.css";-import theme from "./theme";-import "@usememos/mui/dist/index.css";import "leaflet/dist/leaflet.css";const Main = observer(() => (- <CssVarsProvider theme={theme}>+ <><RouterProvider router={router} /><Toaster position="top-right" toastOptions={{ className: "dark:bg-zinc-700 dark:text-gray-300" }} />- </CssVarsProvider>+ </>));(async () => {diff --git a/web/src/pages/Attachments.tsx b/web/src/pages/Attachments.tsxindex 7c98bb51d..6adc4328d 100644--- a/web/src/pages/Attachments.tsx+++ b/web/src/pages/Attachments.tsx@@ -1,5 +1,3 @@-import { Divider, Tooltip } from "@mui/joy";-import { Button, Input } from "@usememos/mui";import dayjs from "dayjs";import { includes } from "lodash-es";import { PaperclipIcon, SearchIcon, TrashIcon } from "lucide-react";@@ -8,6 +6,10 @@ import { useEffect, useState } from "react";import AttachmentIcon from "@/components/AttachmentIcon";import Empty from "@/components/Empty";import MobileHeader from "@/components/MobileHeader";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Separator } from "@/components/ui/separator";+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { attachmentServiceClient } from "@/grpcweb";import useLoading from "@/hooks/useLoading";import useResponsiveWidth from "@/hooks/useResponsiveWidth";@@ -75,13 +77,15 @@ const Attachments = observer(() => {<span className="text-lg">{t("common.attachments")}</span></p><div>- <Input- className="max-w-32"- placeholder={t("common.search")}- startDecorator={<SearchIcon className="w-4 h-auto" />}- value={state.searchQuery}- onChange={(e) => setState({ ...state, searchQuery: e.target.value })}- />+ <div className="relative max-w-32">+ <SearchIcon className="absolute left-3 top-1/2 transform -translate-y-1/2 w-4 h-4 text-gray-500" />+ <Input+ className="pl-9"+ placeholder={t("common.search")}+ value={state.searchQuery}+ onChange={(e) => setState({ ...state, searchQuery: e.target.value })}+ />+ </div></div></div><div className="w-full flex flex-col justify-start items-start mt-4 mb-6">@@ -127,18 +131,25 @@ const Attachments = observer(() => {{unusedAttachments.length > 0 && (<>- <Divider />+ <Separator /><div className="w-full flex flex-row justify-start items-start"><div className="w-16 sm:w-24 sm:pl-4 flex flex-col justify-start items-start"></div><div className="w-full max-w-[calc(100%-4rem)] sm:max-w-[calc(100%-6rem)] flex flex-row justify-start items-start gap-4 flex-wrap"><div className="w-full flex flex-row justify-start items-center gap-2"><span className="text-gray-600 dark:text-gray-400">{t("resource.unused-resources")}</span><span className="text-gray-500 dark:text-gray-500 opacity-80">({unusedAttachments.length})</span>- <Tooltip title="Delete all" placement="top">- <Button variant="plain" onClick={handleDeleteUnusedAttachments}>- <TrashIcon className="w-4 h-auto opacity-60" />- </Button>- </Tooltip>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button variant="ghost" size="sm" onClick={handleDeleteUnusedAttachments}>+ <TrashIcon className="w-4 h-auto opacity-60" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <p>Delete all</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider></div>{unusedAttachments.map((attachment) => {return (diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsxindex 06888a180..43b557741 100644--- a/web/src/pages/MemoDetail.tsx+++ b/web/src/pages/MemoDetail.tsx@@ -1,4 +1,3 @@-import { Button } from "@usememos/mui";import { ArrowUpLeftFromCircleIcon, MessageCircleIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { ClientError } from "nice-grpc-web";@@ -9,14 +8,15 @@ import { MemoDetailSidebar, MemoDetailSidebarDrawer } from "@/components/MemoDetimport MemoEditor from "@/components/MemoEditor";import MemoView from "@/components/MemoView";import MobileHeader from "@/components/MobileHeader";+import { Button } from "@/components/ui/button";import useCurrentUser from "@/hooks/useCurrentUser";import useNavigateTo from "@/hooks/useNavigateTo";import useResponsiveWidth from "@/hooks/useResponsiveWidth";+import { cn } from "@/lib/utils";import { memoNamePrefix } from "@/store/common";import { memoStore } from "@/store/v2";import { workspaceStore } from "@/store/v2";import { Memo, MemoRelation_Type } from "@/types/proto/api/v1/memo_service";-import { cn } from "@/utils";import { useTranslate } from "@/utils/i18n";const MemoDetail = observer(() => {@@ -122,7 +122,7 @@ const MemoDetail = observer(() => {{comments.length === 0 ? (showCreateCommentButton && (<div className="w-full flex flex-row justify-center items-center py-6">- <Button variant="plain" color="primary" onClick={handleShowCommentEditor}>+ <Button variant="ghost" onClick={handleShowCommentEditor}><span className="text-gray-500">{t("memo.comment.write-a-comment")}</span><MessageCircleIcon className="ml-2 w-5 h-auto text-gray-500" /></Button>@@ -137,7 +137,7 @@ const MemoDetail = observer(() => {<span className="text-gray-400 text-sm ml-1">({comments.length})</span></div>{showCreateCommentButton && (- <Button variant="plain" color="primary" className="text-gray-500" onClick={handleShowCommentEditor}>+ <Button variant="ghost" className="text-gray-500" onClick={handleShowCommentEditor}>{t("memo.comment.write-a-comment")}</Button>)}diff --git a/web/src/pages/Setting.tsx b/web/src/pages/Setting.tsxindex 2d3eff394..f7826f4e5 100644--- a/web/src/pages/Setting.tsx+++ b/web/src/pages/Setting.tsx@@ -1,4 +1,3 @@-import { Option, Select } from "@mui/joy";import { CogIcon, DatabaseIcon, KeyIcon, LibraryIcon, LucideIcon, Settings2Icon, UserIcon, UsersIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { useCallback, useEffect, useMemo, useState } from "react";@@ -12,6 +11,7 @@ import SSOSection from "@/components/Settings/SSOSection";import SectionMenuItem from "@/components/Settings/SectionMenuItem";import StorageSection from "@/components/Settings/StorageSection";import WorkspaceSection from "@/components/Settings/WorkspaceSection";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";import useCurrentUser from "@/hooks/useCurrentUser";import useResponsiveWidth from "@/hooks/useResponsiveWidth";import { workspaceStore } from "@/store/v2";@@ -123,12 +123,17 @@ const Setting = observer(() => {</div><div className="w-full grow sm:pl-4 overflow-x-auto"><div className="w-auto inline-block my-2 sm:hidden">- <Select value={state.selectedSection} onChange={(_, value) => handleSectionSelectorItemClick(value as SettingSection)}>- {settingsSectionList.map((settingSection) => (- <Option key={settingSection} value={settingSection}>- {t(`setting.${settingSection}`)}- </Option>- ))}+ <Select value={state.selectedSection} onValueChange={(value) => handleSectionSelectorItemClick(value as SettingSection)}>+ <SelectTrigger className="w-[180px]">+ <SelectValue placeholder="Select section" />+ </SelectTrigger>+ <SelectContent>+ {settingsSectionList.map((settingSection) => (+ <SelectItem key={settingSection} value={settingSection}>+ {t(`setting.${settingSection}`)}+ </SelectItem>+ ))}+ </SelectContent></Select></div>{state.selectedSection === "my-account" ? (diff --git a/web/src/pages/SignIn.tsx b/web/src/pages/SignIn.tsxindex d9e5ff2b6..b5bf36b14 100644--- a/web/src/pages/SignIn.tsx+++ b/web/src/pages/SignIn.tsx@@ -1,11 +1,11 @@-import { Divider } from "@mui/joy";-import { Button } from "@usememos/mui";import { observer } from "mobx-react-lite";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";import { Link } from "react-router-dom";import AuthFooter from "@/components/AuthFooter";import PasswordSignInForm from "@/components/PasswordSignInForm";+import { Button } from "@/components/ui/button";+import { Separator } from "@/components/ui/separator";import { identityProviderServiceClient } from "@/grpcweb";import { absolutifyLink } from "@/helpers/utils";import useCurrentUser from "@/hooks/useCurrentUser";@@ -79,14 +79,20 @@ const SignIn = observer(() => {)}{identityProviderList.length > 0 && (<>- {!workspaceGeneralSetting.disallowPasswordAuth && <Divider className="my-4!">{t("common.or")}</Divider>}+ {!workspaceGeneralSetting.disallowPasswordAuth && (+ <div className="relative my-4 w-full">+ <Separator />+ <div className="absolute inset-0 flex items-center justify-center">+ <span className="bg-background px-2 text-xs text-muted-foreground">{t("common.or")}</span>+ </div>+ </div>+ )}<div className="w-full flex flex-col space-y-2">{identityProviderList.map((identityProvider) => (<Button- className="bg-white dark:bg-black"+ className="bg-white dark:bg-black w-full"key={identityProvider.name}- variant="outlined"- fullWidth+ variant="outline"onClick={() => handleSignInWithIdentityProvider(identityProvider)}>{t("common.sign-in-with", { provider: identityProvider.title })}diff --git a/web/src/pages/SignUp.tsx b/web/src/pages/SignUp.tsxindex a00ae3a1f..4a34b8936 100644--- a/web/src/pages/SignUp.tsx+++ b/web/src/pages/SignUp.tsx@@ -1,4 +1,3 @@-import { Button, Input } from "@usememos/mui";import { LoaderIcon } from "lucide-react";import { observer } from "mobx-react-lite";import { ClientError } from "nice-grpc-web";@@ -6,6 +5,8 @@ import { useState } from "react";import { toast } from "react-hot-toast";import { Link } from "react-router-dom";import AuthFooter from "@/components/AuthFooter";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";import { authServiceClient, userServiceClient } from "@/grpcweb";import useLoading from "@/hooks/useLoading";import useNavigateTo from "@/hooks/useNavigateTo";@@ -83,8 +84,7 @@ const SignUp = observer(() => {<div className="w-full flex flex-col justify-start items-start"><span className="leading-8 text-gray-600">{t("common.username")}</span><Input- className="w-full bg-white dark:bg-black"- size="lg"+ className="w-full bg-white dark:bg-black h-10"type="text"readOnly={actionBtnLoadingState.isLoading}placeholder={t("common.username")}@@ -99,8 +99,7 @@ const SignUp = observer(() => {<div className="w-full flex flex-col justify-start items-start"><span className="leading-8 text-gray-600">{t("common.password")}</span><Input- className="w-full bg-white dark:bg-black"- size="lg"+ className="w-full bg-white dark:bg-black h-10"type="password"readOnly={actionBtnLoadingState.isLoading}placeholder={t("common.password")}@@ -114,14 +113,7 @@ const SignUp = observer(() => {</div></div><div className="flex flex-row justify-end items-center w-full mt-6">- <Button- type="submit"- color="primary"- size="lg"- fullWidth- disabled={actionBtnLoadingState.isLoading}- onClick={handleSignUpButtonClick}- >+ <Button type="submit" className="w-full h-10" disabled={actionBtnLoadingState.isLoading} onClick={handleSignUpButtonClick}>{t("common.sign-up")}{actionBtnLoadingState.isLoading && <LoaderIcon className="w-5 h-auto ml-2 animate-spin opacity-60" />}</Button>diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsxindex 33e7c4b43..8adf13762 100644--- a/web/src/pages/UserProfile.tsx+++ b/web/src/pages/UserProfile.tsx@@ -1,4 +1,3 @@-import { Button } from "@usememos/mui";import copy from "copy-to-clipboard";import dayjs from "dayjs";import { ExternalLinkIcon } from "lucide-react";@@ -9,6 +8,7 @@ import { useParams } from "react-router-dom";import MemoView from "@/components/MemoView";import PagedMemoList from "@/components/PagedMemoList";import UserAvatar from "@/components/UserAvatar";+import { Button } from "@/components/ui/button";import useLoading from "@/hooks/useLoading";import { viewStore, userStore } from "@/store/v2";import memoFilterStore from "@/store/v2/memoFilter";@@ -81,7 +81,7 @@ const UserProfile = observer(() => {(user ? (<><div className="my-4 w-full flex justify-end items-center gap-2">- <Button variant="outlined" onClick={handleCopyProfileLink}>+ <Button variant="outline" onClick={handleCopyProfileLink}>{t("common.share")}<ExternalLinkIcon className="ml-1 w-4 h-auto opacity-60" /></Button>diff --git a/web/src/style.css b/web/src/style.cssindex 45202c1ea..86fa616ab 100644--- a/web/src/style.css+++ b/web/src/style.css@@ -1,7 +1,126 @@@import "tailwindcss";+@import "tw-animate-css";++@custom-variant dark (&:is(.dark *));@theme {--default-transition-duration: 150ms;}@variant dark (&:is(.dark *));++@theme inline {+ --radius-sm: calc(var(--radius) - 4px);+ --radius-md: calc(var(--radius) - 2px);+ --radius-lg: var(--radius);+ --radius-xl: calc(var(--radius) + 4px);+ --color-background: var(--background);+ --color-foreground: var(--foreground);+ --color-card: var(--card);+ --color-card-foreground: var(--card-foreground);+ --color-popover: var(--popover);+ --color-popover-foreground: var(--popover-foreground);+ --color-primary: var(--primary);+ --color-primary-foreground: var(--primary-foreground);+ --color-secondary: var(--secondary);+ --color-secondary-foreground: var(--secondary-foreground);+ --color-muted: var(--muted);+ --color-muted-foreground: var(--muted-foreground);+ --color-accent: var(--accent);+ --color-accent-foreground: var(--accent-foreground);+ --color-destructive: var(--destructive);+ --color-border: var(--border);+ --color-input: var(--input);+ --color-ring: var(--ring);+ --color-chart-1: var(--chart-1);+ --color-chart-2: var(--chart-2);+ --color-chart-3: var(--chart-3);+ --color-chart-4: var(--chart-4);+ --color-chart-5: var(--chart-5);+ --color-sidebar: var(--sidebar);+ --color-sidebar-foreground: var(--sidebar-foreground);+ --color-sidebar-primary: var(--sidebar-primary);+ --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);+ --color-sidebar-accent: var(--sidebar-accent);+ --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);+ --color-sidebar-border: var(--sidebar-border);+ --color-sidebar-ring: var(--sidebar-ring);+}++:root {+ --radius: 0.625rem;+ --background: oklch(1 0 0);+ --foreground: oklch(0.141 0.005 285.823);+ --card: oklch(1 0 0);+ --card-foreground: oklch(0.141 0.005 285.823);+ --popover: oklch(1 0 0);+ --popover-foreground: oklch(0.141 0.005 285.823);+ --primary: oklch(0.21 0.006 285.885);+ --primary-foreground: oklch(0.985 0 0);+ --secondary: oklch(0.967 0.001 286.375);+ --secondary-foreground: oklch(0.21 0.006 285.885);+ --muted: oklch(0.967 0.001 286.375);+ --muted-foreground: oklch(0.552 0.016 285.938);+ --accent: oklch(0.967 0.001 286.375);+ --accent-foreground: oklch(0.21 0.006 285.885);+ --destructive: oklch(0.577 0.245 27.325);+ --border: oklch(0.92 0.004 286.32);+ --input: oklch(0.92 0.004 286.32);+ --ring: oklch(0.705 0.015 286.067);+ --chart-1: oklch(0.646 0.222 41.116);+ --chart-2: oklch(0.6 0.118 184.704);+ --chart-3: oklch(0.398 0.07 227.392);+ --chart-4: oklch(0.828 0.189 84.429);+ --chart-5: oklch(0.769 0.188 70.08);+ --sidebar: oklch(0.985 0 0);+ --sidebar-foreground: oklch(0.141 0.005 285.823);+ --sidebar-primary: oklch(0.21 0.006 285.885);+ --sidebar-primary-foreground: oklch(0.985 0 0);+ --sidebar-accent: oklch(0.967 0.001 286.375);+ --sidebar-accent-foreground: oklch(0.21 0.006 285.885);+ --sidebar-border: oklch(0.92 0.004 286.32);+ --sidebar-ring: oklch(0.705 0.015 286.067);+}++.dark {+ --background: oklch(0.141 0.005 285.823);+ --foreground: oklch(0.985 0 0);+ --card: oklch(0.21 0.006 285.885);+ --card-foreground: oklch(0.985 0 0);+ --popover: oklch(0.21 0.006 285.885);+ --popover-foreground: oklch(0.985 0 0);+ --primary: oklch(0.92 0.004 286.32);+ --primary-foreground: oklch(0.21 0.006 285.885);+ --secondary: oklch(0.274 0.006 286.033);+ --secondary-foreground: oklch(0.985 0 0);+ --muted: oklch(0.274 0.006 286.033);+ --muted-foreground: oklch(0.705 0.015 286.067);+ --accent: oklch(0.274 0.006 286.033);+ --accent-foreground: oklch(0.985 0 0);+ --destructive: oklch(0.704 0.191 22.216);+ --border: oklch(1 0 0 / 10%);+ --input: oklch(1 0 0 / 15%);+ --ring: oklch(0.552 0.016 285.938);+ --chart-1: oklch(0.488 0.243 264.376);+ --chart-2: oklch(0.696 0.17 162.48);+ --chart-3: oklch(0.769 0.188 70.08);+ --chart-4: oklch(0.627 0.265 303.9);+ --chart-5: oklch(0.645 0.246 16.439);+ --sidebar: oklch(0.21 0.006 285.885);+ --sidebar-foreground: oklch(0.985 0 0);+ --sidebar-primary: oklch(0.488 0.243 264.376);+ --sidebar-primary-foreground: oklch(0.985 0 0);+ --sidebar-accent: oklch(0.274 0.006 286.033);+ --sidebar-accent-foreground: oklch(0.985 0 0);+ --sidebar-border: oklch(1 0 0 / 10%);+ --sidebar-ring: oklch(0.552 0.016 285.938);+}++@layer base {+ * {+ @apply border-border outline-ring/50;+ }+ body {+ @apply bg-background text-foreground;+ }+}diff --git a/web/src/theme/index.ts b/web/src/theme/index.tsindex 22f89a45f..77b70ca57 100644--- a/web/src/theme/index.ts+++ b/web/src/theme/index.ts@@ -1,35 +1,5 @@-import { extendTheme } from "@mui/joy";+// Theme configuration for Tailwind CSS v4+// This file is kept for compatibility but no longer used for MUI theme configuration+// All styling is now handled by Tailwind CSS-const theme = extendTheme({- components: {- JoyButton: {- defaultProps: {- size: "sm",- },- },- JoyInput: {- defaultProps: {- size: "sm",- },- },- JoySelect: {- defaultProps: {- size: "sm",- },- styleOverrides: {- listbox: {- zIndex: 9999,- },- },- },- JoyAutocomplete: {- styleOverrides: {- listbox: {- zIndex: 9999,- },- },- },- },-});--export default theme;+export default {};diff --git a/web/src/utils/index.ts b/web/src/utils/index.tsdeleted file mode 100644index 178cd64f8..000000000--- a/web/src/utils/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./utils";diff --git a/web/src/utils/utils.ts b/web/src/utils/utils.tsdeleted file mode 100644index ccd813e3e..000000000--- a/web/src/utils/utils.ts+++ /dev/null@@ -1,6 +0,0 @@-import { type ClassValue, clsx } from "clsx";-import { twMerge } from "tailwind-merge";--export const cn = (...inputs: ClassValue[]) => {- return twMerge(clsx(inputs));-};diff --git a/web/vite.config.mts b/web/vite.config.mtsindex 2238c4844..d39adc157 100644--- a/web/vite.config.mts+++ b/web/vite.config.mts@@ -46,7 +46,6 @@ export default defineConfig({rollupOptions: {output: {manualChunks: {- "mui-vendor": ["@mui/joy", "@emotion/react", "@emotion/styled"],"utils-vendor": ["dayjs", "lodash-es"],"katex-vendor": ["katex"],"mermaid-vendor": ["mermaid"],