A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: make side bar order stateful
Ammar Ahmed4cc8a538a42d
diff --git a/apps/mobile/app/components/side-menu/color-section.tsx b/apps/mobile/app/components/side-menu/color-section.tsxindex 5dc8d5b2d..3a6700292 100644--- a/apps/mobile/app/components/side-menu/color-section.tsx+++ b/apps/mobile/app/components/side-menu/color-section.tsx@@ -43,6 +43,10 @@ export const ColorSection = React.memo(]);const loading = useSettingStore((state) => state.isAppLoading);const setColorNotes = useMenuStore((state) => state.setColorNotes);+ const [order, hiddensItems] = useMenuStore((state) => [+ state.order["colors"],+ state.hiddenItems["colors"]+ ]);useEffect(() => {if (!loading) {@@ -59,8 +63,8 @@ export const ColorSection = React.memo(db.settings.setSideBarHiddenItems("colors", data);}}disableDefaultDrag={true}- itemOrder={db.settings.getSideBarOrder("colors")}- hiddenItems={db.settings.getSideBarHiddenItems("colors")}+ itemOrder={order}+ hiddenItems={hiddensItems}alwaysBounceVertical={false}data={colorNotes}style={{diff --git a/apps/mobile/app/components/side-menu/index.tsx b/apps/mobile/app/components/side-menu/index.tsxindex 9d324e128..2f27eb6da 100644--- a/apps/mobile/app/components/side-menu/index.tsx+++ b/apps/mobile/app/components/side-menu/index.tsx@@ -27,6 +27,7 @@ import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";import { DDS } from "../../services/device-detection";import { eSendEvent } from "../../services/event-manager";import Navigation from "../../services/navigation";+import { useMenuStore } from "../../stores/use-menu-store";import { useSettingStore } from "../../stores/use-setting-store";import { useThemeStore } from "../../stores/use-theme-store";import { useUserStore } from "../../stores/use-user-store";@@ -50,6 +51,10 @@ export const SideMenu = React.memo();const isAppLoading = useSettingStore((state) => state.isAppLoading);const dragging = useSideBarDraggingStore((state) => state.dragging);+ const [order, hiddensItems] = useMenuStore((state) => [+ state.order["routes"],+ state.hiddenItems["routes"]+ ]);const introCompleted = useSettingStore((state) => state.settings.introCompleted@@ -93,8 +98,8 @@ export const SideMenu = React.memo(onHiddenItemsChanged={(data) => {db.settings.setSideBarHiddenItems("routes", data);}}- itemOrder={db.settings.getSideBarOrder("routes")}- hiddenItems={db.settings.getSideBarHiddenItems("routes")}+ itemOrder={order}+ hiddenItems={hiddensItems}alwaysBounceVertical={false}data={MenuItemsList}style={{diff --git a/apps/mobile/app/components/side-menu/pinned-section.tsx b/apps/mobile/app/components/side-menu/pinned-section.tsxindex db47ee6c0..8ad237e8a 100644--- a/apps/mobile/app/components/side-menu/pinned-section.tsx+++ b/apps/mobile/app/components/side-menu/pinned-section.tsx@@ -44,7 +44,7 @@ export const PinnedSection = React.memo(const menuPins = useMenuStore((state) => state.menuPins);const loading = useSettingStore((state) => state.isAppLoading);const setMenuPins = useMenuStore((state) => state.setMenuPins);-+ const [order] = useMenuStore((state) => [state.order["shortcuts"]]);useEffect(() => {if (!loading) {setMenuPins();@@ -61,7 +61,13 @@ export const PinnedSection = React.memo(Navigation.closeDrawer();});};- const renderItem = ({ item }: { item: Notebook | Tag; index: number }) => {+ const renderItem = ({+ item,+ index+ }: {+ item: Notebook | Tag;+ index: number;+ }) => {return <PinItem item={item} onPress={onPress} />;};@@ -77,7 +83,7 @@ export const PinnedSection = React.memo(}}onHiddenItemsChanged={(data) => {}}canHideItems={false}- itemOrder={db.settings.getSideBarOrder("shortcuts")}+ itemOrder={order}hiddenItems={[]}alwaysBounceVertical={false}data={menuPins}diff --git a/apps/mobile/app/hooks/use-app-events.tsx b/apps/mobile/app/hooks/use-app-events.tsxindex 28c634113..c9f60941d 100644--- a/apps/mobile/app/hooks/use-app-events.tsx+++ b/apps/mobile/app/hooks/use-app-events.tsx@@ -307,9 +307,6 @@ export const useAppEvents = () => {initAfterSync();setLastSynced(await db.lastSynced());eSendEvent(eCloseSheet, "sync_progress");- useUserStore.setState({- profile: db.settings.getProfile()- });}, [setLastSynced]);useEffect(() => {diff --git a/apps/mobile/app/stores/index.ts b/apps/mobile/app/stores/index.tsindex 616e7df54..3b4bc66f9 100644--- a/apps/mobile/app/stores/index.ts+++ b/apps/mobile/app/stores/index.ts@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/+import { db } from "../common/database";import Navigation from "../services/navigation";import Notifications from "../services/notifications";import { useFavoriteStore } from "./use-favorite-store";@@ -27,6 +28,7 @@ import { useRelationStore } from "./use-relation-store";import { useReminderStore } from "./use-reminder-store";import { useTagStore } from "./use-tag-store";import { useTrashStore } from "./use-trash-store";+import { useUserStore } from "./use-user-store";export function initAfterSync() {Navigation.queueRoutesForUpdate();@@ -36,6 +38,9 @@ export function initAfterSync() {useRelationStore.getState().update();useMenuStore.getState().setColorNotes();useMenuStore.getState().setMenuPins();+ useUserStore.setState({+ profile: db.settings.getProfile()+ });}export async function initialize() {}diff --git a/apps/mobile/app/stores/use-menu-store.ts b/apps/mobile/app/stores/use-menu-store.tsindex 865bb031f..26fafedad 100644--- a/apps/mobile/app/stores/use-menu-store.ts+++ b/apps/mobile/app/stores/use-menu-store.ts@@ -17,7 +17,13 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { Color, Notebook, Tag } from "@notesnook/core/dist/types";+import {+ Color,+ Notebook,+ SideBarHideableSection,+ SideBarSection,+ Tag+} from "@notesnook/core/dist/types";import create, { State } from "zustand";import { db } from "../common/database";@@ -29,17 +35,56 @@ export interface MenuStore extends State {clearAll: () => void;loadingShortcuts: boolean;loadingColors: boolean;+ order: Record<SideBarSection, string[]>;+ hiddenItems: Record<SideBarHideableSection, string[]>;}-export const useMenuStore = create<MenuStore>((set) => ({+export const useMenuStore = create<MenuStore>((set, get) => ({menuPins: [],colorNotes: [],loadingShortcuts: true,loadingColors: true,+ order: {+ colors: [],+ shortcuts: [],+ routes: []+ },+ hiddenItems: {+ colors: [],+ routes: []+ },setMenuPins: () => {db.shortcuts.resolved().then((shortcuts) => {set({ menuPins: [...(shortcuts as [])], loadingShortcuts: false });});+ const sections = ["colors", "shortcuts", "routes"];+ const order: Record<SideBarSection, string[]> = {+ colors: [],+ shortcuts: [],+ routes: []+ };+ const hiddenItems: Record<SideBarHideableSection, string[]> = {+ colors: [],+ routes: []+ };+ for (const section of sections) {+ order[section as SideBarSection] = db.settings.getSideBarOrder(+ section as SideBarSection+ );+ hiddenItems[section as SideBarHideableSection] =+ db.settings.getSideBarHiddenItems("colors");+ }++ if (+ JSON.stringify(get().order || {}) !== JSON.stringify(order || {}) ||+ JSON.stringify(get().hiddenItems || {}) !==+ JSON.stringify(hiddenItems || {})+ ) {+ set({+ order: order,+ hiddenItems: hiddenItems+ });+ }},setColorNotes: () => {db.colors?.all