Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: fix editor settings not applying properly on random basis

Ammar Ahmed65b5652fa659
diff --git a/apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx b/apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx
index e1c8cac84..4bac6fc6a 100644
--- a/apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx
+++ b/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
diff --git a/packages/editor-mobile/src/hooks/useSettings.ts b/packages/editor-mobile/src/hooks/useSettings.ts
index ba37adc15..fe69edc56 100644
--- a/packages/editor-mobile/src/hooks/useSettings.ts
+++ b/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;
};
diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts
index 18f720993..66603b734 100644
--- a/packages/editor/src/index.ts
+++ b/packages/editor/src/index.ts
@@ -424,7 +424,13 @@ const useTiptap = (
timeFormat,
editorProps,
copyToClipboard,
- createInternalLink
+ createInternalLink,
+ dayFormat,
+ doubleSpacedLines,
+ enableFontLigatures,
+ getLinkData,
+ downloadCsvTable,
+ options.placeholder
]
);