开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
feat(popover): add reusable popover and replace radix popover
pubuzhixing8d30388a6d23a
diff --git a/package-lock.json b/package-lock.jsonindex a0a142b..5d6bfd8 100644--- a/package-lock.json+++ b/package-lock.json@@ -16,7 +16,6 @@"@plait/layouts": "^0.68.0","@plait/mind": "^0.68.0","@plait/text-plugins": "^0.68.0",- "@radix-ui/react-popover": "^1.0.3","ahooks": "^3.8.0","browser-fs-access": "^0.35.0","classnames": "^2.5.1",@@ -2647,19 +2646,6 @@"node": "^12.22.0 || ^14.17.0 || >=16.0.0"}},- "node_modules/@floating-ui/core": {- "version": "0.7.3",- "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz",- "integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg=="- },- "node_modules/@floating-ui/dom": {- "version": "0.5.4",- "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz",- "integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==",- "dependencies": {- "@floating-ui/core": "^0.7.3"- }- },"node_modules/@floating-ui/react": {"version": "0.26.24","resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.24.tgz",@@ -2674,19 +2660,6 @@"react-dom": ">=16.8.0"}},- "node_modules/@floating-ui/react-dom": {- "version": "0.7.2",- "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz",- "integrity": "sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==",- "dependencies": {- "@floating-ui/dom": "^0.5.3",- "use-isomorphic-layout-effect": "^1.1.1"- },- "peerDependencies": {- "react": ">=16.8.0",- "react-dom": ">=16.8.0"- }- },"node_modules/@floating-ui/react/node_modules/@floating-ui/core": {"version": "1.6.8","resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",@@ -4002,283 +3975,6 @@"integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==","dev": true},- "node_modules/@radix-ui/primitive": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.0.tgz",- "integrity": "sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==",- "dependencies": {- "@babel/runtime": "^7.13.10"- }- },- "node_modules/@radix-ui/react-arrow": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.1.tgz",- "integrity": "sha512-1yientwXqXcErDHEv8av9ZVNEBldH8L9scVR3is20lL+jOCfcJyMFZFEY5cgIrgexsq1qggSXqiEL/d/4f+QXA==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-primitive": "1.0.1"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-compose-refs": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz",- "integrity": "sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==",- "dependencies": {- "@babel/runtime": "^7.13.10"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-context": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.0.tgz",- "integrity": "sha512-1pVM9RfOQ+n/N5PJK33kRSKsr1glNxomxONs5c49MliinBY6Yw2Q995qfBUUo0/Mbg05B/sGA0gkgPI7kmSHBg==",- "dependencies": {- "@babel/runtime": "^7.13.10"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-dismissable-layer": {- "version": "1.0.2",- "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.2.tgz",- "integrity": "sha512-WjJzMrTWROozDqLB0uRWYvj4UuXsM/2L19EmQ3Au+IJWqwvwq9Bwd+P8ivo0Deg9JDPArR1I6MbWNi1CmXsskg==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/primitive": "1.0.0",- "@radix-ui/react-compose-refs": "1.0.0",- "@radix-ui/react-primitive": "1.0.1",- "@radix-ui/react-use-callback-ref": "1.0.0",- "@radix-ui/react-use-escape-keydown": "1.0.2"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-focus-guards": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.0.tgz",- "integrity": "sha512-UagjDk4ijOAnGu4WMUPj9ahi7/zJJqNZ9ZAiGPp7waUWJO0O1aWXi/udPphI0IUjvrhBsZJGSN66dR2dsueLWQ==",- "dependencies": {- "@babel/runtime": "^7.13.10"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-focus-scope": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.1.tgz",- "integrity": "sha512-Ej2MQTit8IWJiS2uuujGUmxXjF/y5xZptIIQnyd2JHLwtV0R2j9NRVoRj/1j/gJ7e3REdaBw4Hjf4a1ImhkZcQ==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-compose-refs": "1.0.0",- "@radix-ui/react-primitive": "1.0.1",- "@radix-ui/react-use-callback-ref": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-id": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.0.tgz",- "integrity": "sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-use-layout-effect": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-popover": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.0.3.tgz",- "integrity": "sha512-YwedSukfWsyJs3/yP3yXUq44k4/JBe3jqU63Z8v2i19qZZ3dsx32oma17ztgclWPNuqp3A+Xa9UiDlZHyVX8Vg==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/primitive": "1.0.0",- "@radix-ui/react-compose-refs": "1.0.0",- "@radix-ui/react-context": "1.0.0",- "@radix-ui/react-dismissable-layer": "1.0.2",- "@radix-ui/react-focus-guards": "1.0.0",- "@radix-ui/react-focus-scope": "1.0.1",- "@radix-ui/react-id": "1.0.0",- "@radix-ui/react-popper": "1.1.0",- "@radix-ui/react-portal": "1.0.1",- "@radix-ui/react-presence": "1.0.0",- "@radix-ui/react-primitive": "1.0.1",- "@radix-ui/react-slot": "1.0.1",- "@radix-ui/react-use-controllable-state": "1.0.0",- "aria-hidden": "^1.1.1",- "react-remove-scroll": "2.5.5"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-popper": {- "version": "1.1.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.0.tgz",- "integrity": "sha512-07U7jpI0dZcLRAxT7L9qs6HecSoPhDSJybF7mEGHJDBDv+ZoGCvIlva0s+WxMXwJEav+ckX3hAlXBtnHmuvlCQ==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@floating-ui/react-dom": "0.7.2",- "@radix-ui/react-arrow": "1.0.1",- "@radix-ui/react-compose-refs": "1.0.0",- "@radix-ui/react-context": "1.0.0",- "@radix-ui/react-primitive": "1.0.1",- "@radix-ui/react-use-callback-ref": "1.0.0",- "@radix-ui/react-use-layout-effect": "1.0.0",- "@radix-ui/react-use-rect": "1.0.0",- "@radix-ui/react-use-size": "1.0.0",- "@radix-ui/rect": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-portal": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.1.tgz",- "integrity": "sha512-NY2vUWI5WENgAT1nfC6JS7RU5xRYBfjZVLq0HmgEN1Ezy3rk/UruMV4+Rd0F40PEaFC5SrLS1ixYvcYIQrb4Ig==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-primitive": "1.0.1"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-presence": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.0.tgz",- "integrity": "sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-compose-refs": "1.0.0",- "@radix-ui/react-use-layout-effect": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-primitive": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.1.tgz",- "integrity": "sha512-fHbmislWVkZaIdeF6GZxF0A/NH/3BjrGIYj+Ae6eTmTCr7EB0RQAAVEiqsXK6p3/JcRqVSBQoceZroj30Jj3XA==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-slot": "1.0.1"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-slot": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",- "integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-compose-refs": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-use-callback-ref": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.0.tgz",- "integrity": "sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==",- "dependencies": {- "@babel/runtime": "^7.13.10"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-use-controllable-state": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.0.tgz",- "integrity": "sha512-FohDoZvk3mEXh9AWAVyRTYR4Sq7/gavuofglmiXB2g1aKyboUD4YtgWxKj8O5n+Uak52gXQ4wKz5IFST4vtJHg==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-use-callback-ref": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-use-escape-keydown": {- "version": "1.0.2",- "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.2.tgz",- "integrity": "sha512-DXGim3x74WgUv+iMNCF+cAo8xUHHeqvjx8zs7trKf+FkQKPQXLk2sX7Gx1ysH7Q76xCpZuxIJE7HLPxRE+Q+GA==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-use-callback-ref": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-use-layout-effect": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.0.tgz",- "integrity": "sha512-6Tpkq+R6LOlmQb1R5NNETLG0B4YP0wc+klfXafpUCj6JGyaUc8il7/kUZ7m59rGbXGczE9Bs+iz2qloqsZBduQ==",- "dependencies": {- "@babel/runtime": "^7.13.10"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-use-rect": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.0.tgz",- "integrity": "sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/rect": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/react-use-size": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.0.tgz",- "integrity": "sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/react-use-layout-effect": "1.0.0"- },- "peerDependencies": {- "react": "^16.8 || ^17.0 || ^18.0"- }- },- "node_modules/@radix-ui/rect": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.0.tgz",- "integrity": "sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==",- "dependencies": {- "@babel/runtime": "^7.13.10"- }- },"node_modules/@rollup/pluginutils": {"version": "5.1.0","resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",@@ -5627,13 +5323,13 @@"version": "15.7.12","resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz","integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",- "devOptional": true+ "dev": true},"node_modules/@types/react": {"version": "18.3.1","resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz","integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==",- "devOptional": true,+ "dev": true,"dependencies": {"@types/prop-types": "*","csstype": "^3.0.2"@@ -6579,17 +6275,6 @@"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==","dev": true},- "node_modules/aria-hidden": {- "version": "1.2.4",- "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",- "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",- "dependencies": {- "tslib": "^2.0.0"- },- "engines": {- "node": ">=10"- }- },"node_modules/aria-query": {"version": "5.3.0","resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",@@ -7900,7 +7585,7 @@"version": "3.1.3","resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz","integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",- "devOptional": true+ "dev": true},"node_modules/damerau-levenshtein": {"version": "1.0.8",@@ -8166,11 +7851,6 @@"node": ">=8"}},- "node_modules/detect-node-es": {- "version": "1.1.0",- "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",- "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="- },"node_modules/detect-port": {"version": "1.6.1","resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.6.1.tgz",@@ -9917,14 +9597,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/get-nonce": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",- "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",- "engines": {- "node": ">=6"- }- },"node_modules/get-package-type": {"version": "0.1.0","resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",@@ -10535,14 +10207,6 @@"resolved": "https://registry.npmjs.org/intersection-observer/-/intersection-observer-0.12.2.tgz","integrity": "sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg=="},- "node_modules/invariant": {- "version": "2.2.4",- "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",- "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",- "dependencies": {- "loose-envify": "^1.0.0"- }- },"node_modules/is-array-buffer": {"version": "3.0.4","resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",@@ -13469,73 +13133,6 @@"node": ">=0.10.0"}},- "node_modules/react-remove-scroll": {- "version": "2.5.5",- "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",- "integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",- "dependencies": {- "react-remove-scroll-bar": "^2.3.3",- "react-style-singleton": "^2.2.1",- "tslib": "^2.1.0",- "use-callback-ref": "^1.3.0",- "use-sidecar": "^1.1.2"- },- "engines": {- "node": ">=10"- },- "peerDependencies": {- "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",- "react": "^16.8.0 || ^17.0.0 || ^18.0.0"- },- "peerDependenciesMeta": {- "@types/react": {- "optional": true- }- }- },- "node_modules/react-remove-scroll-bar": {- "version": "2.3.6",- "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz",- "integrity": "sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==",- "dependencies": {- "react-style-singleton": "^2.2.1",- "tslib": "^2.0.0"- },- "engines": {- "node": ">=10"- },- "peerDependencies": {- "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",- "react": "^16.8.0 || ^17.0.0 || ^18.0.0"- },- "peerDependenciesMeta": {- "@types/react": {- "optional": true- }- }- },- "node_modules/react-style-singleton": {- "version": "2.2.1",- "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",- "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",- "dependencies": {- "get-nonce": "^1.0.0",- "invariant": "^2.2.4",- "tslib": "^2.0.0"- },- "engines": {- "node": ">=10"- },- "peerDependencies": {- "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",- "react": "^16.8.0 || ^17.0.0 || ^18.0.0"- },- "peerDependenciesMeta": {- "@types/react": {- "optional": true- }- }- },"node_modules/readable-stream": {"version": "3.6.2","resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",@@ -15352,60 +14949,6 @@"requires-port": "^1.0.0"}},- "node_modules/use-callback-ref": {- "version": "1.3.2",- "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz",- "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==",- "dependencies": {- "tslib": "^2.0.0"- },- "engines": {- "node": ">=10"- },- "peerDependencies": {- "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",- "react": "^16.8.0 || ^17.0.0 || ^18.0.0"- },- "peerDependenciesMeta": {- "@types/react": {- "optional": true- }- }- },- "node_modules/use-isomorphic-layout-effect": {- "version": "1.1.2",- "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",- "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",- "peerDependencies": {- "react": "^16.8.0 || ^17.0.0 || ^18.0.0"- },- "peerDependenciesMeta": {- "@types/react": {- "optional": true- }- }- },- "node_modules/use-sidecar": {- "version": "1.1.2",- "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",- "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==",- "dependencies": {- "detect-node-es": "^1.1.0",- "tslib": "^2.0.0"- },- "engines": {- "node": ">=10"- },- "peerDependencies": {- "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",- "react": "^16.8.0 || ^17.0.0 || ^18.0.0"- },- "peerDependenciesMeta": {- "@types/react": {- "optional": true- }- }- },"node_modules/util-deprecate": {"version": "1.0.2","resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",diff --git a/package.json b/package.jsonindex 09b0458..263811b 100644--- a/package.json+++ b/package.json@@ -16,7 +16,6 @@"@plait/layouts": "^0.68.0","@plait/mind": "^0.68.0","@plait/text-plugins": "^0.68.0",- "@radix-ui/react-popover": "^1.0.3","ahooks": "^3.8.0","browser-fs-access": "^0.35.0","classnames": "^2.5.1",diff --git a/packages/drawnix/src/components/popover/popover.tsx b/packages/drawnix/src/components/popover/popover.tsxnew file mode 100644index 0000000..32ea326--- /dev/null+++ b/packages/drawnix/src/components/popover/popover.tsx@@ -0,0 +1,188 @@+import * as React from 'react';+import {+ useFloating,+ autoUpdate,+ offset,+ flip,+ shift,+ useClick,+ useDismiss,+ useRole,+ useInteractions,+ useMergeRefs,+ Placement,+ FloatingPortal,+ FloatingFocusManager,+ useId,+} from '@floating-ui/react';++interface PopoverOptions {+ initialOpen?: boolean;+ placement?: Placement;+ modal?: boolean;+ open?: boolean;+ sideOffset?: number;+ onOpenChange?: (open: boolean) => void;+}++export function usePopover({+ initialOpen = false,+ placement = 'bottom',+ modal,+ sideOffset,+ open: controlledOpen,+ onOpenChange: setControlledOpen,+}: PopoverOptions = {}) {+ const [uncontrolledOpen, setUncontrolledOpen] = React.useState(initialOpen);+ const [labelId, setLabelId] = React.useState<string | undefined>();+ const [descriptionId, setDescriptionId] = React.useState<+ string | undefined+ >();++ const open = controlledOpen ?? uncontrolledOpen;+ const setOpen = setControlledOpen ?? setUncontrolledOpen;++ const data = useFloating({+ placement,+ open,+ onOpenChange: setOpen,+ whileElementsMounted: autoUpdate,+ middleware: [+ offset(sideOffset || 4),+ flip({+ crossAxis: placement.includes('-'),+ fallbackAxisSideDirection: 'end',+ padding: 5,+ }),+ shift({ padding: 5 }),+ ],+ });++ const context = data.context;++ const click = useClick(context, {+ enabled: controlledOpen == null,+ });+ const dismiss = useDismiss(context);+ const role = useRole(context);++ const interactions = useInteractions([click, dismiss, role]);++ return React.useMemo(+ () => ({+ open,+ setOpen,+ ...interactions,+ ...data,+ modal,+ labelId,+ descriptionId,+ setLabelId,+ setDescriptionId,+ }),+ [open, setOpen, interactions, data, modal, labelId, descriptionId]+ );+}++type ContextType =+ | (ReturnType<typeof usePopover> & {+ setLabelId: React.Dispatch<React.SetStateAction<string | undefined>>;+ setDescriptionId: React.Dispatch<+ React.SetStateAction<string | undefined>+ >;+ })+ | null;++const PopoverContext = React.createContext<ContextType>(null);++export const usePopoverContext = () => {+ const context = React.useContext(PopoverContext);++ if (context == null) {+ throw new Error('Popover components must be wrapped in <Popover />');+ }++ return context;+};++export function Popover({+ children,+ modal = false,+ ...restOptions+}: {+ children: React.ReactNode;+} & PopoverOptions) {+ // This can accept any props as options, e.g. `placement`,+ // or other positioning options.+ const popover = usePopover({ modal, ...restOptions });+ return (+ <PopoverContext.Provider value={popover}>+ {children}+ </PopoverContext.Provider>+ );+}++interface PopoverTriggerProps {+ children: React.ReactNode;+ asChild?: boolean;+}++export const PopoverTrigger = React.forwardRef<+ HTMLElement,+ React.HTMLProps<HTMLElement> & PopoverTriggerProps+>(function PopoverTrigger({ children, asChild = false, ...props }, propRef) {+ const context = usePopoverContext();+ const childrenRef = (children as any).ref;+ const ref = useMergeRefs([context.refs.setReference, propRef, childrenRef]);++ // `asChild` allows the user to pass any element as the anchor+ if (asChild && React.isValidElement(children)) {+ return React.cloneElement(+ children,+ context.getReferenceProps({+ ref,+ ...props,+ ...children.props,+ 'data-state': context.open ? 'open' : 'closed',+ })+ );+ }++ return (+ <button+ ref={ref}+ type="button"+ // The user can style the trigger based on the state+ data-state={context.open ? 'open' : 'closed'}+ {...context.getReferenceProps(props)}+ >+ {children}+ </button>+ );+});++export const PopoverContent = React.forwardRef<+ HTMLDivElement,+ React.HTMLProps<HTMLDivElement> & { container?: HTMLElement | null }+>(function PopoverContent({ container, style, ...props }, propRef) {+ const { context: floatingContext, ...context } = usePopoverContext();+ const ref = useMergeRefs([context.refs.setFloating, propRef]);++ if (!floatingContext.open) return null;++ return (+ <FloatingPortal root={container}>+ <FloatingFocusManager context={floatingContext} modal={context.modal}>+ <div+ ref={ref}+ style={{ ...context.floatingStyles, ...style }}+ aria-labelledby={context.labelId}+ aria-describedby={context.descriptionId}+ {...context.getFloatingProps(props)}+ >+ {props.children}+ </div>+ </FloatingFocusManager>+ </FloatingPortal>+ );+});diff --git a/packages/drawnix/src/components/toolbar/draw-toolbar.tsx b/packages/drawnix/src/components/toolbar/draw-toolbar.tsxindex 8349773..6b14bf9 100644--- a/packages/drawnix/src/components/toolbar/draw-toolbar.tsx+++ b/packages/drawnix/src/components/toolbar/draw-toolbar.tsx@@ -21,10 +21,10 @@ import { MindPointerType } from '@plait/mind';import { DrawnixPointerType } from '../../drawnix';import { BoardCreationMode, setCreationMode } from '@plait/common';import { ArrowLineShape, BasicShapes, DrawPointerType } from '@plait/draw';-import * as Popover from '@radix-ui/react-popover';import { ShapePanel } from './shape-panel';import { ArrowPanel } from './arrow-panel';import { useState } from 'react';+import { Popover, PopoverContent, PopoverTrigger } from '../popover/popover';export enum PopupKey {'shape' = 'shape',@@ -131,14 +131,15 @@ export const DrawToolbar: React.FC<DrawToolbarProps> = ({ setPointer }) => {{BUTTONS.map((button, index) => {if (button.popupKey === PopupKey.shape) {return (- <Popover.Root+ <Popoverkey={index}open={shapeOpen}+ sideOffset={12}onOpenChange={(open) => {setShapeOpen(open);}}>- <Popover.Trigger asChild>+ <PopoverTrigger asChild><ToolButtontype="icon"visible={true}@@ -151,6 +152,7 @@ export const DrawToolbar: React.FC<DrawToolbarProps> = ({ setPointer }) => {title={`Shape`}aria-label={`Shape`}onPointerDown={() => {+ setShapeOpen(!shapeOpen);BoardTransforms.updatePointerType(board,BasicShapes.rectangle@@ -159,38 +161,38 @@ export const DrawToolbar: React.FC<DrawToolbarProps> = ({ setPointer }) => {setCreationMode(board, BoardCreationMode.drawing);}}/>- </Popover.Trigger>- <Popover.Portal container={container}>- <Popover.Content sideOffset={12}>- <ShapePanel- onPointerUp={(pointer: DrawPointerType) => {- setShapeOpen(false);- setPointer(pointer);- }}- ></ShapePanel>- </Popover.Content>- </Popover.Portal>- </Popover.Root>+ </PopoverTrigger>+ <PopoverContent container={container}>+ <ShapePanel+ onPointerUp={(pointer: DrawPointerType) => {+ setShapeOpen(false);+ setPointer(pointer);+ }}+ ></ShapePanel>+ </PopoverContent>+ </Popover>);}if (button.popupKey === PopupKey.arrow) {return (- <Popover.Root+ <Popoverkey={index}open={arrowOpen}+ sideOffset={12}onOpenChange={(open) => {setArrowOpen(open);}}>- <Popover.Trigger asChild>+ <PopoverTrigger asChild><ToolButtontype="icon"visible={true}selected={arrowOpen || isArrowLinePointer(board)}icon={button.icon}- title={`Shape`}- aria-label={`Shape`}+ title={`Arrow`}+ aria-label={`Arrow`}onPointerDown={() => {+ setArrowOpen(!shapeOpen);BoardTransforms.updatePointerType(board,ArrowLineShape.straight@@ -199,18 +201,16 @@ export const DrawToolbar: React.FC<DrawToolbarProps> = ({ setPointer }) => {setCreationMode(board, BoardCreationMode.drawing);}}/>- </Popover.Trigger>- <Popover.Portal container={container}>- <Popover.Content sideOffset={12}>- <ArrowPanel- onPointerUp={(pointer: DrawPointerType) => {- setArrowOpen(false);- setPointer(pointer);- }}- ></ArrowPanel>- </Popover.Content>- </Popover.Portal>- </Popover.Root>+ </PopoverTrigger>+ <PopoverContent container={container}>+ <ArrowPanel+ onPointerUp={(pointer: DrawPointerType) => {+ setArrowOpen(false);+ setPointer(pointer);+ }}+ ></ArrowPanel>+ </PopoverContent>+ </Popover>);}return (