Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-02-24 04:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

mobile: fix realtime sync editor updates in tabs

Browse Source
This commit is contained in:
Ammar Ahmed
2025-02-03 15:38:17 +05:00
parent 5c3136d07d
commit 7df1037e3f
3 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
apps/mobile/app/screens/editor/tiptap/use-editor.ts
View File

@@ -738,35 +738,37 @@ export const useEditor = (
lock.current = true;
// Handle this case where note was locked on another device and synced.
const locked = note
let locked = note
? await db.vaults.itemExists(note as ItemReference)
: false;
if (data.type === "tiptap") {
locked = data.locked;
}
useTabStore.getState().forEachNoteTab(noteId, async (tab) => {
const tabId = tab.id;
let didUnlock = false;
if (note) {
if (!locked && tab?.session?.noteLocked) {
// Note lock removed.
if (tab.session?.locked) {
if (useTabStore.getState().currentTab === tabId) {
eSendEvent(eOnLoadNote, {
item: note
});
} else {
useTabStore.getState().updateTab(tabId, {
session: {
locked: false,
noteLocked: false
}
});
if (tab?.session?.noteLocked || tab?.session?.locked) {
if (useTabStore.getState().currentTab !== tabId) {
localTabState.current?.set(tabId, {
editedAt: 0
});
}
didUnlock = true;
useTabStore.getState().updateTab(tabId, {
session: {
locked: false,
noteLocked: false
}
});
}
} else if (!tab?.session?.noteLocked && locked) {
// Note lock added.
useTabStore.getState().updateTab(tabId, {
session: {
locked: true,
@@ -782,18 +784,24 @@ export const useEditor = (
});
}
if (currentNotes.current[noteId]?.title !== note.title) {
if (
currentNotes.current[noteId]?.title !== note.title ||
didUnlock
) {
postMessage(NativeEvents.title, note.title, tabId);
}
commands.setTags(note);
if (currentNotes.current[noteId]?.dateEdited !== note.dateEdited) {
if (
currentNotes.current[noteId]?.dateEdited !== note.dateEdited ||
didUnlock
) {
commands.setStatus(
getFormattedDate(note.dateEdited, "date-time"),
strings.saved(),
tabId as string
);
}
if (tab.session?.readonly !== note.readonly) {
if (tab.session?.readonly !== note.readonly || didUnlock) {
useTabStore.getState().updateTab(tabId, {
session: {
readonly: note.readonly
@@ -803,7 +811,10 @@ export const useEditor = (
}
if (data.type === "tiptap" && note && !isLocal) {
if (lastContentChangeTime.current[noteId] >= data.dateModified) {
if (
lastContentChangeTime.current[noteId] >= data.dateModified &&
!didUnlock
) {
return;
}
@@ -823,18 +834,35 @@ export const useEditor = (
} else {
await postMessage(
NativeEvents.updatehtml,
decryptedContent.data,
{
data: decryptedContent.data,
selection: tab.session?.selection,
scrollTop: tab.session?.scrollTop
},
tabId
);
currentContents.current[note.id] = decryptedContent;
}
} else {
const _nextContent = data.data;
if (_nextContent === currentContents.current[note.id]?.data) {
if (
_nextContent === currentContents.current[note.id]?.data &&
!didUnlock
) {
return;
}
lastContentChangeTime.current[note.id] = note.dateEdited;
await postMessage(NativeEvents.updatehtml, _nextContent, tabId);
console.log(tab.session?.selection);
await postMessage(
NativeEvents.updatehtml,
{
data: _nextContent,
selection: tab.session?.selection,
scrollTop: tab.session?.scrollTop
},
tabId
);
if (!isEncryptedContent(data)) {
currentContents.current[note.id] =
data as UnencryptedContentItem;

1
apps/mobile/native/android/app/src/main/AndroidManifest.xml
View File

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

29
packages/editor-mobile/src/components/editor.tsx
View File

@@ -205,9 +205,18 @@ const Tiptap = ({
if (tabRef.current.session?.noteId) {
clearTimeout(noteStateUpdateTimer.current);
noteStateUpdateTimer.current = setTimeout(() => {
const { to, from } =
editors[tabRef.current?.id]?.state.selection || {};
}, 500);
post(
EditorEvents.saveScroll,
{
selection: {
to: editors[tabRef.current.id]?.state.selection.to,
from: editors[tabRef.current.id]?.state.selection.from
}
},
tabRef.current.id,
tabRef.current.session?.noteId
);
}, 300);
}
},
onCreate() {
@@ -547,7 +556,7 @@ const Tiptap = ({
</>
)}
{controller.loading || tab.session?.locked ? (
{controller.loading || tab.session?.noteLocked ? (
<div
style={{
width: "100%",
@@ -559,13 +568,15 @@ const Tiptap = ({
paddingLeft: 12,
display: "flex",
flexDirection: "column",
alignItems: tab.session?.locked ? "center" : "flex-start",
justifyContent: tab.session?.locked ? "center" : "flex-start",
alignItems: tab.session?.noteLocked ? "center" : "flex-start",
justifyContent: tab.session?.noteLocked
? "center"
: "flex-start",
boxSizing: "border-box",
rowGap: 10
}}
>
{tab.session?.locked ? (
{tab.session?.noteLocked ? (
<>
<p
style={{
@@ -605,7 +616,9 @@ const Tiptap = ({
style={{
display: "flex",
flexDirection: "column",
rowGap: 10
rowGap: 10,
justifyContent: "center",
alignItems: "center"
}}
>
<input