Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Fix folder chooser indent on deeper levels in all apps (#2453)
Leendert de Borst776d4dfbe496
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsxindex c42c7433c..fe5dfd296 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx@@ -1,5 +1,5 @@import { scopedKey } from '@aliasvault/client/database/ItemRef';-import { buildFolderTree, getFolderIdPath, isSharedFolder, type FolderTreeNode } from '@aliasvault/client/items/FolderUtils';+import { buildFolderTree, flattenFolderTree, getFolderIdPath, isSharedFolder } from '@aliasvault/client/items/FolderUtils';import React, { useState, useCallback, useMemo, useEffect } from 'react';import { useTranslation } from 'react-i18next';@@ -9,6 +9,9 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';import type { Folder, FolderRef } from '@aliasvault/client/database/repositories/FolderRepository';+/** Indent per folder level. */+const FOLDER_INDENT_PX = 20;+type ItemNameInputProps = {inputRef?: React.RefObject<HTMLInputElement | null>;value: string;@@ -45,8 +48,8 @@ const ItemNameInput: React.FC<ItemNameInputProps> = ({const selectedFolder = folders.find(f => f.Id === selectedFolderId && f.ManifestId === selectedManifestId);const personalManifestId = dbContext?.sqliteClient?.getPersonalManifestId() ?? null;- // Build folder treeconst folderTree = useMemo(() => buildFolderTree(folders), [folders]);+ const visibleFolders = useMemo(() => flattenFolderTree(folderTree, expandedFolders), [folderTree, expandedFolders]);/*** Automatically expand parent folders when a folder is pre-selected.@@ -108,76 +111,6 @@ const ItemNameInput: React.FC<ItemNameInputProps> = ({setShowFolderModal(false);}, []);- /**- * Render a folder tree node recursively.- */- const renderFolderNode = useCallback((node: FolderTreeNode, depth: number = 0): React.ReactNode => {- const nodeKey = scopedKey(node.ManifestId, node.Id);- const isExpanded = expandedFolders.has(nodeKey);- const hasChildren = node.children.length > 0;- const isSelected = selectedFolderId === node.Id && selectedManifestId === node.ManifestId;-- return (- <div key={nodeKey}>- <button- type="button"- onClick={() => handleSelectFolder({ Id: node.Id, ManifestId: node.ManifestId })}- className={`w-full px-3 py-2 text-left rounded-md flex items-center gap-2 transition-colors ${- isSelected- ? 'bg-primary-50 dark:bg-primary-900/20 text-primary-700 dark:text-primary-300'- : 'text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700'- }`}- style={{ paddingLeft: `${depth * 12 + 12}px` }}- >- {/* Expand/Collapse button */}- {hasChildren && (- <button- type="button"- onClick={(e) => {- e.stopPropagation();- toggleFolder(nodeKey);- }}- className="p-0.5 hover:bg-gray-200 dark:hover:bg-gray-600 rounded transition-colors"- >- <svg- className={`w-3 h-3 transition-transform ${isExpanded ? 'rotate-90' : ''}`}- fill="currentColor"- viewBox="0 0 20 20"- >- <path fillRule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clipRule="evenodd" />- </svg>- </button>- )}-- {/* Folder icon */}- <FolderIcon- variant="outline"- isShared={isSharedFolder(node, personalManifestId)}- className={`w-5 h-5 ${isSelected ? 'text-primary-500' : 'text-gray-400'} ${!hasChildren ? 'ml-5' : ''}`}- badgeClassName="bg-white dark:bg-gray-800 ring-gray-200 dark:ring-gray-600"- />-- {/* Folder name */}- <span className="font-medium flex-1">{node.Name}</span>-- {/* Checkmark for selected */}- {isSelected && (- <svg className="w-5 h-5 text-primary-600 dark:text-primary-400" fill="currentColor" viewBox="0 0 20 20">- <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />- </svg>- )}- </button>-- {/* Render children if expanded */}- {hasChildren && isExpanded && (- <div>- {node.children.map(child => renderFolderNode(child, depth + 1))}- </div>- )}- </div>- );- }, [expandedFolders, selectedFolderId, selectedManifestId, handleSelectFolder, toggleFolder, personalManifestId]);-return (<><div>@@ -267,8 +200,53 @@ const ItemNameInput: React.FC<ItemNameInputProps> = ({)}</button>- {/* Folder Tree */}- {folderTree.map(node => renderFolderNode(node, 0))}+ {/* Folder Tree, one row per visible folder; each level indents by one chevron slot */}+ {visibleFolders.map(node => {+ const nodeKey = scopedKey(node.ManifestId, node.Id);+ const isExpanded = expandedFolders.has(nodeKey);+ const hasChildren = node.children.length > 0;+ const isSelected = selectedFolderId === node.Id && selectedManifestId === node.ManifestId;+ return (+ <div+ key={nodeKey}+ className={`flex items-center rounded-md transition-colors ${isSelected ? 'bg-primary-50 dark:bg-primary-900/20 text-primary-700 dark:text-primary-300' : 'text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700'}`}+ style={{ paddingLeft: `${node.depth * FOLDER_INDENT_PX + 4}px` }}+ >+ {hasChildren ? (+ <button+ type="button"+ onClick={() => toggleFolder(nodeKey)}+ aria-expanded={isExpanded}+ className="flex-shrink-0 w-6 h-6 flex items-center justify-center rounded text-gray-500 dark:text-gray-400 hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors"+ >+ <svg className={`w-3 h-3 transition-transform ${isExpanded ? 'rotate-90' : ''}`} fill="currentColor" viewBox="0 0 20 20">+ <path fillRule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clipRule="evenodd" />+ </svg>+ </button>+ ) : (+ <span className="flex-shrink-0 w-6" />+ )}+ <button+ type="button"+ onClick={() => handleSelectFolder({ Id: node.Id, ManifestId: node.ManifestId })}+ className="flex-1 min-w-0 pl-1 pr-3 py-2 text-left flex items-center gap-2"+ >+ <FolderIcon+ variant="outline"+ isShared={isSharedFolder(node, personalManifestId)}+ className={`w-5 h-5 flex-shrink-0 ${isSelected ? 'text-primary-500' : 'text-gray-400'}`}+ badgeClassName="bg-white dark:bg-gray-800 ring-gray-200 dark:ring-gray-600"+ />+ <span className="font-medium flex-1 truncate">{node.Name}</span>+ {isSelected && (+ <svg className="w-5 h-5 flex-shrink-0 text-primary-600 dark:text-primary-400" fill="currentColor" viewBox="0 0 20 20">+ <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />+ </svg>+ )}+ </button>+ </div>+ );+ })}</div></ModalWrapper></>diff --git a/apps/mobile-app/components/folders/FolderSelectorModal.tsx b/apps/mobile-app/components/folders/FolderSelectorModal.tsxindex 92a3152b1..39e69bbbe 100644--- a/apps/mobile-app/components/folders/FolderSelectorModal.tsx+++ b/apps/mobile-app/components/folders/FolderSelectorModal.tsx@@ -10,13 +10,16 @@ import {} from 'react-native';import { scopedKey } from '@aliasvault/client/database/ItemRef';-import { buildFolderTree, getFolderIdPath, isSharedFolder, type FolderTreeNode } from '@aliasvault/client/items/FolderUtils';+import { buildFolderTree, flattenFolderTree, getFolderIdPath, isSharedFolder, type FolderTreeNode } from '@aliasvault/client/items/FolderUtils';import { useColors } from '@/hooks/useColorScheme';import { ModalWrapper } from '@/components/common/ModalWrapper';import { FolderIcon } from '@/components/folders/FolderIcon';import type { Folder, FolderRef } from '@aliasvault/client/database/repositories/FolderRepository';+/** Indent per folder level. */+const FOLDER_INDENT = 24;+interface IFolderSelectorModalProps {folders: Folder[];selectedFolder: FolderRef | null | undefined;@@ -78,6 +81,7 @@ export const FolderSelectorModal: React.FC<IFolderSelectorModalProps> = ({}, [selectedFolderId, selectedManifestId, folders]);const folderTree = useMemo(() => buildFolderTree(folders), [folders]);+ const visibleFolders = useMemo(() => flattenFolderTree(folderTree, expandedFolders), [folderTree, expandedFolders]);/*** Handle folder selection.@@ -88,14 +92,11 @@ export const FolderSelectorModal: React.FC<IFolderSelectorModalProps> = ({}, [onFolderChange, onClose]);const styles = StyleSheet.create({- chevronButton: {- padding: 4,- borderRadius: 4,- },chevronContainer: {- width: 26,alignItems: 'center',+ alignSelf: 'stretch',justifyContent: 'center',+ width: FOLDER_INDENT,},closeButton: {padding: 4,@@ -103,9 +104,6 @@ export const FolderSelectorModal: React.FC<IFolderSelectorModalProps> = ({right: 0,top: 0,},- folderIcon: {- marginLeft: 4,- },folderOption: {alignItems: 'center',borderRadius: 8,@@ -113,6 +111,19 @@ export const FolderSelectorModal: React.FC<IFolderSelectorModalProps> = ({paddingHorizontal: 12,paddingVertical: 12,},+ folderRow: {+ alignItems: 'center',+ borderRadius: 8,+ flexDirection: 'row',+ },+ folderRowButton: {+ alignItems: 'center',+ flex: 1,+ flexDirection: 'row',+ paddingLeft: 4,+ paddingRight: 12,+ paddingVertical: 12,+ },folderOptionActive: {backgroundColor: colors.tint + '15',},@@ -146,86 +157,54 @@ export const FolderSelectorModal: React.FC<IFolderSelectorModalProps> = ({});/**- * Recursively render folder tree node.+ * Render one visible folder row; each level indents by one chevron slot.*/- const renderFolderNode = useCallback((node: FolderTreeNode, depth: number = 0): React.ReactNode => {+ const renderFolderRow = (node: FolderTreeNode): React.ReactNode => {const nodeKey = scopedKey(node.ManifestId, node.Id);const isExpanded = expandedFolders.has(nodeKey);const hasChildren = node.children.length > 0;const isSelected = selectedFolderId === node.Id && selectedManifestId === node.ManifestId;return (- <View key={nodeKey}>+ <View key={nodeKey} style={[styles.folderRow, isSelected && styles.folderOptionActive, { paddingLeft: 4 + node.depth * FOLDER_INDENT }]}>+ {hasChildren ? (+ <TouchableOpacity+ onPress={() => toggleFolder(nodeKey)}+ style={styles.chevronContainer}+ hitSlop={{ top: 10, bottom: 10, left: 6, right: 0 }}+ accessibilityState={{ expanded: isExpanded }}+ >+ <MaterialIcons+ name="chevron-right"+ size={20}+ color={colors.textMuted}+ style={{ transform: [{ rotate: isExpanded ? '90deg' : '0deg' }] }}+ />+ </TouchableOpacity>+ ) : (+ <View style={styles.chevronContainer} />+ )}+<TouchableOpacity- style={[- styles.folderOption,- isSelected && styles.folderOptionActive,- ]}+ style={styles.folderRowButton}onPress={() => handleSelectFolder({ Id: node.Id, ManifestId: node.ManifestId })}activeOpacity={0.7}>- {/* Indentation */}- <View style={{ width: depth * 20 }} />-- {/* Expand/collapse chevron - fixed width container */}- <View style={styles.chevronContainer}>- {hasChildren ? (- <TouchableOpacity- onPress={(e) => {- e.stopPropagation();- toggleFolder(nodeKey);- }}- style={styles.chevronButton}- hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}- >- <MaterialIcons- name="chevron-right"- size={18}- color={colors.textMuted}- style={{- transform: [{ rotate: isExpanded ? '90deg' : '0deg' }],- }}- />- </TouchableOpacity>- ) : (- <View style={{ width: 18 }} />- )}- </View>-- {/* Folder icon */}<FolderIconisShared={isSharedFolder(node, personalManifestId)}size={22}color={isSelected ? colors.tint : colors.textMuted}- style={styles.folderIcon}/>-- {/* Folder name */}- <Text- style={[- styles.folderOptionText,- isSelected && styles.folderOptionTextActive,- ]}- numberOfLines={1}- >+ <Text style={[styles.folderOptionText, isSelected && styles.folderOptionTextActive]} numberOfLines={1}>{node.Name}</Text>-- {/* Checkmark for selected folder */}{isSelected && (<MaterialIcons name="check" size={20} color={colors.tint} />)}</TouchableOpacity>-- {/* Render children if expanded */}- {isExpanded && hasChildren && (- <>- {node.children.map(child => renderFolderNode(child, depth + 1))}- </>- )}</View>);- }, [expandedFolders, selectedFolderId, selectedManifestId, personalManifestId, handleSelectFolder, toggleFolder, colors, styles]);+ };const modalContent = (<View style={styles.modalContainer}>@@ -267,8 +246,8 @@ export const FolderSelectorModal: React.FC<IFolderSelectorModalProps> = ({)}</TouchableOpacity>- {/* Folder tree (recursive rendering) */}- {folderTree.map(node => renderFolderNode(node, 0))}+ {/* Folder tree, one row per visible folder */}+ {visibleFolders.map(renderFolderRow)}</ScrollView></View>);diff --git a/apps/web/src/components/items/FolderSelector.tsx b/apps/web/src/components/items/FolderSelector.tsxindex f6fcd769d..a72b98ed7 100644--- a/apps/web/src/components/items/FolderSelector.tsx+++ b/apps/web/src/components/items/FolderSelector.tsx@@ -1,5 +1,5 @@import { scopedKey } from '@aliasvault/client/database/ItemRef';-import { buildFolderTree, getFolderIdPath, isSharedFolder, type FolderTreeNode } from '@aliasvault/client/items/FolderUtils';+import { buildFolderTree, flattenFolderTree, getFolderIdPath, isSharedFolder } from '@aliasvault/client/items/FolderUtils';import React, { useEffect, useMemo, useState } from 'react';import { useTranslation } from 'react-i18next';@@ -20,6 +20,9 @@ type FolderSelectorProps = {*/const folderKey = (folder: FolderRef): string => scopedKey(folder.ManifestId, folder.Id);+/** Indent per folder level. */+const FOLDER_INDENT_REM = 1.25;+/*** Inline folder name with a modal to pick another folder from the tree.*/@@ -52,7 +55,6 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelec// Expand the parents of the selected folder so it is visible.const selectedKey = selectedFolder ? folderKey(selectedFolder) : null;- const excludedKey = excludeFolder ? folderKey(excludeFolder) : null;useEffect(() => {if (!selectedFolder || folders.length === 0) {return;@@ -64,25 +66,7 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelecconst tree = useMemo(() => buildFolderTree(folders), [folders]);- const flatTree = useMemo((): FolderTreeNode[] => {- const result: FolderTreeNode[] = [];- /**- * Walk the tree, skipping the excluded folder and collapsed children.- */- const traverse = (nodes: FolderTreeNode[]): void => {- for (const node of nodes) {- if (folderKey(node) === excludedKey) {- continue;- }- result.push(node);- if (expandedFolderIds.has(folderKey(node)) && node.children.length > 0) {- traverse(node.children);- }- }- };- traverse(tree);- return result;- }, [excludedKey, expandedFolderIds, tree]);+ const flatTree = useMemo(() => flattenFolderTree(tree, expandedFolderIds, excludeFolder), [tree, expandedFolderIds, excludeFolder]);/*** Expand or collapse a folder.@@ -108,32 +92,20 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelec};/**- * Classes of a folder row button.+ * Classes of a folder row.*/- const buttonClass = (key: string | null, isDisabled: boolean, hasChevron: boolean): string => {- const base = `flex-1 px-3 py-2 text-left ${hasChevron ? 'rounded-r-md' : 'rounded-md'} flex items-center transition-colors`;- if (isDisabled) {- return `${base} bg-gray-100 dark:bg-gray-800 text-gray-400 dark:text-gray-600 cursor-not-allowed opacity-50`;- }- if (selectedKey === key) {- return `${base} bg-primary-50 dark:bg-primary-900/20 text-primary-700 dark:text-primary-300`;- }- return `${base} text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700`;- };+ const rowClass = (key: string | null): string => selectedKey === key+ ? 'bg-primary-50 dark:bg-primary-900/20 text-primary-700 dark:text-primary-300'+ : 'text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700';/*** Classes of a folder row icon.*/- const iconClass = (key: string | null, isDisabled: boolean = false): string => {- if (isDisabled) {- return 'w-5 h-5 text-gray-300 dark:text-gray-700';- }- return selectedKey === key ? 'w-5 h-5 text-primary-500' : 'w-5 h-5 text-gray-400';- };+ const iconClass = (key: string | null): string => selectedKey === key ? 'w-5 h-5 flex-shrink-0 text-primary-500' : 'w-5 h-5 flex-shrink-0 text-gray-400';const selectedFolderRow = selectedKey ? folders.find(f => folderKey(f) === selectedKey) : undefined;const checkIcon = (- <svg className="w-5 h-5 ml-auto text-primary-600 dark:text-primary-400" fill="currentColor" viewBox="0 0 20 20">+ <svg className="w-5 h-5 ml-auto flex-shrink-0 text-primary-600 dark:text-primary-400" fill="currentColor" viewBox="0 0 20 20"><path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" /></svg>);@@ -174,7 +146,7 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelec)}><div className="space-y-1 max-h-64 overflow-y-auto -mx-2">- <button type="button" onClick={() => selectFolder(null)} className={`${buttonClass(null, false, false)} w-full`}>+ <button type="button" onClick={() => selectFolder(null)} className={`w-full px-3 py-2 text-left rounded-md flex items-center gap-3 transition-colors ${rowClass(null)}`}><svg className={iconClass(null)} fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4" /></svg>@@ -184,31 +156,25 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelec{flatTree.map((node) => {const key = folderKey(node);- const isDisabled = key === excludedKey;const hasChildren = node.children.length > 0;const isExpanded = expandedFolderIds.has(key);const count = itemCounts[key] ?? 0;return (- <div key={key} className="flex items-stretch">+ <div key={key} className={`flex items-center rounded-md transition-colors ${rowClass(key)}`} style={{ paddingLeft: `${node.depth * FOLDER_INDENT_REM + 0.25}rem` }}>{hasChildren ? (- <button type="button" onClick={(e) => {- e.stopPropagation();- toggleExpansion(key);- }} className="px-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-l-md transition-colors flex items-center" style={{ marginLeft: `${node.depth * 1.5}rem` }}>- <svg className={`w-4 h-4 text-gray-500 dark:text-gray-400 transition-transform ${isExpanded ? 'rotate-90' : ''}`} fill="none" stroke="currentColor" viewBox="0 0 24 24">+ <button type="button" onClick={() => toggleExpansion(key)} aria-expanded={isExpanded} className="flex-shrink-0 w-7 h-7 flex items-center justify-center rounded text-gray-500 dark:text-gray-400 hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors">+ <svg className={`w-4 h-4 transition-transform ${isExpanded ? 'rotate-90' : ''}`} fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 5l7 7-7 7" /></svg></button>) : (- <div className="w-8" style={{ marginLeft: `${node.depth * 1.5}rem` }}></div>+ <span className="flex-shrink-0 w-7" />)}- <button type="button" onClick={() => selectFolder(node)} disabled={isDisabled} className={buttonClass(key, isDisabled, hasChildren)}>- <div className="flex items-center gap-3 flex-1">- <FolderIcon variant="outline" isShared={isSharedFolder(node, personalManifestId)} className={iconClass(key, isDisabled)} />- <span className="font-medium">{node.Name}</span>- {count > 0 && <span className="text-xs text-gray-400 dark:text-gray-500">({count})</span>}- </div>+ <button type="button" onClick={() => selectFolder(node)} className="flex-1 min-w-0 pl-1 pr-3 py-2 text-left flex items-center gap-3">+ <FolderIcon variant="outline" isShared={isSharedFolder(node, personalManifestId)} className={iconClass(key)} />+ <span className="font-medium truncate">{node.Name}</span>+ {count > 0 && <span className="flex-shrink-0 text-xs text-gray-400 dark:text-gray-500">({count})</span>}{selectedKey === key && checkIcon}</button></div>diff --git a/core/client/src/items/FolderUtils.ts b/core/client/src/items/FolderUtils.tsindex 35f63574a..89fddce2b 100644--- a/core/client/src/items/FolderUtils.ts+++ b/core/client/src/items/FolderUtils.ts@@ -68,33 +68,31 @@ export function buildFolderTree(folders: Folder[]): FolderTreeNode[] {});});- // Build the tree structure+ // Link children to their parents first; depth and path are set afterwards, since a child may come before its parent.const rootFolders: FolderTreeNode[] = [];-folders.forEach(folder => {const node = folderMap.get(scopedKey(folder.ManifestId, folder.Id))!;-- if (!folder.ParentFolderId) {- // Root folder- node.depth = 0;- node.path = [folder.Id];- rootFolders.push(node);+ const parent = folder.ParentFolderId ? folderMap.get(scopedKey(folder.ManifestId, folder.ParentFolderId)) : undefined;+ if (parent) {+ parent.children.push(node);} else {- // Child folder- const parent = folderMap.get(scopedKey(folder.ManifestId, folder.ParentFolderId));- if (parent) {- node.depth = parent.depth + 1;- node.path = [...parent.path, folder.Id];- parent.children.push(node);- } else {- // Parent not found or deleted - treat as root- node.depth = 0;- node.path = [folder.Id];- rootFolders.push(node);- }+ // Root folder, or its parent is missing or deleted.+ rootFolders.push(node);}});+ /**+ * Set depth and path of each node from its parent.+ */+ const assignDepth = (nodes: FolderTreeNode[], depth: number, parentPath: string[]): void => {+ nodes.forEach(node => {+ node.depth = depth;+ node.path = [...parentPath, node.Id];+ assignDepth(node.children, depth + 1, node.path);+ });+ };+ assignDepth(rootFolders, 0, []);+/*** Sort children of a folder tree node recursively.*/@@ -114,6 +112,36 @@ export function buildFolderTree(folders: Folder[]): FolderTreeNode[] {return rootFolders;}+/**+ * The visible rows of a folder tree: children of collapsed folders are skipped, as is the excluded folder with its subtree.+ * @param tree - Root-level folder tree nodes+ * @param expandedKeys - Scoped keys (see scopedKey) of the expanded folders+ * @param excludeFolder - Folder to leave out, or null+ * @returns The rows in display order, each with its depth+ */+export function flattenFolderTree(tree: FolderTreeNode[], expandedKeys: ReadonlySet<string>, excludeFolder: FolderRef | null = null): FolderTreeNode[] {+ const result: FolderTreeNode[] = [];+ const excludedKey = excludeFolder ? scopedKey(excludeFolder.ManifestId, excludeFolder.Id) : null;++ /**+ * Walk the nodes depth first.+ */+ const walk = (nodes: FolderTreeNode[]): void => {+ for (const node of nodes) {+ const key = scopedKey(node.ManifestId, node.Id);+ if (key === excludedKey) {+ continue;+ }+ result.push(node);+ if (node.children.length > 0 && expandedKeys.has(key)) {+ walk(node.children);+ }+ }+ };+ walk(tree);+ return result;+}+/*** Get folder depth in the hierarchy.* @param ref - The folder to check