Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: replace simplebar with simple css styling (#9085)

01zulfibfedc1f43ef4
diff --git a/packages/editor/package-lock.json b/packages/editor/package-lock.json
index 96763fdb7..95ef9e3ba 100644
--- a/packages/editor/package-lock.json
+++ b/packages/editor/package-lock.json
@@ -58,7 +58,6 @@
"react-colorful": "^5.6.1",
"redent": "^4.0.0",
"refractor": "^4.8.1",
- "simplebar-react": "^3.3.2",
"strip-indent": "^4.0.0",
"unfurl.js": "^6.4.0"
},
@@ -1748,6 +1747,39 @@
"@styled-system/css": "^5.1.5"
}
},
+ "node_modules/@theme-ui/color-modes": {
+ "version": "0.16.2",
+ "resolved": "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.16.2.tgz",
+ "integrity": "sha512-jWEWx53lxNgWCT38i/kwLV2rsvJz8lVZgi5oImnVwYba9VejXD23q1ckbNFJHosQ8KKXY87ht0KPC6BQFIiHtQ==",
+ "dev": true,
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "@theme-ui/core": "^0.16.2",
+ "@theme-ui/css": "^0.16.2",
+ "deepmerge": "^4.2.2"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.11.1",
+ "react": ">=18"
+ }
+ },
+ "node_modules/@theme-ui/color-modes/node_modules/@theme-ui/core": {
+ "version": "0.16.2",
+ "resolved": "https://registry.npmjs.org/@theme-ui/core/-/core-0.16.2.tgz",
+ "integrity": "sha512-bBd/ltbwO9vIUjF1jtlOX6XN0IIOdf1vzBp2JCKsSOqdfn84m+XL8OogIe/zOhQ+aM94Nrq4+32tFJc8sFav4Q==",
+ "dev": true,
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "@theme-ui/css": "^0.16.2",
+ "deepmerge": "^4.2.2"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.11.1",
+ "react": ">=18"
+ }
+ },
"node_modules/@theme-ui/components": {
"version": "0.16.1",
"resolved": "https://registry.npmjs.org/@theme-ui/components/-/components-0.16.1.tgz",
@@ -1793,6 +1825,39 @@
"@emotion/react": "^11.11.1"
}
},
+ "node_modules/@theme-ui/theme-provider": {
+ "version": "0.16.2",
+ "resolved": "https://registry.npmjs.org/@theme-ui/theme-provider/-/theme-provider-0.16.2.tgz",
+ "integrity": "sha512-LRnVevODcGqO0JyLJ3wht+PV3ZoZcJ7XXLJAJWDoGeII4vZcPQKwVy4Lpz/juHsZppQxKcB3U+sQDGBnP25irQ==",
+ "dev": true,
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "@theme-ui/color-modes": "^0.16.2",
+ "@theme-ui/core": "^0.16.2",
+ "@theme-ui/css": "^0.16.2"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.11.1",
+ "react": ">=18"
+ }
+ },
+ "node_modules/@theme-ui/theme-provider/node_modules/@theme-ui/core": {
+ "version": "0.16.2",
+ "resolved": "https://registry.npmjs.org/@theme-ui/core/-/core-0.16.2.tgz",
+ "integrity": "sha512-bBd/ltbwO9vIUjF1jtlOX6XN0IIOdf1vzBp2JCKsSOqdfn84m+XL8OogIe/zOhQ+aM94Nrq4+32tFJc8sFav4Q==",
+ "dev": true,
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "@theme-ui/css": "^0.16.2",
+ "deepmerge": "^4.2.2"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.11.1",
+ "react": ">=18"
+ }
+ },
"node_modules/@tiptap/core": {
"version": "2.6.6",
"resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.6.6.tgz",
@@ -4770,8 +4835,7 @@
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
- "dev": true
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
},
"node_modules/js-yaml": {
"version": "3.14.1",
@@ -4985,18 +5049,6 @@
"node": ">=8"
}
},
- "node_modules/lodash": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
- "license": "MIT"
- },
- "node_modules/lodash-es": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
- "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
- "license": "MIT"
- },
"node_modules/lodash.flattendeep": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
@@ -5028,7 +5080,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
- "dev": true,
"dependencies": {
"js-tokens": "^3.0.0 || ^4.0.0"
},
@@ -6949,7 +7000,6 @@
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
- "dev": true,
"dependencies": {
"loose-envify": "^1.1.0"
},
@@ -6970,7 +7020,6 @@
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
- "dev": true,
"dependencies": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.2"
@@ -7397,7 +7446,6 @@
"version": "0.23.2",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
- "dev": true,
"dependencies": {
"loose-envify": "^1.1.0"
}
@@ -7484,28 +7532,6 @@
"node": ">=10"
}
},
- "node_modules/simplebar-core": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/simplebar-core/-/simplebar-core-1.3.2.tgz",
- "integrity": "sha512-qKgTTuTqapjsFGkNhCjyPhysnbZGpQqNmjk0nOYjFN5ordC/Wjvg+RbYCyMSnW60l/Z0ZS82GbNltly6PMUH1w==",
- "license": "MIT",
- "dependencies": {
- "lodash": "^4.17.21",
- "lodash-es": "^4.17.21"
- }
- },
- "node_modules/simplebar-react": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/simplebar-react/-/simplebar-react-3.3.2.tgz",
- "integrity": "sha512-ZsgcQhKLtt5ra0BRIJeApfkTBQCa1vUPA/WXI4HcYReFt+oCEOvdVz6rR/XsGJcKxTlCRPmdGx1uJIUChupo+A==",
- "license": "MIT",
- "dependencies": {
- "simplebar-core": "^1.3.2"
- },
- "peerDependencies": {
- "react": ">=16.8.0"
- }
- },
"node_modules/source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -7931,7 +7957,7 @@
},
"node_modules/tap/node_modules/@babel/code-frame": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -7943,7 +7969,7 @@
},
"node_modules/tap/node_modules/@babel/compat-data": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -7952,7 +7978,7 @@
},
"node_modules/tap/node_modules/@babel/core": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -7982,7 +8008,7 @@
},
"node_modules/tap/node_modules/@babel/generator": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -7996,7 +8022,7 @@
},
"node_modules/tap/node_modules/@babel/helper-annotate-as-pure": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8008,7 +8034,7 @@
},
"node_modules/tap/node_modules/@babel/helper-compilation-targets": {
"version": "7.16.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8026,7 +8052,7 @@
},
"node_modules/tap/node_modules/@babel/helper-function-name": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8040,7 +8066,7 @@
},
"node_modules/tap/node_modules/@babel/helper-get-function-arity": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8052,7 +8078,7 @@
},
"node_modules/tap/node_modules/@babel/helper-hoist-variables": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8064,7 +8090,7 @@
},
"node_modules/tap/node_modules/@babel/helper-member-expression-to-functions": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8076,7 +8102,7 @@
},
"node_modules/tap/node_modules/@babel/helper-module-imports": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8088,7 +8114,7 @@
},
"node_modules/tap/node_modules/@babel/helper-module-transforms": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8107,7 +8133,7 @@
},
"node_modules/tap/node_modules/@babel/helper-optimise-call-expression": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8119,7 +8145,7 @@
},
"node_modules/tap/node_modules/@babel/helper-plugin-utils": {
"version": "7.14.5",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8128,7 +8154,7 @@
},
"node_modules/tap/node_modules/@babel/helper-replace-supers": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8143,7 +8169,7 @@
},
"node_modules/tap/node_modules/@babel/helper-simple-access": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8155,7 +8181,7 @@
},
"node_modules/tap/node_modules/@babel/helper-split-export-declaration": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8167,7 +8193,7 @@
},
"node_modules/tap/node_modules/@babel/helper-validator-identifier": {
"version": "7.15.7",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8176,7 +8202,7 @@
},
"node_modules/tap/node_modules/@babel/helper-validator-option": {
"version": "7.14.5",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8185,7 +8211,7 @@
},
"node_modules/tap/node_modules/@babel/helpers": {
"version": "7.16.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8199,7 +8225,7 @@
},
"node_modules/tap/node_modules/@babel/highlight": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8213,7 +8239,7 @@
},
"node_modules/tap/node_modules/@babel/parser": {
"version": "7.16.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"bin": {
@@ -8225,7 +8251,7 @@
},
"node_modules/tap/node_modules/@babel/plugin-proposal-object-rest-spread": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8244,7 +8270,7 @@
},
"node_modules/tap/node_modules/@babel/plugin-syntax-jsx": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8259,7 +8285,7 @@
},
"node_modules/tap/node_modules/@babel/plugin-syntax-object-rest-spread": {
"version": "7.8.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8271,7 +8297,7 @@
},
"node_modules/tap/node_modules/@babel/plugin-transform-destructuring": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8286,7 +8312,7 @@
},
"node_modules/tap/node_modules/@babel/plugin-transform-parameters": {
"version": "7.16.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8301,7 +8327,7 @@
},
"node_modules/tap/node_modules/@babel/plugin-transform-react-jsx": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8320,7 +8346,7 @@
},
"node_modules/tap/node_modules/@babel/template": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8334,7 +8360,7 @@
},
"node_modules/tap/node_modules/@babel/traverse": {
"version": "7.16.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8354,7 +8380,7 @@
},
"node_modules/tap/node_modules/@babel/types": {
"version": "7.16.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8367,7 +8393,7 @@
},
"node_modules/tap/node_modules/@isaacs/import-jsx": {
"version": "4.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8387,7 +8413,7 @@
},
"node_modules/tap/node_modules/@isaacs/import-jsx/node_modules/caller-callsite": {
"version": "4.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8399,7 +8425,7 @@
},
"node_modules/tap/node_modules/@isaacs/import-jsx/node_modules/caller-path": {
"version": "3.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8411,7 +8437,7 @@
},
"node_modules/tap/node_modules/@isaacs/import-jsx/node_modules/callsites": {
"version": "3.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8420,13 +8446,13 @@
},
"node_modules/tap/node_modules/@types/prop-types": {
"version": "15.7.4",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/@types/react": {
"version": "17.0.34",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8437,19 +8463,19 @@
},
"node_modules/tap/node_modules/@types/scheduler": {
"version": "0.16.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/@types/yoga-layout": {
"version": "1.9.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/ansi-escapes": {
"version": "4.3.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8464,7 +8490,7 @@
},
"node_modules/tap/node_modules/ansi-escapes/node_modules/type-fest": {
"version": "0.21.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
@@ -8476,7 +8502,7 @@
},
"node_modules/tap/node_modules/ansi-regex": {
"version": "5.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8485,7 +8511,7 @@
},
"node_modules/tap/node_modules/ansi-styles": {
"version": "3.2.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8497,13 +8523,13 @@
},
"node_modules/tap/node_modules/ansicolors": {
"version": "0.3.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/astral-regex": {
"version": "2.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8512,7 +8538,7 @@
},
"node_modules/tap/node_modules/auto-bind": {
"version": "4.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8524,13 +8550,13 @@
},
"node_modules/tap/node_modules/balanced-match": {
"version": "1.0.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/brace-expansion": {
"version": "1.1.11",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8540,7 +8566,7 @@
},
"node_modules/tap/node_modules/browserslist": {
"version": "4.17.6",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8563,7 +8589,7 @@
},
"node_modules/tap/node_modules/caniuse-lite": {
"version": "1.0.30001279",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "CC-BY-4.0",
"funding": {
@@ -8573,7 +8599,7 @@
},
"node_modules/tap/node_modules/cardinal": {
"version": "2.1.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8586,7 +8612,7 @@
},
"node_modules/tap/node_modules/chalk": {
"version": "2.4.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8600,13 +8626,13 @@
},
"node_modules/tap/node_modules/ci-info": {
"version": "2.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/cli-boxes": {
"version": "2.2.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8618,7 +8644,7 @@
},
"node_modules/tap/node_modules/cli-cursor": {
"version": "3.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8630,7 +8656,7 @@
},
"node_modules/tap/node_modules/cli-truncate": {
"version": "2.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8646,7 +8672,7 @@
},
"node_modules/tap/node_modules/code-excerpt": {
"version": "3.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8658,7 +8684,7 @@
},
"node_modules/tap/node_modules/color-convert": {
"version": "1.9.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8667,25 +8693,25 @@
},
"node_modules/tap/node_modules/color-name": {
"version": "1.1.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/commondir": {
"version": "1.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/concat-map": {
"version": "0.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/convert-source-map": {
"version": "1.8.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8694,7 +8720,7 @@
},
"node_modules/tap/node_modules/convert-to-spaces": {
"version": "1.0.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8703,13 +8729,13 @@
},
"node_modules/tap/node_modules/csstype": {
"version": "3.0.9",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/debug": {
"version": "4.3.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8726,19 +8752,19 @@
},
"node_modules/tap/node_modules/electron-to-chromium": {
"version": "1.3.893",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/emoji-regex": {
"version": "8.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/escalade": {
"version": "3.1.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8747,7 +8773,7 @@
},
"node_modules/tap/node_modules/escape-string-regexp": {
"version": "1.0.5",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8756,7 +8782,7 @@
},
"node_modules/tap/node_modules/esprima": {
"version": "4.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "BSD-2-Clause",
"bin": {
@@ -8769,13 +8795,13 @@
},
"node_modules/tap/node_modules/events-to-array": {
"version": "1.1.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/find-cache-dir": {
"version": "3.3.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8792,7 +8818,7 @@
},
"node_modules/tap/node_modules/find-up": {
"version": "4.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8805,13 +8831,13 @@
},
"node_modules/tap/node_modules/fs.realpath": {
"version": "1.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/gensync": {
"version": "1.0.0-beta.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8820,7 +8846,7 @@
},
"node_modules/tap/node_modules/glob": {
"version": "7.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -8840,7 +8866,7 @@
},
"node_modules/tap/node_modules/globals": {
"version": "11.12.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8849,7 +8875,7 @@
},
"node_modules/tap/node_modules/has-flag": {
"version": "3.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8858,7 +8884,7 @@
},
"node_modules/tap/node_modules/indent-string": {
"version": "4.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8867,7 +8893,7 @@
},
"node_modules/tap/node_modules/inflight": {
"version": "1.0.6",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -8877,13 +8903,13 @@
},
"node_modules/tap/node_modules/inherits": {
"version": "2.0.4",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/ink": {
"version": "3.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8926,7 +8952,7 @@
},
"node_modules/tap/node_modules/ink/node_modules/ansi-styles": {
"version": "4.3.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8941,7 +8967,7 @@
},
"node_modules/tap/node_modules/ink/node_modules/chalk": {
"version": "4.1.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8957,7 +8983,7 @@
},
"node_modules/tap/node_modules/ink/node_modules/color-convert": {
"version": "2.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8969,13 +8995,13 @@
},
"node_modules/tap/node_modules/ink/node_modules/color-name": {
"version": "1.1.4",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/ink/node_modules/has-flag": {
"version": "4.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -8984,7 +9010,7 @@
},
"node_modules/tap/node_modules/ink/node_modules/supports-color": {
"version": "7.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -8996,7 +9022,7 @@
},
"node_modules/tap/node_modules/is-ci": {
"version": "2.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9008,7 +9034,7 @@
},
"node_modules/tap/node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9017,13 +9043,13 @@
},
"node_modules/tap/node_modules/js-tokens": {
"version": "4.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/jsesc": {
"version": "2.5.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"bin": {
@@ -9035,7 +9061,7 @@
},
"node_modules/tap/node_modules/json5": {
"version": "2.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9050,7 +9076,7 @@
},
"node_modules/tap/node_modules/locate-path": {
"version": "5.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9062,13 +9088,13 @@
},
"node_modules/tap/node_modules/lodash": {
"version": "4.17.21",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/loose-envify": {
"version": "1.4.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9080,7 +9106,7 @@
},
"node_modules/tap/node_modules/make-dir": {
"version": "3.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9095,7 +9121,7 @@
},
"node_modules/tap/node_modules/mimic-fn": {
"version": "2.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9104,7 +9130,7 @@
},
"node_modules/tap/node_modules/minimatch": {
"version": "3.0.4",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -9116,13 +9142,13 @@
},
"node_modules/tap/node_modules/minimist": {
"version": "1.2.5",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/minipass": {
"version": "3.1.6",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -9134,19 +9160,19 @@
},
"node_modules/tap/node_modules/ms": {
"version": "2.1.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/node-releases": {
"version": "2.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/object-assign": {
"version": "4.1.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9155,7 +9181,7 @@
},
"node_modules/tap/node_modules/once": {
"version": "1.4.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -9164,7 +9190,7 @@
},
"node_modules/tap/node_modules/onetime": {
"version": "5.1.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9179,7 +9205,7 @@
},
"node_modules/tap/node_modules/p-limit": {
"version": "2.3.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9194,7 +9220,7 @@
},
"node_modules/tap/node_modules/p-locate": {
"version": "4.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9206,7 +9232,7 @@
},
"node_modules/tap/node_modules/p-try": {
"version": "2.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9215,7 +9241,7 @@
},
"node_modules/tap/node_modules/patch-console": {
"version": "1.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9224,7 +9250,7 @@
},
"node_modules/tap/node_modules/path-exists": {
"version": "4.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9233,7 +9259,7 @@
},
"node_modules/tap/node_modules/path-is-absolute": {
"version": "1.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9242,13 +9268,13 @@
},
"node_modules/tap/node_modules/picocolors": {
"version": "1.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/pkg-dir": {
"version": "4.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9260,7 +9286,7 @@
},
"node_modules/tap/node_modules/punycode": {
"version": "2.1.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9269,7 +9295,7 @@
},
"node_modules/tap/node_modules/react": {
"version": "17.0.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9282,7 +9308,7 @@
},
"node_modules/tap/node_modules/react-devtools-core": {
"version": "4.21.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9292,7 +9318,7 @@
},
"node_modules/tap/node_modules/react-reconciler": {
"version": "0.26.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9309,7 +9335,7 @@
},
"node_modules/tap/node_modules/redeyed": {
"version": "2.1.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9318,7 +9344,7 @@
},
"node_modules/tap/node_modules/resolve-from": {
"version": "3.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9327,7 +9353,7 @@
},
"node_modules/tap/node_modules/restore-cursor": {
"version": "3.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9340,7 +9366,7 @@
},
"node_modules/tap/node_modules/rimraf": {
"version": "3.0.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -9355,13 +9381,13 @@
},
"node_modules/tap/node_modules/safe-buffer": {
"version": "5.1.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/scheduler": {
"version": "0.20.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9371,7 +9397,7 @@
},
"node_modules/tap/node_modules/semver": {
"version": "6.3.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"bin": {
@@ -9380,19 +9406,19 @@
},
"node_modules/tap/node_modules/shell-quote": {
"version": "1.7.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/signal-exit": {
"version": "3.0.6",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/slice-ansi": {
"version": "3.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9406,7 +9432,7 @@
},
"node_modules/tap/node_modules/slice-ansi/node_modules/ansi-styles": {
"version": "4.3.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9421,7 +9447,7 @@
},
"node_modules/tap/node_modules/slice-ansi/node_modules/color-convert": {
"version": "2.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9433,13 +9459,13 @@
},
"node_modules/tap/node_modules/slice-ansi/node_modules/color-name": {
"version": "1.1.4",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/source-map": {
"version": "0.5.7",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "BSD-3-Clause",
"engines": {
@@ -9448,7 +9474,7 @@
},
"node_modules/tap/node_modules/stack-utils": {
"version": "2.0.5",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9460,7 +9486,7 @@
},
"node_modules/tap/node_modules/stack-utils/node_modules/escape-string-regexp": {
"version": "2.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9469,7 +9495,7 @@
},
"node_modules/tap/node_modules/string-width": {
"version": "4.2.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9483,7 +9509,7 @@
},
"node_modules/tap/node_modules/strip-ansi": {
"version": "6.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9495,7 +9521,7 @@
},
"node_modules/tap/node_modules/supports-color": {
"version": "5.5.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9507,7 +9533,7 @@
},
"node_modules/tap/node_modules/tap-parser": {
"version": "11.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9524,7 +9550,7 @@
},
"node_modules/tap/node_modules/tap-yaml": {
"version": "1.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -9533,7 +9559,7 @@
},
"node_modules/tap/node_modules/to-fast-properties": {
"version": "2.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9542,7 +9568,7 @@
},
"node_modules/tap/node_modules/treport": {
"version": "3.0.3",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"dependencies": {
@@ -9560,7 +9586,7 @@
},
"node_modules/tap/node_modules/treport/node_modules/ansi-styles": {
"version": "4.3.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9575,7 +9601,7 @@
},
"node_modules/tap/node_modules/treport/node_modules/chalk": {
"version": "3.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9588,7 +9614,7 @@
},
"node_modules/tap/node_modules/treport/node_modules/color-convert": {
"version": "2.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9600,13 +9626,13 @@
},
"node_modules/tap/node_modules/treport/node_modules/color-name": {
"version": "1.1.4",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/treport/node_modules/has-flag": {
"version": "4.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9615,7 +9641,7 @@
},
"node_modules/tap/node_modules/treport/node_modules/supports-color": {
"version": "7.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9627,7 +9653,7 @@
},
"node_modules/tap/node_modules/type-fest": {
"version": "0.12.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
@@ -9639,7 +9665,7 @@
},
"node_modules/tap/node_modules/unicode-length": {
"version": "2.0.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9649,7 +9675,7 @@
},
"node_modules/tap/node_modules/unicode-length/node_modules/ansi-regex": {
"version": "2.1.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9658,7 +9684,7 @@
},
"node_modules/tap/node_modules/unicode-length/node_modules/strip-ansi": {
"version": "3.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9670,7 +9696,7 @@
},
"node_modules/tap/node_modules/widest-line": {
"version": "3.1.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9682,7 +9708,7 @@
},
"node_modules/tap/node_modules/wrap-ansi": {
"version": "6.2.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9696,7 +9722,7 @@
},
"node_modules/tap/node_modules/wrap-ansi/node_modules/ansi-styles": {
"version": "4.3.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9711,7 +9737,7 @@
},
"node_modules/tap/node_modules/wrap-ansi/node_modules/color-convert": {
"version": "2.0.1",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -9723,19 +9749,19 @@
},
"node_modules/tap/node_modules/wrap-ansi/node_modules/color-name": {
"version": "1.1.4",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/tap/node_modules/wrappy": {
"version": "1.0.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/ws": {
"version": "7.5.5",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"engines": {
@@ -9756,13 +9782,13 @@
},
"node_modules/tap/node_modules/yallist": {
"version": "4.0.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/tap/node_modules/yaml": {
"version": "1.10.2",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "ISC",
"engines": {
@@ -9771,7 +9797,7 @@
},
"node_modules/tap/node_modules/yoga-layout-prebuilt": {
"version": "1.10.0",
- "dev": true,
+ "extraneous": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
diff --git a/packages/editor/package.json b/packages/editor/package.json
index a977c3b12..6290bfafe 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -78,7 +78,6 @@
"react-colorful": "^5.6.1",
"redent": "^4.0.0",
"refractor": "^4.8.1",
- "simplebar-react": "^3.3.2",
"strip-indent": "^4.0.0",
"unfurl.js": "^6.4.0"
},
diff --git a/packages/editor/src/extensions/code-block/code-block.ts b/packages/editor/src/extensions/code-block/code-block.ts
index 5f82e9826..d6df141f9 100644
--- a/packages/editor/src/extensions/code-block/code-block.ts
+++ b/packages/editor/src/extensions/code-block/code-block.ts
@@ -545,6 +545,7 @@ export const CodeBlock = Node.create<CodeBlockOptions>({
languageDefinition?.filename ?? languageDefinition?.title ?? "xyz"
}`.replace(/\s/, "-")
);
+ content.classList.add("scroll-bar")
content.style.whiteSpace = "pre";
// caret is not visible if content element width is 0px
content.style.minWidth = "20px";
diff --git a/packages/editor/src/extensions/code-block/component.tsx b/packages/editor/src/extensions/code-block/component.tsx
index 12e924b1b..c7e8cfce7 100644
--- a/packages/editor/src/extensions/code-block/component.tsx
+++ b/packages/editor/src/extensions/code-block/component.tsx
@@ -30,7 +30,6 @@ import { CodeBlockAttributes } from "./code-block.js";
import Languages from "./languages.json";
import { useThemeEngineStore } from "@notesnook/theme";
import { strings } from "@notesnook/intl";
-import SimpleBar from "simplebar-react";
export function CodeblockComponent(
props: ReactNodeViewProps<CodeBlockAttributes>
@@ -59,53 +58,45 @@ export function CodeblockComponent(
overflow: "hidden"
}}
>
- <SimpleBar
- style={{
- backgroundColor: "var(--background-secondary)"
+ <Text
+ ref={(ref) => {
+ elementRef.current = ref ?? undefined;
+ forwardRef?.(ref);
}}
- >
- <div>
- <Text
- ref={(ref) => {
- elementRef.current = ref ?? undefined;
- forwardRef?.(ref);
- }}
- autoCorrect="off"
- autoCapitalize="none"
- css={theme.codeBlockCSS}
- sx={{
- pre: {
- fontFamily: "inherit !important",
- tabSize: "inherit !important",
- // background: "transparent !important",
- padding: "10px !important",
- margin: "0px !important",
- width: "100%",
- borderRadius: `0px !important`,
+ autoCorrect="off"
+ autoCapitalize="none"
+ css={theme.codeBlockCSS}
+ sx={{
+ pre: {
+ fontFamily: "inherit !important",
+ tabSize: "inherit !important",
+ // background: "transparent !important",
+ padding: "10px !important",
+ margin: "0px !important",
+ width: "100%",
+ borderRadius: `0px !important`,
- "::selection,*::selection": {
- bg: "background-selected",
- color: "inherit"
- },
- "::-moz-selection,*::-moz-selection": {
- bg: "background-selected",
- color: "inherit"
- }
- },
- fontFamily: "monospace",
- whiteSpace: "pre", // TODO !important
- tabSize: 1,
- position: "relative",
- lineHeight: "20px",
- // bg: "var(--background-secondary)",
- // color: "white",
- // overflowX: "hidden",
- display: "flex"
- }}
- spellCheck={false}
- />
- </div>
- </SimpleBar>
+ "::selection,*::selection": {
+ bg: "background-selected",
+ color: "inherit"
+ },
+ "::-moz-selection,*::-moz-selection": {
+ bg: "background-selected",
+ color: "inherit"
+ }
+ },
+ fontFamily: "monospace",
+ whiteSpace: "pre", // TODO !important
+ tabSize: 1,
+ position: "relative",
+ lineHeight: "20px",
+ // bg: "var(--background-secondary)",
+ // color: "white",
+ overflowX: "hidden",
+ display: "flex"
+ }}
+ spellCheck={false}
+ />
<Flex
ref={toolbarRef}
contentEditable={false}
diff --git a/packages/editor/src/extensions/table/component.tsx b/packages/editor/src/extensions/table/component.tsx
index bdca8a20c..43767eb9b 100644
--- a/packages/editor/src/extensions/table/component.tsx
+++ b/packages/editor/src/extensions/table/component.tsx
@@ -39,7 +39,6 @@ import {
import { DesktopOnly, MobileOnly } from "../../components/responsive/index.js";
import { TextDirections } from "../text-direction/index.js";
import { strings } from "@notesnook/intl";
-import SimpleBar from "simplebar-react";
import { useIsMobile } from "../../toolbar/stores/toolbar-store.js";
import { updateColumnsOnResize } from "./prosemirror-tables/tableview.js";
@@ -104,41 +103,27 @@ export function TableComponent(
/>
</>
) : null}
- <SimpleBar autoHide style={{ overflowY: "hidden" }}>
- <div dir={textDirection}>
- <table
- ref={(ref) => {
- forwardRef?.(ref);
- tableRef.current = ref || undefined;
- }}
- >
- <colgroup ref={colgroupRef} />
- {/* <tbody /> */}
- </table>
- </div>
- </SimpleBar>
</DesktopOnly>
- <MobileOnly>
- <div
- dir={textDirection}
- style={{
- overflowY: "hidden",
- overflowX: "auto",
- WebkitOverflowScrolling: "touch",
- maxWidth: "100%"
+ <div
+ dir={textDirection}
+ className="scroll-bar"
+ style={{
+ overflowY: "hidden",
+ overflowX: "auto",
+ WebkitOverflowScrolling: "touch",
+ maxWidth: "100%"
+ }}
+ >
+ <table
+ ref={(ref) => {
+ forwardRef?.(ref);
+ tableRef.current = ref || undefined;
}}
>
- <table
- ref={(ref) => {
- forwardRef?.(ref);
- tableRef.current = ref || undefined;
- }}
- >
- <colgroup ref={colgroupRef} />
- {/* <tbody /> */}
- </table>
- </div>
- </MobileOnly>
+ <colgroup ref={colgroupRef} />
+ {/* <tbody /> */}
+ </table>
+ </div>
</>
);
}
diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts
index 1f6bde2ef..b8dd1fb2c 100644
--- a/packages/editor/src/index.ts
+++ b/packages/editor/src/index.ts
@@ -87,7 +87,6 @@ import { strings } from "@notesnook/intl";
import { InlineCode } from "./extensions/inline-code/inline-code.js";
import { FontLigature } from "./extensions/font-ligature/font-ligature.js";
import { SearchResult } from "./extensions/search-result/search-result.js";
-import "simplebar-react/dist/simplebar.min.css";
interface TiptapStorage {
dateFormat?: DateTimeOptions["dateFormat"];
diff --git a/packages/editor/styles/styles.css b/packages/editor/styles/styles.css
index c80c6a1bc..f008bade5 100644
--- a/packages/editor/styles/styles.css
+++ b/packages/editor/styles/styles.css
@@ -991,11 +991,35 @@ del.diffdel {
.simplebar-content:before {
content: "" !important;
}
-.simplebar-content:after {
- content: "" !important;
+
+.scroll-bar {
+ overflow: auto;
+ scrollbar-width: thin;
+ scrollbar-color: transparent transparent;
+}
+
+.scroll-bar:hover {
+ scrollbar-color: var(--border) transparent;
+}
+
+.scroll-bar::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
}
-pre[class*="language-"] {
- overflow: initial !important;
+.scroll-bar::-webkit-scrollbar-track {
+ background: transparent;
+}
+
+.scroll-bar::-webkit-scrollbar-thumb {
+ background-color: transparent;
+ border-radius: 10px;
+ border: 2px solid transparent;
+ background-clip: content-box;
+ transition: background-color 0.2s ease;
}
+.scroll-bar::-webkit-scrollbar-thumb:hover,
+.scroll-bar::-webkit-scrollbar-thumb:active {
+ background-color: var(--border);
+}