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 moving and updating notebooks

Browse Source
This commit is contained in:
Ammar Ahmed
2025-02-19 11:50:09 +05:00
committed by Abdullah Atta
parent a082c7d33a
commit 72a80c8f57
7 changed files with 92 additions and 795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
apps/mobile/app/components/sheets/move-notebook/index.tsx
View File

@@ -25,14 +25,15 @@ import { FlatList } from "react-native-actions-sheet";
import create from "zustand";
import { db } from "../../../common/database";
import { useNotebook } from "../../../hooks/use-notebook";
import { eSendEvent, presentSheet } from "../../../services/event-manager";
import { presentSheet } from "../../../services/event-manager";
import {
useNotebookStore,
useNotebooks
} from "../../../stores/use-notebook-store";
import { eOnNotebookUpdated } from "../../../utils/events";
import {
checkParentSelected,
findRootNotebookId,
findSelectedParent,
getParentNotebookId
} from "../../../utils/notebooks";
import { AppFontSize } from "../../../utils/size";
@@ -47,6 +48,10 @@ import { IconButton } from "../../ui/icon-button";
import { Pressable } from "../../ui/pressable";
import Paragraph from "../../ui/typography/paragraph";
import { AddNotebookSheet } from "../add-notebook";
import {
useSideMenuNotebookExpandedStore,
useSideMenuNotebookSelectionStore
} from "../../side-menu/stores";
const useNotebookExpandedStore = create<{
expanded: {
@@ -79,7 +84,7 @@ export const MoveNotebookSheet = ({
useEffect(() => {
(async () => {
for (const notebook of selectedNotebooks) {
const root = await findRootNotebookId(notebook.id);
const root = await findSelectedParent(notebook.id);
if (root !== notebook.id) {
setMoveToTop(true);
return;
@@ -107,6 +112,9 @@ export const MoveNotebookSheet = ({
context: "move-notebook",
positivePress: async () => {
for (const notebook of selectedNotebooks) {
if (await checkParentSelected(notebook.id, selectedNotebooks))
continue;
const parent = await getParentNotebookId(notebook.id);
const root = await findRootNotebookId(notebook.id);
@@ -122,12 +130,23 @@ export const MoveNotebookSheet = ({
);
}
await db.relations.add(selectedNotebook, notebook);
if (parent) {
eSendEvent(eOnNotebookUpdated, parent);
}
}
useNotebookStore.getState().refresh();
eSendEvent(eOnNotebookUpdated, selectedNotebook.id);
if (
!useSideMenuNotebookExpandedStore.getState().expanded[
selectedNotebook.id
]
) {
useSideMenuNotebookExpandedStore
.getState()
.setExpanded(selectedNotebook.id);
}
useSideMenuNotebookSelectionStore.setState({
enabled: false,
selection: {}
});
close?.();
}
});
@@ -179,8 +198,12 @@ export const MoveNotebookSheet = ({
type="secondaryAccented"
onPress={async () => {
for (const notebook of selectedNotebooks) {
if (
await checkParentSelected(notebook.id, selectedNotebooks)
)
continue;
const parent = await getParentNotebookId(notebook.id);
const root = await findRootNotebookId(notebook.id);
const root = await findSelectedParent(notebook.id);
if (root !== notebook.id) {
await db.relations.unlink(
{
@@ -189,11 +212,13 @@ export const MoveNotebookSheet = ({
},
notebook
);
eSendEvent(eOnNotebookUpdated, parent);
eSendEvent(eOnNotebookUpdated, notebook.id);
}
}
useNotebookStore.getState().refresh();
useSideMenuNotebookSelectionStore.setState({
enabled: false,
selection: {}
});
close?.();
}}
/>

649
apps/mobile/app/components/sheets/notebook-sheet/index.tsx
View File

@@ -1,649 +0,0 @@
/*
This file is part of the Notesnook project (https://notesnook.com/)
Copyright (C) 2023 Streetwriters (Private) Limited
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { Notebook, VirtualizedGrouping } from "@notesnook/core";
import { useThemeColors } from "@notesnook/theme";
import React, { useEffect, useRef, useState } from "react";
import {
Platform,
RefreshControl,
View,
useWindowDimensions
} from "react-native";
import ActionSheet, { ActionSheetRef } from "react-native-actions-sheet";
import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
import Config from "react-native-config";
import Icon from "react-native-vector-icons/MaterialCommunityIcons";
import create from "zustand";
import { notesnook } from "../../../../e2e/test.ids";
import { db } from "../../../common/database";
import { MMKV } from "../../../common/database/mmkv";
import { useNotebook } from "../../../hooks/use-notebook";
import NotebookScreen from "../../../screens/notebook";
import { openEditor } from "../../../screens/notes/common";
import { eSendEvent, presentSheet } from "../../../services/event-manager";
import { createItemSelectionStore } from "../../../stores/item-selection-store";
import useNavigationStore from "../../../stores/use-navigation-store";
import { useSelectionStore } from "../../../stores/use-selection-store";
import { eOnNotebookUpdated } from "../../../utils/events";
import { deleteItems } from "../../../utils/functions";
import { findRootNotebookId } from "../../../utils/notebooks";
import { AppFontSize, normalize } from "../../../utils/size";
import { Properties } from "../../properties";
import { IconButton } from "../../ui/icon-button";
import { Pressable } from "../../ui/pressable";
import Paragraph from "../../ui/typography/paragraph";
import { AddNotebookSheet } from "../add-notebook";
import { MoveNotebookSheet } from "../move-notebook";
import Sort from "../sort";
import { strings } from "@notesnook/intl";
const useItemSelectionStore = createItemSelectionStore(true, false);
type NotebookParentProp = {
parent?: NotebookParentProp;
item?: Notebook;
};
type ConfigItem = { id: string; type: string };
class NotebookSheetConfig {
static storageKey: "$$sp";
static makeId(item: ConfigItem) {
return `${NotebookSheetConfig.storageKey}:${item.type}:${item.id}`;
}
static get(item: ConfigItem) {
const value = MMKV.getInt(NotebookSheetConfig.makeId(item));
return typeof value === "number" ? value : 0;
}
static set(item: ConfigItem, index = 0) {
MMKV.setInt(NotebookSheetConfig.makeId(item), index);
}
}
const useNotebookExpandedStore = create<{
expanded: {
[id: string]: boolean;
};
setExpanded: (id: string) => void;
}>((set, get) => ({
expanded: {},
setExpanded(id: string) {
set({
expanded: {
...get().expanded,
[id]: !get().expanded[id]
}
});
}
}));
export const NotebookSheet = () => {
const [collapsed, setCollapsed] = useState(false);
const currentRoute = useNavigationStore((state) => state.currentRoute);
const focusedRouteId = useNavigationStore((state) => state.focusedRouteId);
const enabled = useItemSelectionStore((state) => state.enabled);
const canShow = currentRoute === "Notebook";
const { colors } = useThemeColors("sheet");
const ref = useRef<ActionSheetRef>(null);
const currentItem = useRef<string>();
const { fontScale } = useWindowDimensions();
const [root, setRoot] = useState<string>();
const {
onUpdate: onRequestUpdate,
notebook,
nestedNotebooks: notebooks,
nestedNotebookNotesCount: totalNotes,
groupOptions
} = useNotebook(
currentRoute === "Notebook" ? root : undefined,
undefined,
true
);
const renderNotebook = ({ index }: { item: boolean; index: number }) => (
<NotebookItem
items={notebooks}
id={index}
index={index}
totalNotes={totalNotes}
/>
);
useEffect(() => {
if (canShow) {
setImmediate(async () => {
if (!focusedRouteId) return;
const nextRoot = await findRootNotebookId(focusedRouteId);
if (nextRoot !== currentItem.current) {
useItemSelectionStore.setState({
enabled: false,
selection: {}
});
}
currentItem.current = nextRoot;
const snapPoint = NotebookSheetConfig.get({
type: "notebook",
id: focusedRouteId as string
});
if (ref.current?.isOpen()) {
ref.current?.snapToIndex(snapPoint);
} else {
ref.current?.show(snapPoint);
}
setRoot(nextRoot);
onRequestUpdate();
});
} else {
if (ref.current?.isOpen()) {
useItemSelectionStore.setState({
enabled: false,
selection: {}
});
ref.current?.hide();
}
}
}, [canShow, focusedRouteId]);
return (
<ActionSheet
ref={ref}
isModal={false}
containerStyle={{
maxHeight: 300,
borderTopRightRadius: 15,
borderTopLeftRadius: 15,
backgroundColor: colors.primary.background,
borderWidth: 1,
borderColor: colors.primary.border,
borderBottomWidth: 0
}}
openAnimationConfig={{
friction: 10
}}
onSnapIndexChange={(index) => {
setCollapsed(index === 0);
NotebookSheetConfig.set(
{
type: "notebook",
id: focusedRouteId as string
},
index
);
}}
overlayColor={colors.primary.backdrop}
closable={!canShow}
elevation={10}
indicatorStyle={{
width: 100,
backgroundColor: colors.secondary.background
}}
keyboardHandlerEnabled={false}
snapPoints={
Config.isTesting === "true"
? [100]
: [Platform.OS === "android" ? 15 : 10, 100]
}
initialSnapIndex={1}
backgroundInteractionEnabled
gestureEnabled
>
{/* <View
style={{
position: "absolute",
right: 24 + normalize(50),
marginTop: -80
}}
>
<Pressable
testID="add-notebook-button"
type="secondary"
onPress={() => {
if (!notebook) return;
}}
style={{
borderRadius: 100
}}
>
<View
style={{
alignItems: "center",
justifyContent: "center",
height: normalize(50),
width: normalize(50)
}}
>
<Icon
name="notebook-plus"
color={colors.primary.icon}
size={SIZE.xxl}
/>
</View>
</Pressable>
</View> */}
<View
style={{
position: "absolute",
right: 12,
marginTop: -80
}}
>
<Pressable
testID={notesnook.buttons.add}
type="accent"
onPress={openEditor}
style={{
borderRadius: 100
}}
>
<View
style={{
alignItems: "center",
justifyContent: "center",
height: normalize(50),
width: normalize(50)
}}
>
<Icon name="plus" color="white" size={AppFontSize.xxl} />
</View>
</Pressable>
</View>
<View
style={{
maxHeight: 450,
height: 450,
width: "100%"
}}
>
<View
style={{
flexDirection: "row",
justifyContent: "space-between",
paddingHorizontal: 12,
alignItems: "center"
}}
>
<Paragraph size={AppFontSize.xs} color={colors.primary.icon}>
{strings.notebooks()}
</Paragraph>
<View
style={{
flexDirection: "row"
}}
>
{enabled ? (
<>
<IconButton
style={{
marginLeft: 10,
width: 40 * fontScale,
height: 40 * fontScale
}}
onPress={async () => {
await deleteItems(
"notebook",
useItemSelectionStore.getState().getSelectedItemIds()
);
useSelectionStore.getState().clearSelection();
useItemSelectionStore.setState({
enabled: false,
selection: {}
});
return;
}}
color={colors.primary.icon}
tooltipText="Move to trash"
tooltipPosition={1}
name="delete"
size={22}
/>
<IconButton
style={{
marginLeft: 10,
width: 40 * fontScale,
height: 40 * fontScale
}}
onPress={async () => {
const ids = useItemSelectionStore
.getState()
.getSelectedItemIds();
const notebooks = await db.notebooks.all.items(ids);
MoveNotebookSheet.present(notebooks);
}}
color={colors.primary.icon}
tooltipText="Clear selection"
tooltipPosition={1}
name="arrow-right-bold-box-outline"
size={22}
/>
<IconButton
style={{
marginLeft: 10,
width: 40 * fontScale,
height: 40 * fontScale
}}
onPress={() => {
useSelectionStore.getState().clearSelection();
useItemSelectionStore.setState({
enabled: false,
selection: {}
});
}}
color={colors.primary.icon}
tooltipText="Clear selection"
tooltipPosition={1}
name="close"
size={22}
/>
</>
) : (
<>
<IconButton
name={
groupOptions?.sortDirection === "asc"
? "sort-ascending"
: "sort-descending"
}
onPress={() => {
presentSheet({
component: <Sort screen="TopicSheet" type="notebook" />
});
}}
testID="group-topic-button"
color={colors.primary.icon}
size={22}
style={{
width: 40 * fontScale,
height: 40 * fontScale
}}
/>
<IconButton
name={collapsed ? "chevron-up" : "chevron-down"}
onPress={() => {
if (ref.current?.currentSnapIndex() !== 0) {
setCollapsed(true);
ref.current?.snapToIndex(0);
} else {
setCollapsed(false);
ref.current?.snapToIndex(1);
}
}}
color={colors.primary.icon}
size={22}
style={{
width: 40 * fontScale,
height: 40 * fontScale
}}
/>
<IconButton
testID="add-notebook-button"
name="notebook-plus"
onPress={() => {
if (!notebook) return;
AddNotebookSheet.present(
undefined,
notebook,
undefined,
undefined,
false
);
}}
color={colors.primary.icon}
size={22}
style={{
width: 40 * fontScale,
height: 40 * fontScale
}}
/>
</>
)}
</View>
</View>
<FlashList
data={notebooks?.placeholders}
style={{
width: "100%"
}}
estimatedItemSize={50}
refreshControl={
<RefreshControl
refreshing={false}
onRefresh={() => {
eSendEvent(eOnNotebookUpdated);
}}
colors={[colors.primary.accent]}
progressBackgroundColor={colors.primary.background}
/>
}
renderItem={renderNotebook}
ListEmptyComponent={
<View
style={{
flex: 1,
justifyContent: "center",
alignItems: "center",
height: 200
}}
>
<Paragraph color={colors.primary.icon}>
{strings.emptyPlaceholders("notebook")}
</Paragraph>
</View>
}
/>
</View>
</ActionSheet>
);
};
const NotebookItem = ({
id,
totalNotes,
currentLevel = 0,
index,
parent,
items
}: {
id: string | number;
totalNotes: (id: string) => number;
currentLevel?: number;
index: number;
parent?: NotebookParentProp;
items?: VirtualizedGrouping<Notebook>;
}) => {
const {
nestedNotebookNotesCount,
nestedNotebooks,
notebook: item
} = useNotebook(id, items, true);
const isFocused = useNavigationStore((state) => state.focusedRouteId === id);
const { colors } = useThemeColors("sheet");
const isSelected = useItemSelectionStore((state) =>
item?.id ? state.selection[item.id] === "selected" : false
);
const enabled = useItemSelectionStore((state) => state.enabled);
const { fontScale } = useWindowDimensions();
const expanded = useNotebookExpandedStore((state) =>
item?.id ? state.expanded[item?.id] : undefined
);
return (
<View
style={{
paddingLeft: currentLevel > 0 && currentLevel < 6 ? 15 : undefined,
width: "100%"
}}
>
<Pressable
type={isSelected || isFocused ? "selected" : "transparent"}
onLongPress={() => {
if (enabled || !item) return;
useItemSelectionStore.setState({
enabled: true,
selection: {}
});
useItemSelectionStore
.getState()
.markAs(item, isSelected ? "deselected" : "selected");
}}
testID={`notebook-sheet-item-${currentLevel}-${index}`}
onPress={() => {
if (!item) return;
if (enabled) {
useItemSelectionStore
.getState()
.markAs(item, isSelected ? "deselected" : "selected");
return;
}
NotebookScreen.navigate(item, true);
}}
style={{
justifyContent: "space-between",
width: "100%",
alignItems: "center",
flexDirection: "row",
paddingHorizontal: 12,
borderRadius: 0
}}
>
<View
style={{
flexDirection: "row",
alignItems: "center"
}}
>
{nestedNotebooks?.placeholders.length ? (
<IconButton
size={AppFontSize.lg}
color={isSelected ? colors.selected.icon : colors.primary.icon}
onPress={() => {
if (!item?.id) return;
useNotebookExpandedStore.getState().setExpanded(item?.id);
}}
top={0}
left={0}
bottom={0}
right={0}
style={{
width: 35,
height: 35
}}
name={expanded ? "chevron-down" : "chevron-right"}
/>
) : (
<View
style={{
width: 35,
height: 35
}}
/>
)}
{enabled ? (
<IconButton
size={AppFontSize.lg}
color={isSelected ? colors.selected.icon : colors.primary.icon}
top={0}
left={0}
bottom={0}
right={0}
style={{
width: 35,
height: 35,
marginRight: 5
}}
name={
isSelected
? "check-circle-outline"
: "checkbox-blank-circle-outline"
}
/>
) : null}
<Paragraph
color={
isFocused ? colors.selected.paragraph : colors.secondary.paragraph
}
size={AppFontSize.sm}
>
{item?.title}
</Paragraph>
</View>
<View
style={{
flexDirection: "row",
columnGap: 10,
alignItems: "center"
}}
>
{item?.id && totalNotes?.(item?.id) ? (
<Paragraph size={AppFontSize.sm} color={colors.secondary.paragraph}>
{totalNotes(item?.id)}
</Paragraph>
) : null}
<IconButton
name="dots-horizontal"
style={{
width: 40 * fontScale,
height: 40 * fontScale
}}
testID={notesnook.ids.notebook.menu}
onPress={() => {
Properties.present(item);
}}
left={0}
right={0}
bottom={0}
top={0}
color={colors.primary.icon}
size={AppFontSize.xl}
/>
</View>
</Pressable>
{!expanded
? null
: item &&
nestedNotebooks?.placeholders.map((id, index) => (
<NotebookItem
key={item.id + "_" + index}
id={index}
index={index}
totalNotes={nestedNotebookNotesCount}
currentLevel={currentLevel + 1}
items={nestedNotebooks}
parent={{
parent: parent,
item: item
}}
/>
))}
</View>
);
};

126
apps/mobile/app/components/side-menu/side-menu-notebooks.tsx
View File

@@ -77,8 +77,6 @@ const NotebookItem = ({
onLongPress?: () => void;
}) => {
const notebook = item.notebook;
const [nestedNotebooksSelected, setNestedNotebooksSelected] =
React.useState(false);
const isFocused = focused;
const { totalNotes, getTotalNotes } = useTotalNotes("notebook");
const getTotalNotesRef = React.useRef(getTotalNotes);
@@ -89,97 +87,6 @@ const NotebookItem = ({
getTotalNotesRef.current([item.notebook.id]);
}, [item.notebook]);
useEffect(() => {
if (selectionEnabled) {
const selector = db.relations.from(
{
type: "notebook",
id: item.notebook.id
},
"notebook"
).selector;
selector.ids().then((ids) => {
setNestedNotebooksSelected(
ids.length === 0
? true
: ids.every(
(id) => selectionStore.getState().selection[id] === "selected"
)
);
});
}
}, [selected, item.notebook.id, selectionEnabled, selectionStore]);
async function selectAll() {
const selector = db.relations.from(
{
type: "notebook",
id: item.notebook.id
},
"notebook"
).selector;
const ids = await selector.ids();
selectionStore.setState({
selection: {
...selectionStore.getState().selection,
...ids.reduce((acc: any, id) => {
acc[id] = "selected";
return acc;
}, {})
}
});
setNestedNotebooksSelected(true);
}
async function deselectAll() {
const selector = db.relations.from(
{
type: "notebook",
id: item.notebook.id
},
"notebook"
).selector;
const ids = await selector.ids();
useSideMenuNotebookSelectionStore.setState({
selection: {
...selectionStore.getState().selection,
...ids.reduce((acc: any, id) => {
acc[id] = "deselected";
return acc;
}, {})
}
});
setNestedNotebooksSelected(false);
}
useEffect(() => {
const unsub = selectionStore.subscribe((state) => {
if (state.enabled) {
const selector = db.relations.from(
{
type: "notebook",
id: item.notebook.id
},
"notebook"
).selector;
selector.ids().then((ids) => {
if (!ids.length) return;
setNestedNotebooksSelected(
ids.length === 0
? true
: ids.every(
(id) => selectionStore.getState().selection[id] === "selected"
)
);
});
}
});
return () => {
unsub();
};
}, [item.notebook.id, selectionStore]);
useEffect(() => {
const onNotebookUpdate = (id?: string) => {
if (id && id !== notebook.id) return;
@@ -207,11 +114,6 @@ const NotebookItem = ({
testID={`notebook-item-${item.depth}-${index}`}
onPress={async () => {
if (selectionEnabled) {
if (selected && !nestedNotebooksSelected) {
console.log("Select all...");
return selectAll();
}
await deselectAll();
selectionStore
.getState()
.markAs(item.notebook, selected ? "deselected" : "selected");
@@ -288,13 +190,7 @@ const NotebookItem = ({
}}
>
<AppIcon
name={
selected
? !nestedNotebooksSelected
? "checkbox-intermediate"
: "checkbox-outline"
: "checkbox-blank-outline"
}
name={selected ? "checkbox-outline" : "checkbox-blank-outline"}
size={AppFontSize.md}
color={selected ? colors.selected.icon : colors.primary.icon}
/>
@@ -394,8 +290,6 @@ export const SideMenuNotebooks = () => {
[]
);
console.log("RENDERING ROOT");
return (
<View
style={{
@@ -481,12 +375,19 @@ const NotebookItemWrapper = React.memo(
useSideMenuNotebookTreeStore
.getState()
.updateItem(item.notebook.id, notebook);
if (expanded) {
useSideMenuNotebookTreeStore
.getState()
.setTree(
await useSideMenuNotebookTreeStore
.getState()
.fetchAndAdd(item.notebook.id, item.depth + 1)
);
}
} else {
useSideMenuNotebookTreeStore.getState().removeItem(item.notebook.id);
}
}, [item.notebook.id]);
console.log("RENDERING", item?.notebook?.title, item.parentId);
}, [expanded, item.depth, item.notebook.id]);
return (
<View
@@ -537,7 +438,10 @@ const NotebookItemWrapper = React.memo(
return (
prev.item.notebook.id === next.item.notebook.id &&
prev.item.notebook.dateModified === next.item.notebook.dateModified &&
prev.item.notebook.dateEdited === next.item.notebook.dateEdited
prev.item.notebook.dateEdited === next.item.notebook.dateEdited &&
prev.item.hasChildren === next.item.hasChildren &&
prev.index === next.index &&
prev.item.parentId === next.item.parentId
);
}
);

10
apps/mobile/app/screens/notebook/index.tsx
View File

@@ -39,7 +39,7 @@ import useNavigationStore, {
NotebookScreenParams
} from "../../stores/use-navigation-store";
import { eUpdateNotebookRoute } from "../../utils/events";
import { findRootNotebookId } from "../../utils/notebooks";
import { findSelectedParent } from "../../utils/notebooks";
import { AppFontSize } from "../../utils/size";
import { DefaultAppStyles } from "../../utils/styles";
import { openEditor, setOnFirstSave } from "../notes/common";
@@ -94,8 +94,8 @@ const NotebookScreen = ({ route, navigation }: NavigationProps<"Notebook">) => {
}
if (data?.item?.id && params.current.item?.id !== data?.item?.id) {
const nextRootNotebookId = await findRootNotebookId(data?.item?.id);
const currentNotebookRoot = await findRootNotebookId(
const nextRootNotebookId = await findSelectedParent(data?.item?.id);
const currentNotebookRoot = await findSelectedParent(
params.current.item.id
);
@@ -284,8 +284,8 @@ NotebookScreen.navigate = async (item: Notebook, canGoBack?: boolean) => {
});
} else if (currentRoute === "Notebook") {
if (!focusedRouteId) return;
const rootNotebookId = await findRootNotebookId(focusedRouteId);
const currentNotebookRoot = await findRootNotebookId(item?.id);
const rootNotebookId = await findSelectedParent(focusedRouteId);
const currentNotebookRoot = await findSelectedParent(item?.id);
if (
(rootNotebookId === currentNotebookRoot &&

15
apps/mobile/app/stores/create-notebook-tree-stores.ts
View File

@@ -18,10 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { Notebook } from "@notesnook/core";
import create from "zustand";
import { db } from "../common/database";
import { createItemSelectionStore } from "./item-selection-store";
import { persist, StateStorage } from "zustand/middleware";
import { db } from "../common/database";
import { MMKV } from "../common/database/mmkv";
import { createItemSelectionStore } from "./item-selection-store";
export type TreeItem = {
parentId: string;
@@ -68,13 +68,18 @@ export function createNotebookTreeStores(
setTree(tree) {
set({ tree });
},
updateItem: (id, notebook) => {
const newTree = [...get().tree];
updateItem: async (id, notebook) => {
const newTree = get().tree.slice();
const index = newTree.findIndex((item) => item.notebook.id === id);
const childernCount = await db.relations
.from(notebook, "notebook")
.count();
newTree[index] = {
...newTree[index],
notebook
notebook,
hasChildren: childernCount > 0
};
set({
tree: newTree
});

19
apps/mobile/app/utils/functions.ts
View File

@@ -32,8 +32,7 @@ import { useMenuStore } from "../stores/use-menu-store";
import { useNotebookStore } from "../stores/use-notebook-store";
import { useRelationStore } from "../stores/use-relation-store";
import { useTagStore } from "../stores/use-tag-store";
import { eOnNotebookUpdated, eUpdateNoteInEditor } from "./events";
import { getParentNotebookId } from "./notebooks";
import { eUpdateNoteInEditor } from "./events";
export function getObfuscatedEmail(email: string) {
if (!email) return "";
@@ -79,7 +78,6 @@ function confirmDeleteAllNotes(
async function deleteNotebook(id: string, deleteNotes: boolean) {
const notebook = await db.notebooks.notebook(id);
if (!notebook) return;
const parentId = getParentNotebookId(id);
if (deleteNotes) {
const noteRelations = await db.relations.from(notebook, "note").get();
if (noteRelations?.length) {
@@ -89,11 +87,6 @@ async function deleteNotebook(id: string, deleteNotes: boolean) {
}
}
await db.notebooks.moveToTrash(id);
eSendEvent(eOnNotebookUpdated, parentId);
if (!parentId) {
useNotebookStore.getState().refresh();
}
}
export const deleteItems = async (
@@ -170,9 +163,7 @@ export const deleteItems = async (
useMenuStore.getState().setColorNotes();
ToastManager.hide();
if (type === "notebook") {
deletedIds.forEach(async (id) => {
eSendEvent(eOnNotebookUpdated, await getParentNotebookId(id));
});
useNotebookStore.getState().refresh();
}
},
actionText: "Undo"
@@ -187,11 +178,9 @@ export const deleteItems = async (
Navigation.queueRoutesForUpdate();
useMenuStore.getState().setColorNotes();
if (type === "notebook") {
itemIds.forEach(async (id) => {
eSendEvent(eOnNotebookUpdated, await getParentNotebookId(id));
});
useMenuStore.getState().setMenuPins();
useNotebookStore.getState().refresh();
}
useMenuStore.getState().setMenuPins();
};
export const openLinkInBrowser = async (link: string) => {

23
apps/mobile/app/utils/notebooks.ts
View File

@@ -16,6 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { Notebook } from "@notesnook/core";
import { db } from "../common/database";
import { eSendEvent } from "../services/event-manager";
import { useNotebookStore } from "../stores/use-notebook-store";
@@ -38,6 +39,28 @@ export async function findRootNotebookId(id: string) {
}
}
export async function checkParentSelected(
id: string,
selectedNotebooks: Notebook[]
) {
const relation = await db.relations
.to(
{
id,
type: "notebook"
},
"notebook"
)
.get();
if (!relation || !relation.length) {
return false;
} else {
if (selectedNotebooks.findIndex((n) => n.id === relation[0].fromId) > -1)
return true;
return checkParentSelected(relation[0].fromId, selectedNotebooks);
}
}
export async function getParentNotebookId(id: string) {
const relation = await db.relations
.to(