self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Merge branch 'release-3.0' into dev

Browse Source
This commit is contained in:
Laurent Cozic
2024-07-06 13:41:53 +02:00
parent 731260926d e49bca8315
commit 1a4ba2c74a
16 changed files with 234 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/app-mobile/components/side-menu-content.tsx
View File

@@ -8,7 +8,7 @@ import Synchronizer from '@joplin/lib/Synchronizer';
import NavService from '@joplin/lib/services/NavService';
import { _ } from '@joplin/lib/locale';
import { ThemeStyle, themeStyle } from './global-style';
import { isFolderSelected, renderFolders } from '@joplin/lib/components/shared/side-menu-shared';
import { buildFolderTree, isFolderSelected, renderFolders } from '@joplin/lib/components/shared/side-menu-shared';
import { FolderEntity, FolderIcon, FolderIconType } from '@joplin/lib/services/database/types';
import { AppState } from '../utils/types';
import Setting from '@joplin/lib/models/Setting';
@@ -560,8 +560,16 @@ const SideMenuContentComponent = (props: Props) => {
items.push(renderSidebarButton('folder_header', _('Notebooks'), 'folder'));
const folderTree = useMemo(() => {
return buildFolderTree(props.folders);
}, [props.folders]);
if (props.folders.length) {
const result = renderFolders(props, renderFolderItem);
const result = renderFolders({
folderTree,
collapsedFolderIds: props.collapsedFolderIds,
}, renderFolderItem);
const folderItems = result.items;
items = items.concat(folderItems);
}