Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 06:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

migrate to queueRoutesForUpdate

Browse Source
This commit is contained in:
ammarahm-ed
2022-04-24 16:30:49 +05:00
parent 496f550a19
commit e10ea84b0e
3 changed files with 148 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
apps/mobile/src/screens/editor/Functions.js
View File

@@ -625,12 +625,15 @@ export const _onMessage = async evt => {
let _tag = JSON.parse(message.value); let _tag = JSON.parse(message.value);
console.log(_tag.title); console.log(_tag.title);
await db.notes.note(note.id).untag(_tag.title); await db.notes.note(note.id).untag(_tag.title);
useTagStore.getState().setTags(); useTagStore.getState().setTags();
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Notes, 'TaggedNotes',
Navigation.routeNames.NotesPage, 'ColoredNotes',
Navigation.routeNames.Tags 'TopicNotes',
]); 'Favorites',
'Notes'
);
} }
break; break;
case 'newtag': case 'newtag':
@@ -732,11 +735,14 @@ async function addToCollection(id) {
editing.actionAfterFirstSave = { editing.actionAfterFirstSave = {
type: null type: null
}; };
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Notebooks, 'TaggedNotes',
Navigation.routeNames.TopicNotes, 'ColoredNotes',
Navigation.routeNames.Notebook 'TopicNotes',
]); 'Favorites',
'Notes',
'Notebook'
);
break; break;
} }
case 'tag': { case 'tag': {
@@ -744,10 +750,13 @@ async function addToCollection(id) {
editing.actionAfterFirstSave = { editing.actionAfterFirstSave = {
type: null type: null
}; };
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Tags, 'TaggedNotes',
Navigation.routeNames.TaggedNotes 'ColoredNotes',
]); 'TopicNotes',
'Favorites',
'Notes'
);
eSendEvent('updateTags'); eSendEvent('updateTags');
break; break;
} }
@@ -757,7 +766,13 @@ async function addToCollection(id) {
editing.actionAfterFirstSave = { editing.actionAfterFirstSave = {
type: null type: null
}; };
Navigation.queueRoutesForUpdate([Navigation.routeNames.ColoredNotes]); Navigation.queueRoutesForUpdate(
'TaggedNotes',
'ColoredNotes',
'TopicNotes',
'Favorites',
'Notes'
);
useMenuStore.getState().setColorNotes(); useMenuStore.getState().setColorNotes();
break; break;
} }
@@ -821,12 +836,13 @@ export async function saveNote(title, _id, data, type, _sessionId, _historySessi
if (!locked) { if (!locked) {
let noteId = await db.notes.add(noteData); let noteId = await db.notes.add(noteData);
if (!_id || saveCounter < 3) { if (!_id || saveCounter < 3) {
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Notes, 'TaggedNotes',
Navigation.routeNames.Favorites, 'ColoredNotes',
Navigation.routeNames.NotesPage, 'TopicNotes',
Navigation.routeNames.Notebook 'Favorites',
]); 'Notes'
);
} }
if (!_id) { if (!_id) {
if (sessionId === _sessionId) id = noteId; if (sessionId === _sessionId) id = noteId;
@@ -851,11 +867,13 @@ export async function saveNote(title, _id, data, type, _sessionId, _historySessi
await db.vault.save(noteData); await db.vault.save(noteData);
} }
if (sessionId === _sessionId) { if (sessionId === _sessionId) {
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.NotesPage, 'TaggedNotes',
Navigation.routeNames.Favorites, 'ColoredNotes',
Navigation.routeNames.Notes 'TopicNotes',
]); 'Favorites',
'Notes'
);
lastEditTime = n + 10; lastEditTime = n + 10;
let n = db.notes.note(_id)?.data?.dateEdited; let n = db.notes.note(_id)?.data?.dateEdited;

42
apps/mobile/src/utils/functions.js
View File

