A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
editor: replace tinycolor2 with colord
Abdullah Atta745cbc082f6d
diff --git a/packages/editor/package-lock.json b/packages/editor/package-lock.jsonindex a2256dfbb..e8b2a810b 100644--- a/packages/editor/package-lock.json+++ b/packages/editor/package-lock.json@@ -45,6 +45,7 @@"alfaaz": "^1.1.0","async-mutex": "^0.5.0","clipboard-polyfill": "4.1.0",+ "colord": "^2.9.3","detect-indent": "^7.0.1","entities": "^5.0.0","katex": "0.16.11",@@ -71,15 +72,13 @@"@types/react-color": "^3.0.12","@types/react-dom": "^18.3.0","@types/react-modal": "^3.16.3 ",- "@types/tinycolor2": "^1.4.6",- "framer-motion": "^11.5.4","happy-dom": "^15.7.4","isomorphic-fetch": "^3.0.0",+ "nodemon": "^3.1.7","prosemirror-test-builder": "^1.1.1","react": "18.3.1","react-dom": "18.3.1","react-modal": "3.16.1",- "tinycolor2": "^1.6.0","vitest": "^2.0.5","web-vitals": "^4.2.3","zustand": "4.5.5"@@ -89,11 +88,9 @@"@mdi/js": ">=7.2.96","@theme-ui/components": ">=0.16.0","@theme-ui/core": ">=0.16.0",- "framer-motion": ">=11","react": ">=18","react-dom": ">=18","react-modal": ">=3",- "tinycolor2": ">=1.6","zustand": ">=4"}},@@ -215,10 +212,8 @@"@theme-ui/core": "^0.16.1","@trpc/server": "^10.45.2","@types/react": "^18.2.39",- "@types/tinycolor2": "^1.4.3","isomorphic-fetch": "^3.0.0","react": "18.2.0",- "tinycolor2": "^1.6.0","ts-json-schema-generator": "^1.2.0","zustand": "4.4.7"},@@ -228,7 +223,6 @@"@theme-ui/components": ">=0.16.0","@theme-ui/core": ">=0.16.0","react": ">=18",- "tinycolor2": ">=1","zustand": ">=4"}},@@ -247,7 +241,6 @@"@types/react": "^18.2.39","@types/react-dom": "^18.2.17","@types/react-modal": "3.16.3",- "framer-motion": "^10.6.8","mac-scrollbar": "^0.10.3","react": "18.2.0","react-dom": "18.2.0",@@ -258,7 +251,6 @@"@mdi/js": ">=7","@theme-ui/components": ">=0.16","@theme-ui/core": ">=0.16",- "framer-motion": ">=10","mac-scrollbar": ">=0.10","react": ">=18","react-dom": ">=18",@@ -1999,12 +1991,6 @@"csstype": "^3.0.2"}},- "node_modules/@types/tinycolor2": {- "version": "1.4.6",- "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz",- "integrity": "sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==",- "dev": true- },"node_modules/@types/unist": {"version": "2.0.10","resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz",@@ -2108,6 +2094,20 @@"node": ">=4"}},+ "node_modules/anymatch": {+ "version": "3.1.3",+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "normalize-path": "^3.0.0",+ "picomatch": "^2.0.4"+ },+ "engines": {+ "node": ">= 8"+ }+ },"node_modules/argparse": {"version": "2.0.1","resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",@@ -2145,6 +2145,50 @@"npm": ">=6"}},+ "node_modules/balanced-match": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/binary-extensions": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/brace-expansion": {+ "version": "1.1.11",+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "balanced-match": "^1.0.0",+ "concat-map": "0.0.1"+ }+ },+ "node_modules/braces": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "fill-range": "^7.1.1"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/cac": {"version": "6.7.14","resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",@@ -2238,6 +2282,31 @@"node": ">= 16"}},+ "node_modules/chokidar": {+ "version": "3.6.0",+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "anymatch": "~3.1.2",+ "braces": "~3.0.2",+ "glob-parent": "~5.1.2",+ "is-binary-path": "~2.1.0",+ "is-glob": "~4.0.1",+ "normalize-path": "~3.0.0",+ "readdirp": "~3.6.0"+ },+ "engines": {+ "node": ">= 8.10.0"+ },+ "funding": {+ "url": "https://paulmillr.com/funding/"+ },+ "optionalDependencies": {+ "fsevents": "~2.3.2"+ }+ },"node_modules/clipboard-polyfill": {"version": "4.1.0","resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-4.1.0.tgz",@@ -2258,6 +2327,12 @@"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==","dev": true},+ "node_modules/colord": {+ "version": "2.9.3",+ "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",+ "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",+ "license": "MIT"+ },"node_modules/comma-separated-tokens": {"version": "2.0.3","resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",@@ -2275,6 +2350,13 @@"node": ">= 12"}},+ "node_modules/concat-map": {+ "version": "0.0.1",+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",+ "dev": true,+ "license": "MIT"+ },"node_modules/convert-source-map": {"version": "1.9.0","resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",@@ -2537,37 +2619,25 @@"integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==","dev": true},+ "node_modules/fill-range": {+ "version": "7.1.1",+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "to-regex-range": "^5.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/find-root": {"version": "1.1.0","resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz","integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==","dev": true},- "node_modules/framer-motion": {- "version": "11.5.4",- "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.5.4.tgz",- "integrity": "sha512-E+tb3/G6SO69POkdJT+3EpdMuhmtCh9EWuK4I1DnIC23L7tFPrl8vxP+LSovwaw6uUr73rUbpb4FgK011wbRJQ==",- "dev": true,- "dependencies": {- "tslib": "^2.4.0"- },- "peerDependencies": {- "@emotion/is-prop-valid": "*",- "react": "^18.0.0",- "react-dom": "^18.0.0"- },- "peerDependenciesMeta": {- "@emotion/is-prop-valid": {- "optional": true- },- "react": {- "optional": true- },- "react-dom": {- "optional": true- }- }- },"node_modules/fsevents": {"version": "2.3.3","resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",@@ -2612,6 +2682,19 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/glob-parent": {+ "version": "5.1.2",+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "is-glob": "^4.0.1"+ },+ "engines": {+ "node": ">= 6"+ }+ },"node_modules/globals": {"version": "11.12.0","resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",@@ -2751,6 +2834,13 @@"node": ">=16.17.0"}},+ "node_modules/ignore-by-default": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",+ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",+ "dev": true,+ "license": "ISC"+ },"node_modules/import-fresh": {"version": "3.3.0","resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",@@ -2806,6 +2896,19 @@"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==","dev": true},+ "node_modules/is-binary-path": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "binary-extensions": "^2.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/is-core-module": {"version": "2.15.1","resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",@@ -2830,6 +2933,29 @@"url": "https://github.com/sponsors/wooorm"}},+ "node_modules/is-extglob": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/is-glob": {+ "version": "4.0.3",+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "is-extglob": "^2.1.1"+ },+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/is-hexadecimal": {"version": "2.0.1","resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz",@@ -2839,6 +2965,16 @@"url": "https://github.com/sponsors/wooorm"}},+ "node_modules/is-number": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.12.0"+ }+ },"node_modules/is-stream": {"version": "3.0.0","resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",@@ -3013,6 +3149,19 @@"node": ">=4"}},+ "node_modules/minimatch": {+ "version": "3.1.2",+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "brace-expansion": "^1.1.7"+ },+ "engines": {+ "node": "*"+ }+ },"node_modules/ms": {"version": "2.1.3","resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",@@ -3054,6 +3203,63 @@}}},+ "node_modules/nodemon": {+ "version": "3.1.7",+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.7.tgz",+ "integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "chokidar": "^3.5.2",+ "debug": "^4",+ "ignore-by-default": "^1.0.1",+ "minimatch": "^3.1.2",+ "pstree.remy": "^1.1.8",+ "semver": "^7.5.3",+ "simple-update-notifier": "^2.0.0",+ "supports-color": "^5.5.0",+ "touch": "^3.1.0",+ "undefsafe": "^2.0.5"+ },+ "bin": {+ "nodemon": "bin/nodemon.js"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/nodemon"+ }+ },+ "node_modules/nodemon/node_modules/debug": {+ "version": "4.3.7",+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",+ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "ms": "^2.1.3"+ },+ "engines": {+ "node": ">=6.0"+ },+ "peerDependenciesMeta": {+ "supports-color": {+ "optional": true+ }+ }+ },+ "node_modules/normalize-path": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/npm-run-path": {"version": "5.3.0","resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",@@ -3204,6 +3410,19 @@"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==","dev": true},+ "node_modules/picomatch": {+ "version": "2.3.1",+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8.6"+ },+ "funding": {+ "url": "https://github.com/sponsors/jonschlinkert"+ }+ },"node_modules/postcss": {"version": "8.4.45","resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",@@ -3473,6 +3692,13 @@"prosemirror-transform": "^1.1.0"}},+ "node_modules/pstree.remy": {+ "version": "1.1.8",+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",+ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",+ "dev": true,+ "license": "MIT"+ },"node_modules/punycode.js": {"version": "2.3.1","resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",@@ -3555,6 +3781,19 @@"react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"}},+ "node_modules/readdirp": {+ "version": "3.6.0",+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "picomatch": "^2.2.1"+ },+ "engines": {+ "node": ">=8.10.0"+ }+ },"node_modules/redent": {"version": "4.0.0","resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",@@ -3671,6 +3910,19 @@"loose-envify": "^1.1.0"}},+ "node_modules/semver": {+ "version": "7.6.3",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",+ "dev": true,+ "license": "ISC",+ "bin": {+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"+ }+ },"node_modules/shebang-command": {"version": "2.0.0","resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",@@ -3710,6 +3962,19 @@"url": "https://github.com/sponsors/isaacs"}},+ "node_modules/simple-update-notifier": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",+ "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "semver": "^7.5.3"+ },+ "engines": {+ "node": ">=10"+ }+ },"node_modules/source-map": {"version": "0.5.7","resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",@@ -3832,12 +4097,6 @@"integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==","dev": true},- "node_modules/tinycolor2": {- "version": "1.6.0",- "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",- "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",- "dev": true- },"node_modules/tinypool": {"version": "1.0.1","resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.1.tgz",@@ -3874,6 +4133,29 @@"node": ">=4"}},+ "node_modules/to-regex-range": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "is-number": "^7.0.0"+ },+ "engines": {+ "node": ">=8.0"+ }+ },+ "node_modules/touch": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",+ "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",+ "dev": true,+ "license": "ISC",+ "bin": {+ "nodetouch": "bin/nodetouch.js"+ }+ },"node_modules/tr46": {"version": "0.0.3","resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",@@ -3889,6 +4171,13 @@"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz","integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="},+ "node_modules/undefsafe": {+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",+ "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",+ "dev": true,+ "license": "MIT"+ },"node_modules/unfurl.js": {"version": "6.4.0","resolved": "https://registry.npmjs.org/unfurl.js/-/unfurl.js-6.4.0.tgz",diff --git a/packages/editor/package.json b/packages/editor/package.jsonindex 6ce8235e4..5f073f5bc 100644--- a/packages/editor/package.json+++ b/packages/editor/package.json@@ -65,6 +65,7 @@"alfaaz": "^1.1.0","async-mutex": "^0.5.0","clipboard-polyfill": "4.1.0",+ "colord": "^2.9.3","detect-indent": "^7.0.1","entities": "^5.0.0","katex": "0.16.11",@@ -91,7 +92,6 @@"@types/react-color": "^3.0.12","@types/react-dom": "^18.3.0","@types/react-modal": "^3.16.3 ",- "@types/tinycolor2": "^1.4.6","happy-dom": "^15.7.4","isomorphic-fetch": "^3.0.0","nodemon": "^3.1.7",@@ -99,7 +99,6 @@"react": "18.3.1","react-dom": "18.3.1","react-modal": "3.16.1",- "tinycolor2": "^1.6.0","vitest": "^2.0.5","web-vitals": "^4.2.3","zustand": "4.5.5"@@ -112,7 +111,6 @@"react": ">=18","react-dom": ">=18","react-modal": ">=3",- "tinycolor2": ">=1.6","zustand": ">=4"},"scripts": {diff --git a/packages/editor/src/toolbar/popups/color-picker.tsx b/packages/editor/src/toolbar/popups/color-picker.tsxindex 2bcf41bdf..0abca1926 100644--- a/packages/editor/src/toolbar/popups/color-picker.tsx+++ b/packages/editor/src/toolbar/popups/color-picker.tsx@@ -22,7 +22,7 @@ import { Input } from "@theme-ui/components";import { Icon } from "@notesnook/ui";import { Icons } from "../icons.js";import { useCallback, useEffect, useRef, useState } from "react";-import tinycolor from "tinycolor2";+import { colord } from "colord";import { HexColorPicker } from "react-colorful";import { Button } from "../../components/button.js";import { debounce } from "../../utils/debounce.js";@@ -68,10 +68,10 @@ export function ColorPicker(props: ColorPickerProps) {const inputRef = useRef<HTMLInputElement>(null);const [isPickerOpen, setIsPickerOpen] = useState(expanded || false);const [currentColor, setCurrentColor] = useState<string>(- tinycolor(color || colors?.[0]).toHexString()+ colord(color || colors?.[0]).toHex());const [deleteMode, setDeleteMode] = useState(false);- const tColor = tinycolor(currentColor);+ const tColor = colord(currentColor);const allColors = deleteMode ? colors : [...defaultColors, ...colors];useEffect(() => {@@ -148,7 +148,7 @@ export function ColorPicker(props: ColorPickerProps) {onChange={(e) => {const { value } = e.target;if (!value) return;- if (tinycolor(value, { format: "hex" }).isValid()) {+ if (colord(value).isValid()) {setCurrentColor(value);onChange(value);}@@ -284,9 +284,7 @@ function PaletteButton(props: PaletteButtonProps) {ml: [2, 2, 1],bg,":hover:not(:disabled):not(:active)": {- bg: bg?.startsWith("#")- ? tinycolor(bg).darken(5).toRgbString()- : "hover"+ bg: bg?.startsWith("#") ? colord(bg).darken(5).toRgbString() : "hover"},...sx}}diff --git a/packages/editor/src/toolbar/tools/colors.tsx b/packages/editor/src/toolbar/tools/colors.tsxindex 1e93bef35..08c6b41d8 100644--- a/packages/editor/src/toolbar/tools/colors.tsx+++ b/packages/editor/src/toolbar/tools/colors.tsx@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import { useEffect, useMemo, useRef, useState } from "react";-import tinycolor from "tinycolor2";+import { colord } from "colord";import { PopupWrapper } from "../../components/popup-presenter/index.js";import { config } from "../../utils/config.js";import { SplitButton } from "../components/split-button.js";@@ -35,7 +35,7 @@ import { strings } from "@notesnook/intl";type ColorType = "background" | "text" | "border";type ColorToolProps = ToolProps & {onColorChange: (color?: string) => void;- activeColor: string;+ activeColor?: string;title: string;cacheKey: string;type: ColorType;@@ -103,7 +103,7 @@ export function ColorTool(props: ColorToolProps) {const buttonRef = useRef<HTMLButtonElement>(null);const defaultColors = DEFAULT_COLORS[type];const activeColor = _activeColor || config.get(cacheKey);- const tColor = tinycolor(activeColor);+ const tColor = activeColor ? colord(activeColor) : undefined;const isBottom = useToolbarLocation() === "bottom";const { toggle, isOpen, close, isPinned, togglePinned } = usePopupManager({id: props.icon,@@ -132,12 +132,12 @@ export function ColorTool(props: ColorToolProps) {<SplitButton{...toolProps}buttonRef={buttonRef}- iconColor={activeColor && tColor.isDark() ? "white" : "icon"}+ iconColor={activeColor && tColor?.isDark() ? "white" : "icon"}sx={{mr: 0,bg: activeColor || "transparent",":hover:not(:disabled):not(:active)": {- bg: activeColor ? tColor.darken(5).toRgbString() : "transparent"+ bg: tColor ? tColor.darken(5).toRgbString() : "transparent"}}}onOpen={toggle}