mobile: disable buttons in loading state

.eslintignore

@@ -21,7 +21,4 @@ packages/editor/styles/
 packages/editor/languages/
 
 # editor mobile
-packages/editor-mobile/build.bundle
-
-# snapshots
-tap-snapshots
+packages/editor-mobile/build.bundle

.github/dco.yml

@@ -1,4 +0,0 @@
-allowRemediationCommits:
-  individual: true
-require:
-  members: false

.github/workflows/android.publish.yml

@@ -50,18 +50,7 @@ jobs:
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}  
-
-      - name: Publish to Playstore
-        id: deploy
-        uses: r0adkll/upload-google-play@v1.1.1
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-          packageName: com.streetwriters.notesnook
-          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: production
-          status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/      
+          keyPassword: ${{ secrets.KEY_PASSWORD }}        
 
       - name: Build apks for Github release
         run: yarn release:android
@@ -102,4 +91,15 @@ jobs:
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk           
+            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
+
+      - name: Publish to Playstore
+        id: deploy
+        uses: r0adkll/upload-google-play@v1.1.1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+          packageName: com.streetwriters.notesnook
+          releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
+          track: production
+          status: completed
+          whatsNewDirectory: apps/mobile/native/android/releasenotes/             

.github/workflows/desktop.publish.yml

@@ -215,17 +215,17 @@ jobs:
       - name: Build snap
         if: inputs.publish-snap
         run: |
-          npx electron-builder --linux snap:x64 -p never
+          npx electron-builder --linux snap -p never
         working-directory: ./apps/web/desktop
 
-      - name: Build AppImage
+      - name: Build AppImage deb and rpm
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if [ ${{ inputs.publish-github }} == true ]; then
-            npx electron-builder --linux AppImage:x64 AppImage:arm64 -p always
+            npx electron-builder --linux AppImage deb rpm -p always
           else
-            npx electron-builder --linux AppImage:x64 AppImage:arm64 -p never
+            npx electron-builder --linux AppImage deb rpm -p never
           fi
         working-directory: ./apps/web/desktop
 

.github/workflows/editor.tests.yml

@@ -1,57 +0,0 @@
-name: Test @notesnook/editor
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "packages/editor/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/editor.tests.yml"
-  pull_request:
-    types:
-      - "ready_for_review"
-      - "opened"
-      - "synchronize"
-      - "reopened"
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: "npm"
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
-
-      - name: Install packages
-        run: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
-
-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
-      - name: Build editor
-        run: npx nx build @notesnook/editor
-
-      - name: Run all @notesnook/editor tests
-        run: npx nx test @notesnook/editor

.gitignore

@@ -6,5 +6,4 @@ dist
 nx-cloud.env
 .idea
 .eslintcache
-.env.local
-.nyc_output
+.env.local

CONTRIBUTING.md

@@ -8,9 +8,9 @@ Thank you so much for considering to contribute to Notesnook! If you have no ide
 
 Ugh! Bugs!
 
-> A bug is when software behaves in a way you didn't expect, which the developer didn't intend.
+> A bug is when software behaves in a way that you didn't expect, and the developer didn't intend.
 
-To help us understand what's happening, we first want to **make sure you're using the latest version of Notesnook**.
+To help us understand what's going on, we first want to **make sure you're using the latest version of Notesnook**.
 
 Once you've **confirmed that the bug still exists in the latest version**, you'll want to check to make sure it's not something we already know about in the [opened GitHub issues](https://github.com/streetwriters/notesnook/issues).
 
@@ -30,7 +30,7 @@ Before you open a new feature request, please make sure it's not a duplicate. **
 
 ### Helping out in the issue tracker
 
-New issues are always opened that need to be triaged, sorted & organized, so the developers can easily find the most critical and/or relevant bugs to fix. Any help in this regard is appreciated.
+There are always new issues getting opened that need to be triaged, sorted & organized, so the developers can easily find the most critical and/or relevant bugs to fix. Any help in this regard is appreciated.
 
 In addition to this, you can help out in the following ways:
 