@@ -45,7 +45,13 @@ export const deleteItems = async item => {
await db.notes.delete(...ids); await db.notes.delete(...ids);
Navigation.queueRoutesForUpdate([Navigation.routeNames.Notes, Navigation.routeNames.NotesPage]); Navigation.queueRoutesForUpdate(
'TaggedNotes',
'ColoredNotes',
'TopicNotes',
'Favorites',
'Notes'
);
eSendEvent(eClearEditor); eSendEvent(eClearEditor);
} }
if (topics?.length > 0) { if (topics?.length > 0) {
@@ -55,10 +61,7 @@ export const deleteItems = async item => {
} }
// layoutmanager.withAnimation(150); // layoutmanager.withAnimation(150);
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate('Notebook', 'Notebooks');
Navigation.routeNames.Notebooks,
Navigation.routeNames.Notebook
]);
useMenuStore.getState().setMenuPins(); useMenuStore.getState().setMenuPins();
ToastEvent.show({ ToastEvent.show({
heading: 'Topics deleted', heading: 'Topics deleted',
@@ -71,7 +74,14 @@ export const deleteItems = async item => {
await db.notebooks.delete(...ids); await db.notebooks.delete(...ids);
//layoutmanager.withAnimation(150); //layoutmanager.withAnimation(150);
Navigation.queueRoutesForUpdate([Navigation.routeNames.Notebooks, Navigation.routeNames.Notes]); Navigation.queueRoutesForUpdate(
'TaggedNotes',
'ColoredNotes',
'TopicNotes',
'Favorites',
'Notes',
'Notebooks'
);
useMenuStore.getState().setMenuPins(); useMenuStore.getState().setMenuPins();
} }
@@ -94,14 +104,16 @@ export const deleteItems = async item => {
await db.trash.restore(...ids); await db.trash.restore(...ids);
//layoutmanager.withAnimation(150); //layoutmanager.withAnimation(150);
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Notebooks, 'TaggedNotes',
Navigation.routeNames.Notes, 'ColoredNotes',
Navigation.routeNames.Trash, 'TopicNotes',
Navigation.routeNames.NotesPage, 'Favorites',
Navigation.routeNames.Notebook, 'Notes',
Navigation.routeNames.Trash 'Notebook',
]); 'Notebooks',
'Trash'
);
useMenuStore.getState().setMenuPins(); useMenuStore.getState().setMenuPins();
useMenuStore.getState().setColorNotes(); useMenuStore.getState().setColorNotes();
ToastEvent.hide(); ToastEvent.hide();
@@ -110,7 +122,7 @@ export const deleteItems = async item => {
}); });
} }
history.selectedItemsList = []; history.selectedItemsList = [];
Navigation.queueRoutesForUpdate([Navigation.routeNames.Trash]); Navigation.queueRoutesForUpdate('Trash');
useSelectionStore.getState().clearSelection(true); useSelectionStore.getState().clearSelection(true);
useMenuStore.getState().setMenuPins(); useMenuStore.getState().setMenuPins();
useMenuStore.getState().setColorNotes(); useMenuStore.getState().setColorNotes();

128
apps/mobile/src/utils/hooks/useActions.js
View File

