From 10c7b1af7d8d5399233237fedf5ade34eb66aad8 Mon Sep 17 00:00:00 2001 From: Wadjih Bencheikh Date: Thu, 13 Oct 2022 05:05:23 +0100 Subject: [PATCH] feat: sync 2d chart spectrum colors (#1807) * feat: sync 2d chart spectrum colors * refactor: update dependencies --- package-lock.json | 103 ++++++++++++++----------------- package.json | 14 ++--- src/component/2d/Left1DChart.tsx | 7 ++- src/component/2d/Top1DChart.tsx | 2 +- 4 files changed, 60 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index eaed6d749..ce194e1c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "openchemlib-utils": "^2.0.0", "re-resizable": "^6.9.9", "react-d3-utils": "^0.5.1", - "react-dropzone": "^14.2.2", + "react-dropzone": "^14.2.3", "react-error-boundary": "^3.1.4", "react-icons": "^4.4.0", "react-inspector": "^6.0.1", @@ -64,29 +64,29 @@ "@babel/plugin-transform-modules-commonjs": "^7.18.6", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "@playwright/test": "^1.26.1", + "@playwright/test": "^1.27.1", "@simbathesailor/use-what-changed": "^2.0.0", "@types/d3": "^7.4.0", - "@types/jest": "^29.1.1", - "@types/node": "^18.8.2", + "@types/jest": "^29.1.2", + "@types/node": "^18.8.5", "@types/react": "^18.0.21", "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^2.1.0", "@zakodium/eslint-config": "^6.0.0", "cross-env": "^7.0.3", - "eslint": "^8.24.0", + "eslint": "^8.25.0", "jest": "^29.1.2", "modern-normalize": "^1.1.0", "prettier": "^2.7.1", "rc-menu": "^9.6.4", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router-dom": "^6.4.1", + "react-router-dom": "^6.4.2", "rimraf": "^3.0.2", "rollup-plugin-analyzer": "^4.0.0", "serve": "^14.0.1", "typescript": "~4.8.4", - "vite": "^3.1.4" + "vite": "^3.1.7" }, "peerDependencies": { "react": ">=18.0.0", @@ -985,9 +985,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz", - "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", + "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -1048,16 +1048,6 @@ "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -1916,13 +1906,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.26.1.tgz", - "integrity": "sha512-bNxyZASVt2adSZ9gbD7NCydzcb5JaI0OR9hc7s+nmPeH604gwp0zp17NNpwXY4c8nvuBGQQ9oGDx72LE+cUWvw==", + "version": "1.27.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.27.1.tgz", + "integrity": "sha512-mrL2q0an/7tVqniQQF6RBL2saskjljXzqNcCOVMUjRIgE6Y38nCNaP+Dc2FBW06bcpD3tqIws/HT9qiMHbNU0A==", "dev": true, "dependencies": { "@types/node": "*", - "playwright-core": "1.26.1" + "playwright-core": "1.27.1" }, "bin": { "playwright": "cli.js" @@ -1932,9 +1922,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.1.tgz", - "integrity": "sha512-eBV5rvW4dRFOU1eajN7FmYxjAIVz/mRHgUE9En9mBn6m3mulK3WTR5C3iQhL9MZ14rWAq+xOlEaCkDiW0/heOg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.2.tgz", + "integrity": "sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ==", "dev": true, "engines": { "node": ">=14" @@ -2336,9 +2326,9 @@ } }, "node_modules/@types/jest": { - "version": "29.1.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.1.1.tgz", - "integrity": "sha512-U9Ey07dGWl6fUFaIaUQUKWG5NoKi/zizeVQCGV8s4nSU0jPgqphVZvS64+8BtWYvrc3ZGw6wo943NSYPxkrp/g==", + "version": "29.1.2", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.1.2.tgz", + "integrity": "sha512-y+nlX0h87U0R+wsGn6EBuoRWYyv3KFtwRNP3QWp9+k2tJ2/bqcGS3UxD7jgT+tiwJWWq3UsyV4Y+T6rsMT4XMg==", "dev": true, "dependencies": { "expect": "^29.0.0", @@ -2370,9 +2360,9 @@ "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==" }, "node_modules/@types/node": { - "version": "18.8.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.2.tgz", - "integrity": "sha512-cRMwIgdDN43GO4xMWAfJAecYn8wV4JbsOGHNfNUIDiuYkUYAR5ec4Rj7IO2SAhFPEfpPtLtUTbbny/TCT7aDwA==", + "version": "18.8.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.5.tgz", + "integrity": "sha512-Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q==", "dev": true }, "node_modules/@types/parse-json": { @@ -5036,14 +5026,13 @@ } }, "node_modules/eslint": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz", - "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==", + "version": "8.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz", + "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.3.2", + "@eslint/eslintrc": "^1.3.3", "@humanwhocodes/config-array": "^0.10.5", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", "@humanwhocodes/module-importer": "^1.0.1", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -9601,9 +9590,9 @@ } }, "node_modules/playwright-core": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.26.1.tgz", - "integrity": "sha512-hzFchhhxnEiPc4qVPs9q2ZR+5eKNifY2hQDHtg1HnTTUuphYCBP8ZRb2si+B1TR7BHirgXaPi48LIye5SgrLAA==", + "version": "1.27.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.27.1.tgz", + "integrity": "sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==", "dev": true, "bin": { "playwright": "cli.js" @@ -9965,9 +9954,9 @@ } }, "node_modules/react-dropzone": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.2.tgz", - "integrity": "sha512-5oyGN/B5rNhop2ggUnxztXBQ6q6zii+OMEftPzsxAR2hhpVWz0nAV+3Ktxo2h5bZzdcCKrpd8bfWAVsveIBM+w==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.3.tgz", + "integrity": "sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug==", "dependencies": { "attr-accept": "^2.2.2", "file-selector": "^0.6.0", @@ -10128,12 +10117,12 @@ "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/react-router": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.1.tgz", - "integrity": "sha512-OJASKp5AykDWFewgWUim1vlLr7yfD4vO/h+bSgcP/ix8Md+LMHuAjovA74MQfsfhQJGGN1nHRhwS5qQQbbBt3A==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.2.tgz", + "integrity": "sha512-Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw==", "dev": true, "dependencies": { - "@remix-run/router": "1.0.1" + "@remix-run/router": "1.0.2" }, "engines": { "node": ">=14" @@ -10143,13 +10132,13 @@ } }, "node_modules/react-router-dom": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.1.tgz", - "integrity": "sha512-MY7NJCrGNVJtGp8ODMOBHu20UaIkmwD2V3YsAOUQoCXFk7Ppdwf55RdcGyrSj+ycSL9Uiwrb3gTLYSnzcRoXww==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.2.tgz", + "integrity": "sha512-yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ==", "dev": true, "dependencies": { - "@remix-run/router": "1.0.1", - "react-router": "6.4.1" + "@remix-run/router": "1.0.2", + "react-router": "6.4.2" }, "engines": { "node": ">=14" @@ -11498,12 +11487,12 @@ } }, "node_modules/vite": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.4.tgz", - "integrity": "sha512-JoQI08aBjY9lycL7jcEq4p9o1xUjq5aRvdH4KWaXtkSx7e7RpAh9D3IjzDWRD4Fg44LS3oDAIOG/Kq1L+82psA==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.7.tgz", + "integrity": "sha512-5vCAmU4S8lyVdFCInu9M54f/g8qbOMakVw5xJ4pjoaDy5wgy9sLLZkGdSLN52dlsBqh0tBqxjaqqa8LgPqwRAA==", "dev": true, "dependencies": { - "esbuild": "^0.15.6", + "esbuild": "^0.15.9", "postcss": "^8.4.16", "resolve": "^1.22.1", "rollup": "~2.78.0" diff --git a/package.json b/package.json index 531540bb9..70a2e05c2 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "openchemlib-utils": "^2.0.0", "re-resizable": "^6.9.9", "react-d3-utils": "^0.5.1", - "react-dropzone": "^14.2.2", + "react-dropzone": "^14.2.3", "react-error-boundary": "^3.1.4", "react-icons": "^4.4.0", "react-inspector": "^6.0.1", @@ -104,28 +104,28 @@ "@babel/plugin-transform-modules-commonjs": "^7.18.6", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "@playwright/test": "^1.26.1", + "@playwright/test": "^1.27.1", "@simbathesailor/use-what-changed": "^2.0.0", "@types/d3": "^7.4.0", - "@types/jest": "^29.1.1", - "@types/node": "^18.8.2", + "@types/jest": "^29.1.2", + "@types/node": "^18.8.5", "@types/react": "^18.0.21", "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^2.1.0", "@zakodium/eslint-config": "^6.0.0", "cross-env": "^7.0.3", - "eslint": "^8.24.0", + "eslint": "^8.25.0", "jest": "^29.1.2", "modern-normalize": "^1.1.0", "prettier": "^2.7.1", "rc-menu": "^9.6.4", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router-dom": "^6.4.1", + "react-router-dom": "^6.4.2", "rimraf": "^3.0.2", "rollup-plugin-analyzer": "^4.0.0", "serve": "^14.0.1", "typescript": "~4.8.4", - "vite": "^3.1.4" + "vite": "^3.1.7" } } \ No newline at end of file diff --git a/src/component/2d/Left1DChart.tsx b/src/component/2d/Left1DChart.tsx index d58e617bd..0a32b825c 100644 --- a/src/component/2d/Left1DChart.tsx +++ b/src/component/2d/Left1DChart.tsx @@ -81,7 +81,12 @@ function Left1DChart({ - + ); diff --git a/src/component/2d/Top1DChart.tsx b/src/component/2d/Top1DChart.tsx index ebf04229a..503cc91ce 100644 --- a/src/component/2d/Top1DChart.tsx +++ b/src/component/2d/Top1DChart.tsx @@ -73,7 +73,7 @@ function Top1DChart({