Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: fix tree items in search

Ammar Ahmed0ad63da4a239
diff --git a/apps/mobile/app/components/side-menu/notebook-item.tsx b/apps/mobile/app/components/side-menu/notebook-item.tsx
index 2f49a731d..9aa8abf21 100644
--- a/apps/mobile/app/components/side-menu/notebook-item.tsx
+++ b/apps/mobile/app/components/side-menu/notebook-item.tsx
@@ -168,7 +168,7 @@ export const NotebookItem = ({
}
testID={item.hasChildren ? `expand-notebook-${index}` : ""}
onPress={() => {
- if (item.hasChildren && disableExpand) {
+ if (item.hasChildren && !disableExpand) {
onToggleExpanded?.();
} else {
onPress?.();
diff --git a/apps/mobile/app/components/side-menu/side-menu-notebooks.tsx b/apps/mobile/app/components/side-menu/side-menu-notebooks.tsx
index 291aa395d..1ffd17748 100644
--- a/apps/mobile/app/components/side-menu/side-menu-notebooks.tsx
+++ b/apps/mobile/app/components/side-menu/side-menu-notebooks.tsx
@@ -66,9 +66,9 @@ export const SideMenuNotebooks = () => {
const updateNotebooks = React.useCallback(() => {
if (lastQuery.current) {
- useSideMenuNotebookTreeStore.setState({
- isSearching: true
- });
+ // useSideMenuNotebookTreeStore.setState({
+ // isSearching: true
+ // });
db.lookup
.notebooks(lastQuery.current)
.sorted(db.settings.getGroupOptions("notebooks"))
@@ -76,9 +76,9 @@ export const SideMenuNotebooks = () => {
setFilteredNotebooks(filtered);
});
} else {
- useSideMenuNotebookTreeStore.setState({
- isSearching: false
- });
+ // useSideMenuNotebookTreeStore.setState({
+ // isSearching: false
+ // });
setFilteredNotebooks(notebooks);
}
}, [notebooks]);
diff --git a/apps/mobile/app/screens/link-notebooks/index.tsx b/apps/mobile/app/screens/link-notebooks/index.tsx
index 0e6398417..465082026 100644
--- a/apps/mobile/app/screens/link-notebooks/index.tsx
+++ b/apps/mobile/app/screens/link-notebooks/index.tsx
@@ -118,14 +118,8 @@ const LinkNotebooks = (props: NavigationProps<"LinkNotebooks">) => {
.then((filtered) => {
setFilteredNotebooks(filtered);
});
- useNotebookTreeStore.setState({
- isSearching: true
- });
} else {
setFilteredNotebooks(notebooks);
- useNotebookTreeStore.setState({
- isSearching: false
- });
}
}, [notebooks]);
diff --git a/apps/mobile/app/screens/move-notebook/index.tsx b/apps/mobile/app/screens/move-notebook/index.tsx
index d963c98e4..debd652b6 100644
--- a/apps/mobile/app/screens/move-notebook/index.tsx
+++ b/apps/mobile/app/screens/move-notebook/index.tsx
@@ -90,14 +90,8 @@ export const MoveNotebook = (props: NavigationProps<"MoveNotebook">) => {
.then((filtered) => {
setFilteredNotebooks(filtered);
});
- useNotebookTreeStore.setState({
- isSearching: true
- });
} else {
setFilteredNotebooks(notebooks);
- useNotebookTreeStore.setState({
- isSearching: false
- });
}
}, [notebooks]);
diff --git a/apps/mobile/app/stores/create-notebook-tree-stores.ts b/apps/mobile/app/stores/create-notebook-tree-stores.ts
index dcb2d2acd..d00550e46 100644
--- a/apps/mobile/app/stores/create-notebook-tree-stores.ts
+++ b/apps/mobile/app/stores/create-notebook-tree-stores.ts
@@ -114,16 +114,32 @@ export function createNotebookTreeStores(
}
}
- const newTreeItems = notebooks.map((notebook) => {
- return {
- parentId,
- notebook,
- depth: depth,
- hasChildren: items.some((item) => {
- return item.fromId === notebook.id;
- })
- };
- });
+ const rootTreeItems = newTree.filter((item) => item.parentId === "root");
+ const newTreeItems = notebooks.reduce((acc, notebook) => {
+ if (!rootTreeItems.find((item) => item.notebook.id === notebook.id)) {
+ acc.push({
+ parentId,
+ notebook,
+ depth: depth,
+ hasChildren: false
+ });
+ }
+ return acc;
+ }, [] as TreeItem[]);
+
+ if (parentId === "root") {
+ rootTreeItems.splice(0, 0, ...newTreeItems);
+ }
+
+ for (const treeItem of newTreeItems) {
+ treeItem.hasChildren = items.some((item) => {
+ return (
+ rootTreeItems.findIndex(
+ (treeItem) => treeItem.notebook.id === item.toId
+ ) === -1 && item.fromId === treeItem.notebook.id
+ );
+ });
+ }
newTree.splice(parentIndex + 1, 0, ...newTreeItems);