@@ -123,11 +123,13 @@ export const useActions = ({ close = () => {}, item }) => {
if (!item.id) return; if (!item.id) return;
close(); close();
await db.notes.note(item.id).favorite(); await db.notes.note(item.id).favorite();
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.NotesPage, 'TaggedNotes',
Navigation.routeNames.Favorites, 'ColoredNotes',
Navigation.routeNames.Notes 'TopicNotes',
]); 'Favorites',
'Notes'
);
} }
async function pinItem() { async function pinItem() {
@@ -142,7 +144,14 @@ export const useActions = ({ close = () => {}, item }) => {
return; return;
} }
await db[`${type}s`][type](item.id).pin(); await db[`${type}s`][type](item.id).pin();
Navigation.queueRoutesForUpdate([Navigation.routeNames.Notebooks, Navigation.routeNames.Notes]); Navigation.queueRoutesForUpdate(
'TaggedNotes',
'ColoredNotes',
'TopicNotes',
'Favorites',
'Notes',
'Notebooks'
);
} }
async function pinToNotifications() { async function pinToNotifications() {
@@ -178,14 +187,14 @@ export const useActions = ({ close = () => {}, item }) => {
if (!checkNoteSynced()) return; if (!checkNoteSynced()) return;
close(); close();
await db.trash.restore(item.id); await db.trash.restore(item.id);
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Tags, 'TaggedNotes',
Navigation.routeNames.Notes, 'ColoredNotes',
Navigation.routeNames.Notebooks, 'TopicNotes',
Navigation.routeNames.NotesPage, 'Favorites',
Navigation.routeNames.Favorites, 'Notes',
Navigation.routeNames.Trash 'Notebooks'
]); );
let type = item.type === 'trash' ? item.itemType : item.type; let type = item.type === 'trash' ? item.itemType : item.type;
ToastEvent.show({ ToastEvent.show({
heading: type === 'note' ? 'Note restored from trash' : 'Notebook restored from trash', heading: type === 'note' ? 'Note restored from trash' : 'Notebook restored from trash',
@@ -299,11 +308,13 @@ export const useActions = ({ close = () => {}, item }) => {
let note = db.notes.note(item.id).data; let note = db.notes.note(item.id).data;
if (note.locked) { if (note.locked) {
close(); close();
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.NotesPage, 'TaggedNotes',
Navigation.routeNames.Favorites, 'ColoredNotes',
Navigation.routeNames.Notes 'TopicNotes',
]); 'Favorites',
'Notes'
);
} }
} catch (e) { } catch (e) {
close(); close();
@@ -361,11 +372,14 @@ export const useActions = ({ close = () => {}, item }) => {
await db.tags.rename(item.id, db.tags.sanitize(value)); await db.tags.rename(item.id, db.tags.sanitize(value));
useTagStore.getState().setTags(); useTagStore.getState().setTags();
useMenuStore.getState().setMenuPins(); useMenuStore.getState().setMenuPins();
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Notes, 'TaggedNotes',
Navigation.routeNames.NotesPage, 'ColoredNotes',
Navigation.routeNames.Tags 'TopicNotes',
]); 'Favorites',
'Notes',
'Tags'
);
}, },
input: true, input: true,
defaultValue: alias, defaultValue: alias,
@@ -407,11 +421,14 @@ export const useActions = ({ close = () => {}, item }) => {
positivePress: async value => { positivePress: async value => {
await db.tags.remove(item.id); await db.tags.remove(item.id);
useTagStore.getState().setTags(); useTagStore.getState().setTags();
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Notes, 'TaggedNotes',
Navigation.routeNames.NotesPage, 'ColoredNotes',
Navigation.routeNames.Tags 'TopicNotes',
]); 'Favorites',
'Notes',
'Tags'
);
}, },
positiveText: 'Delete', positiveText: 'Delete',
positiveType: 'errorShade' positiveType: 'errorShade'
@@ -441,12 +458,15 @@ export const useActions = ({ close = () => {}, item }) => {
.notebook(editing.actionAfterFirstSave.notebook) .notebook(editing.actionAfterFirstSave.notebook)
.topics.topic(editing.actionAfterFirstSave.id) .topics.topic(editing.actionAfterFirstSave.id)
.delete(item.id); .delete(item.id);
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.Notebooks, 'TaggedNotes',
Navigation.routeNames.Notes, 'ColoredNotes',
Navigation.routeNames.NotesPage, 'TopicNotes',
Navigation.routeNames.Notebook 'Favorites',
]); 'Notes',
'Notebook',
'Notebooks'
);
close(); close();
} }
@@ -461,7 +481,7 @@ export const useActions = ({ close = () => {}, item }) => {
negativeText: 'Cancel', negativeText: 'Cancel',
positivePress: async () => { positivePress: async () => {
await db.trash.delete(item.id); await db.trash.delete(item.id);
Navigation.queueRoutesForUpdate([Navigation.routeNames.Trash]); Navigation.queueRoutesForUpdate('Trash');
useSelectionStore.getState().setSelectionMode(false); useSelectionStore.getState().setSelectionMode(false);
ToastEvent.show({ ToastEvent.show({
heading: 'Permanantly deleted items', heading: 'Permanantly deleted items',
@@ -496,11 +516,13 @@ export const useActions = ({ close = () => {}, item }) => {
async function toggleLocalOnly() { async function toggleLocalOnly() {
if (!checkNoteSynced()) return; if (!checkNoteSynced()) return;
db.notes.note(item.id).localOnly(); db.notes.note(item.id).localOnly();
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.NotesPage, 'TaggedNotes',
Navigation.routeNames.Favorites, 'ColoredNotes',
Navigation.routeNames.Notes 'TopicNotes',
]); 'Favorites',
'Notes'
);
close(); close();
} }
@@ -511,22 +533,26 @@ export const useActions = ({ close = () => {}, item }) => {
useEditorStore.getState().setReadonly(current); useEditorStore.getState().setReadonly(current);
tiny.call(EditorWebView, tiny.toogleReadMode(current ? 'readonly' : 'design')); tiny.call(EditorWebView, tiny.toogleReadMode(current ? 'readonly' : 'design'));
} }
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.NotesPage, 'TaggedNotes',
Navigation.routeNames.Favorites, 'ColoredNotes',
Navigation.routeNames.Notes 'TopicNotes',
]); 'Favorites',
'Notes'
);
close(); close();
}; };
const duplicateNote = async () => { const duplicateNote = async () => {
if (!checkNoteSynced()) return; if (!checkNoteSynced()) return;
await db.notes.note(item.id).duplicate(); await db.notes.note(item.id).duplicate();
Navigation.queueRoutesForUpdate([ Navigation.queueRoutesForUpdate(
Navigation.routeNames.NotesPage, 'TaggedNotes',
Navigation.routeNames.Favorites, 'ColoredNotes',
Navigation.routeNames.Notes 'TopicNotes',
]); 'Favorites',
'Notes'
);
close(); close();
}; };