@@ -62,7 +62,7 @@ Once you are done, [open a new pull request](https://docs.github.com/en/pull-req
 
 1. Fork [the repository](https://github.com/streetwriters/notesnook) and create your branch from `master` (you can name your branch anything).
 2. Run `npm run bootstrap` in the repository root.
-3. If you've fixed a bug or added code that should be tested, add tests!
+3. If you’ve fixed a bug or added code that should be tested, add tests!
 4. Ensure the test suite passes (`npm run test`).
 5. Format your code with prettier (`npm run prettier`).
 6. Make sure your code lints (`npm run lint`). Tip: `npm run linc` to only check changed files.
@@ -131,11 +131,11 @@ We use an automatic code formatter called [Prettier](https://prettier.io/). Run
 
 Then, our linter will catch most issues that may exist in your code. You can check the status of your code styling by simply running `npm run lint`.
 
-However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
+However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb’s Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
 
 ## Git Branch Organization
 
-Submit all changes directly to the [`master branch`](https://github.com/streetwriters/notesnook). We don't use separate branches for development or for upcoming releases. This requires us to always keep the `master` branch in a deployable state which means:
+Submit all changes directly to the [`master branch`](https://github.com/streetwriters/notesnook). We don’t use separate branches for development or for upcoming releases. This requires us to always keep the `master` branch in a deployable state which means:
 
 1. All tests must be passing at all times
 2. There should be as few breaking changes as possible

README.md

@@ -10,11 +10,11 @@
 
 ## Overview
 
-Notesnook is a free (as in speech) & open-source note-taking app focused on user privacy & ease of use. To ensure zero knowledge principles, Notesnook encrypts everything on your device using `XChaCha20-Poly1305` & `Argon2`.
+Notesnook is a free (as in speech) & open source note taking app focused on user privacy & ease of use. To ensure zero knowledge principles, Notesnook encrypts everything on your device using `XChaCha20-Poly1305` & `Argon2`.
 
-Notesnook is our **proof** that privacy does _not_ (always) have to come at the cost of convenience. We aim to provide users peace of mind & 100% confidence that their notes are safe and secure. The decision to go fully open source is one of the most crucial steps towards that.
+Notesnook is our **proof** that privacy does _not_ (always) have to come at the cost of convenience. Our goal is to provide users peace of mind & 100% confidence that their notes are safe and secure. The decision to go fully open source is one of the most crucial steps towards that.
 
-This repository contains all the code required to build & use the Notesnook web, desktop & mobile clients. If you are looking for a full feature list or screenshots, please check the [website](https://notesnook.com/).
+This repository contains all the code required to build & use the Notesnook web, desktop & mobile clients. If you are looking for a full features list or screenshots, please check the [website](https://notesnook.com/).
 
 ## Developer guide
 

apps/mobile/README.md

@@ -19,9 +19,9 @@
 
 ## Build instructions
 
-> **Before you start, it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
+> **Before you start it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
 
-### Setting up the development environment
+### Setting up development environment
 
 Requirements:
 
@@ -57,7 +57,7 @@ npm install
 
 ### Running the app on Android
 
-[Setup an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) if you haven't already, and then run the following command to start the app in the Emulator:
+[Setup an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) if you haven't already and then run the following command to start the app in the Emulator:
 
 ```bash
 npm run start:android
@@ -78,11 +78,11 @@ npm run start:ios
 
 ## Developer guide
 
-> This project is in a transition state between Javascript & Typescript. We are gradually porting everything over to Typescript, so if you can help with that, it'd be great!
+> This project is in a transition state between Javascript & Typescript. We are gradually porting everything over to Typescript so if you can help with that, it'd be great!
 
 ### The tech stack
 
-We try to keep the stack as lean as possible:
+We try to keep the stack as lean as possible
 
 1. React Native
 2. Typescript/Javascript
@@ -95,17 +95,17 @@ We try to keep the stack as lean as possible:
 
 The app codebase is distributed over two primary directories. `native/` and `app/`.
 
-- `native/`: Includes `android/` and `ios/` folders and everything related to react native core functionality like bundling, development, and packaging. Any react-native dependency with native code, i.e., android & ios folders, is installed here.
+- `native/`: Includes `android/` and `ios/` folders and everything related to react native core functionality like bundling, development and packaging. Any react-native dependency that has native code i.e android & ios folders, is installed here.
 
-- `app/`: Includes all the app code other than the native part. All JS-only dependencies are installed here.
-  - `components/`: Each component serves a specific purpose in the app UI. For example, the `Paragraph` component is used to render paragraphs in the app, and a `Header` component is used to render a `header` on all screens.
-  - `common/`: Features that are integral to the app's functionality. For example, the notesnook core is initialized here.
+- `app/`: Includes all the app code other than the native part. All JS only dependencies are installed here.
+  - `components/`: Each component serves a specific purpose in the app UI, for example the `Paragraph` component is used to render paragraphs in the app and a `Header` component is used to render a `header` on all screens.
+  - `common/`: Features that have integral role in app functionality, for example, notesnook core is initialized here.
   - `hooks/`: Hooks for different app logic
-  - `navigation/`: Includes app navigation-specific code. Here the app navigation, editor & side menu are rendered side by side in fluid tabs.
+  - `navigation/`: Includes app navigation specific code. Here the app navigation, editor & side menu are rendered side by side in fluid tabs.
   - `screens`: Navigator screens.
-  - `services`: Parts of code that do a specific function. For example, the `sync` service runs Sync from anywhere in the app.
-  - `stores`: We use `zustand` for global state management in the app. Multiple stores provide the state for different parts of the app.
-  - `utils`: General purpose stuff such as constant values, utility functions, etc.
+  - `services`: Parts of code that do a specific function, for example, the `sync` service is responsibe for running Sync from anywhere in the app.
+  - `stores`: We use `zustand` for global state management in the app. There are multiple stores that provide the state for different parts of the app.
+  - `utils`: General purpose stuff such as constant values, utility functions etc.
 
 There are several other folders at the root:
 
@@ -115,11 +115,11 @@ There are several other folders at the root:
 
 ### Running the tests
 
-When you are done making the required changes, you must run the tests to ensure you didn't break anything. We use Detox as the testing framework & the tests can be started as follows:
+When you are done making the required changes, you will need to run the tests to make sure you didn't break anything. We use Detox as the testing framework & the tests can be started as follows:
 
 ### Android
 
-To run the tests on Android, you will need to create an emulator device on your system:
+To run the tests on android, you will need to create an emulator device on your system:
 
 ```
 $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_5_API_31 -d pixel --package "system-images;android-31;default;x86_64"
@@ -127,13 +127,13 @@ $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_5_API_31 -d pixel --packa
 
 If you face problems, follow the detailed guide in [Detox documentation](https://wix.github.io/Detox/docs/introduction/android-dev-env). Keep the emulator name set to `Pixel_5_API_31`.
 
-Once you have created an emulator device, build the Android apks:
+Once you have created an emulator device, build the android apks
 
 ```
 npm run build:android
 ```
 
-Finally, run the tests:
+Finally run the tests
 
 ```
 npm run test:android
@@ -141,9 +141,9 @@ npm run test:android
 
 ### iOS
 
-To run e2e tests on the iOS simulator, you must be on a Mac with XCode installed.
+To run e2e tests on iOS simulator, you must be on a Mac with XCode installed.
 
-First, install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils):
+First install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils)
 
 ```
 brew tap wix/brew
@@ -156,7 +156,7 @@ Now build the iOS app for testing:
 npm run build:ios
 ```
 
-Finally, run the tests:
+Finally run the tests:
 
 ```
 npm run test:ios

apps/mobile/app/app.js

@@ -31,6 +31,14 @@ import { TipManager } from "./services/tip-manager";
 import { useUserStore } from "./stores/use-user-store";
 import { View } from "react-native";
 import { useState } from "react";
+import NetInfo from "@react-native-community/netinfo";
+NetInfo.configure({
+  reachabilityUrl: "https://notesnook.com",
+  reachabilityTest: (response) => {
+    if (!response) return false;
+    return response?.status >= 200 && response?.status < 300;
+  }
+});
 
 SettingsService.init();
 SettingsService.checkOrientation();

apps/mobile/app/common/database/index.js

@@ -68,3 +68,14 @@ db.host(
         ISSUES_HOST: "https://issues.streetwriters.co"
       }
 );
+
+export async function loadDatabase() {
+  // if (!DB) {
+  //   let module = await import(/* webpackChunkName: "notes-core" */ 'notes-core/api/index');
+  //   DB = module.default;
+  // }
+  // db = new DB(Storage, Platform.OS === 'ios' ? EventSource : AndroidEventSource, filesystem);
+  // if (DOMParser) {
+  //   await DOMParser.prepare();
+  // }
+}

apps/mobile/app/common/filesystem/compress.js

@@ -1,50 +0,0 @@
-/*
-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 { Dimensions, Platform } from "react-native";
-import ImageResizer from "@bam.tech/react-native-image-resizer";
-import RNFetchBlob from "rn-fetch-blob";
-/**
- * Scale down & compress images to screen width
- * for loading in editor.
- * @returns
- */
-export async function compressToBase64(path, type) {
-  const { width, scale } = Dimensions.get("window");
-  const response = await ImageResizer.createResizedImage(
-    path,
-    width * scale,
-    9999,
-    type,
-    80,
-    0,
-    undefined,
-    true,
-    {
-      mode: "contain",
-      onlyScaleDown: true
-    }
-  );
-  const base64 = await RNFetchBlob.fs.readFile(
-    Platform.OS === "ios" ? response.uri?.replace("file://", "") : response.uri,
-    "base64"
-  );
-  RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
-  RNFetchBlob.fs.unlink(response.uri.replace("file://", "")).catch(console.log);
-  return base64;
-}

apps/mobile/app/common/filesystem/download-attachment.js

@@ -28,16 +28,8 @@ import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { db } from "../database";
 import Storage from "../database/storage";
 import { cacheDir } from "./utils";
-import { getFileNameWithExtension } from "@notesnook/core/utils/filename";
 
-export default async function downloadAttachment(
-  hash,
-  global = true,
-  options = {
-    silent: false,
-    cache: false
-  }
-) {
+export default async function downloadAttachment(hash, global = true) {
   let attachment = db.attachments.attachment(hash);
   if (!attachment) {
     console.log("attachment not found");
@@ -45,13 +37,11 @@ export default async function downloadAttachment(
   }
 
   let folder = {};
-  if (!options.cache) {
-    if (Platform.OS === "android") {
-      folder = await ScopedStorage.openDocumentTree();
-      if (!folder) return;
-    } else {
-      folder.uri = await Storage.checkAndCreateDir("/downloads/");
-    }
+  if (Platform.OS === "android") {
+    folder = await ScopedStorage.openDocumentTree();
+    if (!folder) return;
+  } else {
+    folder.uri = await Storage.checkAndCreateDir("/downloads/");
   }
 
   try {
@@ -64,11 +54,6 @@ export default async function downloadAttachment(
     )
       return;
 
-    let filename = getFileNameWithExtension(
-      attachment.metadata.filename,
-      attachment.metadata.type
-    );
-
     let key = await db.attachments.decryptKey(attachment.key);
     let info = {
       iv: attachment.iv,
@@ -78,50 +63,46 @@ export default async function downloadAttachment(
       hash: attachment.metadata.hash,
       hashType: attachment.metadata.hashType,
       mime: attachment.metadata.type,
-      fileName: options.cache ? undefined : filename,
-      uri: options.cache ? undefined : folder.uri,
+      fileName: attachment.metadata.filename,
+      uri: folder.uri,
       chunkSize: attachment.chunkSize
     };
 
-    let fileUri = await Sodium.decryptFile(
-      key,
-      info,
-      options.cache ? "cache" : "file"
-    );
+    let fileUri = await Sodium.decryptFile(key, info, "file");
+    ToastEvent.show({
+      heading: "Download successful",
+      message: attachment.metadata.filename + " downloaded",
+      type: "success"
+    });
 
-    if (!options.silent) {
-      ToastEvent.show({
-        heading: "Download successful",
-        message: filename + " downloaded",
-        type: "success"
-      });
-    }
-
-    if (
-      attachment.dateUploaded &&
-      !attachment.metadata?.type?.startsWith("image")
-    ) {
+    if (attachment.dateUploaded) {
       RNFetchBlob.fs
         .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.metadata.hash}`)
         .catch(console.log);
     }
-    if (Platform.OS === "ios" && !options.cache) {
-      fileUri = folder.uri + `/${filename}`;
-    }
-    if (!options.silent) {
-      presentSheet({
-        title: "File downloaded",
-        paragraph: `${filename} saved to ${
-          Platform.OS === "android"
-            ? "selected path"
-            : "File Manager/Notesnook/downloads"
-        }`,
-        icon: "download",
-        context: global ? null : attachment.metadata.hash,
-        component: <ShareComponent uri={fileUri} name={filename} padding={12} />
-      });
-    }
 
+    if (Platform.OS === "ios") {
+      fileUri = folder.uri + `/${attachment.metadata.filename}`;
+    }
+    console.log("saved file uri: ", fileUri);
+
+    presentSheet({
+      title: "File downloaded",
+      paragraph: `${attachment.metadata.filename} saved to ${
+        Platform.OS === "android"
+          ? "selected path"
+          : "File Manager/Notesnook/downloads"
+      }`,
+      icon: "download",
+      context: global ? null : attachment.metadata.hash,
+      component: (
+        <ShareComponent
+          uri={fileUri}
+          name={attachment.metadata.filename}
+          padding={12}
+        />
+      )
+    });
     return fileUri;
   } catch (e) {
     console.log("download attachment error: ", e);

apps/mobile/app/common/filesystem/index.js

@@ -23,16 +23,14 @@ import {
   deleteFile,
   exists,
   readEncrypted,
-  writeEncryptedBase64,
-  hashBase64
+  writeEncrypted
 } from "./io";
 import { uploadFile } from "./upload";
 import { cancelable } from "./utils";
 
 export default {
   readEncrypted,
-  writeEncryptedBase64,
-  hashBase64,
+  writeEncrypted,
   uploadFile: cancelable(uploadFile),
   downloadFile: cancelable(downloadFile),
   deleteFile,

apps/mobile/app/common/filesystem/io.js

@@ -21,8 +21,6 @@ import { Platform } from "react-native";
 import Sodium from "@ammarahmed/react-native-sodium";
 import RNFetchBlob from "rn-fetch-blob";
 import { cacheDir, getRandomId } from "./utils";
-import { db } from "../database";
-import { compressToBase64 } from "./compress";
 
 export async function readEncrypted(filename, key, cipherData) {
   let path = `${cacheDir}/${filename}`;
@@ -31,9 +29,6 @@ export async function readEncrypted(filename, key, cipherData) {
     if (!exists) {
       return false;
     }
-    const attachment = db.attachments.attachment(filename);
-    const isPng = /(png)/g.test(attachment?.metadata.type);
-    const isJpeg = /(jpeg|jpg)/g.test(attachment?.metadata.type);
 
     let output = await Sodium.decryptFile(
       key,
@@ -41,20 +36,8 @@ export async function readEncrypted(filename, key, cipherData) {
         ...cipherData,
         hash: filename
       },
-      cipherData.outputType === "base64"
-        ? isPng || isJpeg
-          ? "cache"
-          : "base64"
-        : "text"
+      cipherData.outputType === "base64" ? "base64" : "text"
     );
-    if (cipherData.outputType === "base64" && (isPng || isJpeg)) {
-      const dCachePath = `${cacheDir}/${output}`;
-      output = await compressToBase64(
-        `file://${dCachePath}`,
-        isPng ? "PNG" : "JPEG"
-      );
-    }
-
     return output;
   } catch (e) {
     RNFetchBlob.fs.unlink(path).catch(console.log);
@@ -63,26 +46,17 @@ export async function readEncrypted(filename, key, cipherData) {
   }
 }
 
-export async function hashBase64(data) {
-  const hash = await Sodium.hashFile({
-    type: "base64",
-    data,
-    uri: ""
-  });
-  return {
-    hash: hash,
-    type: "xxh64"
-  };
-}
-
-export async function writeEncryptedBase64({ data, key }) {
+export async function writeEncrypted(filename, { data, type, key }) {
+  console.log("file input: ", { type, key });
   let filepath = cacheDir + `/${getRandomId("imagecache_")}`;
+  console.log(filepath);
   await RNFetchBlob.fs.writeFile(filepath, data, "base64");
   let output = await Sodium.encryptFile(key, {
     uri: Platform.OS === "ios" ? filepath : "file://" + filepath,
     type: "url"
   });
   RNFetchBlob.fs.unlink(filepath).catch(console.log);
+
   console.log("encrypted file output: ", output);
   return {
     ...output,

apps/mobile/app/components/announcements/cta.js

@@ -148,7 +148,7 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
               <Button
                 key={item.title}
                 title={item.title}
-                fontSize={SIZE.xs}
+                fontSize={SIZE.xs + 1}
                 type="gray"
                 onPress={() => onPress(item)}
                 width={null}

apps/mobile/app/components/announcements/title.js

@@ -67,7 +67,7 @@ export const Title = ({ text, style = {}, inline }) => {
           right: 0
         }}
         iconSize={24}
-        fontSize={SIZE.xs}
+        fontSize={SIZE.xs + 1}
         style={{
           borderRadius: 100,
           paddingVertical: 0,

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

@@ -209,7 +209,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
           }}
         >
           <Paragraph
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             style={{
               marginRight: 10
             }}
@@ -221,7 +221,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
             style={{
               marginRight: 10
             }}
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             color={colors.icon}
           >
             {formatBytes(attachment.length)}
@@ -232,7 +232,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
               style={{
                 marginRight: 10
               }}
-              size={SIZE.xs}
+              size={SIZE.xs + 1}
               color={colors.icon}
             >
               {attachment.noteIds.length} note
@@ -248,7 +248,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
                 context: "local"
               });
             }}
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             color={colors.icon}
           >
             {attachment.metadata.hash}
@@ -304,7 +304,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
                 }}
                 key={item.id}
               >
-                <Paragraph size={SIZE.xs}>{item.title}</Paragraph>
+                <Paragraph size={SIZE.xs + 1}>{item.title}</Paragraph>
               </PressableButton>
             ))}
           </>

apps/mobile/app/components/attachments/attachment-item.js

@@ -22,6 +22,7 @@ import { TouchableOpacity, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
+import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { formatBytes } from "../../utils";
 import { SIZE } from "../../utils/size";
@@ -35,17 +36,16 @@ function getFileExtension(filename) {
   var ext = /^.+\.([^.]+)$/.exec(filename);
   return ext == null ? "" : ext[1];
 }
-/**
- *
- * @param {any} param0
- * @returns
- */
+
 export const AttachmentItem = ({ attachment, encryption, setAttachments }) => {
   const colors = useThemeStore((state) => state.colors);
   const [currentProgress, setCurrentProgress] = useAttachmentProgress(
     attachment,
     encryption
   );
+  const encryptionProgress = useAttachmentStore(
+    (state) => state.encryptionProgress
+  );
 
   const onPress = () => {
     Actions.present(attachment, setAttachments, attachment.metadata.hash);
@@ -122,7 +122,7 @@ export const AttachmentItem = ({ attachment, encryption, setAttachments }) => {
         </View>
       </View>
 
-      {currentProgress ? (
+      {currentProgress || encryptionProgress || encryption ? (
         <TouchableOpacity
           activeOpacity={0.9}
           onPress={() => {
@@ -139,7 +139,13 @@ export const AttachmentItem = ({ attachment, encryption, setAttachments }) => {
         >
           <ProgressCircleComponent
             size={SIZE.xxl}
-            progress={currentProgress?.value ? currentProgress?.value / 100 : 0}
+            progress={
+              encryptionProgress
+                ? encryptionProgress
+                : currentProgress?.value
+                ? currentProgress?.value / 100
+                : 0
+            }
             showsText
             textStyle={{
               fontSize: 10

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

@@ -17,33 +17,70 @@ 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, { useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { View } from "react-native";
+import { FlatList } from "react-native-gesture-handler";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import filesystem from "../../common/filesystem";
-import { presentSheet } from "../../services/event-manager";
+import {
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../services/event-manager";
 import { useThemeStore } from "../../stores/use-theme-store";
+import {
+  eCloseAttachmentDialog,
+  eOpenAttachmentsDialog
+} from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import DialogHeader from "../dialog/dialog-header";
+import { Toast } from "../toast";
 import Input from "../ui/input";
 import Seperator from "../ui/seperator";
+import SheetWrapper from "../ui/sheet";
 import Paragraph from "../ui/typography/paragraph";
 import { AttachmentItem } from "./attachment-item";
-import { FlatList } from "react-native-actions-sheet";
-
-export const AttachmentDialog = ({ data }) => {
+export const AttachmentDialog = () => {
   const colors = useThemeStore((state) => state.colors);
-  const [note, setNote] = useState(data);
-  const [attachments, setAttachments] = useState(
-    data
-      ? db.attachments.ofNote(data.id, "all")
-      : [...(db.attachments.all || [])]
-  );
+  const [visible, setVisible] = useState(false);
+  const [note, setNote] = useState(null);
+  const actionSheetRef = useRef();
+  const [attachments, setAttachments] = useState([]);
   const attachmentSearchValue = useRef();
   const searchTimer = useRef();
   const [loading, setLoading] = useState(false);
 
+  useEffect(() => {
+    eSubscribeEvent(eOpenAttachmentsDialog, open);
+    eSubscribeEvent(eCloseAttachmentDialog, close);
+    return () => {
+      eUnSubscribeEvent(eOpenAttachmentsDialog, open);
+      eUnSubscribeEvent(eCloseAttachmentDialog, close);
+    };
+  }, [visible]);
+
+  const open = (data) => {
+    if (data?.id) {
+      setNote(data);
+      let _attachments = db.attachments.ofNote(data.id, "all");
+      setAttachments(_attachments);
+    } else {
+      setAttachments([...db.attachments.all]);
+    }
+    setVisible(true);
+  };
+
+  useEffect(() => {
+    if (visible) {
+      actionSheetRef.current?.show();
+    }
+  }, [visible]);
+
+  const close = () => {
+    actionSheetRef.current?.hide();
+    setVisible(false);
+  };
+
   const onChangeText = (text) => {
     attachmentSearchValue.current = text;
     if (
@@ -67,101 +104,107 @@ export const AttachmentDialog = ({ data }) => {
     <AttachmentItem setAttachments={setAttachments} attachment={item} />
   );
 
-  return (
-    <View
-      style={{
-        width: "100%",
-        alignSelf: "center",
-        paddingHorizontal: 12
+  return !visible ? null : (
+    <SheetWrapper
+      centered={false}
+      fwdRef={actionSheetRef}
+      onClose={async () => {
+        setVisible(false);
       }}
     >
-      <DialogHeader
-        title={note ? "Attachments" : "Manage attachments"}
-        paragraph="Tap on an attachment to view properties"
-        button={{
-          title: "Check all",
-          type: "grayAccent",
-          loading: loading,
-          onPress: async () => {
-            setLoading(true);
-            for (let attachment of attachments) {
-              let result = await filesystem.checkAttachment(
-                attachment.metadata.hash
-              );
-              if (result.failed) {
-                db.attachments.markAsFailed(
-                  attachment.metadata.hash,
-                  result.failed
-                );
-              } else {
-                db.attachments.markAsFailed(attachment.id, null);
-              }
-              setAttachments([...db.attachments.all]);
-            }
-            setLoading(false);
-          }
-        }}
-      />
-      <Seperator />
-      {!note ? (
-        <Input
-          placeholder="Filter attachments by filename, type or hash"
-          onChangeText={onChangeText}
-          onSubmit={() => {
-            onChangeText(attachmentSearchValue.current);
-          }}
-        />
-      ) : null}
-
-      <FlatList
-        keyboardDismissMode="none"
-        keyboardShouldPersistTaps="always"
-        maxToRenderPerBatch={10}
-        initialNumToRender={10}
-        windowSize={5}
-        ListEmptyComponent={
-          <View
-            style={{
-              height: 150,
-              justifyContent: "center",
-              alignItems: "center"
-            }}
-          >
-            <Icon name="attachment" size={60} color={colors.icon} />
-            <Paragraph>
-              {note ? "No attachments on this note" : "No attachments"}
-            </Paragraph>
-          </View>
-        }
-        ListFooterComponent={
-          <View
-            style={{
-              height: 350
-            }}
-          />
-        }
-        data={attachments}
-        keyExtractor={(item) => item.id}
-        renderItem={renderItem}
-      />
-
-      <Paragraph
-        color={colors.icon}
-        size={SIZE.xs}
+      <Toast context="local" />
+      <View
         style={{
-          textAlign: "center",
-          marginTop: 10
+          width: "100%",
+          alignSelf: "center",
+          paddingHorizontal: 12
         }}
       >
-        <Icon name="shield-key-outline" size={SIZE.xs} color={colors.icon} />
-        {"  "}All attachments are end-to-end encrypted.
-      </Paragraph>
-    </View>
+        <DialogHeader
+          title={note ? "Attachments" : "Manage attachments"}
+          paragraph="Tap on an attachment to view properties"
+          button={{
+            title: "Check all",
+            type: "grayAccent",
+            loading: loading,
+            onPress: async () => {
+              setLoading(true);
+              for (let attachment of attachments) {
+                let result = await filesystem.checkAttachment(
+                  attachment.metadata.hash
+                );
+                if (result.failed) {
+                  db.attachments.markAsFailed(
+                    attachment.metadata.hash,
+                    result.failed
+                  );
+                } else {
+                  db.attachments.markAsFailed(attachment.id, null);
+                }
+                setAttachments([...db.attachments.all]);
+              }
+              setLoading(false);
+            }
+          }}
+        />
+        <Seperator />
+        {!note ? (
+          <Input
+            placeholder="Filter attachments by filename, type or hash"
+            onChangeText={onChangeText}
+            onSubmit={() => {
+              onChangeText(attachmentSearchValue.current);
+            }}
+          />
+        ) : null}
+
+        <FlatList
+          nestedScrollEnabled
+          overScrollMode="never"
+          scrollToOverflowEnabled={false}
+          keyboardDismissMode="none"
+          keyboardShouldPersistTaps="always"
+          onMomentumScrollEnd={() => {
+            actionSheetRef.current?.handleChildScrollEnd();
+          }}
+          ListEmptyComponent={
+            <View
+              style={{
+                height: 150,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <Icon name="attachment" size={60} color={colors.icon} />
+              <Paragraph>
+                {note ? "No attachments on this note" : "No attachments"}
+              </Paragraph>
+            </View>
+          }
+          ListFooterComponent={
+            <View
+              style={{
+                height: 350
+              }}
+            />
+          }
+          data={attachments}
+          keyExtractor={(item) => item.id}
+          renderItem={renderItem}
+        />
+
+        <Paragraph
+          color={colors.icon}
+          size={SIZE.xs}
+          style={{
+            textAlign: "center",
+            marginTop: 10
+          }}
+        >
+          <Icon name="shield-key-outline" size={SIZE.xs} color={colors.icon} />
+          {"  "}All attachments are end-to-end encrypted.
+        </Paragraph>
+      </View>
+    </SheetWrapper>
   );
 };
-
-AttachmentDialog.present = (note) => {
-  presentSheet({
-    component: () => <AttachmentDialog data={note} />
-  });
-};

apps/mobile/app/components/auth/session-expired.js

@@ -44,10 +44,8 @@ import Paragraph from "../ui/typography/paragraph";
 import { LoginSteps, useLogin } from "./use-login";
 
 function getObfuscatedEmail(email) {
-  if (!email) return "";
-  const [username, provider] = email.split("@");
-  if (username.length === 1) return `****@${provider}`;
-  return email.replace(/(.{1})(.*)(?=@)/, function (gp1, gp2, gp3) {
+  if (!email) return null;
+  return email.replace(/(.{2})(.*)(?=@)/, function (gp1, gp2, gp3) {
     for (let i = 0; i < gp3.length; i++) {
       gp2 += "*";
     }

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

@@ -21,6 +21,7 @@ import React from "react";
 import { useNoteStore } from "../../stores/use-notes-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { AnnouncementDialog } from "../announcements";
+import { AttachmentDialog } from "../attachments";
 import AuthModal from "../auth/auth-modal";
 import { SessionExpired } from "../auth/session-expired";
 import { Dialog } from "../dialog";
@@ -33,6 +34,10 @@ import MergeConflicts from "../merge-conflicts";
 import PremiumDialog from "../premium";
 import { Expiring } from "../premium/expiring";
 import SheetProvider from "../sheet-provider";
+import { AddNotebookSheet } from "../sheets/add-notebook";
+import AddToNotebookSheet from "../sheets/add-to";
+import ManageTagsSheet from "../sheets/manage-tags";
+import PublishNoteSheet from "../sheets/publish-note";
 import RateAppSheet from "../sheets/rate-app";
 import RecoveryKeySheet from "../sheets/recovery-key";
 import RestoreDataSheet from "../sheets/restore-data";
@@ -46,6 +51,7 @@ const DialogProvider = () => {
       <LoadingDialog />
       <Dialog context="global" />
       <AddTopicDialog colors={colors} />
+      <AddNotebookSheet colors={colors} />
       <PremiumDialog colors={colors} />
       <AuthModal colors={colors} />
       <MergeConflicts />
@@ -55,8 +61,12 @@ const DialogProvider = () => {
       <RestoreDataSheet />
       <ResultDialog />
       <VaultDialog colors={colors} />
+      <AddToNotebookSheet colors={colors} />
       <RateAppSheet />
       <ImagePreview />
+      <PublishNoteSheet />
+      <ManageTagsSheet />
+      <AttachmentDialog />
       {loading ? null : <Expiring />}
       <AnnouncementDialog />
       <SessionExpired />

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

@@ -35,7 +35,6 @@ import BaseDialog from "./base-dialog";
 import DialogButtons from "./dialog-buttons";
 import DialogHeader from "./dialog-header";
 import { useCallback } from "react";
-import { Button } from "../ui/button";
 
 export const Dialog = ({ context = "global" }) => {
   const colors = useThemeStore((state) => state.colors);
@@ -55,11 +54,7 @@ export const Dialog = ({ context = "global" }) => {
     input: false,
     inputPlaceholder: "Enter some text",
     defaultValue: "",
-    disableBackdropClosing: false,
-    check: {
-      info: "Check",
-      type: "transparent"
-    }
+    disableBackdropClosing: false
   });
 
   useEffect(() => {
@@ -92,7 +87,6 @@ export const Dialog = ({ context = "global" }) => {
       if (data.context !== context) return;
       setDialogInfo(data);
       setVisible(true);
-      setInputValue(data.defaultValue);
     },
     [context]
   );
@@ -143,9 +137,6 @@ export const Dialog = ({ context = "global" }) => {
           paragraph={dialogInfo.paragraph}
           paragraphColor={dialogInfo.paragraphColor}
           padding={12}
-          style={{
-            minHeight: 0
-          }}
         />
         <Seperator half />
 
@@ -172,28 +163,6 @@ export const Dialog = ({ context = "global" }) => {
           </View>
         ) : null}
 
-        {dialogInfo.check ? (
-          <>
-            <Button
-              onPress={() => {
-                setInputValue(!inputValue);
-              }}
-              icon={
-                inputValue
-                  ? "check-circle-outline"
-                  : "checkbox-blank-circle-outline"
-              }
-              style={{
-                justifyContent: "flex-start"
-              }}
-              height={35}
-              width="100%"
-              title={dialogInfo.check.info}
-              type={inputValue ? dialogInfo.check.type : "gray"}
-            />
-          </>
-        ) : null}
-
         <DialogButtons
           onPressNegative={onNegativePress}
           onPressPositive={dialogInfo.positivePress && onPressPositive}

apps/mobile/app/components/dialogs/add-topic/index.js

@@ -22,7 +22,6 @@ import { View } from "react-native";
 
 import { useMenuStore } from "../../../stores/use-menu-store";
 import {
-  eSendEvent,
   eSubscribeEvent,
   eUnSubscribeEvent,
   ToastEvent
@@ -31,7 +30,6 @@ import Navigation from "../../../services/navigation";
 import { db } from "../../../common/database";
 import {
   eCloseAddTopicDialog,
-  eOnTopicSheetUpdate,
   eOpenAddTopicDialog
 } from "../../../utils/events";
 import { sleep } from "../../../utils/time";
@@ -42,7 +40,6 @@ import DialogHeader from "../../dialog/dialog-header";
 import Input from "../../ui/input";
 import Seperator from "../../ui/seperator";
 import { Toast } from "../../toast";
-import { useRelationStore } from "../../../stores/use-relation-store";
 
 export class AddTopicDialog extends React.Component {
   constructor(props) {
@@ -62,12 +59,14 @@ export class AddTopicDialog extends React.Component {
 
   addNewTopic = async () => {
     try {
+      this.setState({ loading: true });
       if (!this.title || this.title?.trim() === "") {
         ToastEvent.show({
           heading: "Topic title is required",
           type: "error",
           context: "local"
         });
+        this.setState({ loading: false });
         return;
       }
 
@@ -79,13 +78,10 @@ export class AddTopicDialog extends React.Component {
 
         await db.notebooks.notebook(topic.notebookId).topics.add(topic);
       }
+      this.setState({ loading: false });
       this.close();
-      setTimeout(() => {
-        Navigation.queueRoutesForUpdate();
-        useMenuStore.getState().setMenuPins();
-      });
-      eSendEvent(eOnTopicSheetUpdate);
-      useRelationStore.getState().update();
+      Navigation.queueRoutesForUpdate("Notebooks", "Notebook", "TopicNotes");
+      useMenuStore.getState().setMenuPins();
     } catch (e) {
       console.error(e);
     }
@@ -181,6 +177,7 @@ export class AddTopicDialog extends React.Component {
             positiveTitle={this.toEdit ? "Save" : "Add"}
             onPressNegative={() => this.close()}
             onPressPositive={() => this.addNewTopic()}
+            loading={this.state.loading}
           />
         </DialogContainer>
         <Toast context="local" />

apps/mobile/app/components/dialogs/result/index.js

@@ -135,6 +135,7 @@ const ResultDialog = () => {
               paddingHorizontal: 12
             }}
             onPress={close}
+            height={50}
             fontSize={SIZE.md + 2}
           />
         </View>

apps/mobile/app/components/dialogs/result/pro-features.js

@@ -86,7 +86,7 @@ export const ProFeatures = ({ count = 6 }) => {
           await sleep(300);
           eSendEvent(eOpenPremiumDialog);
         }}
-        size={SIZE.xs}
+        size={SIZE.xs + 1}
         style={{
           textDecorationLine: "underline",
           color: colors.icon

apps/mobile/app/components/dialogs/vault/index.js

@@ -207,7 +207,13 @@ export class VaultDialog extends Component {
       return;
     }
 
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "TopicNotes",
+      "TaggedNotes",
+      "ColoredNotes"
+    );
 
     this.password = null;
     this.confirmPassword = null;

apps/mobile/app/components/header/title.js

@@ -30,6 +30,7 @@ import { useThemeStore } from "../../stores/use-theme-store";
 import { eScrollEvent } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import Heading from "../ui/typography/heading";
+import Paragraph from "../ui/typography/paragraph";
 import { useCallback } from "react";
 import Tag from "../ui/tag";
 
@@ -63,15 +64,13 @@ export const Title = () => {
       }
       if (data.y > 150) {
         if (!hide) return;
-        titleState[currentScreen.id] = false;
         setHide(false);
       } else {
         if (hide) return;
-        titleState[currentScreen.id] = true;
         setHide(true);
       }
     },
-    [currentScreen.id, currentScreen.name, hide]
+    [currentScreen.name, hide]
   );
 
   useEffect(() => {
@@ -86,6 +85,10 @@ export const Title = () => {
     }
   }, [currentScreen.id, currentScreen.name]);
 
+  useEffect(() => {
+    titleState[currentScreen.id] = hide;
+  }, [currentScreen.id, hide]);
+
   useEffect(() => {
     eSubscribeEvent(eScrollEvent, onScroll);
     return () => {
@@ -109,16 +112,25 @@ export const Title = () => {
       {!hide && !isHidden ? (
         <Heading
           onPress={navigateToNotebook}
-          numberOfLines={1}
-          size={SIZE.xl}
+          numberOfLines={isTopic ? 2 : 1}
+          size={isTopic ? SIZE.md + 2 : SIZE.xl}
           style={{
             flexWrap: "wrap",
             marginTop: Platform.OS === "ios" ? -1 : 0
           }}
           color={currentScreen.color || colors.heading}
         >
+          {isTopic ? (
+            <Paragraph numberOfLines={1} size={SIZE.xs + 1}>
+              {notebook?.title}
+              {"\n"}
+            </Paragraph>
+          ) : null}
           {isTag ? (
-            <Heading size={SIZE.xl} color={colors.accent}>
+            <Heading
+              size={isTopic ? SIZE.md + 2 : SIZE.xl}
+              color={colors.accent}
+            >
               #
             </Heading>
           ) : null}

apps/mobile/app/components/image-preview/index.js

@@ -18,26 +18,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useEffect, useState } from "react";
-import { Platform, View } from "react-native";
+import { View } from "react-native";
 import ImageViewer from "react-native-image-zoom-viewer";
-import downloadAttachment from "../../common/filesystem/download-attachment";
-import { cacheDir } from "../../common/filesystem/utils";
 import {
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../services/event-manager";
-import { useThemeStore } from "../../stores/use-theme-store";
 import BaseDialog from "../dialog/base-dialog";
 import { IconButton } from "../ui/icon-button";
-import { ProgressBarComponent } from "../ui/svg/lazy";
-import Sodium from "@ammarahmed/react-native-sodium";
-import dataurl from "@notesnook/core/utils/dataurl";
 
 const ImagePreview = () => {
-  const colors = useThemeStore((state) => state.colors);
   const [visible, setVisible] = useState(false);
   const [image, setImage] = useState("");
-  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     eSubscribeEvent("ImagePreview", open);
@@ -47,29 +39,9 @@ const ImagePreview = () => {
     };
   }, []);
 
-  const open = async (image) => {
+  const open = (image) => {
+    setImage(image);
     setVisible(true);
-    setLoading(true);
-    setTimeout(async () => {
-      let hash = image.hash;
-      if (!hash && dataurl.toObject(image.src)) {
-        const data = dataurl.toObject(image.src);
-        if (!data) return;
-        hash = await Sodium.hashFile({
-          data: data.data,
-          type: "base64",
-          uri: ""
-        });
-      }
-      if (!hash) return;
-      const uri = await downloadAttachment(hash, false, {
-        silent: true,
-        cache: true
-      });
-      const path = `${cacheDir}/${uri}`;
-      setImage("file://" + path);
-      setLoading(false);
-    }, 100);
   };
 
   const close = () => {
@@ -87,60 +59,44 @@ const ImagePreview = () => {
             backgroundColor: "black"
           }}
         >
-          {loading ? (
-            <View
-              style={{
-                flex: 1,
-                justifyContent: "center",
-                alignItems: "center"
-              }}
-            >
-              <ProgressBarComponent
-                indeterminate
-                color={colors.accent}
-                borderColor="transparent"
-              />
-            </View>
-          ) : (
-            <ImageViewer
-              enableImageZoom={true}
-              renderIndicator={() => <></>}
-              enableSwipeDown
-              useNativeDriver
-              onSwipeDown={close}
-              saveToLocalByLongPress={false}
-              renderHeader={() => (
-                <View
-                  style={{
-                    flexDirection: "row",
-                    width: "100%",
-                    justifyContent: "flex-end",
-                    alignItems: "center",
-                    height: 80,
-                    marginTop: 0,
-                    paddingHorizontal: 12,
-                    position: "absolute",
-                    zIndex: 999,
-                    backgroundColor: "rgba(0,0,0,0.3)",
-                    paddingTop: Platform.OS === "android" ? 30 : 0
+          <ImageViewer
+            enableImageZoom={true}
+            renderIndicator={() => <></>}
+            enableSwipeDown
+            useNativeDriver
+            onSwipeDown={close}
+            saveToLocalByLongPress={false}
+            renderHeader={() => (
+              <View
+                style={{
+                  flexDirection: "row",
+                  width: "100%",
+                  justifyContent: "flex-end",
+                  alignItems: "center",
+                  height: 80,
+                  marginTop: 0,
+                  paddingHorizontal: 12,
+                  position: "absolute",
+                  zIndex: 999,
+                  backgroundColor: "rgba(0,0,0,0.3)",
+                  paddingTop: 30
+                }}
+              >
+                <IconButton
+                  name="close"
+                  color="white"
+                  onPress={() => {
+                    close();
                   }}
-                >
-                  <IconButton
-                    name="close"
-                    color="white"
-                    onPress={() => {
-                      close();
-                    }}
-                  />
-                </View>
-              )}
-              imageUrls={[
-                {
-                  url: image
-                }
-              ]}
-            />
-          )}
+                />
+              </View>
+            )}
+            imageUrls={[
+              {
+                url: image
+              }
+            ]}
+          />
         </View>
       </BaseDialog>
     )

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

@@ -17,14 +17,12 @@ 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 notifee from "@notifee/react-native";
 import React, { useCallback, useEffect, useRef } from "react";
 import { Platform, View } from "react-native";
 import RNBootSplash from "react-native-bootsplash";
 import { checkVersion } from "react-native-check-version";
-import Config from "react-native-config";
 import { enabled } from "react-native-privacy-snapshot";
-import { DatabaseLogger, db } from "../../common/database";
+import { DatabaseLogger, db, loadDatabase } from "../../common/database";
 import { useAppState } from "../../hooks/use-app-state";
 import BiometricService from "../../services/biometrics";
 import { eSendEvent, presentSheet } from "../../services/event-manager";
@@ -37,9 +35,7 @@ import { useNoteStore } from "../../stores/use-notes-store";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { useUserStore } from "../../stores/use-user-store";
-import { AndroidModule } from "../../utils";
 import { eOpenAnnouncementDialog } from "../../utils/events";
-import { getGithubVersion } from "../../utils/github-version";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { SVG } from "../auth/background";
@@ -54,6 +50,10 @@ import { SvgView } from "../ui/svg";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { Walkthrough } from "../walkthroughs";
+import Config from "react-native-config";
+import { getGithubVersion } from "../../utils/github-version";
+import notifee from "@notifee/react-native";
+
 
 const Launcher = React.memo(
   function Launcher() {
@@ -70,8 +70,7 @@ const Launcher = React.memo(
     const introCompleted = useSettingStore(
       (state) => state.settings.introCompleted
     );
-    const verifying = useRef(false);
-
+    const dbInitCompleted = useRef(false);
     const loadNotes = useCallback(async () => {
       if (verifyUser) {
         return;
@@ -82,25 +81,28 @@ const Launcher = React.memo(
           initialize();
           setImmediate(() => {
             setLoading(false);
+            if (!dbInitCompleted.current) {
+              setImmediate(() => doAppLoadActions());
+            }
           });
         });
       });
-    }, [setLoading, verifyUser]);
+    }, [doAppLoadActions, setLoading, verifyUser]);
 
     const init = useCallback(async () => {
-      if (!db.isInitialized) {
+      if (!dbInitCompleted.current) {
         await RNBootSplash.hide({ fade: true });
+        await loadDatabase();
         DatabaseLogger.info("Initializing database");
         await db.init();
+        dbInitCompleted.current = true;
       }
 
       if (db.migrations.required() && !verifyUser) {
         presentSheet({
           component: <Migrate />,
           onClose: async () => {
-            if (!db.isInitialized) {
-              await db.init();
-            }
+            await db.init();
             loadNotes();
           },
           disableClosing: true
@@ -119,6 +121,9 @@ const Launcher = React.memo(
       if (!loading) {
         doAppLoadActions();
       }
+      return () => {
+        dbInitCompleted.current = false;
+      };
     }, [doAppLoadActions, loading]);
 
     const doAppLoadActions = useCallback(async () => {
@@ -146,7 +151,7 @@ const Launcher = React.memo(
     }, [introCompleted]);
 
     const checkAppUpdateAvailable = async () => {
-      if (__DEV__ || Config.isTesting === "true") return;
+      if (__DEV__) return;
       try {
         const version =
           Config.GITHUB_RELEASE === "true"
@@ -194,11 +199,6 @@ const Launcher = React.memo(
 
     const onUnlockBiometrics = useCallback(async () => {
       if (!(await BiometricService.isBiometryAvailable())) return;
-      if (Platform.OS === "android") {
-        const activityName = await AndroidModule.getActivityName();
-        if (activityName !== "MainActivity") return;
-      }
-
       let verified = await BiometricService.validateUser(
         "Unlock to access your notes",
         ""
@@ -207,9 +207,6 @@ const Launcher = React.memo(
         setVerifyUser(false);
         enabled(false);
         password.current = null;
-        setTimeout(() => {
-          verifying.current = false;
-        }, 1);
       }
     }, [setVerifyUser]);
 
@@ -218,9 +215,7 @@ const Launcher = React.memo(
     }, [init, verifyUser]);
 
     useEffect(() => {
-      if (verifying.current) return;
       if (verifyUser && appState === "active") {
-        verifying.current = true;
         onUnlockBiometrics();
       }
     }, [appState, onUnlockBiometrics, verifyUser]);

apps/mobile/app/components/list-items/note/index.js

@@ -24,10 +24,8 @@ import { View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { notesnook } from "../../../../e2e/test.ids";
 import { db } from "../../../common/database";
-import Notebook from "../../../screens/notebook";
 import { TaggedNotes } from "../../../screens/notes/tagged";
 import { TopicNotes } from "../../../screens/notes/topic-notes";
-import useNavigationStore from "../../../stores/use-navigation-store";
 import { useRelationStore } from "../../../stores/use-relation-store";
 import { useSettingStore } from "../../../stores/use-setting-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
@@ -41,6 +39,10 @@ import { TimeSince } from "../../ui/time-since";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 
+const navigateToTopic = (topic) => {
+  TopicNotes.navigate(topic, true);
+};
+
 function navigateToTag(item) {
   const tag = db.tags.tag(item.id);
   if (!tag) return;
@@ -53,48 +55,30 @@ const showActionSheet = (item) => {
 
 function getNotebook(item) {
   const isTrash = item.type === "trash";
-  const currentId = useNavigationStore.getState().currentScreen.id;
-  if (isTrash) return [];
-  const items = [];
-  const notebooks = db.relations.to(item, "notebook") || [];
+  if (isTrash || !item.notebooks || item.notebooks.length < 1) return [];
 
-  for (let notebook of notebooks) {
-    if (items.length > 1) break;
-    if (notebook.id === currentId) continue;
-    items.push(notebook);
-  }
+  return item.notebooks.reduce(function (prev, curr) {
+    if (prev && prev.length > 0) return prev;
+    const topicId = curr.topics[0];
+    const notebook = db.notebooks?.notebook(curr.id)?.data;
+    if (!notebook) return [];
+    const topic = notebook.topics.find((t) => t.id === topicId);
+    if (!topic) return [];
 
-  if (item.notebooks) {
-    for (let nb of item.notebooks) {
-      if (items.length > 1) break;
-      const notebook = db.notebooks?.notebook(nb.id)?.data;
-      if (!notebook) continue;
-      for (let topicId of nb.topics) {
-        if (items.length > 1) break;
-        if (topicId === currentId) continue;
-        const topic = notebook.topics.find((t) => t.id === topicId);
-        if (!topic) continue;
-        items.push(topic);
+    return [
+      {
+        title: `${notebook?.title} › ${topic?.title}`,
+        notebook: notebook,
+        topic: topic
       }
-    }
-  }
-  return items;
-}
-
-function getTags(item) {
-  const noteTags = item.tags?.slice(0, 3) || [];
-  const tags = [];
-  for (const tagName of noteTags) {
-    const tag = db.tags.tag(tagName);
-    if (!tag) continue;
-    tags.push(tag);
-  }
-  return tags;
+    ];
+  }, []);
 }
 
 const NoteItem = ({
   item,
   isTrash,
+  tags,
   dateBy = "dateCreated",
   noOpen = false
 }) => {
@@ -104,13 +88,11 @@ const NoteItem = ({
   );
   const compactMode = notesListMode === "compact";
   const attachmentCount = db.attachments?.ofNote(item.id, "all")?.length || 0;
-  const _update = useRelationStore((state) => state.updater);
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const notebooks = React.useMemo(() => getNotebook(item), [item, _update]);
+  const notebooks = React.useMemo(() => getNotebook(item), [item]);
   const reminders = db.relations.from(item, "reminder");
   const reminder = getUpcomingReminder(reminders);
+  const _update = useRelationStore((state) => state.updater);
   const noteColor = COLORS_NOTE[item.color?.toLowerCase()];
-  const tags = getTags(item);
   return (
     <>
       <View
@@ -130,17 +112,12 @@ const NoteItem = ({
               flexWrap: "wrap"
             }}
           >
-            {notebooks?.map((item) => (
+            {notebooks?.map((_item) => (
               <Button
-                title={
-                  item.title.length > 25
-                    ? item.title.slice(0, 25) + "..."
-                    : item.title
-                }
-                tooltipText={item.title}
-                key={item.id}
+                title={_item.title}
+                key={_item}
                 height={25}
-                icon={item.type === "topic" ? "bookmark" : "book-outline"}
+                icon="book-outline"
                 type="grayBg"
                 fontSize={SIZE.xs}
                 iconSize={SIZE.sm}
@@ -155,13 +132,7 @@ const NoteItem = ({
                   paddingHorizontal: 6,
                   marginBottom: 5
                 }}
-                onPress={() => {
-                  if (item.type === "topic") {
-                    TopicNotes.navigate(item, true);
-                  } else {
-                    Notebook.navigate(item);
-                  }
-                }}
+                onPress={() => navigateToTopic(_item.topic)}
               />
             ))}
 

apps/mobile/app/components/list-items/note/wrapper.js

@@ -100,7 +100,7 @@ export const openNote = async (item, isTrash, setSelectedItem, isSheet) => {
 };
 
 export const NoteWrapper = React.memo(
-  function NoteWrapper({ item, index, dateBy, isSheet }) {
+  function NoteWrapper({ item, index, tags, dateBy, isSheet }) {
     const isTrash = item.type === "trash";
     const setSelectedItem = useSelectionStore((state) => state.setSelectedItem);
 
@@ -113,7 +113,7 @@ export const NoteWrapper = React.memo(
         isSheet={isSheet}
         item={item}
       >
-        <NoteItem item={item} dateBy={dateBy} isTrash={isTrash} />
+        <NoteItem item={item} dateBy={dateBy} tags={tags} isTrash={isTrash} />
       </SelectionWrapper>
     );
   },
@@ -125,6 +125,10 @@ export const NoteWrapper = React.memo(
       return false;
     }
 
+    if (JSON.stringify(prev.tags) !== JSON.stringify(next.tags)) {
+      return false;
+    }
+
     if (prev.item !== next.item) {
       return false;
     }

apps/mobile/app/components/list-items/notebook/wrapper.js

@@ -64,7 +64,16 @@ export const openNotebookTopic = (item) => {
       negativeText: "Delete",
       positivePress: async () => {
         await db.trash.restore(item.id);
-        Navigation.queueRoutesForUpdate();
+        Navigation.queueRoutesForUpdate(
+          "Tags",
+          "Notes",
+          "Notebooks",
+          "Favorites",
+          "Trash",
+          "TaggedNotes",
+          "ColoredNotes",
+          "TopicNotes"
+        );
         useSelectionStore.getState().setSelectionMode(false);
         ToastEvent.show({
           heading: "Restore successful",

apps/mobile/app/components/list-items/reminder/index.tsx

@@ -108,7 +108,7 @@ const ReminderItem = React.memo(
                   color={colors.errorText}
                 />
                 <Paragraph
-                  size={SIZE.xs}
+                  size={SIZE.xs + 1}
                   color={colors.icon}
                   style={{ marginLeft: 5 }}
                 >
@@ -133,7 +133,7 @@ const ReminderItem = React.memo(
               >
                 <Icon name="reload" size={SIZE.md} color={colors.accent} />
                 <Paragraph
-                  size={SIZE.xs}
+                  size={SIZE.xs + 1}
                   color={colors.icon}
                   style={{ marginLeft: 5 }}
                 >
@@ -147,7 +147,7 @@ const ReminderItem = React.memo(
             <ReminderTime
               reminder={item}
               checkIsActive={false}
-              fontSize={SIZE.xs}
+              fontSize={SIZE.xs + 1}
               style={{
                 justifyContent: "flex-start",
                 borderWidth: 0,

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

@@ -17,7 +17,7 @@ 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, { useEffect, useRef } from "react";
+import React, { useRef } from "react";
 import { RefreshControl, View } from "react-native";
 import { FlashList } from "@shopify/flash-list";
 import Animated, { FadeInDown } from "react-native-reanimated";
@@ -57,10 +57,24 @@ const RenderItem = ({ item, index, type, ...restArgs }) => {
   const dateBy =
     groupOptions.sortBy !== "title" ? groupOptions.sortBy : "dateEdited";
   const totalNotes = getTotalNotes(item);
+  const tags =
+    item.tags
+      ?.slice(0, 3)
+      ?.map((item) => {
+        let tag = db.tags.tag(item);
 
+        if (!tag) return null;
+        return {
+          title: tag.title,
+          id: tag.id,
+          alias: tag.alias
+        };
+      })
+      .filter((t) => t !== null) || [];
   return (
     <Item
       item={item}
+      tags={tags}
       dateBy={dateBy}
       index={index}
       type={type}
@@ -89,9 +103,7 @@ const List = ({
   ListHeader,
   warning,
   isSheet = false,
-  onMomentumScrollEnd,
-  handlers,
-  ScrollComponent
+  onMomentumScrollEnd
 }) => {
   const colors = useThemeStore((state) => state.colors);
   const scrollRef = useRef();
@@ -139,21 +151,14 @@ const List = ({
     [screen]
   );
 
-  useEffect(() => {
-    eSendEvent(eScrollEvent, {
-      y: 0,
-      screen
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   let styles = {
     width: "100%",
     minHeight: 1,
     minWidth: 1
   };
 
-  const ListView = ScrollComponent ? ScrollComponent : FlashList;
+  const _keyExtractor = (item) => item.id || item.title;
+
   return (
     <>
       <Animated.View
@@ -162,8 +167,7 @@ const List = ({
         }}
         entering={type === "search" ? undefined : FadeInDown}
       >
-        <ListView
-          {...handlers}
+        <FlashList
           style={styles}
           ref={scrollRef}
           testID={notesnook.list.id}
@@ -218,14 +222,12 @@ const List = ({
           }
         />
       </Animated.View>
-      {listData ? (
-        <JumpToSectionDialog
-          screen={screen}
-          data={listData}
-          type={screen === "Notes" ? "home" : type}
-          scrollRef={scrollRef}
-        />
-      ) : null}
+      <JumpToSectionDialog
+        screen={screen}
+        data={listData}
+        type={screen === "Notes" ? "home" : type}
+        scrollRef={scrollRef}
+      />
     </>
   );
 };

apps/mobile/app/components/merge-conflicts/index.js

@@ -85,7 +85,13 @@ const MergeConflicts = () => {
         }
       });
     }
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes"
+    );
     if (editorController.current?.note?.id === note.id) {
       // reload the note in editor
       eSendEvent(eOnLoadNote, {

apps/mobile/app/components/note-history/preview.js

@@ -44,7 +44,16 @@ export default function NotePreview({ session, content, note }) {
   async function restore() {
     if (note && note.type === "trash") {
       await db.trash.restore(note.id);
-      Navigation.queueRoutesForUpdate();
+      Navigation.queueRoutesForUpdate(
+        "Tags",
+        "Notes",
+        "Notebooks",
+        "Favorites",
+        "Trash",
+        "TaggedNotes",
+        "ColoredNotes",
+        "TopicNotes"
+      );
       useSelectionStore.getState().setSelectionMode(false);
       ToastEvent.show({
         heading: "Restore successful",
@@ -64,7 +73,13 @@ export default function NotePreview({ session, content, note }) {
     }
     eSendEvent(eCloseSheet, "note_history");
     eSendEvent(eCloseSheet);
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes"
+    );
 
     ToastEvent.show({
       heading: "Note restored successfully",

apps/mobile/app/components/premium/expiring.js

@@ -143,7 +143,7 @@ export const Expiring = () => {
                     await sleep(300);
                     eSendEvent(eOpenPremiumDialog, promo);
                   }}
-                  size={SIZE.xs}
+                  size={SIZE.xs + 1}
                   style={{
                     textDecorationLine: "underline",
                     color: colors.icon,

apps/mobile/app/components/properties/color-tags.js

@@ -43,7 +43,13 @@ export const ColorTags = ({ item }) => {
     let _note = db.notes.note(note.id).data;
     setNote({ ..._note });
     setColorNotes();
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes"
+    );
     eSendEvent(refreshNotesPage);
   };
 
@@ -83,7 +89,6 @@ export const ColorTags = ({ item }) => {
         flexWrap: "wrap",
         flexGrow: isTablet ? undefined : 1,
         paddingHorizontal: 12,
-        paddingRight: 0,
         alignItems: "center",
         justifyContent: isTablet ? "center" : "space-between"
       }}

apps/mobile/app/components/properties/date-meta.js

@@ -62,10 +62,10 @@ export const DateMeta = ({ item }) => {
         paddingVertical: 3
       }}
     >
-      <Paragraph size={SIZE.xs} color={colors.icon}>
+      <Paragraph size={SIZE.xs + 1} color={colors.icon}>
         {getNameFromKey(key)}
       </Paragraph>
-      <Paragraph size={SIZE.xs} color={colors.icon}>
+      <Paragraph size={SIZE.xs + 1} color={colors.icon}>
         {timeConverter(item[key])}
       </Paragraph>
     </View>

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

@@ -16,9 +16,10 @@ 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 React from "react";
 import { Platform, View } from "react-native";
-import { FlatList } from "react-native-actions-sheet";
+import { ScrollView } from "react-native-gesture-handler";
 import { db } from "../../common/database";
 import { DDS } from "../../services/device-detection";
 import { presentSheet } from "../../services/event-manager";
@@ -36,6 +37,7 @@ import { Items } from "./items";
 import Notebooks from "./notebooks";
 import { Synced } from "./synced";
 import { Tags, TagStrip } from "./tags";
+
 const Line = ({ top = 6, bottom = 6 }) => {
   const colors = useThemeStore((state) => state.colors);
   return (
@@ -51,11 +53,20 @@ const Line = ({ top = 6, bottom = 6 }) => {
   );
 };
 
-export const Properties = ({ close = () => {}, item, buttons = [] }) => {
+export const Properties = ({
+  close = () => {},
+  item,
+  buttons = [],
+  getRef
+}) => {
   const colors = useThemeStore((state) => state.colors);
   const alias = item.alias || item.title;
   const isColor = !!COLORS_NOTE[item.title];
 
+  const onScrollEnd = () => {
+    getRef().current?.handleChildScrollEnd();
+  };
+
   if (!item || !item.id) {
     return (
       <Paragraph style={{ marginVertical: 10, alignSelf: "center" }}>
@@ -64,92 +75,89 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
     );
   }
   return (
-    <FlatList
+    <ScrollView
+      nestedScrollEnabled
+      onMomentumScrollEnd={onScrollEnd}
       keyboardShouldPersistTaps="always"
       keyboardDismissMode="none"
       style={{
         backgroundColor: colors.bg,
+        paddingHorizontal: 0,
         borderBottomRightRadius: DDS.isLargeTablet() ? 10 : 1,
         borderBottomLeftRadius: DDS.isLargeTablet() ? 10 : 1,
         maxHeight: "100%"
       }}
-      data={[0]}
-      keyExtractor={() => "properties-scroll-item"}
-      renderItem={() => (
-        <View>
-          <View
-            style={{
-              paddingHorizontal: 12,
-              marginTop: 5,
-              zIndex: 10
-            }}
-          >
-            <Heading size={SIZE.lg}>
-              {item.type === "tag" && !isColor ? (
-                <Heading size={SIZE.xl} color={colors.accent}>
-                  #
-                </Heading>
-              ) : null}
-              {alias}
+    >
+      <View
+        style={{
+          paddingHorizontal: 12,
+          marginTop: 5,
+          zIndex: 10
+        }}
+      >
+        <Heading size={SIZE.lg}>
+          {item.type === "tag" && !isColor ? (
+            <Heading size={SIZE.xl} color={colors.accent}>
+              #
             </Heading>
 
-            {item.type === "note" ? (
-              <TagStrip close={close} item={item} />
-            ) : null}
-
-            {item.type === "reminder" ? (
-              <ReminderTime
-                reminder={item}
-                style={{
-                  justifyContent: "flex-start",
-                  borderWidth: 0,
-                  height: 30,
-                  alignSelf: "flex-start",
-                  backgroundColor: "transparent",
-                  paddingHorizontal: 0
-                }}
-                fontSize={SIZE.xs}
-              />
-            ) : null}
-          </View>
-          <Line top={12} />
-
-          <DateMeta item={item} />
-          <Line bottom={0} />
-          {item.type === "note" ? <Tags close={close} item={item} /> : null}
-
-          <View
-            style={{
-              paddingHorizontal: 12
-            }}
-          >
-            <Notebooks note={item} close={close} />
-          </View>
-
-          <Items
-            item={item}
-            buttons={buttons}
-            close={() => {
-              close();
-              setTimeout(() => {
-                SearchService.updateAndSearch();
-              }, 1000);
-            }}
-          />
-          <Synced item={item} close={close} />
-          <DevMode item={item} />
-
-          {DDS.isTab ? (
-            <View
-              style={{
-                height: 20
-              }}
-            />
           ) : null}
-          <SheetProvider context="properties" />
-        </View>
-      )}
-    />
+          {alias}
+        </Heading>
+
+        {item.type === "note" ? <TagStrip close={close} item={item} /> : null}
+
+        {item.type === "reminder" ? (
+          <ReminderTime
+            reminder={item}
+            style={{
+              justifyContent: "flex-start",
+              borderWidth: 0,
+              height: 30,
+              alignSelf: "flex-start",
+              backgroundColor: "transparent",
+              paddingHorizontal: 0
+            }}
+            fontSize={SIZE.xs + 1}
+          />
+        ) : null}
+      </View>
+      <Line top={12} />
+
+      <DateMeta item={item} />
+      <Line bottom={0} />
+      {item.type === "note" ? <Tags close={close} item={item} /> : null}
+
+      <View
+        style={{
+          paddingHorizontal: 12
+        }}
+      >
+        {item.notebooks ? <Notebooks note={item} close={close} /> : null}
+      </View>
+
+      <Items
+        item={item}
+        buttons={buttons}
+        close={() => {
+          close();
+          setTimeout(() => {
+            SearchService.updateAndSearch();
+          }, 1000);
+        }}
+      />
+      <Synced item={item} close={close} />
+      <DevMode item={item} />
+
+      {DDS.isTab ? (
+        <View
+          style={{
+            height: 20
+          }}
+        />
+      ) : null}
+      <SheetProvider context="properties" />
+    </ScrollView>
   );
 };
 
@@ -179,7 +187,6 @@ Properties.present = (item, buttons = [], isSheet) => {
         "lock-unlock",
         "trash",
         "remove-from-topic",
-        "remove-from-notebook",
         "history",
         "read-only",
         "reminders",
@@ -217,7 +224,7 @@ Properties.present = (item, buttons = [], isSheet) => {
         close={() => {
           close();
         }}
-        actionSheetRef={ref}
+        getRef={() => ref}
         item={props[0]}
         buttons={props[1]}
       />

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

@@ -18,7 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React from "react";
-import { FlatList, ScrollView, View } from "react-native";
+import { View } from "react-native";
+import { FlatList } from "react-native-gesture-handler";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { useActions } from "../../hooks/use-actions";
 import { DDS } from "../../services/device-detection";
@@ -84,9 +85,8 @@ export const Items = ({ item, buttons, close }) => {
     </View>
   );
 
-  const renderColumnItem = (item) => (
+  const renderColumnItem = ({ item }) => (
     <Button
-      key={item.name + item.title}
       buttonType={{
         text: item.on
           ? colors.accent
@@ -108,19 +108,18 @@ export const Items = ({ item, buttons, close }) => {
     />
   );
 
-  const renderTopBarItem = (item, index) => {
-    const isLast = index === topBarItems.length;
+  const renderTopBarItem = ({ item }) => {
     return (
       <PressableButton
         onPress={item.func}
         key={item.id}
         testID={"icon-" + item.id}
-        activeOpacity={1}
         customStyle={{
-          alignSelf: "flex-start",
-          marginRight: isLast ? 0 : 10,
-          paddingHorizontal: 0,
-          width: topBarItemWidth
+          alignItems: "center",
+          width: topBarItemWidth,
+          marginBottom: 10,
+          marginRight: 10,
+          backgroundColor: "transparent"
         }}
       >
         <PressableButton
@@ -150,7 +149,11 @@ export const Items = ({ item, buttons, close }) => {
           />
         </PressableButton>
 
-        <Paragraph size={SIZE.xxs + 1} style={{ textAlign: "center" }}>
+        <Paragraph
+          size={SIZE.xxs + 1}
+          style={{ textAlign: "center" }}
+          textBreakStrategy="simple"
+        >
           {item.title}
         </Paragraph>
       </PressableButton>
@@ -166,7 +169,7 @@ export const Items = ({ item, buttons, close }) => {
     "lock-unlock",
     "publish"
   ];
-  const topBarItems = data.filter(
+  const bottomBarItems = data.filter(
     (item) => topBarItemsList.indexOf(item.id) > -1
   );
 
@@ -175,19 +178,21 @@ export const Items = ({ item, buttons, close }) => {
   );
 
   const topBarItemWidth =
-    (width - (topBarItems.length * 10 + 14)) / topBarItems.length;
+    (width - (bottomBarItems.length * 10 + 14)) / bottomBarItems.length;
 
   return item.type === "note" ? (
     <>
-      <ScrollView
+      <FlatList
+        data={bottomBarItems}
+        keyExtractor={(item) => item.title}
         horizontal
+        disableVirtualization={true}
         style={{
           paddingHorizontal: 12,
-          paddingVertical: 12
+          paddingTop: 12
         }}
-      >
-        {topBarItems.map(renderTopBarItem)}
-      </ScrollView>
+        renderItem={renderTopBarItem}
+      />
 
       <FlatList
         data={bottomGridItems}
@@ -197,8 +202,10 @@ export const Items = ({ item, buttons, close }) => {
         disableVirtualization={true}
         style={{
           marginTop: item.type !== "note" ? 10 : 0,
-          paddingTop: 10,
-          marginLeft: 6
+          paddingTop: 10
+        }}
+        columnWrapperStyle={{
+          justifyContent: "flex-start"
         }}
         contentContainerStyle={{
           alignSelf: "center",
@@ -209,6 +216,11 @@ export const Items = ({ item, buttons, close }) => {
       />
     </>
   ) : (
-    <View data={data}>{data.map(renderColumnItem)}</View>
+    <FlatList
+      data={data}
+      keyExtractor={(item) => item.title}
+      renderItem={renderColumnItem}
+      disableVirtualization={true}
+    />
   );
 };

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

@@ -23,33 +23,20 @@ import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import Notebook from "../../screens/notebook";
 import { TopicNotes } from "../../screens/notes/topic-notes";
-import {
-  eSendEvent,
-  presentSheet,
-  ToastEvent
-} from "../../services/event-manager";
+import { presentSheet, ToastEvent } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import { useNotebookStore } from "../../stores/use-notebook-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
 import Heading from "../ui/typography/heading";
-import { eClearEditor } from "../../utils/events";
 
 export default function Notebooks({ note, close, full }) {
   const colors = useThemeStore((state) => state.colors);
   const notebooks = useNotebookStore((state) => state.notebooks);
   function getNotebooks(item) {
+    if (!item.notebooks || item.notebooks.length < 1) return [];
     let filteredNotebooks = [];
-    const relations = db.relations.to(note, "notebook");
-    filteredNotebooks.push(
-      ...relations.map((notebook) => ({
-        ...notebook,
-        topics: []
-      }))
-    );
-    if (!item.notebooks || item.notebooks.length < 1) return filteredNotebooks;
-
     for (let notebookReference of item.notebooks) {
       let notebook = {
         ...(notebooks.find((item) => item.id === notebookReference.id) || {})
@@ -58,14 +45,7 @@ export default function Notebooks({ note, close, full }) {
         notebook.topics = notebook.topics.filter((topic) => {
           return notebookReference.topics.findIndex((t) => t === topic.id) > -1;
         });
-        const index = filteredNotebooks.findIndex(
-          (item) => item.id === notebook.id
-        );
-        if (index > -1) {
-          filteredNotebooks[index].topics = notebook.topics;
-        } else {
-          filteredNotebooks.push(notebook);
-        }
+        filteredNotebooks.push(notebook);
       }
     }
     return filteredNotebooks;
@@ -83,6 +63,7 @@ export default function Notebooks({ note, close, full }) {
     if (!item) return;
     TopicNotes.navigate(item, true);
   };
+
   const renderItem = (item) => (
     <View
       key={item.id}
@@ -97,8 +78,7 @@ export default function Notebooks({ note, close, full }) {
         borderWidth: full ? 0 : 1,
         borderColor: colors.nav,
         borderRadius: 10,
-        backgroundColor: full ? "transparent" : colors.nav,
-        minHeight: 42
+        backgroundColor: full ? "transparent" : colors.nav
       }}
     >
       <Icon
@@ -117,7 +97,6 @@ export default function Notebooks({ note, close, full }) {
         size={SIZE.sm}
         onPress={() => {
           navigateNotebook(item.id);
-          eSendEvent(eClearEditor);
           close();
         }}
       >
@@ -140,7 +119,6 @@ export default function Notebooks({ note, close, full }) {
             key={topic.id}
             onPress={() => {
               navigateTopic(topic.id, item.id);
-              eSendEvent(eClearEditor);
               close();
             }}
             onLongPress={async () => {
@@ -152,7 +130,13 @@ export default function Notebooks({ note, close, full }) {
                 note
               );
               useNotebookStore.getState().setNotebooks();
-              Navigation.queueRoutesForUpdate();
+              Navigation.queueRoutesForUpdate(
+                "Notes",
+                "Favorites",
+                "ColoredNotes",
+                "TaggedNotes",
+                "TopicNotes"
+              );
               ToastEvent.show({
                 heading: "Note removed from topic",
                 context: "local",
@@ -162,7 +146,7 @@ export default function Notebooks({ note, close, full }) {
             title={topic.title}
             type="gray"
             height={30}
-            fontSize={SIZE.xs}
+            fontSize={SIZE.xs + 1}
             icon="bookmark-outline"
             style={{
               marginRight: 5,
@@ -176,7 +160,7 @@ export default function Notebooks({ note, close, full }) {
     </View>
   );
 
-  return noteNotebooks.length === 0 ? null : (
+  return !note.notebooks || note.notebooks.length === 0 ? null : (
     <View
       style={{
         width: "100%",
@@ -191,7 +175,7 @@ export default function Notebooks({ note, close, full }) {
       {noteNotebooks.length > 1 && !full ? (
         <Button
           title={`See all linked notebooks`}
-          fontSize={SIZE.xs}
+          fontSize={SIZE.xs + 1}
           style={{
             alignSelf: "flex-end",
             marginRight: 12,

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

@@ -91,10 +91,10 @@ export const Synced = ({ item, close }) => {
             console.error(e);
           }
         }}
-        fontSize={SIZE.xs}
+        fontSize={SIZE.xs + 1}
         title="Learn more"
         height={30}
-        type="grayAccent"
+        type="transparent"
       />
     </View>
   ) : null;

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

@@ -21,10 +21,11 @@ import React from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
 import { TaggedNotes } from "../../screens/notes/tagged";
+import { eSendEvent } from "../../services/event-manager";
 import { useThemeStore } from "../../stores/use-theme-store";
+import { eOpenTagsDialog } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
-import ManageTagsSheet from "../sheets/manage-tags";
 import { Button } from "../ui/button";
 import { ColorTags } from "./color-tags";
 export const Tags = ({ item, close }) => {
@@ -40,14 +41,14 @@ export const Tags = ({ item, close }) => {
         flexWrap: "wrap",
         alignItems: "center",
         paddingHorizontal: 12,
-        alignSelf: "center",
-        justifyContent: "space-between",
-        width: "100%"
+        alignSelf: "center"
       }}
     >
       <Button
         onPress={async () => {
-          ManageTagsSheet.present(item);
+          close();
+          await sleep(300);
+          eSendEvent(eOpenTagsDialog, item);
         }}
         buttonType={{
           text: colors.accent
@@ -57,7 +58,7 @@ export const Tags = ({ item, close }) => {
         icon="plus"
         iconPosition="right"
         height={30}
-        fontSize={SIZE.xs}
+        fontSize={SIZE.xs + 1}
         style={{
           marginRight: 5,
           borderRadius: 100,
@@ -78,8 +79,8 @@ export const TagStrip = ({ item, close }) => {
         alignItems: "center"
       }}
     >
-      {item.tags.map((tag) =>
-        tag ? <TagItem key={tag} tag={tag} close={close} /> : null
+      {item.tags.map((item) =>
+        item ? <TagItem key={item} tag={item} close={close} /> : null
       )}
     </View>
   ) : null;
@@ -101,13 +102,14 @@ const TagItem = ({ tag, close }) => {
     marginTop: 0,
     backgroundColor: "transparent"
   };
+
   return (
     <Button
       onPress={onPress}
       title={"#" + tag}
       type="grayBg"
       height={20}
-      fontSize={SIZE.xs}
+      fontSize={SIZE.xs + 1}
       style={style}
       textStyle={{
         textDecorationLine: "underline"

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

@@ -39,7 +39,7 @@ export const Topics = ({ item, close }) => {
       height={30}
       onPress={() => open(topic)}
       icon="bookmark-outline"
-      fontSize={SIZE.xs}
+      fontSize={SIZE.xs + 1}
       style={{
         marginRight: 5,
         paddingHorizontal: 8,

apps/mobile/app/components/selection-header/index.js

@@ -21,18 +21,18 @@ import React, { useCallback, useEffect } from "react";
 import { BackHandler, Platform, View } from "react-native";
 import { db } from "../../common/database";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-import { ToastEvent } from "../../services/event-manager";
+import { eSendEvent, ToastEvent } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import SearchService from "../../services/search";
 import useNavigationStore from "../../stores/use-navigation-store";
 import { useSelectionStore } from "../../stores/use-selection-store";
 import { useThemeStore } from "../../stores/use-theme-store";
+import { eOpenMoveNoteDialog } from "../../utils/events";
 import { deleteItems } from "../../utils/functions";
 import { tabBarRef } from "../../utils/global-refs";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { presentDialog } from "../dialog/functions";
-import MoveNoteSheet from "../sheets/add-to";
 import ExportNotesSheet from "../sheets/export-notes";
 import { IconButton } from "../ui/icon-button";
 import Heading from "../ui/typography/heading";
@@ -64,7 +64,13 @@ export const SelectionHeader = React.memo(() => {
       selectedItemsList.forEach((item) => {
         db.notes.note(item.id).favorite();
       });
-      Navigation.queueRoutesForUpdate();
+      Navigation.queueRoutesForUpdate(
+        "Notes",
+        "Favorites",
+        "ColoredNotes",
+        "TaggedNotes",
+        "TopicNotes"
+      );
       clearSelection();
     }
   };
@@ -76,7 +82,16 @@ export const SelectionHeader = React.memo(() => {
         noteIds.push(item.id);
       });
       await db.trash.restore(...noteIds);
-      Navigation.queueRoutesForUpdate();
+      Navigation.queueRoutesForUpdate(
+        "Notes",
+        "Favorites",
+        "ColoredNotes",
+        "TaggedNotes",
+        "TopicNotes",
+        "Trash",
+        "Notebooks",
+        "Tags"
+      );
 
       clearSelection();
       ToastEvent.show({
@@ -103,7 +118,16 @@ export const SelectionHeader = React.memo(() => {
             noteIds.push(item.id);
           });
           await db.trash.delete(...noteIds);
-          Navigation.queueRoutesForUpdate();
+          Navigation.queueRoutesForUpdate(
+            "Notes",
+            "Favorites",
+            "ColoredNotes",
+            "TaggedNotes",
+            "TopicNotes",
+            "Trash",
+            "Notebooks",
+            "Tags"
+          );
           clearSelection();
         }
       },
@@ -177,7 +201,7 @@ export const SelectionHeader = React.memo(() => {
           }}
         >
           <Heading size={SIZE.md} color={colors.accent}>
-            {selectedItemsList.length}
+            {selectedItemsList.length + " Selected"}
           </Heading>
         </View>
       </View>
@@ -213,7 +237,7 @@ export const SelectionHeader = React.memo(() => {
               onPress={async () => {
                 //setSelectionMode(false);
                 await sleep(100);
-                MoveNoteSheet.present();
+                eSendEvent(eOpenMoveNoteDialog);
               }}
               customStyle={{
                 marginLeft: 10
@@ -240,40 +264,36 @@ export const SelectionHeader = React.memo(() => {
           </>
         )}
 
-        {screen === "TopicNotes" || screen === "Notebook" ? (
+        {screen === "TopicNotes" ? (
           <IconButton
             onPress={async () => {
               if (selectedItemsList.length > 0) {
-                const currentScreen =
+                const currentTopic =
                   useNavigationStore.getState().currentScreen;
+                await db.notes.removeFromNotebook(
+                  {
+                    id: currentTopic.notebookId,
+                    topic: currentTopic.id
+                  },
+                  ...selectedItemsList.map((item) => item.id)
+                );
 
-                if (screen === "Notebook") {
-                  for (const item of selectedItemsList) {
-                    await db.relations.unlink(
-                      { type: "notebook", id: currentScreen.id },
-                      item
-                    );
-                  }
-                } else {
-                  await db.notes.removeFromNotebook(
-                    {
-                      id: currentScreen.notebookId,
-                      topic: currentScreen.id
-                    },
-                    ...selectedItemsList.map((item) => item.id)
-                  );
-                }
-
-                Navigation.queueRoutesForUpdate();
+                Navigation.queueRoutesForUpdate(
+                  "Notes",
+                  "Favorites",
+                  "ColoredNotes",
+                  "TaggedNotes",
+                  "TopicNotes",
+                  "Notebooks",
+                  "Notebook"
+                );
                 clearSelection();
               }
             }}
             customStyle={{
               marginLeft: 10
             }}
-            tooltipText={`Remove from ${
-              screen === "Notebook" ? "notebook" : "topic"
-            }`}
+            tooltipText="Remove from topic"
             tooltipPosition={4}
             testID="select-minus"
             color={colors.pri}

apps/mobile/app/components/sheet-provider/index.js

@@ -36,7 +36,7 @@ import Paragraph from "../ui/typography/paragraph";
 const SheetProvider = ({ context = "global" }) => {
   const colors = useThemeStore((state) => state.colors);
   const [visible, setVisible] = useState(false);
-  const [data, setData] = useState(null);
+  const [dialogData, setDialogData] = useState(null);
   const actionSheetRef = useRef();
   const editor = useRef({
     refocus: false
@@ -52,35 +52,42 @@ const SheetProvider = ({ context = "global" }) => {
   }, [close, open, visible]);
 
   const open = useCallback(
-    async (payload) => {
-      if (!payload.context) payload.context = "global";
-      if (payload.context !== context) return;
-      setData(payload);
+    async (data) => {
+      if (!data.context) data.context = "global";
+      if (data.context !== context) return;
+      if (visible || dialogData) {
+        setDialogData(null);
+        setVisible(false);
+        await sleep(0);
+      }
+      setDialogData(data);
       setVisible(true);
-      if (payload.editor) {
+      if (data.editor) {
         editor.current.refocus = false;
         if (editorState().keyboardState) {
+          // tiny.call(EditorWebView, tiny.cacheRange + tiny.blur);
           editor.current.refocus = true;
         }
       }
     },
-    [context]
+    [context, dialogData, visible]
   );
 
   useEffect(() => {
     (async () => {
-      if (visible && data) {
-        if (data.editor) await sleep(100);
+      if (visible && dialogData) {
+        if (dialogData.editor) await sleep(100);
         actionSheetRef.current?.setModalVisible(true);
         return;
       } else {
         if (editor.current?.refocus) {
           editorState().isFocused = true;
+          //  tiny.call(EditorWebView, tiny.restoreRange + tiny.clearRange);
           editor.current.refocus = false;
         }
       }
     })();
-  }, [visible, data]);
+  }, [visible, dialogData]);
 
   const close = useCallback(
     (ctx) => {
@@ -91,31 +98,34 @@ const SheetProvider = ({ context = "global" }) => {
     [context]
   );
 
-  return !visible || !data ? null : (
+  return !visible || !dialogData ? null : (
     <SheetWrapper
       fwdRef={actionSheetRef}
-      gestureEnabled={!data?.progress && !data?.disableClosing}
-      closeOnTouchBackdrop={!data?.progress && !data?.disableClosing}
+      gestureEnabled={!dialogData?.progress && !dialogData?.disableClosing}
+      closeOnTouchBackdrop={
+        !dialogData?.progress && !dialogData?.disableClosing
+      }
       onClose={() => {
-        data.onClose && data.onClose();
+        dialogData.onClose && dialogData.onClose();
         setVisible(false);
-        setData(null);
+        setDialogData(null);
       }}
-      bottomPadding={!data.noBottomPadding}
-      enableGesturesInScrollView={data.enableGesturesInScrollView}
     >
       <View
         style={{
           justifyContent: "center",
           alignItems: "center",
           marginBottom:
-            !data.progress && !data.icon && !data.title && !data.paragraph
+            !dialogData.progress &&
+            !dialogData.icon &&
+            !dialogData.title &&
+            !dialogData.paragraph
               ? 0
               : 10,
           paddingHorizontal: 12
         }}
       >
-        {data?.progress ? (
+        {dialogData?.progress ? (
           <ActivityIndicator
             style={{
               marginTop: 15
@@ -125,48 +135,47 @@ const SheetProvider = ({ context = "global" }) => {
           />
         ) : null}
 
-        {data?.icon ? (
+        {dialogData?.icon ? (
           <Icon
-            color={colors[data.iconColor] || colors.accent}
-            name={data.icon}
+            color={colors[dialogData.iconColor] || colors.accent}
+            name={dialogData.icon}
             size={50}
           />
         ) : null}
 
-        {data?.title ? <Heading> {data?.title}</Heading> : null}
+        {dialogData?.title ? <Heading> {dialogData?.title}</Heading> : null}
 
-        {data?.paragraph ? (
+        {dialogData?.paragraph ? (
           <Paragraph style={{ textAlign: "center" }}>
-            {data?.paragraph}
+            {dialogData?.paragraph}
           </Paragraph>
         ) : null}
       </View>
 
-      {typeof data.component === "function"
-        ? data.component(
+      {typeof dialogData.component === "function"
+        ? dialogData.component(
             actionSheetRef,
             () => close(context),
             (data) => {
               if (!data) return;
-              setData((prevData) => {
+              setDialogData((prevData) => {
                 return {
                   ...prevData,
                   ...data
                 };
               });
-            },
-            colors
+            }
           )
-        : data.component}
+        : dialogData.component}
 
       <View
         style={{
           paddingHorizontal: 12,
-          marginBottom: data.valueArray ? 12 : 0
+          marginBottom: dialogData.valueArray ? 12 : 0
         }}
       >
-        {data.valueArray &&
-          data.valueArray.map((v) => (
+        {dialogData.valueArray &&
+          dialogData.valueArray.map((v) => (
             <Button
               title={v}
               type="gray"
@@ -188,12 +197,12 @@ const SheetProvider = ({ context = "global" }) => {
           paddingHorizontal: 12
         }}
       >
-        {data?.action ? (
+        {dialogData?.action ? (
           <Button
-            onPress={data.action}
-            key={data.actionText}
-            title={data.actionText}
-            accentColor={data.iconColor || "accent"}
+            onPress={dialogData.action}
+            key={dialogData.actionText}
+            title={dialogData.actionText}
+            accentColor={dialogData.iconColor || "accent"}
             accentText="light"
             type="accent"
             height={45}
@@ -205,14 +214,15 @@ const SheetProvider = ({ context = "global" }) => {
           />
         ) : null}
 
-        {data?.actionsArray &&
-          data?.actionsArray.map((item) => (
+        {dialogData?.actionsArray &&
+          dialogData?.actionsArray.map((item) => (
             <Button
               onPress={item.action}
               key={item.accentText}
               title={item.actionText}
               icon={item.icon && item.icon}
               type={item.type || "accent"}
+              height={50}
               style={{
                 marginBottom: 10
               }}
@@ -221,7 +231,7 @@ const SheetProvider = ({ context = "global" }) => {
             />
           ))}
 
-        {data?.learnMore ? (
+        {dialogData?.learnMore ? (
           <Paragraph
             style={{
               alignSelf: "center",
@@ -229,7 +239,7 @@ const SheetProvider = ({ context = "global" }) => {
               textDecorationLine: "underline"
             }}
             size={SIZE.xs}
-            onPress={data.learnMorePress}
+            onPress={dialogData.learnMorePress}
             color={colors.icon}
           >
             <Icon
@@ -237,7 +247,7 @@ const SheetProvider = ({ context = "global" }) => {
               name="information-outline"
               size={SIZE.xs}
             />{" "}
-            {data.learnMore}
+            {dialogData.learnMore}
           </Paragraph>
         ) : null}
       </View>

apps/mobile/app/components/sheets/add-notebook/index.js

@@ -25,34 +25,41 @@ import {
   TouchableOpacity,
   View
 } from "react-native";
-import { FlatList } from "react-native-actions-sheet";
+import { FlatList } from "react-native-gesture-handler";
 import { notesnook } from "../../../../e2e/test.ids";
-import { db } from "../../../common/database";
-import { DDS } from "../../../services/device-detection";
-import { ToastEvent, presentSheet } from "../../../services/event-manager";
-import Navigation from "../../../services/navigation";
 import { useMenuStore } from "../../../stores/use-menu-store";
-import { useRelationStore } from "../../../stores/use-relation-store";
-import { SIZE, ph, pv } from "../../../utils/size";
+import { DDS } from "../../../services/device-detection";
+import {
+  eSubscribeEvent,
+  eUnSubscribeEvent,
+  ToastEvent
+} from "../../../services/event-manager";
+import Navigation from "../../../services/navigation";
+import { db } from "../../../common/database";
+import {
+  eCloseAddNotebookDialog,
+  eOpenAddNotebookDialog
+} from "../../../utils/events";
+import { ph, pv, SIZE } from "../../../utils/size";
 import { sleep } from "../../../utils/time";
-import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
+import { Button } from "../../ui/button";
+import DialogHeader from "../../dialog/dialog-header";
 import Input from "../../ui/input";
-import Seperator from "../../ui/seperator";
-import Heading from "../../ui/typography/heading";
 import { MoveNotes } from "../move-notes/movenote";
+import Seperator from "../../ui/seperator";
+import SheetWrapper from "../../ui/sheet";
+import { Toast } from "../../toast";
 
 let refs = [];
+
 export class AddNotebookSheet extends React.Component {
   constructor(props) {
     super(props);
-    refs = [];
     this.state = {
-      notebook: props.notebook,
-      topics:
-        props.notebook?.topics?.map((item) => {
-          return item.title;
-        }) || [],
+      notebook: null,
+      visible: false,
+      topics: [],
       description: null,
       titleFocused: false,
       descFocused: false,
@@ -61,14 +68,13 @@ export class AddNotebookSheet extends React.Component {
       editTopic: false,
       loading: false
     };
-
-    this.title = props.notebook?.title;
-    this.description = props.notebook?.description;
+    this.title = null;
+    this.description = null;
     this.listRef;
     this.prevItem = null;
     this.prevIndex = null;
     this.currentSelectedInput = null;
-    this.id = props.notebook?.id;
+    this.id = null;
     this.backPressCount = 0;
     this.currentInputValue = null;
     this.titleRef;
@@ -77,22 +83,57 @@ export class AddNotebookSheet extends React.Component {
     this.hiddenInput = createRef();
     this.topicInputRef = createRef();
     this.addingTopic = false;
-    this.actionSheetRef = props.actionSheetRef;
-  }
-
-  componentWillUnmount() {
-    refs = [];
+    this.actionSheetRef = createRef();
   }
 
   componentDidMount() {
-    sleep(300).then(() => {
-      !this.state.notebook && this.titleRef?.focus();
-    });
+    eSubscribeEvent(eOpenAddNotebookDialog, this.open);
+    eSubscribeEvent(eCloseAddNotebookDialog, this.close);
   }
 
-  close = () => {
+  componentWillUnmount() {
+    eUnSubscribeEvent(eOpenAddNotebookDialog, this.open);
+    eUnSubscribeEvent(eCloseAddNotebookDialog, this.close);
+  }
+
+  open = (notebook) => {
     refs = [];
-    this.props.close(true);
+
+    if (notebook) {
+      let topicsList = [];
+      notebook.topics.forEach((item) => {
+        topicsList.push(item.title);
+      });
+      this.id = notebook.id;
+      this.title = notebook.title;
+      this.description = notebook.description;
+
+      this.setState({
+        topics: [...topicsList],
+        visible: true,
+        notebook: notebook
+      });
+    } else {
+      this.setState({
+        visible: true,
+        notebook: null
+      });
+    }
+    sleep(100).then(() => {
+      this.actionSheetRef.current?.show();
+    });
+  };
+
+  close = () => {
+    this.actionSheetRef.current?.hide();
+    refs = [];
+    this.prevIndex = null;
+    this.prevItem = null;
+    this.currentSelectedInput = null;
+    this.title = null;
+    this.description = null;
+    this.currentInputValue = null;
+    this.id = null;
   };
 
   onDelete = (index) => {
@@ -182,7 +223,6 @@ export class AddNotebookSheet extends React.Component {
       });
 
       await db.notebooks.notebook(toEdit.id).topics.add(...nextTopics);
-      this.close();
     } else {
       newNotebookId = await db.notebooks.add({
         title: this.title,
@@ -192,9 +232,23 @@ export class AddNotebookSheet extends React.Component {
       });
     }
     useMenuStore.getState().setMenuPins();
-    Navigation.queueRoutesForUpdate();
-    useRelationStore.getState().update();
-    MoveNotes.present(db.notebooks.notebook(newNotebookId).data);
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes",
+      "Notebooks",
+      "Notebook"
+    );
+
+    this.setState({
+      loading: false
+    });
+    this.close();
+    await sleep(300);
+    if (!notebook) {
+      MoveNotes.present(db.notebooks.notebook(newNotebookId).data);
+    }
   };
 
   onSubmit = (forward = true) => {
@@ -211,7 +265,7 @@ export class AddNotebookSheet extends React.Component {
         topics: prevTopics
       });
       setTimeout(() => {
-        this.listRef.current?.scrollToEnd?.({ animated: true });
+        this.listRef.scrollToEnd({ animated: true });
       }, 30);
       this.currentInputValue = null;
     } else {
@@ -235,7 +289,7 @@ export class AddNotebookSheet extends React.Component {
 
       if (forward) {
         setTimeout(() => {
-          this.listRef.current?.scrollToEnd?.({ animated: true });
+          this.listRef.scrollToEnd({ animated: true });
         }, 30);
       }
     }
@@ -245,166 +299,183 @@ export class AddNotebookSheet extends React.Component {
     willFocus && this.topicInputRef.current?.focus();
   };
 
-  renderTopicItem = ({ item, index }) => (
-    <TopicItem
-      item={item}
-      onPress={(item, index) => {
-        this.prevIndex = index;
-        this.prevItem = item;
-        this.topicInputRef.current?.setNativeProps({
-          text: item
-        });
-        this.topicInputRef.current?.focus();
-        this.currentInputValue = item;
-        this.setState({
-          editTopic: true
-        });
-      }}
-      onDelete={this.onDelete}
-      index={index}
-      colors={this.props.colors}
-    />
-  );
-
   render() {
     const { colors } = this.props;
-    const { topics, topicInputFocused, notebook } = this.state;
+    const { topics, visible, topicInputFocused, notebook } = this.state;
+    if (!visible) return null;
     return (
-      <View
-        style={{
-          maxHeight: DDS.isTab ? "90%" : "97%",
-          borderRadius: DDS.isTab ? 5 : 0,
-          paddingHorizontal: 12
+      <SheetWrapper
+        onOpen={async () => {
+          this.topicsToDelete = [];
+          await sleep(300);
+          !this.state.notebook && this.titleRef?.focus();
         }}
+        fwdRef={this.actionSheetRef}
+        onClose={() => {
+          this.close();
+          this.setState({
+            visible: false,
+            topics: [],
+            descFocused: false,
+            titleFocused: false,
+            editTopic: false,
+            notebook: null
+          });
+        }}
+        statusBarTranslucent={false}
+        onRequestClose={this.close}
       >
-        <TextInput
-          ref={this.hiddenInput}
-          style={{
-            width: 1,
-            height: 1,
-            opacity: 0,
-            position: "absolute"
-          }}
-          blurOnSubmit={false}
-        />
-
         <View
           style={{
-            flexDirection: "row",
-            width: "100%",
-            justifyContent: "space-between",
-            alignItems: "center"
+            maxHeight: DDS.isTab ? "90%" : "96%",
+            borderRadius: DDS.isTab ? 5 : 0,
+            paddingHorizontal: 12
           }}
         >
-          <Heading size={SIZE.lg}>
-            {notebook && notebook.dateCreated
-              ? "Edit Notebook"
-              : "New Notebook"}
-          </Heading>
-          <Button
-            title="Save"
-            type="accent"
-            height={40}
+          <TextInput
+            ref={this.hiddenInput}
             style={{
-              borderRadius: 100,
-              paddingHorizontal: 24
+              width: 1,
+              height: 1,
+              opacity: 0,
+              position: "absolute"
             }}
+            blurOnSubmit={false}
+          />
+          <DialogHeader
+            title={
+              notebook && notebook.dateCreated
+                ? "Edit Notebook"
+                : "New Notebook"
+            }
+            paragraph={
+              notebook && notebook.dateCreated
+                ? "You are editing " + this.title + " notebook."
+                : "Notebooks are the best way to organize your notes."
+            }
+          />
+          <Seperator half />
+
+          <Input
+            fwdRef={(ref) => (this.titleRef = ref)}
+            testID={notesnook.ids.dialogs.notebook.inputs.title}
+            onChangeText={(value) => {
+              this.title = value;
+            }}
+            placeholder="Enter a title"
+            onSubmit={() => {
+              this.descriptionRef.focus();
+            }}
+            returnKeyLabel="Next"
+            returnKeyType="next"
+            defaultValue={notebook ? notebook.title : null}
+          />
+
+          <Input
+            fwdRef={(ref) => (this.descriptionRef = ref)}
+            testID={notesnook.ids.dialogs.notebook.inputs.description}
+            onChangeText={(value) => {
+              this.description = value;
+            }}
+            placeholder="Describe your notebook."
+            onSubmit={() => {
+              this.topicInputRef.current?.focus();
+            }}
+            returnKeyLabel="Next"
+            returnKeyType="next"
+            defaultValue={notebook ? notebook.description : null}
+          />
+
+          <Input
+            fwdRef={this.topicInputRef}
+            testID={notesnook.ids.dialogs.notebook.inputs.topic}
+            onChangeText={(value) => {
+              this.currentInputValue = value;
+              if (this.prevItem !== null) {
+                refs[this.prevIndex].setNativeProps({
+                  text: value,
+                  style: {
+                    borderBottomColor: colors.accent
+                  }
+                });
+              }
+            }}
+            returnKeyLabel="Done"
+            returnKeyType="done"
+            onSubmit={() => {
+              this.onSubmit();
+            }}
+            blurOnSubmit={false}
+            button={{
+              testID: "topic-add-button",
+              icon: this.state.editTopic ? "check" : "plus",
+              onPress: this.onSubmit,
+              color: topicInputFocused ? colors.accent : colors.icon
+            }}
+            placeholder="Add a topic"
+          />
+
+          <FlatList
+            data={topics}
+            ref={(ref) => (this.listRef = ref)}
+            nestedScrollEnabled
+            keyExtractor={(item, index) => item + index.toString()}
+            onMomentumScrollEnd={() => {
+              this.actionSheetRef.current?.handleChildScrollEnd();
+            }}
+            keyboardShouldPersistTaps="always"
+            keyboardDismissMode="interactive"
+            ListFooterComponent={<View style={{ height: 50 }} />}
+            renderItem={({ item, index }) => (
+              <TopicItem
+                item={item}
+                onPress={(item, index) => {
+                  this.prevIndex = index;
+                  this.prevItem = item;
+                  this.topicInputRef.current?.setNativeProps({
+                    text: item
+                  });
+                  this.topicInputRef.current?.focus();
+                  this.currentInputValue = item;
+                  this.setState({
+                    editTopic: true
+                  });
+                }}
+                onDelete={this.onDelete}
+                index={index}
+                colors={colors}
+              />
+            )}
+          />
+          <Seperator />
+          <Button
+            width="100%"
+            height={50}
             fontSize={SIZE.md}
+            title={
+              notebook && notebook.dateCreated
+                ? "Save changes"
+                : "Create notebook"
+            }
+            type="accent"
             onPress={this.addNewNotebook}
           />
+          {/* 
+          {Platform.OS === 'ios'  && (
+            <View
+              style={{
+                height: 40
+              }}
+            />
+          )} */}
         </View>
 
-        <Seperator />
-
-        <Input
-          fwdRef={(ref) => (this.titleRef = ref)}
-          testID={notesnook.ids.dialogs.notebook.inputs.title}
-          onChangeText={(value) => {
-            this.title = value;
-          }}
-          placeholder="Enter a title"
-          onSubmit={() => {
-            this.descriptionRef.focus();
-          }}
-          returnKeyLabel="Next"
-          returnKeyType="next"
-          defaultValue={notebook ? notebook.title : null}
-        />
-
-        <Input
-          fwdRef={(ref) => (this.descriptionRef = ref)}
-          testID={notesnook.ids.dialogs.notebook.inputs.description}
-          onChangeText={(value) => {
-            this.description = value;
-          }}
-          placeholder="Describe your notebook."
-          onSubmit={() => {
-            this.topicInputRef.current?.focus();
-          }}
-          returnKeyLabel="Next"
-          returnKeyType="next"
-          defaultValue={notebook ? notebook.description : null}
-        />
-
-        <Input
-          fwdRef={this.topicInputRef}
-          testID={notesnook.ids.dialogs.notebook.inputs.topic}
-          onChangeText={(value) => {
-            this.currentInputValue = value;
-            if (this.prevItem !== null) {
-              refs[this.prevIndex].setNativeProps({
-                text: value,
-                style: {
-                  borderBottomColor: colors.accent
-                }
-              });
-            }
-          }}
-          returnKeyLabel="Done"
-          returnKeyType="done"
-          onSubmit={() => {
-            this.onSubmit();
-          }}
-          blurOnSubmit={false}
-          button={{
-            testID: "topic-add-button",
-            icon: this.state.editTopic ? "check" : "plus",
-            onPress: this.onSubmit,
-            color: topicInputFocused ? colors.accent : colors.icon
-          }}
-          placeholder="Add a topic"
-        />
-
-        <FlatList
-          data={topics}
-          ref={(ref) => (this.listRef = ref)}
-          nestedScrollEnabled
-          keyExtractor={(item, index) => item + index.toString()}
-          keyboardShouldPersistTaps="always"
-          keyboardDismissMode="interactive"
-          ListFooterComponent={
-            topics.length === 0 ? null : <View style={{ height: 50 }} />
-          }
-          renderItem={this.renderTopicItem}
-        />
-      </View>
+        <Toast context="local" />
+      </SheetWrapper>
     );
   }
 }
 
-AddNotebookSheet.present = (notebook) => {
-  presentSheet({
-    component: (ref, close, _update, colors) => (
-      <AddNotebookSheet
-        actionSheetRef={ref}
-        notebook={notebook}
-        close={close}
-        colors={colors}
-      />
-    )
-  });
-};
-
 const TopicItem = ({ item, index, colors, onPress, onDelete }) => {
   const topicRef = (ref) => (refs[index] = ref);
 

apps/mobile/app/components/sheets/add-to/context.js

@@ -20,9 +20,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { createContext, useContext } from "react";
 
 export const SelectionContext = createContext({
+  enabled: false,
+  selected: [],
   toggleSelection: (item) => null,
   deselect: (item) => null,
   select: (item) => null,
+  isSelected: (item) => null,
+  setMultiSelect: () => null,
   deselectAll: () => null
 });
 export const SelectionProvider = SelectionContext.Provider;

apps/mobile/app/components/sheets/add-to/filtered-list.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { FlatList } from "react-native-actions-sheet";
+import { FlatList } from "react-native-gesture-handler";
 import { db } from "../../../common/database";
 import { ListHeaderInputItem } from "./list-header-item.js";
 
@@ -27,7 +27,6 @@ export const FilteredList = ({
   itemType,
   onAddItem,
   hasHeaderSearch,
-  listRef,
   ...restProps
 }) => {
   const [filtered, setFiltered] = useState(data);
@@ -57,7 +56,6 @@ export const FilteredList = ({
     <FlatList
       {...restProps}
       data={filtered}
-      ref={listRef}
       ListHeaderComponent={
         hasHeaderSearch ? (
           <ListHeaderInputItem
@@ -71,6 +69,7 @@ export const FilteredList = ({
       }
       keyboardShouldPersistTaps="always"
       keyboardDismissMode="none"
+      nestedScrollEnabled
     />
   );
 };

apps/mobile/app/components/sheets/add-to/index.js

@@ -17,45 +17,90 @@ 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 } from "react";
+import React, {
+  createRef,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState
+} from "react";
 import { Keyboard, TouchableOpacity, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../../common/database";
 import {
-  eSendEvent,
-  presentSheet,
+  eSubscribeEvent,
+  eUnSubscribeEvent,
   ToastEvent
 } from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import SearchService from "../../../services/search";
 import { useNotebookStore } from "../../../stores/use-notebook-store";
 import { useSelectionStore } from "../../../stores/use-selection-store";
-import { useSettingStore } from "../../../stores/use-setting-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
-import { eOnTopicSheetUpdate } from "../../../utils/events";
+import { eOpenMoveNoteDialog } from "../../../utils/events";
 import { Dialog } from "../../dialog";
 import DialogHeader from "../../dialog/dialog-header";
 import { presentDialog } from "../../dialog/functions";
 import { Button } from "../../ui/button";
+import SheetWrapper from "../../ui/sheet";
 import Paragraph from "../../ui/typography/paragraph";
 import { SelectionProvider } from "./context";
 import { FilteredList } from "./filtered-list";
 import { ListItem } from "./list-item";
-import { useItemSelectionStore } from "./store";
-import { useRelationStore } from "../../../stores/use-relation-store";
 
-const MoveNoteSheet = ({ note, actionSheetRef }) => {
+const actionSheetRef = createRef();
+const AddToNotebookSheet = () => {
+  const [visible, setVisible] = useState(false);
+  const [note, setNote] = useState(null);
+
+  function open(note) {
+    setNote(note);
+    setVisible(true);
+    actionSheetRef.current?.setModalVisible(true);
+  }
+
+  useEffect(() => {
+    eSubscribeEvent(eOpenMoveNoteDialog, open);
+    return () => {
+      eUnSubscribeEvent(eOpenMoveNoteDialog, open);
+    };
+  }, []);
+
+  const _onClose = () => {
+    setVisible(false);
+    setNote(null);
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes",
+      "Notebooks",
+      "Notebook"
+    );
+  };
+
+  return !visible ? null : (
+    <SheetWrapper fwdRef={actionSheetRef} onClose={_onClose}>
+      <MoveNoteComponent note={note} />
+    </SheetWrapper>
+  );
+};
+
+export default AddToNotebookSheet;
+
+const MoveNoteComponent = ({ note }) => {
   const colors = useThemeStore((state) => state.colors);
+  const [multiSelect, setMultiSelect] = useState(false);
   const notebooks = useNotebookStore((state) =>
     state.notebooks.filter((n) => n?.type === "notebook")
   );
-  const dimensions = useSettingStore((state) => state.dimensions);
+  const [edited, setEdited] = useState(false);
   const selectedItemsList = useSelectionStore(
     (state) => state.selectedItemsList
   );
   const setNotebooks = useNotebookStore((state) => state.setNotebooks);
-
-  const multiSelect = useItemSelectionStore((state) => state.multiSelect);
+  const [itemState, setItemState] = useState({});
 
   const onAddNotebook = async (title) => {
     if (!title || title.trim().length === 0) {
@@ -114,13 +159,13 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
     (item) => {
       switch (item.type) {
         case "notebook": {
-          const notes = db.relations.from(item, "note");
-          if (notes.length === 0) return 0;
+          const noteIds = [];
+          for (let topic of item.topics) {
+            noteIds.push(...(db.notes?.topicReferences.get(topic.id) || []));
+          }
           let count = 0;
           selectedItemsList.forEach((item) =>
-            notes.findIndex((note) => note.id === item.id) > -1
-              ? count++
-              : undefined
+            noteIds.indexOf(item.id) > -1 ? count++ : undefined
           );
           return count;
         }
@@ -139,55 +184,42 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
 
   useEffect(() => {
     resetItemState();
-    return () => {
-      useItemSelectionStore.getState().setMultiSelect(false);
-      useItemSelectionStore.getState().setItemState({});
-    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const resetItemState = useCallback(
     (state) => {
-      const itemState = {};
-      const notebooks = db.notebooks.all;
-      let count = 0;
-      for (let notebook of notebooks) {
-        itemState[notebook.id] = state
-          ? state
-          : areAllSelectedItemsInNotebook(notebook, selectedItemsList)
-          ? "selected"
-          : getSelectedNotesCountInItem(notebook, selectedItemsList) > 0
-          ? "intermediate"
-          : "deselected";
-        if (itemState[notebook.id] === "selected") {
-          count++;
-          contextValue.select(notebook);
-        } else {
-          contextValue.deselect(notebook);
-        }
-        for (let topic of notebook.topics) {
-          itemState[topic.id] = state
+      setItemState(() => {
+        const itemState = {};
+        const notebooks = db.notebooks.all;
+        for (let notebook of notebooks) {
+          itemState[notebook.id] = state
             ? state
-            : areAllSelectedItemsInTopic(topic, selectedItemsList) &&
-              getSelectedNotesCountInItem(topic, selectedItemsList)
+            : areAllSelectedItemsInAllTopics(notebook, selectedItemsList) &&
+              getSelectedNotesCountInItem(notebook, selectedItemsList) > 0
             ? "selected"
-            : getSelectedNotesCountInItem(topic, selectedItemsList) > 0
+            : getSelectedNotesCountInItem(notebook, selectedItemsList) > 0
             ? "intermediate"
             : "deselected";
-          if (itemState[topic.id] === "selected") {
-            count++;
-            contextValue.select(topic);
-          } else {
-            contextValue.deselect(topic);
+          if (itemState[notebook.id] === "selected") {
+            contextValue.select(notebook);
+          }
+          for (let topic of notebook.topics) {
+            itemState[topic.id] = state
+              ? state
+              : areAllSelectedItemsInTopic(topic, selectedItemsList) &&
+                getSelectedNotesCountInItem(topic, selectedItemsList)
+              ? "selected"
+              : getSelectedNotesCountInItem(topic, selectedItemsList) > 0
+              ? "intermediate"
+              : "deselected";
+            if (itemState[topic.id] === "selected") {
+              contextValue.select(topic);
+            }
           }
         }
-      }
-      if (count > 1) {
-        useItemSelectionStore.getState().setMultiSelect(true);
-      } else {
-        useItemSelectionStore.getState().setMultiSelect(false);
-      }
-      useItemSelectionStore.getState().setItemState(itemState);
+        return itemState;
+      });
     },
     [contextValue, getSelectedNotesCountInItem, selectedItemsList]
   );
@@ -199,11 +231,11 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
     }
   };
 
-  function areAllSelectedItemsInNotebook(notebook, items) {
-    const notes = db.relations.from(notebook, "note");
-    if (notes.length === 0) return false;
+  function areAllSelectedItemsInAllTopics(notebook, items) {
     return items.every((item) => {
-      return notes.find((note) => note.id === item.id);
+      return notebook.topics.every((topic) => {
+        return db.notes.topicReferences.get(topic.id).indexOf(item.id) > -1;
+      });
     });
   }
 
@@ -214,26 +246,51 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
   }
 
   const updateItemState = useCallback(function (item, state) {
-    const itemState = useItemSelectionStore.getState().itemState;
-    const mergeState = {
-      [item.id]: state
-    };
-    useItemSelectionStore.getState().setItemState({
-      ...itemState,
-      ...mergeState
+    setItemState((itemState) => {
+      const mergeState = {
+        [item.id]: state
+      };
+      const notebooks = db.notebooks.all;
+      const notebook =
+        item.type === "notebook"
+          ? item
+          : notebooks.find((n) => n.id === item.notebookId);
+      const intermediate = notebook.topics.some((topic) => {
+        return topic.id === item.id
+          ? state === "selected"
+          : itemState[topic.id] === "selected";
+      });
+      if (intermediate) mergeState[notebook.id] = "intermediate";
+      const selected = notebook.topics.every((topic) => {
+        return topic.id === item.id
+          ? state === "selected"
+          : itemState[topic.id] === "selected";
+      });
+      if (selected) mergeState[notebook.id] = "selected";
+      if (!selected && !intermediate) mergeState[notebook.id] = "deselected";
+
+      return {
+        ...itemState,
+        ...mergeState
+      };
     });
   }, []);
 
   const contextValue = useMemo(
     () => ({
+      enabled: multiSelect,
       toggleSelection: (item) => {
-        const itemState = useItemSelectionStore.getState().itemState;
-        if (itemState[item.id] === "selected") {
-          updateItemState(item, "deselected");
-        } else {
-          updateItemState(item, "selected");
-        }
+        setItemState((itemState) => {
+          if (itemState[item.id] === "selected") {
+            updateItemState(item, "deselected");
+          } else {
+            updateItemState(item, "selected");
+          }
+
+          return itemState;
+        });
       },
+      setMultiSelect: setMultiSelect,
       deselect: (item) => {
         updateItemState(item, "deselected");
       },
@@ -244,7 +301,7 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
         resetItemState(state);
       }
     }),
-    [resetItemState, updateItemState]
+    [multiSelect, resetItemState, updateItemState]
   );
 
   const getItemFromId = (id) => {
@@ -257,47 +314,39 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
   };
 
   const onSave = async () => {
-    const noteIds = note ? [note.id] : selectedItemsList.map((n) => n.id);
-    const itemState = useItemSelectionStore.getState().itemState;
     for (const id in itemState) {
       const item = getItemFromId(id);
+      if (item.type === "notebook") continue;
+      const noteIds = selectedItemsList.map((n) => n.id);
       if (itemState[id] === "selected") {
-        if (item.type === "notebook") {
-          for (let noteId of noteIds) {
-            await db.relations.add(item, { id: noteId, type: "note" });
-          }
-        } else {
-          await db.notes.addToNotebook(
-            {
-              topic: item.id,
-              id: item.notebookId,
-              rebuildCache: true
-            },
-            ...noteIds
-          );
-        }
+        await db.notes.addToNotebook(
+          {
+            topic: item.id,
+            id: item.notebookId,
+            rebuildCache: true
+          },
+          ...noteIds
+        );
       } else if (itemState[id] === "deselected") {
-        if (item.type === "notebook") {
-          for (let noteId of noteIds) {
-            await db.relations.unlink(item, { id: noteId, type: "note" });
-          }
-        } else {
-          await db.notes.removeFromNotebook(
-            {
-              id: item.notebookId,
-              topic: item.id,
-              rebuildCache: true
-            },
-            ...noteIds
-          );
-        }
+        await db.notes.removeFromNotebook(
+          {
+            id: item.notebookId,
+            topic: item.id,
+            rebuildCache: true
+          },
+          ...noteIds
+        );
       }
     }
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes"
+    );
     setNotebooks();
-    eSendEvent(eOnTopicSheetUpdate);
     SearchService.updateAndSearch();
-    useRelationStore.getState().update();
     actionSheetRef.current?.hide();
   };
 
@@ -348,32 +397,34 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
           />
         </View>
 
-        <View
-          style={{
-            paddingHorizontal: 12
-          }}
-        >
-          <Button
-            title="Reset selection"
-            height={30}
+        {multiSelect ? (
+          <View
             style={{
-              alignSelf: "flex-start",
-              paddingHorizontal: 0,
-              width: "100%",
-              marginTop: 6
+              paddingHorizontal: 12
             }}
-            type="grayAccent"
-            onPress={() => {
-              resetItemState();
-            }}
-          />
-        </View>
+          >
+            <Button
+              title="Reset selection"
+              height={30}
+              style={{
+                alignSelf: "flex-start",
+                paddingHorizontal: 0
+              }}
+              onPress={() => {
+                resetItemState();
+                setMultiSelect(false);
+              }}
+            />
+          </View>
+        ) : null}
 
         <SelectionProvider value={contextValue}>
           <FilteredList
+            onMomentumScrollEnd={() => {
+              actionSheetRef.current?.handleChildScrollEnd();
+            }}
             style={{
-              paddingHorizontal: 12,
-              maxHeight: dimensions.height * 0.85
+              paddingHorizontal: 12
             }}
             ListEmptyComponent={
               notebooks.length > 0 ? null : (
@@ -399,8 +450,12 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
                 item={item}
                 key={item.id}
                 index={index}
-                hasNotes={getSelectedNotesCountInItem(item) > 0}
-                sheetRef={actionSheetRef}
+                intermediate={itemState[item.id] === "intermediate"}
+                removed={
+                  itemState[item.id] === "deselected" &&
+                  getSelectedNotesCountInItem(item) > 0
+                }
+                isSelected={itemState[item.id] === "selected"}
                 infoText={
                   <>
                     {item.topics.length === 1
@@ -410,18 +465,25 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
                 }
                 getListItems={getItemsForItem}
                 getSublistItemProps={(topic) => ({
-                  hasNotes: getSelectedNotesCountInItem(topic) > 0,
+                  selected: itemState[topic.id] === "selected",
+                  intermediate: itemState[topic.id] === "intermediate",
+                  isSelected: itemState[topic.id] === "selected",
+                  removed:
+                    itemState[topic.id] === "deselected" &&
+                    getSelectedNotesCountInItem(topic) > 0,
                   style: {
                     marginBottom: 0,
                     height: 40
                   },
                   onPress: (item) => {
-                    const itemState =
-                      useItemSelectionStore.getState().itemState;
                     const currentState = itemState[item.id];
                     if (currentState !== "selected") {
                       resetItemState("deselected");
                       contextValue.select(item);
+                      updateItemState(
+                        notebooks.find((n) => n.id === item.notebookId),
+                        "intermediate"
+                      );
                     } else {
                       contextValue.deselect(item);
                     }
@@ -446,35 +508,22 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
                 onAddSublistItem={(item) => {
                   openAddTopicDialog(item);
                 }}
-                onPress={(item) => {
-                  const itemState = useItemSelectionStore.getState().itemState;
-                  const currentState = itemState[item.id];
-                  if (currentState !== "selected") {
-                    resetItemState("deselected");
-                    contextValue.select(item);
-                  } else {
-                    contextValue.deselect(item);
-                  }
-                }}
               />
             )}
             itemType="notebook"
             onAddItem={async (title) => {
               return await onAddNotebook(title);
             }}
-            ListFooterComponent={<View style={{ height: 20 }} />}
+            ListFooterComponent={
+              <View
+                style={{
+                  height: 200
+                }}
+              />
+            }
           />
         </SelectionProvider>
       </View>
     </>
   );
 };
-
-MoveNoteSheet.present = (note) => {
-  presentSheet({
-    component: (ref) => <MoveNoteSheet actionSheetRef={ref} note={note} />,
-    enableGesturesInScrollView: false,
-    noBottomPadding: true
-  });
-};
-export default MoveNoteSheet;

apps/mobile/app/components/sheets/add-to/list-item.js

@@ -17,10 +17,8 @@ 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, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { View } from "react-native";
-import { db } from "../../../common/database";
-import { useSelectionStore } from "../../../stores/use-selection-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
 import { SIZE } from "../../../utils/size";
 import { IconButton } from "../../ui/icon-button";
@@ -29,78 +27,13 @@ import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 import { useSelectionContext } from "./context";
 import { FilteredList } from "./filtered-list";
-import { useItemSelectionStore } from "./store";
 
-const SelectionIndicator = ({
-  item,
-  hasNotes,
-  selectItem,
-  onPress,
-  onChange
-}) => {
-  const itemState = useItemSelectionStore((state) => state.itemState[item.id]);
-  const multiSelect = useItemSelectionStore((state) => state.multiSelect);
-
-  const isSelected = itemState === "selected";
-  const isIntermediate = itemState === "intermediate";
-  const isRemoved = !isSelected && hasNotes;
-  const colors = useThemeStore((state) => state.colors);
-
-  useEffect(() => {
-    onChange?.();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [itemState]);
-
-  return (
-    <IconButton
-      size={22}
-      customStyle={{
-        marginRight: 5,
-        width: 23,
-        height: 23
-      }}
-      color={
-        isRemoved
-          ? colors.red
-          : isIntermediate || isSelected
-          ? colors.accent
-          : colors.icon
-      }
-      onPress={() => {
-        if (multiSelect) return selectItem();
-        onPress?.(item);
-      }}
-      onLongPress={() => {
-        useItemSelectionStore.getState().setMultiSelect(true);
-        selectItem();
-      }}
-      testID={
-        isRemoved
-          ? "close-circle-outline"
-          : isSelected
-          ? "check-circle-outline"
-          : isIntermediate
-          ? "minus-circle-outline"
-          : "checkbox-blank-circle-outline"
-      }
-      name={
-        isRemoved
-          ? "close-circle-outline"
-          : isSelected
-          ? "check-circle-outline"
-          : isIntermediate
-          ? "minus-circle-outline"
-          : "checkbox-blank-circle-outline"
-      }
-    />
-  );
-};
-
-export const ListItem = ({
+const _ListItem = ({
   item,
   index,
   icon,
   infoText,
+  intermediate,
   hasSubList,
   onPress,
   onScrollEnd,
@@ -110,49 +43,29 @@ export const ListItem = ({
   sublistItemType,
   onAddItem,
   getSublistItemProps,
+  removed,
+  isSelected,
   hasHeaderSearch,
-  onAddSublistItem,
-  hasNotes,
-  onChange,
-  sheetRef
+  onAddSublistItem
 }) => {
-  const { toggleSelection } = useSelectionContext();
-  const multiSelect = useItemSelectionStore((state) => state.multiSelect);
-  const [showSelectedIndicator, setShowSelectedIndicator] = useState(false);
+  const { enabled, toggleSelection, setMultiSelect, select, deselect } =
+    useSelectionContext();
   const colors = useThemeStore((state) => state.colors);
   const [expanded, setExpanded] = useState(false);
 
   function selectItem() {
+    const currentState = isSelected;
     toggleSelection(item);
-  }
-
-  const getSelectedNotesCountInNotebookTopics = (item) => {
-    if (item.type === "topic") return;
-
-    let count = 0;
-    const noteIds = [];
-    for (let topic of item.topics) {
-      noteIds.push(...(db.notes?.topicReferences.get(topic.id) || []));
-      if (useItemSelectionStore.getState().itemState[topic.id] === "selected") {
-        count++;
-      }
+    if (item.type === "notebook") {
+      item.topics.forEach((item) => {
+        if (currentState) {
+          deselect(item);
+        } else {
+          select(item);
+        }
+      });
     }
-    useSelectionStore.getState().selectedItemsList.forEach((item) => {
-      if (noteIds.indexOf(item.id) > -1) {
-        count++;
-      }
-    });
-    return count;
-  };
-
-  useEffect(() => {
-    setShowSelectedIndicator(getSelectedNotesCountInNotebookTopics(item) > 0);
-  }, [item]);
-
-  const onChangeSubItem = () => {
-    setShowSelectedIndicator(getSelectedNotesCountInNotebookTopics(item) > 0);
-  };
-
+  }
   return (
     <View
       style={{
@@ -164,12 +77,12 @@ export const ListItem = ({
       <PressableButton
         onPress={() => {
           if (hasSubList) return setExpanded(!expanded);
-          if (multiSelect) return selectItem();
+          if (enabled) return selectItem();
           onPress?.(item);
         }}
         type={type}
         onLongPress={() => {
-          useItemSelectionStore.getState().setMultiSelect(true);
+          setMultiSelect(true);
           selectItem();
         }}
         customStyle={{
@@ -194,12 +107,46 @@ export const ListItem = ({
               alignItems: "center"
             }}
           >
-            <SelectionIndicator
-              hasNotes={hasNotes}
-              onPress={onPress}
-              item={item}
-              onChange={onChange}
-              selectItem={selectItem}
+            <IconButton
+              size={22}
+              customStyle={{
+                marginRight: 5,
+                width: 23,
+                height: 23
+              }}
+              color={
+                removed
+                  ? colors.red
+                  : intermediate || isSelected
+                  ? colors.accent
+                  : colors.icon
+              }
+              onPress={() => {
+                if (item.type === "notebook") {
+                  setMultiSelect(true);
+                }
+                selectItem();
+                if (enabled) return;
+                onPress?.(item);
+              }}
+              testID={
+                removed
+                  ? "close-circle-outline"
+                  : isSelected
+                  ? "check-circle-outline"
+                  : intermediate
+                  ? "minus-circle-outline"
+                  : "checkbox-blank-circle-outline"
+              }
+              name={
+                removed
+                  ? "close-circle-outline"
+                  : isSelected
+                  ? "check-circle-outline"
+                  : intermediate
+                  ? "minus-circle-outline"
+                  : "checkbox-blank-circle-outline"
+              }
             />
             <View>
               {hasSubList && expanded ? (
@@ -218,27 +165,14 @@ export const ListItem = ({
 
           <View
             style={{
-              flexDirection: "row",
-              alignItems: "center"
+              flexDirection: "row"
             }}
           >
-            {showSelectedIndicator ? (
-              <View
-                style={{
-                  backgroundColor: colors.accent,
-                  width: 7,
-                  height: 7,
-                  borderRadius: 100,
-                  marginRight: 12
-                }}
-              />
-            ) : null}
-
             {onAddSublistItem ? (
               <IconButton
                 name={"plus"}
                 testID="add-item-icon"
-                color={colors.pri}
+                color={colors}
                 size={SIZE.xl}
                 onPress={() => {
                   onAddSublistItem(item);
@@ -271,7 +205,7 @@ export const ListItem = ({
           style={{
             width: "95%",
             alignSelf: "flex-end",
-            maxHeight: 250
+            maxHeight: 500
           }}
           itemType={sublistItemType}
           hasHeaderSearch={hasHeaderSearch}
@@ -280,7 +214,6 @@ export const ListItem = ({
               item={item}
               {...getSublistItemProps(item)}
               index={index}
-              onChange={onChangeSubItem}
               onScrollEnd={onScrollEnd}
             />
           )}
@@ -290,3 +223,11 @@ export const ListItem = ({
     </View>
   );
 };
+
+export const ListItem = React.memo(_ListItem, (prev, next) => {
+  if (prev.selected === undefined) return false;
+  if (prev.isSelected !== next.isSelected) return false;
+  if (prev.selected !== next.selected) return false;
+  if (prev.intermediate !== next.intermediate) return false;
+  return true;
+});

apps/mobile/app/components/sheets/add-to/store.ts

@@ -1,42 +0,0 @@
-/*
-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 create, { State } from "zustand";
-
-type SelectionItemState = Record<
-  string,
-  "intermediate" | "selected" | "deselected"
->;
-
-export interface SelectionStore extends State {
-  itemState: SelectionItemState;
-  setItemState: (state: SelectionItemState) => void;
-  multiSelect: boolean;
-  setMultiSelect: (multiSelect: boolean) => void;
-}
-
-export const useItemSelectionStore = create<SelectionStore>((set) => ({
-  itemState: {},
-  setItemState: (itemState) => {
-    set({
-      itemState
-    });
-  },
-  multiSelect: false,
-  setMultiSelect: (multiSelect) => set({ multiSelect })
-}));

apps/mobile/app/components/sheets/change-email/index.tsx

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import React, { RefObject, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
-import { ActionSheetRef } from "react-native-actions-sheet";
+import ActionSheet from "react-native-actions-sheet";
 import { db } from "../../../common/database";
 import {
   eSendEvent,
@@ -31,7 +31,7 @@ import { Button } from "../../ui/button";
 import Input from "../../ui/input";
 
 type ChangeEmailProps = {
-  actionSheetRef: RefObject<ActionSheetRef>;
+  actionSheetRef: RefObject<ActionSheet>;
   close?: () => void;
   update?: (options: PresentSheetOptions) => void;
 };

apps/mobile/app/components/sheets/export-notes/index.js

@@ -277,6 +277,7 @@ const ExportNotesSheet = ({ notes, update }) => {
                       });
                     });
                   }}
+                  height={50}
                 />
                 <Button
                   title="Share"
@@ -300,6 +301,7 @@ const ExportNotesSheet = ({ notes, update }) => {
                       }).catch(console.log);
                     }
                   }}
+                  height={50}
                 />
                 <Button
                   title="Export in another format"
@@ -315,6 +317,7 @@ const ExportNotesSheet = ({ notes, update }) => {
                     setResult(null);
                     setExporting(false);
                   }}
+                  height={50}
                 />
               </>
             )}

apps/mobile/app/components/sheets/export-notes/share.js

@@ -48,6 +48,7 @@ export const ShareComponent = ({ uri, name, padding }) => {
             });
           });
         }}
+        height={50}
       />
       <Button
         title="Share"
@@ -64,6 +65,7 @@ export const ShareComponent = ({ uri, name, padding }) => {
             shareFile: true
           }).catch(console.log);
         }}
+        height={50}
       />
     </View>
   );

apps/mobile/app/components/sheets/github/issue.js

@@ -196,6 +196,7 @@ For example:
         onPress={onPress}
         title={loading ? null : "Submit"}
         loading={loading}
+        height={50}
         width="100%"
         type="accent"
       />

apps/mobile/app/components/sheets/manage-tags/index.js

@@ -17,32 +17,51 @@ 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, useRef, useState } from "react";
-import { View } from "react-native";
-import { ScrollView } from "react-native-actions-sheet";
+import React, { useEffect, useRef, useState } from "react";
+import { ScrollView, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../../common/database";
-import { presentSheet, ToastEvent } from "../../../services/event-manager";
+import {
+  eSubscribeEvent,
+  eUnSubscribeEvent,
+  ToastEvent
+} from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import { useTagStore } from "../../../stores/use-tag-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
+import { eCloseTagsDialog, eOpenTagsDialog } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
+import { sleep } from "../../../utils/time";
 import Input from "../../ui/input";
 import { PressableButton } from "../../ui/pressable";
+import SheetWrapper from "../../ui/sheet";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
-const ManageTagsSheet = (props) => {
+import { useCallback } from "react";
+const ManageTagsSheet = () => {
   const colors = useThemeStore((state) => state.colors);
-  const [note, setNote] = useState(props.note);
+  const [visible, setVisible] = useState(false);
+  const [note, setNote] = useState(null);
   const allTags = useTagStore((state) => state.tags);
   const [tags, setTags] = useState([]);
   const [query, setQuery] = useState(null);
   const inputRef = useRef();
-  const [focus, setFocus] = useState(false);
+  const actionSheetRef = useRef();
 
   useEffect(() => {
-    sortTags();
-  }, [allTags, note, query, sortTags]);
+    eSubscribeEvent(eOpenTagsDialog, open);
+    eSubscribeEvent(eCloseTagsDialog, close);
+    return () => {
+      eUnSubscribeEvent(eOpenTagsDialog, open);
+      eUnSubscribeEvent(eCloseTagsDialog, close);
+    };
+  }, [open]);
+
+  useEffect(() => {
+    if (visible) {
+      sortTags();
+    }
+  }, [allTags, note, query, sortTags, visible]);
 
   const sortTags = useCallback(() => {
     let _tags = [...allTags];
@@ -69,9 +88,26 @@ const ManageTagsSheet = (props) => {
     setTags(combinedTags);
   }, [allTags, note, query]);
 
+  const open = useCallback(
+    (item) => {
+      setNote(item);
+      useTagStore.getState().setTags();
+      sortTags();
+      setVisible(true);
+    },
+    [sortTags]
+  );
+
   useEffect(() => {
-    useTagStore.getState().setTags();
-  }, []);
+    if (visible) {
+      actionSheetRef.current?.show();
+    }
+  }, [visible]);
+
+  const close = () => {
+    setQuery(null);
+    actionSheetRef.current?.hide();
+  };
 
   const onSubmit = async () => {
     let _query = query;
@@ -103,98 +139,115 @@ const ManageTagsSheet = (props) => {
       });
     }
 
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes",
+      "Notebooks",
+      "Notebook"
+    );
   };
 
-  return (
-    <View
-      style={{
-        width: "100%",
-        alignSelf: "center",
-        paddingHorizontal: 12,
-        minHeight: focus ? "100%" : "60%"
+  return !visible ? null : (
+    <SheetWrapper
+      centered={false}
+      fwdRef={actionSheetRef}
+      onOpen={async () => {
+        await sleep(300);
+        inputRef.current?.focus();
+      }}
+      onClose={async () => {
+        setQuery(null);
+        setVisible(false);
       }}
     >
-      <Input
-        button={{
-          icon: "magnify",
-          color: colors.accent,
-          size: SIZE.lg
+      <View
+        style={{
+          width: "100%",
+          alignSelf: "center",
+          paddingHorizontal: 12,
+          minHeight: "60%"
         }}
-        testID="tag-input"
-        fwdRef={inputRef}
-        autoCapitalize="none"
-        onChangeText={(v) => {
-          setQuery(db.tags.sanitize(v));
-        }}
-        onFocusInput={() => {
-          setFocus(true);
-        }}
-        onBlurInput={() => {
-          setFocus(false);
-        }}
-        onSubmit={onSubmit}
-        placeholder="Search or add a tag"
-      />
-
-      <ScrollView
-        overScrollMode="never"
-        scrollToOverflowEnabled={false}
-        keyboardDismissMode="none"
-        keyboardShouldPersistTaps="always"
       >
-        {query && query !== tags[0]?.title ? (
-          <PressableButton
-            key={"query_item"}
-            customStyle={{
-              flexDirection: "row",
-              marginVertical: 5,
-              justifyContent: "space-between",
-              padding: 12
-            }}
-            onPress={onSubmit}
-            type="accent"
-          >
-            <Heading size={SIZE.sm} color={colors.light}>
-              Add {'"' + "#" + query + '"'}
-            </Heading>
-            <Icon name="plus" color={colors.light} size={SIZE.lg} />
-          </PressableButton>
-        ) : null}
-        {!allTags || allTags.length === 0 ? (
-          <View
-            style={{
-              width: "100%",
-              height: 200,
-              justifyContent: "center",
-              alignItems: "center"
-            }}
-          >
-            <Heading size={50} color={colors.icon}>
-              #
-            </Heading>
-            <Paragraph textBreakStrategy="balanced" color={colors.icon}>
-              You do not have any tags.
-            </Paragraph>
-          </View>
-        ) : null}
+        <Input
+          button={{
+            icon: "magnify",
+            color: colors.accent,
+            size: SIZE.lg
+          }}
+          testID="tag-input"
+          fwdRef={inputRef}
+          autoCapitalize="none"
+          onChangeText={(v) => {
+            setQuery(db.tags.sanitize(v));
+          }}
+          onSubmit={onSubmit}
+          height={50}
+          placeholder="Search or add a tag"
+        />
 
-        {tags.map((item) => (
-          <TagItem key={item.title} tag={item} note={note} setNote={setNote} />
-        ))}
-      </ScrollView>
-    </View>
+        <ScrollView
+          nestedScrollEnabled
+          overScrollMode="never"
+          scrollToOverflowEnabled={false}
+          keyboardDismissMode="none"
+          keyboardShouldPersistTaps="always"
+          onMomentumScrollEnd={() => {
+            actionSheetRef.current?.handleChildScrollEnd();
+          }}
+        >
+          {query && query !== tags[0]?.title ? (
+            <PressableButton
+              key={"query_item"}
+              customStyle={{
+                flexDirection: "row",
+                marginVertical: 5,
+                justifyContent: "space-between",
+                padding: 12
+              }}
+              onPress={onSubmit}
+              type="accent"
+            >
+              <Heading size={SIZE.sm} color={colors.light}>
+                Add {'"' + "#" + query + '"'}
+              </Heading>
+              <Icon name="plus" color={colors.light} size={SIZE.lg} />
+            </PressableButton>
+          ) : null}
+          {!allTags || allTags.length === 0 ? (
+            <View
+              style={{
+                width: "100%",
+                height: 200,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <Heading size={50} color={colors.icon}>
+                #
+              </Heading>
+              <Paragraph textBreakStrategy="balanced" color={colors.icon}>
+                You do not have any tags.
+              </Paragraph>
+            </View>
+          ) : null}
+
+          {tags.map((item) => (
+            <TagItem
+              key={item.title}
+              tag={item}
+              note={note}
+              setNote={setNote}
+            />
+          ))}
+        </ScrollView>
+      </View>
+    </SheetWrapper>
   );
 };
 
-ManageTagsSheet.present = (note) => {
-  presentSheet({
-    component: (ref) => {
-      return <ManageTagsSheet actionSheetRef={ref} note={note} />;
-    }
-  });
-};
-
 export default ManageTagsSheet;
 
 const TagItem = ({ tag, note, setNote }) => {
@@ -216,7 +269,13 @@ const TagItem = ({ tag, note, setNote }) => {
       console.error(e);
     }
     setTimeout(() => {
-      Navigation.queueRoutesForUpdate();
+      Navigation.queueRoutesForUpdate(
+        "Notes",
+        "Favorites",
+        "ColoredNotes",
+        "TaggedNotes",
+        "TopicNotes"
+      );
     }, 1);
   };
 

apps/mobile/app/components/sheets/move-notes/movenote.tsx

@@ -17,11 +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 { FlashList } from "@shopify/flash-list";
 import { NotebookType, NoteType, TopicType } from "app/utils/types";
 import React, { RefObject, useState } from "react";
 import { Platform, useWindowDimensions, View } from "react-native";
-import { ActionSheetRef } from "react-native-actions-sheet";
-import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
+import ActionSheet from "react-native-actions-sheet";
 import { db } from "../../../common/database";
 import {
   eSendEvent,
@@ -58,7 +58,7 @@ export const MoveNotes = ({
 }: {
   notebook: NotebookType;
   selectedTopic?: TopicType;
-  fwdRef: RefObject<ActionSheetRef>;
+  fwdRef: RefObject<ActionSheet>;
 }) => {
   const colors = useThemeStore((state) => state.colors);
   const [currentNotebook, setCurrentNotebook] = useState(notebook);
@@ -122,7 +122,15 @@ export const MoveNotes = ({
       db.notebooks?.notebook(currentNotebook.id).data as NotebookType
     );
 
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "ColoredNotes",
+      "TaggedNotes",
+      "TopicNotes",
+      "Notebook",
+      "Notebooks"
+    );
     return true;
   };
 
@@ -158,7 +166,11 @@ export const MoveNotes = ({
               {item.title}
             </Paragraph>
             {item.type == "note" && item.headline ? (
-              <Paragraph numberOfLines={1} color={colors.icon} size={SIZE.xs}>
+              <Paragraph
+                numberOfLines={1}
+                color={colors.icon}
+                size={SIZE.xs + 1}
+              >
                 {item.headline}
               </Paragraph>
             ) : null}
@@ -265,6 +277,10 @@ export const MoveNotes = ({
       )}
 
       <FlashList
+        nestedScrollEnabled
+        onMomentumScrollEnd={() => {
+          fwdRef.current?.handleChildScrollEnd();
+        }}
         ListEmptyComponent={
           <View
             style={{
@@ -306,7 +322,15 @@ export const MoveNotes = ({
               },
               ...selectedNoteIds
             );
-            Navigation.queueRoutesForUpdate();
+            Navigation.queueRoutesForUpdate(
+              "Notes",
+              "Favorites",
+              "ColoredNotes",
+              "TaggedNotes",
+              "TopicNotes",
+              "Notebook",
+              "Notebooks"
+            );
             SearchService.updateAndSearch();
             eSendEvent(eCloseSheet);
           }}
@@ -321,7 +345,7 @@ export const MoveNotes = ({
 
 MoveNotes.present = (notebook: NotebookType, topic: TopicType) => {
   presentSheet({
-    component: (ref: RefObject<ActionSheetRef>) => (
+    component: (ref: RefObject<ActionSheet>) => (
       <MoveNotes fwdRef={ref} notebook={notebook} selectedTopic={topic} />
     )
   });

apps/mobile/app/components/sheets/new-feature/index.tsx

@@ -93,13 +93,7 @@ NewFeature.present = () => {
     });
     return;
   }
-  if (!version || version === getVersion()) {
-    SettingsService.set({
-      version: getVersion()
-    });
-    return false;
-  }
-
+  if (version && version === getVersion()) return false;
   SettingsService.set({
     version: getVersion()
   });

apps/mobile/app/components/sheets/publish-note/index.js

@@ -18,14 +18,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import Clipboard from "@react-native-clipboard/clipboard";
-import React, { useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { ActivityIndicator, TouchableOpacity, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../../common/database";
-import { presentSheet, ToastEvent } from "../../../services/event-manager";
+import {
+  eSubscribeEvent,
+  eUnSubscribeEvent,
+  ToastEvent
+} from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import { useAttachmentStore } from "../../../stores/use-attachment-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
+import {
+  eClosePublishNoteDialog,
+  eOpenPublishNoteDialog
+} from "../../../utils/events";
 import { openLinkInBrowser } from "../../../utils/functions";
 import { SIZE } from "../../../utils/size";
 import DialogHeader from "../../dialog/dialog-header";
@@ -33,38 +41,75 @@ import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import Input from "../../ui/input";
 import Seperator from "../../ui/seperator";
+import SheetWrapper from "../../ui/sheet";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 
-const PublishNoteSheet = ({ note: item, update }) => {
+let passwordValue = null;
+const PublishNoteSheet = () => {
   const colors = useThemeStore((state) => state.colors);
+  const [visible, setVisible] = useState(false);
   const actionSheetRef = useRef();
   const loading = useAttachmentStore((state) => state.loading);
   const [selfDestruct, setSelfDestruct] = useState(false);
   const [isLocked, setIsLocked] = useState(false);
-  const [note, setNote] = useState(item);
+  const [note, setNote] = useState(null);
   const [publishing, setPublishing] = useState(false);
   const publishUrl =
     note &&
     `https://monograph.notesnook.com/${db?.monographs.monograph(note?.id)}`;
   const isPublished = note && db?.monographs.isPublished(note?.id);
   const pwdInput = useRef();
-  const passwordValue = useRef();
+
+  useEffect(() => {
+    eSubscribeEvent(eOpenPublishNoteDialog, open);
+    eSubscribeEvent(eClosePublishNoteDialog, close);
+    return () => {
+      eUnSubscribeEvent(eOpenPublishNoteDialog, open);
+      eUnSubscribeEvent(eClosePublishNoteDialog, close);
+    };
+  }, []);
+
+  const open = (item) => {
+    if (!item) return;
+    setNote(item);
+    setPublishing(false);
+    setSelfDestruct(false);
+    setIsLocked(false);
+    setVisible(true);
+    passwordValue = null;
+  };
+
+  useEffect(() => {
+    if (visible) {
+      actionSheetRef.current?.show();
+    }
+  }, [visible]);
+
+  const close = () => {
+    passwordValue = null;
+    actionSheetRef.current?.hide();
+  };
 
   const publishNote = async () => {
     if (publishing) return;
-    setPublishLoading(true);
+    setPublishing(true);
 
     try {
       if (note?.id) {
         if (isLocked && !passwordValue) return;
         await db.monographs.publish(note.id, {
           selfDestruct: selfDestruct,
-          password: isLocked && passwordValue.current
+          password: isLocked && passwordValue
         });
         setNote(db.notes.note(note.id)?.data);
-        Navigation.queueRoutesForUpdate();
-        setPublishLoading(false);
+        Navigation.queueRoutesForUpdate(
+          "Notes",
+          "Favorites",
+          "ColoredNotes",
+          "TaggedNotes",
+          "TopicNotes"
+        );
       }
     } catch (e) {
       ToastEvent.show({
@@ -75,22 +120,23 @@ const PublishNoteSheet = ({ note: item, update }) => {
       });
     }
 
-    setPublishLoading(false);
-  };
-
-  const setPublishLoading = (value) => {
-    setPublishing(value);
+    setPublishing(false);
   };
 
   const deletePublishedNote = async () => {
     if (publishing) return;
-    setPublishLoading(true);
+    setPublishing(true);
     try {
       if (note?.id) {
         await db.monographs.unpublish(note.id);
         setNote(db.notes.note(note.id)?.data);
-        Navigation.queueRoutesForUpdate();
-        setPublishLoading(false);
+        Navigation.queueRoutesForUpdate(
+          "Notes",
+          "Favorites",
+          "ColoredNotes",
+          "TaggedNotes",
+          "TopicNotes"
+        );
       }
     } catch (e) {
       ToastEvent.show({
@@ -101,281 +147,267 @@ const PublishNoteSheet = ({ note: item, update }) => {
       });
     }
     actionSheetRef.current?.hide();
-    setPublishLoading(false);
+    setPublishing(false);
   };
 
-  return (
-    <View
-      style={{
-        width: "100%",
-        alignSelf: "center",
-        paddingHorizontal: 12
+  return !visible ? null : (
+    <SheetWrapper
+      centered={false}
+      fwdRef={actionSheetRef}
+      closeOnTouchBackdrop={!publishing}
+      gestureEnabled={!publishing}
+      onClose={async () => {
+        passwordValue = null;
+        setVisible(false);
       }}
     >
-      <DialogHeader
-        title={note?.title}
-        paragraph={`Anyone with the link${
-          isLocked ? " and password" : ""
-        } of the published note can view it.`}
-      />
+      <View
+        style={{
+          width: "100%",
+          alignSelf: "center",
+          paddingHorizontal: 12
+        }}
+      >
+        <DialogHeader
+          title={note?.title}
+          paragraph={`Anyone with the link${
+            isLocked ? " and password" : ""
+          } of the published note can view it.`}
+        />
 
-      {publishing ? (
-        <View
-          style={{
-            justifyContent: "center",
-            alignContent: "center",
-            height: 150,
-            width: "100%"
-          }}
-        >
-          <ActivityIndicator size={25} color={colors.accent} />
-          <Paragraph
+        {publishing ? (
+          <View
             style={{
-              textAlign: "center"
+              justifyContent: "center",
+              alignContent: "center",
+              height: 150,
+              width: "100%"
             }}
           >
-            Please wait...
-            {loading && loading.current && loading.total
-              ? `\nDownloading attachments (${
-                  loading?.current / loading?.total
-                })`
-              : ""}
-          </Paragraph>
-        </View>
-      ) : (
-        <>
-          {isPublished && (
-            <View
+            <ActivityIndicator size={25} color={colors.accent} />
+            <Paragraph
+              style={{
+                textAlign: "center"
+              }}
+            >
+              Please wait...
+              {loading && loading.current && loading.total
+                ? `\nDownloading attachments (${
+                    loading?.current / loading?.total
+                  })`
+                : ""}
+            </Paragraph>
+          </View>
+        ) : (
+          <>
+            {isPublished && (
+              <View
+                style={{
+                  flexDirection: "row",
+                  alignItems: "center",
+                  marginTop: 15,
+                  backgroundColor: colors.nav,
+                  padding: 12,
+                  borderRadius: 5
+                }}
+              >
+                <View
+                  style={{
+                    width: "100%",
+                    flexShrink: 1
+                  }}
+                >
+                  <Heading size={SIZE.sm}>Published at:</Heading>
+                  <Paragraph size={SIZE.xs} numberOfLines={1}>
+                    {publishUrl}
+                  </Paragraph>
+                  <Paragraph
+                    onPress={async () => {
+                      try {
+                        await openLinkInBrowser(publishUrl, colors.accent);
+                      } catch (e) {
+                        console.error(e);
+                      }
+                    }}
+                    size={SIZE.xs}
+                    style={{
+                      marginTop: 5,
+                      color: colors.pri
+                    }}
+                  >
+                    <Icon color={colors.accent} name="open-in-new" /> Open in
+                    browser
+                  </Paragraph>
+                </View>
+
+                <IconButton
+                  onPress={() => {
+                    Clipboard.setString(publishUrl);
+                    ToastEvent.show({
+                      heading: "Note publish url copied",
+                      type: "success",
+                      context: "local"
+                    });
+                  }}
+                  color={colors.accent}
+                  size={SIZE.lg}
+                  name="content-copy"
+                />
+              </View>
+            )}
+            <Seperator />
+
+            <TouchableOpacity
+              onPress={() => {
+                if (publishing) return;
+                setIsLocked(!isLocked);
+              }}
+              activeOpacity={0.9}
               style={{
                 flexDirection: "row",
                 alignItems: "center",
-                marginTop: 10,
-                backgroundColor: colors.nav,
-                padding: 12,
-                borderRadius: 5
+                marginBottom: 10
               }}
             >
+              <IconButton
+                onPress={() => {
+                  if (publishing) return;
+                  setIsLocked(!isLocked);
+                }}
+                color={isLocked ? colors.accent : colors.icon}
+                size={SIZE.lg}
+                name={
+                  isLocked
+                    ? "check-circle-outline"
+                    : "checkbox-blank-circle-outline"
+                }
+              />
+
               <View
                 style={{
                   width: "100%",
                   flexShrink: 1
                 }}
               >
-                <Heading size={SIZE.md}>Published at:</Heading>
-                <Paragraph size={SIZE.sm} numberOfLines={1}>
-                  {publishUrl}
-                </Paragraph>
-                <Paragraph
-                  onPress={async () => {
-                    try {
-                      await openLinkInBrowser(publishUrl, colors.accent);
-                    } catch (e) {
-                      console.error(e);
-                    }
-                  }}
-                  size={SIZE.xs}
-                  style={{
-                    marginTop: 5,
-                    color: colors.pri
-                  }}
-                >
-                  <Icon color={colors.accent} name="open-in-new" /> Open in
-                  browser
+                <Heading size={SIZE.md}>Password protection</Heading>
+                <Paragraph>
+                  Published note can only be viewed by someone with the
+                  password.
                 </Paragraph>
               </View>
+            </TouchableOpacity>
 
-              <IconButton
-                onPress={() => {
-                  Clipboard.setString(publishUrl);
-                  ToastEvent.show({
-                    heading: "Note publish url copied",
-                    type: "success",
-                    context: "local"
-                  });
-                }}
-                color={colors.accent}
-                size={SIZE.lg}
-                name="content-copy"
-              />
-            </View>
-          )}
-
-          <TouchableOpacity
-            onPress={() => {
-              if (publishing) return;
-              setIsLocked(!isLocked);
-            }}
-            activeOpacity={0.9}
-            style={{
-              flexDirection: "row",
-              alignItems: "center",
-              marginBottom: 10,
-              backgroundColor: colors.nav,
-              paddingVertical: 12,
-              borderRadius: 5,
-              marginTop: 10
-            }}
-          >
-            <IconButton
-              onPress={() => {
-                if (publishing) return;
-                setIsLocked(!isLocked);
-              }}
-              color={isLocked ? colors.accent : colors.icon}
-              size={SIZE.xl}
-              name={
-                isLocked
-                  ? "check-circle-outline"
-                  : "checkbox-blank-circle-outline"
-              }
-            />
-
-            <View
-              style={{
-                width: "100%",
-                flexShrink: 1
-              }}
-            >
-              <Heading size={SIZE.md}>Password protection</Heading>
-              <Paragraph>
-                Published note can only be viewed by someone with the password.
-              </Paragraph>
-            </View>
-          </TouchableOpacity>
-
-          <TouchableOpacity
-            onPress={() => {
-              setSelfDestruct(!selfDestruct);
-            }}
-            activeOpacity={0.9}
-            style={{
-              flexDirection: "row",
-              alignItems: "center",
-              backgroundColor: colors.nav,
-              paddingVertical: 12,
-              borderRadius: 5
-            }}
-          >
-            <IconButton
+            <TouchableOpacity
               onPress={() => {
                 setSelfDestruct(!selfDestruct);
               }}
-              color={selfDestruct ? colors.accent : colors.icon}
-              size={SIZE.xl}
-              name={
-                selfDestruct
-                  ? "check-circle-outline"
-                  : "checkbox-blank-circle-outline"
-              }
-            />
-
-            <View
-              style={{
-                width: "100%",
-                flexShrink: 1
-              }}
-            >
-              <Heading size={SIZE.md}>Self destruct</Heading>
-              <Paragraph>
-                Published note link will be automatically deleted once it is
-                viewed by someone.
-              </Paragraph>
-            </View>
-          </TouchableOpacity>
-
-          <View
-            style={{
-              width: "100%",
-              alignSelf: "center",
-              marginTop: 10
-            }}
-          >
-            {isLocked ? (
-              <>
-                <Input
-                  fwdRef={pwdInput}
-                  onChangeText={(value) => (passwordValue.current = value)}
-                  blurOnSubmit
-                  secureTextEntry
-                  defaultValue={passwordValue.current}
-                  placeholder="Enter Password"
-                />
-                <Seperator half />
-              </>
-            ) : null}
-
-            <View
+              activeOpacity={0.9}
               style={{
                 flexDirection: "row",
-                width: "100%",
-                justifyContent: "center"
+                alignItems: "center"
               }}
             >
-              {isPublished && (
+              <IconButton
+                onPress={() => {
+                  setSelfDestruct(!selfDestruct);
+                }}
+                color={selfDestruct ? colors.accent : colors.icon}
+                size={SIZE.lg}
+                name={
+                  selfDestruct
+                    ? "check-circle-outline"
+                    : "checkbox-blank-circle-outline"
+                }
+              />
+
+              <View
+                style={{
+                  width: "100%",
+                  flexShrink: 1
+                }}
+              >
+                <Heading size={SIZE.md}>Self destruct</Heading>
+                <Paragraph>
+                  Published note link will be automatically deleted once it is
+                  viewed by someone.
+                </Paragraph>
+              </View>
+            </TouchableOpacity>
+
+            <View
+              style={{
+                width: "100%",
+                alignSelf: "center",
+                marginTop: 10
+              }}
+            >
+              {isLocked ? (
                 <>
-                  <Button
-                    onPress={deletePublishedNote}
-                    fontSize={SIZE.md}
-                    type="error"
-                    title="Unpublish"
-                    style={{
-                      width: "49%"
-                    }}
+                  <Input
+                    fwdRef={pwdInput}
+                    onChangeText={(value) => (passwordValue = value)}
+                    blurOnSubmit
+                    secureTextEntry
+                    defaultValue={passwordValue}
+                    placeholder="Enter Password"
                   />
+                  <Seperator half />
                 </>
-              )}
-              <Seperator half />
+              ) : null}
+
               <Button
                 onPress={publishNote}
                 fontSize={SIZE.md}
+                width="100%"
                 style={{
-                  width: isPublished ? "49%" : 250,
-                  borderRadius: isPublished ? 5 : 100
+                  marginTop: 10
                 }}
+                height={50}
                 type="accent"
-                title={isPublished ? "Update" : "Publish"}
+                title={isPublished ? "Update published note" : "Publish note"}
               />
-            </View>
-          </View>
-        </>
-      )}
 
-      <Paragraph
-        color={colors.icon}
-        size={SIZE.xs}
-        style={{
-          textAlign: "center",
-          marginTop: 10,
-          textDecorationLine: "underline"
-        }}
-        onPress={async () => {
-          try {
-            await openLinkInBrowser(
-              "https://docs.notesnook.com/monographs/",
-              colors.accent
-            );
-          } catch (e) {
-            console.error(e);
-          }
-        }}
-      >
-        Learn more about Notesnook Monograph
-      </Paragraph>
-    </View>
+              {isPublished && (
+                <>
+                  <Seperator half />
+                  <Button
+                    onPress={deletePublishedNote}
+                    fontSize={SIZE.md}
+                    width="100%"
+                    height={50}
+                    type="error"
+                    title="Unpublish note"
+                  />
+                </>
+              )}
+            </View>
+          </>
+        )}
+
+        <Paragraph
+          color={colors.icon}
+          size={SIZE.xs}
+          style={{
+            textAlign: "center",
+            marginTop: 5,
+            textDecorationLine: "underline"
+          }}
+          onPress={async () => {
+            try {
+              await openLinkInBrowser(
+                "https://docs.notesnook.com/monographs/",
+                colors.accent
+              );
+            } catch (e) {
+              console.error(e);
+            }
+          }}
+        >
+          Learn more about Notesnook Monograph
+        </Paragraph>
+      </View>
+    </SheetWrapper>
   );
 };
 
-PublishNoteSheet.present = (note) => {
-  presentSheet({
-    component: (ref, close, update) => (
-      <PublishNoteSheet
-        actionSheetRef={ref}
-        close={close}
-        update={update}
-        note={note}
-      />
-    )
-  });
-};
-
 export default PublishNoteSheet;

apps/mobile/app/components/sheets/rate-app/index.js

@@ -96,6 +96,7 @@ const RateAppSheet = () => {
           onPress={rateApp}
           fontSize={SIZE.md}
           width="100%"
+          height={50}
           type="accent"
           title="Rate now (It takes only a second)"
         />
@@ -120,12 +121,14 @@ const RateAppSheet = () => {
             fontSize={SIZE.md}
             type="error"
             width="48%"
+            height={50}
             title="Never"
           />
           <Button
             onPress={onClose}
             fontSize={SIZE.md}
             width="48%"
+            height={50}
             type="grayBg"
             title="Later"
           />

apps/mobile/app/components/sheets/recovery-key/index.js

@@ -43,7 +43,8 @@ import Seperator from "../../ui/seperator";
 import SheetWrapper from "../../ui/sheet";
 import { QRCode } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
-import RNFetchBlob from "rn-fetch-blob";
+
+let RNFetchBlob;
 
 class RecoveryKeySheet extends React.Component {
   constructor(props) {
@@ -114,6 +115,7 @@ class RecoveryKeySheet extends React.Component {
     this.svg.current?.toDataURL(async (data) => {
       try {
         let path;
+        RNFetchBlob = (await import("rn-fetch-blob")).default;
         let fileName = "nn_" + this.user.email + "_recovery_key_qrcode";
         fileName = sanitizeFilename(fileName, { replacement: "_" });
         fileName = fileName + ".png";
@@ -149,6 +151,7 @@ class RecoveryKeySheet extends React.Component {
       fileName = sanitizeFilename(fileName, { replacement: "_" });
       fileName = fileName + ".txt";
 
+      RNFetchBlob = (await import("rn-fetch-blob")).default;
       if (Platform.OS === "android") {
         let file = await ScopedStorage.createDocument(
           fileName,
@@ -295,6 +298,7 @@ class RecoveryKeySheet extends React.Component {
             width="100%"
             type="grayAccent"
             fontSize={SIZE.md}
+            height={50}
           />
           <Seperator />
           <Button
@@ -304,6 +308,7 @@ class RecoveryKeySheet extends React.Component {
             type="grayAccent"
             fontSize={SIZE.md}
             icon="qrcode"
+            height={50}
           />
           <Seperator />
           <Button
@@ -313,6 +318,7 @@ class RecoveryKeySheet extends React.Component {
             type="grayAccent"
             icon="text"
             fontSize={SIZE.md}
+            height={50}
           />
           <Seperator />
 
@@ -323,6 +329,7 @@ class RecoveryKeySheet extends React.Component {
             type="grayAccent"
             icon="cloud"
             fontSize={SIZE.md}
+            height={50}
           />
           <Seperator />
 
@@ -342,6 +349,7 @@ class RecoveryKeySheet extends React.Component {
           <Button
             title="I have saved the key."
             width="100%"
+            height={50}
             type="error"
             fontSize={SIZE.md}
             onPress={this.close}

apps/mobile/app/components/sheets/relations-list/index.tsx

@@ -18,13 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import React, { RefObject, useEffect, useState } from "react";
 import { View } from "react-native";
-import { ActionSheetRef } from "react-native-actions-sheet";
-import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
+import ActionSheet from "react-native-actions-sheet";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../../common/database";
 import {
-  presentSheet,
-  PresentSheetOptions
+  PresentSheetOptions,
+  presentSheet
 } from "../../../services/event-manager";
 import { Reminder } from "../../../services/notifications";
 import { useRelationStore } from "../../../stores/use-relation-store";
@@ -38,7 +37,7 @@ import { PressableButtonProps } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
 
 type RelationsListProps = {
-  actionSheetRef: RefObject<ActionSheetRef>;
+  actionSheetRef: RefObject<ActionSheet>;
   close?: () => void;
   update?: (options: PresentSheetOptions) => void;
   item: { id: string; type: string };
@@ -63,6 +62,8 @@ const IconsByType = {
 
 export const RelationsList = ({
   actionSheetRef,
+  close,
+  update,
   item,
   referenceType,
   relationType,
@@ -74,6 +75,7 @@ export const RelationsList = ({
   const [items, setItems] = useState<Reminder[]>([]);
   const colors = useThemeStore((state) => state.colors);
   const hasNoRelations = !items || items.length === 0;
+
   useEffect(() => {
     setItems(
       db.relations?.[relationType]?.(
@@ -121,7 +123,6 @@ export const RelationsList = ({
       ) : (
         <List
           listData={items}
-          ScrollComponent={FlashList}
           loading={false}
           type={referenceType}
           headerProps={null}

apps/mobile/app/components/sheets/reminder-notify/index.tsx

@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import dayjs from "dayjs";
 import React, { RefObject } from "react";
-import { View } from "react-native";
-import { ActionSheetRef, ScrollView } from "react-native-actions-sheet";
+import { ScrollView, View } from "react-native";
+import ActionSheet from "react-native-actions-sheet";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../../common/database";
 import {
@@ -36,7 +36,7 @@ import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 
 type ReminderSheetProps = {
-  actionSheetRef: RefObject<ActionSheetRef>;
+  actionSheetRef: RefObject<ActionSheet>;
   close?: () => void;
   update?: (options: PresentSheetOptions) => void;
   reminder?: Reminder;
@@ -119,7 +119,7 @@ export default function ReminderNotify({
           marginTop: 10
         }}
       >
-        <Paragraph size={SIZE.xs}>Remind me in:</Paragraph>
+        <Paragraph size={SIZE.xs + 1}>Remind me in:</Paragraph>
         {QuickActions.map((item) => {
           return (
             <Button
@@ -127,7 +127,7 @@ export default function ReminderNotify({
               key={item.title}
               title={item.title}
               height={30}
-              fontSize={SIZE.xs}
+              fontSize={SIZE.xs + 1}
               style={{ marginLeft: 10, borderRadius: 100 }}
               onPress={() => onSnooze(item.time)}
             />
@@ -150,7 +150,7 @@ export default function ReminderNotify({
           <Paragraph
             style={{
               color: colors.icon,
-              fontSize: SIZE.xs,
+              fontSize: SIZE.xs + 1,
               marginBottom: 10
             }}
           >

apps/mobile/app/components/sheets/reminder/index.tsx

@@ -17,13 +17,19 @@ 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, { RefObject, useRef, useState } from "react";
-import { Platform, TextInput, View } from "react-native";
-import { ActionSheetRef, ScrollView } from "react-native-actions-sheet";
+import {
+  Platform,
+  ScrollView,
+  TextInput,
+  useWindowDimensions,
+  View
+} from "react-native";
+import ActionSheet from "react-native-actions-sheet";
 import DateTimePickerModal from "react-native-modal-datetime-picker";
 import {
+  presentSheet,
   PresentSheetOptions,
-  ToastEvent,
-  presentSheet
+  ToastEvent
 } from "../../../services/event-manager";
 import { useThemeStore } from "../../../stores/use-theme-store";
 import { SIZE } from "../../../utils/size";
@@ -33,20 +39,18 @@ import Input from "../../ui/input";
 import dayjs from "dayjs";
 import DatePicker from "react-native-date-picker";
 import { db } from "../../../common/database";
-import { DDS } from "../../../services/device-detection";
 import Navigation from "../../../services/navigation";
 import Notifications, { Reminder } from "../../../services/notifications";
 import PremiumService from "../../../services/premium";
 import SettingsService from "../../../services/settings";
 import { useRelationStore } from "../../../stores/use-relation-store";
+import { ReminderTime } from "../../ui/reminder-time";
+import Paragraph from "../../ui/typography/paragraph";
 import { NoteType } from "../../../utils/types";
 import { Dialog } from "../../dialog";
-import { ReminderTime } from "../../ui/reminder-time";
-import Heading from "../../ui/typography/heading";
-import Paragraph from "../../ui/typography/paragraph";
 
 type ReminderSheetProps = {
-  actionSheetRef: RefObject<ActionSheetRef>;
+  actionSheetRef: RefObject<ActionSheet>;
   close?: (ctx?: string) => void;
   update?: (options: PresentSheetOptions) => void;
   reminder?: Reminder;
@@ -113,15 +117,13 @@ export default function ReminderSheet({
   >(reminder?.priority || SettingsService.get().reminderNotificationMode);
   const [isDatePickerVisible, setDatePickerVisibility] = useState(false);
   const [repeatFrequency, setRepeatFrequency] = useState(1);
+  const title = useRef<string | undefined>(reminder?.title);
+  const details = useRef<string | undefined>(reminder?.description);
+  const titleRef = useRef<TextInput>(null);
+  const { height } = useWindowDimensions();
   const referencedItem = reference
     ? (db.notes?.note(reference.id)?.data as NoteType)
     : null;
-  const title = useRef<string | undefined>(
-    reminder?.title || referencedItem?.title
-  );
-  const details = useRef<string | undefined>(reminder?.description);
-  const titleRef = useRef<TextInput>(null);
-  const timer = useRef<NodeJS.Timeout>();
 
   const showDatePicker = () => {
     setDatePickerVisibility(true);
@@ -132,10 +134,9 @@ export default function ReminderSheet({
   };
 
   const handleConfirm = (date: Date) => {
-    timer.current = setTimeout(() => {
-      hideDatePicker();
-      setDate(date);
-    }, 50);
+    hideDatePicker();
+    setDate(date);
+    console.log(date);
   };
   function nth(n: number) {
     return (
@@ -200,8 +201,7 @@ export default function ReminderSheet({
 
       if (!_reminder) {
         ToastEvent.show({
-          heading: "Failed to add a new reminder",
-          context: "local"
+          heading: "Failed to add a new reminder"
         });
       }
       if (reference) {
@@ -211,68 +211,57 @@ export default function ReminderSheet({
         });
       }
       Notifications.scheduleNotification(_reminder as Reminder);
-      Navigation.queueRoutesForUpdate();
+      Navigation.queueRoutesForUpdate(
+        "TaggedNotes",
+        "ColoredNotes",
+        "Notes",
+        "NotesPage",
+        "Reminders",
+        "Favorites",
+        "TopicNotes"
+      );
       useRelationStore.getState().update();
       close?.();
     } catch (e) {
-      ToastEvent.error(e as Error, undefined, "local");
+      ToastEvent.error(e as Error);
     }
   }
 
   return (
     <View
       style={{
-        paddingHorizontal: 12,
-        maxHeight: DDS.isTab ? "90%" : "99.99%"
+        paddingHorizontal: 12
       }}
     >
-      <View
+      <Dialog context="local"/> 
+      <ScrollView
+        onScrollEndDrag={() => actionSheetRef.current?.handleChildScrollEnd()}
         style={{
-          flexDirection: "row",
-          width: "100%",
-          justifyContent: "space-between",
-          alignItems: "center"
+          maxHeight: height * 0.85
         }}
       >
-        <Heading size={SIZE.lg}>Set reminder</Heading>
-        <Button
-          title="Save"
-          type="accent"
-          height={40}
-          style={{
-            borderRadius: 100,
-            paddingHorizontal: 24
-          }}
-          fontSize={SIZE.md}
-          onPress={saveReminder}
-        />
-      </View>
-      <Dialog context="local" />
-      <ScrollView>
         <Input
           fwdRef={titleRef}
           defaultValue={reminder?.title || referencedItem?.title}
           placeholder="Remind me of..."
           onChangeText={(text) => (title.current = text)}
-          wrapperStyle={{
-            marginTop: 10
-          }}
+          containerStyle={{ borderWidth: 0, borderBottomWidth: 1 }}
         />
 
         <Input
-          defaultValue={
-            reminder ? reminder?.description : referencedItem?.headline
-          }
-          placeholder="Add a short note"
+          defaultValue={reminder ? reminder?.description : referencedItem?.headline}
+          placeholder="Add a quick note"
           onChangeText={(text) => (details.current = text)}
           containerStyle={{
-            maxHeight: 80
+            borderWidth: 0,
+            borderBottomWidth: 1,
+            maxHeight: 80,
+            marginTop: 10
           }}
           multiline
           textAlignVertical="top"
           inputStyle={{
-            minHeight: 80,
-            paddingVertical: 12
+            height: 80
           }}
           height={80}
           wrapperStyle={{
@@ -310,16 +299,6 @@ export default function ReminderSheet({
                     mode as keyof typeof ReminderModes
                   ] as Reminder["mode"]
                 );
-                if (mode === "Repeat") {
-                  setSelectedDays((days) => {
-                    if (days.length > 0) return days;
-                    if (days.indexOf(date.getDay()) > -1) {
-                      return days;
-                    }
-                    days.push(date.getDay());
-                    return [...days];
-                  });
-                }
               }}
             />
           ))}
@@ -461,13 +440,11 @@ export default function ReminderSheet({
 
             <DatePicker
               date={date}
-              maximumDate={dayjs(date).add(3, "months").toDate()}
               onDateChange={handleConfirm}
               textColor={colors.night ? "#ffffff" : "#000000"}
               fadeToColor={colors.bg}
               theme={colors.night ? "dark" : "light"}
               is24hourSource="locale"
-              androidVariant="nativeAndroid"
               mode={reminderMode === ReminderModes.Repeat ? "time" : "datetime"}
             />
 
@@ -550,7 +527,7 @@ export default function ReminderSheet({
             }}
           >
             <>
-              <Paragraph size={SIZE.xs} color={colors.icon}>
+              <Paragraph size={SIZE.xs + 1} color={colors.icon}>
                 {recurringMode === RecurringModes.Daily
                   ? "Repeats daily " + `at ${dayjs(date).format("hh:mm A")}.`
                   : selectedDays.length === 7 &&
@@ -585,6 +562,15 @@ export default function ReminderSheet({
           }}
         />
       </ScrollView>
+      <Button
+        style={{
+          width: "100%"
+        }}
+        title="Save"
+        type="accent"
+        fontSize={SIZE.md}
+        onPress={saveReminder}
+      />
     </View>
   );
 }
@@ -596,8 +582,6 @@ ReminderSheet.present = (
 ) => {
   presentSheet({
     context: isSheet ? "local" : undefined,
-    enableGesturesInScrollView: true,
-    noBottomPadding: true,
     component: (ref, close, update) => (
       <ReminderSheet
         actionSheetRef={ref}

apps/mobile/app/components/sheets/restore-data/index.js

@@ -18,10 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { EVENTS } from "@notesnook/core/common";
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, { createRef, useCallback, useEffect, useState } from "react";
 import { ActivityIndicator, Platform, View } from "react-native";
-import { FlatList } from "react-native-actions-sheet";
 import DocumentPicker from "react-native-document-picker";
+import { FlatList } from "react-native-gesture-handler";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { db } from "../../../common/database";
 import storage from "../../../common/database/storage";
@@ -35,7 +35,7 @@ import { initialize } from "../../../stores";
 import { useThemeStore } from "../../../stores/use-theme-store";
 import { eCloseRestoreDialog, eOpenRestoreDialog } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
-import { timeConverter } from "../../../utils/time";
+import { sleep, timeConverter } from "../../../utils/time";
 import { Dialog } from "../../dialog";
 import DialogHeader from "../../dialog/dialog-header";
 import { presentDialog } from "../../dialog/functions";
@@ -44,19 +44,12 @@ import { Button } from "../../ui/button";
 import Seperator from "../../ui/seperator";
 import SheetWrapper from "../../ui/sheet";
 import Paragraph from "../../ui/typography/paragraph";
-import RNFetchBlob from "rn-fetch-blob";
-
+const actionSheetRef = createRef();
+let RNFetchBlob;
 const RestoreDataSheet = () => {
   const [visible, setVisible] = useState(false);
   const [restoring, setRestoring] = useState(false);
-  const sheet = useRef();
   useEffect(() => {
-    const open = async () => {
-      setVisible(true);
-      setTimeout(() => {
-        sheet.current?.show();
-      }, 1);
-    };
     eSubscribeEvent(eOpenRestoreDialog, open);
     eSubscribeEvent(eCloseRestoreDialog, close);
     return () => {
@@ -65,15 +58,21 @@ const RestoreDataSheet = () => {
     };
   }, [close]);
 
+  const open = async () => {
+    setVisible(true);
+    await sleep(30);
+    actionSheetRef.current?.setModalVisible(true);
+  };
+
   const close = useCallback(() => {
     if (restoring) {
       showIsWorking();
       return;
     }
-    sheet.current?.hide();
+    actionSheetRef.current?.setModalVisible(false);
     setTimeout(() => {
       setVisible(false);
-    }, 150);
+    }, 300);
   }, [restoring]);
 
   const showIsWorking = () => {
@@ -87,19 +86,15 @@ const RestoreDataSheet = () => {
 
   return !visible ? null : (
     <SheetWrapper
-      fwdRef={sheet}
+      fwdRef={actionSheetRef}
       gestureEnabled={!restoring}
       closeOnTouchBackdrop={!restoring}
-      onClose={() => {
-        setVisible(false);
-        close();
-      }}
+      onClose={close}
     >
       <RestoreDataComponent
         close={close}
         restoring={restoring}
         setRestoring={setRestoring}
-        actionSheetRef={sheet}
       />
       <Toast context="local" />
     </SheetWrapper>
@@ -114,6 +109,7 @@ const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
   const [loading, setLoading] = useState(true);
   const [backupDirectoryAndroid, setBackupDirectoryAndroid] = useState(false);
   const [progress, setProgress] = useState();
+
   useEffect(() => {
     const subscription = db.eventManager.subscribe(
       EVENTS.migrationProgress,
@@ -127,9 +123,7 @@ const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
   }, []);
 
   useEffect(() => {
-    setTimeout(() => {
-      checkBackups();
-    }, 300);
+    checkBackups();
   }, []);
 
   const restore = async (item) => {
@@ -214,6 +208,7 @@ const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
           return;
         }
       } else {
+        RNFetchBlob = (await import("rn-fetch-blob")).default;
         let path = await storage.checkAndCreateDir("/backups/");
         files = await RNFetchBlob.fs.lstat(path);
       }
@@ -367,6 +362,10 @@ const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
         </View>
         <Seperator half />
         <FlatList
+          nestedScrollEnabled
+          onMomentumScrollEnd={() => {
+            actionSheetRef.current?.handleChildScrollEnd();
+          }}
           ListEmptyComponent={
             !restoring ? (
               loading ? (

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

@@ -25,22 +25,23 @@ import Navigation from "../../../services/navigation";
 import { useThemeStore } from "../../../stores/use-theme-store";
 import { GROUP, SORT } from "../../../utils/constants";
 import { refreshNotesPage } from "../../../utils/events";
+import layoutmanager from "../../../utils/layout-manager";
 import { SIZE } from "../../../utils/size";
 import { Button } from "../../ui/button";
 import Seperator from "../../ui/seperator";
 import Heading from "../../ui/typography/heading";
 const Sort = ({ type, screen }) => {
   const colors = useThemeStore((state) => state.colors);
-  const isTopicSheet = screen === "TopicSheet";
   const [groupOptions, setGroupOptions] = useState(
     db.settings.getGroupOptions(type)
   );
   const updateGroupOptions = async (_groupOptions) => {
     await db.settings.setGroupOptions(type, _groupOptions);
 
+    layoutmanager.withSpringAnimation(600);
     setGroupOptions(_groupOptions);
     setTimeout(() => {
-      if (screen !== "TopicSheet") Navigation.queueRoutesForUpdate(screen);
+      Navigation.queueRoutesForUpdate(screen);
       eSendEvent("groupOptionsUpdate");
       eSendEvent(refreshNotesPage);
     }, 1);
@@ -51,9 +52,6 @@ const Sort = ({ type, screen }) => {
       ...groupOptions,
       sortDirection: groupOptions.sortDirection === "asc" ? "desc" : "asc"
     };
-    if (type === "topics") {
-      _groupOptions.groupBy = "none";
-    }
     await updateGroupOptions(_groupOptions);
   };
 
@@ -102,7 +100,7 @@ const Sort = ({ type, screen }) => {
           height={25}
           iconPosition="right"
           fontSize={SIZE.sm - 1}
-          type="transparent"
+          type="grayBg"
           buttonType={{
             text: colors.accent
           }}
@@ -121,7 +119,7 @@ const Sort = ({ type, screen }) => {
           flexDirection: "row",
           justifyContent: "flex-start",
           flexWrap: "wrap",
-          borderBottomWidth: isTopicSheet ? 0 : 1,
+          borderBottomWidth: 1,
           borderBottomColor: colors.nav,
           marginBottom: 12,
           paddingHorizontal: 12,
@@ -168,9 +166,6 @@ const Sort = ({ type, screen }) => {
                     ...groupOptions,
                     sortBy: type === "trash" ? "dateDeleted" : item
                   };
-                  if (type === "topics") {
-                    _groupOptions.groupBy = "none";
-                  }
                   await updateGroupOptions(_groupOptions);
                 }}
                 iconSize={SIZE.md}
@@ -180,70 +175,64 @@ const Sort = ({ type, screen }) => {
         )}
       </View>
 
-      {isTopicSheet ? null : (
-        <>
-          <Heading
-            style={{
-              marginLeft: 12
+      <Heading
+        style={{
+          marginLeft: 12
+        }}
+        size={SIZE.lg}
+      >
+        Group by
+      </Heading>
+
+      <Seperator />
+
+      <View
+        style={{
+          borderRadius: 0,
+          flexDirection: "row",
+          flexWrap: "wrap",
+          paddingHorizontal: 12
+        }}
+      >
+        {Object.keys(GROUP).map((item) => (
+          <Button
+            key={item}
+            testID={"btn-" + item}
+            type={groupOptions.groupBy === GROUP[item] ? "grayBg" : "gray"}
+            buttonType={{
+              text:
+                groupOptions.groupBy === GROUP[item]
+                  ? colors.accent
+                  : colors.icon
             }}
-            size={SIZE.lg}
-          >
-            Group by
-          </Heading>
+            onPress={async () => {
+              let _groupOptions = {
+                ...groupOptions,
+                groupBy: GROUP[item]
+              };
 
-          <Seperator />
-
-          <View
-            style={{
-              borderRadius: 0,
-              flexDirection: "row",
-              flexWrap: "wrap",
-              paddingHorizontal: 12
-            }}
-          >
-            {Object.keys(GROUP).map((item) => (
-              <Button
-                key={item}
-                testID={"btn-" + item}
-                type={groupOptions.groupBy === GROUP[item] ? "grayBg" : "gray"}
-                buttonType={{
-                  text:
-                    groupOptions.groupBy === GROUP[item]
-                      ? colors.accent
-                      : colors.icon
-                }}
-                onPress={async () => {
-                  let _groupOptions = {
-                    ...groupOptions,
-                    groupBy: GROUP[item]
-                  };
-
-                  if (item === "abc") {
-                    _groupOptions.sortBy = "title";
-                    _groupOptions.sortDirection = "asc";
-                  } else {
-                    if (groupOptions.sortBy === "title") {
-                      _groupOptions.sortBy = "dateEdited";
-                      _groupOptions.sortDirection = "desc";
-                    }
-                  }
-                  updateGroupOptions(_groupOptions);
-                }}
-                height={40}
-                icon={groupOptions.groupBy === GROUP[item] ? "check" : null}
-                title={
-                  item.slice(0, 1).toUpperCase() + item.slice(1, item.length)
+              if (item === "abc") {
+                _groupOptions.sortBy = "title";
+                _groupOptions.sortDirection = "asc";
+              } else {
+                if (groupOptions.sortBy === "title") {
+                  _groupOptions.sortBy = "dateEdited";
+                  _groupOptions.sortDirection = "desc";
                 }
-                style={{
-                  paddingHorizontal: 8,
-                  marginBottom: 10,
-                  marginRight: 10
-                }}
-              />
-            ))}
-          </View>
-        </>
-      )}
+              }
+              updateGroupOptions(_groupOptions);
+            }}
+            height={40}
+            icon={groupOptions.groupBy === GROUP[item] ? "check" : null}
+            title={item.slice(0, 1).toUpperCase() + item.slice(1, item.length)}
+            style={{
+              paddingHorizontal: 8,
+              marginBottom: 10,
+              marginRight: 10
+            }}
+          />
+        ))}
+      </View>
     </View>
   );
 };

apps/mobile/app/components/sheets/topic-sheet/index.tsx

@@ -1,556 +0,0 @@
-/*
-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 qclone from "qclone";
-import React, {
-  createContext,
-  RefObject,
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-  useState
-} from "react";
-import { RefreshControl, View } from "react-native";
-import ActionSheet, {
-  ActionSheetRef,
-  FlatList
-} from "react-native-actions-sheet";
-import { db } from "../../../common/database";
-import { IconButton } from "../../../components/ui/icon-button";
-import { PressableButton } from "../../../components/ui/pressable";
-import Paragraph from "../../../components/ui/typography/paragraph";
-import { TopicNotes } from "../../../screens/notes/topic-notes";
-import {
-  eSendEvent,
-  eSubscribeEvent,
-  eUnSubscribeEvent,
-  presentSheet
-} from "../../../services/event-manager";
-import useNavigationStore, {
-  NotebookScreenParams
-} from "../../../stores/use-navigation-store";
-import { useThemeStore } from "../../../stores/use-theme-store";
-import {
-  eOnNewTopicAdded,
-  eOnTopicSheetUpdate,
-  eOpenAddTopicDialog
-} from "../../../utils/events";
-import { normalize, SIZE } from "../../../utils/size";
-import { GroupHeader, NotebookType, TopicType } from "../../../utils/types";
-
-import { groupArray } from "@notesnook/core/utils/grouping";
-import Config from "react-native-config";
-import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import { notesnook } from "../../../../e2e/test.ids";
-import { MMKV } from "../../../common/database/mmkv";
-import { openEditor } from "../../../screens/notes/common";
-import { getTotalNotes, history } from "../../../utils";
-import { deleteItems } from "../../../utils/functions";
-import { presentDialog } from "../../dialog/functions";
-import { Properties } from "../../properties";
-import Sort from "../sort";
-import Heading from "../../ui/typography/heading";
-
-type ConfigItem = { id: string; type: string };
-class TopicSheetConfig {
-  static storageKey: "$$sp";
-
-  static makeId(item: ConfigItem) {
-    return `${TopicSheetConfig.storageKey}:${item.type}:${item.id}`;
-  }
-
-  static get(item: ConfigItem) {
-    return MMKV.getInt(TopicSheetConfig.makeId(item)) || 0;
-  }
-
-  static set(item: ConfigItem, index = 0) {
-    MMKV.setInt(TopicSheetConfig.makeId(item), index);
-  }
-}
-
-export const TopicsSheet = () => {
-  const [collapsed, setCollapsed] = useState(false);
-  const currentScreen = useNavigationStore((state) => state.currentScreen);
-  const canShow =
-    currentScreen.name === "Notebook" || currentScreen.name === "TopicNotes";
-  const [notebook, setNotebook] = useState(
-    canShow
-      ? db.notebooks?.notebook(
-          currentScreen?.notebookId || currentScreen?.id || ""
-        )?.data
-      : null
-  );
-  const [selection, setSelection] = useState<TopicType[]>([]);
-  const [enabled, setEnabled] = useState(false);
-  const colors = useThemeStore((state) => state.colors);
-  const ref = useRef<ActionSheetRef>(null);
-  const isTopic = currentScreen.name === "TopicNotes";
-  const [topics, setTopics] = useState(
-    notebook
-      ? qclone(
-          groupArray(notebook.topics, db.settings?.getGroupOptions("topics"))
-        )
-      : []
-  );
-
-  const [groupOptions, setGroupOptions] = useState(
-    db.settings?.getGroupOptions("topics")
-  );
-
-  const onRequestUpdate = React.useCallback(
-    (data?: NotebookScreenParams) => {
-      if (!canShow) return;
-      if (!data) data = { item: notebook } as NotebookScreenParams;
-      const _notebook = db.notebooks?.notebook(data.item?.id)
-        ?.data as NotebookType;
-      if (_notebook) {
-        setNotebook(_notebook);
-
-        setTopics(
-          qclone(
-            groupArray(_notebook.topics, db.settings?.getGroupOptions("topics"))
-          )
-        );
-      }
-    },
-    [canShow, notebook]
-  );
-
-  const onUpdate = useCallback(() => {
-    setGroupOptions({ ...(db.settings?.getGroupOptions("topics") as any) });
-    onRequestUpdate();
-  }, [onRequestUpdate]);
-
-  useEffect(() => {
-    eSubscribeEvent("groupOptionsUpdate", onUpdate);
-    return () => {
-      eUnSubscribeEvent("groupOptionsUpdate", onUpdate);
-    };
-  }, [onUpdate]);
-
-  useEffect(() => {
-    const onTopicUpdate = () => {
-      setTimeout(() => {
-        onRequestUpdate();
-      }, 1);
-    };
-    eSubscribeEvent(eOnTopicSheetUpdate, onTopicUpdate);
-    eSubscribeEvent(eOnNewTopicAdded, onRequestUpdate);
-    return () => {
-      eUnSubscribeEvent(eOnTopicSheetUpdate, onRequestUpdate);
-      eUnSubscribeEvent(eOnNewTopicAdded, onTopicUpdate);
-    };
-  }, [onRequestUpdate]);
-
-  const PLACEHOLDER_DATA = {
-    heading: "Topics",
-    paragraph: "You have not added any topics yet.",
-    button: "Add first topic",
-    action: () => {
-      eSendEvent(eOpenAddTopicDialog, { notebookId: notebook.id });
-    },
-    loading: "Loading notebook topics"
-  };
-
-  const renderTopic = ({
-    item,
-    index
-  }: {
-    item: TopicType | GroupHeader;
-    index: number;
-  }) =>
-    (item as GroupHeader).type === "header" ? null : (
-      <TopicItem sheetRef={ref} item={item as TopicType} index={index} />
-    );
-
-  const selectionContext = {
-    selection: selection,
-    enabled,
-    setEnabled,
-    toggleSelection: (item: TopicType) => {
-      setSelection((state) => {
-        const selection = [...state];
-        const index = selection.findIndex(
-          (selected) => selected.id === item.id
-        );
-        if (index > -1) {
-          selection.splice(index, 1);
-          if (selection.length === 0) {
-            setEnabled(false);
-          }
-          return selection;
-        }
-        selection.push(item);
-        return selection;
-      });
-    }
-  };
-
-  useEffect(() => {
-    if (canShow) {
-      setTimeout(() => {
-        const id = isTopic ? currentScreen?.notebookId : currentScreen?.id;
-        const notebook = db.notebooks?.notebook(id as string)?.data;
-        const snapPoint = isTopic
-          ? 0
-          : TopicSheetConfig.get({
-              type: isTopic ? "topic" : "notebook",
-              id: currentScreen.id as string
-            });
-
-        if (ref.current?.isOpen()) {
-          ref.current?.snapToIndex(snapPoint);
-        } else {
-          ref.current?.show(snapPoint);
-        }
-        if (notebook) {
-          onRequestUpdate({
-            item: notebook
-          } as any);
-        }
-      }, 300);
-    } else {
-      ref.current?.hide();
-    }
-  }, [
-    canShow,
-    currentScreen?.id,
-    currentScreen.name,
-    currentScreen?.notebookId,
-    onRequestUpdate,
-    isTopic
-  ]);
-
-  return (
-    <ActionSheet
-      ref={ref}
-      isModal={false}
-      containerStyle={{
-        maxHeight: 300,
-        borderTopRightRadius: 15,
-        borderTopLeftRadius: 15,
-        backgroundColor: colors.bg,
-        borderWidth: 1,
-        borderColor: colors.nav,
-        borderBottomWidth: 0
-      }}
-      openAnimationConfig={{
-        friction: 10
-      }}
-      onSnapIndexChange={(index) => {
-        setCollapsed(index === 0);
-        TopicSheetConfig.set(
-          {
-            type: isTopic ? "topic" : "notebook",
-            id: currentScreen.id as string
-          },
-          index
-        );
-      }}
-      closable={!canShow}
-      elevation={10}
-      indicatorStyle={{
-        width: 100,
-        backgroundColor: colors.nav
-      }}
-      keyboardHandlerEnabled={false}
-      snapPoints={Config.isTesting === "true" ? [100] : [25, 100]}
-      initialSnapIndex={1}
-      backgroundInteractionEnabled
-      gestureEnabled
-    >
-      <View
-        style={{
-          position: "absolute",
-          right: 12,
-          marginTop: -80
-        }}
-      >
-        <PressableButton
-          testID={notesnook.buttons.add}
-          type="accent"
-          accentColor={"accent"}
-          accentText="light"
-          onPress={openEditor}
-          customStyle={{
-            borderRadius: 100
-          }}
-        >
-          <View
-            style={{
-              alignItems: "center",
-              justifyContent: "center",
-              height: normalize(60),
-              width: normalize(60)
-            }}
-          >
-            <Icon name="plus" color="white" size={SIZE.xxl} />
-          </View>
-        </PressableButton>
-      </View>
-      <View
-        style={{
-          maxHeight: 300,
-          height: 300,
-          width: "100%"
-        }}
-      >
-        <View
-          style={{
-            flexDirection: "row",
-            justifyContent: "space-between",
-            paddingHorizontal: 12,
-            alignItems: "center"
-          }}
-        >
-          <Paragraph size={SIZE.xs} color={colors.icon}>
-            TOPICS
-          </Paragraph>
-          <View
-            style={{
-              flexDirection: "row"
-            }}
-          >
-            {enabled ? (
-              <IconButton
-                customStyle={{
-                  marginLeft: 10
-                }}
-                onPress={async () => {
-                  //@ts-ignore
-                  history.selectedItemsList = selection;
-                  presentDialog({
-                    title: `Delete ${
-                      selection.length > 1 ? "topics" : "topics"
-                    }`,
-                    paragraph: `Are you sure you want to delete ${
-                      selection.length > 1 ? "these topics?" : "this topic?"
-                    }`,
-                    positiveText: "Delete",
-                    negativeText: "Cancel",
-                    positivePress: async () => {
-                      await deleteItems();
-                      history.selectedItemsList = [];
-                      setEnabled(false);
-                      setSelection([]);
-                    },
-                    positiveType: "errorShade"
-                  });
-                  return;
-                }}
-                color={colors.pri}
-                tooltipText="Move to trash"
-                tooltipPosition={1}
-                name="delete"
-                size={22}
-              />
-            ) : (
-              <>
-                <IconButton
-                  name={
-                    groupOptions?.sortDirection === "asc"
-                      ? "sort-ascending"
-                      : "sort-descending"
-                  }
-                  onPress={() => {
-                    presentSheet({
-                      component: <Sort screen="TopicSheet" type="topics" />
-                    });
-                  }}
-                  testID="group-topic-button"
-                  color={colors.pri}
-                  size={22}
-                  customStyle={{
-                    width: 40,
-                    height: 40
-                  }}
-                />
-                <IconButton
-                  name="plus"
-                  onPress={PLACEHOLDER_DATA.action}
-                  testID="add-topic-button"
-                  color={colors.pri}
-                  size={22}
-                  customStyle={{
-                    width: 40,
-                    height: 40
-                  }}
-                />
-
-                <IconButton
-                  name={collapsed ? "chevron-up" : "chevron-down"}
-                  onPress={() => {
-                    if (ref.current?.currentSnapIndex() !== 0) {
-                      setCollapsed(true);
-                      ref.current?.snapToIndex(0);
-                    } else {
-                      setCollapsed(false);
-                      ref.current?.snapToIndex(1);
-                    }
-                  }}
-                  color={colors.pri}
-                  size={22}
-                  customStyle={{
-                    width: 40,
-                    height: 40
-                  }}
-                />
-              </>
-            )}
-          </View>
-        </View>
-        <SelectionContext.Provider value={selectionContext}>
-          <FlatList
-            data={topics}
-            style={{
-              width: "100%"
-            }}
-            refreshControl={
-              <RefreshControl
-                refreshing={false}
-                onRefresh={() => {
-                  onRequestUpdate();
-                }}
-                colors={[colors.accent]}
-                progressBackgroundColor={colors.bg}
-              />
-            }
-            keyExtractor={(item) => (item as TopicType).id}
-            renderItem={renderTopic}
-            ListEmptyComponent={
-              <View
-                style={{
-                  flex: 1,
-                  justifyContent: "center",
-                  alignItems: "center",
-                  height: 200
-                }}
-              >
-                <Paragraph color={colors.icon}>No topics</Paragraph>
-              </View>
-            }
-            ListFooterComponent={<View style={{ height: 50 }} />}
-          />
-        </SelectionContext.Provider>
-      </View>
-    </ActionSheet>
-  );
-};
-
-const SelectionContext = createContext<{
-  selection: TopicType[];
-  enabled: boolean;
-  setEnabled: (value: boolean) => void;
-  toggleSelection: (item: TopicType) => void;
-}>({
-  selection: [],
-  enabled: false,
-  setEnabled: (_value: boolean) => {},
-  toggleSelection: (_item: TopicType) => {}
-});
-const useSelection = () => useContext(SelectionContext);
-
-const TopicItem = ({
-  item,
-  index,
-  sheetRef
-}: {
-  item: TopicType;
-  index: number;
-  sheetRef: RefObject<ActionSheetRef>;
-}) => {
-  const screen = useNavigationStore((state) => state.currentScreen);
-  const colors = useThemeStore((state) => state.colors);
-  const selection = useSelection();
-  const isSelected =
-    selection.selection.findIndex((selected) => selected.id === item.id) > -1;
-  const isFocused = screen.id === item.id;
-  const notesCount = getTotalNotes(item);
-
-  return (
-    <PressableButton
-      type={isSelected || isFocused ? "grayBg" : "transparent"}
-      onLongPress={() => {
-        if (selection.enabled) return;
-        selection.setEnabled(true);
-        selection.toggleSelection(item);
-      }}
-      testID={`topic-sheet-item-${index}`}
-      onPress={() => {
-        if (selection.enabled) {
-          selection.toggleSelection(item);
-          return;
-        }
-        TopicNotes.navigate(item, true);
-      }}
-      customStyle={{
-        justifyContent: "space-between",
-        width: "100%",
-        alignItems: "center",
-        flexDirection: "row",
-        paddingHorizontal: 12,
-        borderRadius: 0
-      }}
-    >
-      <View
-        style={{
-          flexDirection: "row",
-          alignItems: "center"
-        }}
-      >
-        {selection.enabled ? (
-          <IconButton
-            size={SIZE.lg}
-            color={isSelected ? colors.accent : colors.icon}
-            name={
-              isSelected
-                ? "check-circle-outline"
-                : "checkbox-blank-circle-outline"
-            }
-          />
-        ) : null}
-        <Paragraph size={SIZE.sm}>
-          {item.title}{" "}
-          {notesCount ? (
-            <Paragraph size={SIZE.xs} color={colors.icon}>
-              {notesCount}
-            </Paragraph>
-          ) : null}
-        </Paragraph>
-      </View>
-      <IconButton
-        name="dots-horizontal"
-        customStyle={{
-          width: 40,
-          height: 40
-        }}
-        testID={notesnook.ids.notebook.menu}
-        onPress={() => {
-          Properties.present(item);
-        }}
-        left={0}
-        right={0}
-        bottom={0}
-        top={0}
-        color={colors.pri}
-        size={SIZE.xl}
-      />
-    </PressableButton>
-  );
-};

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

@@ -19,10 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { useEffect, useState } from "react";
 import { Linking, View } from "react-native";
-import { ScrollView } from "react-native-actions-sheet";
 import { checkVersion } from "react-native-check-version";
 import Config from "react-native-config";
 import deviceInfoModule from "react-native-device-info";
+import { ScrollView } from "react-native-gesture-handler";
 import { useThemeStore } from "../../../stores/use-theme-store";
 import { STORE_LINK } from "../../../utils/constants";
 import { SIZE } from "../../../utils/size";
@@ -148,6 +148,9 @@ export const Update = ({ version: appVersion, fwdRef }) => {
           <Seperator />
           <ScrollView
             nestedScrollEnabled={true}
+            onMomentumScrollEnd={() => {
+              fwdRef?.current?.handleChildScrollEnd();
+            }}
             style={{
               width: "100%"
             }}

apps/mobile/app/components/side-menu/pinned-section.js

@@ -164,6 +164,7 @@ export const PinItem = React.memo(
               }}
               fontSize={SIZE.md}
               width="95%"
+              height={50}
               customStyle={{
                 marginBottom: 30
               }}

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

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { TouchableOpacity, View } from "react-native";
+import { Keyboard, TouchableOpacity, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { notesnook } from "../../../e2e/test.ids";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
@@ -34,25 +34,24 @@ import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+let toastMessages = [];
 export const Toast = ({ context = "global" }) => {
   const colors = useThemeStore((state) => state.colors);
+  const [keyboard, setKeyboard] = useState(false);
   const [data, setData] = useState({});
   const insets = useGlobalSafeAreaInsets();
   const hideTimeout = useRef();
   const [visible, setVisible] = useState(false);
-  const toastMessages = useRef([]);
 
-  const show = useCallback(
+  const showToastFunc = useCallback(
     async (data) => {
       if (!data) return;
       if (data.context !== context) return;
-      if (
-        toastMessages.current.findIndex((m) => m.message === data.message) >= 0
-      ) {
+      if (toastMessages.findIndex((m) => m.message === data.message) >= 0) {
         return;
       }
-      toastMessages.current.push(data);
-      if (toastMessages.current?.length > 1) return;
+      toastMessages.push(data);
+      if (toastMessages?.length > 1) return;
       setData(data);
 
       setVisible(true);
@@ -60,16 +59,16 @@ export const Toast = ({ context = "global" }) => {
         clearTimeout(hideTimeout.current);
       }
       hideTimeout.current = setTimeout(() => {
-        hide();
+        hideToastFunc();
       }, data.duration);
     },
-    [context, hide]
+    [context, hideToastFunc]
   );
 
-  const next = useCallback(
+  const showNext = useCallback(
     (data) => {
       if (!data) {
-        hide();
+        hideToastFunc();
         return;
       }
       setData(data);
@@ -77,28 +76,27 @@ export const Toast = ({ context = "global" }) => {
         clearTimeout(hideTimeout.current);
       }
       hideTimeout.current = setTimeout(() => {
-        hide();
+        hideToastFunc();
       }, data?.duration);
     },
-    [hide]
+    [hideToastFunc]
   );
 
-  const hide = useCallback(() => {
+  const hideToastFunc = useCallback(() => {
     if (hideTimeout.current) {
       clearTimeout(hideTimeout.current);
     }
-    let msg =
-      toastMessages.current.length > 1 ? toastMessages.current.shift() : null;
+    let msg = toastMessages.length > 1 ? toastMessages.shift() : null;
 
     if (msg) {
       setVisible(false);
-      next(msg);
+      showNext(msg);
       setTimeout(() => {
         setVisible(true);
       }, 300);
     } else {
       setVisible(false);
-      toastMessages.current.shift();
+      toastMessages.shift();
       setTimeout(() => {
         setData({});
         if (hideTimeout.current) {
@@ -106,22 +104,44 @@ export const Toast = ({ context = "global" }) => {
         }
       }, 100);
     }
-  }, [next]);
+  }, [showNext]);
+
+  const _onKeyboardShow = () => {
+    setKeyboard(true);
+  };
+
+  const _onKeyboardHide = () => {
+    setKeyboard(false);
+  };
 
   useEffect(() => {
-    eSubscribeEvent(eShowToast, show);
-    eSubscribeEvent(eHideToast, hide);
+    toastMessages = [];
+    let sub1 = Keyboard.addListener("keyboardDidShow", _onKeyboardShow);
+    let sub2 = Keyboard.addListener("keyboardDidHide", _onKeyboardHide);
+    eSubscribeEvent(eShowToast, showToastFunc);
+    eSubscribeEvent(eHideToast, hideToastFunc);
     return () => {
-      toastMessages.current = [];
-      eUnSubscribeEvent(eShowToast, show);
-      eUnSubscribeEvent(eHideToast, hide);
+      if (hideTimeout.current) {
+        clearTimeout(hideTimeout.current);
+      }
+
+      toastMessages = [];
+      sub1?.remove();
+      sub2?.remove();
+      eUnSubscribeEvent(eShowToast, showToastFunc);
+      eUnSubscribeEvent(eHideToast, hideToastFunc);
     };
-  }, [hide, show]);
+  }, [hideToastFunc, keyboard, showToastFunc]);
 
   return (
     visible && (
       <TouchableOpacity
-        onPress={hide}
+        onPress={() => {
+          if (hideTimeout.current) {
+            clearTimeout(hideTimeout.current);
+          }
+          hideToastFunc();
+        }}
         activeOpacity={1}
         style={{
           width: DDS.isTab ? 400 : "100%",
@@ -189,7 +209,7 @@ export const Toast = ({ context = "global" }) => {
                   color={colors.pri}
                   size={SIZE.md}
                   onPress={() => {
-                    hide();
+                    hideToastFunc();
                   }}
                 >
                   {data.heading}
@@ -204,7 +224,7 @@ export const Toast = ({ context = "global" }) => {
                     paddingRight: 10
                   }}
                   onPress={() => {
-                    hide();
+                    hideToastFunc();
                   }}
                 >
                   {data.message}

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

@@ -40,8 +40,6 @@ import { getElevation } from "../../../utils";
 import { SIZE } from "../../../utils/size";
 import { IconButton } from "../icon-button";
 import Paragraph from "../typography/paragraph";
-import phone from "phone";
-
 interface InputProps extends TextInputProps {
   fwdRef?: RefObject<TextInput>;
   validationType?:
@@ -94,7 +92,7 @@ const Input = ({
   button,
   onBlurInput,
   onPress,
-  height = 45,
+  height = 50,
   fontSize = SIZE.md,
   onFocusInput,
   buttons,
@@ -151,6 +149,7 @@ const Input = ({
         isError = customValidator && value === customValidator();
         break;
       case "phonenumber": {
+        const { default: phone } = await import("phone");
         const result = phone(value, {
           strictDetection: true,
           validateMobilePrefix: true

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

@@ -65,7 +65,7 @@ export const Notice = ({
           flexShrink: 1
         }}
         selectable={selectable}
-        size={isSmall ? SIZE.xs : SIZE.sm}
+        size={isSmall ? SIZE.xs + 1 : SIZE.sm}
       >
         {text}
       </Paragraph>

apps/mobile/app/components/ui/sheet/index.js

@@ -37,9 +37,7 @@ const SheetWrapper = ({
   onHasReachedTop,
   keyboardMode,
   overlay,
-  overlayOpacity = 0.3,
-  enableGesturesInScrollView = false,
-  bottomPadding = true
+  overlayOpacity = 0.3
 }) => {
   const colors = useThemeStore((state) => state.colors);
   const deviceMode = useSettingStore((state) => state.deviceMode);
@@ -61,8 +59,8 @@ const SheetWrapper = ({
       zIndex: 10,
       paddingTop: 5,
       paddingBottom: 0,
-      borderTopRightRadius: 15,
-      borderTopLeftRadius: 15,
+      borderTopRightRadius: 20,
+      borderTopLeftRadius: 20,
       alignSelf: "center",
       borderBottomRightRadius: 0,
       borderBottomLeftRadius: 0
@@ -86,8 +84,7 @@ const SheetWrapper = ({
         backdrop: "sheet-backdrop"
       }}
       indicatorStyle={{
-        width: 100,
-        backgroundColor: colors.nav
+        width: 100
       }}
       drawUnderStatusBar={false}
       containerStyle={style}
@@ -101,9 +98,8 @@ const SheetWrapper = ({
       indicatorColor={colors.nav}
       onOpen={_onOpen}
       keyboardDismissMode="none"
-      enableGesturesInScrollView={enableGesturesInScrollView}
       defaultOverlayOpacity={overlayOpacity}
-      overlayColor={pitchBlack ? "#585858" : "#2b2b2b"}
+      overlayColor={pitchBlack ? "#585858" : "#000000"}
       keyboardShouldPersistTaps="always"
       ExtraOverlayComponent={
         <>
@@ -120,16 +116,14 @@ const SheetWrapper = ({
     >
       <BouncingView>
         {children}
-        {bottomPadding ? (
-          <View
-            style={{
-              height:
-                Platform.OS === "ios" && insets.bottom !== 0
-                  ? insets.bottom + 5
-                  : 20
-            }}
-          />
-        ) : null}
+        <View
+          style={{
+            height:
+              Platform.OS === "ios" && insets.bottom !== 0
+                ? insets.bottom + 5
+                : 20
+          }}
+        />
       </BouncingView>
     </ActionSheet>
   );

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

@@ -46,7 +46,6 @@ export default function Tag({
         marginLeft: 2,
         marginTop: -10,
         height: 20,
-        justifyContent: "center",
         ...style
       }}
     >

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

@@ -22,15 +22,10 @@ import React, { useCallback, useEffect, useState } from "react";
 import { Platform } from "react-native";
 import Share from "react-native-share";
 import { db } from "../common/database";
-import { AttachmentDialog } from "../components/attachments";
 import { presentDialog } from "../components/dialog/functions";
 import NoteHistory from "../components/note-history";
-import { AddNotebookSheet } from "../components/sheets/add-notebook";
-import MoveNoteSheet from "../components/sheets/add-to";
 import ExportNotesSheet from "../components/sheets/export-notes";
 import { MoveNotes } from "../components/sheets/move-notes/movenote";
-import PublishNoteSheet from "../components/sheets/publish-note";
-import { RelationsList } from "../components/sheets/relations-list/index";
 import ReminderSheet from "../components/sheets/reminder";
 import {
   eSendEvent,
@@ -45,7 +40,6 @@ import Notifications from "../services/notifications";
 import { useEditorStore } from "../stores/use-editor-store";
 import { useMenuStore } from "../stores/use-menu-store";
 import useNavigationStore from "../stores/use-navigation-store";
-import { useRelationStore } from "../stores/use-relation-store";
 import { useSelectionStore } from "../stores/use-selection-store";
 import { useTagStore } from "../stores/use-tag-store";
 import { useThemeStore } from "../stores/use-theme-store";
@@ -53,12 +47,17 @@ import { useUserStore } from "../stores/use-user-store";
 import { toTXT } from "../utils";
 import { toggleDarkMode } from "../utils/color-scheme/utils";
 import {
-  eOnTopicSheetUpdate,
+  eOpenAddNotebookDialog,
   eOpenAddTopicDialog,
-  eOpenLoginDialog
+  eOpenAttachmentsDialog,
+  eOpenLoginDialog,
+  eOpenMoveNoteDialog,
+  eOpenPublishNoteDialog
 } from "../utils/events";
 import { deleteItems } from "../utils/functions";
 import { sleep } from "../utils/time";
+import { RelationsList } from "../components/sheets/relations-list/index";
+import { useRelationStore } from "../stores/use-relation-store";
 
 export const useActions = ({ close = () => null, item }) => {
   const colors = useThemeStore((state) => state.colors);
@@ -106,15 +105,6 @@ export const useActions = ({ close = () => null, item }) => {
     );
   };
 
-  const isNoteInNotebook = () => {
-    const currentScreen = useNavigationStore.getState().currentScreen;
-    if (item.type !== "note" || currentScreen.name !== "Notebook") return;
-
-    return !!db.relations
-      .to(item, "notebook")
-      .find((notebook) => notebook.id === currentScreen.id);
-  };
-
   const onUpdate = useCallback(
     async (type) => {
       if (type === "unpin") {
@@ -139,16 +129,25 @@ export const useActions = ({ close = () => null, item }) => {
   }
 
   function addTo() {
+    close();
     clearSelection(true);
     setSelectedItem(item);
-    MoveNoteSheet.present(item);
+    setTimeout(() => {
+      eSendEvent(eOpenMoveNoteDialog, item);
+    }, 300);
   }
 
   async function addToFavorites() {
     if (!item.id) return;
     close();
     await db.notes.note(item.id).favorite();
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "TaggedNotes",
+      "ColoredNotes",
+      "TopicNotes",
+      "Favorites",
+      "Notes"
+    );
   }
 
   async function pinItem() {
@@ -156,7 +155,14 @@ export const useActions = ({ close = () => null, item }) => {
     close();
     let type = item.type;
     await db[`${type}s`][type](item.id).pin();
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "TaggedNotes",
+      "ColoredNotes",
+      "TopicNotes",
+      "Favorites",
+      "Notes",
+      "Notebooks"
+    );
   }
 
   async function pinToNotifications() {
@@ -170,17 +176,9 @@ export const useActions = ({ close = () => null, item }) => {
       checkNotifPinned();
       return;
     }
-    if (item.locked) {
-      ToastEvent.show({
-        heading: "Note is locked",
-        type: "error",
-        message: "Locked notes cannot be pinned to notifications",
-        context: "local"
-      });
-      return;
-    }
-    let text = await toTXT(item, false);
-    let html = text.replace(/\n/g, "<br />");
+    if (item.locked) return;
+    let html = await db.notes.note(item.id).content();
+    let text = await toTXT(item);
     Notifications.displayNotification({
       title: item.title,
       message: item.headline || text,
@@ -199,7 +197,15 @@ export const useActions = ({ close = () => null, item }) => {
     if (!checkNoteSynced()) return;
     close();
     await db.trash.restore(item.id);
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "TaggedNotes",
+      "ColoredNotes",
+      "TopicNotes",
+      "Favorites",
+      "Notes",
+      "Notebooks",
+      "Trash"
+    );
     let type = item.type === "trash" ? item.itemType : item.type;
     ToastEvent.show({
       heading:
@@ -264,7 +270,9 @@ export const useActions = ({ close = () => null, item }) => {
       });
       return;
     }
-    PublishNoteSheet.present(item);
+    close();
+    await sleep(300);
+    eSendEvent(eOpenPublishNoteDialog, item);
   }
 
   const checkNoteSynced = () => {
@@ -315,7 +323,13 @@ export const useActions = ({ close = () => null, item }) => {
       let note = db.notes.note(item.id).data;
       if (note.locked) {
         close();
-        Navigation.queueRoutesForUpdate();
+        Navigation.queueRoutesForUpdate(
+          "TaggedNotes",
+          "ColoredNotes",
+          "TopicNotes",
+          "Favorites",
+          "Notes"
+        );
       }
     } catch (e) {
       close();
@@ -381,11 +395,16 @@ export const useActions = ({ close = () => null, item }) => {
       positivePress: async (value) => {
         if (!value || value === "" || value.trimStart().length == 0) return;
         await db.tags.rename(item.id, db.tags.sanitize(value));
-        setImmediate(() => {
-          useTagStore.getState().setTags();
-          useMenuStore.getState().setMenuPins();
-          Navigation.queueRoutesForUpdate();
-        });
+        useTagStore.getState().setTags();
+        useMenuStore.getState().setMenuPins();
+        Navigation.queueRoutesForUpdate(
+          "TaggedNotes",
+          "ColoredNotes",
+          "TopicNotes",
+          "Favorites",
+          "Notes",
+          "Tags"
+        );
       },
       input: true,
       defaultValue: alias,
@@ -428,16 +447,24 @@ export const useActions = ({ close = () => null, item }) => {
             ? "This reminder will be removed"
             : "This tag will be removed from all notes.",
         positivePress: async () => {
+          const routes = [];
+          routes.push(
+            "TaggedNotes",
+            "ColoredNotes",
+            "Notes",
+            "NotesPage",
+            "Reminders",
+            "Favorites"
+          );
           if (item.type === "reminder") {
             await db.reminders.remove(item.id);
           } else {
             await db.tags.remove(item.id);
-          }
-          setImmediate(() => {
             useTagStore.getState().setTags();
-            Navigation.queueRoutesForUpdate();
-            useRelationStore.getState().update();
-          });
+            routes.push("Tags");
+          }
+          Navigation.queueRoutesForUpdate(...routes);
+          useRelationStore.getState().update();
         },
         positiveText: "Delete",
         positiveType: "errorShade"
@@ -475,16 +502,15 @@ export const useActions = ({ close = () => null, item }) => {
       },
       item.id
     );
-    Navigation.queueRoutesForUpdate();
-    eSendEvent(eOnTopicSheetUpdate);
-    close();
-  }
-
-  async function removeNoteFromNotebook() {
-    const currentScreen = useNavigationStore.getState().currentScreen;
-    if (currentScreen.name !== "Notebook") return;
-    await db.relations.unlink({ type: "notebook", id: currentScreen.id }, item);
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "TaggedNotes",
+      "ColoredNotes",
+      "TopicNotes",
+      "Favorites",
+      "Notes",
+      "Notebook",
+      "Notebooks"
+    );
     close();
   }
 
@@ -499,14 +525,12 @@ export const useActions = ({ close = () => null, item }) => {
       negativeText: "Cancel",
       positivePress: async () => {
         await db.trash.delete(item.id);
-        setImmediate(() => {
-          Navigation.queueRoutesForUpdate();
-          useSelectionStore.getState().setSelectionMode(false);
-          ToastEvent.show({
-            heading: "Permanantly deleted items",
-            type: "success",
-            context: "local"
-          });
+        Navigation.queueRoutesForUpdate("Trash");
+        useSelectionStore.getState().setSelectionMode(false);
+        ToastEvent.show({
+          heading: "Permanantly deleted items",
+          type: "success",
+          context: "local"
         });
       },
       positiveType: "errorShade"
@@ -514,32 +538,35 @@ export const useActions = ({ close = () => null, item }) => {
   }
 
   async function openHistory() {
+    close();
+    await sleep(300);
     presentSheet({
       component: (ref) => <NoteHistory fwdRef={ref} note={item} />
     });
   }
 
   async function showAttachments() {
-    AttachmentDialog.present(item);
+    close();
+    await sleep(300);
+    eSendEvent(eOpenAttachmentsDialog, item);
   }
 
   async function exportNote() {
-    if (item.locked) {
-      ToastEvent.show({
-        heading: "Note is locked",
-        type: "error",
-        message: "Locked notes cannot be exported",
-        context: "local"
-      });
-      return;
-    }
+    close();
+    await sleep(300);
     ExportNotesSheet.present([item]);
   }
 
   async function toggleLocalOnly() {
     if (!checkNoteSynced() || !user) return;
     db.notes.note(item.id).localOnly();
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "TaggedNotes",
+      "ColoredNotes",
+      "TopicNotes",
+      "Favorites",
+      "Notes"
+    );
     close();
   }
 
@@ -550,14 +577,26 @@ export const useActions = ({ close = () => null, item }) => {
       useEditorStore.getState().setReadonly(current);
       //  tiny.call(EditorWebView, tiny.toogleReadMode(current ? 'readonly' : 'design'));
     }
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "TaggedNotes",
+      "ColoredNotes",
+      "TopicNotes",
+      "Favorites",
+      "Notes"
+    );
     close();
   };
 
   const duplicateNote = async () => {
     if (!checkNoteSynced()) return;
     await db.notes.note(item.id).duplicate();
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "TaggedNotes",
+      "ColoredNotes",
+      "TopicNotes",
+      "Favorites",
+      "Notes"
+    );
     close();
   };
   const actions = [
@@ -608,6 +647,8 @@ export const useActions = ({ close = () => null, item }) => {
       title: "Add notes",
       icon: "plus",
       func: async () => {
+        close();
+        await sleep(500);
         MoveNotes.present(db.notebooks.notebook(item.notebookId).data, item);
       }
     },
@@ -623,7 +664,7 @@ export const useActions = ({ close = () => null, item }) => {
     },
     {
       id: "favorite",
-      title: item.favorite ? "Unfavorite" : "Favorite",
+      title: !item.favorite ? "Favorite" : "Unfavorite",
       icon: item.favorite ? "star-off" : "star-outline",
       func: addToFavorites,
       close: false,
@@ -636,7 +677,7 @@ export const useActions = ({ close = () => null, item }) => {
       id: "pin-to-notifications",
       title:
         notifPinned !== null
-          ? "Unpin from notifications"
+          ? "Unpin from Notifications"
           : "Pin to notifications",
       icon: "message-badge-outline",
       on: notifPinned !== null,
@@ -648,7 +689,9 @@ export const useActions = ({ close = () => null, item }) => {
       title: "Edit notebook",
       icon: "square-edit-outline",
       func: async () => {
-        AddNotebookSheet.present(item);
+        close();
+        await sleep(300);
+        eSendEvent(eOpenAddNotebookDialog, item);
       }
     },
     {
@@ -701,7 +744,7 @@ export const useActions = ({ close = () => null, item }) => {
     },
     {
       id: "read-only",
-      title: "Readonly",
+      title: "Read only",
       icon: "pencil-lock",
       func: toggleReadyOnlyMode,
       on: item.readonly
@@ -734,6 +777,8 @@ export const useActions = ({ close = () => null, item }) => {
       title: "Edit reminder",
       icon: "pencil",
       func: async () => {
+        close();
+        await sleep(300);
         ReminderSheet.present(item);
       },
       close: false
@@ -744,6 +789,7 @@ export const useActions = ({ close = () => null, item }) => {
       title: "Reminders",
       icon: "clock-outline",
       func: async () => {
+        close();
         RelationsList.present({
           reference: item,
           referenceType: "reminder",
@@ -785,7 +831,15 @@ export const useActions = ({ close = () => null, item }) => {
         });
         Notifications.scheduleNotification(item);
         useRelationStore.getState().update();
-        Navigation.queueRoutesForUpdate();
+        Navigation.queueRoutesForUpdate(
+          "TaggedNotes",
+          "ColoredNotes",
+          "TopicNotes",
+          "Favorites",
+          "Notes",
+          "NotesPage",
+          "Reminders"
+        );
       }
     },
     {
@@ -795,13 +849,6 @@ export const useActions = ({ close = () => null, item }) => {
       icon: "minus-circle-outline",
       func: removeNoteFromTopic
     },
-    {
-      id: "remove-from-notebook",
-      title: "Remove from notebook",
-      hidden: !isNoteInNotebook(),
-      icon: "minus-circle-outline",
-      func: removeNoteFromNotebook
-    },
     {
       id: "trash",
       title:

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

@@ -402,9 +402,11 @@ export const useAppEvents = () => {
 
   const checkAutoBackup = useCallback(async () => {
     if (verify || syncing) {
+      console.log("backup is waiting");
       refValues.current.backupDidWait = true;
       return;
     }
+    console.log("backup running immediate");
     const user = await db.user.getUser();
     if (PremiumService.get() && user) {
       if (SettingsService.get().reminder === "off") {
@@ -425,6 +427,7 @@ export const useAppEvents = () => {
 
   useEffect(() => {
     if (!verify && !syncing && refValues.current.backupDidWait) {
+      console.log("backup run after wait");
       refValues.current.backupDidWait = false;
       checkAutoBackup();
     }
@@ -558,7 +561,7 @@ export const useAppEvents = () => {
       let shareExtensionOpened = MMKV.getString("shareExtensionOpened");
       if (notesAddedFromIntent) {
         if (Platform.OS === "ios") {
-          await db.initCollections();
+          await db.init();
           await db.notes.init();
         }
         useNoteStore.getState().setNotes();
@@ -571,8 +574,8 @@ export const useAppEvents = () => {
       if (notesAddedFromIntent || shareExtensionOpened) {
         let id = useEditorStore.getState().currentEditingNote;
         let note = id && db.notes.note(id).data;
+        eSendEvent("loadingNote", note);
         eSendEvent("webview_reset");
-        setTimeout(() => eSendEvent("loadingNote", note), 1);
         MMKV.removeItem("shareExtensionOpened");
       }
     } catch (e) {

apps/mobile/app/hooks/use-attachment-progress.js

@@ -20,43 +20,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { useEffect, useState } from "react";
 import { useAttachmentStore } from "../stores/use-attachment-store";
 
-type AttachmentProgress = {
-  type: string;
-  value?: number;
-  percent?: string;
-};
-
-export const useAttachmentProgress = (
-  attachment: any,
-  encryption?: boolean
-) => {
+export const useAttachmentProgress = (attachment, encryption) => {
   const progress = useAttachmentStore((state) => state.progress);
-  const [currentProgress, setCurrentProgress] = useState<
-    AttachmentProgress | undefined
-  >(
+  const [currentProgress, setCurrentProgress] = useState(
     encryption
       ? {
           type: "encrypt"
         }
-      : undefined
+      : null
   );
 
   useEffect(() => {
-    const attachmentProgress = progress?.[attachment.metadata.hash];
-    if (attachmentProgress) {
-      const type = attachmentProgress.type;
-      const loaded =
-        attachmentProgress.type === "download"
-          ? attachmentProgress.recieved
-          : attachmentProgress.sent;
-      const value = loaded / attachmentProgress.total;
+    let prog = progress[attachment.metadata.hash];
+    if (prog) {
+      let type = prog.type;
+      let loaded = prog.type === "download" ? prog.recieved : prog.sent;
+      prog = loaded / prog.total;
+      prog = (prog * 100).toFixed(0);
       setCurrentProgress({
-        value: value * 100,
-        percent: (value * 100).toFixed(0) + "%",
+        value: prog,
+        percent: prog + "%",
         type: type
       });
     } else {
-      setCurrentProgress(undefined);
+      setCurrentProgress(null);
     }
   }, [attachment.metadata.hash, progress]);
 

apps/mobile/app/hooks/use-vault-status.js

@@ -0,0 +1,61 @@
+/*
+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 React, { useCallback, useEffect } from "react";
+import BiometicService from "../services/biometrics";
+import { eSubscribeEvent, eUnSubscribeEvent } from "../services/event-manager";
+import { db } from "../common/database";
+
+const VaultStatusCache = {
+  exists: false,
+  biometryEnrolled: false,
+  isBiometryAvailable: false
+};
+
+export const useVaultStatus = () => {
+  const [vaultStatus, setVaultStatus] = React.useState(VaultStatusCache);
+
+  const checkVaultStatus = useCallback(() => {
+    db.vault.exists().then(async (exists) => {
+      let available = await BiometicService.isBiometryAvailable();
+      let fingerprint = await BiometicService.hasInternetCredentials();
+      if (
+        VaultStatusCache.exists === exists &&
+        VaultStatusCache.biometryEnrolled === fingerprint &&
+        VaultStatusCache.isBiometryAvailable === available
+      )
+        return;
+      setVaultStatus({
+        exists: exists,
+        biometryEnrolled: fingerprint,
+        isBiometryAvailable: available ? true : false
+      });
+    });
+  }, []);
+
+  useEffect(() => {
+    checkVaultStatus();
+    eSubscribeEvent("vaultUpdated", () => checkVaultStatus());
+    return () => {
+      eUnSubscribeEvent("vaultUpdated", () => checkVaultStatus());
+    };
+  }, [checkVaultStatus]);
+
+  return vaultStatus;
+};

apps/mobile/app/navigation/navigation-stack.js

@@ -24,7 +24,6 @@ import { SafeAreaView } from "react-native";
 import Container from "../components/container";
 import DelayLayout from "../components/delay-layout";
 import Intro from "../components/intro";
-import { TopicsSheet } from "../components/sheets/topic-sheet";
 import useGlobalSafeAreaInsets from "../hooks/use-global-safe-area-insets";
 import { hideAllTooltips } from "../hooks/use-tooltip";
 import Favorites from "../screens/favorites";
@@ -199,7 +198,6 @@ const _NavigationStack = () => {
       <NavigationContainer onStateChange={onStateChange} ref={rootNavigatorRef}>
         <Tabs />
       </NavigationContainer>
-      <TopicsSheet />
     </Container>
   );
 };

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

@@ -69,7 +69,6 @@ import {
 import { editorRef, tabBarRef } from "../utils/global-refs";
 import { sleep } from "../utils/time";
 import { NavigationStack } from "./navigation-stack";
-import changeNavigationBarColor from "react-native-navigation-bar-color";
 
 const _TabsHolder = () => {
   const colors = useThemeStore((state) => state.colors);
@@ -236,17 +235,14 @@ const _TabsHolder = () => {
     let needsUpdate = current !== deviceMode;
 
     if (fullscreen && current !== "mobile") {
-      // Runs after size is set via state.
-      setTimeout(() => {
-        editorRef.current?.setNativeProps({
-          style: {
-            width: size.width,
-            zIndex: 999,
-            paddingHorizontal:
-              current === "smallTablet" ? size.width * 0 : size.width * 0.15
-          }
-        });
-      }, 1);
+      editorRef.current?.setNativeProps({
+        style: {
+          width: size.width,
+          zIndex: 999,
+          paddingHorizontal:
+            current === "smallTablet" ? size.width * 0 : size.width * 0.15
+        }
+      });
     } else {
       if (fullscreen) eSendEvent(eCloseFullscreenEditor, current);
       editorRef.current?.setNativeProps({
@@ -285,8 +281,10 @@ const _TabsHolder = () => {
             !editorState().movedAway &&
             useEditorStore.getState().currentEditingNote
           ) {
+            console.log("editor");
             tabBarRef.current?.goToIndex(2, false);
           } else {
+            console.log("home");
             tabBarRef.current?.goToIndex(1, false);
           }
           break;
@@ -387,10 +385,6 @@ const _TabsHolder = () => {
     };
   }, []);
 
-  useEffect(() => {
-    changeNavigationBarColor(colors.bg, !colors.night, true);
-  }, [colors.night, colors.bg]);
-
   return (
     <View
       onLayout={_onLayout}

apps/mobile/app/package.json

@@ -10,10 +10,10 @@
     "buffer": "^6.0.3",
     "dayjs": "^1.10.4",
     "entities": "^3.0.1",
-    "html-to-text": "9.0.5",
+    "html-to-text": "8.1.0",
     "phone": "^3.1.14",
     "qclone": "^1.2.0",
-    "react-native-actions-sheet": "0.9.0-alpha.18",
+    "react-native-actions-sheet": "^0.7.2",
     "react-native-check-version": "https://github.com/flexible-agency/react-native-check-version",
     "react-native-drax": "^0.10.2",
     "react-native-image-zoom-viewer": "^3.0.1",
@@ -28,6 +28,7 @@
     "zustand": "^3.6.0",
     "fflate": "^0.7.3",
     "timeago.js": "4.0.2"
+
   },
   "sideEffects": false
 }

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

@@ -24,7 +24,6 @@ import React, {
   useCallback,
   useEffect,
   useImperativeHandle,
-  useRef,
   useState
 } from "react";
 import { Platform, ViewStyle } from "react-native";
@@ -90,7 +89,7 @@ const Editor = React.memo(
         noToolbar,
         noHeader
       });
-      const renderKey = useRef(`editor-0`);
+
       useImperativeHandle(ref, () => ({
         get: () => editor
       }));
@@ -108,7 +107,6 @@ const Editor = React.memo(
           attachmentType: string;
         }) => {
           if (groupId !== editor.note.current?.id) return;
-          editorController.current.markImageLoaded(hash);
           if (attachmentType === "webclip") {
             editor.commands.updateWebclip({
               hash: hash,
@@ -125,9 +123,8 @@ const Editor = React.memo(
       );
 
       const onError = useCallback(() => {
-        renderKey.current =
-          renderKey.current === `editor-0` ? `editor-1` : `editor-0`;
         editor.setLoading(true);
+        setTimeout(() => editor.setLoading(false), 10);
       }, [editor]);
 
       useEffect(() => {
@@ -154,7 +151,6 @@ const Editor = React.memo(
             testID={notesnook.editor.id}
             ref={editor.ref}
             onLoad={editor.onLoad}
-            key={renderKey.current}
             onRenderProcessGone={onError}
             nestedScrollEnabled
             onError={onError}
@@ -166,7 +162,6 @@ const Editor = React.memo(
             injectedJavaScript={`globalThis.sessionId="${editor.sessionId}";`}
             javaScriptEnabled={true}
             focusable={true}
-            onContentProcessDidTerminate={onError}
             setSupportMultipleWindows={false}
             overScrollMode="never"
             scrollEnabled={false}

apps/mobile/app/screens/editor/loading.js

@@ -28,12 +28,12 @@ import { Button } from "../../components/ui/button";
 import { IconButton } from "../../components/ui/icon-button";
 import Paragraph from "../../components/ui/typography/paragraph";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
+import { DDS } from "../../services/device-detection";
 import {
   eSendEvent,
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../services/event-manager";
-import { useSettingStore } from "../../stores/use-setting-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { eClearEditor } from "../../utils/events";
 import { SIZE } from "../../utils/size";
@@ -42,9 +42,7 @@ const EditorOverlay = ({ editorId = "", editor }) => {
   const colors = useThemeStore((state) => state.colors);
   const [error, setError] = useState(false);
   const opacity = useSharedValue(1);
-  const translateValue = useSharedValue(0);
-  const deviceMode = useSettingStore((state) => state.deviceMode);
-  const isTablet = deviceMode !== "mobile";
+  const translateValue = useSharedValue(6000);
   const insets = useGlobalSafeAreaInsets();
   const isDefaultEditor = editorId === "";
   const timers = useRef({
@@ -52,9 +50,6 @@ const EditorOverlay = ({ editorId = "", editor }) => {
     error: 0,
     closing: 0
   });
-  const loadingState = useRef({
-    startTime: 0
-  });
 
   const clearTimers = () => {
     clearTimeout(timers.current.loading);
@@ -67,7 +62,6 @@ const EditorOverlay = ({ editorId = "", editor }) => {
       editorState().overlay = true;
       clearTimers();
       if (_loading) {
-        loadingState.current.startTime = Date.now();
         opacity.value = 1;
         translateValue.value = 0;
         timers.current.error = setTimeout(() => {
@@ -75,14 +69,7 @@ const EditorOverlay = ({ editorId = "", editor }) => {
         }, 15 * 1000);
       } else {
         clearTimers();
-        const timeDiffSinceLoadStarted =
-          Date.now() - loadingState.current.startTime > 300 ? 300 : 0;
-        if (!timeDiffSinceLoadStarted) {
-          setError(false);
-          editorState().overlay = false;
-          opacity.value = 0;
-          translateValue.value = 6000;
-        } else {
+        setTimeout(() => {
           setError(false);
           editorState().overlay = false;
           opacity.value = withTiming(0, {
@@ -91,25 +78,19 @@ const EditorOverlay = ({ editorId = "", editor }) => {
           setTimeout(() => {
             translateValue.value = 6000;
           }, 500);
-        }
+        }, 100);
       }
     },
     [opacity, translateValue]
   );
 
   useEffect(() => {
-    setTimeout(() => {
-      if (!loadingState.current.startTime) {
-        translateValue.value = 6000;
-        opacity.value = 0;
-      }
-    }, 3000);
     eSubscribeEvent("loadingNote" + editorId, load);
     return () => {
       clearTimers();
       eUnSubscribeEvent("loadingNote" + editorId, load);
     };
-  }, [editorId, load, translateValue]);
+  }, [editorId, load]);
 
   const animatedStyle = useAnimatedStyle(() => {
     return {
@@ -159,7 +140,7 @@ const EditorOverlay = ({ editorId = "", editor }) => {
               paddingRight: 12
             }}
           >
-            {isTablet ? (
+            {DDS.isTablet() ? (
               <View />
             ) : (
               <IconButton
@@ -203,9 +184,7 @@ const EditorOverlay = ({ editorId = "", editor }) => {
                 alignItems: "center",
                 flexDirection: "row",
                 paddingHorizontal: 10,
-                marginTop: 5,
-                borderWidth: 1,
-                borderColor: colors.border
+                marginTop: 10
               }}
             >
               <Paragraph color={colors.icon} size={13}>

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

@@ -48,7 +48,6 @@ const fn = (fn: string) => {
   const id = randId("fn_");
   return {
     job: `(async () => {
-      if (typeof __PLATFORM__ === "undefined") __PLATFORM__ = "${Platform.OS}";
       try {
         let response = true;
         ${fn}
@@ -58,7 +57,7 @@ const fn = (fn: string) => {
         if (DEV_MODE && typeof logger !== "undefined") logger('error', "webview: ", e.message, e.stack);
       }
       return true;
-    })();true;`,
+    })();`,
     id: id
   };
 };
@@ -106,7 +105,6 @@ typeof globalThis.editorTitle !== "undefined" && editorTitle.current && editorTi
 if (editorController.content) editorController.content.current = null;
 editorController.onUpdate();
 editorController.setTitle(null);
-editorController.countWords(0);
 typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",saved:""});
         `
     );
@@ -130,6 +128,7 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
   };
 
   setInsets = async (insets: EdgeInsets) => {
+    logger.info("setInsets", insets);
     await this.doAsync(`
       if (typeof safeAreaController !== "undefined") {
         safeAreaController.update(${JSON.stringify(insets)}) 
@@ -229,7 +228,7 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
     await this.doAsync(
       `editor && editor.commands.updateImage(${JSON.stringify({
         hash
-      })},${JSON.stringify({ dataurl: src, hash, preventUpdate: true })})`
+      })},${JSON.stringify({ src, hash, preventUpdate: true })})`
     );
   };
 
@@ -238,10 +237,6 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
       'response = window.dispatchEvent(new Event("handleBackPress",{cancelable:true}));'
     );
   };
-
-  keyboardShown = async (keyboardShown: boolean) => {
-    return this.doAsync(`globalThis['keyboardShown']=${keyboardShown};`);
-  };
   //todo add replace image function
 }
 

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

@@ -34,6 +34,5 @@ export const EventTypes = {
   fullscreen: "editor-event:fullscreen",
   link: "editor-event:link",
   contentchange: "editor-event:content-change",
-  reminders: "editor-event:reminders",
-  previewAttachment: "editor-event:preview-attachment"
+  reminders: "editor-event:reminders"
 };

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

@@ -17,14 +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 Sodium from "@ammarahmed/react-native-sodium";
 import React from "react";
 import { Platform, View } from "react-native";
 import DocumentPicker from "react-native-document-picker";
 import { launchCamera, launchImageLibrary } from "react-native-image-picker";
+import Sodium from "@ammarahmed/react-native-sodium";
 import RNFetchBlob from "rn-fetch-blob";
 import { db } from "../../../common/database";
-import { compressToBase64 } from "../../../common/filesystem/compress";
 import { AttachmentItem } from "../../../components/attachments/attachment-item";
 import {
   eSendEvent,
@@ -33,6 +32,7 @@ import {
 } from "../../../services/event-manager";
 import PremiumService from "../../../services/premium";
 import { eCloseSheet } from "../../../utils/events";
+import { sleep } from "../../../utils/time";
 import { editorController, editorState } from "./utils";
 const FILE_SIZE_LIMIT = 500 * 1024 * 1024;
 const IMAGE_SIZE_LIMIT = 50 * 1024 * 1024;
@@ -124,7 +124,6 @@ const file = async (fileOptions) => {
     });
     if (!(await attachFile(uri, hash, file.type, file.name, fileOptions)))
       return;
-    if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
     editorController.current?.commands.insertAttachment({
       hash: hash,
       filename: file.name,
@@ -148,6 +147,8 @@ const file = async (fileOptions) => {
 const camera = async (options) => {
   try {
     await db.attachments.generateKey();
+    eSendEvent(eCloseSheet);
+    await sleep(400);
     launchCamera(
       {
         includeBase64: true,
@@ -169,6 +170,8 @@ const camera = async (options) => {
 const gallery = async (options) => {
   try {
     await db.attachments.generateKey();
+    eSendEvent(eCloseSheet);
+    await sleep(400);
     launchImageLibrary(
       {
         includeBase64: true,
@@ -202,7 +205,7 @@ const pick = async (options) => {
     return;
   }
   if (options?.type.startsWith("image") || options?.type === "camera") {
-    if (options.type.startsWith("image")) {
+    if (options.type === "image") {
       gallery(options);
     } else {
       camera(options);
@@ -231,7 +234,7 @@ const handleImageResponse = async (response, options) => {
     });
     return;
   }
-  let b64 = `data:${image.type};base64, ` + image.base64;
+  const b64 = `data:${image.type};base64, ` + image.base64;
   const uri = decodeURI(image.uri);
   const hash = await Sodium.hashFile({
     uri: uri,
@@ -240,24 +243,12 @@ const handleImageResponse = async (response, options) => {
 
   let fileName = image.originalFileName || image.fileName;
   if (!(await attachFile(uri, hash, image.type, fileName, options))) return;
-  const isPng = /(png)/g.test(image.type);
-  const isJpeg = /(jpeg|jpg)/g.test(image.type);
-  if (isPng || isJpeg) {
-    b64 =
-      `data:${image.type};base64, ` +
-      (await compressToBase64(
-        Platform.OS === "ios" ? "file://" + image.uri : image.uri,
-        isPng ? "PNG" : "JPEG"
-      ));
-  }
-
-  if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
 
   editorController.current?.commands.insertImage({
     hash: hash,
     type: image.type,
     title: fileName,
-    dataurl: b64,
+    src: b64,
     size: image.fileSize,
     filename: fileName
   });
@@ -298,6 +289,7 @@ async function attachFile(uri, hash, type, filename, options) {
       encryptionInfo,
       editorController.current?.note?.id
     );
+    if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
 
     return true;
   } catch (e) {

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

@@ -48,8 +48,6 @@ export type Settings = {
   keyboardShown?: boolean;
   doubleSpacedLines?: boolean;
   corsProxy: string;
-  fontSize: string;
-  fontFamily: string;
 };
 
 export type EditorProps = {

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

@@ -25,21 +25,19 @@ import { useCallback, useEffect, useRef } from "react";
 import {
   BackHandler,
   InteractionManager,
-  Keyboard,
-  KeyboardEventListener,
   NativeEventSubscription
 } from "react-native";
 import { WebViewMessageEvent } from "react-native-webview";
 import { db } from "../../../common/database";
-import ManageTagsSheet from "../../../components/sheets/manage-tags";
 import { RelationsList } from "../../../components/sheets/relations-list";
 import ReminderSheet from "../../../components/sheets/reminder";
+import useKeyboard from "../../../hooks/use-keyboard";
 import { DDS } from "../../../services/device-detection";
 import {
-  ToastEvent,
   eSendEvent,
   eSubscribeEvent,
-  eUnSubscribeEvent
+  eUnSubscribeEvent,
+  ToastEvent
 } from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import { useEditorStore } from "../../../stores/use-editor-store";
@@ -53,7 +51,8 @@ import {
   eOpenFullscreenEditor,
   eOpenLoginDialog,
   eOpenPremiumDialog,
-  eOpenPublishNoteDialog
+  eOpenPublishNoteDialog,
+  eOpenTagsDialog
 } from "../../../utils/events";
 import { openLinkInBrowser } from "../../../utils/functions";
 import { tabBarRef } from "../../../utils/global-refs";
@@ -136,30 +135,8 @@ export const useEditorEvents = (
   const doubleSpacedLines = useSettingStore(
     (state) => state.settings?.doubleSpacedLines
   );
-  const defaultFontSize = useSettingStore(
-    (state) => state.settings.defaultFontSize
-  );
-  const defaultFontFamily = useSettingStore(
-    (state) => state.settings.defaultFontFamily
-  );
-
   const tools = useDragState((state) => state.data);
-
-  useEffect(() => {
-    const handleKeyboardDidShow: KeyboardEventListener = () => {
-      editor.commands.keyboardShown(true);
-    };
-    const handleKeyboardDidHide: KeyboardEventListener = () => {
-      editor.commands.keyboardShown(false);
-    };
-    const subscriptions = [
-      Keyboard.addListener("keyboardDidShow", handleKeyboardDidShow),
-      Keyboard.addListener("keyboardDidHide", handleKeyboardDidHide)
-    ];
-    return () => {
-      subscriptions.forEach((subscription) => subscription.remove());
-    };
-  }, [editor.commands]);
+  const { keyboardShown } = useKeyboard();
 
   useEffect(() => {
     editor.commands.setSettings({
@@ -170,10 +147,9 @@ export const useEditorEvents = (
       tools: tools || getDefaultPresets().default,
       noHeader: noHeader,
       noToolbar: readonly || editorPropReadonly || noToolbar,
+      keyboardShown: keyboardShown || false,
       doubleSpacedLines: doubleSpacedLines,
-      corsProxy: corsProxy,
-      fontSize: defaultFontSize,
-      fontFamily: defaultFontFamily
+      corsProxy: corsProxy
     });
   }, [
     fullscreen,
@@ -184,13 +160,12 @@ export const useEditorEvents = (
     deviceMode,
     tools,
     editor.commands,
+    keyboardShown,
     doubleSpacedLines,
     editorPropReadonly,
     noHeader,
     noToolbar,
-    corsProxy,
-    defaultFontSize,
-    defaultFontFamily
+    corsProxy
   ]);
 
   const onBackPress = useCallback(async () => {
@@ -214,7 +189,12 @@ export const useEditorEvents = (
       setImmediate(() => {
         useEditorStore.getState().setCurrentlyEditingNote(null);
         setTimeout(() => {
-          Navigation.queueRoutesForUpdate();
+          Navigation.queueRoutesForUpdate(
+            "ColoredNotes",
+            "Notes",
+            "TaggedNotes",
+            "TopicNotes"
+          );
         }, 500);
       });
       editorState().currentlyEditing = false;
@@ -293,28 +273,12 @@ export const useEditorEvents = (
     (event: WebViewMessageEvent) => {
       const data = event.nativeEvent.data;
       const editorMessage = JSON.parse(data) as EditorMessage;
-
-      if (editorMessage.type === EventTypes.content) {
-        editor.saveContent({
-          type: editorMessage.type,
-          content: editorMessage.value as string,
-          forSessionId: editorMessage.sessionId
-        });
-      } else if (editorMessage.type === EventTypes.title) {
-        editor.saveContent({
-          type: editorMessage.type,
-          title: editorMessage.value as string,
-          forSessionId: editorMessage.sessionId
-        });
-      }
-
       if (
         editorMessage.sessionId !== editor.sessionId &&
         editorMessage.type !== EditorEvents.status
       ) {
         return;
       }
-
       switch (editorMessage.type) {
         case EventTypes.logger:
           logger.info("[WEBVIEW LOG]", editorMessage.value);
@@ -322,8 +286,21 @@ export const useEditorEvents = (
         case EventTypes.contentchange:
           editor.onContentChanged();
           break;
+        case EventTypes.content:
+          editor.saveContent({
+            type: editorMessage.type,
+            content: editorMessage.value as string
+          });
+          break;
         case EventTypes.selection:
           break;
+        case EventTypes.title:
+          editor.saveContent({
+            type: editorMessage.type,
+            title: editorMessage.value as string
+          });
+          break;
+
         case EventTypes.reminders:
           if (!editor.note.current) {
             ToastEvent.show({
@@ -349,7 +326,7 @@ export const useEditorEvents = (
             });
             return;
           }
-          ManageTagsSheet.present(editor.note.current);
+          eSendEvent(eOpenTagsDialog, editor.note.current);
           break;
         case EventTypes.tag:
           if (editorMessage.value) {
@@ -360,7 +337,13 @@ export const useEditorEvents = (
               .then(async () => {
                 useTagStore.getState().setTags();
                 await editor.commands.setTags(editor.note.current);
-                Navigation.queueRoutesForUpdate();
+                Navigation.queueRoutesForUpdate(
+                  "ColoredNotes",
+                  "Notes",
+                  "TaggedNotes",
+                  "TopicNotes",
+                  "Tags"
+                );
               });
           }
           break;
@@ -397,10 +380,6 @@ export const useEditorEvents = (
         case EventTypes.link:
           openLinkInBrowser(editorMessage.value as string);
           break;
-
-        case EventTypes.previewAttachment:
-          eSendEvent("ImagePreview", editorMessage.value);
-          break;
         default:
           break;
       }

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

@@ -17,7 +17,6 @@ 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 { EVENTS } from "@notesnook/core/common";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import WebView from "react-native-webview";
 import { db } from "../../../common/database";
@@ -30,7 +29,6 @@ import {
   openVault
 } from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
-import SettingsService from "../../../services/settings";
 import { TipManager } from "../../../services/tip-manager";
 import { useEditorStore } from "../../../stores/use-editor-store";
 import { useNoteStore } from "../../../stores/use-notes-store";
@@ -43,15 +41,17 @@ import { NoteType } from "../../../utils/types";
 import Commands from "./commands";
 import { Content, EditorState, Note, SavePayload } from "./types";
 import {
-  EditorEvents,
   clearAppState,
   defaultState,
+  EditorEvents,
   getAppState,
   isContentInvalid,
   isEditorLoaded,
   makeSessionId,
   post
 } from "./utils";
+import { EVENTS } from "@notesnook/core/common";
+import SettingsService from "../../../services/settings";
 
 export const useEditor = (
   editorId = "",
@@ -76,12 +76,10 @@ export const useEditor = (
   const saveCount = useRef(0);
   const lastContentChangeTime = useRef<number>(0);
   const lock = useRef(false);
-  const loadedImages = useRef<{ [name: string]: boolean }>({});
-  const lockedSessionId = useRef<string>();
 
   const postMessage = useCallback(
-    async <T>(type: string, data: T, waitFor = 300) =>
-      await post(editorRef, sessionIdRef.current, type, data, waitFor),
+    async <T>(type: string, data: T) =>
+      await post(editorRef, sessionIdRef.current, type, data),
     [sessionIdRef]
   );
 
@@ -120,11 +118,27 @@ export const useEditor = (
     [editorId]
   );
 
+  const onReady = useCallback(async () => {
+    if (!(await isEditorLoaded(editorRef, sessionIdRef.current))) {
+      overlay(true);
+      setLoading(true);
+    }
+  }, [overlay]);
+
+  useEffect(() => {
+    state.current.saveCount = 0;
+    async () => {
+      await commands.setSessionId(sessionIdRef.current);
+      if (sessionIdRef.current) {
+        if (!state.current?.ready) return;
+        await onReady();
+      }
+    };
+  }, [sessionId, loading, commands, onReady]);
+
   useEffect(() => {
     if (loading) {
       setLoading(false);
-    } else {
-      state.current.ready = false;
     }
   }, [loading]);
 
@@ -137,19 +151,17 @@ export const useEditor = (
   );
 
   const reset = useCallback(
-    async (resetState = true, resetContent = true) => {
+    async (resetState = true) => {
       currentNote.current?.id && db.fs.cancel(currentNote.current.id);
       currentNote.current = null;
-      loadedImages.current = {};
       currentContent.current = null;
-      clearTimeout(timers.current["loading-images"]);
       sessionHistoryId.current = undefined;
       saveCount.current = 0;
       useEditorStore.getState().setReadonly(false);
-      resetContent && postMessage(EditorEvents.title, "");
+      postMessage(EditorEvents.title, "");
       lastContentChangeTime.current = 0;
-      resetContent && (await commands.clearContent());
-      resetContent && (await commands.clearTags());
+      await commands.clearContent();
+      await commands.clearTags();
       if (resetState) {
         isDefaultEditor &&
           useEditorStore.getState().setCurrentlyEditingNote(null);
@@ -224,15 +236,9 @@ export const useEditor = (
 
           if (
             useEditorStore.getState().currentEditingNote !== id &&
-            isDefaultEditor &&
-            state.current.currentlyEditing
+            isDefaultEditor
           ) {
             setTimeout(() => {
-              if (
-                (currentNote.current?.id && currentNote.current?.id !== id) ||
-                !state.current.currentlyEditing
-              )
-                return;
               id && useEditorStore.getState().setCurrentlyEditingNote(id);
             });
           }
@@ -253,7 +259,12 @@ export const useEditor = (
             currentNote.current?.headline?.slice(0, 200) !==
               note.headline?.slice(0, 200)
           ) {
-            Navigation.queueRoutesForUpdate();
+            Navigation.queueRoutesForUpdate(
+              "ColoredNotes",
+              "Notes",
+              "TaggedNotes",
+              "TopicNotes"
+            );
           }
         }
 
@@ -279,58 +290,6 @@ export const useEditor = (
     }
   }, []);
 
-  const getMediaToLoad = (previousContent?: string) => {
-    if (!currentNote.current?.id) return [];
-
-    const previousAttachments =
-      previousContent?.matchAll(/data-hash="(.+?)"/gm) || [];
-    const attachments =
-      currentContent.current?.data?.matchAll(/data-hash="(.+?)"/gm) || [];
-
-    const media: string[] = [];
-
-    const oldMatches = Array.from(previousAttachments).map((match) => match[1]);
-    const matches = Array.from(attachments).map((match) => match[1]);
-
-    for (let i = 0; i < matches.length; i++) {
-      const currentHash = matches[i];
-      const oldHash = oldMatches[i];
-      if (currentHash !== oldHash) {
-        media.push(currentHash);
-        loadedImages.current[currentHash] = false;
-      }
-    }
-    return media;
-  };
-
-  const markImageLoaded = (hash: string) => {
-    const attachment = loadedImages.current[hash];
-    if (typeof attachment === "boolean") {
-      loadedImages.current[hash] = true;
-    }
-  };
-
-  const loadImages = useCallback((previousContent?: string) => {
-    if (!currentNote.current?.id) return;
-    const timerId = "loading-images";
-    clearTimeout(timers.current[timerId]);
-    timers.current[timerId] = setTimeout(() => {
-      if (!currentNote.current?.id) return;
-      if (currentNote.current?.content?.isPreview) {
-        db.content?.downloadMedia(
-          currentNote.current?.id,
-          currentNote.current.content,
-          true
-        );
-      } else {
-        const media = getMediaToLoad(previousContent);
-        if (media.length > 0) {
-          db.attachments?.downloadMedia(currentNote.current?.id, media);
-        }
-      }
-    }, 1000);
-  }, []);
-
   const loadNote = useCallback(
     async (
       item: Omit<NoteType, "type"> & {
@@ -340,6 +299,7 @@ export const useEditor = (
     ) => {
       state.current.currentlyEditing = true;
       const editorState = useEditorStore.getState();
+
       if (item && item.type === "new") {
         currentNote.current && (await reset());
         const nextSessionId = makeSessionId(item as NoteType);
@@ -347,62 +307,51 @@ export const useEditor = (
         sessionIdRef.current = nextSessionId;
         sessionHistoryId.current = Date.now();
         await commands.setSessionId(nextSessionId);
-        if (state.current?.ready) await commands.focus();
+        await commands.focus();
         lastContentChangeTime.current = 0;
         useEditorStore.getState().setReadonly(false);
       } else {
         if (!item.forced && currentNote.current?.id === item.id) return;
-        state.current.movedAway = false;
-        state.current.currentlyEditing = true;
         isDefaultEditor && editorState.setCurrentlyEditingNote(item.id);
-        currentNote.current && (await reset(false, false));
+        overlay(true, item);
+        currentNote.current && (await reset(false));
         await loadContent(item as NoteType);
-        if (
-          !currentContent.current?.data ||
-          currentContent.current?.data.length < 50000
-        ) {
-          if (state.current.ready) overlay(false);
-        } else {
-          overlay(true);
-        }
         lastContentChangeTime.current = item.dateEdited;
         const nextSessionId = makeSessionId(item as NoteType);
-        lockedSessionId.current = nextSessionId;
         sessionHistoryId.current = Date.now();
         setSessionId(nextSessionId);
-        commands.setSessionId(nextSessionId);
         sessionIdRef.current = nextSessionId;
+        await commands.setSessionId(nextSessionId);
         currentNote.current = item as NoteType;
         await commands.setStatus(timeConverter(item.dateEdited), "Saved");
         await postMessage(EditorEvents.title, item.title);
-        await postMessage(
-          EditorEvents.html,
-          currentContent.current?.data,
-          10000
-        );
+        await postMessage(EditorEvents.html, currentContent.current?.data);
         useEditorStore.getState().setReadonly(item.readonly);
         await commands.setTags(currentNote.current);
         commands.setSettings();
-        setTimeout(() => {
-          if (lockedSessionId.current === nextSessionId) {
-            lockedSessionId.current = undefined;
-          }
-        }, 300);
         overlay(false);
         loadImages();
       }
     },
-    [
-      commands,
-      isDefaultEditor,
-      loadContent,
-      loadImages,
-      overlay,
-      postMessage,
-      reset
-    ]
+    [commands, isDefaultEditor, loadContent, overlay, postMessage, reset]
   );
 
+  const loadImages = () => {
+    if (!currentNote.current?.id) return;
+    setTimeout(() => {
+      if (!currentNote.current?.id) return;
+      if (currentNote.current?.content?.isPreview) {
+        db.content?.downloadMedia(
+          currentNote.current?.id,
+          currentNote.current.content,
+          true
+        );
+      } else {
+        db.attachments?.downloadMedia(currentNote.current?.id);
+      }
+    }, 300);
+  };
+
   const lockNoteWithVault = useCallback((note: NoteType) => {
     eSendEvent(eClearEditor);
     openVault({
@@ -429,9 +378,6 @@ export const useEditor = (
         return;
 
       lock.current = true;
-
-      const previousContent = currentContent.current?.data;
-
       if (data.type === "tiptap") {
         if (!currentNote.current.locked && isContentEncrypted) {
           lockNoteWithVault(note);
@@ -462,20 +408,16 @@ export const useEditor = (
         }
         await commands.setStatus(timeConverter(note.dateEdited), "Saved");
       }
-
+      db.eventManager.subscribe(
+        EVENTS.syncCompleted,
+        async () => {
+          loadImages();
+        },
+        true
+      );
       lock.current = false;
-      if (data.type === "tiptap") {
-        loadImages(previousContent);
-        db.eventManager.subscribe(
-          EVENTS.syncCompleted,
-          () => {
-            loadImages(previousContent);
-          },
-          true
-        );
-      }
     },
-    [loadImages, lockNoteWithVault, postMessage, commands]
+    [commands, postMessage, lockNoteWithVault]
   );
 
   useEffect(() => {
@@ -494,16 +436,14 @@ export const useEditor = (
     ({
       title,
       content,
-      type,
-      forSessionId
+      type
     }: {
       title?: string;
       content?: string;
       type: string;
-      forSessionId: string;
     }) => {
-      if (lock.current || lockedSessionId.current === forSessionId) return;
       lastContentChangeTime.current = Date.now();
+      if (lock.current) return;
       if (type === EditorEvents.content) {
         currentContent.current = {
           data: content,
@@ -511,27 +451,22 @@ export const useEditor = (
           noteId: currentNote.current?.id as string
         };
       }
-      const noteIdFromSessionId =
-        !forSessionId || forSessionId.startsWith("session")
-          ? null
-          : forSessionId.split("_")[0];
-
-      const noteId = noteIdFromSessionId || currentNote.current?.id;
       const params = {
         title,
         data: content,
         type: "tiptap",
-        sessionId: forSessionId,
-        id: noteId,
+        sessionId,
+        id: currentNote.current?.id,
         sessionHistoryId: sessionHistoryId.current
       };
+
       withTimer(
-        noteId || "newnote",
+        currentNote.current?.id || "newnote",
         () => {
           if (
             currentNote.current &&
             !params.id &&
-            params.sessionId === forSessionId
+            params.sessionId === sessionId
           ) {
             params.id = currentNote.current?.id;
           }
@@ -541,10 +476,10 @@ export const useEditor = (
           }
           saveNote(params);
         },
-        150
+        500
       );
     },
-    [withTimer, onChange, saveNote]
+    [sessionId, withTimer, onChange, saveNote]
   );
 
   const restoreEditorState = useCallback(async () => {
@@ -554,7 +489,6 @@ export const useEditor = (
     state.current.isRestoringState = true;
     state.current.currentlyEditing = true;
     state.current.movedAway = false;
-
     if (!DDS.isTab) {
       tabBarRef.current?.goToPage(1, false);
     }
@@ -574,6 +508,10 @@ export const useEditor = (
     state.current.isRestoringState = false;
   }, [loadNote, overlay]);
 
+  useEffect(() => {
+    isDefaultEditor && restoreEditorState();
+  }, [isDefaultEditor, restoreEditorState]);
+
   useEffect(() => {
     eSubscribeEvent(eOnLoadNote + editorId, loadNote);
     return () => {
@@ -581,40 +519,19 @@ export const useEditor = (
     };
   }, [editorId, loadNote, restoreEditorState, isDefaultEditor]);
 
-  const onContentChanged = () => {
-    lastContentChangeTime.current = Date.now();
-  };
-
-  useEffect(() => {
-    state.current.saveCount = 0;
-  }, [sessionId, loading]);
-
-  const onReady = useCallback(async () => {
-    if (!(await isEditorLoaded(editorRef, sessionIdRef.current))) {
-      eSendEvent("webview_reset");
-    } else {
-      isDefaultEditor && restoreEditorState();
-    }
-  }, [isDefaultEditor, restoreEditorState]);
-
   const onLoad = useCallback(async () => {
-    if (currentNote.current) overlay(true);
-    clearTimeout(timers.current["editor:loaded"]);
-    timers.current["editor:loaded"] = setTimeout(async () => {
-      postMessage(EditorEvents.theme, theme || useThemeStore.getState().colors);
-      commands.setInsets(
-        isDefaultEditor ? insets : { top: 0, left: 0, right: 0, bottom: 0 }
-      );
-      await commands.setSessionId(sessionIdRef.current);
-      await onReady();
-      await commands.setSettings();
-      if (currentNote.current) {
-        loadNote({ ...currentNote.current, forced: true });
-      } else {
-        await commands.setPlaceholder(placeholderTip.current);
-      }
-      state.current.ready = true;
-    }, 300);
+    state.current.ready = true;
+    onReady();
+    postMessage(EditorEvents.theme, theme || useThemeStore.getState().colors);
+    commands.setInsets(
+      isDefaultEditor ? insets : { top: 0, left: 0, right: 0, bottom: 0 }
+    );
+    if (currentNote.current) {
+      loadNote({ ...currentNote.current, forced: true });
+    } else {
+      await commands.setPlaceholder(placeholderTip.current);
+    }
+    commands.setSettings();
   }, [
     onReady,
     postMessage,
@@ -622,10 +539,13 @@ export const useEditor = (
     commands,
     isDefaultEditor,
     insets,
-    loadNote,
-    overlay
+    loadNote
   ]);
 
+  const onContentChanged = () => {
+    lastContentChangeTime.current = Date.now();
+  };
+
   return {
     ref: editorRef,
     onLoad,
@@ -640,8 +560,6 @@ export const useEditor = (
     onReady,
     saveContent,
     onContentChanged,
-    editorId: editorId,
-    markImageLoaded,
-    overlay
+    editorId: editorId
   };
 };

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

@@ -73,8 +73,7 @@ export async function post<T>(
   ref: RefObject<WebView>,
   sessionId: string,
   type: string,
-  value: T | null = null,
-  waitFor = 300
+  value: T | null = null
 ) {
   if (!sessionId) {
     console.warn("post called without sessionId of type:", type);
@@ -86,7 +85,7 @@ export async function post<T>(
     sessionId: sessionId
   };
   setImmediate(() => ref.current?.postMessage(JSON.stringify(message)));
-  const response = await getResponse(type, waitFor);
+  const response = await getResponse(type);
   return response;
 }
 
@@ -98,8 +97,7 @@ type WebviewResponseData = {
 };
 
 export const getResponse = async (
-  type: string,
-  waitFor = 300
+  type: string
 ): Promise<WebviewResponseData | false> => {
   return new Promise((resolve) => {
     const callback = (data: WebviewResponseData) => {
@@ -109,7 +107,7 @@ export const getResponse = async (
     eSubscribeEvent(type, callback);
     setTimeout(() => {
       resolve(false);
-    }, waitFor);
+    }, 5000);
   });
 };
 

apps/mobile/app/screens/editor/wrapper.js

@@ -51,7 +51,6 @@ export const EditorWrapper = ({ width }) => {
     if (editorState().movedAway) return;
     if (state === "active") {
       editorController.current.onReady();
-      editorController.current.overlay(false);
     }
   };
 

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

@@ -65,6 +65,7 @@ export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {
     onBlur: () => false,
     delay: SettingsService.get().homepage === route.name ? 1 : -1
   });
+
   return (
     <DelayLayout wait={loading} delay={500}>
       <List

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

@@ -16,15 +16,18 @@ 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 { groupArray } from "@notesnook/core/utils/grouping";
+import qclone from "qclone";
 import React, { useEffect, useRef, useState } from "react";
 import { db } from "../../common/database";
+import { FloatingButton } from "../../components/container/floating-button";
 import DelayLayout from "../../components/delay-layout";
 import List from "../../components/list";
 import { NotebookHeader } from "../../components/list-items/headers/notebook-header";
-import { AddNotebookSheet } from "../../components/sheets/add-notebook";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
 import {
+  eSendEvent,
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../services/event-manager";
@@ -33,29 +36,28 @@ import SearchService from "../../services/search";
 import useNavigationStore, {
   NotebookScreenParams
 } from "../../stores/use-navigation-store";
-import { eOnNewTopicAdded } from "../../utils/events";
+import {
+  eOnNewTopicAdded,
+  eOpenAddNotebookDialog,
+  eOpenAddTopicDialog
+} from "../../utils/events";
 import { NotebookType } from "../../utils/types";
-import { openEditor, setOnFirstSave } from "../notes/common";
 const Notebook = ({ route, navigation }: NavigationProps<"Notebook">) => {
-  const [notes, setNotes] = useState(
+  const [topics, setTopics] = useState(
     groupArray(
-      db.relations?.from(route.params.item, "note") || [],
-      db.settings?.getGroupOptions("notes")
+      qclone(route?.params.item?.topics) || [],
+      db.settings?.getGroupOptions("topics")
     )
   );
   const params = useRef<NotebookScreenParams>(route?.params);
-
   useNavigationFocus(navigation, {
     onFocus: () => {
       Navigation.routeNeedsUpdate(route.name, onRequestUpdate);
       syncWithNavigation();
-      useNavigationStore.getState().setButtonAction(openEditor);
+      useNavigationStore.getState().setButtonAction(onPressFloatingButton);
       return false;
     },
-    onBlur: () => {
-      setOnFirstSave(null);
-      return false;
-    }
+    onBlur: () => false
   });
 
   const syncWithNavigation = React.useCallback(() => {
@@ -68,10 +70,6 @@ const Notebook = ({ route, navigation }: NavigationProps<"Notebook">) => {
       },
       params.current?.canGoBack
     );
-    setOnFirstSave({
-      type: "notebook",
-      id: params.current.item.id
-    });
     SearchService.prepareSearch = prepareSearch;
   }, [route.name]);
 
@@ -84,9 +82,11 @@ const Notebook = ({ route, navigation }: NavigationProps<"Notebook">) => {
           ?.data as NotebookType;
         if (notebook) {
           params.current.item = notebook;
-          const notes = db.relations?.from(notebook, "note");
-          setNotes(
-            groupArray(notes || [], db.settings?.getGroupOptions("notes"))
+          setTopics(
+            groupArray(
+              qclone(notebook.topics),
+              db.settings?.getGroupOptions("topics")
+            )
           );
           syncWithNavigation();
         }
@@ -102,62 +102,60 @@ const Notebook = ({ route, navigation }: NavigationProps<"Notebook">) => {
     return () => {
       eUnSubscribeEvent(eOnNewTopicAdded, onRequestUpdate);
     };
-  }, [onRequestUpdate]);
-
-  useEffect(() => {
-    return () => {
-      setOnFirstSave(null);
-    };
-  }, []);
+  }, [onRequestUpdate, topics]);
 
   const prepareSearch = () => {
     SearchService.update({
       placeholder: `Search in "${params.current.title}"`,
-      type: "notes",
+      type: "topics",
       title: params.current.title,
       get: () => {
         const notebook = db.notebooks?.notebook(params?.current?.item?.id)
           ?.data as NotebookType;
-        if (!notebook) return [];
-        return db.relations?.from(notebook, "note");
+        return notebook?.topics;
       }
     });
   };
 
+  const onPressFloatingButton = () => {
+    const n = params.current.item;
+    eSendEvent(eOpenAddTopicDialog, { notebookId: n.id });
+  };
+
   const PLACEHOLDER_DATA = {
     heading: params.current.item?.title,
-    paragraph: "You have not added any notes yet.",
-    button: "Add your first note",
-    action: openEditor,
-    loading: "Loading notebook notes"
+    paragraph: "You have not added any topics yet.",
+    button: "Add first topic",
+    action: onPressFloatingButton,
+    loading: "Loading notebook topics"
   };
 
   return (
-    <>
-      <DelayLayout>
-        <List
-          listData={notes}
-          type="notes"
-          refreshCallback={() => {
-            onRequestUpdate();
-          }}
-          screen="Notebook"
-          headerProps={{
-            heading: params.current.title
-          }}
-          loading={false}
-          ListHeader={
-            <NotebookHeader
-              onEditNotebook={() => {
-                AddNotebookSheet.present(params.current.item);
-              }}
-              notebook={params.current.item}
-            />
-          }
-          placeholderData={PLACEHOLDER_DATA}
-        />
-      </DelayLayout>
-    </>
+    <DelayLayout>
+      <List
+        listData={topics}
+        type="topics"
+        refreshCallback={() => {
+          onRequestUpdate();
+        }}
+        screen="Notebook"
+        headerProps={{
+          heading: params.current.title
+        }}
+        loading={false}
+        ListHeader={
+          <NotebookHeader
+            onEditNotebook={() => {
+              eSendEvent(eOpenAddNotebookDialog, params.current.item);
+            }}
+            notebook={params.current.item}
+          />
+        }
+        placeholderData={PLACEHOLDER_DATA}
+      />
+
+      <FloatingButton title="Add new topic" onPress={onPressFloatingButton} />
+    </DelayLayout>
   );
 };
 

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

@@ -18,12 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React from "react";
-import { Config } from "react-native-config";
 import { db } from "../../common/database";
 import { FloatingButton } from "../../components/container/floating-button";
 import DelayLayout from "../../components/delay-layout";
+import { AddNotebookEvent } from "../../components/dialog-provider/recievers";
 import List from "../../components/list";
-import { AddNotebookSheet } from "../../components/sheets/add-notebook";
 import { Walkthrough } from "../../components/walkthroughs";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
 import Navigation, { NavigationProps } from "../../services/navigation";
@@ -31,9 +30,10 @@ import SearchService from "../../services/search";
 import SettingsService from "../../services/settings";
 import useNavigationStore from "../../stores/use-navigation-store";
 import { useNotebookStore } from "../../stores/use-notebook-store";
+import { Config } from "react-native-config";
 
 const onPressFloatingButton = () => {
-  AddNotebookSheet.present();
+  AddNotebookEvent();
 };
 
 const prepareSearch = () => {
@@ -83,7 +83,7 @@ export const Notebooks = ({
   });
 
   return (
-    <DelayLayout delay={1}>
+    <DelayLayout>
       <List
         listData={notebooks}
         type="notebooks"

apps/mobile/app/screens/notes/common.ts

@@ -24,7 +24,7 @@ import Navigation from "../../services/navigation";
 import { useMenuStore } from "../../stores/use-menu-store";
 import { NotesScreenParams } from "../../stores/use-navigation-store";
 import { useTagStore } from "../../stores/use-tag-store";
-import { eOnLoadNote, eOnTopicSheetUpdate } from "../../utils/events";
+import { eOnLoadNote } from "../../utils/events";
 import { openLinkInBrowser } from "../../utils/functions";
 import { tabBarRef } from "../../utils/global-refs";
 import { TopicType } from "../../utils/types";
@@ -81,22 +81,12 @@ export const setOnFirstSave = (
     editorState().onNoteCreated = null;
     return;
   }
-  setTimeout(() => {
-    editorState().onNoteCreated = (id) => onNoteCreated(id, data);
-  }, 0);
+  editorState().onNoteCreated = (id) => onNoteCreated(id, data);
 };
 
 async function onNoteCreated(id: string, params: FirstSaveData) {
   if (!params) return;
   switch (params.type) {
-    case "notebook": {
-      await db.relations?.add(
-        { type: "notebook", id: params.id },
-        { type: "note", id: id }
-      );
-      editorState().onNoteCreated = null;
-      break;
-    }
     case "topic": {
       if (!params.notebook) break;
       await db.notes?.addToNotebook(
@@ -107,18 +97,40 @@ async function onNoteCreated(id: string, params: FirstSaveData) {
         id
       );
       editorState().onNoteCreated = null;
-      eSendEvent(eOnTopicSheetUpdate);
+      Navigation.queueRoutesForUpdate(
+        "TaggedNotes",
+        "ColoredNotes",
+        "TopicNotes",
+        "Favorites",
+        "Notes",
+        "Notebook",
+        "Notebooks"
+      );
       break;
     }
     case "tag": {
       await db.notes?.note(id).tag(params.id);
       editorState().onNoteCreated = null;
+      Navigation.queueRoutesForUpdate(
+        "TaggedNotes",
+        "ColoredNotes",
+        "TopicNotes",
+        "Favorites",
+        "Notes"
+      );
       useTagStore.getState().setTags();
       break;
     }
     case "color": {
       await db.notes?.note(id).color(params.color);
       editorState().onNoteCreated = null;
+      Navigation.queueRoutesForUpdate(
+        "TaggedNotes",
+        "ColoredNotes",
+        "TopicNotes",
+        "Favorites",
+        "Notes"
+      );
       useMenuStore.getState().setColorNotes();
       break;
     }
@@ -126,5 +138,4 @@ async function onNoteCreated(id: string, params: FirstSaveData) {
       break;
     }
   }
-  Navigation.queueRoutesForUpdate();
 }

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

@@ -18,13 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useEffect, useRef, useState } from "react";
-import { View } from "react-native";
-import { db } from "../../common/database";
 import { FloatingButton } from "../../components/container/floating-button";
 import DelayLayout from "../../components/delay-layout";
 import List from "../../components/list";
-import { IconButton } from "../../components/ui/icon-button";
-import Paragraph from "../../components/ui/typography/paragraph";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
 import {
   eSubscribeEvent,
@@ -38,9 +34,7 @@ import useNavigationStore, {
   RouteName
 } from "../../stores/use-navigation-store";
 import { useNoteStore } from "../../stores/use-notes-store";
-import { SIZE } from "../../utils/size";
 import { NoteType, TopicType } from "../../utils/types";
-import Notebook from "../notebook/index";
 import {
   getAlias,
   openEditor,
@@ -104,11 +98,7 @@ const NotesPage = ({
   const [loadingNotes, setLoadingNotes] = useState(false);
   const alias = getAlias(params.current);
   const isMonograph = route.name === "Monographs";
-  const notebook =
-    route.name === "TopicNotes" && (params.current.item as TopicType).notebookId
-      ? db.notebooks?.notebook((params.current.item as TopicType).notebookId)
-          ?.data
-      : null;
+
   const isFocused = useNavigationFocus(navigation, {
     onFocus: (prev) => {
       Navigation.routeNeedsUpdate(route.name, onRequestUpdate);
@@ -181,13 +171,11 @@ const NotesPage = ({
         if (isNew) setLoadingNotes(true);
         const notes = get(params.current, true) as NoteType[];
         if (
-          ((item.type === "tag" || item.type === "color") &&
-            (!notes || notes.length === 0)) ||
-          (item.type === "topic" && !notes)
+          (item.type === "tag" || item.type === "color") &&
+          (!notes || notes.length === 0)
         ) {
           return Navigation.goBack();
         }
-        if (notes.length === 0) setLoadingNotes(false);
         setNotes(notes);
         syncWithNavigation();
       } catch (e) {
@@ -199,7 +187,7 @@ const NotesPage = ({
 
   useEffect(() => {
     if (loadingNotes) {
-      setTimeout(() => setLoadingNotes(false), 50);
+      setTimeout(() => setLoadingNotes(false), 300);
     }
   }, [loadingNotes, notes]);
 
@@ -220,49 +208,6 @@ const NotesPage = ({
       }
       wait={loading || loadingNotes}
     >
-      {route.name === "TopicNotes" ? (
-        <View
-          style={{
-            width: "100%",
-            paddingHorizontal: 12,
-            flexDirection: "row",
-            alignItems: "center"
-            // borderBottomWidth: 1,
-            // borderBottomColor: colors.nav
-          }}
-        >
-          <Paragraph
-            onPress={() => {
-              Navigation.navigate(
-                {
-                  name: "Notebooks"
-                },
-                {}
-              );
-            }}
-            size={SIZE.xs}
-          >
-            Notebooks
-          </Paragraph>
-          {notebook ? (
-            <>
-              <IconButton
-                name="chevron-right"
-                size={14}
-                customStyle={{ width: 25, height: 25 }}
-              />
-              <Paragraph
-                onPress={() => {
-                  Notebook.navigate(notebook, true);
-                }}
-                size={SIZE.xs}
-              >
-                {notebook.title}
-              </Paragraph>
-            </>
-          ) : null}
-        </View>
-      ) : null}
       <List
         listData={notes}
         type="notes"
@@ -279,9 +224,7 @@ const NotesPage = ({
         placeholderData={placeholderData}
       />
 
-      {!isMonograph &&
-      route.name !== "TopicNotes" &&
-      (notes?.length > 0 || isFocused) ? (
+      {notes?.length > 0 || (isFocused && !isMonograph) ? (
         <FloatingButton title="Create a note" onPress={onPressFloatingButton} />
       ) : null}
     </DelayLayout>