mobile: release v3.0.28

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

.github/actions/setup-node-with-cache/action.yml

@@ -14,6 +14,8 @@ runs:
           apps/mobile/package-lock.json
           apps/desktop/package-lock.json
           apps/web/package-lock.json
+          apps/monograph/package-lock.json
+          apps/theme-builder/package-lock.json
           extensions/web-clipper/package-lock.json
           packages/core/package-lock.json
           packages/crypto/package-lock.json
@@ -24,3 +26,4 @@ runs:
           packages/logger/package-lock.json
           packages/streamable-fs/package-lock.json
           packages/theme/package-lock.json
+          packages/intl/package-lock.json

.github/workflows/core.tests.yml

@@ -18,7 +18,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/desktop.publish.yml

@@ -37,7 +37,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -49,6 +49,13 @@ jobs:
         run: |
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=web
+          npm run bootstrap -- --scope=desktop
+
+      - name: Install sqlite-better-trigram for all arch
+        run: |
+          npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu x64 sqlite-better-trigram
+        working-directory: ./apps/desktop
 
       - name: Setup environment
         run: |
@@ -57,6 +64,10 @@ jobs:
       - name: Generate desktop build
         run: npx nx build:desktop @notesnook/web
 
+      - name: Build desktop bundle
+        working-directory: ./apps/desktop
+        run: npm run bundle
+
       - name: Archive build artifact
         uses: actions/upload-artifact@v4
         with:
@@ -71,7 +82,8 @@ jobs:
 
       - name: Package desktop build
         run: |
-          zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/web/build/
+          cp -r ./apps/web/build ./apps/desktop/
+          zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/desktop/build/
           echo "Build folder archived to ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip"
 
       - name: Upload desktop build

.github/workflows/desktop.tests.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -133,7 +133,7 @@ jobs:
   test-linux:
     name: Test for Linux
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out Git repository

.github/workflows/editor.tests.yml

@@ -19,7 +19,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/help.publish.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/monograph.publish.yml

@@ -14,7 +14,7 @@ on: workflow_dispatch
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       packages: write
       contents: read

.github/workflows/theme-builder.publish.yml

@@ -5,7 +5,7 @@ on: workflow_dispatch
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/vericrypt.publish.yml

@@ -5,7 +5,7 @@ on: workflow_dispatch
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/web.benchmarks.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   bench:
     name: Bench
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/web.publish.yml

@@ -5,7 +5,7 @@ on: workflow_dispatch
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/web.tests.yml

@@ -19,7 +19,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

7421.patch

@@ -0,0 +1,37 @@
+From af88ee05e1620afb65c76148d347cb7efc32bded Mon Sep 17 00:00:00 2001
+From: 01zulfi <85733202+01zulfi@users.noreply.github.com>
+Date: Wed, 29 Jan 2025 12:22:32 +0500
+Subject: [PATCH] editor: fix hover styling in toolbar color buttons
+ Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
+
+---
+ packages/editor/src/toolbar/popups/color-picker.tsx | 2 +-
+ packages/editor/src/toolbar/tools/colors.tsx        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/packages/editor/src/toolbar/popups/color-picker.tsx b/packages/editor/src/toolbar/popups/color-picker.tsx
+index 0abca19268..34209bd550 100644
+--- a/packages/editor/src/toolbar/popups/color-picker.tsx
++++ b/packages/editor/src/toolbar/popups/color-picker.tsx
+@@ -284,7 +284,7 @@ function PaletteButton(props: PaletteButtonProps) {
+         ml: [2, 2, 1],
+         bg,
+         ":hover:not(:disabled):not(:active)": {
+-          bg: bg?.startsWith("#") ? colord(bg).darken(5).toRgbString() : "hover"
++          bg: bg?.startsWith("#") ? colord(bg).darken().toRgbString() : "hover"
+         },
+         ...sx
+       }}
+diff --git a/packages/editor/src/toolbar/tools/colors.tsx b/packages/editor/src/toolbar/tools/colors.tsx
+index 08c6b41d8a..77ea660e75 100644
+--- a/packages/editor/src/toolbar/tools/colors.tsx
++++ b/packages/editor/src/toolbar/tools/colors.tsx
+@@ -137,7 +137,7 @@ export function ColorTool(props: ColorToolProps) {
+         mr: 0,
+         bg: activeColor || "transparent",
+         ":hover:not(:disabled):not(:active)": {
+-          bg: tColor ? tColor.darken(5).toRgbString() : "transparent"
++          bg: tColor ? tColor.darken().toRgbString() : "transparent"
+         }
+       }}
+       onOpen={toggle}

apps/desktop/package-lock.json

@@ -1,16 +1,16 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.0.24",
+  "version": "3.0.25",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.0.24",
+      "version": "3.0.25",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@lingui/core": "4.11.4",
+        "@lingui/core": "5.1.2",
         "@notesnook/intl": "file:../../packages/intl",
         "@trpc/client": "10.45.2",
         "@trpc/server": "10.45.2",
@@ -51,6 +51,7 @@
       "license": "GPL-3.0-or-later",
       "devDependencies": {
         "@lingui/cli": "5.1.2",
+        "@lingui/core": "5.1.2",
         "@lingui/swc-plugin": "5.0.2",
         "@types/react": "18.3.5",
         "babel-plugin-macros": "^3.1.0",
@@ -960,30 +961,40 @@
       "dev": true
     },
     "node_modules/@lingui/core": {
-      "version": "4.11.4",
-      "resolved": "https://registry.npmjs.org/@lingui/core/-/core-4.11.4.tgz",
-      "integrity": "sha512-W0bBIFe44s//Qs+RQ+NMfzK5vAm9oEKyDddlN94Db6rzeUT/IJo7N+T75A6Bya8v/BrtF2G/W4b77eS3sd0utw==",
-      "license": "MIT",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@lingui/core/-/core-5.1.2.tgz",
+      "integrity": "sha512-biqmMCWuBBj7ERSpgGSV91hTShnSrR/RIFUcNKjWuZYgDd3HpBdEmXKCo9NTanQYbkBUpmyw/bgwsSBex6vkDA==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
-        "@lingui/message-utils": "4.11.4",
+        "@lingui/message-utils": "^5.1.2",
         "unraw": "^3.0.0"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "@lingui/babel-plugin-lingui-macro": "5.1.2",
+        "babel-plugin-macros": "2 || 3"
+      },
+      "peerDependenciesMeta": {
+        "@lingui/babel-plugin-lingui-macro": {
+          "optional": true
+        },
+        "babel-plugin-macros": {
+          "optional": true
+        }
       }
     },
     "node_modules/@lingui/message-utils": {
-      "version": "4.11.4",
-      "resolved": "https://registry.npmjs.org/@lingui/message-utils/-/message-utils-4.11.4.tgz",
-      "integrity": "sha512-ZTCDhGbj5EN+P9Ajcj0Gq9uDP3HZTRW6/kT09WkiFgL4NayYLksPvgBk29sIglsS6M+Y6Iw2BrUK403SZjZKgw==",
-      "license": "MIT",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@lingui/message-utils/-/message-utils-5.1.2.tgz",
+      "integrity": "sha512-P/N0yBy2MuC726EaGPGiOafc/0RafHiwkvZJdFKjm1/XOMWrFZDPFXTuxguVQ3HQsRi5eUIPaboU4uRX4GepPg==",
       "dependencies": {
         "@messageformat/parser": "^5.0.0",
         "js-sha256": "^0.10.1"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@malept/cross-spawn-promise": {
@@ -1065,10 +1076,9 @@
       }
     },
     "node_modules/@messageformat/parser": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.1.0.tgz",
-      "integrity": "sha512-jKlkls3Gewgw6qMjKZ9SFfHUpdzEVdovKFtW1qRhJ3WI4FW5R/NnGDqr8SDGz+krWDO3ki94boMmQvGke1HwUQ==",
-      "license": "MIT",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.1.1.tgz",
+      "integrity": "sha512-3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==",
       "dependencies": {
         "moo": "^0.5.1"
       }
@@ -4319,8 +4329,7 @@
     "node_modules/js-sha256": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
-      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw==",
-      "license": "MIT"
+      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -4770,8 +4779,7 @@
     "node_modules/moo": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
-      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
-      "license": "BSD-3-Clause"
+      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="
     },
     "node_modules/ms": {
       "version": "2.1.3",

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.24",
+  "version": "3.0.25",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
@@ -25,7 +25,7 @@
   "repository": "https://github.com/streetwriters/notesnook",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "@lingui/core": "4.11.4",
+    "@lingui/core": "5.1.2",
     "@notesnook/intl": "file:../../packages/intl",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
@@ -262,4 +262,4 @@
       }
     ]
   }
-}
+}

apps/mobile/app/components/attachments/actions.tsx

