Merge pull request #10299 from streetwriters/release/3.4.7

web: bump version to 3.4.7

apps/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.4.6",
+      "version": "3.4.7",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",

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

@@ -167,7 +167,7 @@ const ReminderItem = React.memo(
           </View>
         </View>
 
-        {selectionMode === "note" || selectionMode === "trash" ? (
+        {selectionMode === "reminder" || selectionMode === "trash" ? (
           <>
             <View
               style={{

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

@@ -209,7 +209,6 @@ export const useEditorEvents = (
     };
   }, [editor, editor.commands, editor.postMessage]);
   useEffect(() => {
-    if (loading) return;
     if (typeof defaultFontFamily === "object") {
       SettingsService.set({
         defaultFontFamily: (defaultFontFamily as any).id
@@ -231,9 +230,9 @@ export const useEditorEvents = (
           ? parseInt(defaultFontSize)
           : defaultFontSize,
       fontFamily: SettingsService.get().defaultFontFamily,
-      dateFormat: db.settings?.getDateFormat(),
-      timeFormat: db.settings?.getTimeFormat(),
-      dayFormat: db.settings?.getDayFormat(),
+      dateFormat: dateFormat,
+      timeFormat: timeFormat,
+      dayFormat: dayFormat,
       fontScale,
       markdownShortcuts,
       features,

apps/mobile/app/screens/search/search-bar.tsx

@@ -84,7 +84,7 @@ export const SearchBar = ({
           style={{
             fontSize: AppFontSize.sm,
             fontFamily: "Inter-Regular",
-            flexGrow: 1,
+            flex: 1,
             color: colors.primary.paragraph,
             paddingTop: 0,
             paddingBottom: 0

apps/mobile/app/stores/use-setting-store.ts

@@ -206,7 +206,7 @@ export const defaultSettings: SettingStore["settings"] = {
   colorScheme: "light",
   lighTheme: ThemeLight,
   darkTheme: ThemeDark,
-  markdownShortcuts: true,
+  markdownShortcuts: false,
   biometricsAuthEnabled: false,
   appLockHasPasswordSecurity: false,
   backgroundSync: true,
@@ -264,7 +264,7 @@ export const useSettingStore = create<SettingStore>((set, get) => ({
     set({
       dayFormat: db.settings.getDayFormat(),
       timeFormat: db.settings.getTimeFormat(),
-      dateFormat: db.settings?.getTimeFormat(),
+      dateFormat: db.settings?.getDateFormat(),
       weekFormat: db.settings.getWeekFormat(),
       vaultLockAfter: db.settings.getVaultLockAfter(),
       inboxEnabled: await db.user.hasInboxKeys()

apps/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "3.4.6",
+      "version": "3.4.7",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/web/package.json

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

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

@@ -956,7 +956,15 @@ const Tiptap = ({
         </div>
 
         <TiptapEditorWrapper
-          key={tick + tab.id + "-editor"}
+          key={[
+            tick,
+            tab.id,
+            settings.doubleSpacedLines ? "ds" : "ss",
+            settings.dateFormat,
+            settings.timeFormat,
+            settings.dayFormat,
+            tab.session?.readonly ? "readonly" : "edit"
+          ].join("-")}
           options={tiptapOptions}
           settings={settings}
           onEditorUpdate={(editor) => {

packages/editor-mobile/src/hooks/useSettings.ts

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { getDefaultPresets } from "@notesnook/editor";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Settings } from "../utils";
 
 const settingsJson = localStorage.getItem("editorSettings");
@@ -74,5 +74,14 @@ export const useSettings = (): Settings => {
   });
   global.settingsController.set = setSettings;
 
+  useEffect(() => {
+    setSettings((current) =>
+      JSON.stringify(current) ===
+      JSON.stringify(global.settingsController.previous)
+        ? current
+        : { ...global.settingsController.previous }
+    );
+  }, []);
+
   return settings;
 };

packages/editor/src/index.ts

@@ -424,7 +424,13 @@ const useTiptap = (
       timeFormat,
       editorProps,
       copyToClipboard,
-      createInternalLink
+      createInternalLink,
+      dayFormat,
+      doubleSpacedLines,
+      enableFontLigatures,
+      getLinkData,
+      downloadCsvTable,
+      options.placeholder
     ]
   );
 

packages/editor/src/toolbar/tool-definitions.ts

@@ -399,6 +399,13 @@ export const READONLY_MOBILE_STATIC_TOOLBAR_GROUPS: ToolbarDefinition = [
   ]
 ];
 
+export const READONLY_MOBILE_TOOLBAR_NODES = [
+  "image",
+  "attachment",
+  "webclip",
+  "link"
+];
+
 const defaultPresets: Record<"default" | "minimal", ToolbarDefinition> = {
   default: [
     [

packages/editor/src/toolbar/toolbar.tsx

@@ -22,7 +22,8 @@ import {
   getDefaultPresets,
   STATIC_TOOLBAR_GROUPS,
   MOBILE_STATIC_TOOLBAR_GROUPS,
-  READONLY_MOBILE_STATIC_TOOLBAR_GROUPS
+  READONLY_MOBILE_STATIC_TOOLBAR_GROUPS,
+  READONLY_MOBILE_TOOLBAR_NODES
 } from "./tool-definitions.js";
 import { useEffect, useMemo } from "react";
 import { Editor } from "../types.js";
@@ -67,6 +68,11 @@ export function Toolbar(props: ToolbarProps) {
     [tools, editor.isEditable, isMobile]
   );
 
+  const isEmptyReadonlyToolbar =
+    isMobile &&
+    !editor.isEditable &&
+    !READONLY_MOBILE_TOOLBAR_NODES.some((node) => editor.isActive(node));
+
   const setToolbarLocation = useToolbarStore(
     (store) => store.setToolbarLocation
   );
@@ -89,33 +95,35 @@ export function Toolbar(props: ToolbarProps) {
 
   return (
     <>
-      <Flex
-        className={["editor-toolbar", className].join(" ")}
-        sx={{
-          flexWrap: isMobile ? "nowrap" : "wrap",
-          overflowX: isMobile ? "auto" : "hidden",
-          bg: "background",
-          borderRadius: isMobile ? "0px" : "default",
-          ...sx
-        }}
-        {...flexProps}
-      >
-        {toolbarTools.map((tools) => {
-          return (
-            <ToolbarGroup
-              key={tools.join("")}
-              tools={tools}
-              editor={editor}
-              groupId={tools.join("")}
-              sx={{
-                borderRight: "1px solid var(--separator)",
-                ":last-of-type": { borderRight: "none" },
-                alignItems: "center"
-              }}
-            />
-          );
-        })}
-      </Flex>
+      {isEmptyReadonlyToolbar ? null : (
+        <Flex
+          className={["editor-toolbar", className].join(" ")}
+          sx={{
+            flexWrap: isMobile ? "nowrap" : "wrap",
+            overflowX: isMobile ? "auto" : "hidden",
+            bg: "background",
+            borderRadius: isMobile ? "0px" : "default",
+            ...sx
+          }}
+          {...flexProps}
+        >
+          {toolbarTools.map((tools) => {
+            return (
+              <ToolbarGroup
+                key={tools.join("")}
+                tools={tools}
+                editor={editor}
+                groupId={tools.join("")}
+                sx={{
+                  borderRight: "1px solid var(--separator)",
+                  ":last-of-type": { borderRight: "none" },
+                  alignItems: "center"
+                }}
+              />
+            );
+          })}
+        </Flex>
+      )}
       <EditorFloatingMenus editor={editor} />
     </>
   );