From f815dd60cae1c3f59f031cb976e461590c439bbf Mon Sep 17 00:00:00 2001 From: thecodrr Date: Tue, 7 Apr 2020 11:53:08 +0500 Subject: [PATCH] fix: favorites not opening --- .../src/navigation/navigators/rootnavigator.js | 17 ++++++++++++----- apps/web/src/views/Notes.js | 18 +++++++++++++----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/apps/web/src/navigation/navigators/rootnavigator.js b/apps/web/src/navigation/navigators/rootnavigator.js index 6c32fe0ea..7dd306abb 100644 --- a/apps/web/src/navigation/navigators/rootnavigator.js +++ b/apps/web/src/navigation/navigators/rootnavigator.js @@ -45,11 +45,18 @@ export const routes = { ...createRoute("notebooks", NotebooksContainer, { icon: Icon.Notebook, }), - ...createNormalRoute("favorites", Notes, Icon.StarOutline, { - title: "Favorites", - options: SelectionModeOptions.FavoritesOptions, - context: { type: "favorites" }, - }), + ...createRoute( + "favorites", + Notes, + { + icon: Icon.StarOutline, + title: "Favorites", + options: SelectionModeOptions.FavoritesOptions, + }, + { + context: { type: "favorites" }, + } + ), ...createNormalRoute("trash", Trash, Icon.Trash, { title: "Trash", options: SelectionModeOptions.TrashOptions, diff --git a/apps/web/src/views/Notes.js b/apps/web/src/views/Notes.js index 616b3e262..c54655e1c 100644 --- a/apps/web/src/views/Notes.js +++ b/apps/web/src/views/Notes.js @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useEffect } from "react"; import Note from "../components/note"; import ListContainer from "../components/list-container"; import { useStore } from "../stores/editor-store"; @@ -6,9 +6,17 @@ import { useStore as useNotesStore } from "../stores/note-store"; import { DEFAULT_CONTEXT } from "../common"; function Notes(props) { - const newSession = useStore(store => store.newSession); - const context = useNotesStore(store => store.context); + const newSession = useStore((store) => store.newSession); + const context = useNotesStore((store) => store.context); + const setContext = useNotesStore((store) => store.setContext); + useEffect(() => { + if (props.context) { + setContext(props.context); + } + }, [props.context, setContext]); + + if (!context) return null; return ( newSession({ ...DEFAULT_CONTEXT, - ...props.context - }) + ...props.context, + }), }} /> );