diff --git a/package.json b/package.json index f247adc..5aef830 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ }, "dependencies": { "@ant-design/charts": "^1.4.2", + "@ant-design/icons": "^5.2.6", "@ant-design/plots": "^1.2.5", "@emotion/react": "^11.11.1", "antd": "^5.11.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 206d1ca..1b4390c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,13 +1,12 @@ lockfileVersion: '6.0' -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - dependencies: '@ant-design/charts': specifier: ^1.4.2 - version: 1.4.2(@ant-design/icons@4.8.1)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13) + version: 1.4.2(@ant-design/icons@5.2.6)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': + specifier: ^5.2.6 + version: 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/plots': specifier: ^1.2.5 version: 1.2.5(react-dom@18.2.0)(react@18.2.0) @@ -117,7 +116,7 @@ packages: '@jridgewell/trace-mapping': 0.3.19 dev: true - /@ant-design/charts@1.4.2(@ant-design/icons@4.8.1)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13): + /@ant-design/charts@1.4.2(@ant-design/icons@5.2.6)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-BcVx6AAnwxSdzAVUZReSuvUVtnT5AkJivq3wmcYj17scll26HHficg35yimGskAj3Gu1upYjBQBz6Tk7GEMJsQ==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -126,19 +125,17 @@ packages: react: '>=16.8.4' react-dom: '>=16.8.4' dependencies: - '@ant-design/flowchart': 1.2.2(@ant-design/icons@4.8.1)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13) + '@ant-design/flowchart': 1.2.2(@ant-design/icons@5.2.6)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) '@ant-design/graphs': 1.4.0(react-dom@18.2.0)(react@18.2.0) - '@ant-design/icons': 4.8.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/maps': 1.0.7(react-dom@18.2.0)(react@18.2.0) '@ant-design/plots': 1.2.5(react-dom@18.2.0)(react@18.2.0) antd: 5.11.1(react-dom@18.2.0)(react@18.2.0) - lodash: 4.17.21 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: - bufferutil - classnames - - reflect-metadata - utf-8-validate dev: false @@ -148,12 +145,6 @@ packages: tinycolor2: 1.6.0 dev: false - /@ant-design/colors@6.0.0: - resolution: {integrity: sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==} - dependencies: - '@ctrl/tinycolor': 3.6.1 - dev: false - /@ant-design/colors@7.0.0: resolution: {integrity: sha512-iVm/9PfGCbC0dSMBrz7oiEXZaaGH7ceU40OJEfKmyuzR9R5CRimJYPlRiFtMQGQcbNMea/ePcoIebi4ASGYXtg==} dependencies: @@ -166,7 +157,7 @@ packages: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@emotion/hash': 0.8.0 '@emotion/unitless': 0.7.5 classnames: 2.3.2 @@ -177,7 +168,7 @@ packages: stylis: 4.2.0 dev: false - /@ant-design/flowchart@1.2.2(@ant-design/icons@4.8.1)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13): + /@ant-design/flowchart@1.2.2(@ant-design/icons@5.2.6)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-bzHZ81qqHjWIrXcCMInDB6eMTzbswaVCOAdUTCQJ+B45aybkVsU9LMCKquyOwRM7U7PWNfPC9S/lAlx2i2BvBQ==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -186,21 +177,19 @@ packages: react: '>=16.8.4' react-dom: '>=16.8.4' dependencies: - '@ant-design/icons': 4.8.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@antv/layout': 0.1.31 '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow': 1.0.55(@ant-design/icons@4.8.1)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13) + '@antv/xflow': 1.0.55(@ant-design/icons@5.2.6)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) antd: 5.11.1(react-dom@18.2.0)(react@18.2.0) - lodash: 4.17.21 react: 18.2.0 react-color: 2.17.3(react@18.2.0) react-dom: 18.2.0(react@18.2.0) react-use: 17.3.1(react-dom@18.2.0)(react@18.2.0) transitivePeerDependencies: - classnames - - reflect-metadata dev: false /@ant-design/graphs@1.4.0(react-dom@18.2.0)(react@18.2.0): @@ -223,23 +212,6 @@ packages: resolution: {integrity: sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g==} dev: false - /@ant-design/icons@4.8.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-JRAuiqllnMsiZIO8OvBOeFconprC3cnMpJ9MvXrHh+H5co9rlg8/aSHQfLf5jKKe18lUgRaIwC2pz8YxH9VuCA==} - engines: {node: '>=8'} - peerDependencies: - react: '>=16.0.0' - react-dom: '>=16.0.0' - dependencies: - '@ant-design/colors': 6.0.0 - '@ant-design/icons-svg': 4.3.1 - '@babel/runtime': 7.23.2 - classnames: 2.3.2 - lodash: 4.17.21 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - dev: false - /@ant-design/icons@5.2.6(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw==} engines: {node: '>=8'} @@ -249,7 +221,7 @@ packages: dependencies: '@ant-design/colors': 7.0.0 '@ant-design/icons-svg': 4.3.1 - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -291,7 +263,7 @@ packages: peerDependencies: react: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 json2mq: 0.2.0 react: 18.2.0 @@ -915,7 +887,7 @@ packages: utility-types: 3.10.0 dev: false - /@antv/xflow-core@1.0.55(@ant-design/icons@4.8.1)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0): + /@antv/xflow-core@1.0.55(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-FhjTstp/ZdO6mj8ERARJ6M9PWgikXvOpWwMTLCjc+i8vS4O3t4XL/fIu16MqJNuNdqfETcjJluHd06c32MTB/w==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -927,7 +899,7 @@ packages: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 dependencies: - '@ant-design/icons': 4.8.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) @@ -935,7 +907,6 @@ packages: antd: 5.11.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 immer: 9.0.21 - lodash: 4.17.21 mana-common: 0.3.2 mana-syringe: 0.2.2 react: 18.2.0 @@ -944,7 +915,7 @@ packages: rxjs: 6.6.7 dev: false - /@antv/xflow-extension@1.0.55(@ant-design/icons@4.8.1)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13): + /@antv/xflow-extension@1.0.55(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-iHRfO/ae4/9xvC5xVFmA9eIFg813DQa06hTgTdxLlt0Aojnfa5VnsGrIrPQoDDQovCXG8SavMDlnLZUpa491GQ==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -955,16 +926,14 @@ packages: classnames: ^2.2.6 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - reflect-metadata: ^0.1.13 dependencies: - '@ant-design/icons': 4.8.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow-core': 1.0.55(@ant-design/icons@4.8.1)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0) + '@antv/xflow-core': 1.0.55(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) '@antv/xflow-hook': 1.0.55 antd: 5.11.1(react-dom@18.2.0)(react@18.2.0) - classnames: 2.3.2 mana-syringe: 0.2.2 moment: 2.29.4 rc-field-form: 1.40.0(react-dom@18.2.0)(react@18.2.0) @@ -982,7 +951,7 @@ packages: toposort: 2.0.2 dev: false - /@antv/xflow@1.0.55(@ant-design/icons@4.8.1)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13): + /@antv/xflow@1.0.55(@ant-design/icons@5.2.6)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-1LRFZsDZDVuRwEYD0xFt7SGCbHducgXQ4GgPOzmaCMA5FMbQfZVpXhsOG4o/a9X+gKfYdpOELCLqpz7iykyArQ==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -991,21 +960,19 @@ packages: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 dependencies: - '@ant-design/icons': 4.8.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@antv/layout': 0.1.31 '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow-core': 1.0.55(@ant-design/icons@4.8.1)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow-extension': 1.0.55(@ant-design/icons@4.8.1)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(classnames@2.3.2)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.13) + '@antv/xflow-core': 1.0.55(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) + '@antv/xflow-extension': 1.0.55(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.11.1)(react-dom@18.2.0)(react@18.2.0) '@antv/xflow-hook': 1.0.55 antd: 5.11.1(react-dom@18.2.0)(react@18.2.0) - lodash: 4.17.21 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: - classnames - - reflect-metadata dev: false /@babel/code-frame@7.22.13: @@ -1251,7 +1218,7 @@ packages: resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} dependencies: '@babel/helper-module-imports': 7.22.15 - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@emotion/hash': 0.9.1 '@emotion/memoize': 0.8.1 '@emotion/serialize': 1.1.2 @@ -1773,7 +1740,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@ctrl/tinycolor': 3.6.1 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -1787,7 +1754,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -1797,7 +1764,7 @@ packages: resolution: {integrity: sha512-jS4E7T9Li2GuYwI6PyiVXmxTiM6b07rlD9Ge8uGZSCz3WlzcG5ZK7g5bbuKNeZ9pgUuPK/5guV781ujdVpm4HQ==} engines: {node: '>=8.x'} dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 dev: false /@rc-component/mutate-observer@1.1.0(react-dom@18.2.0)(react@18.2.0): @@ -1807,7 +1774,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -1821,7 +1788,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -1835,7 +1802,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 @@ -2621,7 +2588,7 @@ packages: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 cosmiconfig: 7.1.0 resolve: 1.22.6 dev: false @@ -3384,7 +3351,7 @@ packages: debug: 4.3.4 enhanced-resolve: 5.15.0 eslint: 8.50.0 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.50.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-typescript@3.6.1)(eslint@8.50.0) eslint-plugin-import: 2.28.1(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-typescript@3.6.1)(eslint@8.50.0) fast-glob: 3.3.1 get-tsconfig: 4.7.2 @@ -3427,6 +3394,35 @@ packages: - supports-color dev: true + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-typescript@3.6.1)(eslint@8.50.0): + resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} + engines: {node: '>=4'} + peerDependencies: + '@typescript-eslint/parser': '*' + eslint: '*' + eslint-import-resolver-node: '*' + eslint-import-resolver-typescript: '*' + eslint-import-resolver-webpack: '*' + peerDependenciesMeta: + '@typescript-eslint/parser': + optional: true + eslint: + optional: true + eslint-import-resolver-node: + optional: true + eslint-import-resolver-typescript: + optional: true + eslint-import-resolver-webpack: + optional: true + dependencies: + '@typescript-eslint/parser': 6.7.4(eslint@8.50.0)(typescript@5.2.2) + debug: 3.2.7 + eslint: 8.50.0 + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.7.4)(eslint-plugin-import@2.28.1)(eslint@8.50.0) + transitivePeerDependencies: + - supports-color + dev: true + /eslint-plugin-import@2.28.1(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-typescript@3.6.1)(eslint@8.50.0): resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==} engines: {node: '>=4'} @@ -4962,7 +4958,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 array-tree-filter: 2.1.0 classnames: 2.3.2 rc-select: 14.10.0(react-dom@18.2.0)(react@18.2.0) @@ -4978,7 +4974,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -4991,7 +4987,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -5005,7 +5001,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) @@ -5020,7 +5016,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) @@ -5049,7 +5045,7 @@ packages: react: '>=16.11.0' react-dom: '>=16.11.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -5064,7 +5060,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 async-validator: 4.2.5 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5077,7 +5073,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-dialog: 9.3.4(react-dom@18.2.0)(react@18.2.0) @@ -5093,7 +5089,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/mini-decimal': 1.1.0 classnames: 2.3.2 rc-input: 1.3.6(react-dom@18.2.0)(react@18.2.0) @@ -5108,7 +5104,7 @@ packages: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5121,7 +5117,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-input: 1.3.6(react-dom@18.2.0)(react@18.2.0) @@ -5138,7 +5134,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) @@ -5154,7 +5150,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5168,7 +5164,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -5182,7 +5178,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -5196,7 +5192,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5223,7 +5219,7 @@ packages: moment: optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 dayjs: 1.11.10 @@ -5238,7 +5234,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5252,7 +5248,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5265,7 +5261,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5279,7 +5275,7 @@ packages: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -5294,7 +5290,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) @@ -5312,7 +5308,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5326,7 +5322,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5339,7 +5335,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5353,7 +5349,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/context': 1.4.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) @@ -5370,7 +5366,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-dropdown: 4.1.0(react-dom@18.2.0)(react@18.2.0) rc-menu: 9.12.2(react-dom@18.2.0)(react@18.2.0) @@ -5387,7 +5383,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-input: 1.3.6(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) @@ -5402,7 +5398,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 react: 18.2.0 @@ -5415,7 +5411,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-select: 14.10.0(react-dom@18.2.0)(react@18.2.0) rc-tree: 5.8.2(react-dom@18.2.0)(react@18.2.0) @@ -5431,7 +5427,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -5462,7 +5458,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5485,7 +5481,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-is: 18.2.0 @@ -5498,7 +5494,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 classnames: 2.3.2 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -6578,3 +6574,7 @@ packages: react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: false + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false diff --git a/src/components/organisms/LocalSelector.tsx b/src/components/organisms/LocalSelector.tsx index af56e0f..a394ffe 100644 --- a/src/components/organisms/LocalSelector.tsx +++ b/src/components/organisms/LocalSelector.tsx @@ -1,5 +1,8 @@ import { MapSVG, type MetroID, MetroInfo } from "@/../static/MapSVGData"; import { type ReactNode } from "react"; +import { Dropdown, Flex } from "antd"; +import { DownOutlined } from "@ant-design/icons"; +import { css } from "@emotion/react"; interface Props { selected: MetroID; @@ -7,64 +10,102 @@ interface Props { } const LocalSelector = ({ selected, onClick = () => {} }: Props) => ( - - + > + 기초 자치 단체 선택하기 + + + +
+ + {MapSVG.map(group => + group.groupId === selected ? ( + + {group.component.map(shape => { + if (shape.type === `path`) { + return ( + onClick(shape.id)} + /> + ); + } + if (shape.type === `polygon`) { + return ( + onClick(shape.id)} + /> + ); + } + throw new Error(`${shape.id} is not path or polygon`); + })} + + ) : ( + + ), + )} + + ); export default LocalSelector; diff --git a/src/components/organisms/MetroSelector.tsx b/src/components/organisms/MetroSelector.tsx index d26e914..0687072 100644 --- a/src/components/organisms/MetroSelector.tsx +++ b/src/components/organisms/MetroSelector.tsx @@ -1,5 +1,8 @@ import { MapSVG, MetroInfo } from "@/../static/MapSVGData"; import { type ReactNode, useState } from "react"; +import { Dropdown, Flex } from "antd"; +import { css } from "@emotion/react"; +import { DownOutlined } from "@ant-design/icons"; interface Props { onClick?: (local: string) => void; @@ -8,64 +11,100 @@ interface Props { const MetroSelector = ({ onClick = () => {} }: Props) => { const [hover, setHover] = useState(""); return ( - - - {MapSVG.map(group => ( - + + + 광역 자치 단체 선택하기 + + + +
+ + {MapSVG.map(group => ( + { - setHover(group.groupId); - }} - onMouseLeave={() => { - setHover(""); - }} - onClick={() => { - onClick(group.groupId); - }} - > - {group.component.map(shape => { - if (shape.type === `path`) { - return ; - } - if (shape.type === `polygon`) { - return ( - - ); - } - throw new Error(`${shape.id} is not path or polygon`); - })} - - ))} - + : "#060606"}; + `} + onMouseEnter={() => { + setHover(group.groupId); + }} + onMouseLeave={() => { + setHover(""); + }} + onClick={() => { + onClick(group.groupId); + }} + > + {group.component.map(shape => { + if (shape.type === `path`) { + return ; + } + if (shape.type === `polygon`) { + return ( + + ); + } + throw new Error(`${shape.id} is not path or polygon`); + })} + + ))} + + ); }; diff --git a/src/components/pages/LocalCouncil.tsx b/src/components/pages/LocalCouncil.tsx index 28dd9fb..fce190f 100644 --- a/src/components/pages/LocalCouncil.tsx +++ b/src/components/pages/LocalCouncil.tsx @@ -1,32 +1,41 @@ -import React from "react"; +import React, { useState } from "react"; import { Flex } from "antd"; import { css } from "@emotion/react"; import { Layout } from "@/components/templates"; import { LocalSelector, MetroSelector } from "@/components/organisms"; +import { type MetroID } from "static/MapSVGData"; +import { useNavigate } from "react-router-dom"; -const LocalCouncil: React.FC = () => ( - - - { - alert(id); - }} - /> - { - alert(id); - }} - /> - - -); +const LocalCouncil: React.FC = () => { + const [metroId, setMetroId] = useState(); + const navigate = useNavigate(); + return ( + + + {metroId ? ( + { + navigate(`/localCouncilReport/${metroId}/${id}`); + }} + /> + ) : ( + { + setMetroId(id as MetroID); + }} + /> + )} + + + ); +}; export default LocalCouncil; diff --git a/static/MapSVGData.ts b/static/MapSVGData.ts index 2b11c65..87b4287 100644 --- a/static/MapSVGData.ts +++ b/static/MapSVGData.ts @@ -17,60 +17,84 @@ export type MetroID = | "인천광역시" | "서울특별시"; +export const themeColors = [ + "#031273", + "#0504AA", + "#2337C6", + "#4169E1", + "#4CC9F0", +]; + export const MetroInfo: { [id in MetroID]: { color: string; viewBox?: string }; } = { 제주특별자치도: { - color: "#4caff4", + color: themeColors[0], + viewBox: "355 600 150 150", }, 경상남도: { - color: "#4caff4", + color: themeColors[3], + viewBox: "200 400 250 250", }, 경상북도: { - color: "#4c6bf4", + color: themeColors[4], + viewBox: "220 200 300 300", }, 전라남도: { - color: "#4c6bf4", + color: themeColors[4], + viewBox: "0 450 280 280", }, 전라북도: { - color: "#9cc3ff", + color: themeColors[1], + viewBox: "65 350 220 220", }, 충청남도: { - color: "#4c4cf4", + color: themeColors[3], + viewBox: "30 220 220 220", }, 충청북도: { - color: "#4caff4", + color: themeColors[2], + viewBox: "150 190 240 240", }, 강원도: { - color: "#4c4cf4", + color: themeColors[3], + viewBox: "150 -30 320 320", }, 경기도: { - color: "#9cc3ff", + color: themeColors[4], + viewBox: "50 50 240 240", }, 세종특별자치시: { - color: "#6c6cd4", + color: themeColors[1], + viewBox: "140 280 100 100", }, 울산광역시: { - color: "#6c6cd4", + color: themeColors[2], + viewBox: "390 435 100 100", }, 대전광역시: { - color: "#9cc3ff", + color: themeColors[4], + viewBox: "165 320 80 80", }, 광주광역시: { - color: "#6c6cd4", + color: themeColors[3], + viewBox: "95 505 80 80", }, 대구광역시: { - color: "#6c6cd4", + color: themeColors[1], + viewBox: "285 340 150 150", }, 인천광역시: { - color: "#4c4cf4", + color: themeColors[1], + viewBox: "-20 80 180 180", }, 부산광역시: { - color: "#c3e1ff", + color: themeColors[0], + viewBox: "365 485 100 100", }, 서울특별시: { - color: "#c3e1ff", - viewBox: "100 100 150 150", + color: themeColors[0], + viewBox: "115 130 80 80", }, };