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: install & use simplebar for table scroll bar Signed-off-by: 01zulfi <[email protected]>
01zulfi6eb1f2a4a7af
diff --git a/packages/editor/package-lock.json b/packages/editor/package-lock.jsonindex 941ee0195..ac96e370d 100644--- a/packages/editor/package-lock.json+++ b/packages/editor/package-lock.json@@ -59,6 +59,7 @@"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"},@@ -1754,6 +1755,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",@@ -1799,6 +1833,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",@@ -3867,8 +3934,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",@@ -4016,6 +4082,18 @@"resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.3.tgz","integrity": "sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg=="},+ "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.includes": {"version": "4.3.0","resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",@@ -4072,7 +4150,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"},@@ -5695,7 +5772,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"},@@ -5716,7 +5792,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"@@ -6070,7 +6145,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"}@@ -6164,6 +6238,28 @@"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",diff --git a/packages/editor/package.json b/packages/editor/package.jsonindex 79c7528e4..9166fe22f 100644--- a/packages/editor/package.json+++ b/packages/editor/package.json@@ -79,6 +79,7 @@"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/table/component.tsx b/packages/editor/src/extensions/table/component.tsxindex 9cb5783c4..d0c81376f 100644--- a/packages/editor/src/extensions/table/component.tsx+++ b/packages/editor/src/extensions/table/component.tsx@@ -32,7 +32,7 @@ import {TableProperties} from "../../toolbar/tools/table.js";import { getToolDefinition } from "../../toolbar/tool-definitions.js";-import { getPosition, ScrollContainer } from "@notesnook/ui";+import { getPosition } from "@notesnook/ui";import {findSelectedDOMNode,hasSameAttributes@@ -40,6 +40,7 @@ import {import { DesktopOnly } from "../../components/responsive/index.js";import { TextDirections } from "../text-direction/index.js";import { strings } from "@notesnook/intl";+import SimpleBar from "simplebar-react";export function TableComponent(props: ReactNodeViewProps) {const { editor, node, forwardRef } = props;@@ -67,13 +68,7 @@ export function TableComponent(props: ReactNodeViewProps) {textDirection={textDirection}/></DesktopOnly>- <ScrollContainer- style={{ display: "flex", overscrollBehavior: "contain" }}- trackStyle={() => ({- backgroundColor: "transparent",- "--ms-track-size": "6px"- })}- >+ <SimpleBar autoHide><div dir={textDirection}><tableref={(ref) => {@@ -85,7 +80,7 @@ export function TableComponent(props: ReactNodeViewProps) {{/* <tbody /> */}</table></div>- </ScrollContainer>+ </SimpleBar></>);}@@ -240,7 +235,7 @@ function TableColumnToolbar(props: TableToolbarProps) {});const scrollLeft =- table.current.parentElement?.parentElement?.scrollLeft || 0;+ table.current?.closest(".simplebar-content-wrapper")?.scrollLeft || 0;columnToolsRef.current.style.left = `${pos.left - scrollLeft}px`;columnToolsRef.current.style.top = `${pos.top}px`;diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.tsindex 29f6ac8fa..dbf5b09b3 100644--- a/packages/editor/src/index.ts+++ b/packages/editor/src/index.ts@@ -87,6 +87,7 @@ 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.cssindex f61153c6b..9e78a1457 100644--- a/packages/editor/styles/styles.css+++ b/packages/editor/styles/styles.css@@ -799,3 +799,11 @@ del.diffdel {del.diffdel {text-decoration: none;}++/* simplebar */+.simplebar-track {+ height: 9px !important;+}+.simplebar-content:before {+ content: "" !important;+}\ No newline at end of file