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: some more fixes
Ammar Ahmed366948cd2827
diff --git a/apps/mobile/app/app.tsx b/apps/mobile/app/app.tsxindex ce87e8751..a6421b2ba 100644--- a/apps/mobile/app/app.tsx+++ b/apps/mobile/app/app.tsx@@ -43,18 +43,6 @@ I18nManager.allowRTL(false);I18nManager.forceRTL(false);I18nManager.swapLeftAndRightInRTL(false);-// How app lock works-// 1. User goes to settings and setup app lock with a Pin/Password.-// 2. The Pin/Password is used to encrypt a random value or user's encryption key.-// 3. The encrypted value is stored in MMKV-// 4. When the app launches, the same value is decrypted with user provided key, if it works, we launch the app otherwise it remains locked.-// 5. If Biometrics are enabled, the app lock pin/password is stored in keychain. the value can be accessed if fingerprint auth works ONLY.-// 6. User can manually enter the pin if biometrics fails.-// 7. There is no way to enter the app if user forgets the PIN. The only way is to reset app data and start fresh again.--// How to handle app lock for existing users...-// 1.-const App = () => {const init = useAppEvents();useEffect(() => {diff --git a/apps/mobile/app/components/sheets/editor-tabs/index.tsx b/apps/mobile/app/components/sheets/editor-tabs/index.tsxindex 7697d99ec..4590d9355 100644--- a/apps/mobile/app/components/sheets/editor-tabs/index.tsx+++ b/apps/mobile/app/components/sheets/editor-tabs/index.tsx@@ -20,14 +20,15 @@ import { useThemeColors } from "@notesnook/theme";import React from "react";import { View } from "react-native";import { useDBItem } from "../../../hooks/use-db-item";+import { useTabStore } from "../../../screens/editor/tiptap/use-tab-store";+import { editorController } from "../../../screens/editor/tiptap/utils";import { presentSheet } from "../../../services/event-manager";import { SIZE } from "../../../utils/size";import { Button } from "../../ui/button";import { IconButton } from "../../ui/icon-button";import { PressableButton } from "../../ui/pressable";-import Paragraph from "../../ui/typography/paragraph";import Heading from "../../ui/typography/heading";-import { useTabStore } from "../../../screens/editor/tiptap/use-tab-store";+import Paragraph from "../../ui/typography/paragraph";type TabItem = {id: number;@@ -55,6 +56,7 @@ const TabItemComponent = (props: {onPress={() => {if (!props.isFocused) {useTabStore.getState().focusTab(props.tab.id);+ props.close?.();}}}>@@ -82,7 +84,13 @@ const TabItemComponent = (props: {size={SIZE.lg}color={colors.primary.icon}onPress={() => {+ const isLastTab = useTabStore.getState().tabs.length === 1;useTabStore.getState().removeTab(props.tab.id);+ // The last tab is not actually removed, it is just cleaned up.+ if (isLastTab) {+ editorController.current?.reset(props.tab.id, true, true);+ props.close?.();+ }}}top={0}left={0}@@ -121,7 +129,10 @@ export default function EditorTabs({<Heading size={SIZE.lg}>Tabs</Heading><ButtononPress={() => {- useTabStore.getState().newTab();+ close?.();+ setTimeout(() => {+ useTabStore.getState().newTab();+ }, 300);}}title="New tab"icon="plus"diff --git a/apps/mobile/app/components/tabs/index.tsx b/apps/mobile/app/components/tabs/index.tsxindex e005ac1be..b3a58e6fe 100644--- a/apps/mobile/app/components/tabs/index.tsx+++ b/apps/mobile/app/components/tabs/index.tsx@@ -22,6 +22,7 @@ import React, {RefObject,useEffect,useImperativeHandle,+ useMemo,useRef,useState} from "react";@@ -36,7 +37,7 @@ import Animated, {WithSpringConfig,withTiming} from "react-native-reanimated";-import { editorState } from "../../screens/editor/tiptap/utils";+import { getAppState } from "../../screens/editor/tiptap/utils";import { eSendEvent } from "../../services/event-manager";import { useSettingStore } from "../../stores/use-setting-store";import { eClearEditor } from "../../utils/events";@@ -76,12 +77,19 @@ export const FluidTabs = forwardRef<TabsRef, TabProps>(function FluidTabs(}: TabProps,ref) {+ const appState = useMemo(() => getAppState(), []);const deviceMode = useSettingStore((state) => state.deviceMode);const fullscreen = useSettingStore((state) => state.fullscreen);const introCompleted = useSettingStore((state) => state.settings.introCompleted);- const translateX = useSharedValue(widths ? widths.a : 0);+ const translateX = useSharedValue(+ widths+ ? appState && !appState?.movedAway+ ? widths.a + widths.b+ : widths.a+ : 0+ );const startX = useSharedValue(0);const currentTab = useSharedValue(1);const previousTab = useSharedValue(1);@@ -112,9 +120,8 @@ export const FluidTabs = forwardRef<TabsRef, TabProps>(function FluidTabs(translateX.value = 0;} else {if (prevWidths.current?.a !== widths.a) {- translateX.value = editorState().movedAway- ? widths.a- : editorPosition;+ translateX.value =+ !appState || appState?.movedAway ? widths.a : editorPosition;}}isLoaded.current = true;@@ -142,7 +149,8 @@ export const FluidTabs = forwardRef<TabsRef, TabProps>(function FluidTabs(isDrawerOpen,homePosition,onDrawerStateChange,- editorPosition+ editorPosition,+ appState]);useImperativeHandle(diff --git a/apps/mobile/app/screens/editor/tiptap/commands.ts b/apps/mobile/app/screens/editor/tiptap/commands.tsindex 3df438b12..5757cad20 100644--- a/apps/mobile/app/screens/editor/tiptap/commands.ts+++ b/apps/mobile/app/screens/editor/tiptap/commands.ts@@ -95,7 +95,7 @@ class Commands {`const editor = editors[${tabId}];const editorTitle = editorTitles[${tabId}];- editor && editor.commands.blur();+ typeof editor !== "undefined" && editor.commands.blur();typeof editorTitle !== "undefined" && editorTitle.current && editorTitle.current.blur();`,"blur"@@ -110,7 +110,10 @@ const editorController = editorControllers[${tabId}];const editorTitle = editorTitles[${tabId}];const statusBar = statusBars[${tabId}];-editor.commands.blur();+if (typeof editor !== "undefined") {+ editor.commands.blur();+}+typeof editorTitle !== "undefined" && editorTitle.current && editorTitle.current?.blur();if (editorController.content) editorController.content.current = null;editorController.onUpdate();diff --git a/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts b/apps/mobile/app/screens/editor/tiptap/use-editor-events.tsindex 40b350669..dfeeac83d 100644--- a/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts+++ b/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts@@ -531,7 +531,6 @@ export const useEditorEvents = (break;}case EventTypes.tabFocused: {- // Reload the noteconsole.log("Focused tab",editorMessage.tabId,@@ -542,15 +541,32 @@ export const useEditorEvents = (eSendEvent(eEditorTabFocused, editorMessage.tabId);if (!editorMessage.value && editorMessage.noteId) {- const note = await db.notes.note(editorMessage.noteId);- if (note) {- eSendEvent(eOnLoadNote, {- item: note,- forced: true,- tabId: editorMessage.tabId+ if (!useSettingStore.getState().isAppLoading) {+ const note = await db.notes.note(editorMessage.noteId);+ if (note) {+ eSendEvent(eOnLoadNote, {+ item: note,+ forced: true,+ tabId: editorMessage.tabId+ });+ }+ } else {+ const unsub = useSettingStore.subscribe(async (state) => {+ if (!state.isAppLoading) {+ unsub();+ const note = await db.notes.note(editorMessage.noteId);+ if (note) {+ eSendEvent(eOnLoadNote, {+ item: note,+ forced: true,+ tabId: editorMessage.tabId+ });+ }+ }});}}+break;}diff --git a/apps/mobile/app/screens/editor/tiptap/use-editor.ts b/apps/mobile/app/screens/editor/tiptap/use-editor.tsindex 699404e60..ba0f54bf8 100644--- a/apps/mobile/app/screens/editor/tiptap/use-editor.ts+++ b/apps/mobile/app/screens/editor/tiptap/use-editor.ts@@ -46,7 +46,6 @@ import {import Navigation from "../../../services/navigation";import Notifications from "../../../services/notifications";import SettingsService from "../../../services/settings";-import { TipManager } from "../../../services/tip-manager";import { useSettingStore } from "../../../stores/use-setting-store";import { useTagStore } from "../../../stores/use-tag-store";import {@@ -67,8 +66,7 @@ import {getAppState,isContentInvalid,isEditorLoaded,- post,- waitForEvent+ post} from "./utils";// Keep a fixed session id, dont' change it when a new note is opened, session id can stay the same always I think once the app is opened. DONE@@ -78,9 +76,20 @@ import {// the useEditor hook can recieve save messages for different notes at a time. DONE// When a note is created, the useEditor hook must immediately notify the editor with the note id and set the note id in the editor tabs store// so further changes will go into that note. DONE-// Events sent to editor have the tab id value added to ensure the correct tab will recieve and return events only.+// Events sent to editor have the tab id value added to ensure the correct tab will recieve and return events only. DONE// The useEditorEvents hook can manage events from different tabs at the same time as long as the attached session id matches. DONE// useEditor hook will keep historySessionId for different notes instead of a single note. DONE+//+// LIST OF CASES TO VERIFY WITH TABS OPENING & CLOSING+// 1. SWITCHING TAB CLOSES THE SHEET. DONE+// 2. Closing the tab does proper cleanup if it's the last tab and is not empty. DONE+// 3. Swiping left only focuses editor if current tab is empty. DONE+// 4. Pressing + button will open a new tab for new note if an empty tab does not exist.+// 5. Notes will always open in the preview tab.+// 6. If a note is edited, the tab will become persisted.+// 7. If note is already opened in a tab, we focus that tab.+// 8. If app is killed, restore the note in background.+// 9. During realtimes sync, tabs not focused will be updated so if focused, they have the latest and updated content loaded.export const useEditor = (editorId = "",@@ -188,18 +197,17 @@ export const useEditor = (const reset = useCallback(async (tabId: number, resetState = true, resetContent = true) => {+ console.log("Resetting tab:", tabId);const noteId = useTabStore.getState().getNoteIdForTab(tabId);if (noteId) {currentNotes.current?.id && db.fs().cancel(noteId, "download");-currentNotes.current[noteId] = null;currentContents.current[noteId] = null;editorSessionHistory.clearSession(noteId);lastContentChangeTime.current[noteId] = 0;+ clearTimeout(timers.current["loading-images" + noteId]);}- clearTimeout(timers.current["loading-images" + noteId]);-saveCount.current = 0;loadingState.current = undefined;lock.current = false;@@ -224,7 +232,7 @@ export const useEditor = (sessionHistoryId: currentSessionHistoryId,tabId}: SavePayload) => {- if (currentNotes.current[id as string]?.readonly) return;+ if (currentNotes.current[id as string]?.readonly || readonly) return;try {if (id && !(await db.notes?.note(id))) {await reset(tabId);@@ -337,7 +345,7 @@ export const useEditor = (DatabaseLogger.error(e as Error);}},- [commands, editorSessionHistory, postMessage, reset]+ [commands, editorSessionHistory, postMessage, readonly, reset]);const loadContent = useCallback(@@ -406,7 +414,7 @@ export const useEditor = (const tabId = useTabStore.getState().getTabForNote(event.item.id);if (typeof tabId === "number") {useTabStore.getState().updateTab(tabId, {- readonly: event.item.readonly+ readonly: event.item.readonly || readonly});useTabStore.getState().focusTab(tabId);}@@ -415,7 +423,7 @@ export const useEditor = (console.log("Opening note in preview tab");// Otherwise we focus the preview tab or create one to open the note in.useTabStore.getState().focusPreviewTab(event.item.id, {- readonly: event.item.readonly,+ readonly: event.item.readonly || readonly,locked: false});}@@ -472,15 +480,14 @@ export const useEditor = (await postMessage(EditorEvents.title, item.title, tabId);loadingState.current = currentContents.current[item.id]?.data;- if (currentContents.current[item.id]?.data) {- console.log("loading content for note...");- await postMessage(- EditorEvents.html,- currentContents.current[item.id]?.data,- tabId,- 10000- );- }++ await postMessage(+ EditorEvents.html,+ currentContents.current[item.id]?.data || "",+ tabId,+ 10000+ );+loadingState.current = undefined;await commands.setTags(item);commands.setSettings();@@ -491,7 +498,7 @@ export const useEditor = (}, 300);}},- [commands, editorSessionHistory, loadContent, postMessage, reset]+ [commands, editorSessionHistory, loadContent, postMessage, readonly, reset]);const lockNoteWithVault = useCallback((note: Note) => {@@ -702,15 +709,13 @@ export const useEditor = (if (!state.current.ready && (await onReady())) {state.current.ready = true;}- overlay(false);+ setTimeout(() => overlay(false), 300);const noteId = useTabStore.getState().getCurrentNoteId();async function restoreTabNote() {if (!noteId) return;const note = await db.notes.note(noteId);- if (note) {- loadNote({ item: note, forced: true });- } else {+ if (!note) {console.log("Editor loaded with blank note");loadNote({ newNote: true });if (tabBarRef.current?.page === 1) {diff --git a/apps/mobile/app/screens/editor/tiptap/utils.ts b/apps/mobile/app/screens/editor/tiptap/utils.tsindex 355fb3562..9441a4400 100644--- a/apps/mobile/app/screens/editor/tiptap/utils.ts+++ b/apps/mobile/app/screens/editor/tiptap/utils.ts@@ -147,16 +147,22 @@ export function isContentInvalid(content: string | undefined) {);}+const canRestoreAppState = (appState: AppState) => {+ return (+ appState.editing &&+ !appState.note?.locked &&+ appState.note?.id &&+ Date.now() < appState.timestamp + 3600000+ );+};++let appState: AppState | undefined;export function getAppState() {+ if (appState && canRestoreAppState(appState)) return appState as AppState;const json = MMKV.getString("appState");if (json) {- const appState = JSON.parse(json) as AppState;- if (- appState.editing &&- !appState.note?.locked &&- appState.note?.id &&- Date.now() < appState.timestamp + 3600000- ) {+ appState = JSON.parse(json) as AppState;+ if (canRestoreAppState(appState)) {return appState;} else {return null;@@ -166,5 +172,6 @@ export function getAppState() {}export function clearAppState() {+ appState = undefined;MMKV.removeItem("appState");}diff --git a/packages/editor-mobile/src/components/editor.tsx b/packages/editor-mobile/src/components/editor.tsxindex d050baf5b..7792222c3 100644--- a/packages/editor-mobile/src/components/editor.tsx+++ b/packages/editor-mobile/src/components/editor.tsx@@ -37,7 +37,12 @@ import {} from "react";import { useEditorController } from "../hooks/useEditorController";import { useSettings } from "../hooks/useSettings";-import { TabStore, useTabContext, useTabStore } from "../hooks/useTabStore";+import {+ TabItem,+ TabStore,+ useTabContext,+ useTabStore+} from "../hooks/useTabStore";import { EmotionEditorToolbarTheme } from "../theme-factory";import { EventTypes, Settings } from "../utils";import Header from "./header";@@ -48,12 +53,18 @@ import Title from "./title";globalThis.toBlobURL = toBlobURL as typeof globalThis.toBlobURL;const Tiptap = ({ settings }: { settings: Settings }) => {+ const { colors } = useThemeColors();const tab = useTabContext();const isFocused = useTabStore((state) => state.currentTab === tab?.id);const [tick, setTick] = useState(0);const contentRef = useRef<HTMLDivElement>(null);const containerRef = useRef<HTMLDivElement>(null);const [layout, setLayout] = useState(false);+ const noteStateUpdateTimer = useRef<NodeJS.Timeout>();+ const tabRef = useRef<TabItem>(tab);+ const isFocusedRef = useRef<boolean>(false);+ tabRef.current = tab;+usePermissionHandler({claims: {premium: settings.premium@@ -102,6 +113,21 @@ const Tiptap = ({ settings }: { settings: Settings }) => {copyToClipboard: (text) => {globalThis.editorControllers[tab.id]?.copyToClipboard(text);},+ onSelectionUpdate: () => {+ if (tab.noteId) {+ const noteId = tab.noteId;+ clearTimeout(noteStateUpdateTimer.current);+ noteStateUpdateTimer.current = setTimeout(() => {+ if (tab.noteId !== noteId) return;+ const { to, from } =+ editors[tabRef.current?.id]?.state.selection || {};+ useTabStore.getState().setNoteState(noteId, {+ to,+ from+ });+ }, 500);+ }+ },downloadOptions: {corsHost: settings.corsProxy},@@ -120,12 +146,33 @@ const Tiptap = ({ settings }: { settings: Settings }) => {const update = useCallback(() => {setTick((tick) => tick + 1);- containerRef.current?.scrollTo?.({- left: 0,- top: 0+ setTimeout(() => {+ const noteState = tabRef.current.noteId+ ? useTabStore.getState().noteState[tabRef.current.noteId]+ : undefined;+ const top = noteState?.top;++ if (noteState?.to || noteState?.from) {+ editors[tabRef.current.id]?.chain().setTextSelection({+ to: noteState.to,+ from: noteState.from+ });+ }++ containerRef.current?.scrollTo({+ left: 0,+ top: top || 0,+ behavior: "auto"+ });+ }, 32);++ globalThis.editorControllers[tabRef.current.id]?.setTitlePlaceholder(+ "Note title"+ );+ setTimeout(() => {+ editorControllers[tabRef.current.id]?.setLoading(false);});- globalThis.editorControllers[tab.id]?.setTitlePlaceholder("Note title");- }, [tab.id]);+ }, []);const controller = useEditorController(update);const controllerRef = useRef(controller);@@ -136,33 +183,57 @@ const Tiptap = ({ settings }: { settings: Settings }) => {useLayoutEffect(() => {setLayout(true);const updateScrollPosition = (state: TabStore) => {- if (state.currentTab === tab.id) {- const position = state.scrollPosition[tab?.id];- if (position) {+ if (isFocusedRef.current) return;+ if (state.currentTab === tabRef.current.id) {+ isFocusedRef.current = true;+ const noteState = tabRef.current.noteId+ ? state.noteState[tabRef.current.noteId]+ : undefined;+ if (noteState) {containerRef.current?.scrollTo({left: 0,- top: position,+ top: noteState.top,behavior: "auto"});+ if (noteState.to || noteState.from) {+ editors[tabRef.current.id]?.chain().setTextSelection({+ to: noteState.to,+ from: noteState.from+ });+ }}++ if (+ !globalThis.editorControllers[tabRef.current.id]?.content.current &&+ tabRef.current.noteId+ ) {+ editorControllers[tabRef.current.id]?.setLoading(true);+ }+post(EventTypes.tabFocused,- !!globalThis.editorControllers[tab.id]?.content.current,- tab.id,+ !!globalThis.editorControllers[tabRef.current.id]?.content.current,+ tabRef.current.id,state.getCurrentNoteId());+ editorControllers[tabRef.current.id]?.updateTab();+ } else {+ isFocusedRef.current = false;}};updateScrollPosition(useTabStore.getState());const unsub = useTabStore.subscribe((state, prevState) => {+ if (state.currentTab !== tabRef.current.id) {+ isFocusedRef.current = false;+ }if (state.currentTab === prevState.currentTab) return;updateScrollPosition(state);});return () => {unsub();};- }, [tab.id]);+ }, []);const onClickEmptyArea: React.MouseEventHandler<HTMLDivElement> = useCallback((event) => {@@ -244,6 +315,7 @@ const Tiptap = ({ settings }: { settings: Settings }) => {settings={settings}noHeader={settings.noHeader || false}/>+<divonScroll={controller.scroll}ref={containerRef}@@ -269,6 +341,52 @@ const Tiptap = ({ settings }: { settings: Settings }) => {</>)}+ {controller.loading ? (+ <div+ style={{+ height: "100%",+ width: "100%",+ position: "absolute",+ zIndex: 999,+ backgroundColor: "white",+ paddingRight: 12,+ paddingLeft: 12,+ display: "flex",+ flexDirection: "column"+ }}+ >+ <div+ style={{+ height: 16,+ width: "94%",+ backgroundColor: colors.secondary.background,+ borderRadius: 5,+ marginTop: 10+ }}+ />++ <div+ style={{+ height: 16,+ width: "94%",+ backgroundColor: colors.secondary.background,+ borderRadius: 5,+ marginTop: 10+ }}+ />++ <div+ style={{+ height: 16,+ width: 200,+ backgroundColor: colors.secondary.background,+ borderRadius: 5,+ marginTop: 10+ }}+ />+ </div>+ ) : null}+<ContentDivpadding={settings.doubleSpacedLines ? 0 : 6}fontSize={settings.fontSize}diff --git a/packages/editor-mobile/src/hooks/useEditorController.ts b/packages/editor-mobile/src/hooks/useEditorController.tsindex 03c403704..264573208 100644--- a/packages/editor-mobile/src/hooks/useEditorController.ts+++ b/packages/editor-mobile/src/hooks/useEditorController.ts@@ -104,21 +104,30 @@ export type EditorController = {countWords: (ms: number) => void;copyToClipboard: (text: string) => void;getAttachmentData: (attachment: Attachment) => Promise<string>;+ updateTab: () => void;+ loading: boolean;+ setLoading: (value: boolean) => void;};export function useEditorController(update: () => void): EditorController {const tab = useTabContext();+ const [loading, setLoading] = useState(true);const setTheme = useThemeEngineStore((store) => store.setTheme);const { colors } = useThemeColors("editor");const [title, setTitle] = useState("");const [titlePlaceholder, setTitlePlaceholder] = useState("Note title");const htmlContentRef = useRef<string | null>(null);+ const updateTabOnFocus = useRef(false);const timers = useRef<Timers>({selectionChange: null,change: null,wordCounter: null});+ if (!tab.noteId && loading) {+ setLoading(false);+ }+const selectionChange = useCallback((_editor: Editor) => {}, []);const titleChange = useCallback(@@ -176,9 +185,11 @@ export function useEditorController(update: () => void): EditorController {const scroll = useCallback((_event: React.UIEvent<HTMLDivElement, UIEvent>) => {if (!tab) return;- useTabStore- .getState()- .setScrollPosition(tab.id, _event.currentTarget.scrollTop);+ if (tab.noteId) {+ useTabStore.getState().setNoteState(tab.noteId, {+ top: _event.currentTarget.scrollTop+ });+ }},[tab]);@@ -212,25 +223,30 @@ export function useEditorController(update: () => void): EditorController {switch (type) {case "native:updatehtml": {htmlContentRef.current = value;- if (!editor) break;- const { from, to } = editor.state.selection;-- editor?.commands.setContent(htmlContentRef.current, false, {- preserveWhitespace: true- });+ if (tab.id !== useTabStore.getState().currentTab) {+ updateTabOnFocus.current = true;+ } else {+ if (!editor) break;+ const { from, to } = editor.state.selection;+ editor?.commands.setContent(htmlContentRef.current, false, {+ preserveWhitespace: true+ });++ editor.commands.setTextSelection({+ from,+ to+ });+ countWords(0);+ }- editor.commands.setTextSelection({- from,- to- });- countWords();break;}case "native:html":// logger("info", "loading html", htmlContentRef.current);htmlContentRef.current = value;+ if (!editor) break;update();- countWords();+ countWords(0);break;case "native:theme":setTheme(message.value);@@ -329,6 +345,8 @@ export function useEditorController(update: () => void): EditorController {selectionChange,titleChange,scroll,+ loading,+ setLoading,title,setTitle,titlePlaceholder,@@ -341,6 +359,26 @@ export function useEditorController(update: () => void): EditorController {onUpdate: onUpdate,countWords,copyToClipboard,- getAttachmentData+ getAttachmentData,+ updateTab: () => {+ // When the tab is focused, we apply any updates to content that were recieved when+ // the tab was not focused.+ updateTabOnFocus.current = false;+ setTimeout(() => {+ if (!updateTabOnFocus.current) return;+ const editor = editors[tab.id];+ if (!editor) return;+ const { from, to } = editor.state.selection;+ editor?.commands.setContent(htmlContentRef.current, false, {+ preserveWhitespace: true+ });+ editor.commands.setTextSelection({+ from,+ to+ });+ countWords();+ logger("info", `Tab ${tab.id} updated.`);+ }, 1);+ }};}diff --git a/packages/editor-mobile/src/hooks/useTabStore.ts b/packages/editor-mobile/src/hooks/useTabStore.tsindex 387050f19..14a412258 100644--- a/packages/editor-mobile/src/hooks/useTabStore.ts+++ b/packages/editor-mobile/src/hooks/useTabStore.ts@@ -33,10 +33,17 @@ export type TabItem = {readonly?: boolean;};+type NoteState = {+ top: number;+ to: number;+ from: number;+};+export type TabStore = {tabs: TabItem[];currentTab: number;scrollPosition: Record<number, number>;+ noteState: Record<string, NoteState>;updateTab: (id: number, options: Omit<Partial<TabItem>, "id">) => void;removeTab: (index: number) => void;moveTab: (index: number, toIndex: number) => void;@@ -53,6 +60,7 @@ export type TabStore = {) => void;getCurrentNoteId: () => string | undefined;getTab: (tabId: number) => TabItem | undefined;+ setNoteState: (noteId: string, state: Partial<NoteState>) => void;};function getId(id: number, tabs: TabItem[]): number {@@ -66,6 +74,7 @@ function getId(id: number, tabs: TabItem[]): number {export const useTabStore = create(persist<TabStore>((set, get) => ({+ noteState: {},tabs: [{id: 0,@@ -74,6 +83,18 @@ export const useTabStore = create(],currentTab: 0,scrollPosition: {},+ setNoteState: (noteId: string, state: Partial<NoteState>) => {+ const noteState = {+ ...get().noteState+ };+ noteState[noteId] = {+ ...get().noteState[noteId],+ ...state+ };+ set({+ noteState+ });+ },updateTab: (id: number, options: Omit<Partial<TabItem>, "id">) => {const index = get().tabs.findIndex((t) => t.id === id);if (index == -1) return;