@@ -182,18 +182,17 @@ const Actions = ({
         relations
           .map((relation) => relation.fromId)
           .forEach(async (id) => {
-            const tab = useTabStore.getState().getTabForNote(id);
-            if (tab !== undefined) {
-              const isFocused = useTabStore.getState().currentTab === tab;
+            useTabStore.getState().forEachNoteTab(id, async (tab) => {
+              const isFocused = useTabStore.getState().currentTab === tab.id;
               if (isFocused) {
                 eSendEvent(eOnLoadNote, {
                   item: await db.notes.note(id),
                   forced: true
                 });
               } else {
-                editorController.current.commands.setLoading(true, tab);
+                editorController.current.commands.setLoading(true, tab.id);
               }
-            }
+            });
           });
         close?.();
       },

apps/mobile/app/components/dialog/index.js

@@ -110,6 +110,7 @@ export const Dialog = ({ context = "global" }) => {
     setChecked(false);
     values.current.inputValue = undefined;
     setVisible(false);
+    dialogInfo.onClose();
   };
 
   const onNegativePress = async () => {

apps/mobile/app/components/properties/index.js

@@ -141,7 +141,7 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
                     close();
                     eSendEvent(eOnLoadNote, {
                       item: item,
-                      presistTab: true
+                      newTab: true
                     });
                     if (!DDS.isTab) {
                       tabBarRef.current?.goToPage(1);

apps/mobile/app/components/sheets/editor-tabs/index.tsx

@@ -16,8 +16,8 @@ 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 { Note } from "@notesnook/core";
-import { EVENTS } from "@notesnook/core";
+import { EVENTS, Note } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect } from "react";
 import { View } from "react-native";
@@ -25,27 +25,18 @@ import { FlatList } from "react-native-actions-sheet";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../../common/database";
 import { useDBItem } from "../../../hooks/use-db-item";
-import { useTabStore } from "../../../screens/editor/tiptap/use-tab-store";
+import {
+  TabItem,
+  useTabStore
+} from "../../../screens/editor/tiptap/use-tab-store";
 import { editorController } from "../../../screens/editor/tiptap/utils";
 import { eSendEvent, presentSheet } from "../../../services/event-manager";
 import { eUnlockNote } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
-import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import { Pressable } from "../../ui/pressable";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
-import { strings } from "@notesnook/intl";
-
-type TabItem = {
-  id: number;
-  noteId?: string;
-  previewTab?: boolean;
-  locked?: boolean;
-  noteLocked?: boolean;
-  readonly?: boolean;
-  pinned?: boolean;
-};
 
 const TabItemComponent = (props: {
   tab: TabItem;
@@ -53,7 +44,7 @@ const TabItemComponent = (props: {
   close?: (ctx?: string | undefined) => void;
 }) => {
   const { colors } = useThemeColors();
-  const [item, update] = useDBItem(props.tab.noteId, "note");
+  const [item, update] = useDBItem(props.tab.session?.noteId, "note");
 
   useEffect(() => {
     const syncCompletedSubscription = db.eventManager?.subscribe(
@@ -85,11 +76,11 @@ const TabItemComponent = (props: {
       onPress={() => {
         if (!props.isFocused) {
           useTabStore.getState().focusTab(props.tab.id);
-          if (props.tab.locked) {
+          if (props.tab.session?.locked) {
             eSendEvent(eUnlockNote);
           }
 
-          if (!props.tab.noteId) {
+          if (!props.tab.session?.noteId) {
             setTimeout(() => {
               editorController?.current?.commands?.focus(props.tab.id);
             }, 300);
@@ -97,11 +88,6 @@ const TabItemComponent = (props: {
         }
         props.close?.();
       }}
-      onLongPress={() => {
-        useTabStore.getState().updateTab(props.tab.id, {
-          previewTab: false
-        });
-      }}
     >
       <View
         style={{
@@ -112,9 +98,9 @@ const TabItemComponent = (props: {
           flexShrink: 1
         }}
       >
-        {props.tab.noteLocked ? (
+        {props.tab.session?.noteLocked ? (
           <>
-            {props.tab.locked ? (
+            {props.tab.session?.locked ? (
               <Icon size={SIZE.md} name="lock" />
             ) : (
               <Icon size={SIZE.md} name="lock-open-outline" />
@@ -122,7 +108,9 @@ const TabItemComponent = (props: {
           </>
         ) : null}
 
-        {props.tab.readonly ? <Icon size={SIZE.md} name="pencil-lock" /> : null}
+        {props.tab.session?.readonly ? (
+          <Icon size={SIZE.md} name="pencil-lock" />
+        ) : null}
 
         <Paragraph
           color={
@@ -130,15 +118,10 @@ const TabItemComponent = (props: {
               ? colors.selected.paragraph
               : colors.primary.paragraph
           }
-          style={{
-            fontFamily: props.tab.previewTab
-              ? "OpenSans-Italic"
-              : "OpenSans-Regular"
-          }}
           numberOfLines={1}
           size={SIZE.md}
         >
-          {props.tab.noteId
+          {props.tab.session?.noteId
             ? item?.title || strings.untitledNote()
             : strings.newNote()}
         </Paragraph>
@@ -157,8 +140,7 @@ const TabItemComponent = (props: {
           color={props.tab.pinned ? colors.primary.accent : colors.primary.icon}
           onPress={() => {
             useTabStore.getState().updateTab(props.tab.id, {
-              pinned: !props.tab.pinned,
-              previewTab: false
+              pinned: !props.tab.pinned
             });
           }}
           top={0}
@@ -197,6 +179,7 @@ export default function EditorTabs({
 }: {
   close?: (ctx?: string | undefined) => void;
 }) {
+  const { colors } = useThemeColors();
   const [tabs, currentTab] = useTabStore((state) => [
     state.tabs,
     state.currentTab
@@ -233,25 +216,13 @@ export default function EditorTabs({
         }}
       >
         <Heading size={SIZE.lg}>{strings.tabs()}</Heading>
-        <Button
+        <IconButton
           onPress={() => {
             useTabStore.getState().newTab();
-            setTimeout(() => {
-              editorController?.current?.commands?.focus(
-                useTabStore.getState().currentTab
-              );
-            }, 500);
             close?.();
           }}
-          title={strings.newTab()}
-          icon="plus"
-          style={{
-            flexDirection: "row",
-            justifyContent: "flex-start",
-            borderRadius: 100,
-            height: 35
-          }}
-          iconSize={SIZE.lg}
+          name="plus"
+          color={colors.primary.accent}
         />
       </View>
 

apps/mobile/app/components/sheets/link-note/index.tsx

@@ -22,24 +22,22 @@ import {
   VirtualizedGrouping,
   createInternalLink
 } from "@notesnook/core";
+import type { LinkAttributes } from "@notesnook/editor";
+import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
+import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
 import { FlatList } from "react-native-actions-sheet";
 import { db } from "../../../common/database";
 import { useDBItem } from "../../../hooks/use-db-item";
+import { editorController } from "../../../screens/editor/tiptap/utils";
 import { presentSheet } from "../../../services/event-manager";
 import { SIZE } from "../../../utils/size";
 import { Button } from "../../ui/button";
 import Input from "../../ui/input";
 import { Pressable } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
-import type { LinkAttributes } from "@notesnook/editor";
-import {
-  EditorEvents,
-  editorController
-} from "../../../screens/editor/tiptap/utils";
-import { strings } from "@notesnook/intl";
 
 const ListNoteItem = ({
   id,
@@ -194,7 +192,7 @@ export default function LinkNote(props: {
           }
         : undefined
     );
-    editorController.current?.postMessage(EditorEvents.resolve, {
+    editorController.current?.postMessage(NativeEvents.resolve, {
       data: {
         href: link,
         title: selectedNote.title

apps/mobile/app/components/sheets/update/index.js

@@ -43,7 +43,7 @@ export const Update = ({ version: appVersion, fwdRef }) => {
   let notes = version?.notes
     ? version.notes.replace("Thank you for using Notesnook!", "").split("- ")
     : ["Bug fixes and performance improvements"];
-  notes = notes?.map((n) => n.replace(/\n/g, ""));
+  notes = notes?.map((n) => n.replace(/\n|<br>/g, ""));
   const isGithubRelease = Config.GITHUB_RELEASE === "true";
 
   const getSupportedAbi = () => {
@@ -178,18 +178,20 @@ export const Update = ({ version: appVersion, fwdRef }) => {
                 {version.body}
               </Paragraph>
             ) : null}
-            {notes.map((item) => (
-              <Paragraph
-                key={item}
-                color={colors.secondary.paragraph}
-                style={{
-                  marginBottom: 5
-                }}
-                selectable
-              >
-                • {item}
-              </Paragraph>
-            ))}
+            {notes.map((item) =>
+              item && item !== "" ? (
+                <Paragraph
+                  key={item}
+                  color={colors.secondary.paragraph}
+                  style={{
+                    marginBottom: 5
+                  }}
+                  selectable
+                >
+                  • {item}
+                </Paragraph>
+              ) : null
+            )}
           </ScrollView>
           <Seperator />
           <Button

apps/mobile/app/components/ui/pressable/index.tsx

@@ -263,20 +263,22 @@ export const Pressable = ({
   const getStyle = useCallback(
     ({ pressed }: PressableStateCallbackType): ViewStyle | ViewStyle[] => [
       {
-        backgroundColor: pressed
-          ? RGB_Linear_Shade(alpha, hexToRGBA(selectedColor, opacity || 1))
-          : hexToRGBA(primaryColor, opacity || 1),
+        backgroundColor:
+          pressed && !disabled
+            ? RGB_Linear_Shade(alpha, hexToRGBA(selectedColor, opacity || 1))
+            : hexToRGBA(primaryColor, opacity || 1),
         width: "100%",
         alignSelf: "center",
         borderRadius: noborder ? 0 : br,
         justifyContent: "center",
         alignItems: "center",
         marginBottom: 0,
-        borderColor: pressed
-          ? customSelectedColor
-            ? getColorLinearShade(customSelectedColor, 0.3, false)
-            : borderSelectedColor || borderColor
-          : borderColor || "transparent",
+        borderColor:
+          pressed && !disabled
+            ? customSelectedColor
+              ? getColorLinearShade(customSelectedColor, 0.3, false)
+              : borderSelectedColor || borderColor
+            : borderColor || "transparent",
         borderWidth: borderWidth
       },
       style,
@@ -298,7 +300,8 @@ export const Pressable = ({
       borderColor,
       borderWidth,
       style,
-      growFactor
+      growFactor,
+      disabled
     ]
   );
 

apps/mobile/app/hooks/use-actions.tsx

@@ -19,14 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable no-inner-declarations */
 import {
   Color,
+  createInternalLink,
   ItemReference,
   Note,
   Notebook,
   Reminder,
   Tag,
   TrashItem,
-  VAULT_ERRORS,
-  createInternalLink
+  VAULT_ERRORS
 } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import { DisplayedNotification } from "@notifee/react-native";
@@ -50,11 +50,11 @@ import ReminderSheet from "../components/sheets/reminder";
 import { useSideBarDraggingStore } from "../components/side-menu/dragging-store";
 import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
 import {
-  ToastManager,
   eSendEvent,
   eSubscribeEvent,
   openVault,
-  presentSheet
+  presentSheet,
+  ToastManager
 } from "../services/event-manager";
 import Navigation from "../services/navigation";
 import Notifications from "../services/notifications";
@@ -544,14 +544,13 @@ export const useActions = ({
     const toggleReadyOnlyMode = async () => {
       const currentReadOnly = (item as Note).readonly;
       await db.notes.readonly(!currentReadOnly, item?.id);
-
-      if (useTabStore.getState().hasTabForNote(item.id)) {
-        const tabId = useTabStore.getState().getTabForNote(item.id);
-        if (!tabId) return;
-        useTabStore.getState().updateTab(tabId, {
-          readonly: !currentReadOnly
+      useTabStore.getState().forEachNoteTab(item.id, (tab) => {
+        useTabStore.getState().updateTab(tab.id, {
+          session: {
+            readonly: !currentReadOnly
+          }
         });
-      }
+      });
       Navigation.queueRoutesForUpdate();
       close();
     };

apps/mobile/app/hooks/use-app-events.tsx

@@ -51,7 +51,10 @@ import { endProgress, startProgress } from "../components/dialogs/progress";
 import Migrate from "../components/sheets/migrate";
 import NewFeature from "../components/sheets/new-feature";
 import { Walkthrough } from "../components/walkthroughs";
-import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
+import {
+  resetTabStore,
+  useTabStore
+} from "../screens/editor/tiptap/use-tab-store";
 import {
   clearAppState,
   editorController,
@@ -103,6 +106,7 @@ import { getGithubVersion } from "../utils/github-version";
 import { tabBarRef } from "../utils/global-refs";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { sleep } from "../utils/time";
+import ReminderSheet from "../components/sheets/reminder";
 
 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
   const { disableSync, disableAutoSync } = SettingsService.get();
@@ -157,6 +161,8 @@ const onUserSessionExpired = async () => {
 
 const onAppOpenedFromURL = async (event: { url: string }) => {
   const url = event.url;
+
+  console.log("URL", url);
   try {
     if (url.startsWith("https://app.notesnook.com/account/verified")) {
       await onUserEmailVerified();
@@ -166,6 +172,25 @@ const onAppOpenedFromURL = async (event: { url: string }) => {
       eSendEvent(eOnLoadNote, { newNote: true });
       tabBarRef.current?.goToPage(1, false);
       return;
+    } else if (url.startsWith("https://notesnook.com/open_note")) {
+      const id = new URL(url).searchParams.get("id");
+      if (id) {
+        const note = await db.notes.note(id);
+        if (note) {
+          eSendEvent(eOnLoadNote, {
+            item: note
+          });
+          tabBarRef.current?.goToPage(1, false);
+        }
+      }
+    } else if (url.startsWith("https://notesnook.com/open_reminder")) {
+      const id = new URL(url).searchParams.get("id");
+      if (id) {
+        const reminder = await db.reminders.reminder(id);
+        if (reminder) ReminderSheet.present(reminder);
+      }
+    } else if (url.startsWith("https://notesnook.com/new_reminder")) {
+      ReminderSheet.present();
     }
   } catch (e) {
     console.error(e);
@@ -222,6 +247,7 @@ const onLogout = async (reason: string) => {
   await PremiumService.setPremiumStatus();
   await BiometricService.resetCredentials();
   MMKV.clearStore();
+  resetTabStore();
   clearAllStores();
   setImmediate(() => {
     refreshAllStores();
@@ -620,22 +646,17 @@ export const useAppEvents = () => {
       EV.subscribe(EVENTS.vaultLocked, async () => {
         // Lock all notes in all tabs...
         for (const tab of useTabStore.getState().tabs) {
-          const noteId = useTabStore.getState().getTab(tab.id)?.noteId;
+          const noteId = useTabStore.getState().getTab(tab.id)?.session?.noteId;
           if (!noteId) continue;
           const note = await db.notes.note(noteId);
           const locked = note && (await db.vaults.itemExists(note));
           if (locked) {
             useTabStore.getState().updateTab(tab.id, {
-              locked: true
+              session: {
+                locked: true,
+                noteLocked: true
+              }
             });
-            if (
-              tab.id === useTabStore.getState().currentTab &&
-              locked &&
-              !editorState().movedAway
-            ) {
-              // Show unlock note screen.
-              eSendEvent(eUnlockNote);
-            }
           }
         }
       }),
@@ -695,10 +716,6 @@ export const useAppEvents = () => {
           // Reset the editor if the app has been in background for more than 10 minutes.
           eSendEvent(eEditorReset);
         }
-
-        setTimeout(async () => {
-          IntentService.onAppStateChanged();
-        }, 100);
       } else {
         await saveEditorState();
         if (

apps/mobile/app/navigation/tabs-holder.js

@@ -529,7 +529,9 @@ const onChangeTab = async (event) => {
         const locked = note && (await db.vaults.itemExists(note));
         if (locked) {
           useTabStore.getState().updateTab(tab.id, {
-            locked: true
+            session: {
+              locked: true
+            }
           });
         }
       }

apps/mobile/app/package.json

@@ -39,7 +39,12 @@
     "@lingui/core": "5.1.2",
     "@lingui/react": "5.1.2",
     "react-native-check-version": "^1.3.0",
-    "react-native-material-menu": "^2.0.0"
+    "react-native-material-menu": "^2.0.0",
+    "@trpc/client": "^10.45.2",
+    "@trpc/react-query": "^10.45.2",
+    "@trpc/server": "^10.45.2",
+    "@tanstack/react-query": "^4.36.1",
+    "async-mutex": "0.5.0"
   },
   "sideEffects": false
 }

apps/mobile/app/screens/editor/index.tsx

@@ -19,6 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable @typescript-eslint/no-var-requires */
 
+import { i18n } from "@lingui/core";
+import { strings } from "@notesnook/intl";
 import React, {
   forwardRef,
   useCallback,
@@ -46,6 +48,7 @@ import {
   eUnlockWithPassword
 } from "../../utils/events";
 import { openLinkInBrowser } from "../../utils/functions";
+import { tabBarRef } from "../../utils/global-refs";
 import EditorOverlay from "./loading";
 import { EDITOR_URI } from "./source";
 import { EditorProps, useEditorType } from "./tiptap/types";
@@ -58,9 +61,6 @@ import {
   openInternalLink,
   randId
 } from "./tiptap/utils";
-import { tabBarRef } from "../../utils/global-refs";
-import { strings } from "@notesnook/intl";
-import { i18n } from "@lingui/core";
 
 const style: ViewStyle = {
   height: "100%",
@@ -203,11 +203,13 @@ const useLockedNoteHandler = () => {
 
   useEffect(() => {
     for (const tab of useTabStore.getState().tabs) {
-      const noteId = useTabStore.getState().getTab(tab.id)?.noteId;
+      const noteId = useTabStore.getState().getTab(tab.id)?.session?.noteId;
       if (!noteId) continue;
-      if (tabRef.current && tabRef.current.noteLocked) {
+      if (tabRef.current && tabRef.current.session?.noteLocked) {
         useTabStore.getState().updateTab(tabRef.current.id, {
-          locked: true
+          session: {
+            locked: true
+          }
         });
       }
     }
@@ -221,23 +223,27 @@ const useLockedNoteHandler = () => {
         biometryAvailable: !!biometry,
         biometryEnrolled: !!fingerprint
       });
-      syncTabs();
+      syncTabs("biometry");
     })();
   }, [tab?.id]);
 
   useEffect(() => {
     const unlockWithBiometrics = async () => {
       try {
-        if (!tabRef.current?.noteLocked || !tabRef.current) return;
-
+        if (!tabRef.current?.session?.noteLocked || !tabRef.current) return;
+        console.log("Trying to unlock with biometrics...");
         const credentials = await BiometricService.getCredentials(
           "Unlock note",
           "Unlock note to open it in editor."
         );
 
-        if (credentials && credentials?.password && tabRef.current.noteId) {
+        if (
+          credentials &&
+          credentials?.password &&
+          tabRef.current.session?.noteId
+        ) {
           const note = await db.vault.open(
-            tabRef.current.noteId,
+            tabRef.current.session?.noteId,
             credentials?.password
           );
 
@@ -246,7 +252,9 @@ const useLockedNoteHandler = () => {
           });
 
           useTabStore.getState().updateTab(tabRef.current.id, {
-            locked: false
+            session: {
+              locked: false
+            }
           });
         }
       } catch (e) {
@@ -261,7 +269,7 @@ const useLockedNoteHandler = () => {
       password: string;
       biometrics?: boolean;
     }) => {
-      if (!tabRef.current?.noteId || !tabRef.current) return;
+      if (!tabRef.current?.session?.noteId || !tabRef.current) return;
       if (!password || password.trim().length === 0) {
         ToastManager.show({
           heading: strings.passwordNotEntered(),
@@ -271,7 +279,10 @@ const useLockedNoteHandler = () => {
       }
 
       try {
-        const note = await db.vault.open(tabRef.current?.noteId, password);
+        const note = await db.vault.open(
+          tabRef.current?.session?.noteId,
+          password
+        );
         if (enrollBiometrics && note) {
           try {
             const unlocked = await db.vault.unlock(password);
@@ -302,7 +313,9 @@ const useLockedNoteHandler = () => {
           item: note
         });
         useTabStore.getState().updateTab(tabRef.current.id, {
-          locked: false
+          session: {
+            locked: false
+          }
         });
       } catch (e) {
         ToastManager.show({
@@ -314,7 +327,7 @@ const useLockedNoteHandler = () => {
 
     const unlock = () => {
       if (
-        (tabRef.current?.locked,
+        (tabRef.current?.session?.locked,
         useTabStore.getState().biometryAvailable &&
           useTabStore.getState().biometryEnrolled &&
           !editorState().movedAway)
@@ -325,7 +338,7 @@ const useLockedNoteHandler = () => {
       } else {
         if (!editorState().movedAway) {
           setTimeout(() => {
-            if (tabRef.current && tabRef.current?.locked) {
+            if (tabRef.current && tabRef.current?.session?.locked) {
               editorController.current?.commands.focus(tabRef.current?.id);
             }
           }, 100);
@@ -340,13 +353,13 @@ const useLockedNoteHandler = () => {
       }),
       eSubscribeEvent(eUnlockWithPassword, onSubmit)
     ];
-    if (tabRef.current?.locked && tabBarRef.current?.page() === 2) {
+    if (tabRef.current?.session?.locked && tabBarRef.current?.page() === 2) {
       unlock();
     }
     return () => {
       subs.map((s) => s?.unsubscribe());
     };
-  }, [tab?.id, tab?.locked]);
+  }, [tab?.id, tab?.session?.locked]);
 
   return null;
 };

apps/mobile/app/screens/editor/readonly-editor.tsx

@@ -27,10 +27,10 @@ import WebView from "react-native-webview";
 import { useRef } from "react";
 import { EDITOR_URI } from "./source";
 import { EditorMessage } from "./tiptap/types";
-import { EventTypes } from "./tiptap/editor-events";
+import { EditorEvents } from "@notesnook/editor-mobile/src/utils/editor-events";
 import { Attachment } from "@notesnook/editor";
 import downloadAttachment from "../../common/filesystem/download-attachment";
-import { EditorEvents } from "./tiptap/utils";
+import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
 import { useThemeColors } from "@notesnook/theme";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import { db } from "../../common/database";
@@ -69,11 +69,11 @@ export function ReadonlyEditor(props: {
     const data = event.nativeEvent.data;
     const editorMessage = JSON.parse(data) as EditorMessage<any>;
 
-    if (editorMessage.type === EventTypes.logger) {
+    if (editorMessage.type === EditorEvents.logger) {
       logger.info("[READONLY EDITOR LOG]", editorMessage.value);
     }
 
-    if (editorMessage.type === EventTypes.readonlyEditorLoaded) {
+    if (editorMessage.type === EditorEvents.readonlyEditorLoaded) {
       props.onLoad?.((content: { data: string; id: string }) => {
         setTimeout(() => {
           noteId.current = content.id;
@@ -86,7 +86,7 @@ export function ReadonlyEditor(props: {
           setLoading(false);
         }, 300);
       });
-    } else if (editorMessage.type === EventTypes.getAttachmentData) {
+    } else if (editorMessage.type === EditorEvents.getAttachmentData) {
       const attachment = (editorMessage.value as any).attachment as Attachment;
 
       downloadAttachment(attachment.hash, true, {
@@ -104,7 +104,7 @@ export function ReadonlyEditor(props: {
           );
           editorRef.current?.postMessage(
             JSON.stringify({
-              type: EditorEvents.attachmentData,
+              type: NativeEvents.attachmentData,
               value: {
                 resolverId: (editorMessage.value as any).resolverId,
                 data
@@ -115,7 +115,7 @@ export function ReadonlyEditor(props: {
         .catch(() => {
           editorRef.current?.postMessage(
             JSON.stringify({
-              type: EditorEvents.attachmentData,
+              type: NativeEvents.attachmentData,
               data: {
                 resolverId: (editorMessage.value as any).resolverId,
                 data: undefined

apps/mobile/app/screens/editor/tiptap/commands.ts

@@ -18,9 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Note } from "@notesnook/core";
-import type { Attachment } from "@notesnook/editor";
-import type { ImageAttributes } from "@notesnook/editor";
-import type { LinkAttributes } from "@notesnook/editor";
+import type {
+  Attachment,
+  ImageAttributes,
+  LinkAttributes
+} from "@notesnook/editor";
 import { createRef, RefObject } from "react";
 import { Platform } from "react-native";
 import { EdgeInsets } from "react-native-safe-area-context";
@@ -37,9 +39,6 @@ async function call(webview: RefObject<WebView | undefined>, action?: Action) {
   if (!webview.current || !action) return;
   setImmediate(() => webview.current?.injectJavaScript(action.job));
   const response = await getResponse(action.id);
-  // if (!response) {
-  //   console.warn("webview job failed", action.id);
-  // }
   return response ? response.value : response;
 }
 
@@ -75,110 +74,65 @@ class Commands {
     return call(this.ref, fn(job, name)) as Promise<T>;
   }
 
-  focus = async (tabId: number) => {
+  async sendCommand<T>(command: string, ...args: any[]) {
+    return this.doAsync(
+      `response = globalThis.commands.${command}(${args
+        .map((arg) =>
+          typeof arg === "string" ? `"${arg}"` : JSON.stringify(arg)
+        )
+        .join(",")})`,
+      command
+    );
+  }
+
+  focus = async (tabId: string) => {
     if (!this.ref.current) return;
+
+    const locked = useTabStore.getState().getTab(tabId)?.session?.locked;
     if (Platform.OS === "android") {
       //this.ref.current?.requestFocus();
       setTimeout(async () => {
         if (!this.ref) return;
         textInput.current?.focus();
-
-        const locked = useTabStore.getState().getTab(tabId)?.locked;
-        await this.doAsync(
-          locked
-            ? `editorControllers[${tabId}]?.focusPassInput();`
-            : `editors[${tabId}]?.commands.focus()`,
-          "focus"
-        );
-
+        await this.sendCommand("focus", tabId, locked);
         this.ref?.current?.requestFocus();
       }, 1);
     } else {
       await sleep(400);
-      await this.doAsync(`editors[${tabId}]?.commands.focus()`, "focus");
+      await this.sendCommand("focus", tabId, locked);
     }
   };
 
-  blur = async (tabId: number) =>
-    await this.doAsync(
-      `
-    const editor = editors[${tabId}];
-    const editorTitle = editorTitles[${tabId}];
-    typeof editor !== "undefined" && editor.commands.blur();
-    typeof editorTitle !== "undefined" && editorTitle.current && editorTitle.current.blur();
-    
-    editorControllers[${tabId}]?.blurPassInput();
+  blur = async (tabId: string) => this.sendCommand("blur", tabId);
 
-  `,
-      "blur"
-    );
-
-  clearContent = async (tabId: number) => {
+  clearContent = async (tabId: string) => {
     this.previousSettings = null;
-    await this.doAsync(
-      `
-const editor = editors[${tabId}];
-const editorController = editorControllers[${tabId}];
-const editorTitle = editorTitles[${tabId}];
-const statusBar = statusBars[${tabId}];
-
-if (typeof editor !== "undefined") {
-  editor.commands.blur();
-  editor.commands.clearContent(false);
-}
-
-typeof editorTitle !== "undefined" && editorTitle.current && editorTitle.current?.blur();
-if (typeof editorController.content !== undefined) editorController.content.current = '';
-editorController.onUpdate();
-editorController.setTitle('');
-if (typeof statusBar !== "undefined") {
-  statusBar.current.resetWords();
-  statusBar.current.set({date:"",saved:""});
-}`,
-      "clearContent"
-    );
+    await this.sendCommand("clearContent", tabId);
   };
 
   setSessionId = async (id: string | null) =>
-    await this.doAsync(`globalThis.sessionId = "${id}";`);
+    await this.sendCommand("setSessionId", id);
 
   setStatus = async (
     date: string | undefined,
     saved: string,
-    tabId: number
+    tabId: string
   ) => {
-    await this.doAsync(
-      `
-      const statusBar = statusBars[${tabId}];
-      typeof statusBar !== "undefined" && statusBar.current.set({date:"${date}",saved:"${saved}"})`,
-      "setStatus"
+    this.sendCommand("setStatus", date, saved, tabId);
+  };
+
+  setPlaceholder = async (placeholder: string) => {};
+
+  setLoading = async (loading?: boolean, tabId?: string) => {
+    this.sendCommand(
+      "setLoading",
+      loading,
+      tabId === undefined ? useTabStore.getState().currentTab : tabId
     );
   };
 
-  setPlaceholder = async (placeholder: string) => {
-    // await this.doAsync(`
-    // const element = document.querySelector(".is-editor-empty");
-    // if (element) {
-    //   element.setAttribute("data-placeholder","${placeholder}");
-    // }
-    // `);
-  };
-
-  setLoading = async (loading?: boolean, tabId?: number) => {
-    await this.doAsync(`
-    const editorController = editorControllers[${
-      tabId || useTabStore.getState().currentTab
-    }];
-    editorController.setLoading(${loading})
-    `);
-  };
-
   setInsets = async (insets: EdgeInsets) => {
-    await this.doAsync(`
-      if (typeof safeAreaController !== "undefined") {
-        safeAreaController.update(${JSON.stringify(insets)}) 
-      }
-    `);
+    this.sendCommand("setInsets", insets);
   };
 
   updateSettings = async (settings?: Partial<Settings>) => {
@@ -187,13 +141,7 @@ if (typeof statusBar !== "undefined") {
       ...this.previousSettings,
       ...settings
     };
-    await this.doAsync(`
-      if (typeof globalThis.settingsController !== "undefined") {
-        globalThis.settingsController.update(${JSON.stringify(
-          this.previousSettings
-        )}) 
-      }
-    `);
+    this.sendCommand("updateSettings", settings);
   };
 
   setSettings = async (settings?: Partial<Settings>) => {
@@ -206,71 +154,31 @@ if (typeof statusBar !== "undefined") {
         return;
       }
     }
-    await this.doAsync(`
-      if (typeof globalThis.settingsController !== "undefined") {
-        globalThis.settingsController.update(${JSON.stringify(settings)}) 
-      }
-    `);
+    this.sendCommand("setSettings", settings);
   };
 
   setTags = async (note: Note | null | undefined) => {
     if (!note) return;
-    const tabId = useTabStore.getState().getTabForNote(note.id);
-
-    const tags = await db.relations.to(note, "tag").resolve();
-    await this.doAsync(
-      `
-    const tags = editorTags[${tabId}];
-    if (tags && tags.current) {
-      tags.current.setTags(${JSON.stringify(
-        tags.map((tag) => ({
-          title: tag.title,
-          alias: tag.title,
-          id: tag.id,
-          type: tag.type
-        }))
-      )});
-    }
-  `,
-      "setTags"
-    );
+    useTabStore.getState().forEachNoteTab(note.id, async (tab) => {
+      const tabId = tab.id;
+      const tags = await db.relations.to(note, "tag").resolve();
+      await this.sendCommand("setTags", tabId, tags);
+    });
   };
 
-  clearTags = async (tabId: number) => {
-    await this.doAsync(
-      `
-    const tags = editorTags[${tabId}];
-    logger("info", Object.keys(editorTags), typeof editorTags[0]);
-    if (tags && tags.current) {
-      tags.current.setTags([]);
-    }
-  `,
-      "clearTags"
-    );
+  clearTags = async (tabId: string) => {
+    await this.sendCommand("clearTags", tabId);
   };
 
   insertAttachment = async (attachment: Attachment, tabId: number) => {
-    await this.doAsync(
-      `const editor = editors[${tabId}];
-editor && editor.commands.insertAttachment(${JSON.stringify(attachment)})`
-    );
+    await this.sendCommand("insertAttachment", attachment, tabId);
   };
 
   setAttachmentProgress = async (
     attachmentProgress: Partial<Attachment>,
     tabId: number
   ) => {
-    await this.doAsync(
-      `const editor = editors[${tabId}];
-editor && editor.commands.updateAttachment(${JSON.stringify(
-        attachmentProgress
-      )}, {
-        preventUpdate: true,
-        query: (attachment) => {
-          return attachment.hash === "${attachmentProgress.hash}";
-        }
-      })`
-    );
+    await this.sendCommand("setAttachmentProgress", attachmentProgress, tabId);
   };
 
   insertImage = async (
@@ -279,50 +187,30 @@ editor && editor.commands.updateAttachment(${JSON.stringify(
     },
     tabId: number
   ) => {
-    await this.doAsync(
-      `const editor = editors[${tabId}];
-
-const image = toBlobURL("${image.dataurl}", "${image.hash}");
-
-editor && editor.commands.insertImage({
-        ...${JSON.stringify({
-          ...image,
-          dataurl: undefined
-        })},
-        bloburl: image
-      })`
-    );
+    await this.sendCommand("insertImage", image, tabId);
   };
 
   handleBack = async () => {
-    return this.doAsync<boolean>(
-      'response = window.dispatchEvent(new Event("handleBackPress",{cancelable:true}));'
-    );
+    return this.sendCommand("handleBack");
   };
 
   keyboardShown = async (keyboardShown: boolean) => {
-    return this.doAsync(`globalThis['keyboardShown']=${keyboardShown};`);
+    return this.sendCommand("keyboardShown", keyboardShown);
   };
 
   getTableOfContents = async () => {
     const tabId = useTabStore.getState().currentTab;
-    return this.doAsync(`
-      response = editorControllers[${tabId}]?.getTableOfContents() || [];
-    `);
+    return this.sendCommand("getTableOfContents", tabId);
   };
 
   focusPassInput = async () => {
     const tabId = useTabStore.getState().currentTab;
-    return this.doAsync(`
-      response = editorControllers[${tabId}]?.focusPassInput() || [];
-    `);
+    return this.sendCommand("focusPassInput", tabId);
   };
 
   blurPassInput = async () => {
     const tabId = useTabStore.getState().currentTab;
-    return this.doAsync(`
-      response = editorControllers[${tabId}]?.blurPassInput() || [];
-    `);
+    return this.sendCommand("blurPassInput", tabId);
   };
 
   createInternalLink = async (
@@ -330,30 +218,18 @@ editor && editor.commands.insertImage({
     resolverId: string
   ) => {
     if (!resolverId) return;
-    return this.doAsync(`
-    if (globalThis.pendingResolvers["${resolverId}"]) {
-      globalThis.pendingResolvers["${resolverId}"](${JSON.stringify(
-      attributes
-    )});
-    }`);
+    return this.sendCommand("createInternalLink", attributes, resolverId);
   };
 
   dismissCreateInternalLinkRequest = async (resolverId: string) => {
     if (!resolverId) return;
-    return this.doAsync(`
-    if (globalThis.pendingResolvers["${resolverId}"]) {
-      globalThis.pendingResolvers["${resolverId}"](undefined);
-    }
-    `);
+    return this.sendCommand("dismissCreateInternalLinkRequest", resolverId);
   };
 
   scrollIntoViewById = async (id: string) => {
     const tabId = useTabStore.getState().currentTab;
-    return this.doAsync(`
-      response = editorControllers[${tabId}]?.scrollIntoView("${id}") || [];
-    `);
+    return this.sendCommand("scrollIntoViewById", id, tabId);
   };
-  //todo add replace image function
 }
 
 export default Commands;

apps/mobile/app/screens/editor/tiptap/picker.ts

@@ -44,7 +44,6 @@ import { useTabStore } from "./use-tab-store";
 import { editorController, editorState } from "./utils";
 import { strings } from "@notesnook/intl";
 import { useUserStore } from "../../../stores/use-user-store";
-import { sleep } from "../../../utils/time";
 
 const showEncryptionSheet = (file: DocumentPickerResponse) => {
   presentSheet({
@@ -133,7 +132,6 @@ const file = async (fileOptions: PickerOptions) => {
 
     if (
       fileOptions.tabId !== undefined &&
-      fileOptions.noteId &&
       useTabStore.getState().getNoteIdForTab(fileOptions.tabId) ===
         fileOptions.noteId
     ) {

apps/mobile/app/screens/editor/tiptap/types.ts

@@ -74,7 +74,7 @@ export type EditorMessage<T> = {
   value: T;
   type: string;
   noteId: string;
-  tabId: number;
+  tabId: string;
   resolverId?: string;
   hasTimeout?: boolean;
 };
@@ -86,7 +86,7 @@ export type SavePayload = {
   type?: "tiptap";
   sessionHistoryId?: number;
   ignoreEdit: boolean;
-  tabId: number;
+  tabId: string;
   pendingChanges?: boolean;
 };
 

apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx

@@ -21,7 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable @typescript-eslint/no-var-requires */
 import { ItemReference } from "@notesnook/core";
 import type { Attachment } from "@notesnook/editor";
+import { EditorEvents } from "@notesnook/editor-mobile/src/utils/editor-events";
+import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
 import { getDefaultPresets } from "@notesnook/editor/dist/cjs/toolbar/tool-definitions";
+import { strings } from "@notesnook/intl";
 import Clipboard from "@react-native-clipboard/clipboard";
 import React, { useCallback, useEffect, useRef } from "react";
 import {
@@ -72,11 +75,9 @@ import {
 import { openLinkInBrowser } from "../../../utils/functions";
 import { tabBarRef } from "../../../utils/global-refs";
 import { useDragState } from "../../settings/editor/state";
-import { EventTypes } from "./editor-events";
 import { EditorMessage, EditorProps, useEditorType } from "./types";
 import { useTabStore } from "./use-tab-store";
-import { EditorEvents, editorState, openInternalLink } from "./utils";
-import { strings } from "@notesnook/intl";
+import { editorState, openInternalLink } from "./utils";
 
 const publishNote = async () => {
   const user = useUserStore.getState().user;
@@ -101,7 +102,7 @@ const publishNote = async () => {
   }
   const noteId = useTabStore
     .getState()
-    .getNoteIdForTab(useTabStore.getState().currentTab);
+    .getNoteIdForTab(useTabStore.getState().currentTab!);
 
   if (noteId) {
     const note = await db.notes?.note(noteId);
@@ -124,7 +125,7 @@ const publishNote = async () => {
 const showActionsheet = async () => {
   const noteId = useTabStore
     .getState()
-    .getNoteIdForTab(useTabStore.getState().currentTab);
+    .getNoteIdForTab(useTabStore.getState().currentTab!);
   if (noteId) {
     const note = await db.notes?.note(noteId);
     if (editorState().isFocused || editorState().isFocused) {
@@ -177,7 +178,7 @@ export const useEditorEvents = (
   useEffect(() => {
     const handleKeyboardDidShow: KeyboardEventListener = () => {
       editor.commands.keyboardShown(true);
-      editor.postMessage(EditorEvents.keyboardShown, undefined);
+      editor.postMessage(NativeEvents.keyboardShown, undefined);
     };
     const handleKeyboardDidHide: KeyboardEventListener = () => {
       editor.commands.keyboardShown(false);
@@ -247,7 +248,7 @@ export const useEditorEvents = (
     }
     editorState().currentlyEditing = false;
     // editor.reset(); Notes remain open.
-    editor.commands?.blur(useTabStore.getState().currentTab);
+    editor.commands?.blur(useTabStore.getState().currentTab!);
     setTimeout(async () => {
       if (deviceMode !== "mobile" && fullscreen) {
         if (fullscreen) {
@@ -352,25 +353,25 @@ export const useEditorEvents = (
       const editorMessage = JSON.parse(data) as EditorMessage<any>;
 
       if (editorMessage.hasTimeout && editorMessage.resolverId) {
-        editor.postMessage(EditorEvents.resolve, {
+        editor.postMessage(NativeEvents.resolve, {
           data: true,
           resolverId: editorMessage.resolverId
         });
       }
 
-      if (editorMessage.type === EventTypes.load) {
+      if (editorMessage.type === EditorEvents.load) {
         DatabaseLogger.log("Editor is ready");
         editor.onLoad();
         return;
       }
 
-      if (editorMessage.type === EventTypes.back) {
+      if (editorMessage.type === EditorEvents.back) {
         return onBackPress();
       }
 
       if (
         editorMessage.sessionId !== editor.sessionId.current &&
-        editorMessage.type !== EditorEvents.status
+        editorMessage.type !== NativeEvents.status
       ) {
         return;
       }
@@ -380,8 +381,8 @@ export const useEditorEvents = (
         .getNoteIdForTab(editorMessage.tabId);
 
       switch (editorMessage.type) {
-        case EventTypes.content:
-          DatabaseLogger.log("EventTypes.content");
+        case EditorEvents.content:
+          DatabaseLogger.log("EditorEvents.content");
           editor.saveContent({
             type: editorMessage.type,
             content: editorMessage.value.html as string,
@@ -391,8 +392,8 @@ export const useEditorEvents = (
             pendingChanges: editorMessage.value?.pendingChanges
           });
           break;
-        case EventTypes.title:
-          DatabaseLogger.log("EventTypes.title");
+        case EditorEvents.title:
+          DatabaseLogger.log("EditorEvents.title");
           editor.saveContent({
             type: editorMessage.type,
             title: editorMessage.value?.title as string,
@@ -402,10 +403,10 @@ export const useEditorEvents = (
             pendingChanges: editorMessage.value?.pendingChanges
           });
           break;
-        case EventTypes.logger:
+        case EditorEvents.logger:
           logger.info("[EDITOR LOG]", editorMessage.value);
           break;
-        case EventTypes.dbLogger:
+        case EditorEvents.dbLogger:
           if (editorMessage.value.error) {
             DatabaseLogger.error(
               editorMessage.value.error,
@@ -418,12 +419,12 @@ export const useEditorEvents = (
             DatabaseLogger.info("[EDITOR_LOG]" + editorMessage.value.message);
           }
           break;
-        case EventTypes.contentchange:
+        case EditorEvents.contentchange:
           editor.onContentChanged(editorMessage.noteId);
           break;
-        case EventTypes.selection:
+        case EditorEvents.selection:
           break;
-        case EventTypes.reminders:
+        case EditorEvents.reminders:
           if (!noteId) {
             ToastManager.show({
               heading: strings.createNoteFirst(),
@@ -441,7 +442,7 @@ export const useEditorEvents = (
             onAdd: () => ReminderSheet.present(undefined, note, true)
           });
           break;
-        case EventTypes.newtag:
+        case EditorEvents.newtag:
           if (!noteId) {
             ToastManager.show({
               heading: strings.createNoteFirst(),
@@ -451,7 +452,7 @@ export const useEditorEvents = (
           }
           ManageTagsSheet.present([noteId]);
           break;
-        case EventTypes.tag:
+        case EditorEvents.tag:
           if (editorMessage.value) {
             if (!noteId) return;
             const note = await db.notes.note(noteId);
@@ -467,7 +468,7 @@ export const useEditorEvents = (
               });
           }
           break;
-        case EventTypes.filepicker:
+        case EditorEvents.filepicker:
           editorState().isAwaitingResult = true;
           const { pick } = require("./picker").default;
           pick({
@@ -479,14 +480,14 @@ export const useEditorEvents = (
             editorState().isAwaitingResult = false;
           }, 1000);
           break;
-        case EventTypes.download: {
+        case EditorEvents.download: {
           const downloadAttachment =
             require("../../../common/filesystem/download-attachment").default;
           downloadAttachment((editorMessage.value as Attachment)?.hash, true);
           break;
         }
 
-        case EventTypes.getAttachmentData: {
+        case EditorEvents.getAttachmentData: {
           const attachment = (editorMessage.value as any)
             ?.attachment as Attachment;
 
@@ -506,14 +507,14 @@ export const useEditorEvents = (
                 !!data,
                 editorMessage.resolverId
               );
-              editor.postMessage(EditorEvents.resolve, {
+              editor.postMessage(NativeEvents.resolve, {
                 resolverId: editorMessage.resolverId,
                 data
               });
             })
             .catch((e) => {
               DatabaseLogger.error(e);
-              editor.postMessage(EditorEvents.resolve, {
+              editor.postMessage(NativeEvents.resolve, {
                 resolverId: editorMessage.resolverId,
                 data: undefined
               });
@@ -522,26 +523,26 @@ export const useEditorEvents = (
           break;
         }
 
-        case EventTypes.pro:
+        case EditorEvents.pro:
           if (editor.state.current?.isFocused) {
             editor.state.current.isFocused = true;
           }
           eSendEvent(eOpenPremiumDialog);
           break;
-        case EventTypes.monograph:
+        case EditorEvents.monograph:
           publishNote();
           break;
-        case EventTypes.properties:
+        case EditorEvents.properties:
           showActionsheet();
           break;
-        case EventTypes.scroll:
+        case EditorEvents.scroll:
           editorState().scrollPosition = editorMessage.value;
           break;
-        case EventTypes.fullscreen:
+        case EditorEvents.fullscreen:
           editorState().isFullscreen = true;
           eSendEvent(eOpenFullscreenEditor);
           break;
-        case EventTypes.link:
+        case EditorEvents.link:
           if (editorMessage.value.startsWith("nn://")) {
             openInternalLink(editorMessage.value);
             console.log(
@@ -553,7 +554,7 @@ export const useEditorEvents = (
           }
           break;
 
-        case EventTypes.previewAttachment: {
+        case EditorEvents.previewAttachment: {
           const hash = (editorMessage.value as Attachment)?.hash;
           const attachment = await db.attachments?.attachment(hash);
           if (!attachment) return;
@@ -564,11 +565,26 @@ export const useEditorEvents = (
           }
           break;
         }
-        case EventTypes.copyToClipboard: {
+        case EditorEvents.copyToClipboard: {
           Clipboard.setString(editorMessage.value as string);
           break;
         }
-        case EventTypes.tabsChanged: {
+        case EditorEvents.saveScroll: {
+          useTabStore.getState().updateTab(editorMessage.tabId, {
+            session: {
+              ...editorMessage.value
+            }
+          });
+          break;
+        }
+        case EditorEvents.newNote: {
+          eSendEvent(eOnLoadNote, {
+            tabId: editorMessage.tabId,
+            newNote: true
+          });
+          break;
+        }
+        case EditorEvents.tabsChanged: {
           // useTabStore.setState({
           //   tabs: (editorMessage.value as any)?.tabs,
           //   currentTab: (editorMessage.value as any)?.currentTab
@@ -576,14 +592,14 @@ export const useEditorEvents = (
           //
           break;
         }
-        case EventTypes.toc:
+        case EditorEvents.toc:
           TableOfContents.present(editorMessage.value);
           break;
-        case EventTypes.showTabs: {
+        case EditorEvents.showTabs: {
           EditorTabs.present();
           break;
         }
-        case EventTypes.error: {
+        case EditorEvents.error: {
           presentSheet({
             component: (
               <Issue
@@ -595,19 +611,15 @@ export const useEditorEvents = (
           });
           break;
         }
-        case EventTypes.tabFocused: {
+        case EditorEvents.tabFocused: {
           eSendEvent(eEditorTabFocused, editorMessage.tabId);
 
-          if (
-            (!editorMessage.value || editor.currentLoadingNoteId.current) &&
-            editorMessage.noteId
-          ) {
+          if (editorMessage.noteId) {
             if (!useSettingStore.getState().isAppLoading) {
               const note = await db.notes.note(editorMessage.noteId);
               if (note) {
                 eSendEvent(eOnLoadNote, {
                   item: note,
-                  forced: true,
                   tabId: editorMessage.tabId
                 });
               }
@@ -619,7 +631,6 @@ export const useEditorEvents = (
                   if (note) {
                     eSendEvent(eOnLoadNote, {
                       item: note,
-                      forced: true,
                       tabId: editorMessage.tabId
                     });
                   }
@@ -630,7 +641,7 @@ export const useEditorEvents = (
 
           break;
         }
-        case EventTypes.createInternalLink: {
+        case EditorEvents.createInternalLink: {
           LinkNote.present(
             editorMessage.value.attributes,
             editorMessage.resolverId as string
@@ -638,25 +649,37 @@ export const useEditorEvents = (
           break;
         }
 
-        case EventTypes.unlock: {
+        case EditorEvents.unlock: {
           eSendEvent(eUnlockWithPassword, editorMessage.value);
           break;
         }
 
-        case EventTypes.unlockWithBiometrics: {
+        case EditorEvents.goBack: {
+          useTabStore.getState().goBack();
+          break;
+        }
+
+        case EditorEvents.goForward: {
+          useTabStore.getState().goForward();
+          break;
+        }
+
+        case EditorEvents.unlockWithBiometrics: {
           eSendEvent(eUnlockWithBiometrics);
           break;
         }
 
-        case EventTypes.disableReadonlyMode: {
+        case EditorEvents.disableReadonlyMode: {
           const noteId = editorMessage.value;
           if (noteId) {
             await db.notes.readonly(false, noteId);
             editor.note.current[noteId] = await db.notes?.note(noteId);
             useTabStore
               .getState()
-              .updateTab(useTabStore.getState().currentTab, {
-                readonly: false
+              .updateTab(useTabStore.getState().currentTab!, {
+                session: {
+                  readonly: false
+                }
               });
             setTimeout(() => {
               Navigation.queueRoutesForUpdate();

apps/mobile/app/screens/editor/tiptap/use-editor.ts

@@ -32,8 +32,11 @@ import {
   isEncryptedContent,
   isTrashItem
 } from "@notesnook/core";
+import { EditorEvents } from "@notesnook/editor-mobile/src/utils/editor-events";
+import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
 import { strings } from "@notesnook/intl";
 import { useThemeEngineStore } from "@notesnook/theme";
+import { Mutex } from "async-mutex";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import WebView from "react-native-webview";
 import { DatabaseLogger, db } from "../../../common/database";
@@ -63,12 +66,10 @@ import { sleep } from "../../../utils/time";
 import { unlockVault } from "../../../utils/unlock-vault";
 import { onNoteCreated } from "../../notes/common";
 import Commands from "./commands";
-import { EventTypes } from "./editor-events";
 import { SessionHistory } from "./session-history";
 import { EditorState, SavePayload } from "./types";
-import { syncTabs, useTabStore } from "./use-tab-store";
+import { TabSessionItem, syncTabs, useTabStore } from "./use-tab-store";
 import {
-  EditorEvents,
   clearAppState,
   defaultState,
   getAppState,
@@ -77,10 +78,68 @@ import {
   post
 } from "./utils";
 
+const loadNoteMutex = new Mutex();
+
 type NoteWithContent = Note & {
   content?: NoteContent<false>;
 };
 
+type LocalTabStateT = {
+  editedAt: number;
+  lastFocusedAt: number;
+};
+
+class LocalTabState {
+  state: Record<string, LocalTabStateT> = {};
+  noteEditedTime: Record<string, number> = {};
+
+  setEditTime(noteId: string, time: number) {
+    this.noteEditedTime[noteId] = time;
+  }
+
+  get(tabId: string) {
+    return this.state[tabId] || {};
+  }
+
+  set(tabId: string, state: Partial<LocalTabStateT>) {
+    this.state[tabId] = {
+      ...this.state[tabId],
+      ...state
+    };
+  }
+
+  clear(tabId: string) {
+    delete this.state[tabId];
+  }
+
+  reset() {
+    this.state = {};
+  }
+
+  needsRefresh(tabId: string, locked: boolean, readonly: boolean) {
+    const state = this.get(tabId);
+    const tabSession = useTabStore.getState().getTab(tabId)?.session;
+    const noteId = useTabStore.getState().getNoteIdForTab(tabId);
+
+    if (
+      tabSession?.locked !== locked ||
+      tabSession?.readonly !== readonly ||
+      !noteId
+    ) {
+      console.log("tab is refreshing...");
+      return true;
+    }
+    console.log(
+      "Tab refreshing...",
+      state.editedAt < this.noteEditedTime[noteId]
+    );
+
+    console.log(state.editedAt, this.noteEditedTime[noteId]);
+
+    return !state.editedAt || state.editedAt < this.noteEditedTime[noteId];
+  }
+}
+
 export const useEditor = (
   editorId = "",
   readonly?: boolean,
@@ -99,7 +158,6 @@ export const useEditor = (
             isPreview?: boolean;
           };
         })
-      | null
       | undefined
     >
   >({});
@@ -119,15 +177,17 @@ export const useEditor = (
   const lastContentChangeTime = useRef<Record<string, number>>({});
   const lock = useRef(false);
   const currentLoadingNoteId = useRef<string>();
-  const loadingState = useRef<string>();
-  const lastTabFocused = useRef(0);
+  const lastTabFocused = useRef<string>();
+
+  const localTabState = useRef<LocalTabState>(new LocalTabState());
+
   const blockIdRef = useRef<string>();
   const postMessage = useCallback(
-    async <T>(type: string, data: T, tabId?: number, waitFor = 300) =>
+    async <T>(type: string, data: T, tabId?: string, waitFor = 300) =>
       await post(
         editorRef,
         sessionIdRef.current,
-        typeof tabId !== "number" ? useTabStore.getState().currentTab : tabId,
+        tabId || useTabStore.getState().currentTab!,
         type,
         data,
         waitFor
@@ -142,7 +202,7 @@ export const useEditor = (
   }, [commands, insets, isDefaultEditor]);
 
   useEffect(() => {
-    postMessage(EditorEvents.theme, theme);
+    postMessage(NativeEvents.theme, theme);
   }, [theme, postMessage]);
 
   useEffect(() => {
@@ -152,14 +212,14 @@ export const useEditor = (
   }, [commands, tags]);
 
   useEffect(() => {
-    const event = eSubscribeEvent(eEditorTabFocused, (tabId) => {
+    const event = eSubscribeEvent(eEditorTabFocused, (tabId: string) => {
       if (lastTabFocused.current !== tabId) lock.current = false;
-      lastTabFocused.current = tabId as number;
+      lastTabFocused.current = tabId;
     });
     return () => {
       event?.unsubscribe();
     };
-  });
+  }, []);
 
   const overlay = useCallback(
     (show: boolean, data = { type: "new" }) => {
@@ -188,11 +248,11 @@ export const useEditor = (
   );
 
   const reset = useCallback(
-    async (tabId: number, resetState = true, resetContent = true) => {
+    async (tabId: string, resetState = true, resetContent = true) => {
       const noteId = useTabStore.getState().getNoteIdForTab(tabId);
       if (noteId) {
         currentNotes.current?.id && db.fs().cancel(noteId);
-        currentNotes.current[noteId] = null;
+        currentNotes.current[noteId] = undefined;
         currentContents.current[noteId] = null;
         editorSessionHistory.clearSession(noteId);
         lastContentChangeTime.current[noteId] = 0;
@@ -200,18 +260,11 @@ export const useEditor = (
       }
 
       saveCount.current = 0;
-      loadingState.current = undefined;
+      currentLoadingNoteId.current = undefined;
       lock.current = false;
-      resetContent && postMessage(EditorEvents.title, "", tabId);
-
+      resetContent && postMessage(NativeEvents.title, "", tabId);
       resetContent && (await commands.clearContent(tabId));
       resetContent && (await commands.clearTags(tabId));
-      useTabStore.getState().updateTab(tabId, {
-        noteId: undefined,
-        locked: false,
-        noteLocked: false,
-        readonly: false
-      });
     },
     [commands, editorSessionHistory, postMessage]
   );
@@ -231,6 +284,16 @@ export const useEditor = (
       try {
         if (id && !(await db.notes?.note(id))) {
           await reset(tabId);
+          useTabStore.getState().updateTab(tabId, {
+            session: {
+              noteId: undefined,
+              noteLocked: undefined,
+              locked: undefined,
+              readonly: undefined,
+              scrollTop: undefined,
+              selection: undefined
+            }
+          });
           return;
         }
         let note = id ? await db.notes?.note(id) : undefined;
@@ -269,13 +332,6 @@ export const useEditor = (
           };
         }
 
-        // If note is edited, the tab becomes a persistent tab automatically.
-        if (useTabStore.getState().getTab(tabId)?.previewTab) {
-          useTabStore.getState().updateTab(tabId, {
-            previewTab: false
-          });
-        }
-
         let saved = false;
         setTimeout(() => {
           if (saved) return;
@@ -310,7 +366,9 @@ export const useEditor = (
             }
 
             useTabStore.getState().updateTab(tabId, {
-              noteId: id
+              session: {
+                noteId: id
+              }
             });
 
             const defaultNotebook = db.settings.getDefaultNotebook();
@@ -325,7 +383,7 @@ export const useEditor = (
 
             if (!noteData.title) {
               postMessage(
-                EditorEvents.title,
+                NativeEvents.title,
                 currentNotes.current[id]?.title,
                 tabId
               );
@@ -385,8 +443,8 @@ export const useEditor = (
           id === useTabStore.getState().getCurrentNoteId() &&
           pendingChanges
         ) {
-          postMessage(EditorEvents.title, title || note?.title, tabId);
-          postMessage(EditorEvents.html, data, tabId);
+          postMessage(NativeEvents.title, title || note?.title, tabId);
+          postMessage(NativeEvents.html, data, tabId);
           currentNotes.current[id] = note;
         }
 
@@ -435,179 +493,211 @@ export const useEditor = (
   );
 
   const loadNote = useCallback(
-    async (event: {
+    (event: {
       item?: Note;
-      forced?: boolean;
       newNote?: boolean;
-      tabId?: number;
+      tabId?: string;
       blockId?: string;
-      presistTab?: boolean;
+      session?: TabSessionItem;
+      newTab?: boolean;
     }) => {
-      if (!event) return;
-
-      if (event.blockId) {
-        blockIdRef.current = event.blockId;
-      }
-      state.current.currentlyEditing = true;
-
-      if (
-        !state.current.ready &&
-        (await isEditorLoaded(
-          editorRef,
-          sessionIdRef.current,
-          useTabStore.getState().currentTab
-        ))
-      ) {
-        state.current.ready = true;
-      }
-
-      if (event.newNote) {
-        useTabStore.getState().focusEmptyTab();
-        const tabId = useTabStore.getState().currentTab;
-        currentNotes.current && (await reset(tabId));
-        setTimeout(() => {
-          if (state.current?.ready && !state.current.movedAway)
-            commands.focus(tabId);
-        });
-      } else {
-        if (!event.item) {
-          overlay(false);
-          return;
+      loadNoteMutex.runExclusive(async () => {
+        if (!event) return;
+        if (event.blockId) {
+          blockIdRef.current = event.blockId;
         }
-
-        const item = event.item;
-
-        const currentTab = useTabStore
-          .getState()
-          .getTab(useTabStore.getState().currentTab);
-        if (currentTab?.previewTab && item.id !== currentTab.noteId) {
-          await commands.setLoading(true, useTabStore.getState().currentTab);
-        }
-        const isLockedNote = await db.vaults.itemExists(
-          event.item as ItemReference
-        );
-        const tabLocked =
-          isLockedNote && !(event.item as NoteWithContent).content;
-
-        // If note was already opened in a tab, focus that tab.
-        if (typeof event.tabId !== "number") {
-          if (useTabStore.getState().hasTabForNote(event.item.id)) {
-            const tabId = useTabStore.getState().getTabForNote(event.item.id);
-            if (typeof tabId === "number") {
-              useTabStore.getState().updateTab(tabId, {
-                readonly: event.item.readonly || readonly,
-                locked: tabLocked,
-                noteLocked: isLockedNote
-              });
-              useTabStore.getState().focusTab(tabId);
-              setTimeout(() => {
-                if (blockIdRef.current) {
-                  commands.scrollIntoViewById(blockIdRef.current);
-                  blockIdRef.current = undefined;
-                }
-              }, 150);
-            }
-          } else {
-            if (event.presistTab) {
-              // Open note in new tab.
-              useTabStore.getState().newTab({
-                readonly: event.item.readonly || readonly,
-                locked: tabLocked,
-                noteLocked: isLockedNote,
-                noteId: event.item.id,
-                previewTab: false
-              });
-            } else {
-              // 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,
-                locked: tabLocked,
-                noteLocked: isLockedNote
-              });
-            }
-          }
-        } else {
-          if (lastTabFocused.current !== event.tabId) {
-            useTabStore.getState().focusTab(event.tabId);
-          }
-        }
-
-        const tabId = event.tabId || useTabStore.getState().currentTab;
-        if (lastTabFocused.current !== tabId) {
-          // if ((await waitForEvent(eEditorTabFocused, 1000)) !== tabId) {
-          //
-          //   return;
-          // }
-          currentLoadingNoteId.current = item.id;
-
-          return;
-        }
-
-        state.current.movedAway = false;
         state.current.currentlyEditing = true;
 
-        if (!tabLocked) {
-          await loadContent(item);
-        }
-
         if (
-          currentNotes.current[item.id] &&
-          loadingState.current &&
-          currentContents.current[item.id]?.data &&
-          loadingState.current === currentContents.current[item.id]?.data
+          !state.current.ready &&
+          (await isEditorLoaded(
+            editorRef,
+            sessionIdRef.current,
+            useTabStore.getState().currentTab!
+          ))
         ) {
-          // If note is already loading, return.
-
-          return;
+          state.current.ready = true;
         }
+        if (event.newNote && !currentLoadingNoteId.current) {
+          let tabId;
+          if (useTabStore.getState().tabs.length === 0) {
+            tabId = useTabStore.getState().newTab();
+          } else {
+            tabId = useTabStore.getState().currentTab;
+            await reset(tabId!, true, true);
+            if (
+              event.session?.noteId ||
+              useTabStore.getState().getTab(tabId!)?.session?.noteId
+            ) {
+              useTabStore.getState().newTabSession(tabId!, {});
+            }
+          }
 
-        if (!state.current.ready) {
+          setTimeout(() => {
+            if (state.current?.ready && !state.current.movedAway)
+              commands.focus(tabId!);
+          });
+        } else {
+          if (!event.item) {
+            overlay(false);
+            return;
+          }
+
+          const item = event.item;
+
+          // If note is already open in a tab, focus that tab.
+          if (useTabStore.getState().hasTabForNote(item.id) && !event.newTab) {
+            const tabId = useTabStore.getState().getTabForNote(item.id);
+
+            const currentTab = useTabStore
+              .getState()
+              .getTab(useTabStore.getState().currentTab as string);
+
+            if (
+              currentTab?.session?.noteId !== item.id &&
+              tabId !== useTabStore.getState().currentTab
+            ) {
+              useTabStore.getState().focusTab(tabId as string);
+              return;
+            }
+          }
+
+          const isLockedNote = await db.vaults.itemExists(
+            event.item as ItemReference
+          );
+
+          const tabLocked =
+            isLockedNote && !(event.item as NoteWithContent).content;
+
+          const tabId = event.tabId
+            ? event.tabId
+            : useTabStore.getState().currentTab;
+
+          console.log(tabId === useTabStore.getState().currentTab);
+
+          // Check if tab needs to be refreshed.
+          if (!event.newTab) {
+            if (
+              tabId &&
+              event.item.id === useTabStore.getState().getNoteIdForTab(tabId) &&
+              !localTabState.current?.needsRefresh(
+                tabId,
+                isLockedNote,
+                item.readonly
+              )
+            ) {
+              commands.setLoading(false, tabId);
+              return;
+            } else {
+              localTabState.current?.setEditTime(
+                item.id,
+                localTabState.current?.noteEditedTime[item.id] ||
+                  item.dateEdited
+              );
+              localTabState.current?.set(tabId!, {
+                editedAt:
+                  localTabState.current?.noteEditedTime[item.id] ||
+                  item.dateEdited
+              });
+            }
+          }
+
+          currentLoadingNoteId.current = item.id;
+
+          // Show loading overlay if note is not already loaded.
+          if (
+            tabId &&
+            (event.item?.id !== useTabStore.getState().getNoteIdForTab(tabId) ||
+              !currentContents.current[event.item.id]?.data)
+          ) {
+            await commands.setLoading(true, tabId);
+          }
+
+          const session: Partial<TabSessionItem> = event.session || {
+            noteId: event.item.id
+          };
+
+          session.noteLocked = isLockedNote;
+          session.locked = tabLocked;
+          session.readonly = item.readonly;
+
+          const tab = useTabStore.getState().getTab(tabId!);
+
+          if (useTabStore.getState().tabs.length === 0 || event.newTab) {
+            useTabStore.getState().newTab({
+              session: session
+            });
+          } else {
+            // A new session is created if the note is changed.
+            // If the note is already opened, the session is updated.
+            if (
+              !tab?.session ||
+              (event.item.id !== tab?.session?.noteId && tab?.session?.noteId)
+            ) {
+              useTabStore.getState().newTabSession(tabId!, session);
+            } else {
+              useTabStore.getState().updateTab(tabId!, {
+                session: session
+              });
+            }
+          }
+
+          if (lastTabFocused.current !== tabId) return;
+
+          if (tabBarRef.current?.page() === 2) {
+            state.current.movedAway = false;
+          }
+
+          state.current.currentlyEditing = true;
+          if (!tabLocked) {
+            await loadContent(item);
+          } else {
+            commands.focus(tabId!);
+          }
+
+          lastContentChangeTime.current[item.id] = item.dateEdited;
           currentNotes.current[item.id] = item;
-          return;
+
+          if (!currentNotes.current[item.id]) return;
+
+          editorSessionHistory.newSession(item.id);
+
+          await commands.setStatus(
+            getFormattedDate(item.dateEdited, "date-time"),
+            "Saved",
+            tabId!
+          );
+          await postMessage(NativeEvents.title, item.title, tabId);
+          overlay(false);
+
+          await postMessage(
+            NativeEvents.html,
+            {
+              data: currentContents.current[item.id]?.data || "",
+              scrollTop: tab?.session?.scrollTop,
+              selection: tab?.session?.selection
+            },
+            tabId,
+            10000
+          );
+
+          setTimeout(() => {
+            if (blockIdRef.current) {
+              commands.scrollIntoViewById(blockIdRef.current);
+              blockIdRef.current = undefined;
+            }
+          }, 300);
+
+          await commands.setTags(item);
+          commands.setSettings();
+          setTimeout(() => {
+            if (currentLoadingNoteId.current === event.item?.id) {
+              currentLoadingNoteId.current = undefined;
+            }
+          }, 300);
         }
-
-        lastContentChangeTime.current[item.id] = 0;
-        currentLoadingNoteId.current = item.id;
-        currentNotes.current[item.id] = item;
-
-        if (!currentNotes.current[item.id]) return;
-
-        editorSessionHistory.newSession(item.id);
-
-        await commands.setStatus(
-          getFormattedDate(item.dateEdited, "date-time"),
-          strings.saved(),
-          tabId
-        );
-
-        await postMessage(EditorEvents.title, item.title, tabId);
-        overlay(false);
-        loadingState.current = currentContents.current[item.id]?.data;
-
-        await postMessage(
-          EditorEvents.html,
-          currentContents.current[item.id]?.data || "",
-          tabId,
-          10000
-        );
-
-        setTimeout(() => {
-          if (blockIdRef.current) {
-            commands.scrollIntoViewById(blockIdRef.current);
-            blockIdRef.current = undefined;
-          }
-        }, 300);
-
-        loadingState.current = undefined;
-        await commands.setTags(item);
-        commands.setSettings();
-        setTimeout(() => {
-          if (currentLoadingNoteId.current === event.item?.id) {
-            currentLoadingNoteId.current = undefined;
-          }
-        }, 300);
-      }
-      postMessage(EditorEvents.theme, theme);
+        postMessage(NativeEvents.theme, theme);
+      });
     },
     [
       commands,
@@ -615,7 +705,6 @@ export const useEditor = (
       loadContent,
       overlay,
       postMessage,
-      readonly,
       reset,
       theme
     ]
@@ -627,96 +716,116 @@ export const useEditor = (
       isLocal?: boolean
     ) => {
       try {
-        await (async () => {
-          if (SettingsService.get().disableRealtimeSync && !isLocal) return;
-          if (!data) return;
+        if (SettingsService.get().disableRealtimeSync && !isLocal) return;
+        if (!data) return;
 
-          if (isDeleted(data) || isTrashItem(data)) {
-            const tabId = useTabStore.getState().getTabForNote(data.id);
-            if (tabId !== undefined) {
-              await commands.clearContent(tabId);
-              useTabStore.getState().removeTab(tabId);
-            }
-            return;
+        if (isDeleted(data) || isTrashItem(data)) {
+          const tabId = useTabStore.getState().getTabForNote(data.id);
+          if (tabId !== undefined) {
+            await commands.clearContent(tabId);
+            useTabStore.getState().removeTab(tabId);
           }
+          return;
+        }
 
-          const noteId =
-            (data as ContentItem).type === "tiptap"
-              ? (data as ContentItem).noteId
-              : data.id;
+        const noteId =
+          (data as ContentItem).type === "tiptap"
+            ? (data as ContentItem).noteId
+            : data.id;
 
-          if (!useTabStore.getState().hasTabForNote(noteId)) return;
-          const tabId = useTabStore.getState().getTabForNote(noteId) as number;
+        const note = data.type === "note" ? data : await db.notes?.note(noteId);
 
-          const tab = useTabStore.getState().getTab(tabId);
+        lock.current = true;
 
-          const note =
-            data.type === "note" ? data : await db.notes?.note(noteId);
+        // Handle this case where note was locked on another device and synced.
+        let locked = note
+          ? await db.vaults.itemExists(note as ItemReference)
+          : false;
 
-          lock.current = true;
+        if (data.type === "tiptap") {
+          locked = data.locked;
+        }
 
-          // Handle this case where note was locked on another device and synced.
-          const locked = note
-            ? await db.vaults.itemExists(note as ItemReference)
-            : false;
+        useTabStore.getState().forEachNoteTab(noteId, async (tab) => {
+          const tabId = tab.id;
+
+          let didUnlock = false;
 
           if (note) {
-            if (!locked && tab?.noteLocked) {
-              // Note lock removed.
-              if (tab.locked) {
-                if (useTabStore.getState().currentTab === tabId) {
-                  eSendEvent(eOnLoadNote, {
-                    item: note,
-                    forced: true
+            if (!locked && tab?.session?.noteLocked) {
+              if (tab?.session?.noteLocked || tab?.session?.locked) {
+                if (useTabStore.getState().currentTab !== tabId) {
+                  localTabState.current?.set(tabId, {
+                    editedAt: 0
                   });
-                } else {
-                  useTabStore.getState().updateTab(tabId, {
+                }
+
+                didUnlock = true;
+                useTabStore.getState().updateTab(tabId, {
+                  session: {
                     locked: false,
                     noteLocked: false
-                  });
-                  commands.setLoading(true, tabId);
-                }
+                  }
+                });
               }
-            } else if (!tab?.noteLocked && locked) {
-              // Note lock added.
+            } else if (!tab?.session?.noteLocked && locked) {
               useTabStore.getState().updateTab(tabId, {
-                locked: true,
-                noteLocked: true
+                session: {
+                  locked: true,
+                  noteLocked: true
+                }
               });
+              commands.clearContent(tabId);
               if (useTabStore.getState().currentTab !== tabId) {
-                commands.clearContent(tabId);
                 commands.setLoading(true, tabId);
               }
+              localTabState.current?.set(tabId, {
+                editedAt: 0
+              });
             }
 
-            if (currentNotes.current[noteId]?.title !== note.title) {
-              postMessage(EditorEvents.title, note.title, tabId);
+            if (
+              currentNotes.current[noteId]?.title !== note.title ||
+              didUnlock
+            ) {
+              postMessage(NativeEvents.title, note.title, tabId);
             }
             commands.setTags(note);
-            if (currentNotes.current[noteId]?.dateEdited !== note.dateEdited) {
+            if (
+              currentNotes.current[noteId]?.dateEdited !== note.dateEdited ||
+              didUnlock
+            ) {
               commands.setStatus(
                 getFormattedDate(note.dateEdited, "date-time"),
                 strings.saved(),
-                tabId as number
+                tabId as string
               );
             }
-
-            useTabStore.getState().updateTab(tabId, {
-              readonly: note.readonly
-            });
+            if (tab.session?.readonly !== note.readonly || didUnlock) {
+              useTabStore.getState().updateTab(tabId, {
+                session: {
+                  readonly: note.readonly
+                }
+              });
+            }
           }
 
           if (data.type === "tiptap" && note && !isLocal) {
-            if (lastContentChangeTime.current[noteId] >= data.dateModified) {
+            if (
+              lastContentChangeTime.current[noteId] >= data.dateModified &&
+              !didUnlock
+            ) {
               return;
             }
 
             if (locked && isEncryptedContent(data)) {
               const decryptedContent = await db.vault?.decryptContent(data);
               if (!decryptedContent) {
-                useTabStore.getState().updateTab(tabId, {
-                  locked: true,
-                  noteLocked: true
+                useTabStore.getState().updateTab(tab.id, {
+                  session: {
+                    locked: true,
+                    noteLocked: true
+                  }
                 });
                 if (useTabStore.getState().currentTab !== tabId) {
                   commands.clearContent(tabId);
@@ -724,26 +833,43 @@ export const useEditor = (
                 }
               } else {
                 await postMessage(
-                  EditorEvents.updatehtml,
-                  decryptedContent.data,
+                  NativeEvents.updatehtml,
+                  {
+                    data: decryptedContent.data,
+                    selection: tab.session?.selection,
+                    scrollTop: tab.session?.scrollTop
+                  },
                   tabId
                 );
                 currentContents.current[note.id] = decryptedContent;
               }
             } else {
               const _nextContent = data.data;
-              if (_nextContent === currentContents.current[note.id]?.data) {
+              if (
+                _nextContent === currentContents.current[note.id]?.data &&
+                !didUnlock
+              ) {
                 return;
               }
+
               lastContentChangeTime.current[note.id] = note.dateEdited;
-              await postMessage(EditorEvents.updatehtml, _nextContent, tabId);
+              console.log(tab.session?.selection);
+              await postMessage(
+                NativeEvents.updatehtml,
+                {
+                  data: _nextContent,
+                  selection: tab.session?.selection,
+                  scrollTop: tab.session?.scrollTop
+                },
+                tabId
+              );
               if (!isEncryptedContent(data)) {
                 currentContents.current[note.id] =
                   data as UnencryptedContentItem;
               }
             }
           }
-        })();
+        });
       } catch (e) {
         DatabaseLogger.error(e as Error, "Error when applying sync changes");
       } finally {
@@ -779,7 +905,7 @@ export const useEditor = (
       content?: string;
       type: string;
       ignoreEdit: boolean;
-      tabId: number;
+      tabId: string;
       pendingChanges?: boolean;
     }) => {
       DatabaseLogger.log(
@@ -808,9 +934,13 @@ export const useEditor = (
 
       if (noteId) {
         lastContentChangeTime.current[noteId] = Date.now();
+        localTabState.current?.setEditTime(noteId, Date.now());
+        localTabState?.current?.set(tabId, {
+          editedAt: Date.now()
+        });
       }
 
-      if (type === EventTypes.content && noteId) {
+      if (type === EditorEvents.content && noteId) {
         currentContents.current[noteId as string] = {
           data: content,
           type: "tiptap",
@@ -860,7 +990,9 @@ export const useEditor = (
     if (!appState) return;
     state.current.isRestoringState = true;
     state.current.currentlyEditing = true;
-    state.current.movedAway = false;
+    if (tabBarRef.current?.page() === 2) {
+      state.current.movedAway = false;
+    }
 
     if (!state.current.editorStateRestored) {
       state.current.isRestoringState = true;
@@ -891,9 +1023,12 @@ export const useEditor = (
       !(await isEditorLoaded(
         editorRef,
         sessionIdRef.current,
-        useTabStore.getState().currentTab
+        useTabStore.getState().currentTab!
       ))
     ) {
+      localTabState.current?.set(useTabStore.getState().currentTab!, {
+        editedAt: 0
+      });
       eSendEvent(eEditorReset, "onReady");
       return false;
     } else {
@@ -905,13 +1040,17 @@ export const useEditor = (
 
   const onLoad = useCallback(async () => {
     setTimeout(() => {
-      postMessage(EditorEvents.theme, theme);
+      postMessage(NativeEvents.theme, theme);
     });
     commands.setInsets(
       isDefaultEditor ? insets : { top: 0, left: 0, right: 0, bottom: 0 }
     );
     await commands.setSettings();
 
+    localTabState.current?.set(useTabStore.getState().currentTab!, {
+      editedAt: 0
+    });
+
     if (!state.current.ready) {
       state.current.ready = true;
     }

apps/mobile/app/screens/editor/tiptap/use-tab-store.ts

@@ -16,18 +16,27 @@ 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 {
+  TabHistory as TabHistoryType,
+  TabSessionHistory
+} from "@notesnook/common";
+import { getId } from "@notesnook/core";
+import { MMKVLoader } from "react-native-mmkv-storage";
 import create from "zustand";
 import { persist, StateStorage } from "zustand/middleware";
+import { db } from "../../../common/database";
 import { MMKV } from "../../../common/database/mmkv";
+import { eSendEvent } from "../../../services/event-manager";
+import { eOnLoadNote } from "../../../utils/events";
 import { editorController } from "./utils";
 
-class History {
-  history: number[];
+class TabHistory {
+  history: string[];
   constructor() {
-    this.history = [0];
+    this.history = [];
   }
 
-  add(item: number) {
+  add(item: string) {
     const index = this.history.findIndex((id) => item === id);
     if (index !== -1) {
       // Item already exists, move it to the top
@@ -36,19 +45,19 @@ class History {
     this.history.unshift(item); // Add item to the beginning of the array
 
     useTabStore.setState({
-      tabHistory: this.history.slice()
+      historyNew: this.history.slice()
     });
     return true; // Item added successfully
   }
 
-  remove(id: number) {
+  remove(id: string) {
     const index = this.history.findIndex((item) => item === id);
     if (index >= -1 && index < this.history.length) {
       const removedItem = this.history.splice(index, 1)[0];
       return removedItem;
     }
     useTabStore.setState({
-      tabHistory: this.history.slice()
+      historyNew: this.history.slice()
     });
     return null; // Invalid index
   }
@@ -59,7 +68,7 @@ class History {
       return restoredItem;
     }
     useTabStore.setState({
-      tabHistory: this.history.slice()
+      historyNew: this.history.slice()
     });
     return null; // History is empty
   }
@@ -69,147 +78,354 @@ class History {
   }
 }
 
-export type TabItem = {
-  id: number;
+export type TabSessionItem = {
+  id: string;
   noteId?: string;
-  previewTab?: boolean;
-  readonly?: boolean;
-  locked?: boolean;
+  scrollTop?: number;
+  selection?: { to: number; from: number };
   noteLocked?: boolean;
-  pinned?: boolean;
+  locked?: boolean;
+  readonly?: boolean;
 };
 
-const history = new History();
+const TabSessionStorageKV = new MMKVLoader()
+  .withInstanceID("tab-session-storage")
+  .disableIndexing()
+  .initialize();
+
+class TabSessionStorage {
+  static storage: typeof TabSessionStorageKV = TabSessionStorageKV;
+
+  static get(id: string): TabSessionItem | null {
+    return TabSessionStorage.storage.getMap(id);
+  }
+
+  static set(id: string, session: TabSessionItem): void {
+    TabSessionStorage.storage.setMap(id, session);
+  }
+
+  static update(id: string, session: Partial<TabSessionItem>) {
+    const currentSession = TabSessionStorage.get(id);
+    const newSession = {
+      ...currentSession,
+      ...session
+    };
+    TabSessionStorage.set(id, newSession as TabSessionItem);
+    return newSession;
+  }
+
+  static remove(id: string) {
+    TabSessionStorageKV.removeItem(id);
+  }
+}
+
+export function syncTabs(
+  type: "tabs" | "history" | "biometry" | "all" = "all"
+) {
+  const data: Partial<TabStore> = {};
+  if (type === "tabs" || type === "all") {
+    data.tabs = useTabStore.getState().tabs;
+    data.currentTab = useTabStore.getState().currentTab;
+  }
+  if (type === "history" || type === "all") {
+    data.canGoBack = useTabStore.getState().canGoBack;
+    data.canGoForward = useTabStore.getState().canGoForward;
+    data.sessionId = useTabStore.getState().sessionId;
+  }
+
+  if (type === "biometry" || type === "all") {
+    data.biometryAvailable = useTabStore.getState().biometryAvailable;
+    data.biometryEnrolled = useTabStore.getState().biometryEnrolled;
+  }
+
+  editorController.current?.commands.doAsync(`
+    globalThis.tabStore?.setState(${JSON.stringify(data)});
+`);
+}
+export const tabSessionHistory = new TabSessionHistory({
+  get() {
+    return useTabStore.getState();
+  },
+  set(state) {
+    useTabStore.setState({
+      ...state
+    });
+  }
+});
+
+export type TabItem = {
+  id: string;
+  pinned?: boolean;
+  needsRefresh?: boolean;
+  session?: Partial<TabSessionItem>;
+};
+
+const history = new TabHistory();
 
 export type TabStore = {
   tabs: TabItem[];
-  currentTab: number;
-  updateTab: (id: number, options: Omit<Partial<TabItem>, "id">) => void;
+  currentTab?: string;
+  updateTab: (id: string, options: Omit<Partial<TabItem>, "id">) => void;
   focusPreviewTab: (
     noteId: string,
     options: Omit<Partial<TabItem>, "id">
   ) => void;
-  removeTab: (index: number) => void;
+  removeTab: (index: string) => void;
   moveTab: (index: number, toIndex: number) => void;
-  newTab: (options?: Omit<Partial<TabItem>, "id">) => void;
-  focusTab: (id: number) => void;
-  getNoteIdForTab: (id: number) => string | undefined;
-  getTabForNote: (noteId: string) => number | undefined;
+  newTab: (options?: Omit<Partial<TabItem>, "id">) => string;
+  focusTab: (id: string) => void;
+  getNoteIdForTab: (id: string) => string | undefined;
+  getTabForNote: (noteId: string) => string | undefined;
+  getTabsForNote: (noteId: string) => TabItem[];
+  forEachNoteTab: (noteId: string, cb: (tab: TabItem) => void) => void;
   hasTabForNote: (noteId: string) => boolean;
   focusEmptyTab: () => void;
   getCurrentNoteId: () => string | undefined;
-  getTab: (tabId: number) => TabItem | undefined;
-  tabHistory: number[];
+  getTab: (tabId: string) => TabItem | undefined;
+  newTabSession: (
+    id: string,
+    options?: Omit<Partial<TabSessionItem>, "id">
+  ) => void;
+  historyNew: string[];
   biometryAvailable?: boolean;
   biometryEnrolled?: boolean;
+  tabSessionHistory: TabHistoryType;
+  goBack(): void;
+  goForward(): void;
+  loadSession: (id: string) => Promise<boolean>;
+  canGoBack?: boolean;
+  canGoForward?: boolean;
+  sessionId?: string;
 };
 
-function getId(id: number, tabs: TabItem[]): number {
-  const exists = tabs.find((t) => t.id === id);
-  if (exists) {
-    return getId(id + 1, tabs);
-  }
-  return id;
-}
+const DEFAULT_TABS = {
+  tabs: [
+    {
+      id: "679da59a3924d4bd56d16d3f",
+      session: {
+        id: "679da5a5667a16db2353a062"
+      }
+    }
+  ],
+  tabSessionHistory: {
+    "679da59a3924d4bd56d16d3f": {
+      backStack: ["679da5a5667a16db2353a062"],
+      forwardStack: [] as string[]
+    }
+  } as TabHistoryType,
+  historyNew: ["679da59a3924d4bd56d16d3f"],
+  currentTab: "679da59a3924d4bd56d16d3f"
+} as TabStore;
 
-export function syncTabs() {
-  editorController.current?.commands.doAsync(`
-    globalThis.tabStore?.setState({
-      tabs: ${JSON.stringify(useTabStore.getState().tabs)},
-      currentTab: ${useTabStore.getState().currentTab},
-      biometryAvailable: ${useTabStore.getState().biometryAvailable},
-      biometryEnrolled: ${useTabStore.getState().biometryEnrolled}
-    });
-`);
+export function resetTabStore() {
+  useTabStore.setState({
+    ...DEFAULT_TABS
+  });
+  TabSessionStorage.storage.clearStore();
 }
 
 export const useTabStore = create<TabStore>(
   persist(
     (set, get) => ({
-      tabs: [
-        {
-          id: 0
+      ...DEFAULT_TABS,
+      newTabSession: (
+        _id?: string,
+        options?: Omit<Partial<TabSessionItem>, "id">
+      ) => {
+        const tabId = _id || (get().currentTab as string);
+
+        const sessionHistory = get().tabSessionHistory[tabId];
+
+        let oldSessionId: string | undefined = undefined;
+        if (sessionHistory) {
+          const allSessions = sessionHistory.backStack.concat(
+            sessionHistory.forwardStack
+          );
+          allSessions.forEach((id) => {
+            if (TabSessionStorage.get(id)?.noteId === options?.noteId) {
+              oldSessionId = id;
+            }
+          });
         }
-      ],
-      tabHistory: [0],
-      history: new History(),
-      currentTab: 0,
-      updateTab: (id: number, options: Omit<Partial<TabItem>, "id">) => {
-        if (!options) return;
-        const index = get().tabs.findIndex((t) => t.id === id);
+
+        const sessionId =
+          oldSessionId &&
+          tabSessionHistory.currentSessionId(tabId) === oldSessionId
+            ? oldSessionId
+            : tabSessionHistory.add(tabId, oldSessionId);
+
+        let session: Partial<TabSessionItem>;
+
+        if (!oldSessionId) {
+          session = {
+            id: sessionId,
+            ...options
+          };
+          TabSessionStorage.set(sessionId, session as TabSessionItem);
+        } else {
+          session = {
+            ...TabSessionStorage.get(oldSessionId),
+            ...options
+          };
+        }
+
+        const index = get().tabs.findIndex((t) => t.id === tabId);
         if (index == -1) return;
         const tabs = [...get().tabs];
         tabs[index] = {
           ...tabs[index],
-          ...options
-        };
+          session: session
+        } as TabItem;
 
         set({
           tabs: tabs
         });
         syncTabs();
       },
-      focusPreviewTab: (
-        noteId: string,
-        options: Omit<Partial<TabItem>, "id" | "noteId">
-      ) => {
-        const index = get().tabs.findIndex((t) => t.previewTab);
-        if (index === -1)
-          return get().newTab({
-            noteId,
-            previewTab: true,
-            ...options
-          });
+      updateTab: (id: string, options: Omit<Partial<TabItem>, "id">) => {
+        if (!options) return;
+        const index = get().tabs.findIndex((t) => t.id === id);
+        if (index == -1) return;
         const tabs = [...get().tabs];
+        const sessionId =
+          options.session?.id || (tabs[index].session?.id as string);
+        const updatedSession = !options.session
+          ? tabs[index].session
+          : TabSessionStorage.update(sessionId, options.session);
+
         tabs[index] = {
           ...tabs[index],
           ...options,
-          previewTab: true,
-          noteId: noteId
-        };
+          session: updatedSession
+        } as TabItem;
 
         set({
           tabs: tabs
         });
-        get().focusTab(tabs[index].id);
+        syncTabs();
       },
-      removeTab: (id: number) => {
-        const index = get().tabs.findIndex((t) => t.id === id);
+      goBack: async () => {
+        const currentTab = get().currentTab;
+        if (!currentTab) return;
+        if (!tabSessionHistory.canGoBack(currentTab)) return;
 
+        const id = tabSessionHistory.back(currentTab) as string;
+        const sessionLoaded = await get().loadSession(id);
+
+        if (!sessionLoaded) {
+          tabSessionHistory.remove(currentTab, id);
+          TabSessionStorage.remove(id);
+          if (!tabSessionHistory.canGoBack(currentTab)) {
+            tabSessionHistory.forward(currentTab);
+            syncTabs();
+          } else {
+            return get().goBack();
+          }
+        } else {
+          syncTabs();
+        }
+      },
+      goForward: async () => {
+        const currentTab = get().currentTab;
+        if (!currentTab) return;
+
+        if (!tabSessionHistory.canGoForward(currentTab)) return;
+        const id = tabSessionHistory.forward(currentTab) as string;
+        if (!(await get().loadSession(id))) {
+          tabSessionHistory.remove(currentTab, id);
+          TabSessionStorage.remove(id);
+          if (!tabSessionHistory.canGoForward(currentTab)) {
+            tabSessionHistory.back(currentTab);
+            syncTabs();
+          } else {
+            return get().goForward();
+          }
+        } else {
+          syncTabs();
+        }
+      },
+      loadSession: async (id: string) => {
+        const session = TabSessionStorage.get(id);
+        if (!session) return false;
+
+        const note = session?.noteId
+          ? await db.notes.note(session?.noteId)
+          : undefined;
+
+        if (note) {
+          const isLocked = await db.vaults.itemExists(note);
+          session.locked = isLocked;
+          session.noteLocked = isLocked && !session?.noteLocked;
+
+          session.readonly = note.readonly;
+        } else if (session.noteId) {
+          console.log("Failed to load session...");
+          return false;
+        }
+
+        eSendEvent(eOnLoadNote, {
+          item: note,
+          newNote: !note,
+          tabId: get().currentTab,
+          session: session
+        });
+
+        return true;
+      },
+      focusPreviewTab: (
+        noteId: string,
+        options: Omit<Partial<TabItem>, "id" | "noteId">
+      ) => {},
+
+      removeTab: (id: string) => {
+        const index = get().tabs.findIndex((t) => t.id === id);
         if (index > -1) {
           const isFocused = id === get().currentTab;
           const nextTabs = get().tabs.slice();
           nextTabs.splice(index, 1);
           history.remove(id);
+
+          const tabSessions = tabSessionHistory.getTabHistory(id);
+          tabSessions.back.forEach((id) => TabSessionStorage.remove(id));
+          tabSessions.forward.forEach((id) => TabSessionStorage.remove(id));
+          tabSessionHistory.clearStackForTab(id);
+
           if (nextTabs.length === 0) {
-            nextTabs.push({
-              id: 0
+            const id = getId();
+            set({
+              tabs: [{ id: id }]
             });
+            get().newTabSession(id, {});
+            get().focusTab(id);
+          } else {
+            set({
+              tabs: nextTabs
+            });
+            if (isFocused) {
+              const lastTab = history.restoreLast();
+              if (lastTab) get().focusTab(lastTab);
+            }
           }
-          set({
-            tabs: nextTabs
-          });
-          get().focusTab(
-            isFocused ? history.restoreLast() || 0 : get().currentTab
-          );
+          syncTabs();
         }
       },
       newTab: (options) => {
-        const id = getId(get().tabs.length, get().tabs);
-        const nextTabs = [
-          ...get().tabs,
-          {
-            id: id,
-            ...options
-          }
-        ];
+        const id = getId();
         set({
-          tabs: nextTabs
+          tabs: [
+            ...get().tabs,
+            {
+              id: id,
+              ...options
+            }
+          ]
         });
+        get().newTabSession(id, options?.session || {});
         get().focusTab(id);
+        return id;
       },
       focusEmptyTab: () => {
-        const index = get().tabs.findIndex((t) => !t.noteId);
+        const index = get().tabs.findIndex((t) => !t.session?.noteId);
         if (index === -1) return get().newTab();
 
         get().focusTab(get().tabs[index].id);
@@ -223,37 +439,46 @@ export const useTabStore = create<TabStore>(
         syncTabs();
       },
 
-      focusTab: (id: number) => {
+      focusTab: (id: string) => {
         history.add(id);
         set({
-          currentTab: id
+          currentTab: id,
+          canGoBack: tabSessionHistory.canGoBack(id),
+          canGoForward: tabSessionHistory.canGoForward(id),
+          sessionId: tabSessionHistory.currentSessionId(id)
         });
         syncTabs();
       },
-      getNoteIdForTab: (id: number) => {
-        return get().tabs.find((t) => t.id === id)?.noteId;
+      getNoteIdForTab: (id: string) => {
+        return get().tabs.find((t) => t.id === id)?.session?.noteId;
       },
       hasTabForNote: (noteId: string) => {
-        return (
-          typeof get().tabs.find((t) => t.noteId === noteId)?.id === "number"
-        );
+        return !!get().tabs.find((t) => t.session?.noteId === noteId);
       },
       getTabForNote: (noteId: string) => {
-        return get().tabs.find((t) => t.noteId === noteId)?.id;
+        return get().tabs.find((t) => t.session?.noteId === noteId)?.id;
+      },
+      getTabsForNote(noteId: string) {
+        return get().tabs.filter((t) => t.session?.noteId === noteId);
+      },
+      forEachNoteTab: (noteId: string, cb: (tab: TabItem) => void) => {
+        const tabs = get().tabs.filter((t) => t.session?.noteId === noteId);
+        tabs.forEach(cb);
       },
       getCurrentNoteId: () => {
-        return get().tabs.find((t) => t.id === get().currentTab)?.noteId;
+        return get().tabs.find((t) => t.id === get().currentTab)?.session
+          ?.noteId;
       },
       getTab: (tabId) => {
         return get().tabs.find((t) => t.id === tabId);
       }
     }),
     {
-      name: "tabs-storage",
+      name: "tabs-storage-v3",
       getStorage: () => MMKV as unknown as StateStorage,
       onRehydrateStorage: () => {
         return (state) => {
-          history.history = state?.tabHistory.slice() || [];
+          history.history = state?.historyNew || [];
         };
       }
     }

apps/mobile/app/screens/editor/tiptap/utils.ts

@@ -31,6 +31,8 @@ import { eOnLoadNote } from "../../../utils/events";
 import { NotesnookModule } from "../../../utils/notesnook-module";
 import { AppState, EditorState, useEditorType } from "./types";
 import { useTabStore } from "./use-tab-store";
+import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
+
 export const textInput = createRef<TextInput>();
 export const editorController =
   createRef<useEditorType>() as MutableRefObject<useEditorType>;
@@ -46,19 +48,6 @@ export function editorState() {
   return editorController.current?.state.current || defaultState;
 }
 
-export const EditorEvents = {
-  html: "native:html",
-  updatehtml: "native:updatehtml",
-  title: "native:title",
-  theme: "native:theme",
-  titleplaceholder: "native:titleplaceholder",
-  logger: "native:logger",
-  status: "native:status",
-  keyboardShown: "native:keyboardShown",
-  attachmentData: "native:attachment-data",
-  resolve: "native:resolve"
-};
-
 export function randId(prefix: string) {
   return Math.random()
     .toString(36)
@@ -72,15 +61,15 @@ export function makeSessionId(id?: string) {
 export async function isEditorLoaded(
   ref: RefObject<WebView>,
   sessionId: string,
-  tabId: number
+  tabId: string
 ) {
-  return await post(ref, sessionId, tabId, EditorEvents.status);
+  return await post(ref, sessionId, tabId, NativeEvents.status);
 }
 
 export async function post<T>(
   ref: RefObject<WebView>,
   sessionId: string,
-  tabId: number,
+  tabId: string,
   type: string,
   value: T | null = null,
   waitFor = 300
@@ -185,7 +174,7 @@ export async function openInternalLink(url: string) {
   if (!data?.id) return false;
   if (
     data.id ===
-    useTabStore.getState().getNoteIdForTab(useTabStore.getState().currentTab)
+    useTabStore.getState().getNoteIdForTab(useTabStore.getState().currentTab!)
   ) {
     if (data.params?.blockId) {
       setTimeout(() => {

apps/mobile/app/screens/settings/restore-backup/index.tsx

@@ -148,7 +148,7 @@ const restoreBackup = async (options: {
 
       let count = 0;
       await db.transaction(async () => {
-        let passwordOrKey: PasswordOrKey;
+        let passwordOrKey: PasswordOrKey | undefined = undefined;
         for (const path of extractedBackupFiles) {
           if (path === ".nnbackup" || path === "attachments") continue;
 
@@ -166,7 +166,7 @@ const restoreBackup = async (options: {
 
           passwordOrKey = !isEncryptedBackup
             ? ({} as PasswordOrKey)
-            : await withPassword();
+            : passwordOrKey || (await withPassword());
 
           if (
             isEncryptedBackup &&

apps/mobile/app/screens/settings/section-item.tsx

@@ -44,7 +44,12 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
   const settings = useSettingStore((state) => state.settings);
   const navigation = useNavigation<NavigationProp<RouteParams>>();
   const current = item.useHook && item.useHook(item);
-  const isHidden = item.hidden && item.hidden(item.property || current);
+  const [isHidden, setIsHidden] = useState(
+    item.hidden && item.hidden(item.property || current)
+  );
+  const [isDisabled, setIsDisabled] = useState(
+    item.disabled && item.disabled(item.property || current)
+  );
   const inputRef = useRef<TextInput>(null);
   const [loading, setLoading] = useState(false);
 
@@ -62,7 +67,13 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
     SettingsService.set({
       [item.property]: nextValue
     });
-    setImmediate(() => item.onChange?.(nextValue));
+    setImmediate(() => {
+      item.onChange?.(nextValue);
+      item.hidden &&
+        setIsHidden(item.hidden && item.hidden(item.property || current));
+      item.disabled &&
+        setIsDisabled(item.disabled && item.disabled(item.property || current));
+    });
   };
 
   const styles =
@@ -94,7 +105,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
 
   return isHidden ? null : (
     <Pressable
-      disabled={item.type === "component"}
+      disabled={item.type === "component" || isDisabled}
       style={{
         width: "100%",
         alignItems: "center",
@@ -102,10 +113,12 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
         flexDirection: "row",
         justifyContent: "space-between",
         paddingVertical: 20,
+        opacity: isDisabled ? 0.5 : 1,
         borderRadius: 0,
         ...styles
       }}
       onPress={async () => {
+        if (isDisabled) return;
         switch (item.type) {
           case "screen":
             {
@@ -208,6 +221,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
                 });
                 item.inputProperties?.onSubmitEditing?.(e);
               }}
+              editable={!isDisabled}
               onChangeText={(text) => {
                 SettingsService.set({
                   [item.property as string]: text
@@ -240,6 +254,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
                 name="minus"
                 color={colors.primary.icon}
                 onPress={() => {
+                  if (isDisabled) return;
                   const rawValue = SettingsService.get()[
                     item.property as keyof SettingStore["settings"]
                   ] as string;
@@ -262,6 +277,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
                   onChangeInputSelectorValue(e.nativeEvent.text);
                   item.inputProperties?.onSubmitEditing?.(e);
                 }}
+                editable={!isDisabled}
                 onChangeText={(text) => {
                   onChangeInputSelectorValue(text);
                   item.inputProperties?.onSubmitEditing?.(text as any);
@@ -287,6 +303,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
                 name="plus"
                 color={colors.primary.icon}
                 onPress={() => {
+                  if (isDisabled) return;
                   const rawValue = SettingsService.get()[
                     item.property as keyof SettingStore["settings"]
                   ] as string;

apps/mobile/app/screens/settings/settings-data.tsx

@@ -751,8 +751,12 @@ export const settingsGroups: SettingSection[] = [
             description: strings.clearDefaultNotebookDesc(),
             modifer: () => {
               db.settings.setDefaultNotebook(undefined);
+              ToastManager.show({
+                heading: strings.defaultNotebookCleared(),
+                type: "success"
+              });
             },
-            hidden: () => !db.settings.getDefaultNotebook()
+            disabled: () => !db.settings.getDefaultNotebook()
           }
         ]
       },
@@ -776,6 +780,10 @@ export const settingsGroups: SettingSection[] = [
             description: strings.resetToolbarDesc(),
             modifer: () => {
               useDragState.getState().setPreset("default");
+              ToastManager.show({
+                heading: strings.toolbarReset(),
+                type: "success"
+              });
             }
           },
           {

apps/mobile/app/screens/settings/types.ts

@@ -47,6 +47,7 @@ export type SettingSection = {
   maxInputValue?: number;
   onVerify?: () => Promise<boolean>;
   hideHeader?: boolean;
+  disabled?: (current: unknown) => boolean;
 };
 
 export type SettingsGroup = {

apps/mobile/app/services/backup.ts

@@ -35,6 +35,7 @@ import { eCloseSheet } from "../utils/events";
 import { sleep } from "../utils/time";
 import { ToastManager, eSendEvent, presentSheet } from "./event-manager";
 import SettingsService from "./settings";
+import { e } from "@lingui/react/dist/shared/react.b2b749a9";
 
 const MS_DAY = 86400000;
 const MS_WEEK = MS_DAY * 7;
@@ -217,6 +218,7 @@ async function run(
 
   try {
     const user = await db.user.getUser();
+    DatabaseLogger.info(`Backup started: ${backupType}`);
     for await (const file of db.backup.export({
       type: "mobile",
       encrypt: SettingsService.get().encryptedBackup && !!user,
@@ -244,12 +246,16 @@ async function run(
       }
     }
 
+    DatabaseLogger.info(`Backup complete: ${backupType}. Creating zip file...`);
+
     updateProgress({
       progress: "Creating backup zip file..."
     });
 
     await zip(zipSourceFolder, zipOutputFile);
 
+    DatabaseLogger.info(`Backup zip file created: ${zipOutputFile}`);
+
     if (Platform.OS === "android") {
       // Move the zip to user selected directory.
       const file = await ScopedStorage.createFile(
@@ -258,7 +264,10 @@ async function run(
         "application/nnbackupz"
       );
 
+      DatabaseLogger.info("Copying backup file to user selected directory...");
+
       await copyFileAsync(`file://${zipOutputFile}`, file.uri);
+      DatabaseLogger.info("Backup saved to user selected directory.");
 
       path = file.uri;
     } else {
@@ -293,6 +302,8 @@ async function run(
 
     if (canShowCompletionStatus) {
       presentBackupCompleteSheet(path);
+    } else {
+      eSendEvent(eCloseSheet);
     }
 
     ToastManager.show({

apps/mobile/app/services/notifications.ts

@@ -43,6 +43,7 @@ import { useRelationStore } from "../stores/use-relation-store";
 import { useReminderStore } from "../stores/use-reminder-store";
 import { useSettingStore } from "../stores/use-setting-store";
 import { useUserStore } from "../stores/use-user-store";
+import { eOnLoadNote } from "../utils/events";
 import { tabBarRef } from "../utils/global-refs";
 import { convertNoteToText } from "../utils/note-to-text";
 import { NotesnookModule } from "../utils/notesnook-module";
@@ -449,19 +450,10 @@ async function loadNote(id: string, jump: boolean) {
     })
   );
 
-  const isLocked = await db.vaults.itemExists({
-    type: "note",
-    id: id
-  });
-
   const tab = useTabStore.getState().getTabForNote(id);
-  if (tab !== undefined) {
-    useTabStore.getState().focusTab(tab);
-  } else {
-    useTabStore.getState().focusPreviewTab(id, {
-      noteId: id,
-      readonly: note.readonly,
-      noteLocked: isLocked
+  if (useTabStore.getState().currentTab !== tab) {
+    eSendEvent(eOnLoadNote, {
+      note: note
     });
   }
 }

apps/mobile/native/android/app/build.gradle

@@ -116,7 +116,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3037
+        versionCode 3038
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

apps/mobile/native/android/app/proguard-rules.pro

@@ -62,4 +62,5 @@
 #Gson
 -keepattributes Signature
 -keep class com.google.gson.reflect.TypeToken { *; }
--keep class * extends com.google.gson.reflect.TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep class com.streetwriters.notesnook.datatypes.* { *; }

apps/mobile/native/android/app/src/main/AndroidManifest.xml

@@ -60,6 +60,7 @@
         android:theme="@style/BootTheme"
         android:largeHeap="true"
         android:supportsRtl="false"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:supportsRtl">
 
         <receiver android:exported="false" android:label="@string/reminders_title" android:name=".ReminderWidgetProvider">

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java

@@ -31,14 +31,20 @@ public class NotePreviewWidget extends AppWidgetProvider {
 
         Intent intent = new Intent(context, MainActivity.class);
         intent.putExtra(OpenNoteId, note.getId());
+        intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(RCTNNativeModule.IntentType, "OpenNote");
-        intent.setData(Uri.parse("https://notesnook.com/open_note"));
+        intent.setData(Uri.parse("https://notesnook.com/open_note?id=" + note.getId()));
         PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.open_note, pendingIntent);
 
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 
+    @Override
+    public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
+    }
+
     private static Bundle getActivityOptionsBundle() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             ActivityOptions activityOptions = ActivityOptions.makeBasic();

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java

@@ -4,6 +4,7 @@ import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -45,6 +46,7 @@ class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
         SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);
         Gson gson = new Gson();
         reminders = gson.fromJson(preferences.getString("remindersList","[]"), new TypeToken<List<Reminder>>(){}.getType());
+
     }
 
     @Override
@@ -64,14 +66,16 @@ class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
         boolean useMiniLayout = reminder.getDescription() == null || reminder.getDescription().isEmpty();
 
         RemoteViews views = new RemoteViews(context.getPackageName(), useMiniLayout ? R.layout.widget_reminder_layout_small :  R.layout.widget_reminder_layout);
+
         views.setTextViewText(R.id.reminder_title, reminder.getTitle());
-           if (!useMiniLayout) {
+        if (!useMiniLayout) {
                views.setTextViewText(R.id.reminder_description, reminder.getDescription());
-           }
+        }
         views.setTextViewText(R.id.reminder_time, reminder.getFormattedTime());
         final Intent fillInIntent = new Intent();
         final Bundle extras = new Bundle();
         extras.putString(ReminderViewsService.OpenReminderId, reminder.getId());
+        fillInIntent.setData(Uri.parse("https://notesnook.com/open_reminder?id=" + reminder.getId()));
         fillInIntent.putExtra(RCTNNativeModule.IntentType, "OpenReminder");
         fillInIntent.putExtras(extras);
         views.setOnClickFillInIntent(R.id.reminder_item_btn, fillInIntent);
@@ -86,11 +90,12 @@ class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
 
     @Override
     public int getViewTypeCount() {
-        return 1;
+        return 2;
     }
 
     @Override
     public long getItemId(int position) {
+
         return position;
     }
 

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java

@@ -34,12 +34,13 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
 
     static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, RemoteViews views) {
         Intent listview_intent_template = new Intent(context, MainActivity.class);
-        listview_intent_template.setData(Uri.parse("https://notesnook.com/open_reminder"));
+        listview_intent_template.setAction(Intent.ACTION_VIEW);
         PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, listview_intent_template, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE, getActivityOptionsBundle());
         views.setPendingIntentTemplate(R.id.widget_list_view, pendingIntent);
 
         Intent new_reminder_intent = new Intent(context, MainActivity.class);
         new_reminder_intent.putExtra(NewReminder, NewReminder);
+        new_reminder_intent.setAction(Intent.ACTION_VIEW);
         new_reminder_intent.putExtra(RCTNNativeModule.IntentType, "NewReminder");
         new_reminder_intent.setData(Uri.parse("https://notesnook.com/new_reminder"));
         PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());

apps/mobile/native/android/app/src/main/res/values/colors.xml

@@ -5,7 +5,7 @@
     <color name="light_blue_600">#FF039BE5</color>
     <color name="light_blue_900">#FF01579B</color>
     <color name="bootsplash_background">#FFFFFF</color>
-    <color name="background">#D8000000</color>
-    <color name="border">#CCCCCC</color>
+    <color name="background">#DCEDEDED</color>
+    <color name="border">#BFBFBF</color>
     <color name="text">#1D1D1D</color>
 </resources>

apps/mobile/native/android/releasenotes/whatsnew-en-US

@@ -1,6 +1,5 @@
-- Added a widget to add a note to home screen for quick access
-- Added a widget that shows upcoming reminders on home screen
-- Now you can share an image with other apps from image viewer
+- New and improved editor tabs with history
+- Fixed homescreen widget bugs
 - Many small bug fixes and improvements
 
 Thank you for using Notesnook!

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -1063,7 +1063,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2124;
+				CURRENT_PROJECT_VERSION = 2125;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1137,7 +1137,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.27;
+				MARKETING_VERSION = 3.0.28;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1168,7 +1168,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2124;
+				CURRENT_PROJECT_VERSION = 2125;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1242,7 +1242,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.27;
+				MARKETING_VERSION = 3.0.28;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1401,7 +1401,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2124;
+				CURRENT_PROJECT_VERSION = 2125;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1413,7 +1413,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.27;
+				MARKETING_VERSION = 3.0.28;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1444,7 +1444,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2124;
+				CURRENT_PROJECT_VERSION = 2125;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1457,7 +1457,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.27;
+				MARKETING_VERSION = 3.0.28;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1487,7 +1487,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2124;
+				CURRENT_PROJECT_VERSION = 2125;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1561,7 +1561,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.27;
+				MARKETING_VERSION = 3.0.28;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1592,7 +1592,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2124;
+				CURRENT_PROJECT_VERSION = 2125;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1667,7 +1667,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.27;
+				MARKETING_VERSION = 3.0.28;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";

apps/mobile/package-lock.json

@@ -28,7 +28,6 @@
         "@trpc/react-query": "^10.45.2",
         "@trpc/server": "^10.45.2",
         "@types/validator": "^13.12.2",
-        "dayjs": "^1.11.13",
         "diffblazer": "^1.0.1",
         "react": "18.2.0",
         "react-native": "0.74.5"
@@ -3822,6 +3821,7 @@
         "@lingui/react": "5.1.2",
         "@mdi/js": "^7.2.96",
         "@mdi/react": "^1.6.0",
+        "@notesnook/common": "file:../common",
         "@notesnook/editor": "file:../editor",
         "@notesnook/intl": "file:../intl",
         "@notesnook/theme": "file:../theme",
@@ -3832,6 +3832,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-freeze": "^1.0.3",
+        "tinycolor2": "1.6.0",
         "zustand": "^4.4.7"
       },
       "devDependencies": {
@@ -28274,8 +28275,14 @@
         "@readme/data-urls": "3.0.0",
         "@streetwriters/kysely": "^0.27.4",
         "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@tanstack/react-query": "^4.36.1",
+        "@trpc/client": "^10.45.2",
+        "@trpc/react-query": "^10.45.2",
+        "@trpc/server": "^10.45.2",
         "absolutify": "^0.1.0",
+        "async-mutex": "0.5.0",
         "buffer": "^6.0.3",
+        "dayjs": "^1.11.13",
         "deprecated-react-native-prop-types": "^4.1.0",
         "entities": "^3.0.1",
         "fflate": "^0.7.3",
@@ -34665,6 +34672,14 @@
       "version": "1.0.1",
       "license": "MIT"
     },
+    "node_modules/async-mutex": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
+      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "dev": true,
@@ -43422,6 +43437,7 @@
       "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.2.0.tgz",
       "integrity": "sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "react-is": "^18.2.0",
         "react-shallow-renderer": "^16.15.0",

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.0.27",
+  "version": "3.0.28",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [

apps/monograph/package-lock.json

@@ -11,8 +11,8 @@
         "@emotion/cache": "11.11.0",
         "@emotion/react": "11.11.1",
         "@emotion/server": "11.11.0",
-        "@lingui/core": "4.11.4",
-        "@lingui/react": "4.11.4",
+        "@lingui/core": "5.1.2",
+        "@lingui/react": "5.1.2",
         "@mdi/js": "^7.4.47",
         "@napi-rs/canvas": "0.1.59",
         "@notesnook/core": "file:../../packages/core",
@@ -78,16 +78,16 @@
         "@streetwriters/kysely": "^0.27.4",
         "@streetwriters/showdown": "^3.0.9-alpha",
         "@types/mime-db": "^1.43.5",
-        "async-mutex": "^0.3.2",
-        "dayjs": "1.11.9",
+        "async-mutex": "0.5.0",
+        "dayjs": "1.11.13",
         "dom-serializer": "^2.0.0",
         "domhandler": "^5.0.3",
         "domutils": "^3.1.0",
-        "entities": "^4.3.1",
+        "entities": "5.0.0",
         "fuzzyjs": "^5.0.1",
         "html-to-text": "^9.0.5",
         "htmlparser2": "^8.0.1",
-        "katex": "0.16.2",
+        "katex": "0.16.11",
         "linkedom": "^0.14.17",
         "liqe": "^1.13.0",
         "mime-db": "^1.53.0",
@@ -95,33 +95,33 @@
         "qclone": "^1.2.0",
         "rfdc": "^1.3.0",
         "spark-md5": "^3.0.2",
-        "sqlite-better-trigram": "^0.0.1"
+        "sqlite-better-trigram": "0.0.2"
       },
       "devDependencies": {
         "@notesnook/crypto": "file:../crypto",
         "@types/better-sqlite3": "^7.6.5",
-        "@types/event-source-polyfill": "^1.0.1",
+        "@types/event-source-polyfill": "1.0.5",
         "@types/html-to-text": "^9.0.0",
-        "@types/katex": "^0.16.2",
-        "@types/prismjs": "^1.26.0",
+        "@types/katex": "0.16.7",
+        "@types/prismjs": "1.26.4",
         "@types/spark-md5": "^3.0.2",
         "@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6",
         "@types/unist": "^3.0.3",
         "@types/ws": "^8.5.5",
-        "@vitest/coverage-v8": "^1.0.1",
+        "@vitest/coverage-v8": "2.1.8",
         "abortcontroller-polyfill": "^1.7.3",
-        "better-sqlite3-multiple-ciphers": "^11.5.0",
+        "better-sqlite3-multiple-ciphers": "11.5.0",
         "bson-objectid": "^2.0.4",
-        "dotenv": "^16.0.1",
-        "event-source-polyfill": "^1.0.31",
+        "dotenv": "16.4.7",
+        "event-source-polyfill": "1.0.31",
         "eventsource": "^2.0.2",
-        "hash-wasm": "^4.9.0",
+        "hash-wasm": "4.12.0",
         "isomorphic-fetch": "^3.0.0",
         "mockdate": "^3.0.5",
-        "nanoid": "^5.0.1",
+        "nanoid": "5.0.7",
         "otplib": "^12.0.1",
         "refractor": "^4.8.1",
-        "vitest": "^1.0.1",
+        "vitest": "2.1.8",
         "vitest-fetch-mock": "^0.2.2",
         "ws": "^8.13.0"
       }
@@ -174,14 +174,14 @@
         "@tiptap/pm": "2.6.6",
         "@tiptap/starter-kit": "2.6.6",
         "alfaaz": "^1.1.0",
-        "async-mutex": "^0.5.0",
+        "async-mutex": "0.5.0",
         "clipboard-polyfill": "4.1.0",
         "colord": "^2.9.3",
         "detect-indent": "^7.0.1",
-        "entities": "^5.0.0",
+        "entities": "5.0.0",
         "katex": "0.16.11",
         "linkifyjs": "^4.1.3",
-        "nanoid": "^5.0.7",
+        "nanoid": "5.0.7",
         "prism-themes": "^1.9.0",
         "prosemirror-codemark": "^0.4.2",
         "prosemirror-view": "1.34.2",
@@ -194,23 +194,23 @@
       },
       "devDependencies": {
         "@emotion/react": "11.11.1",
-        "@mdi/js": "^7.4.47",
-        "@theme-ui/components": "^0.16.2",
-        "@theme-ui/core": "^0.16.2",
-        "@types/katex": "^0.16.7",
-        "@types/prismjs": "^1.26.4",
-        "@types/react": "^18.3.5",
+        "@mdi/js": "7.4.47",
+        "@theme-ui/components": "0.16.1",
+        "@theme-ui/core": "0.16.1",
+        "@types/katex": "0.16.7",
+        "@types/prismjs": "1.26.4",
+        "@types/react": "18.3.5",
         "@types/react-color": "^3.0.12",
-        "@types/react-dom": "^18.3.0",
-        "@types/react-modal": "^3.16.3 ",
-        "happy-dom": "^15.7.4",
+        "@types/react-dom": "18.3.0",
+        "@types/react-modal": "3.16.3",
+        "happy-dom": "16.0.1",
         "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",
-        "vitest": "^2.0.5",
+        "react-modal": "3.16.3",
+        "vitest": "2.1.8",
         "web-vitals": "^4.2.3",
         "zustand": "4.5.5"
       },
@@ -231,16 +231,15 @@
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "devDependencies": {
-        "@lingui/cli": "^4.11.4",
-        "@lingui/macro": "^4.11.4 ",
-        "@lingui/swc-plugin": "^4.0.10",
-        "@types/react": "^18.2.39",
+        "@lingui/cli": "5.1.2",
+        "@lingui/core": "5.1.2",
+        "@lingui/swc-plugin": "5.0.2",
+        "@types/react": "18.3.5",
         "babel-plugin-macros": "^3.1.0",
         "nodemon": "^3.1.7",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rollup": "^4.24.4",
-        "typescript": "5.5.3",
-        "vite": "^5.4.8",
+        "vite": "5.4.11",
         "vite-plugin-dts": "^4.2.3",
         "vite-plugin-static-copy": "^2.0.0",
         "vite-plugin-swc-transform": "^1.0.1"
@@ -257,14 +256,14 @@
       "devDependencies": {
         "@emotion/react": "11.11.1",
         "@theme-ui/color": "^0.16.1",
-        "@theme-ui/components": "^0.16.1",
-        "@theme-ui/core": "^0.16.1",
-        "@trpc/server": "^10.45.2",
-        "@types/react": "^18.2.39",
+        "@theme-ui/components": "0.16.1",
+        "@theme-ui/core": "0.16.1",
+        "@trpc/server": "10.45.2",
+        "@types/react": "18.3.5",
         "isomorphic-fetch": "^3.0.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "ts-json-schema-generator": "^1.2.0",
-        "zustand": "4.4.7"
+        "zustand": "4.5.5"
       },
       "peerDependencies": {
         "@emotion/react": ">=11",
@@ -284,16 +283,16 @@
       },
       "devDependencies": {
         "@emotion/react": "11.11.1",
-        "@mdi/js": "^7.2.96",
-        "@theme-ui/components": "^0.16.1",
-        "@theme-ui/core": "^0.16.1",
-        "@types/react": "^18.2.39",
-        "@types/react-dom": "^18.2.17",
+        "@mdi/js": "7.4.47",
+        "@theme-ui/components": "0.16.1",
+        "@theme-ui/core": "0.16.1",
+        "@types/react": "18.3.5",
+        "@types/react-dom": "18.3.0",
         "@types/react-modal": "3.16.3",
-        "mac-scrollbar": "^0.10.3",
-        "react": "18.2.0",
-        "react-dom": "18.2.0",
-        "react-modal": "3.16.1"
+        "mac-scrollbar": "0.13.6",
+        "react": "18.3.1",
+        "react-dom": "18.3.1",
+        "react-modal": "3.16.3"
       },
       "peerDependencies": {
         "@emotion/react": ">=11",
@@ -1660,46 +1659,65 @@
       "dev": true
     },
     "node_modules/@lingui/core": {
-      "version": "4.11.4",
-      "resolved": "https://registry.npmjs.org/@lingui/core/-/core-4.11.4.tgz",
-      "integrity": "sha512-W0bBIFe44s//Qs+RQ+NMfzK5vAm9oEKyDddlN94Db6rzeUT/IJo7N+T75A6Bya8v/BrtF2G/W4b77eS3sd0utw==",
-      "license": "MIT",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@lingui/core/-/core-5.1.2.tgz",
+      "integrity": "sha512-biqmMCWuBBj7ERSpgGSV91hTShnSrR/RIFUcNKjWuZYgDd3HpBdEmXKCo9NTanQYbkBUpmyw/bgwsSBex6vkDA==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
-        "@lingui/message-utils": "4.11.4",
+        "@lingui/message-utils": "^5.1.2",
         "unraw": "^3.0.0"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "@lingui/babel-plugin-lingui-macro": "5.1.2",
+        "babel-plugin-macros": "2 || 3"
+      },
+      "peerDependenciesMeta": {
+        "@lingui/babel-plugin-lingui-macro": {
+          "optional": true
+        },
+        "babel-plugin-macros": {
+          "optional": true
+        }
       }
     },
     "node_modules/@lingui/message-utils": {
-      "version": "4.11.4",
-      "resolved": "https://registry.npmjs.org/@lingui/message-utils/-/message-utils-4.11.4.tgz",
-      "integrity": "sha512-ZTCDhGbj5EN+P9Ajcj0Gq9uDP3HZTRW6/kT09WkiFgL4NayYLksPvgBk29sIglsS6M+Y6Iw2BrUK403SZjZKgw==",
-      "license": "MIT",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@lingui/message-utils/-/message-utils-5.1.2.tgz",
+      "integrity": "sha512-P/N0yBy2MuC726EaGPGiOafc/0RafHiwkvZJdFKjm1/XOMWrFZDPFXTuxguVQ3HQsRi5eUIPaboU4uRX4GepPg==",
       "dependencies": {
         "@messageformat/parser": "^5.0.0",
         "js-sha256": "^0.10.1"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@lingui/react": {
-      "version": "4.11.4",
-      "resolved": "https://registry.npmjs.org/@lingui/react/-/react-4.11.4.tgz",
-      "integrity": "sha512-f7re4HhjI6CLBV1CY/PcI3VYP5zS4rtfU33speWnfkymsxGIXQv4ol3BqrgPLGhypMl2nKcL5nfL+LewrLIW8g==",
-      "license": "MIT",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@lingui/react/-/react-5.1.2.tgz",
+      "integrity": "sha512-YPAvbPUd+kJrmA9H1LSJ9f6+0hkOlm0w8g+7a8FtE7olamjXd7SyIgJMbeJmvKSdztrrdcLBs9YEftUKTfjiyg==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
-        "@lingui/core": "4.11.4"
+        "@lingui/core": "^5.1.2"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@lingui/babel-plugin-lingui-macro": "5.1.2",
+        "babel-plugin-macros": "2 || 3",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@lingui/babel-plugin-lingui-macro": {
+          "optional": true
+        },
+        "babel-plugin-macros": {
+          "optional": true
+        }
       }
     },
     "node_modules/@mdi/js": {
@@ -1739,10 +1757,9 @@
       }
     },
     "node_modules/@messageformat/parser": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.1.0.tgz",
-      "integrity": "sha512-jKlkls3Gewgw6qMjKZ9SFfHUpdzEVdovKFtW1qRhJ3WI4FW5R/NnGDqr8SDGz+krWDO3ki94boMmQvGke1HwUQ==",
-      "license": "MIT",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.1.1.tgz",
+      "integrity": "sha512-3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==",
       "dependencies": {
         "moo": "^0.5.1"
       }
@@ -6212,8 +6229,7 @@
     "node_modules/js-sha256": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
-      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw==",
-      "license": "MIT"
+      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
@@ -7783,8 +7799,7 @@
     "node_modules/moo": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
-      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
-      "license": "BSD-3-Clause"
+      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="
     },
     "node_modules/morgan": {
       "version": "1.10.0",

apps/monograph/package.json

@@ -15,8 +15,8 @@
     "@emotion/cache": "11.11.0",
     "@emotion/react": "11.11.1",
     "@emotion/server": "11.11.0",
-    "@lingui/core": "4.11.4",
-    "@lingui/react": "4.11.4",
+    "@lingui/core": "5.1.2",
+    "@lingui/react": "5.1.2",
     "@mdi/js": "^7.4.47",
     "@napi-rs/canvas": "0.1.59",
     "@notesnook/core": "file:../../packages/core",

apps/web/__e2e__/models/app.model.ts

@@ -55,7 +55,7 @@ export class AppModel {
   }
 
   goBack() {
-    const goBackButton = this.page.locator(getTestId("go-back"));
+    const goBackButton = this.page.locator(getTestId("route-go-back"));
     return goBackButton.click();
   }
 

apps/web/__e2e__/models/base-item.model.ts

@@ -39,10 +39,12 @@ export class BaseItemModel {
     return await this.locator.evaluate((el) => el === document.activeElement);
   }
 
-  async click() {
+  async click(options?: { middleClick?: boolean }) {
     if (!(await this.locator.isVisible()))
       await this.locator.scrollIntoViewIfNeeded();
-    await this.locator.click();
+    await this.locator.click({
+      button: options?.middleClick ? "middle" : "left"
+    });
   }
 
   async getId() {

apps/web/__e2e__/models/editor.model.ts

@@ -36,6 +36,9 @@ export class EditorModel {
   private readonly dateEditedText: Locator;
   private readonly searchButton: Locator;
   private readonly tabsList: Locator;
+  private readonly goBackButton: Locator;
+  private readonly goForwardButton: Locator;
+  private readonly newTabButton: Locator;
   readonly savedIcon: Locator;
   readonly notSavedIcon: Locator;
 
@@ -59,6 +62,9 @@ export class EditorModel {
     this.savedIcon = page.locator(getTestId("editor-save-state-saved"));
     this.notSavedIcon = page.locator(getTestId("editor-save-state-notsaved"));
     this.tabsList = page.locator(getTestId("tabs"));
+    this.goBackButton = page.locator(getTestId("go-back"));
+    this.goForwardButton = page.locator(getTestId("go-forward"));
+    this.newTabButton = page.locator(getTestId("New tab"));
   }
 
   async waitForLoading(title?: string, content?: string) {
@@ -243,6 +249,26 @@ export class EditorModel {
     }
   }
 
+  async getTabs() {
+    const tabs: TabItemModel[] = [];
+    for await (const item of iterateList(this.tabsList.locator(".tab"))) {
+      tabs.push(new TabItemModel(item, this.page));
+    }
+    return tabs;
+  }
+
+  async goBack() {
+    await this.goBackButton.click();
+  }
+
+  async goForward() {
+    await this.goForwardButton.click();
+  }
+
+  async newTab() {
+    await this.newTabButton.click();
+  }
+
   async attachImage() {
     await this.page
       .context()

apps/web/__e2e__/models/note-item.model.ts

@@ -38,8 +38,8 @@ export class NoteItemModel extends BaseItemModel {
     this.editor = new EditorModel(this.page);
   }
 
-  async openNote() {
-    await this.click();
+  async openNote(openInNewTab?: boolean) {
+    await this.click({ middleClick: openInNewTab });
     const title = await this.getTitle();
     await this.editor.waitForLoading(title);
   }

apps/web/__e2e__/models/note-properties.model.ts

@@ -211,6 +211,11 @@ export class NoteContextMenuModel extends BaseProperties {
     this.menu = new ContextMenuModel(page);
   }
 
+  async openInNewTab() {
+    await this.open();
+    await this.menu.clickOnItem("openinnewtab");
+  }
+
   async isColored(color: string): Promise<boolean> {
     await this.open();
     await this.menu.clickOnItem("colors");

apps/web/__e2e__/models/tab-item.model.ts

@@ -30,6 +30,20 @@ export class TabItemModel {
     const testId = await this.locator.getAttribute("data-test-id");
     return testId?.replace("tab-", "");
   }
+
+  async click() {
+    return this.locator.click();
+  }
+
+  async title() {
+    return this.locator.locator(getTestId("tab-title")).textContent();
+  }
+
+  async isActive() {
+    const classList = await this.locator.getAttribute("class");
+    return !!classList?.includes("active");
+  }
+
   close() {
     return this.closeButton.click();
   }

apps/web/__e2e__/notehistory.test.ts

@@ -17,47 +17,11 @@ 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 { test, expect, Page } from "@playwright/test";
-import { AppModel } from "./models/app.model";
-import { NOTE, PASSWORD } from "./utils";
+import { test, expect } from "@playwright/test";
+import { createHistorySession, PASSWORD } from "./utils";
 
 test.setTimeout(60 * 1000);
 
-async function createSession(page: Page, locked = false) {
-  const app = new AppModel(page);
-  await app.goto();
-  const notes = await app.goToNotes();
-  let note = await notes.createNote(NOTE);
-
-  if (locked) {
-    await note?.contextMenu.lock(PASSWORD);
-    await note?.openLockedNote(PASSWORD);
-  }
-
-  const edits = ["Some edited text.", "Some more edited text."];
-  for (const edit of edits) {
-    await notes.editor.setContent(edit);
-
-    await page.waitForTimeout(600);
-
-    await page.reload().catch(console.error);
-    await notes.waitForItem(NOTE.title);
-    note = await notes.findNote(NOTE);
-    locked ? await note?.openLockedNote(PASSWORD) : await note?.openNote();
-  }
-  const contents = [
-    `${NOTE.content}${edits[0]}${edits[1]}`,
-    `${NOTE.content}${edits[0]}`
-  ];
-
-  return {
-    note,
-    notes,
-    app,
-    contents
-  };
-}
-
 const sessionTypes = ["locked", "unlocked"] as const;
 
 for (const type of sessionTypes) {
@@ -66,7 +30,7 @@ for (const type of sessionTypes) {
   test(`editing a note should create a new ${type} session in its session history`, async ({
     page
   }) => {
-    const { note } = await createSession(page, isLocked);
+    const { note } = await createHistorySession(page, isLocked);
 
     const history = await note?.properties.getSessionHistory();
     expect(history?.length).toBeGreaterThan(1);
@@ -81,7 +45,7 @@ for (const type of sessionTypes) {
   test(`switching ${type} sessions should change editor content`, async ({
     page
   }) => {
-    const { note, contents } = await createSession(page, isLocked);
+    const { note, contents } = await createHistorySession(page, isLocked);
 
     const history = await note?.properties.getSessionHistory();
     let preview = await history?.at(1)?.open();
@@ -91,6 +55,7 @@ for (const type of sessionTypes) {
       contents[1]
     );
     await note?.click();
+    if (type === "locked") await note?.openLockedNote(PASSWORD);
     await note?.properties.close();
     preview = await history?.at(0)?.open();
     if (type === "locked") await preview?.unlock(PASSWORD);
@@ -103,7 +68,10 @@ for (const type of sessionTypes) {
   test(`restoring a ${type} session should change note's content`, async ({
     page
   }) => {
-    const { note, notes, contents } = await createSession(page, isLocked);
+    const { note, notes, contents } = await createHistorySession(
+      page,
+      isLocked
+    );
     const history = await note?.properties.getSessionHistory();
     const preview = await history?.at(1)?.open();
     if (type === "locked") await preview?.unlock(PASSWORD);
@@ -115,44 +83,3 @@ for (const type of sessionTypes) {
     expect(await notes.editor.getContent("text")).toBe(contents[1]);
   });
 }
-// test("editing locked note should create locked history sessions", async ({
-//   page
-// }) => {
-//   const { note } = await createLockedSession(page);
-
-//   const history = await note?.properties.getSessionHistory();
-//   expect(history).toHaveLength(2);
-// for (const item of history || []) {
-//   expect(await item.isLocked()).toBeTruthy();
-// }
-// });
-
-// test("switching locked sessions should change editor content", async ({
-//   page
-// }) => {
-//   const { note, notes, contents } = await createLockedSession(page);
-
-//   const history = await note?.properties.getSessionHistory();
-//   await history?.at(1)?.previewLocked(PASSWORD);
-//   await notes.editor.waitForLoading(NOTE.title, contents[1]);
-//   const content1 = await notes.editor.getContent("text");
-
-//   await history?.at(0)?.previewLocked(PASSWORD);
-//   await notes.editor.waitForLoading(NOTE.title, contents[0]);
-//   const content0 = await notes.editor.getContent("text");
-
-//   expect(content1).toBe(contents[1]);
-//   expect(content0).toBe(contents[0]);
-// });
-
-// test("restore a locked session", async ({ page }) => {
-//   const { note, notes, contents } = await createLockedSession(page);
-//   const history = await note?.properties.getSessionHistory();
-//   await history?.at(1)?.previewLocked(PASSWORD);
-//   await notes.editor.waitForLoading(NOTE.title, contents[1]);
-
-//   await notes.editor.restoreSession();
-
-//   const content = await notes.editor.getContent("text");
-//   expect(content).toBe(contents[1]);
-// });

apps/web/__e2e__/sync.test.ts

@@ -20,6 +20,9 @@ import { test, Browser, expect } from "@playwright/test";
 import { AppModel } from "./models/app.model";
 import { USER } from "./utils";
 
+// run this test file sequentially
+test.describe.configure({ mode: "serial" });
+
 async function createDevice(browser: Browser) {
   // Create two isolated browser contexts
   const context = await browser.newContext();
@@ -48,13 +51,13 @@ async function actAndSync<T>(
   return results.slice(0, actions.length) as T[];
 }
 
-const NOTE = {
-  title: `Note ${makeid(20)}`
-};
-
-test(`edits in a note opened on 2 devices should sync in real-time`, async ({
+test(`content edits in a note opened on 2 devices in multiple tabs should sync in real-time`, async ({
   browser
 }, info) => {
+  const NOTE = {
+    title: `Note ${makeid(20)}`
+  };
+
   info.setTimeout(70 * 1000);
   const newContent = makeid(24).repeat(2);
 
@@ -71,6 +74,7 @@ test(`edits in a note opened on 2 devices should sync in real-time`, async ({
   )[0];
   const noteA = await notesA.findNote(NOTE);
   await Promise.all([noteA, noteB].map((note) => note?.openNote()));
+  await noteA?.openNote(true);
 
   if ((await notesB.editor.getContent("text")) !== "")
     await actAndSync([deviceA, deviceB], notesB.editor.clear());
@@ -82,6 +86,52 @@ test(`edits in a note opened on 2 devices should sync in real-time`, async ({
   expect(noteB).toBeDefined();
   await expect(notesA.editor.content).toHaveText(newContent);
   await expect(notesB.editor.content).toHaveText(newContent);
+  const tabsA = await notesA.editor.getTabs();
+  await tabsA[0].click();
+  await expect(notesA.editor.content).toHaveText(newContent);
+
+  await (await deviceA.goToSettings())?.logout();
+  await (await deviceB.goToSettings())?.logout();
+});
+
+test(`title edits in a note opened on 2 devices in multiple tabs should sync in real-time`, async ({
+  browser
+}, info) => {
+  const NOTE = {
+    title: `Note ${makeid(20)}`
+  };
+
+  info.setTimeout(70 * 1000);
+  const newContent = makeid(24).repeat(2);
+
+  const [deviceA, deviceB] = await Promise.all([
+    createDevice(browser),
+    createDevice(browser)
+  ]);
+
+  const [notesA, notesB] = await Promise.all(
+    [deviceA, deviceB].map((d) => d.goToNotes())
+  );
+  const noteB = (
+    await actAndSync([deviceA, deviceB], notesB.createNote(NOTE))
+  )[0];
+  const noteA = await notesA.findNote(NOTE);
+  await Promise.all([noteA, noteB].map((note) => note?.openNote()));
+  await noteA?.openNote(true);
+
+  if ((await notesB.editor.getContent("text")) !== "")
+    await actAndSync([deviceA, deviceB], notesB.editor.clear());
+  await expect(notesA.editor.content).toBeEmpty();
+  await expect(notesB.editor.content).toBeEmpty();
+  await actAndSync([deviceA, deviceB], notesB.editor.setTitle(newContent));
+
+  expect(noteA).toBeDefined();
+  expect(noteB).toBeDefined();
+  expect(await notesA.editor.getTitle()).toBe(newContent);
+  expect(await notesB.editor.getTitle()).toBe(newContent);
+  const tabsA = await notesA.editor.getTabs();
+  await tabsA[0].click();
+  expect(await notesA.editor.getTitle()).toBe(newContent);
 
   await (await deviceA.goToSettings())?.logout();
   await (await deviceB.goToSettings())?.logout();

apps/web/__e2e__/tabs.test.ts

@@ -0,0 +1,256 @@
+/*
+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 { test, expect } from "@playwright/test";
+import { AppModel } from "./models/app.model";
+import { createHistorySession } from "./utils";
+
+test("notes should open in the same tab", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  await notes.createNote({ title: "Note 1" });
+  await notes.createNote({ title: "Note 2" });
+  await notes.createNote({ title: "Note 3" });
+  await page.reload();
+
+  const note = await notes.findNote({ title: "Note 2" });
+  await note?.click();
+
+  const tabs = await notes.editor.getTabs();
+  expect(tabs.length).toBe(1);
+});
+
+test("new note should open in the same tab", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  await notes.createNote({ title: "Note 1" });
+
+  await notes.newNote();
+
+  const tabs = await notes.editor.getTabs();
+  expect(tabs.length).toBe(1);
+});
+
+test("open note in new tab (using context menu)", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  await notes.createNote({ title: "Note 1" });
+  await notes.createNote({ title: "Note 2" });
+  await notes.createNote({ title: "Note 3" });
+
+  const note = await notes.findNote({ title: "Note 2" });
+  await note?.contextMenu.openInNewTab();
+  await notes.editor.waitForLoading();
+
+  const tabs = await notes.editor.getTabs();
+  expect(tabs.length).toBe(2);
+  expect(await tabs[1].title()).toBe("Note 2");
+});
+
+test("open note in new tab (using middle click)", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  await notes.createNote({ title: "Note 1" });
+  await notes.createNote({ title: "Note 2" });
+  await notes.createNote({ title: "Note 3" });
+
+  const note = await notes.findNote({ title: "Note 2" });
+  await note?.click({ middleClick: true });
+  await notes.editor.waitForLoading();
+
+  const tabs = await notes.editor.getTabs();
+  expect(tabs.length).toBe(2);
+  expect(await tabs[1].title()).toBe("Note 2");
+});
+
+test("go back should open previous note", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  const tabs = await notes.editor.getTabs();
+  await notes.createNote({ title: "Note 1" });
+  await notes.createNote({ title: "Note 2" });
+  await notes.createNote({ title: "Note 3" });
+
+  await notes.editor.goBack();
+  expect(await tabs[0].title()).toBe("Note 2");
+  await notes.editor.goBack();
+  expect(await tabs[0].title()).toBe("Note 1");
+});
+
+test("go forward should open next note", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  const tabs = await notes.editor.getTabs();
+  await notes.createNote({ title: "Note 1" });
+  await notes.createNote({ title: "Note 2" });
+  await notes.createNote({ title: "Note 3" });
+
+  await notes.editor.goBack();
+  await notes.editor.goBack();
+  await notes.editor.goForward();
+  expect(await tabs[0].title()).toBe("Note 2");
+  await notes.editor.goForward();
+  expect(await tabs[0].title()).toBe("Note 3");
+});
+
+test("new tab button should open a new tab", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  await notes.createNote({ title: "Note 1" });
+
+  await notes.editor.newTab();
+
+  const tabs = await notes.editor.getTabs();
+  expect(await tabs[0].title()).toBe("Note 1");
+  expect(await tabs[1].title()).toBe("Untitled");
+});
+
+test("changes in a note opened in multiple tabs should sync", async ({
+  page
+}) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  const note = await notes.createNote({ title: "Note 1" });
+  await note?.contextMenu.openInNewTab();
+
+  await notes.editor.editAndWait(async () => {
+    await notes.editor.setContent("This change should sync.");
+  });
+
+  const tabs = await notes.editor.getTabs();
+  await tabs[0].click();
+  expect(await notes.editor.getContent("text")).toBe(
+    "This change should sync."
+  );
+});
+
+test("open same note in 2 tabs and refresh page", async ({ page }) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  const note = await notes.createNote({
+    title: "Note 1",
+    content: "Some edits."
+  });
+  await note?.contextMenu.openInNewTab();
+  await notes.editor.waitForLoading();
+
+  await page.reload();
+  await notes.waitForList();
+
+  const tabs = await notes.editor.getTabs();
+  await tabs[0].click();
+  await notes.editor.waitForLoading();
+  expect(await notes.editor.getContent("text")).toBe("Some edits.");
+});
+
+test("reloading with a note diff open in a tab", async ({ page }) => {
+  const { note, contents } = await createHistorySession(page);
+  const history = await note?.properties.getSessionHistory();
+  const preview = await history?.[0].open();
+  await preview!.firstEditor.waitFor({ state: "visible" });
+
+  await page.reload();
+  await preview!.firstEditor.waitFor({ state: "visible" });
+
+  await expect(preview!.firstEditor.locator(".ProseMirror")).toHaveText(
+    contents[0]
+  );
+  await expect(preview!.secondEditor.locator(".ProseMirror")).toHaveText(
+    contents[0]
+  );
+});
+
+test("navigate back and forth between normal and diff session", async ({
+  page
+}) => {
+  const { note, contents, notes } = await createHistorySession(page);
+  const history = await note?.properties.getSessionHistory();
+  const preview = await history?.[0].open();
+  await preview!.firstEditor.waitFor({ state: "visible" });
+
+  await notes.editor.goBack();
+  await preview!.firstEditor.waitFor({ state: "hidden" });
+
+  expect(await notes.editor.getContent("text")).toBe(contents[0]);
+
+  await notes.editor.goForward();
+  await preview!.firstEditor.waitFor({ state: "visible" });
+
+  await expect(preview!.firstEditor.locator(".ProseMirror")).toHaveText(
+    contents[0]
+  );
+  await expect(preview!.secondEditor.locator(".ProseMirror")).toHaveText(
+    contents[0]
+  );
+});
+
+test("clicking on a note that's already opened in another tab should focus the tab", async ({
+  page
+}) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  const note = await notes.createNote({
+    title: "Note 1"
+  });
+  await note?.contextMenu.openInNewTab();
+  await notes.editor.waitForLoading();
+  await notes.createNote({
+    title: "Note 2"
+  });
+
+  await note?.openNote();
+
+  const tabs = await notes.editor.getTabs();
+  expect(await tabs[0].isActive()).toBe(true);
+});
+
+test("open a note in 2 tabs then open another note and navigate back", async ({
+  page
+}) => {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  const note = await notes.createNote({
+    title: "Note 1"
+  });
+  await note?.contextMenu.openInNewTab();
+  await notes.editor.waitForLoading();
+  await notes.createNote({
+    title: "Note 2"
+  });
+
+  await notes.editor.goBack();
+
+  const tabs = await notes.editor.getTabs();
+  expect(await tabs[1].isActive()).toBe(true);
+  expect(await tabs[1].title()).toBe("Note 1");
+});
+
+test.skip("TODO: open a locked note, switch to another note and navigate back", () => {});
+test.skip("TODO: open a locked note, switch to another note, unlock the note and navigate back", () => {});

apps/web/__e2e__/utils/index.ts

@@ -28,6 +28,7 @@ import {
   SortByOptions
 } from "../models/types";
 import { tmpdir } from "os";
+import { AppModel } from "../models/app.model";
 
 type Note = {
   title: string;
@@ -74,7 +75,10 @@ const PASSWORD = "123abc123abc";
 
 const APP_LOCK_PASSWORD = "lockapporelse🔪";
 
-function getTestId(id: string, variant: "data-test-id" | "data-testid" = "data-test-id") {
+function getTestId(
+  id: string,
+  variant: "data-test-id" | "data-testid" = "data-test-id"
+) {
   return `[${variant}="${id}"]`;
 }
 
@@ -153,6 +157,41 @@ const groupByOptions: GroupByOptions[] = [
   "week"
 ];
 
+export async function createHistorySession(page: Page, locked = false) {
+  const app = new AppModel(page);
+  await app.goto();
+  const notes = await app.goToNotes();
+  let note = await notes.createNote(NOTE);
+
+  if (locked) {
+    await note?.contextMenu.lock(PASSWORD);
+    await note?.openLockedNote(PASSWORD);
+  }
+
+  const edits = ["Some edited text.", "Some more edited text."];
+  for (const edit of edits) {
+    await notes.editor.setContent(edit);
+
+    await page.waitForTimeout(600);
+
+    await page.reload().catch(console.error);
+    await notes.waitForItem(NOTE.title);
+    note = await notes.findNote(NOTE);
+    locked ? await note?.openLockedNote(PASSWORD) : await note?.openNote();
+  }
+  const contents = [
+    `${NOTE.content}${edits[0]}${edits[1]}`,
+    `${NOTE.content}${edits[0]}`
+  ];
+
+  return {
+    note,
+    notes,
+    app,
+    contents
+  };
+}
+
 export {
   USER,
   NOTE,

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "3.0.24",
+  "version": "3.0.25",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

apps/web/src/common/key-map.ts

@@ -18,11 +18,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import hotkeys from "hotkeys-js";
-import { GlobalKeyboard } from "../utils/keyboard";
 import { useEditorStore } from "../stores/editor-store";
 import { useStore as useSearchStore } from "../stores/search-store";
 import { useEditorManager } from "../components/editor/manager";
 
+function isInEditor(e: KeyboardEvent) {
+  return (
+    e.target instanceof HTMLElement && !!e.target?.closest(".editor-container")
+  );
+}
+
 const KEYMAP = [
   // {
   //   keys: ["command+n", "ctrl+n", "command+alt+n", "ctrl+alt+n"],
@@ -54,15 +59,34 @@ const KEYMAP = [
   //     });
   //   },
   // },
+  {
+    keys: [
+      "command+option+right",
+      "ctrl+alt+right",
+      "command+option+shift+right",
+      "ctrl+alt+shift+right"
+    ],
+    description: "Go to next tab",
+    global: false,
+    action: () => useEditorStore.getState().focusNextTab()
+  },
+  {
+    keys: [
+      "command+option+left",
+      "ctrl+alt+left",
+      "command+option+shift+left",
+      "ctrl+alt+shift+left"
+    ],
+    description: "Go to next tab",
+    global: false,
+    action: () => useEditorStore.getState().focusPreviousTab()
+  },
   {
     keys: ["command+f", "ctrl+f"],
     description: "Search all notes",
     global: false,
     action: (e: KeyboardEvent) => {
-      const isInEditor =
-        e.target instanceof HTMLElement &&
-        !!e.target?.closest(".editor-container");
-      if (isInEditor) {
+      if (isInEditor(e)) {
         const activeSession = useEditorStore.getState().getActiveSession();
         if (activeSession?.type === "readonly") {
           e.preventDefault();
@@ -149,14 +173,9 @@ export function registerKeyMap() {
   };
 
   KEYMAP.forEach((key) => {
-    hotkeys(
-      key.keys.join(","),
-      {
-        element: key.global
-          ? (GlobalKeyboard as unknown as HTMLElement)
-          : document.body
-      },
-      key.action
-    );
+    hotkeys(key.keys.join(","), (e) => {
+      e.preventDefault();
+      key.action?.(e);
+    });
   });
 }

apps/web/src/components/diff-viewer/index.tsx

@@ -17,7 +17,13 @@ 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 { useCallback, useLayoutEffect, useRef, useState } from "react";
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState
+} from "react";
 import { Flex, Text, Button } from "@theme-ui/components";
 import { Copy, Restore } from "../icons";
 import ContentToggle from "./content-toggle";
@@ -25,6 +31,7 @@ import { store as notesStore } from "../../stores/note-store";
 import { db } from "../../common/db";
 import {
   ConflictedEditorSession,
+  DiffEditorSession,
   useEditorStore
 } from "../../stores/editor-store";
 import { ScrollSync, ScrollSyncPane } from "react-scroll-sync";
@@ -35,7 +42,7 @@ import { getFormattedDate } from "@notesnook/common";
 import { diff } from "diffblazer";
 import { strings } from "@notesnook/intl";
 
-type DiffViewerProps = { session: ConflictedEditorSession };
+type DiffViewerProps = { session: ConflictedEditorSession | DiffEditorSession };
 function DiffViewer(props: DiffViewerProps) {
   const { session } = props;
 
@@ -44,7 +51,11 @@ function DiffViewer(props: DiffViewerProps) {
   const [conflictedContent, setConflictedContent] = useState(
     content?.conflicted
   );
-  const root = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    setContent(session.content);
+    setConflictedContent(session.content?.conflicted);
+  }, [session.content]);
 
   const onResolveContent = useCallback(
     (saveCopy: boolean) => {
@@ -71,19 +82,13 @@ function DiffViewer(props: DiffViewerProps) {
     });
   }, [session]);
 
-  useLayoutEffect(() => {
-    const element = root.current;
-    element?.classList.add("active");
-    return () => {
-      element?.classList.remove("active");
-    };
-  }, []);
-
   if (!conflictedContent || !content) return null;
 
   return (
     <Flex
-      ref={root}
+      ref={(el) => {
+        if (el) el.classList.add("active");
+      }}
       className="diffviewer"
       data-test-id="diff-viewer"
       sx={{
@@ -112,12 +117,15 @@ function DiffViewer(props: DiffViewerProps) {
               variant="secondary"
               data-test-id="restore-session"
               onClick={async () => {
-                const { closeSessions, openSession } =
+                const { closeTabs, openSession, getSessionsForNote } =
                   useEditorStore.getState();
 
-                await db.noteHistory.restore(session.id);
+                await db.noteHistory.restore(session.historySessionId);
 
-                closeSessions(session.id, session.note.id);
+                closeTabs(
+                  session.id,
+                  ...getSessionsForNote(session.note.id).map((s) => s.id)
+                );
 
                 await notesStore.refresh();
                 await openSession(session.note.id, { force: true });
@@ -135,12 +143,11 @@ function DiffViewer(props: DiffViewerProps) {
             <Button
               variant="secondary"
               onClick={async () => {
-                const { closeSessions, openSession } =
-                  useEditorStore.getState();
+                const { closeTabs, openSession } = useEditorStore.getState();
 
                 const noteId = await createCopy(session.note, content);
 
-                closeSessions(session.id);
+                closeTabs(session.id);
 
                 await notesStore.refresh();
                 await openSession(noteId);

apps/web/src/components/editor/action-bar.tsx

@@ -18,9 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Button, Flex, Text } from "@theme-ui/components";
-import { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import {
   ArrowLeft,
+  ArrowRight,
   Cross,
   EditorFullWidth,
   EditorNormalWidth,
@@ -28,10 +29,12 @@ import {
   FocusMode,
   Fullscreen,
   Lock,
+  NewTab,
   NormalMode,
   Note,
   NoteRemove,
   Pin,
+  Plus,
   Properties,
   Publish,
   Published,
@@ -86,10 +89,10 @@ import { isMac } from "../../utils/platform";
 export function EditorActionBar() {
   const { isMaximized, isFullscreen, hasNativeWindowControls } =
     useWindowControls();
-  const editorMargins = useEditorStore((store) => store.editorMargins);
   const isFocusMode = useAppStore((store) => store.isFocusMode);
+  const activeTab = useEditorStore((store) => store.getActiveTab());
   const activeSession = useEditorStore((store) =>
-    store.activeSessionId ? store.getSession(store.activeSessionId) : undefined
+    activeTab ? store.getSession(activeTab.sessionId) : undefined
   );
   const editorManager = useEditorManager((store) =>
     activeSession?.id ? store.editors[activeSession?.id] : undefined
@@ -97,11 +100,19 @@ export function EditorActionBar() {
   const isLoggedIn = useUserStore((store) => store.isLoggedIn);
   const monographs = useMonographStore((store) => store.monographs);
   const isNotePublished =
-    activeSession && db.monographs.isPublished(activeSession.id);
+    activeSession &&
+    "note" in activeSession &&
+    db.monographs.isPublished(activeSession.note.id);
   const isMobile = useMobile();
   const isTablet = useTablet();
 
   const tools = [
+    {
+      title: strings.newTab(),
+      icon: NewTab,
+      enabled: true,
+      onClick: () => useEditorStore.getState().addTab()
+    },
     {
       title: strings.undo(),
       icon: Undo,
@@ -128,44 +139,6 @@ export function EditorActionBar() {
           activeSession.type === "readonly") &&
         showPublishView(activeSession.note, "top")
     },
-    {
-      title: editorMargins
-        ? strings.disableEditorMargins()
-        : strings.enableEditorMargins(),
-      icon: editorMargins ? EditorNormalWidth : EditorFullWidth,
-      enabled: true,
-      hideOnMobile: true,
-      onClick: () => useEditorStore.getState().toggleEditorMargins()
-    },
-    {
-      title: isFullscreen
-        ? strings.exitFullScreen()
-        : strings.enterFullScreen(),
-      icon: isFullscreen ? ExitFullscreen : Fullscreen,
-      enabled: true,
-      hidden: !isFocusMode,
-      hideOnMobile: true,
-      onClick: () => {
-        if (isFullscreen) {
-          exitFullscreen();
-        } else {
-          enterFullscreen(document.documentElement);
-        }
-      }
-    },
-    {
-      title: isFocusMode ? strings.normalMode() : strings.focusMode(),
-      icon: isFocusMode ? FocusMode : NormalMode,
-      enabled: true,
-      hideOnMobile: true,
-      onClick: () => {
-        useAppStore.getState().toggleFocusMode();
-        if (document.fullscreenElement) exitFullscreen();
-        const id = useEditorStore.getState().activeSessionId;
-        const editor = id && useEditorManager.getState().getEditor(id);
-        if (editor) editor.editor?.focus();
-      }
-    },
     {
       title: strings.toc(),
       icon: TableOfContents,
@@ -238,7 +211,10 @@ export function EditorActionBar() {
           mr:
             hasNativeWindowControls && !isMac() && !isMobile && !isTablet
               ? `calc(100vw - env(titlebar-area-width))`
-              : 0
+              : 1,
+          pl: 1,
+          borderLeft: "1px solid var(--border)",
+          flexShrink: 0
         }}
       >
         {tools.map((tool) => (
@@ -249,14 +225,13 @@ export function EditorActionBar() {
             title={tool.title}
             key={tool.title}
             sx={{
-              height: "100%",
+              p: 1,
               alignItems: "center",
               bg: "transparent",
               display: [
                 "hideOnMobile" in tool && tool.hideOnMobile ? "none" : "flex",
                 tool.hidden ? "none" : "flex"
               ],
-              borderRadius: 0,
               flexShrink: 0,
               "&:hover svg path": {
                 fill:
@@ -267,7 +242,7 @@ export function EditorActionBar() {
             }}
             onClick={tool.onClick}
           >
-            <tool.icon size={18} />
+            <tool.icon size={16} />
           </Button>
         ))}
       </Flex>
@@ -275,183 +250,209 @@ export function EditorActionBar() {
   );
 }
 
-function TabStrip() {
-  const sessions = useEditorStore((store) => store.sessions);
-  const activeSessionId = useEditorStore((store) => store.activeSessionId);
+const TabStrip = React.memo(function TabStrip() {
+  useEditorStore((store) => store.getActiveSession()); // otherwise the tab title won't update on opening a note
+  const tabs = useEditorStore((store) => store.tabs);
+  const currentTab = useEditorStore((store) => store.activeTabId);
+  const canGoBack = useEditorStore((store) => store.canGoBack);
+  const canGoForward = useEditorStore((store) => store.canGoForward);
 
   return (
-    <ScrollContainer
-      className="tabsScroll"
-      suppressScrollY
-      style={{ flex: 1, height: TITLE_BAR_HEIGHT }}
-      trackStyle={() => ({
-        backgroundColor: "transparent",
-        "--ms-track-size": "6px"
-      })}
-      thumbStyle={() => ({ height: 3 })}
-      onWheel={(e) => {
-        const scrollcontainer = document.querySelector(".tabsScroll");
-        if (!scrollcontainer) return;
-        if (e.deltaY > 0) scrollcontainer.scrollLeft += 100;
-        else if (e.deltaY < 0) scrollcontainer.scrollLeft -= 100;
-      }}
-    >
+    <Flex sx={{ flex: 1 }}>
       <Flex
         sx={{
-          flex: 1,
-          height: "100%"
+          px: 1,
+          borderRight: "1px solid var(--border)",
+          alignItems: "center",
+          flexShrink: 0
         }}
-        onDoubleClick={async (e) => {
-          e.stopPropagation();
-          useEditorStore.getState().newSession();
-        }}
-        data-test-id="tabs"
+        onDoubleClick={(e) => e.stopPropagation()}
       >
-        <ReorderableList
-          items={sessions}
-          moveItem={(from, to) => {
-            if (from === to) return;
-            const sessions = useEditorStore.getState().sessions.slice();
-            const isToPinned = sessions[to].pinned;
-            const [fromTab] = sessions.splice(from, 1);
-
-            // if the tab where this tab is being dropped is pinned,
-            // let's pin our tab too.
-            if (isToPinned) {
-              fromTab.pinned = true;
-              fromTab.preview = false;
-            }
-            // unpin the tab if it is moved.
-            else if (fromTab.pinned) fromTab.pinned = false;
-
-            sessions.splice(to, 0, fromTab);
-            useEditorStore.setState({ sessions });
+        <Button
+          disabled={!canGoBack}
+          onClick={() => useEditorStore.getState().goBack()}
+          variant="secondary"
+          sx={{ p: 1, bg: "transparent" }}
+          data-test-id="go-back"
+        >
+          <ArrowLeft size={16} />
+        </Button>
+        <Button
+          disabled={!canGoForward}
+          onClick={() => useEditorStore.getState().goForward()}
+          variant="secondary"
+          sx={{ p: 1, bg: "transparent" }}
+          data-test-id="go-forward"
+        >
+          <ArrowRight size={16} />
+        </Button>
+      </Flex>
+      <ScrollContainer
+        className="tabsScroll"
+        suppressScrollY
+        style={{ flex: 1, height: TITLE_BAR_HEIGHT }}
+        trackStyle={() => ({
+          backgroundColor: "transparent",
+          "--ms-track-size": "6px"
+        })}
+        thumbStyle={() => ({ height: 3 })}
+        onWheel={(e) => {
+          const scrollcontainer = document.querySelector(".tabsScroll");
+          if (!scrollcontainer) return;
+          if (e.deltaY > 0) scrollcontainer.scrollLeft += 100;
+          else if (e.deltaY < 0) scrollcontainer.scrollLeft -= 100;
+        }}
+      >
+        <Flex
+          sx={{
+            flex: 1,
+            height: "100%"
           }}
-          renderItem={({ item: session, index: i }) => {
-            const isUnsaved =
-              session.type === "default" &&
-              session.saveState === SaveState.NotSaved;
-            return (
-              <Tab
-                id={session.id}
-                key={session.id}
-                title={
-                  session.title ||
-                  ("note" in session ? session.note.title : "Untitled")
-                }
-                isUnsaved={isUnsaved}
-                isTemporary={!!session.preview}
-                isActive={session.id === activeSessionId}
-                isPinned={!!session.pinned}
-                isLocked={isLockedSession(session)}
-                type={session.type}
-                onKeepOpen={() =>
-                  useEditorStore
-                    .getState()
-                    .updateSession(
-                      session.id,
-                      [session.type],
-                      (s) => (s.preview = false)
-                    )
-                }
-                onFocus={() => {
-                  if (session.id !== activeSessionId) {
-                    useEditorStore.getState().openSession(session.id);
+          onDoubleClick={async (e) => {
+            e.stopPropagation();
+            useEditorStore.getState().addTab();
+          }}
+          data-test-id="tabs"
+        >
+          <ReorderableList
+            items={tabs}
+            moveItem={(from, to) => {
+              if (from === to) return;
+              const tabs = useEditorStore.getState().tabs.slice();
+              const isToPinned = tabs[to].pinned;
+              const [fromTab] = tabs.splice(from, 1);
+
+              // if the tab where this tab is being dropped is pinned,
+              // let's pin our tab too.
+              if (isToPinned) {
+                fromTab.pinned = true;
+              }
+              // unpin the tab if it is moved.
+              else if (fromTab.pinned) fromTab.pinned = false;
+
+              tabs.splice(to, 0, fromTab);
+              useEditorStore.setState({ tabs });
+            }}
+            renderItem={({ item: tab, index: i }) => {
+              const session = useEditorStore
+                .getState()
+                .getSession(tab.sessionId);
+              if (!session) return null;
+
+              const isUnsaved =
+                session.type === "default" &&
+                session.saveState === SaveState.NotSaved;
+
+              return (
+                <Tab
+                  id={tab.id}
+                  key={tab.sessionId}
+                  title={
+                    session.title ||
+                    ("note" in session
+                      ? session.note.title
+                      : strings.untitled())
                   }
-                }}
-                onClose={() =>
-                  useEditorStore.getState().closeSessions(session.id)
-                }
-                onCloseAll={() =>
-                  useEditorStore
-                    .getState()
-                    .closeSessions(
-                      ...sessions.filter((s) => !s.pinned).map((s) => s.id)
-                    )
-                }
-                onCloseOthers={() =>
-                  useEditorStore
-                    .getState()
-                    .closeSessions(
-                      ...sessions
-                        .filter((s) => s.id !== session.id && !s.pinned)
-                        .map((s) => s.id)
-                    )
-                }
-                onCloseToTheRight={() =>
-                  useEditorStore
-                    .getState()
-                    .closeSessions(
-                      ...sessions
-                        .filter((s, index) => index > i && !s.pinned)
-                        .map((s) => s.id)
-                    )
-                }
-                onCloseToTheLeft={() =>
-                  useEditorStore
-                    .getState()
-                    .closeSessions(
-                      ...sessions
-                        .filter((s, index) => index < i && !s.pinned)
-                        .map((s) => s.id)
-                    )
-                }
-                onRevealInList={() =>
-                  AppEventManager.publish(
-                    AppEvents.revealItemInList,
-                    "note" in session ? session.note.id : session.id,
-                    true
-                  )
-                }
-                onPin={() => {
-                  useEditorStore.setState((state) => {
-                    // preview tabs can never be pinned.
-                    if (!session.pinned) state.sessions[i].preview = false;
-                    state.sessions[i].pinned = !session.pinned;
-                    state.sessions.sort((a, b) =>
+                  isUnsaved={isUnsaved}
+                  isActive={tab.id === currentTab}
+                  isPinned={!!tab.pinned}
+                  isLocked={isLockedSession(session)}
+                  type={session.type}
+                  onFocus={() => {
+                    if (tab.id !== currentTab) {
+                      useEditorStore.getState().activateSession(tab.sessionId);
+                    }
+                  }}
+                  onClose={() => useEditorStore.getState().closeTabs(tab.id)}
+                  onCloseAll={() =>
+                    useEditorStore
+                      .getState()
+                      .closeTabs(
+                        ...tabs.filter((s) => !s.pinned).map((s) => s.id)
+                      )
+                  }
+                  onCloseOthers={() =>
+                    useEditorStore
+                      .getState()
+                      .closeTabs(
+                        ...tabs
+                          .filter((s) => s.id !== tab.id && !s.pinned)
+                          .map((s) => s.id)
+                      )
+                  }
+                  onCloseToTheRight={() =>
+                    useEditorStore
+                      .getState()
+                      .closeTabs(
+                        ...tabs
+                          .filter((s, index) => index > i && !s.pinned)
+                          .map((s) => s.id)
+                      )
+                  }
+                  onCloseToTheLeft={() =>
+                    useEditorStore
+                      .getState()
+                      .closeTabs(
+                        ...tabs
+                          .filter((s, index) => index < i && !s.pinned)
+                          .map((s) => s.id)
+                      )
+                  }
+                  onRevealInList={
+                    "note" in session
+                      ? () =>
+                          AppEventManager.publish(
+                            AppEvents.revealItemInList,
+                            session.note.id,
+                            true
+                          )
+                      : undefined
+                  }
+                  onPin={() => {
+                    const tabs = useEditorStore.getState().tabs.slice();
+                    const index = tabs.findIndex((t) => t.id === tab.id);
+                    tabs[index].pinned = !tabs[index].pinned;
+                    tabs.sort((a, b) =>
                       a.pinned === b.pinned ? 0 : a.pinned ? -1 : 1
                     );
-                  });
-                }}
-              />
-            );
-          }}
-        />
-      </Flex>
-    </ScrollContainer>
+                    useEditorStore.setState({ tabs });
+                  }}
+                />
+              );
+            }}
+          />
+        </Flex>
+      </ScrollContainer>
+    </Flex>
   );
-}
+});
 
 type TabProps = {
   id: string;
   title: string;
   isActive: boolean;
-  isTemporary: boolean;
   isPinned: boolean;
   isLocked: boolean;
   isUnsaved: boolean;
   type: SessionType;
-  onKeepOpen: () => void;
   onFocus: () => void;
   onClose: () => void;
   onCloseOthers: () => void;
   onCloseToTheRight: () => void;
   onCloseToTheLeft: () => void;
   onCloseAll: () => void;
-  onRevealInList: () => void;
   onPin: () => void;
+  onRevealInList?: () => void;
 };
 function Tab(props: TabProps) {
   const {
     id,
     title,
     isActive,
-    isTemporary,
     isPinned,
     isLocked,
     isUnsaved,
     type,
-    onKeepOpen,
     onFocus,
     onClose,
     onCloseAll,
@@ -493,13 +494,14 @@ function Tab(props: TabProps) {
         setNodeRef(el);
         activeTabRef.current = el;
       }}
-      className="tab"
+      className={`tab${isActive || active?.id === id ? " active" : ""}`}
       data-test-id={`tab-${id}`}
       sx={{
         height: "100%",
         cursor: "pointer",
-        px: 2,
+        pl: 2,
         borderRight: "1px solid var(--border)",
+        ":last-of-type": { borderRight: 0 },
 
         transform: CSS.Transform.toString(transform),
         transition,
@@ -511,7 +513,7 @@ function Tab(props: TabProps) {
         flexShrink: 0,
         ":hover": {
           "& .closeTabButton": {
-            visibility: "visible"
+            opacity: 1
           },
           bg: isActive ? "hover-selected" : "hover"
         }
@@ -554,16 +556,10 @@ function Tab(props: TabProps) {
             type: "button",
             title: strings.revealInList(),
             key: "reveal-in-list",
-            onClick: onRevealInList
-          },
-          { type: "separator", key: "sep" },
-          {
-            type: "button",
-            key: "keep-open",
-            title: strings.keepOpen(),
-            onClick: onKeepOpen,
-            isDisabled: !isTemporary
+            onClick: onRevealInList,
+            isHidden: !onRevealInList
           },
+          { type: "separator", key: "sep2" },
           {
             type: "button",
             key: "pin",
@@ -574,37 +570,29 @@ function Tab(props: TabProps) {
           }
         ]);
       }}
-      onDoubleClick={(e) => {
-        e.stopPropagation();
-        if (isTemporary) onKeepOpen();
-      }}
       onAuxClick={(e) => {
         if (e.button == 1) onClose();
       }}
+      onClick={() => onFocus()}
       {...listeners}
       {...attributes}
     >
-      <Flex
-        mr={1}
-        onMouseUp={(e) => {
-          if (e.button == 0) onFocus();
-        }}
-      >
+      <Flex>
         <Icon
           data-test-id={`tab-icon${isUnsaved ? "-unsaved" : ""}`}
-          size={16}
+          size={14}
           color={
             isUnsaved ? "accent-error" : isActive ? "accent-selected" : "icon"
           }
         />
         <Text
+          data-test-id="tab-title"
           variant="body"
           sx={{
             whiteSpace: "nowrap",
             textOverflow: "ellipsis",
             overflowX: "hidden",
             pointerEvents: "none",
-            fontStyle: isTemporary ? "italic" : "normal",
             maxWidth: 120,
             color: isActive ? "paragraph-selected" : "paragraph"
           }}
@@ -616,34 +604,33 @@ function Tab(props: TabProps) {
       {isPinned ? (
         <Pin
           sx={{
-            ":hover": { bg: "border" },
             borderRadius: "default",
-            flexShrink: 0
-          }}
-          size={14}
-          onMouseUp={(e) => {
-            if (e.button == 0) {
-              e.stopPropagation();
-              onPin();
+            flexShrink: 0,
+            ml: "small",
+            mr: 1,
+            "&:hover": {
+              bg: "hover-secondary"
             }
           }}
+          size={14}
+          onClick={onPin}
         />
       ) : (
         <Cross
           sx={{
-            visibility: isActive && active?.id !== id ? "visible" : "hidden",
-            ":hover": { bg: "border" },
             borderRadius: "default",
-            flexShrink: 0
-          }}
-          onMouseUp={(e) => {
-            if (e.button == 0) {
-              onClose();
+            flexShrink: 0,
+            opacity: isActive || active?.id === id ? 1 : 0,
+            ml: "small",
+            mr: 1,
+            "&:hover": {
+              bg: "hover-secondary"
             }
           }}
+          onClick={onClose}
           className="closeTabButton"
           data-test-id={"tab-close-button"}
-          size={16}
+          size={14}
         />
       )}
     </Flex>
@@ -652,7 +639,7 @@ function Tab(props: TabProps) {
 
 type ReorderableListProps<T> = {
   items: T[];
-  renderItem: (props: { item: T; index: number }) => JSX.Element;
+  renderItem: (props: { item: T; index: number }) => JSX.Element | null;
   moveItem: (from: number, to: number) => void;
 };
 
@@ -714,12 +701,3 @@ function ReorderableList<T extends { id: string }>(
     </DndContext>
   );
 }
-
-function enterFullscreen(elem: HTMLElement) {
-  elem.requestFullscreen();
-}
-
-function exitFullscreen() {
-  if (!document.fullscreenElement) return;
-  document.exitFullscreen();
-}

apps/web/src/components/editor/footer.tsx

@@ -19,12 +19,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { Button, Flex, Text } from "@theme-ui/components";
 import { SaveState, useEditorStore } from "../../stores/editor-store";
-import { Loading, Saved, NotSaved } from "../icons";
-import { useEditorConfig, useNoteStatistics } from "./manager";
+import { useStore as useAppStore } from "../../stores/app-store";
+import {
+  Loading,
+  Saved,
+  NotSaved,
+  FocusMode,
+  Plus,
+  Minus,
+  EditorNormalWidth,
+  TableOfContents,
+  ExitFullscreen,
+  Fullscreen,
+  EditorFullWidth,
+  NormalMode
+} from "../icons";
+import {
+  useEditorConfig,
+  useNoteStatistics,
+  useEditorManager
+} from "./manager";
 import { getFormattedDate } from "@notesnook/common";
 import { MAX_AUTO_SAVEABLE_WORDS } from "./types";
 import { strings } from "@notesnook/intl";
 import { EDITOR_ZOOM } from "./common";
+import { useWindowControls } from "../../hooks/use-window-controls";
 
 const SAVE_STATE_ICON_MAP = {
   "-1": NotSaved,
@@ -33,15 +52,59 @@ const SAVE_STATE_ICON_MAP = {
 };
 
 function EditorFooter() {
+  const { isFullscreen } = useWindowControls();
   const { words } = useNoteStatistics();
   const session = useEditorStore((store) => store.getActiveSession());
   const { editorConfig, setEditorConfig } = useEditorConfig();
+  const editorMargins = useEditorStore((store) => store.editorMargins);
+  const isFocusMode = useAppStore((store) => store.isFocusMode);
+
   if (!session) return null;
 
   const saveState =
     session.type === "default" ? session.saveState : SaveState.NotSaved;
   const dateEdited = "note" in session ? session.note.dateEdited : 0;
   const SaveStateIcon = SAVE_STATE_ICON_MAP[saveState];
+  const tools = [
+    {
+      title: editorMargins
+        ? strings.disableEditorMargins()
+        : strings.enableEditorMargins(),
+      icon: editorMargins ? EditorNormalWidth : EditorFullWidth,
+      enabled: true,
+      hideOnMobile: true,
+      onClick: () => useEditorStore.getState().toggleEditorMargins()
+    },
+    {
+      title: isFullscreen
+        ? strings.exitFullScreen()
+        : strings.enterFullScreen(),
+      icon: isFullscreen ? ExitFullscreen : Fullscreen,
+      enabled: true,
+      hidden: !isFocusMode,
+      hideOnMobile: true,
+      onClick: () => {
+        if (isFullscreen) {
+          exitFullscreen();
+        } else {
+          enterFullscreen(document.documentElement);
+        }
+      }
+    },
+    {
+      title: isFocusMode ? strings.normalMode() : strings.focusMode(),
+      icon: isFocusMode ? FocusMode : NormalMode,
+      enabled: true,
+      hideOnMobile: true,
+      onClick: () => {
+        useAppStore.getState().toggleFocusMode();
+        if (document.fullscreenElement) exitFullscreen();
+        const editor =
+          session && useEditorManager.getState().getEditor(session.id);
+        if (editor) editor.editor?.focus();
+      }
+    }
+  ];
 
   return (
     <Flex sx={{ alignItems: "center", justifyContent: "center", gap: 2 }}>
@@ -49,9 +112,28 @@ function EditorFooter() {
         sx={{
           alignItems: "center",
           justifyContent: "center",
-          flex: 1
+          flex: 1,
+          height: "100%"
         }}
       >
+        {tools.map((tool) => (
+          <Button
+            data-test-id={tool.title}
+            disabled={!tool.enabled}
+            title={tool.title}
+            key={tool.title}
+            onClick={tool.onClick}
+            sx={{
+              py: 0,
+              px: 1,
+              height: "100%",
+              display: tool.hidden ? "none" : "block"
+            }}
+            variant="icon"
+          >
+            <tool.icon size={13} />
+          </Button>
+        ))}
         <Button
           variant="icon"
           onClick={() =>
@@ -63,15 +145,11 @@ function EditorFooter() {
             })
           }
           disabled={editorConfig.zoom <= EDITOR_ZOOM.MIN}
-          sx={{ py: 0, height: "100%" }}
+          sx={{ py: 0, px: 1, height: "100%" }}
         >
-          <b>-</b>
+          <Minus size={13} />
         </Button>
-        <Text
-          className="selectable"
-          variant="subBody"
-          sx={{ color: "paragraph" }}
-        >
+        <Text variant="subBody" sx={{ color: "paragraph" }}>
           {editorConfig.zoom}%
         </Text>
         <Button
@@ -85,9 +163,9 @@ function EditorFooter() {
             })
           }
           disabled={editorConfig.zoom >= EDITOR_ZOOM.MAX}
-          sx={{ py: 0, height: "100%" }}
+          sx={{ py: 0, px: 1, height: "100%" }}
         >
-          <b>+</b>
+          <Plus size={13} />
         </Button>
       </Flex>
       {words.total > MAX_AUTO_SAVEABLE_WORDS ? (
@@ -142,3 +220,12 @@ function EditorFooter() {
   );
 }
 export default EditorFooter;
+
+function enterFullscreen(elem: HTMLElement) {
+  elem.requestFullscreen();
+}
+
+function exitFullscreen() {
+  if (!document.fullscreenElement) return;
+  document.exitFullscreen();
+}

apps/web/src/components/editor/index.tsx

@@ -76,7 +76,7 @@ import { TITLE_BAR_HEIGHT } from "../title-bar";
 
 const PDFPreview = React.lazy(() => import("../pdf-preview"));
 
-const autoSaveToast = { show: true, hide: () => { } };
+const autoSaveToast = { show: true, hide: () => {} };
 
 async function saveContent(
   noteId: string,
@@ -116,40 +116,15 @@ async function saveContent(
 const deferredSave = debounceWithId(saveContent, 100);
 
 export default function TabsView() {
-  const sessions = useEditorStore((store) => store.sessions);
+  const tabs = useEditorStore((store) => store.tabs);
   const documentPreview = useEditorStore((store) => store.documentPreview);
-  const activeSessionId = useEditorStore((store) => store.activeSessionId);
+  const activeTab = useEditorStore((store) => store.getActiveTab());
   const arePropertiesVisible = useEditorStore(
     (store) => store.arePropertiesVisible
   );
   const isTOCVisible = useEditorStore((store) => store.isTOCVisible);
   const [dropRef, overlayRef] = useDragOverlay();
 
-  useEffect(() => {
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (
-        (event.ctrlKey || event.metaKey) &&
-        event.altKey &&
-        event.key === "ArrowRight"
-      ) {
-        event.preventDefault();
-        useEditorStore.getState().openNextSession();
-      }
-      if (
-        (event.ctrlKey || event.metaKey) &&
-        event.altKey &&
-        event.key === "ArrowLeft"
-      ) {
-        event.preventDefault();
-        useEditorStore.getState().openPreviousSession();
-      }
-    };
-    document.body.addEventListener("keydown", onKeyDown);
-    return () => {
-      document.body.removeEventListener("keydown", onKeyDown);
-    };
-  }, []);
-
   return (
     <>
       <Flex
@@ -176,17 +151,24 @@ export default function TabsView() {
       >
         <SplitPane direction="vertical" autoSaveId={"editor-panels"}>
           <Pane id="editor-panel" className="editor-pane">
-            {sessions.map((session) => (
-              <Freeze key={session.id} freeze={session.id !== activeSessionId}>
-                {session.type === "locked" ? (
-                  <UnlockNoteView session={session} />
-                ) : session.type === "conflicted" || session.type === "diff" ? (
-                  <DiffViewer session={session} />
-                ) : (
-                  <MemoizedEditorView session={session} />
-                )}
-              </Freeze>
-            ))}
+            {tabs.map((tab) => {
+              const session = useEditorStore
+                .getState()
+                .getSession(tab.sessionId);
+              if (!session) return null;
+              return (
+                <Freeze key={session.id} freeze={tab.id !== activeTab?.id}>
+                  {session.type === "locked" ? (
+                    <UnlockNoteView session={session} />
+                  ) : session.type === "conflicted" ||
+                    session.type === "diff" ? (
+                    <DiffViewer session={session} />
+                  ) : (
+                    <MemoizedEditorView session={session} />
+                  )}
+                </Freeze>
+              );
+            })}
           </Pane>
 
           {documentPreview ? (
@@ -226,15 +208,15 @@ export default function TabsView() {
             </Pane>
           ) : null}
 
-          {isTOCVisible && activeSessionId ? (
+          {isTOCVisible && activeTab ? (
             <Pane id="table-of-contents-pane" initialSize={300} minSize={300}>
-              <TableOfContents sessionId={activeSessionId} />
+              <TableOfContents sessionId={activeTab.sessionId} />
             </Pane>
           ) : null}
         </SplitPane>
         <DropZone overlayRef={overlayRef} />
-        {arePropertiesVisible && activeSessionId && (
-          <Properties sessionId={activeSessionId} />
+        {arePropertiesVisible && activeTab && (
+          <Properties sessionId={activeTab.sessionId} />
         )}
       </ScopedThemeProvider>
     </>
@@ -252,10 +234,10 @@ function EditorView({
   session
 }: {
   session:
-  | DefaultEditorSession
-  | NewEditorSession
-  | ReadonlyEditorSession
-  | DeletedEditorSession;
+    | DefaultEditorSession
+    | NewEditorSession
+    | ReadonlyEditorSession
+    | DeletedEditorSession;
 }) {
   const lastChangedTime = useRef<number>(0);
   const root = useRef<HTMLDivElement>(null);
@@ -294,6 +276,7 @@ function EditorView({
           editor.updateContent(result.data);
         } else if (isNote && session.note.title !== item.title) {
           AppEventManager.publish(AppEvents.changeNoteTitle, {
+            sessionId: session.id,
             title: item.title,
             preventSave: true
           });
@@ -319,7 +302,7 @@ function EditorView({
     if (!session.needsHydration && session.content) {
       editor?.updateContent(session.content.data);
     }
-  }, [editor, session.needsHydration]);
+  }, [editor, session]);
 
   return (
     <Flex
@@ -347,19 +330,39 @@ function EditorView({
         onSave={(content, ignoreEdit) => {
           const currentSession = useEditorStore
             .getState()
-            .getSession(session.id, ["default", "readonly", "new"]);
-          if (!currentSession) return;
+            .getSession(session.id);
+          const noteId =
+            currentSession && "note" in currentSession
+              ? currentSession.note.id
+              : null;
+          const sessions = noteId
+            ? useEditorStore.getState().getSessionsForNote(noteId)
+            : [currentSession];
 
+          const currentSessionId = session.id;
           const data = content();
-          if (!currentSession.content)
-            currentSession.content = { type: "tiptap", data };
-          else currentSession.content.data = data;
+          for (const session of sessions) {
+            if (
+              session?.type !== "default" &&
+              session?.type !== "readonly" &&
+              session?.type !== "new"
+            )
+              continue;
+            if (!session.content) session.content = { type: "tiptap", data };
+            else session.content.data = data;
+
+            // update content in other tabs
+            if (session.id !== currentSessionId) {
+              const editor = useEditorManager.getState().getEditor(session.id);
+              editor?.editor?.updateContent(data);
+            }
+          }
 
           logger.debug("scheduling save", {
             id: session.id,
             length: data.length
           });
-          deferredSave(currentSession.id, currentSession.id, ignoreEdit, data);
+          deferredSave(session.id, session.id, ignoreEdit, data);
         }}
         options={{
           readonly: session?.type === "readonly" || session?.type === "deleted",
@@ -414,9 +417,9 @@ function DownloadAttachmentProgress(props: DownloadAttachmentProgressProps) {
         variant="secondary"
         mt={2}
         onClick={() => {
-          const id = useEditorStore.getState().activeSessionId;
+          const note = useEditorStore.getState().getActiveNote();
           useEditorStore.setState({ documentPreview: undefined });
-          if (id) db.fs().cancel(id).catch(console.error);
+          if (note) db.fs().cancel(note.id).catch(console.error);
         }}
       >
         {strings.cancel()}
@@ -493,6 +496,14 @@ export function Editor(props: EditorProps) {
     return () => unsub();
   }, []);
 
+  useEffect(() => {
+    return () => {
+      const editor = useEditorManager.getState().getEditor(id)?.editor;
+      const selection = editor?.getSelection();
+      if (selection) Config.set(`${id}:selection`, selection);
+    };
+  }, [id]);
+
   return (
     <EditorChrome {...props}>
       <Tiptap
@@ -884,7 +895,7 @@ function UnlockNoteView(props: UnlockNoteViewProps) {
         subtitle={strings.enterPasswordToUnlockNote()}
         title={session.note.title}
         unlock={async (password) => {
-          const note = await db.vault.open(session.id, password);
+          const note = await db.vault.open(session.note.id, password);
           if (!note || !note.content)
             throw new Error("note with this id does not exist.");
 
@@ -897,8 +908,7 @@ function UnlockNoteView(props: UnlockNoteViewProps) {
             saveState: SaveState.Saved,
             sessionId: `${Date.now()}`,
             tags,
-            pinned: session.pinned,
-            preview: session.preview,
+            tabId: session.tabId,
             content: note.content
           });
         }}

apps/web/src/components/editor/tiptap.tsx

@@ -604,7 +604,11 @@ function toIEditor(editor: Editor): IEditor {
       ),
     startSearch: () => editor.commands.startSearch(),
     getContent: () =>
-      getHTMLFromFragment(editor.state.doc.content, editor.schema)
+      getHTMLFromFragment(editor.state.doc.content, editor.schema),
+    getSelection: () => {
+      const { from, to } = editor.state.selection;
+      return { from, to };
+    }
   };
 }
 

apps/web/src/components/editor/title-box.tsx

@@ -17,7 +17,14 @@ 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 React, { useCallback, useEffect, useMemo, useRef } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState
+} from "react";
 import { Input } from "@theme-ui/components";
 import { useEditorStore } from "../../stores/editor-store";
 import { debounceWithId } from "@notesnook/common";
@@ -40,7 +47,7 @@ function TitleBox(props: TitleBoxProps) {
   const inputRef = useRef<HTMLInputElement>(null);
   const pendingChanges = useRef(false);
   // const id = useStore((store) => store.session.id);
-  const sessionType = useEditorStore((store) => store.getActiveSession()?.type);
+  const sessionType = useEditorStore((store) => store.getSession(id)?.type);
   const isMobile = useMobile();
   const isTablet = useTablet();
   const { editorConfig } = useEditorConfig();
@@ -64,13 +71,15 @@ function TitleBox(props: TitleBoxProps) {
     [isMobile, isTablet]
   );
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const session = useEditorStore.getState().getSession(id);
     if (!session || !("note" in session) || !session.note || !inputRef.current)
       return;
     if (pendingChanges.current) return;
 
     const { title } = session.note;
+    if (inputRef.current.value === title) return;
+
     withSelectionPersist(
       inputRef.current,
       (input) => (input.value = title || "")
@@ -86,23 +95,24 @@ function TitleBox(props: TitleBoxProps) {
   useEffect(() => {
     const { unsubscribe } = AppEventManager.subscribe(
       AppEvents.changeNoteTitle,
-      ({ preventSave, title }: { title: string; preventSave: boolean }) => {
-        if (!inputRef.current) return;
+      ({
+        preventSave,
+        title,
+        sessionId
+      }: {
+        title: string;
+        preventSave: boolean;
+        sessionId: string;
+      }) => {
+        if (!inputRef.current || sessionId !== id) return;
         withSelectionPersist(
           inputRef.current,
           (input) => (input.value = title)
         );
         updateFontSize(title.length);
         if (!preventSave) {
-          const { activeSessionId } = useEditorStore.getState();
-          if (!activeSessionId) return;
           pendingChanges.current = true;
-          debouncedOnTitleChange(
-            activeSessionId,
-            activeSessionId,
-            title,
-            pendingChanges
-          );
+          debouncedOnTitleChange(sessionId, sessionId, title, pendingChanges);
         }
       }
     );
@@ -110,7 +120,7 @@ function TitleBox(props: TitleBoxProps) {
     return () => {
       unsubscribe();
     };
-  }, [updateFontSize]);
+  }, [updateFontSize, id]);
 
   return (
     <Input

apps/web/src/components/editor/types.ts

@@ -40,4 +40,5 @@ export interface IEditor {
   sendAttachmentProgress: (hash: string, progress: number) => void;
   startSearch: () => void;
   getContent: () => string;
+  getSelection: () => { from: number; to: number };
 }

apps/web/src/components/icons/index.tsx

@@ -219,7 +219,8 @@ import {
   mdiOpenInNew,
   mdiTagOutline,
   mdiChatQuestionOutline,
-  mdiNoteRemoveOutline
+  mdiNoteRemoveOutline,
+  mdiTabPlus
 } from "@mdi/js";
 import { useTheme } from "@emotion/react";
 import { Theme } from "@notesnook/theme";
@@ -273,7 +274,8 @@ const MDIIconWrapper = memo(
   (prev, next) =>
     prev.rotate === next.rotate &&
     prev.color === next.color &&
-    prev.title === next.title
+    prev.title === next.title &&
+    prev.size === next.size
 );
 
 export type IconProps = FlexProps & Omit<MDIIconWrapperProps, "path">;
@@ -560,3 +562,4 @@ export const ClearCache = createIcon(mdiBroom);
 export const OpenInNew = createIcon(mdiOpenInNew);
 export const Coupon = createIcon(mdiTagOutline);
 export const Support = createIcon(mdiChatQuestionOutline);
+export const NewTab = createIcon(mdiTabPlus);

apps/web/src/components/note/index.tsx

@@ -118,7 +118,7 @@ function Note(props: NoteProps) {
   } = props;
   const note = item;
 
-  const isOpened = useEditorStore((store) => store.activeSessionId === item.id);
+  const isOpened = useEditorStore((store) => store.isNoteOpen(item.id));
   const primary: SchemeColors = color ? color.colorCode : "accent-selected";
 
   return (
@@ -146,7 +146,7 @@ function Note(props: NoteProps) {
       menuItems={menuItems}
       onClick={() => useEditorStore.getState().openSession(note)}
       onMiddleClick={() =>
-        useEditorStore.getState().openSession(note, { newSession: true })
+        useEditorStore.getState().openSession(note, { openInNewTab: true })
       }
       header={
         <Flex
@@ -331,6 +331,14 @@ const menuItems: (
   // const isSynced = db.notes.note(note.id)?.synced();
 
   return [
+    {
+      type: "button",
+      key: "openinnewtab",
+      title: strings.openInNewTab(),
+      icon: OpenInNew.path,
+      onClick: () =>
+        useEditorStore.getState().openSession(note.id, { openInNewTab: true })
+    },
     {
       type: "button",
       key: "pin",

apps/web/src/components/route-container/index.tsx

@@ -140,7 +140,7 @@ function Header(props: RouteContainerProps) {
         {buttons?.back ? (
           <Button
             {...buttons.back}
-            data-test-id="go-back"
+            data-test-id="route-go-back"
             sx={{ p: 0, flexShrink: 0 }}
           >
             <ArrowLeft size={20} />

apps/web/src/components/split-pane/index.tsx

@@ -96,14 +96,15 @@ export const SplitPane = React.forwardRef<
   const wrapSize = useRef(0);
   const childrenLength = childrenToArray(children).length;
   const autoSaveKey = autoSaveId ? `csp:${autoSaveId}` : undefined;
+  const lastCollapsedPaneSize = useRef(0);
 
   const { sizeName, splitPos, splitAxis } = useMemo(
     () =>
-    ({
-      sizeName: direction === "vertical" ? "width" : "height",
-      splitPos: direction === "vertical" ? "left" : "top",
-      splitAxis: direction === "vertical" ? "x" : "y"
-    } as const),
+      ({
+        sizeName: direction === "vertical" ? "width" : "height",
+        splitPos: direction === "vertical" ? "left" : "top",
+        splitAxis: direction === "vertical" ? "x" : "y"
+      } as const),
     [direction]
   );
 
@@ -256,10 +257,14 @@ export const SplitPane = React.forwardRef<
       return {
         collapse: (index: number) => {
           paneSizes.current[index].collapsed = true;
+          lastCollapsedPaneSize.current = paneSizes.current[index].size;
           setSizes(paneSizes.current, wrapSize.current);
         },
         expand: (index: number) => {
           paneSizes.current[index].collapsed = false;
+          paneSizes.current[index].size = lastCollapsedPaneSize.current
+            ? lastCollapsedPaneSize.current
+            : paneSizes.current[index].initialSize;
           setSizes(paneSizes.current, wrapSize.current);
         }
       };

apps/web/src/components/trash-item/index.tsx

@@ -34,7 +34,7 @@ import { strings } from "@notesnook/intl";
 type TrashItemProps = { item: TrashItemType; date: number };
 function TrashItem(props: TrashItemProps) {
   const { item, date } = props;
-  const isOpened = useEditorStore((store) => store.activeSessionId === item.id);
+  const isOpened = useEditorStore((store) => store.isNoteOpen(item.id));
 
   return (
     <ListItem

apps/web/src/dialogs/feature-dialog.tsx

@@ -93,14 +93,9 @@ const features: Record<FeatureKeys, Feature> = {
         ]
       : [
           {
-            title: "Notesnook Gift Cards",
+            title: "Better tabs",
             subtitle:
-              "You can now gift Notesnook Pro to your friends and family. Gift cards are available in 1, 3, and 5-year plans at https://notesnook.com/giftcards."
-          },
-          {
-            title: "Sorted search results",
-            subtitle:
-              "Search results are now sorted by date created by default."
+              "Tabs have been overhauled to be more predictable and easier to use. Give it a try! We are sure you'll love it."
           }
         ],
     cta: {

apps/web/src/stores/editor-store.ts

@@ -39,11 +39,14 @@ import {
   isTrashItem,
   NoteContent
 } from "@notesnook/core";
-import { Context } from "../components/list-container/types";
 import { showToast } from "../utils/toast";
 import { getId } from "@notesnook/core";
 import { PersistStorage } from "zustand/middleware";
-import { getFormattedHistorySessionDate } from "@notesnook/common";
+import {
+  getFormattedHistorySessionDate,
+  TabHistory,
+  TabSessionHistory
+} from "@notesnook/common";
 import { isCipher } from "@notesnook/core";
 import { hashNavigate } from "../navigation";
 import { AppEventManager, AppEvents } from "../common/app-events";
@@ -64,15 +67,17 @@ enum SESSION_STATES {
   conflicted
 }
 
-// type ConflictedContentItem = Omit<ContentItem, "conflicted"> & {
-//   conflicted: ContentItem;
-// };
+type TabItem = {
+  id: string;
+  sessionId: string;
+  pinned?: boolean;
+};
 
 export type BaseEditorSession = {
+  tabId: string;
+
   id: string;
   needsHydration?: boolean;
-  pinned?: boolean;
-  preview?: boolean;
   title?: string;
 
   /**
@@ -115,22 +120,29 @@ export type DefaultEditorSession = BaseEditorSession & {
 
 export type NewEditorSession = BaseEditorSession & {
   type: "new";
-  context?: Context;
   saveState: SaveState;
   content?: NoteContent<false>;
 };
 
 export type ConflictedEditorSession = BaseEditorSession & {
-  type: "conflicted" | "diff";
+  type: "conflicted";
   note: Note;
   content?: ContentItem;
 };
 
+export type DiffEditorSession = BaseEditorSession & {
+  type: "diff";
+  note: Note;
+  content: ContentItem;
+  historySessionId: string;
+};
+
 export type EditorSession =
   | DefaultEditorSession
   | LockedEditorSession
   | NewEditorSession
   | ConflictedEditorSession
+  | DiffEditorSession
   | ReadonlyEditorSession
   | DeletedEditorSession;
 
@@ -140,7 +152,7 @@ type SessionTypeMap = {
   locked: LockedEditorSession;
   new: NewEditorSession;
   conflicted: ConflictedEditorSession;
-  diff: ConflictedEditorSession;
+  diff: DiffEditorSession;
   readonly: ReadonlyEditorSession;
   deleted: DeletedEditorSession;
 };
@@ -160,10 +172,33 @@ export function isLockedSession(session: EditorSession): boolean {
       session.content.locked)
   );
 }
+
+const tabSessionHistory = new TabSessionHistory({
+  get() {
+    return {
+      tabSessionHistory: useEditorStore.getState().tabHistory,
+      canGoBack: useEditorStore.getState().canGoBack,
+      canGoForward: useEditorStore.getState().canGoForward
+    };
+  },
+  set(state) {
+    useEditorStore.setState({
+      tabHistory: state.tabSessionHistory,
+      canGoBack: state.canGoBack,
+      canGoForward: state.canGoForward
+    });
+  }
+});
+
 const saveMutex = new Mutex();
+
 class EditorStore extends BaseStore<EditorStore> {
+  tabs: TabItem[] = [];
+  tabHistory: TabHistory = {};
+  activeTabId: string | undefined;
+  canGoBack = false;
+  canGoForward = false;
   sessions: EditorSession[] = [];
-  activeSessionId?: string;
 
   arePropertiesVisible = false;
   documentPreview?: DocumentPreview;
@@ -178,18 +213,25 @@ class EditorStore extends BaseStore<EditorStore> {
     );
   };
 
-  getActiveSession = <T extends SessionType[]>(types?: T) => {
-    const { activeSessionId, sessions } = this.get();
-    return sessions.find(
-      (s): s is SessionTypeMap[T[number]] =>
-        s.id === activeSessionId && (!types || types.includes(s.type))
+  getSessionsForNote = (noteId: string) => {
+    return this.get().sessions.filter(
+      (s) => "note" in s && s.note.id === noteId
+    );
+  };
+
+  getTabsForNote = (noteId: string) => {
+    const { tabs, sessions } = this.get();
+    return tabs.filter((t) =>
+      sessions.some(
+        (s) => t.sessionId === s.id && "note" in s && s.note.id === noteId
+      )
     );
   };
 
   init = () => {
     EV.subscribe(EVENTS.userLoggedOut, () => {
-      const { closeSessions, sessions } = this.get();
-      closeSessions(...sessions.map((s) => s.id));
+      const { closeTabs, tabs } = this.get();
+      closeTabs(...tabs.map((s) => s.id));
     });
 
     EV.subscribe(EVENTS.vaultLocked, () => {
@@ -199,8 +241,7 @@ class EditorStore extends BaseStore<EditorStore> {
             if (
               session.type === "diff" ||
               session.type === "deleted" ||
-              // TODO: what's this?
-              !("note" in session)
+              session.type === "new"
             )
               return session;
 
@@ -208,8 +249,7 @@ class EditorStore extends BaseStore<EditorStore> {
               type: "locked",
               id: session.id,
               note: session.note,
-              pinned: session.pinned,
-              preview: session.preview
+              tabId: session.tabId
             };
           }
           return session;
@@ -221,8 +261,7 @@ class EditorStore extends BaseStore<EditorStore> {
       EVENTS.syncItemMerged,
       (item?: MaybeDeletedItem<Item>) => {
         if (!item) return;
-        const { sessions, closeSessions, updateSession, openSession } =
-          this.get();
+        const { sessions, closeTabs, updateSession, openSession } = this.get();
         const clearIds: string[] = [];
         for (const session of sessions) {
           if (session.type === "new") continue;
@@ -233,9 +272,9 @@ class EditorStore extends BaseStore<EditorStore> {
             : item.type === "tiptap"
             ? item.noteId
             : null;
-          if (noteId && session.id !== noteId && session.note.id !== noteId)
-            continue;
-          if (isDeleted(item) || isTrashItem(item)) clearIds.push(session.id);
+          if (noteId && session.note.id !== noteId) continue;
+          if (isDeleted(item) || isTrashItem(item))
+            clearIds.push(session.tabId);
           // if a note becomes conflicted, reopen the session
           else if (
             session.type !== "conflicted" &&
@@ -287,33 +326,31 @@ class EditorStore extends BaseStore<EditorStore> {
             );
           }
         }
-        if (clearIds.length > 0) closeSessions(...clearIds);
+        if (clearIds.length > 0) closeTabs(...clearIds);
       }
     );
 
     db.eventManager.subscribe(
       EVENTS.databaseUpdated,
       async (event: DatabaseUpdatedEvent) => {
-        const { sessions, openSession, closeSessions, updateSession } =
-          this.get();
+        const { sessions, openSession, closeTabs, updateSession } = this.get();
         const clearIds: string[] = [];
         if (event.collection === "notes") {
           // when a note is permanently deleted from trash
           if (event.type === "softDelete" || event.type === "delete") {
             clearIds.push(
-              ...event.ids.filter(
-                (id) =>
-                  sessions.findIndex(
-                    (s) => s.id === id || ("note" in s && s.note.id === id)
-                  ) > -1
-              )
+              ...sessions
+                .filter(
+                  (session) =>
+                    "note" in session && event.ids.includes(session.note.id)
+                )
+                .map((s) => s.tabId)
             );
           } else if (event.type === "update") {
             for (const session of sessions) {
               if (
                 session.type === "new" ||
-                (!event.ids.includes(session.id) &&
-                  !event.ids.includes(session.note.id))
+                !event.ids.includes(session.note.id)
               )
                 continue;
 
@@ -324,13 +361,13 @@ class EditorStore extends BaseStore<EditorStore> {
                 // when a note is restored from trash
                 (session.type === "deleted" && event.item.type !== "trash")
               ) {
-                openSession(session.id, { force: true, silent: true });
+                openSession(session.note.id, { force: true, silent: true });
               } else if (
                 // when a note is moved to trash
                 session.type !== "deleted" &&
                 event.item.type === "trash"
               ) {
-                clearIds.push(session.id);
+                clearIds.push(session.tabId);
               } else {
                 updateSession(session.id, [session.type], (session) => {
                   session.note.pinned =
@@ -365,7 +402,7 @@ class EditorStore extends BaseStore<EditorStore> {
                   (session.type === "default" && session.locked)) &&
                   !event.item.locked)
               ) {
-                openSession(session.id, { force: true, silent: true });
+                openSession(session.note.id, { force: true, silent: true });
               }
             }
           }
@@ -394,7 +431,6 @@ class EditorStore extends BaseStore<EditorStore> {
                   : event.reference.ids;
               if (!("color" in session) || !session.color) continue;
               if (
-                !ids.includes(session.id) &&
                 !ids.includes(session.note.id) &&
                 !ids.includes(session.color)
               )
@@ -415,7 +451,6 @@ class EditorStore extends BaseStore<EditorStore> {
                   : event.reference.ids;
               if (!("tags" in session) || !session.tags) continue;
               if (
-                !ids.includes(session.id) &&
                 !ids.includes(session.note.id) &&
                 session.tags.every((t) => !ids.includes(t.id))
               )
@@ -444,36 +479,43 @@ class EditorStore extends BaseStore<EditorStore> {
                 session.tags?.every((t) => !event.ids.includes(t.id))
               )
                 continue;
-              console.log("UDPATE");
               updateSession(session.id, undefined, {
                 tags: await db.notes.tags(session.note.id)
               });
             }
           }
         }
-        if (clearIds.length > 0) closeSessions(...clearIds);
+        if (clearIds.length > 0) closeTabs(...clearIds);
       }
     );
 
-    const {
-      openSession,
-      openDiffSession,
-      activateSession,
-      activeSessionId,
-      getSession,
-      newSession
-    } = this.get();
-    if (activeSessionId) {
-      const session = getSession(activeSessionId);
-      if (!session) return;
-
-      if (session.type === "diff" || session.type === "conflicted")
-        openDiffSession(session.note.id, session.id);
-      else if (session.type === "new") activateSession(session.id);
-      else openSession(activeSessionId);
+    const { rehydrateSession, activeTabId, newSession } = this.get();
+    if (activeTabId) {
+      const tab = this.get().tabs.find((t) => t.id === activeTabId);
+      if (!tab) return;
+      rehydrateSession(tab.sessionId);
     } else newSession();
   };
 
+  private rehydrateSession = (sessionId: string) => {
+    const { openSession, openDiffSession, getSession, activateSession } =
+      this.get();
+
+    const session = getSession(sessionId);
+    if (session?.type === "new") {
+      activateSession(session.id);
+      return;
+    }
+    if (!session || !session.needsHydration) return;
+
+    if (session.type === "diff")
+      openDiffSession(session.note.id, session.historySessionId);
+    else
+      openSession(session.note.id, {
+        force: true
+      });
+  };
+
   updateSession = <T extends SessionType[] = SessionType[]>(
     id: string,
     types: T | undefined,
@@ -496,14 +538,13 @@ class EditorStore extends BaseStore<EditorStore> {
     });
   };
 
-  activateSession = (id?: string, activeBlockId?: string) => {
+  activateSession = (id?: string, activeBlockId?: string, silent?: boolean) => {
     if (!id) hashNavigate(`/`, { replace: true, notify: false });
 
     const session = this.get().sessions.find((s) => s.id === id);
     if (!session) id = undefined;
 
     const activeSession = this.getActiveSession();
-
     if (activeSession) {
       this.saveSessionContentIfNotSaved(activeSession.id);
     }
@@ -517,13 +558,9 @@ class EditorStore extends BaseStore<EditorStore> {
       setDocumentTitle(session.note.title);
     } else setDocumentTitle();
 
-    this.set({ activeSessionId: id });
     AppEventManager.publish(AppEvents.toggleEditor, true);
 
     if (id) {
-      const { history } = this.get();
-      if (history.includes(id)) history.splice(history.indexOf(id), 1);
-      history.push(id);
       if (session?.type === "new")
         hashNavigate(`/notes/${id}/create`, { replace: true, notify: false });
       else hashNavigate(`/notes/${id}/edit`, { replace: true, notify: false });
@@ -533,6 +570,19 @@ class EditorStore extends BaseStore<EditorStore> {
       this.updateSession(session.id, [session.type], {
         activeBlockId
       });
+
+    if (session?.tabId) {
+      const { tabs, activeTabId } = this.get();
+      const index = tabs.findIndex((t) => t.id === session.tabId);
+      // no need to focus tab if the same session is already open
+      if (
+        index === -1 ||
+        (activeTabId === session.tabId && tabs[index].sessionId === session.id)
+      )
+        return;
+      this.set((state) => (state.tabs[index].sessionId = session.id));
+      if (!silent) this.focusTab(session.tabId, session.id);
+    }
   };
 
   openDiffSession = async (noteId: string, sessionId: string) => {
@@ -545,12 +595,30 @@ class EditorStore extends BaseStore<EditorStore> {
 
     if (!oldContent || !currentContent) return;
 
+    const { getSession, addSession, sessions, activeTabId, tabs } = this.get();
+
+    const tabId = activeTabId ?? this.addTab();
+    const tab = tabs.find((t) => t.id === tabId);
+    const activeSession = tab && getSession(tab.sessionId);
+    const oldSession = sessions.find(
+      (s) =>
+        s.type === "diff" &&
+        s.historySessionId === session.id &&
+        s.tabId === tabId
+    );
+    const tabSessionId =
+      activeSession?.needsHydration || activeSession?.type === "new"
+        ? activeSession.id
+        : tabSessionHistory.add(tabId, oldSession?.id);
+
     const label = getFormattedHistorySessionDate(session);
-    this.get().addSession({
+    addSession({
       type: "diff",
-      id: session.id,
+      id: tabSessionId,
       note,
+      tabId,
       title: label,
+      historySessionId: session.id,
       content: {
         type: oldContent.type,
         dateCreated: session.dateCreated,
@@ -573,31 +641,59 @@ class EditorStore extends BaseStore<EditorStore> {
       force?: boolean;
       activeBlockId?: string;
       silent?: boolean;
-      newSession?: boolean;
+      openInNewTab?: boolean;
     } = {}
   ): Promise<void> => {
-    const { getSession, openDiffSession } = this.get();
+    const {
+      getSession,
+      sessions,
+      tabs,
+      activateSession,
+      activeTabId,
+      rehydrateSession,
+      getTabsForNote,
+      addTab
+    } = this.get();
     const noteId = typeof noteOrId === "string" ? noteOrId : noteOrId.id;
-    const session = getSession(noteId);
+    const oldTabForNote = options.force ? null : getTabsForNote(noteId).at(0);
+    const tabId = options.openInNewTab
+      ? addTab(getId())
+      : oldTabForNote?.id || activeTabId || addTab(getId());
 
-    if (session && !options.force) {
-      if (!session.needsHydration) {
-        return this.activateSession(noteId, options.activeBlockId);
-      }
-
-      if (session.type === "diff" || session.type === "conflicted") {
-        return openDiffSession(session.note.id, session.id);
-      }
+    const tab = tabs.find((t) => t.id === tabId);
+    const activeSession = tab && getSession(tab.sessionId);
+    const noteAlreadyOpened =
+      activeSession &&
+      "note" in activeSession &&
+      activeSession.note.id === noteId &&
+      // we should allow opening the same note again if a diff session of a note
+      // is opened in the same tab. This allows for cases where a user opens a diff
+      // and then wants to open the note in the same tab again.
+      activeSession.type !== "diff";
+    if (noteAlreadyOpened && !options.force) {
+      return activeSession.needsHydration
+        ? rehydrateSession(activeSession.id)
+        : activateSession(activeSession.id, options.activeBlockId);
     }
 
-    if (session && session.id) await db.fs().cancel(session.id);
+    if (activeSession && "note" in activeSession)
+      await db.fs().cancel(activeSession.note.id);
 
     const note =
-      typeof noteOrId === "object"
+      typeof noteOrId === "object" && !activeSession?.needsHydration
         ? noteOrId
         : (await db.notes.note(noteId)) || (await db.notes.trashed(noteId));
     if (!note) return;
-    const isPreview = session ? session.preview : !options?.newSession;
+
+    const oldSessionOfNote = sessions.find(
+      (s) => "note" in s && s.note.id === noteId && s.tabId === tabId
+    );
+    const sessionId =
+      activeSession?.needsHydration ||
+      activeSession?.type === "new" ||
+      noteAlreadyOpened
+        ? activeSession.id
+        : tabSessionHistory.add(tabId, oldSessionOfNote?.id);
     const isLocked = await db.vaults.itemExists(note);
 
     if (note.conflicted) {
@@ -626,25 +722,23 @@ class EditorStore extends BaseStore<EditorStore> {
         {
           type: "conflicted",
           content: content,
-          id: note.id,
-          pinned: session?.pinned,
+          id: sessionId,
           note,
-          preview: isPreview,
-          activeBlockId: options.activeBlockId
+          activeBlockId: options.activeBlockId,
+          tabId
         },
-        !options.silent
+        options.silent
       );
     } else if (isLocked && note.type !== "trash") {
       this.addSession(
         {
           type: "locked",
-          id: note.id,
-          pinned: session?.pinned,
+          id: sessionId,
           note,
-          preview: isPreview,
-          activeBlockId: options.activeBlockId
+          activeBlockId: options.activeBlockId,
+          tabId
         },
-        !options.silent
+        options.silent
       );
     } else {
       const content = note.contentId
@@ -661,12 +755,12 @@ class EditorStore extends BaseStore<EditorStore> {
           {
             type: "deleted",
             note,
-            id: note.id,
-            pinned: session?.pinned,
+            id: sessionId,
             content,
-            activeBlockId: options.activeBlockId
+            activeBlockId: options.activeBlockId,
+            tabId
           },
-          !options.silent
+          options.silent
         );
       } else {
         const attachmentsLength = await db.attachments
@@ -679,94 +773,113 @@ class EditorStore extends BaseStore<EditorStore> {
             {
               type: "readonly",
               note,
-              id: note.id,
-              pinned: session?.pinned,
+              id: sessionId,
               content,
               color: colors[0]?.fromId,
               tags,
-              activeBlockId: options.activeBlockId
+              activeBlockId: options.activeBlockId,
+              tabId
             },
-            !options.silent
+            options.silent
           );
         } else {
           this.addSession(
             {
               type: "default",
-              id: note.id,
+              id: sessionId,
               note,
               saveState: SaveState.Saved,
               sessionId: `${Date.now()}`,
               attachmentsLength,
-              pinned: session?.pinned,
               tags,
               color: colors[0]?.fromId,
               content,
-              preview: isPreview,
-              activeBlockId: options.activeBlockId
+              activeBlockId: options.activeBlockId,
+              tabId
             },
-            !options.silent
+            options.silent
           );
         }
       }
     }
   };
 
-  openNextSession = () => {
-    const { sessions, activeSessionId } = this.get();
-    if (sessions.length === 0 || sessions.length === 1) return;
+  focusNextTab = () => {
+    const { tabs, activeTabId } = this.get();
+    if (tabs.length <= 1) return;
 
-    const index = sessions.findIndex((s) => s.id === activeSessionId);
+    const index = tabs.findIndex((s) => s.id === activeTabId);
     if (index === -1) return;
-
-    if (index === sessions.length - 1) {
-      return this.openSession(sessions[0].id);
-    }
-    return this.openSession(sessions[index + 1].id);
+    return this.focusTab(tabs[index === tabs.length - 1 ? 0 : index + 1].id);
   };
 
-  openPreviousSession = () => {
-    const { sessions, activeSessionId } = this.get();
-    if (sessions.length === 0 || sessions.length === 1) return;
+  focusPreviousTab = () => {
+    const { tabs, activeTabId } = this.get();
+    if (tabs.length <= 1) return;
 
-    const index = sessions.findIndex((s) => s.id === activeSessionId);
+    const index = tabs.findIndex((s) => s.id === activeTabId);
     if (index === -1) return;
-
-    if (index === 0) {
-      return this.openSession(sessions[sessions.length - 1].id);
-    }
-    return this.openSession(sessions[index - 1].id);
+    return this.focusTab(tabs[index === 0 ? tabs.length - 1 : index - 1].id);
   };
 
-  addSession = (session: EditorSession, activate = true) => {
-    let oldSessionId: string | null = null;
+  goBack = async () => {
+    const activeTabId = this.get().activeTabId;
+    if (!activeTabId || !tabSessionHistory.canGoBack(activeTabId)) return;
+    const sessionId = tabSessionHistory.back(activeTabId);
+    if (!sessionId) return;
+    if (!(await this.goToSession(activeTabId, sessionId))) {
+      await this.goBack();
+    }
+  };
 
+  goForward = async () => {
+    const activeTabId = this.get().activeTabId;
+    if (!activeTabId || !tabSessionHistory.canGoForward(activeTabId)) return;
+    const sessionId = tabSessionHistory.forward(activeTabId);
+    if (!sessionId) return;
+    if (!(await this.goToSession(activeTabId, sessionId))) {
+      await this.goForward();
+    }
+  };
+
+  goToSession = async (tabId: string, sessionId: string) => {
+    const session = this.get().getSession(sessionId);
+    if (!session) {
+      tabSessionHistory.remove(tabId, sessionId);
+      return false;
+    }
+
+    if (session.type === "new") {
+      this.activateSession(session.id);
+      return true;
+    } else {
+      if (!(await db.notes.exists(session.note.id))) {
+        tabSessionHistory.remove(tabId, session.id);
+        this.set((state) => {
+          const index = state.sessions.findIndex((s) => s.id === session.id);
+          state.sessions.splice(index, 1);
+        });
+        return false;
+      }
+
+      // we must rehydrate the session as the note's content can be stale
+      this.updateSession(session.id, undefined, {
+        needsHydration: true
+      });
+      this.activateSession(session.id);
+      return true;
+    }
+  };
+
+  addSession = (session: EditorSession, silent = false) => {
     this.set((state) => {
-      const { activeSessionIndex, duplicateSessionIndex, previewSessionIndex } =
-        findSessionIndices(state.sessions, session, state.activeSessionId);
-
-      if (duplicateSessionIndex > -1) {
-        oldSessionId = state.sessions[duplicateSessionIndex].id;
-        state.sessions[duplicateSessionIndex] = session;
-      } else if (previewSessionIndex > -1) {
-        oldSessionId = state.sessions[previewSessionIndex].id;
-        state.sessions[previewSessionIndex] = session;
-      } else if (activeSessionIndex > -1)
-        state.sessions.splice(activeSessionIndex + 1, 0, session);
-      else state.sessions.push(session);
-      state.sessions.sort((a, b) =>
-        a.pinned === b.pinned ? 0 : a.pinned ? -1 : 1
-      );
+      const index = state.sessions.findIndex((s) => s.id === session.id);
+      if (index > -1) {
+        state.sessions[index] = session;
+      } else state.sessions.push(session);
     });
 
-    const { history } = this.get();
-    if (
-      oldSessionId &&
-      oldSessionId !== session.id &&
-      history.includes(oldSessionId)
-    )
-      history.splice(history.indexOf(oldSessionId), 1);
-
-    if (activate) this.activateSession(session.id);
+    this.activateSession(session.id, undefined, silent);
   };
 
   saveSession = async (
@@ -786,6 +899,10 @@ class EditorStore extends BaseStore<EditorStore> {
       this.setSaveState(id, 0);
       try {
         const sessionId = getSessionId(currentSession);
+        const noteId =
+          ("note" in currentSession
+            ? currentSession.note.id
+            : partial.note?.id) || id;
 
         if (isLockedSession(currentSession) && partial.content) {
           logger.debug("Saving locked content", { id });
@@ -793,7 +910,7 @@ class EditorStore extends BaseStore<EditorStore> {
           await db.vault.save({
             content: partial.content,
             sessionId,
-            id
+            id: noteId
           });
         } else {
           if (partial.content)
@@ -813,36 +930,36 @@ class EditorStore extends BaseStore<EditorStore> {
                 : undefined,
             content: partial.content,
             sessionId,
-            id
+            id: noteId
           });
         }
 
-        const note = await db.notes.note(id);
+        const note = await db.notes.note(noteId);
         if (!note) throw new Error("Note not saved.");
 
         if (currentSession.type === "new") {
-          if (currentSession.context) {
-            const { type } = currentSession.context;
+          const context = useNoteStore.getState().context;
+          if (context) {
+            const { type } = context;
             if (type === "notebook")
-              await db.notes.addToNotebook(currentSession.context.id, id);
+              await db.notes.addToNotebook(context.id, noteId);
             else if (type === "color" || type === "tag")
               await db.relations.add(
-                { type, id: currentSession.context.id },
+                { type, id: context.id },
                 { id, type: "note" }
               );
           } else {
             const defaultNotebook = db.settings.getDefaultNotebook();
             if (defaultNotebook)
-              await db.notes.addToNotebook(defaultNotebook, id);
+              await db.notes.addToNotebook(defaultNotebook, noteId);
           }
         }
 
         const attachmentsLength = await db.attachments
-          .ofNote(id, "all")
+          .ofNote(note.id, "all")
           .count();
         const shouldRefreshNotes =
           currentSession.type === "new" ||
-          !id ||
           note.title !== currentSession.note?.title ||
           note.headline !== currentSession.note?.headline ||
           attachmentsLength !== currentSession.attachmentsLength;
@@ -869,7 +986,6 @@ class EditorStore extends BaseStore<EditorStore> {
           }
 
           this.updateSession(id, ["default"], {
-            preview: false,
             attachmentsLength: attachmentsLength,
             note,
             sessionId
@@ -889,8 +1005,8 @@ class EditorStore extends BaseStore<EditorStore> {
         this.setSaveState(id, SaveState.NotSaved);
         console.error(err);
         if (err instanceof Error) logger.error(err);
-        if (isLockedSession(currentSession)) {
-          this.get().openSession(id, { force: true });
+        if (isLockedSession(currentSession) && "note" in currentSession) {
+          this.get().openSession(currentSession.note, { force: true });
         }
       }
     });
@@ -916,43 +1032,55 @@ class EditorStore extends BaseStore<EditorStore> {
   };
 
   newSession = () => {
-    const state = useEditorStore.getState();
-    const session = state.sessions.find((session) => session.type === "new");
-    if (session) {
-      session.context = useNoteStore.getState().context;
-      this.activateSession(session.id);
-    } else {
-      this.addSession({
-        type: "new",
-        id: getId(),
-        context: useNoteStore.getState().context,
-        saveState: SaveState.NotSaved
-      });
+    const { activeTabId, activateSession } = this.get();
+    if (!activeTabId) {
+      this.addTab();
+      return;
     }
+
+    const session = this.getActiveSession();
+    if (session?.type === "new") return activateSession(session.id);
+
+    const sessionId = tabSessionHistory.add(activeTabId);
+    this.addSession({
+      type: "new",
+      id: sessionId,
+      tabId: activeTabId,
+      saveState: SaveState.NotSaved
+    });
   };
 
-  closeSessions = (...ids: string[]) => {
+  closeTabs = (...ids: string[]) => {
     this.set((state) => {
-      const sessions: EditorSession[] = [];
-      for (let i = 0; i < state.sessions.length; ++i) {
-        const session = state.sessions[i];
-        if (!ids.includes(session.id)) {
-          sessions.push(session);
+      const tabs: TabItem[] = [];
+      for (let i = 0; i < state.tabs.length; ++i) {
+        const tab = state.tabs[i];
+        if (!ids.includes(tab.id)) {
+          tabs.push(tab);
           continue;
         }
 
-        this.saveSessionContentIfNotSaved(session.id);
+        this.saveSessionContentIfNotSaved(tab.sessionId);
 
-        db.fs().cancel(session.id).catch(console.error);
-        if (state.history.includes(session.id))
-          state.history.splice(state.history.indexOf(session.id), 1);
+        db.fs().cancel(tab.sessionId).catch(console.error);
+        if (state.history.includes(tab.id))
+          state.history.splice(state.history.indexOf(tab.id), 1);
+
+        const tabHistory = tabSessionHistory.getTabHistory(tab.id);
+        state.sessions = state.sessions.filter((session) => {
+          return (
+            !tabHistory.back.includes(session.id) &&
+            !tabHistory.forward.includes(session.id)
+          );
+        });
+        tabSessionHistory.clearStackForTab(tab.id);
       }
-      state.sessions = sessions;
+      state.tabs = tabs;
     });
 
-    const { history, sessions } = this.get();
-    this.activateSession(history.pop());
-    if (sessions.length === 0) this.newSession();
+    const { history, tabs } = this.get();
+    this.focusTab(history.pop());
+    if (tabs.length === 0) this.addTab();
   };
 
   setTitle = (id: string, title: string) => {
@@ -1004,23 +1132,90 @@ class EditorStore extends BaseStore<EditorStore> {
     this.set({ editorMargins: editorMarginsState });
     Config.set("editor:margins", editorMarginsState);
   };
+
+  getActiveTab = () => {
+    const activeTabId = this.get().activeTabId;
+    return this.get().tabs.find((t) => t.id === activeTabId);
+  };
+
+  getActiveNote = () => {
+    const session = this.getActiveSession();
+    return session && "note" in session ? session.note : undefined;
+  };
+
+  isNoteOpen = (noteId: string) => {
+    return this.getActiveNote()?.id === noteId;
+  };
+
+  getActiveSession = <T extends SessionType[]>(
+    types?: T
+  ): SessionTypeMap[T[number]] | undefined => {
+    const activeTab = this.getActiveTab();
+    if (!activeTab) return;
+    const session = this.getSession(activeTab.sessionId);
+    if (session && (!types || types.includes(session.type)))
+      return session as SessionTypeMap[T[number]];
+  };
+
+  addTab = (sessionId?: string) => {
+    const id = getId();
+    const newSessionId = sessionId || tabSessionHistory.add(id);
+    this.set((state) => {
+      state.tabs.push({
+        id,
+        sessionId: newSessionId
+      });
+    });
+    if (!sessionId)
+      this.addSession({
+        type: "new",
+        tabId: id,
+        id: newSessionId,
+        saveState: SaveState.NotSaved
+      });
+    this.focusTab(id);
+    return id;
+  };
+
+  focusTab = (tabId: string | undefined, sessionId?: string) => {
+    if (!tabId) return;
+
+    const { history } = this.get();
+    if (history.includes(tabId)) history.splice(history.indexOf(tabId), 1);
+    history.push(tabId);
+
+    this.set({
+      activeTabId: tabId,
+      canGoBack: tabSessionHistory.canGoBack(tabId),
+      canGoForward: tabSessionHistory.canGoForward(tabId)
+    });
+
+    sessionId =
+      sessionId || this.get().tabs.find((t) => t.id === tabId)?.sessionId;
+    if (sessionId) this.rehydrateSession(sessionId);
+  };
 }
 
 const useEditorStore = createPersistedStore(EditorStore, {
-  name: "editor-sessions",
+  name: "editor-sessions-v2",
   partialize: (state) => ({
     history: state.history,
-    activeSessionId: state.activeSessionId,
     arePropertiesVisible: state.arePropertiesVisible,
     editorMargins: state.editorMargins,
+    tabs: state.tabs,
+    activeTabId: state.activeTabId,
+    tabHistory: state.tabHistory,
+    canGoBack: state.canGoBack,
+    canGoForward: state.canGoForward,
     sessions: state.sessions.reduce((sessions, session) => {
       sessions.push({
         id: session.id,
         type: isLockedSession(session) ? "locked" : session.type,
         needsHydration: session.type === "new" ? false : true,
-        preview: session.preview,
-        pinned: session.pinned,
         title: session.title,
+        historySessionId:
+          session.type === "diff" ? session.historySessionId : undefined,
+        tabId: session.tabId,
         note:
           "note" in session
             ? {
@@ -1037,28 +1232,6 @@ const useEditorStore = createPersistedStore(EditorStore, {
 });
 export { useEditorStore, SESSION_STATES };
 
-function findSessionIndices(
-  sessions: EditorSession[],
-  session: EditorSession,
-  activeSessionId?: string
-) {
-  let activeSessionIndex = -1;
-  let previewSessionIndex = -1;
-  let duplicateSessionIndex = -1;
-  for (let i = 0; i < sessions.length; ++i) {
-    const { id, preview } = sessions[i];
-    if (id === session.id) duplicateSessionIndex = i;
-    else if (preview && session.preview) previewSessionIndex = i;
-    else if (id === activeSessionId) activeSessionIndex = i;
-  }
-
-  return {
-    activeSessionIndex,
-    previewSessionIndex,
-    duplicateSessionIndex
-  };
-}
-
 const MILLISECONDS_IN_A_MINUTE = 60 * 1000;
 const SESSION_DURATION = MILLISECONDS_IN_A_MINUTE * 5;
 function getSessionId(session: DefaultEditorSession | NewEditorSession) {

apps/web/src/stores/reminder-store.ts

@@ -68,7 +68,7 @@ async function resetReminders(reminders: FilteredSelector<Reminder>) {
   )
     return;
 
-  for await (const reminder of reminders) {
+  for await (const reminder of reminders.iterate()) {
     if (reminder.disabled) continue;
 
     // set a one time reminder at the snoozed date

fastlane/metadata/android/en-US/changelogs/15179.txt

@@ -0,0 +1,5 @@
+- New and improved editor tabs with history
+- Fixed homescreen widget bugs
+- Many small bug fixes and improvements
+
+Thank you for using Notesnook!

package.json

@@ -56,7 +56,7 @@
     "husky": "^8.0.1",
     "prettier": "^2.8.8",
     "serve": "^14.0.1",
-    "tsup": "^8.3.0"
+    "tsup": "^8.1.0"
   },
   "dependencies": {
     "eslint-plugin-header": "^3.1.1",

packages/common/src/utils/export-notes.ts

@@ -72,7 +72,9 @@ export async function* exportNotes(
   const pathTree = new PathTree();
   const notePathMap: Map<string, string[]> = new Map();
 
-  for await (const note of notes.fields(["notes.id", "notes.title"])) {
+  for await (const note of notes
+    .fields(["notes.id", "notes.title"])
+    .iterate()) {
     const filename = `${sanitizeFilename(note.title || "Untitled", {
       replacement: "-"
     })}.${FORMAT_TO_EXT[format]}`;

packages/common/src/utils/index.ts

@@ -27,3 +27,4 @@ export * from "./resolve-items.js";
 export * from "./migrate-toolbar.js";
 export * from "./export-notes.js";
 export * from "./dataurl.js";
+export * from "./tab-session-history.js";

packages/common/src/utils/tab-session-history.ts

@@ -0,0 +1,175 @@
+/*
+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 { getId } from "@notesnook/core";
+
+export type TabHistory = Record<
+  string,
+  { backStack: string[]; forwardStack: string[] }
+>;
+export type TabState = {
+  tabSessionHistory: TabHistory;
+  canGoBack?: boolean;
+  canGoForward?: boolean;
+};
+
+export class TabSessionHistory {
+  constructor(
+    public options: {
+      set: (state: TabState) => void;
+      get: () => TabState;
+    }
+  ) {}
+
+  getBackStack(id: string) {
+    const tabHistory = this.options.get().tabSessionHistory[id];
+    if (!tabHistory) return [];
+    return tabHistory.backStack.slice();
+  }
+
+  getForwardStack(id: string) {
+    const tabHistory = this.options.get().tabSessionHistory[id];
+    if (!tabHistory) return [];
+    return tabHistory.forwardStack.slice();
+  }
+
+  setBackStack(id: string, value: string[]) {
+    const tabHistory = this.options.get().tabSessionHistory;
+    this.options.set({
+      canGoBack: value.length > 1,
+      tabSessionHistory: {
+        ...tabHistory,
+        [id]: {
+          ...(tabHistory[id] || {}),
+          backStack: value
+        }
+      }
+    });
+  }
+
+  setForwardStack(id: string, value: string[]) {
+    const tabHistory = this.options.get().tabSessionHistory;
+    this.options.set({
+      canGoForward: value.length > 0,
+      tabSessionHistory: {
+        ...tabHistory,
+        [id]: {
+          ...(tabHistory[id] || {}),
+          forwardStack: value
+        }
+      }
+    });
+  }
+
+  add(id: string, sessionId?: string) {
+    sessionId = sessionId || getId();
+    const back_stack = this.getBackStack(id);
+    back_stack.push(sessionId);
+    this.setBackStack(id, back_stack);
+    this.setForwardStack(id, []);
+    return sessionId;
+  }
+
+  clearStackForTab(tabId: string) {
+    this.options.set({
+      tabSessionHistory: {
+        ...this.options.get().tabSessionHistory,
+        [tabId]: {
+          backStack: [],
+          forwardStack: []
+        }
+      }
+    });
+  }
+
+  back(id: string): string | null {
+    if (!this.canGoBack(id)) return null;
+
+    const backStack = this.getBackStack(id);
+    const forwardStack = this.getForwardStack(id);
+
+    const currentItem = backStack.pop();
+    const nextItem = backStack[backStack.length - 1];
+
+    currentItem && forwardStack.push(currentItem);
+
+    this.setForwardStack(id, forwardStack);
+    this.setBackStack(id, backStack);
+
+    return nextItem;
+  }
+
+  remove(tabId: string, sessionId: string) {
+    const backStack = this.getBackStack(tabId);
+    let index = backStack.findIndex((item) => item === sessionId);
+    if (index === -1) {
+      const forwardStack = this.getForwardStack(tabId);
+      index = forwardStack.findIndex((item) => item === sessionId);
+      forwardStack.splice(index, 1);
+      this.setForwardStack(tabId, forwardStack);
+    } else {
+      backStack.splice(index, 1);
+      this.setBackStack(tabId, backStack);
+    }
+  }
+
+  forward(id: string): string | null {
+    if (!this.canGoForward(id)) return null;
+
+    const backStack = this.getBackStack(id);
+    const forwardStack = this.getForwardStack(id);
+
+    const item = forwardStack.pop() as string;
+    this.setForwardStack(id, forwardStack);
+    backStack.push(item);
+    this.setBackStack(id, backStack);
+    return item;
+  }
+
+  currentSessionId(id: string) {
+    const { back } = this.getTabHistory(id);
+    return back[back.length - 1];
+  }
+
+  getTabHistory(id: string) {
+    const tabHistory = this.options.get().tabSessionHistory[id];
+    if (!tabHistory)
+      return {
+        back: [],
+        forward: []
+      };
+
+    return {
+      back: tabHistory.backStack?.slice() || [],
+      forward: tabHistory.forwardStack?.slice() || []
+    };
+  }
+
+  canGoBack(id: string) {
+    const tabHistory = this.options.get().tabSessionHistory[id];
+    if (!tabHistory) return false;
+    return tabHistory.backStack.length > 1;
+  }
+
+  canGoForward(id: string) {
+    const tabHistory = this.options.get().tabSessionHistory[id];
+    if (!tabHistory) return false;
+    return tabHistory.forwardStack.length >= 1;
+  }
+}

packages/core/src/api/lookup.ts

@@ -184,7 +184,7 @@ export default class Lookup {
   ) {
     const results: Map<string, number> = new Map();
     const columns = fields.map((f) => f.column);
-    for await (const item of selector.fields(columns)) {
+    for await (const item of selector.fields(columns).iterate()) {
       if (limit && results.size >= limit) break;
 
       for (const field of fields) {

packages/core/src/collections/attachments.ts

@@ -422,7 +422,7 @@ export class Attachments implements ICollection {
   async cleanup() {
     const now = dayjs().unix();
     const ids: string[] = [];
-    for await (const attachment of this.deleted) {
+    for await (const attachment of this.deleted.iterate()) {
       if (dayjs(attachment.dateDeleted).add(7, "days").unix() < now) continue;
 
       const isDeleted = await this.db.fs().deleteFile(attachment.hash);

packages/core/src/collections/notes.ts

@@ -285,31 +285,32 @@ export class Notes implements ICollection {
     const { format, rawContent } = options;
 
     const contentString =
-      rawContent ||
-      (await (async () => {
-        let contentItem = options.contentItem;
-        if (!contentItem) {
-          const rawContent = await this.db.content.findByNoteId(note.id);
-          if (rawContent && rawContent.locked) return false;
-          contentItem = rawContent || EMPTY_CONTENT(note.id);
-        }
+      rawContent === undefined
+        ? await (async () => {
+            let contentItem = options.contentItem;
+            if (!contentItem) {
+              const rawContent = await this.db.content.findByNoteId(note.id);
+              if (rawContent && rawContent.locked) return false;
+              contentItem = rawContent || EMPTY_CONTENT(note.id);
+            }
 
-        const { data, type } =
-          options?.embedMedia && format !== "txt"
-            ? await this.db.content.downloadMedia(
-                `export-${note.id}`,
-                contentItem,
-                false
-              )
-            : contentItem;
-        const content = await getContentFromData(type, data);
-        return format === "html"
-          ? content.toHTML()
-          : format === "md"
-          ? content.toMD()
-          : content.toTXT();
-      })());
-    if (!contentString) return false;
+            const { data, type } =
+              options?.embedMedia && format !== "txt"
+                ? await this.db.content.downloadMedia(
+                    `export-${note.id}`,
+                    contentItem,
+                    false
+                  )
+                : contentItem;
+            const content = await getContentFromData(type, data);
+            return format === "html"
+              ? content.toHTML()
+              : format === "md"
+              ? content.toMD()
+              : content.toTXT();
+          })()
+        : rawContent;
+    if (contentString === false) return false;
 
     const tags = (await this.db.relations.to(note, "tag").resolve()).map(
       (tag) => tag.title

packages/core/src/database/backup.ts

@@ -361,7 +361,7 @@ export default class Backup {
       };
 
       let current = 0;
-      for await (const attachment of this.db.attachments.all) {
+      for await (const attachment of this.db.attachments.all.iterate()) {
         current++;
         if (
           !(await this.db

packages/core/src/database/sql-collection.ts

@@ -476,7 +476,7 @@ export class FilteredSelector<T extends Item> {
   async *map<TReturnType>(
     fn: (item: T) => TReturnType
   ): AsyncIterableIterator<TReturnType> {
-    for await (const item of this) {
+    for await (const item of this.iterate()) {
       yield fn(item);
     }
   }
@@ -567,37 +567,43 @@ export class FilteredSelector<T extends Item> {
     );
   }
 
-  async *[Symbol.asyncIterator]() {
-    let lastRow: any | null = null;
-    const fields = this._fields.slice();
-    if (fields.length > 0) {
-      if (!fields.find((f) => f.includes(".dateCreated")))
-        fields.push("dateCreated");
-      if (!fields.find((f) => f.includes(".id"))) fields.push("id");
-    }
+  iterate() {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const thisArg = this;
+    return {
+      async *[Symbol.asyncIterator]() {
+        let lastRow: any | null = null;
+        const fields = thisArg._fields.slice();
+        if (fields.length > 0) {
+          if (!fields.find((f) => f.includes(".dateCreated")))
+            fields.push("dateCreated");
+          if (!fields.find((f) => f.includes(".id"))) fields.push("id");
+        }
 
-    while (true) {
-      const rows = await this.filter
-        .orderBy("dateCreated asc")
-        .orderBy("id asc")
-        .$if(lastRow !== null, (qb) =>
-          qb.where(
-            (eb) => eb.refTuple("dateCreated", "id"),
-            ">",
-            (eb) => eb.tuple(lastRow.dateCreated, lastRow.id)
-          )
-        )
-        .limit(this.batchSize)
-        .$if(fields.length === 0, (eb) => eb.selectAll())
-        .$if(fields.length > 0, (eb) => eb.select(fields))
-        .execute();
-      if (rows.length === 0) break;
-      for (const row of rows) {
-        yield row as T;
+        while (true) {
+          const rows = await thisArg.filter
+            .orderBy("dateCreated asc")
+            .orderBy("id asc")
+            .$if(lastRow !== null, (qb) =>
+              qb.where(
+                (eb) => eb.refTuple("dateCreated", "id"),
+                ">",
+                (eb) => eb.tuple(lastRow.dateCreated, lastRow.id)
+              )
+            )
+            .limit(thisArg.batchSize)
+            .$if(fields.length === 0, (eb) => eb.selectAll())
+            .$if(fields.length > 0, (eb) => eb.select(fields))
+            .execute();
+          if (rows.length === 0) break;
+          for (const row of rows) {
+            yield row as T;
+          }
+
+          lastRow = rows[rows.length - 1];
+        }
       }
-
-      lastRow = rows[rows.length - 1];
-    }
+    };
   }
 
   private buildSortExpression(options: GroupOptions, hasDueDate?: boolean) {

packages/editor-mobile/package-lock.json

@@ -14,6 +14,7 @@
         "@lingui/react": "5.1.2",
         "@mdi/js": "^7.2.96",
         "@mdi/react": "^1.6.0",
+        "@notesnook/common": "file:../common",
         "@notesnook/editor": "file:../editor",
         "@notesnook/intl": "file:../intl",
         "@notesnook/theme": "file:../theme",
@@ -24,6 +25,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-freeze": "^1.0.3",
+        "tinycolor2": "1.6.0",
         "zustand": "^4.4.7"
       },
       "devDependencies": {
@@ -33,6 +35,28 @@
         "react-scripts": "^5.0.1"
       }
     },
+    "../common": {
+      "name": "@notesnook/common",
+      "version": "2.1.3",
+      "license": "GPL-3.0-or-later",
+      "dependencies": {
+        "@notesnook/core": "file:../core",
+        "@readme/data-urls": "^3.0.0",
+        "dayjs": "1.11.13",
+        "pathe": "^1.1.2",
+        "timeago.js": "4.0.2"
+      },
+      "devDependencies": {
+        "@notesnook/core": "file:../core",
+        "@types/react": "18.3.5",
+        "react": "18.3.1",
+        "vitest": "2.1.8"
+      },
+      "peerDependencies": {
+        "react": ">=18",
+        "timeago.js": "4.0.2"
+      }
+    },
     "../editor": {
       "name": "@notesnook/editor",
       "version": "2.1.3",
@@ -3766,6 +3790,10 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@notesnook/common": {
+      "resolved": "../common",
+      "link": true
+    },
     "node_modules/@notesnook/editor": {
       "resolved": "../editor",
       "link": true
@@ -17611,6 +17639,11 @@
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "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=="
+    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",

packages/editor-mobile/package.json

@@ -18,7 +18,9 @@
     "react-freeze": "^1.0.3",
     "zustand": "^4.4.7",
     "@lingui/core": "5.1.2",
-    "@lingui/react": "5.1.2"
+    "@lingui/react": "5.1.2",
+    "tinycolor2": "1.6.0",
+    "@notesnook/common": "file:../common"
   },
   "devDependencies": {
     "@playwright/test": "^1.37.1",

packages/editor-mobile/src/components/editor.tsx

@@ -22,9 +22,9 @@ import {
   getFontById,
   getTableOfContents,
   TiptapOptions,
+  toBlobURL,
   usePermissionHandler
 } from "@notesnook/editor";
-import { toBlobURL } from "@notesnook/editor";
 import { useThemeColors } from "@notesnook/theme";
 import FingerprintIcon from "mdi-react/FingerprintIcon";
 import {
@@ -36,15 +36,11 @@ import {
   useState
 } from "react";
 import { useEditorController } from "../hooks/useEditorController";
+import { useSafeArea } from "../hooks/useSafeArea";
 import { useSettings } from "../hooks/useSettings";
-import {
-  NoteState,
-  TabItem,
-  TabStore,
-  useTabContext,
-  useTabStore
-} from "../hooks/useTabStore";
-import { EventTypes, postAsyncWithTimeout, Settings } from "../utils";
+import { TabItem, useTabContext, useTabStore } from "../hooks/useTabStore";
+import { postAsyncWithTimeout, Settings } from "../utils";
+import { EditorEvents } from "../utils/editor-events";
 import { pendingSaveRequests } from "../utils/pending-saves";
 import Header from "./header";
 import StatusBar from "./statusbar";
@@ -82,49 +78,43 @@ const Tiptap = ({
     undo,
     redo
   });
+  const insets = useSafeArea();
   tabRef.current = tab;
   valueRef.current = {
     undo,
     redo
   };
 
-  function restoreNoteSelection(state?: NoteState) {
-    try {
-      if (!tabRef.current.noteId) return;
-      const noteState =
-        state || useTabStore.getState().noteState[tabRef.current.noteId];
+  logger("info", tabRef.current.id, "rendering");
 
-      if (noteState && (noteState.to || noteState.from)) {
+  const restoreNoteSelection = useCallback(
+    (scrollTop?: number, selection?: { to: number; from: number }) => {
+      if (!tabRef.current.session?.noteId) return;
+      const sel = selection || tabRef.current.session?.selection;
+      if (sel && sel.to && sel.from) {
         const size = editors[tabRef.current.id]?.state.doc.content.size || 0;
-        if (
-          noteState.to > 0 &&
-          noteState.to <= size &&
-          noteState.from > 0 &&
-          noteState.from <= size
-        ) {
+        if (sel.to > 0 && sel.to <= size && sel.from > 0 && sel.from <= size) {
           editors[tabRef.current.id]?.chain().setTextSelection({
-            to: noteState.to,
-            from: noteState.from
+            to: sel.to,
+            from: sel.from
           });
         }
       }
-
       containerRef.current?.scrollTo({
         left: 0,
-        top: noteState?.top || 0,
+        top: scrollTop || tabRef.current.session?.scrollTop || 0,
         behavior: "auto"
       });
-    } catch (e) {
-      logger("error", (e as Error).message, (e as Error).stack);
-    }
-  }
+    },
+    []
+  );
 
   usePermissionHandler({
     claims: {
       premium: settings.premium
     },
     onPermissionDenied: () => {
-      post(EventTypes.pro, undefined, tabRef.current.id, tab.noteId);
+      post(EditorEvents.pro, undefined, tabRef.current.id, tab.session?.noteId);
     }
   });
 
@@ -161,14 +151,14 @@ const Tiptap = ({
         ) as Promise<string | undefined>;
       },
       createInternalLink(attributes) {
-        return postAsyncWithTimeout(EventTypes.createInternalLink, {
+        return postAsyncWithTimeout(EditorEvents.createInternalLink, {
           attributes
         });
       },
       element: getContentDiv(),
-      editable: !tab.readonly,
+      editable: !tab.session?.readonly,
       editorProps: {
-        editable: () => !tab.readonly,
+        editable: () => !tab.session?.readonly,
         handlePaste: (view, event) => {
           const hasFiles = event.clipboardData?.types?.some((type) =>
             type.startsWith("Files")
@@ -211,20 +201,22 @@ const Tiptap = ({
       copyToClipboard: (text) => {
         globalThis.editorControllers[tab.id]?.copyToClipboard(text);
       },
-      placeholder: strings.startWritingNote(),
       onSelectionUpdate: () => {
-        if (tabRef.current.noteId) {
-          const noteId = tabRef.current.noteId;
+        if (tabRef.current.session?.noteId) {
           clearTimeout(noteStateUpdateTimer.current);
           noteStateUpdateTimer.current = setTimeout(() => {
-            if (tabRef.current.noteId !== noteId) return;
-            const { to, from } =
-              editors[tabRef.current?.id]?.state.selection || {};
-            useTabStore.getState().setNoteState(noteId, {
-              to,
-              from
-            });
-          }, 500);
+            post(
+              EditorEvents.saveScroll,
+              {
+                selection: {
+                  to: editors[tabRef.current.id]?.state.selection.to,
+                  from: editors[tabRef.current.id]?.state.selection.from
+                }
+              },
+              tabRef.current.id,
+              tabRef.current.session?.noteId
+            );
+          }, 300);
         }
       },
       onCreate() {
@@ -242,7 +234,7 @@ const Tiptap = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
     getContentDiv,
-    tab.readonly,
+    tab.session?.readonly,
     settings.doubleSpacedLines,
     settings.corsProxy,
     settings.dateFormat,
@@ -252,15 +244,21 @@ const Tiptap = ({
     tick
   ]);
 
-  const update = useCallback(() => {
-    setTick((tick) => tick + 1);
-    globalThis.editorControllers[tabRef.current.id]?.setTitlePlaceholder(
-      strings.noteTitle()
-    );
-    setTimeout(() => {
-      editorControllers[tabRef.current.id]?.setLoading(false);
-    }, 300);
-  }, []);
+  const update = useCallback(
+    (scrollTop?: number, selection?: { to: number; from: number }) => {
+      setTick((tick) => tick + 1);
+      globalThis.editorControllers[tabRef.current.id]?.setTitlePlaceholder(
+        strings.noteTitle()
+      );
+      setTimeout(() => {
+        editorControllers[tabRef.current.id]?.setLoading(false);
+        setTimeout(() => {
+          restoreNoteSelection(scrollTop, selection);
+        }, 300);
+      }, 1);
+    },
+    [restoreNoteSelection]
+  );
 
   const controller = useEditorController({
     update,
@@ -301,60 +299,40 @@ const Tiptap = ({
         });
     }
 
-    const updateScrollPosition = (state: TabStore) => {
+    const updateFocusedTab = () => {
       if (isFocusedRef.current) return;
-      if (state.currentTab === tabRef.current.id) {
-        isFocusedRef.current = true;
-        const noteState = tabRef.current.noteId
-          ? state.noteState[tabRef.current.noteId]
-          : undefined;
+      isFocusedRef.current = true;
+      const noteId = useTabStore
+        .getState()
+        .tabs.find((tab) => tab.id === useTabStore.getState().currentTab)
+        ?.session?.noteId;
+      post(
+        EditorEvents.tabFocused,
+        undefined,
+        useTabStore.getState().currentTab,
+        noteId
+      );
+      editorControllers[tabRef.current.id]?.updateTab();
 
-        post(
-          EventTypes.tabFocused,
-          !!globalThis.editorControllers[tabRef.current.id]?.content.current &&
-            !editorControllers[tabRef.current.id]?.loading,
-          tabRef.current.id,
-          state.getCurrentNoteId()
-        );
-        editorControllers[tabRef.current.id]?.updateTab();
+      restoreNoteSelection();
 
-        if (noteState) {
-          if (
-            containerRef.current &&
-            containerRef.current?.scrollHeight < noteState.top
-          ) {
-            console.log("Container too small to scroll.");
-            return;
-          }
-
-          restoreNoteSelection(noteState);
-        } else {
-          containerRef.current?.scrollTo({
-            left: 0,
-            top: 0,
-            behavior: "auto"
-          });
-        }
-
-        if (
-          !globalThis.editorControllers[tabRef.current.id]?.content.current &&
-          tabRef.current.noteId
-        ) {
-          editorControllers[tabRef.current.id]?.setLoading(true);
-        }
-      } else {
-        isFocusedRef.current = false;
+      if (
+        !globalThis.editorControllers[tabRef.current.id]?.content.current &&
+        tabRef.current.session?.noteId
+      ) {
+        editorControllers[tabRef.current.id]?.setLoading(true);
       }
     };
 
-    updateScrollPosition(useTabStore.getState());
+    updateFocusedTab();
 
     const unsub = useTabStore.subscribe((state, prevState) => {
       if (state.currentTab !== tabRef.current.id) {
         isFocusedRef.current = false;
       }
-      if (state.currentTab === prevState.currentTab) return;
-      updateScrollPosition(state);
+      if (state.currentTab === prevState.currentTab && isFocusedRef.current)
+        return;
+      updateFocusedTab();
       logger("info", "updating scroll position");
     });
     logger("info", tabRef.current.id, "active");
@@ -363,7 +341,7 @@ const Tiptap = ({
       logger("info", tabRef.current.id, "inactive");
       unsub();
     };
-  }, [getContentDiv]);
+  }, [getContentDiv, restoreNoteSelection]);
 
   const onClickEmptyArea: React.MouseEventHandler<HTMLDivElement> = useCallback(
     (event) => {
@@ -557,7 +535,7 @@ const Tiptap = ({
             position: "relative"
           }}
         >
-          {settings.noHeader || tab.locked ? null : (
+          {settings.noHeader || tab.session?.locked ? null : (
             <>
               <Tags settings={settings} loading={controller.loading} />
               <Title
@@ -578,7 +556,7 @@ const Tiptap = ({
             </>
           )}
 
-          {controller.loading || tab.locked ? (
+          {controller.loading || tab.session?.noteLocked ? (
             <div
               style={{
                 width: "100%",
@@ -590,13 +568,15 @@ const Tiptap = ({
                 paddingLeft: 12,
                 display: "flex",
                 flexDirection: "column",
-                alignItems: tab.locked ? "center" : "flex-start",
-                justifyContent: tab.locked ? "center" : "flex-start",
+                alignItems: tab.session?.noteLocked ? "center" : "flex-start",
+                justifyContent: tab.session?.noteLocked
+                  ? "center"
+                  : "flex-start",
                 boxSizing: "border-box",
                 rowGap: 10
               }}
             >
-              {tab.locked ? (
+              {tab.session?.noteLocked ? (
                 <>
                   <p
                     style={{
@@ -636,7 +616,9 @@ const Tiptap = ({
                     style={{
                       display: "flex",
                       flexDirection: "column",
-                      rowGap: 10
+                      rowGap: 10,
+                      justifyContent: "center",
+                      alignItems: "center"
                     }}
                   >
                     <input
@@ -849,7 +831,7 @@ const Tiptap = ({
 
           <div
             style={{
-              display: tab.locked ? "none" : "block"
+              display: tab.session?.locked ? "none" : "block"
             }}
             ref={contentPlaceholderRef}
             className="theme-scope-editor"
@@ -857,11 +839,11 @@ const Tiptap = ({
 
           <div
             onClick={(e) => {
-              if (tab.locked) return;
+              if (tab.session?.locked) return;
               onClickBottomArea();
             }}
             onMouseDown={(e) => {
-              if (tab.locked) return;
+              if (tab.session?.locked) return;
               if (globalThis.keyboardShown) {
                 e.preventDefault();
               }

packages/editor-mobile/src/components/header.tsx

@@ -19,18 +19,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { ControlledMenu, MenuItem as MenuItemInner } from "@szhsin/react-menu";
 import ArrowBackIcon from "mdi-react/ArrowBackIcon";
+import ArrowForwardIcon from "mdi-react/ArrowForwardIcon";
 import ArrowULeftTopIcon from "mdi-react/ArrowULeftTopIcon";
 import ArrowURightTopIcon from "mdi-react/ArrowURightTopIcon";
 import DotsHorizontalIcon from "mdi-react/DotsHorizontalIcon";
 import DotsVerticalIcon from "mdi-react/DotsVerticalIcon";
 import FullscreenIcon from "mdi-react/FullscreenIcon";
 import MagnifyIcon from "mdi-react/MagnifyIcon";
+import PlusIcon from "mdi-react/PlusIcon";
+
 import PencilLockIcon from "mdi-react/PencilLockIcon";
 import TableOfContentsIcon from "mdi-react/TableOfContentsIcon";
 import React, { useRef, useState } from "react";
 import { useSafeArea } from "../hooks/useSafeArea";
 import { useTabContext, useTabStore } from "../hooks/useTabStore";
-import { EventTypes, Settings } from "../utils";
+import { Settings } from "../utils";
+import { EditorEvents } from "../utils/editor-events";
 import styles from "./styles.module.css";
 import { strings } from "@notesnook/intl";
 
@@ -100,6 +104,10 @@ function Header({
   const openedTabsCount = useTabStore((state) => state.tabs.length);
   const [isOpen, setOpen] = useState(false);
   const btnRef = useRef(null);
+  const [canGoBack, canGoForward] = useTabStore((state) => [
+    state.canGoBack,
+    state.canGoForward
+  ]);
 
   return (
     <div
@@ -131,7 +139,7 @@ function Header({
           ) : (
             <Button
               onPress={() => {
-                post(EventTypes.back, undefined, tab.id, tab.noteId);
+                post(EditorEvents.back, undefined, tab.id, tab.session?.noteId);
               }}
               preventDefault={false}
               style={{
@@ -165,75 +173,15 @@ function Header({
               flexDirection: "row"
             }}
           >
-            {tab.locked ? null : (
-              <>
-                <Button
-                  onPress={() => {
-                    editor?.commands.undo();
-                  }}
-                  style={{
-                    borderWidth: 0,
-                    borderRadius: 100,
-                    color: "var(--nn_primary_icon)",
-                    marginRight: 10,
-                    width: 39,
-                    height: 39,
-                    display: "flex",
-                    justifyContent: "center",
-                    alignItems: "center",
-                    position: "relative"
-                  }}
-                >
-                  <ArrowULeftTopIcon
-                    color={
-                      !hasUndo
-                        ? "var(--nn_secondary_border)"
-                        : "var(--nn_primary_icon)"
-                    }
-                    size={25 * settings.fontScale}
-                    style={{
-                      position: "absolute"
-                    }}
-                  />
-                </Button>
-
-                <Button
-                  onPress={() => {
-                    if (tab.locked) return;
-                    editor?.commands.redo();
-                  }}
-                  style={{
-                    borderWidth: 0,
-                    borderRadius: 100,
-                    color: "var(--nn_primary_icon)",
-                    marginRight: 10,
-                    width: 39,
-                    height: 39,
-                    display: "flex",
-                    justifyContent: "center",
-                    alignItems: "center",
-                    position: "relative"
-                  }}
-                >
-                  <ArrowURightTopIcon
-                    color={
-                      !hasRedo
-                        ? "var(--nn_secondary_border)"
-                        : "var(--nn_primary_icon)"
-                    }
-                    size={25 * settings.fontScale}
-                    style={{
-                      position: "absolute"
-                    }}
-                  />
-                </Button>
-              </>
-            )}
-
             {settings.deviceMode !== "mobile" && !settings.fullscreen ? (
               <Button
                 onPress={() => {
-                  post(EventTypes.fullscreen, undefined, tab.id, tab.noteId);
+                  post(
+                    EditorEvents.fullscreen,
+                    undefined,
+                    tab.id,
+                    tab.session?.noteId
+                  );
                 }}
                 preventDefault={false}
                 style={{
@@ -259,14 +207,12 @@ function Header({
               </Button>
             ) : null}
 
-            {tab.readonly ? (
+            {tab.session?.readonly ? (
               <Button
                 onPress={() => {
                   post(
                     "editor-events:disable-readonly-mode",
-                    useTabStore
-                      .getState()
-                      .getNoteIdForTab(useTabStore.getState().currentTab)
+                    tab.session?.noteId
                   );
                 }}
                 fwdRef={btnRef}
@@ -296,7 +242,72 @@ function Header({
 
             <Button
               onPress={() => {
-                post(EventTypes.showTabs, undefined, tab.id, tab.noteId);
+                editor?.commands.undo();
+              }}
+              style={{
+                borderWidth: 0,
+                borderRadius: 100,
+                color: "var(--nn_primary_icon)",
+                marginRight: 10,
+                width: 39,
+                height: 39,
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "center",
+                position: "relative"
+              }}
+            >
+              <ArrowULeftTopIcon
+                color={
+                  !hasUndo
+                    ? "var(--nn_secondary_border)"
+                    : "var(--nn_primary_icon)"
+                }
+                size={25 * settings.fontScale}
+                style={{
+                  position: "absolute"
+                }}
+              />
+            </Button>
+
+            <Button
+              onPress={() => {
+                editor?.commands.redo();
+              }}
+              style={{
+                borderWidth: 0,
+                borderRadius: 100,
+                color: "var(--nn_primary_icon)",
+                marginRight: 10,
+                width: 39,
+                height: 39,
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "center",
+                position: "relative"
+              }}
+            >
+              <ArrowURightTopIcon
+                color={
+                  !hasRedo
+                    ? "var(--nn_secondary_border)"
+                    : "var(--nn_primary_icon)"
+                }
+                size={25 * settings.fontScale}
+                style={{
+                  position: "absolute"
+                }}
+              />
+            </Button>
+
+            <Button
+              onPress={() => {
+                post(
+                  EditorEvents.showTabs,
+                  undefined,
+                  tab.id,
+                  tab.session?.noteId
+                );
               }}
               preventDefault={false}
               style={{
@@ -340,8 +351,13 @@ function Header({
             <Button
               fwdRef={btnRef}
               onPress={() => {
-                if (tab.locked) {
-                  post(EventTypes.properties, undefined, tab.id, tab.noteId);
+                if (tab.session?.locked) {
+                  post(
+                    EditorEvents.properties,
+                    undefined,
+                    tab.id,
+                    tab.session?.noteId
+                  );
                 } else {
                   setOpen(!isOpen);
                 }
@@ -360,7 +376,7 @@ function Header({
                 position: "relative"
               }}
             >
-              {tab.locked ? (
+              {tab.session?.locked ? (
                 <DotsHorizontalIcon
                   size={25 * settings.fontScale}
                   style={{
@@ -395,33 +411,153 @@ function Header({
                 switch (e.value) {
                   case "toc":
                     post(
-                      EventTypes.toc,
+                      EditorEvents.toc,
                       editorControllers[tab.id]?.getTableOfContents(),
                       tab.id,
-                      tab.noteId
+                      tab.session?.noteId
                     );
                     break;
                   case "search":
                     editor?.commands.startSearch();
                     break;
+                  case "newNote":
+                    post(
+                      EditorEvents.newNote,
+                      undefined,
+                      tab.id,
+                      tab.session?.noteId
+                    );
+                    break;
                   case "properties":
-                    logger("info", "post properties...");
-                    post(EventTypes.properties, undefined, tab.id, tab.noteId);
+                    post(
+                      EditorEvents.properties,
+                      undefined,
+                      tab.id,
+                      tab.session?.noteId
+                    );
                     break;
                   default:
                     break;
                 }
               }}
             >
+              <div
+                style={{
+                  display: "flex",
+                  gap: 10,
+                  alignItems: "center",
+                  flexDirection: "row",
+                  justifyContent: "center",
+                  flex: 1,
+                  paddingTop: 5
+                }}
+              >
+                <Button
+                  onPress={() => {
+                    post(
+                      EditorEvents.goBack,
+                      undefined,
+                      tab.id,
+                      tab.session?.noteId
+                    );
+                    setOpen(false);
+                  }}
+                  style={{
+                    borderWidth: 0,
+                    borderRadius: 100,
+                    color: "var(--nn_primary_icon)",
+                    width: 39,
+                    height: 39,
+                    display: "flex",
+                    justifyContent: "center",
+                    alignItems: "center",
+                    position: "relative"
+                  }}
+                >
+                  <ArrowBackIcon
+                    color={
+                      !canGoBack
+                        ? "var(--nn_secondary_border)"
+                        : "var(--nn_primary_icon)"
+                    }
+                    size={25 * settings.fontScale}
+                    style={{
+                      position: "absolute"
+                    }}
+                  />
+                </Button>
+
+                <Button
+                  onPress={() => {
+                    post(
+                      EditorEvents.goForward,
+                      undefined,
+                      tab.id,
+                      tab.session?.noteId
+                    );
+                    setOpen(false);
+                  }}
+                  style={{
+                    borderWidth: 0,
+                    borderRadius: 100,
+                    color: "var(--nn_primary_icon)",
+                    width: 39,
+                    height: 39,
+                    display: "flex",
+                    justifyContent: "center",
+                    alignItems: "center",
+                    position: "relative"
+                  }}
+                >
+                  <ArrowForwardIcon
+                    color={
+                      !canGoForward
+                        ? "var(--nn_secondary_border)"
+                        : "var(--nn_primary_icon)"
+                    }
+                    size={25 * settings.fontScale}
+                    style={{
+                      position: "absolute"
+                    }}
+                  />
+                </Button>
+
+                <Button
+                  onPress={() => {
+                    editor?.commands.startSearch();
+                    setOpen(false);
+                  }}
+                  style={{
+                    borderWidth: 0,
+                    borderRadius: 100,
+                    color: "var(--nn_primary_icon)",
+                    width: 39,
+                    height: 39,
+                    display: "flex",
+                    justifyContent: "center",
+                    alignItems: "center",
+                    position: "relative"
+                  }}
+                >
+                  <MagnifyIcon
+                    size={28 * settings.fontScale}
+                    style={{
+                      position: "absolute"
+                    }}
+                    color="var(--nn_primary_icon)"
+                  />
+                </Button>
+              </div>
+
               <MenuItem
-                value="search"
+                value="newNote"
                 style={{
                   display: "flex",
                   gap: 10,
                   alignItems: "center"
                 }}
               >
-                <MagnifyIcon
+                <PlusIcon
                   size={22 * settings.fontScale}
                   color="var(--nn_primary_icon)"
                 />
@@ -430,7 +566,7 @@ function Header({
                     color: "var(--nn_primary_paragraph)"
                   }}
                 >
-                  {strings.search()}
+                  New note
                 </span>
               </MenuItem>
 

packages/editor-mobile/src/components/readonly-editor.tsx

@@ -27,7 +27,8 @@ import {
   useState
 } from "react";
 import { useSettings } from "../hooks/useSettings";
-import { EventTypes, Settings, isReactNative, randId } from "../utils";
+import { Settings, isReactNative, randId } from "../utils";
+import { EditorEvents } from "../utils/editor-events";
 
 export const ReadonlyEditorProvider = (): JSX.Element => {
   const settings = useSettings();
@@ -95,7 +96,7 @@ const Tiptap = ({
             delete pendingResolvers[resolverId];
             resolve(data);
           };
-          post(EventTypes.getAttachmentData, {
+          post(EditorEvents.getAttachmentData, {
             attachment,
             resolverId: resolverId
           });
@@ -142,7 +143,7 @@ const Tiptap = ({
     if (isSafari) {
       root = window;
     }
-    post(EventTypes.readonlyEditorLoaded);
+    post(EditorEvents.readonlyEditorLoaded);
 
     const onMessage = (event: any) => {
       if (event?.data?.[0] !== "{") return;

packages/editor-mobile/src/components/tags.tsx

@@ -18,7 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useEffect, useRef, useState } from "react";
-import { EventTypes, Settings } from "../utils";
+import { Settings } from "../utils";
+import { EditorEvents } from "../utils/editor-events";
 import styles from "./styles.module.css";
 import { useTabContext } from "../hooks/useTabStore";
 import { strings } from "@notesnook/intl";
@@ -45,7 +46,7 @@ function Tags(props: { settings: Settings; loading?: boolean }): JSX.Element {
       editor.commands.blur();
       editorTitles[tab.id]?.current?.blur();
     }
-    post(EventTypes.newtag, undefined, tab.id, tab.noteId);
+    post(EditorEvents.newtag, undefined, tab.id, tab.session?.noteId);
   };
   const fontScale = props.settings?.fontScale || 1;
 
@@ -126,7 +127,7 @@ function Tags(props: { settings: Settings; loading?: boolean }): JSX.Element {
           }}
           onClick={(e) => {
             e.preventDefault();
-            post(EventTypes.tag, tag, tab.id, tab.noteId);
+            post(EditorEvents.tag, tag, tab.id, tab.session?.noteId);
           }}
         >
           #{tag.alias}

packages/editor-mobile/src/components/tiptap.tsx

@@ -36,7 +36,7 @@ export default function TiptapEditorWrapper(props: {
 
   return (
     <>
-      {tab.locked ? null : (
+      {tab.session?.locked ? null : (
         <EmotionEditorToolbarTheme>
           <Toolbar
             className="theme-scope-editorToolbar"