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
mobile: always recreate editor on changing note
Ammar Ahmedfaba5f6385d2
diff --git a/packages/editor-mobile/src/components/editor.tsx b/packages/editor-mobile/src/components/editor.tsxindex 86422cbd0..190fd44d4 100644--- a/packages/editor-mobile/src/components/editor.tsx+++ b/packages/editor-mobile/src/components/editor.tsx@@ -22,9 +22,7 @@ import {getFontById,getTableOfContents,TiptapOptions,- Toolbar,- usePermissionHandler,- useTiptap+ usePermissionHandler} from "@notesnook/editor";import { toBlobURL } from "@notesnook/editor/dist/utils/downloader";import { useThemeColors } from "@notesnook/theme";@@ -46,13 +44,13 @@ import {useTabContext,useTabStore} from "../hooks/useTabStore";-import { EmotionEditorToolbarTheme } from "../theme-factory";-import { EventTypes, postAsyncWithTimeout, randId, Settings } from "../utils";+import { EventTypes, postAsyncWithTimeout, Settings } from "../utils";+import { pendingSaveRequests } from "../utils/pending-saves";import Header from "./header";import StatusBar from "./statusbar";import Tags from "./tags";+import TiptapEditorWrapper from "./tiptap";import Title from "./title";-import { pendingSaveRequests } from "../utils/pending-saves";globalThis.toBlobURL = toBlobURL as typeof globalThis.toBlobURL;@@ -77,6 +75,8 @@ const Tiptap = ({const biometryEnrolled = useTabStore((state) => state.biometryEnrolled);const editorRoot = useRef<HTMLDivElement>(null);const isFocusedRef = useRef<boolean>(false);+ const [undo, setUndo] = useState(false);+ const [redo, setRedo] = useState(false);tabRef.current = tab;function restoreNoteSelection(state?: NoteState) {@@ -232,14 +232,11 @@ const Tiptap = ({settings.dateFormat,settings.timeFormat,settings.markdownShortcuts,- tick,- tab.id+ tab.id,+ tick]);- const _editor = useTiptap(tiptapOptions, [tiptapOptions]);-const update = useCallback(() => {- editors[tabRef.current.id]?.commands.setTextSelection(0);setTick((tick) => tick + 1);globalThis.editorControllers[tabRef.current.id]?.setTitlePlaceholder("Note title"@@ -263,7 +260,6 @@ const Tiptap = ({const controllerRef = useRef(controller);globalThis.editorControllers[tab.id] = controller;- globalThis.editors[tab.id] = _editor;useLayoutEffect(() => {if (!getContentDiv().parentElement) {@@ -427,8 +423,8 @@ const Tiptap = ({onDoubleClick={onClickEmptyArea}><Header- hasRedo={_editor?.can().redo() || false}- hasUndo={_editor?.can().undo() || false}+ hasRedo={redo}+ hasUndo={undo}settings={settings}noHeader={settings.noHeader || false}/>@@ -859,24 +855,23 @@ const Tiptap = ({/></div>- {tab.locked ? null : (- <EmotionEditorToolbarTheme>- <Toolbar- className="theme-scope-editorToolbar"- sx={{- display: settings.noToolbar ? "none" : "flex",- overflowY: "hidden",- minHeight: "50px",- backgroundColor: "red"- }}- editor={_editor}- location="bottom"- tools={[...settings.tools]}- defaultFontFamily={settings.fontFamily}- defaultFontSize={settings.fontSize}- />- </EmotionEditorToolbarTheme>- )}+ <TiptapEditorWrapper+ key={tick + tab.id + "-editor"}+ options={tiptapOptions}+ settings={settings}+ onEditorUpdate={(editor) => {+ if (!editor) {+ setUndo(false);+ setRedo(false);+ }+ if (undo !== editor.can().undo()) {+ setUndo(editor.can().undo());+ }+ if (redo !== editor.can().redo()) {+ setRedo(editor.can().redo());+ }+ }}+ /></div></>);diff --git a/packages/editor-mobile/src/components/tiptap.tsx b/packages/editor-mobile/src/components/tiptap.tsxnew file mode 100644index 000000000..a786a348c--- /dev/null+++ b/packages/editor-mobile/src/components/tiptap.tsx@@ -0,0 +1,60 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/+import { Editor, TiptapOptions, Toolbar, useTiptap } from "@notesnook/editor";+import { useTabContext } from "../hooks/useTabStore";+import { EmotionEditorToolbarTheme } from "../theme-factory";+import { Settings } from "../utils";+import { useEffect } from "react";++export default function TiptapEditorWrapper(props: {+ options: Partial<TiptapOptions>;+ onEditorUpdate: (editor: Editor) => void;+ settings: Settings;+}) {+ const tab = useTabContext();+ const editor = useTiptap(props.options, [props.options]);+ globalThis.editors[tab.id] = editor;++ useEffect(() => {+ props.onEditorUpdate(editor);+ }, [editor, props]);++ return (+ <>+ {tab.locked ? null : (+ <EmotionEditorToolbarTheme>+ <Toolbar+ className="theme-scope-editorToolbar"+ sx={{+ display: props.settings.noToolbar ? "none" : "flex",+ overflowY: "hidden",+ minHeight: "50px",+ backgroundColor: "red"+ }}+ editor={editor}+ location="bottom"+ tools={[...props.settings.tools]}+ defaultFontFamily={props.settings.fontFamily}+ defaultFontSize={props.settings.fontSize}+ />+ </EmotionEditorToolbarTheme>+ )}+ </>+ );+}diff --git a/packages/editor-mobile/src/hooks/useEditorController.ts b/packages/editor-mobile/src/hooks/useEditorController.tsindex 0d7a99f28..7bc86cc9b 100644--- a/packages/editor-mobile/src/hooks/useEditorController.ts+++ b/packages/editor-mobile/src/hooks/useEditorController.ts@@ -355,13 +355,13 @@ export function useEditorController({}scrollTo?.(noteState?.top || 0);-countWords(0);}break;}case "native:html":+ if (htmlContentRef.current === value) break;htmlContentRef.current = value;logger("info", "LOADING NOTE HTML");if (!editor) break;