Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update FolderSelector in mobile app ItemNameField to support tree view (#1695)
Leendert de Borstd04d4abbbd3a
diff --git a/apps/mobile-app/app/(tabs)/items/add-edit.tsx b/apps/mobile-app/app/(tabs)/items/add-edit.tsxindex 4635adf52..a9ad679cd 100644--- a/apps/mobile-app/app/(tabs)/items/add-edit.tsx+++ b/apps/mobile-app/app/(tabs)/items/add-edit.tsx@@ -538,17 +538,15 @@ export default function AddEditItemScreen(): React.ReactNode {} catch (err) {console.error('Error loading password settings:', err);}- // Now load the item - passwordSettings is already setloadExistingItem();} else {- // Create mode - load password settings for new items too+ // Create modetry {const settings = await dbContext.sqliteClient!.getPasswordSettings();setPasswordSettings(settings);} catch (err) {console.error('Error loading password settings:', err);}- // Create mode - initialize new itemlet serviceName = '';let decodedItemUrl = '';diff --git a/apps/mobile-app/components/folders/FolderSelector.tsx b/apps/mobile-app/components/folders/FolderSelector.tsxdeleted file mode 100644index cfa6c1d49..000000000--- a/apps/mobile-app/components/folders/FolderSelector.tsx+++ /dev/null@@ -1,337 +0,0 @@-import MaterialIcons from '@expo/vector-icons/MaterialIcons';-import React, { useState, useCallback } from 'react';-import { useTranslation } from 'react-i18next';-import {- StyleSheet,- Text,- TouchableOpacity,- View,- ScrollView,-} from 'react-native';--import { useColors } from '@/hooks/useColorScheme';-import { ModalWrapper } from '@/components/common/ModalWrapper';--type Folder = {- Id: string;- Name: string;- ParentFolderId?: string | null;- Weight?: number;-};--type FolderTreeNode = Folder & {- children: FolderTreeNode[];- depth: number;- path: string[];- indentedName: string;-};--interface IFolderSelectorProps {- folders: Folder[];- selectedFolderId: string | null | undefined;- onFolderChange: (folderId: string | null) => void;-}--/**- * FolderSelector component- *- * A button that opens a modal to select a folder for an item.- * Can be placed anywhere in the form.- */-export const FolderSelector: React.FC<IFolderSelectorProps> = ({- folders,- selectedFolderId,- onFolderChange,-}) => {- const { t } = useTranslation();- const colors = useColors();- const [showModal, setShowModal] = useState(false);-- /**- * Build a hierarchical tree from flat array of folders.- */- const buildFolderTree = useCallback((folders: Folder[]): FolderTreeNode[] => {- const folderMap = new Map<string, FolderTreeNode>();-- // Initialize all folders as tree nodes- folders.forEach(folder => {- folderMap.set(folder.Id, {- ...folder,- children: [],- depth: 0,- path: [],- indentedName: folder.Name,- });- });-- // Build the tree structure- const rootFolders: FolderTreeNode[] = [];-- folders.forEach(folder => {- const node = folderMap.get(folder.Id)!;-- if (!folder.ParentFolderId) {- // Root folder- node.depth = 0;- node.path = [folder.Id];- node.indentedName = folder.Name;- rootFolders.push(node);- } else {- // Child folder- const parent = folderMap.get(folder.ParentFolderId);- if (parent) {- node.depth = parent.depth + 1;- node.path = [...parent.path, folder.Id];- node.indentedName = ' '.repeat(node.depth) + folder.Name;- parent.children.push(node);- } else {- // Parent not found - treat as root- node.depth = 0;- node.path = [folder.Id];- node.indentedName = folder.Name;- rootFolders.push(node);- }- }- });-- return rootFolders;- }, []);-- /**- * Flatten folder tree for display.- */- const flattenTree = useCallback((tree: FolderTreeNode[]): FolderTreeNode[] => {- const result: FolderTreeNode[] = [];-- const traverse = (nodes: FolderTreeNode[]): void => {- nodes.forEach(node => {- result.push(node);- traverse(node.children);- });- };-- traverse(tree);- return result;- }, []);-- const folderTree = buildFolderTree(folders);- const flatFolders = flattenTree(folderTree);-- const selectedFolder = folders.find(f => f.Id === selectedFolderId);-- /**- * Get folder path for display in button.- */- const getSelectedFolderPath = useCallback((): string => {- if (!selectedFolderId) {- return t('items.folders.noFolder');- }-- const folder = flatFolders.find(f => f.Id === selectedFolderId);- if (!folder) {- return selectedFolder?.Name || t('items.folders.noFolder');- }-- // Build path from root to current folder- const pathNames: string[] = [];- let currentId: string | null = selectedFolderId;- let iterations = 0;-- while (currentId && iterations < 5) {- const current = folders.find(f => f.Id === currentId);- if (!current) {- break;- }- pathNames.unshift(current.Name);- currentId = current.ParentFolderId || null;- iterations++;- }-- return pathNames.join(' > ');- }, [selectedFolderId, selectedFolder, flatFolders, folders, t]);-- /**- * Handle folder selection.- */- const handleSelectFolder = useCallback((folderId: string | null): void => {- onFolderChange(folderId);- setShowModal(false);- }, [onFolderChange]);-- const styles = StyleSheet.create({- button: {- alignItems: 'center',- backgroundColor: selectedFolderId ? colors.tint + '20' : colors.accentBackground,- borderColor: selectedFolderId ? colors.tint : colors.accentBorder,- borderRadius: 8,- borderWidth: 1,- flexDirection: 'row',- gap: 8,- paddingHorizontal: 12,- paddingVertical: 10,- },- buttonText: {- color: selectedFolderId ? colors.tint : colors.textMuted,- flex: 1,- fontSize: 15,- },- closeButton: {- padding: 4,- position: 'absolute',- right: 0,- top: 0,- },- folderOption: {- alignItems: 'center',- borderRadius: 8,- flexDirection: 'row',- gap: 12,- paddingHorizontal: 12,- paddingVertical: 12,- },- folderOptionActive: {- backgroundColor: colors.tint + '15',- },- folderOptionText: {- color: colors.text,- flex: 1,- fontSize: 16,- },- folderOptionTextActive: {- color: colors.tint,- fontWeight: '600',- },- label: {- color: colors.textMuted,- fontSize: 14,- fontWeight: '500',- marginBottom: 6,- },- modalHeader: {- alignItems: 'center',- flexDirection: 'row',- justifyContent: 'space-between',- marginBottom: 16,- },- modalTitle: {- color: colors.text,- fontSize: 18,- fontWeight: '600',- },- optionsList: {- maxHeight: 300,- },- wrapper: {- marginBottom: 16,- },- });-- const modalContent = (- <>- <View style={styles.modalHeader}>- <Text style={styles.modalTitle}>{t('items.folders.selectFolder')}</Text>- <TouchableOpacity- style={styles.closeButton}- onPress={() => setShowModal(false)}- >- <MaterialIcons name="close" size={24} color={colors.textMuted} />- </TouchableOpacity>- </View>-- <ScrollView style={styles.optionsList}>- {/* No folder option */}- <TouchableOpacity- style={[- styles.folderOption,- !selectedFolderId && styles.folderOptionActive,- ]}- onPress={() => handleSelectFolder(null)}- >- <MaterialIcons- name="folder-open"- size={22}- color={!selectedFolderId ? colors.tint : colors.textMuted}- />- <Text- style={[- styles.folderOptionText,- !selectedFolderId && styles.folderOptionTextActive,- ]}- >- {t('items.folders.noFolder')}- </Text>- {!selectedFolderId && (- <MaterialIcons name="check" size={20} color={colors.tint} />- )}- </TouchableOpacity>-- {/* Folder options (hierarchical) */}- {flatFolders.map(folder => (- <TouchableOpacity- key={folder.Id}- style={[- styles.folderOption,- selectedFolderId === folder.Id && styles.folderOptionActive,- ]}- onPress={() => handleSelectFolder(folder.Id)}- >- <View style={{ width: folder.depth * 16 }} />- <MaterialIcons- name={folder.children.length > 0 ? "folder" : "folder-open"}- size={22}- color={selectedFolderId === folder.Id ? colors.tint : colors.textMuted}- />- <Text- style={[- styles.folderOptionText,- selectedFolderId === folder.Id && styles.folderOptionTextActive,- ]}- numberOfLines={1}- >- {folder.Name}- </Text>- {selectedFolderId === folder.Id && (- <MaterialIcons name="check" size={20} color={colors.tint} />- )}- </TouchableOpacity>- ))}- </ScrollView>- </>- );-- return (- <View style={styles.wrapper}>- <Text style={styles.label}>{t('items.folders.folder')}</Text>- <TouchableOpacity- style={styles.button}- onPress={() => setShowModal(true)}- activeOpacity={0.7}- >- <MaterialIcons- name="folder"- size={20}- color={selectedFolderId ? colors.tint : colors.textMuted}- />- <Text style={styles.buttonText} numberOfLines={1}>- {getSelectedFolderPath()}- </Text>- <MaterialIcons- name="keyboard-arrow-down"- size={20}- color={colors.textMuted}- />- </TouchableOpacity>-- <ModalWrapper- isOpen={showModal}- onClose={() => setShowModal(false)}- showHeaderBorder={false}- showFooterBorder={false}- >- {modalContent}- </ModalWrapper>- </View>- );-};--export default FolderSelector;diff --git a/apps/mobile-app/components/folders/FolderSelectorModal.tsx b/apps/mobile-app/components/folders/FolderSelectorModal.tsxnew file mode 100644index 000000000..ea0be4b18--- /dev/null+++ b/apps/mobile-app/components/folders/FolderSelectorModal.tsx@@ -0,0 +1,366 @@+import MaterialIcons from '@expo/vector-icons/MaterialIcons';+import React, { useState, useCallback, useMemo, useEffect } from 'react';+import { useTranslation } from 'react-i18next';+import {+ StyleSheet,+ Text,+ TouchableOpacity,+ View,+ ScrollView,+} from 'react-native';++import { useColors } from '@/hooks/useColorScheme';+import { ModalWrapper } from '@/components/common/ModalWrapper';++type Folder = {+ Id: string;+ Name: string;+ ParentFolderId: string | null;+ Weight: number;+};++type FolderTreeNode = Folder & {+ children: FolderTreeNode[];+ depth: number;+ path: string[];+ indentedName: string;+};++interface IFolderSelectorModalProps {+ folders: Folder[];+ selectedFolderId: string | null | undefined;+ onFolderChange: (folderId: string | null) => void;+ isOpen: boolean;+ onClose: () => void;+}++/**+ * FolderSelectorModal component+ *+ * A modal for selecting folders with a hierarchical tree view.+ * Features expand/collapse, auto-expansion, and visual indicators.+ */+export const FolderSelectorModal: React.FC<IFolderSelectorModalProps> = ({+ folders,+ selectedFolderId,+ onFolderChange,+ isOpen,+ onClose,+}) => {+ const { t } = useTranslation();+ const colors = useColors();+ const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());++ /**+ * Build a hierarchical tree from flat array of folders.+ */+ const buildFolderTree = useCallback((folders: Folder[]): FolderTreeNode[] => {+ const folderMap = new Map<string, FolderTreeNode>();++ // Initialize all folders as tree nodes+ folders.forEach(folder => {+ folderMap.set(folder.Id, {+ ...folder,+ children: [],+ depth: 0,+ path: [],+ indentedName: folder.Name,+ });+ });++ // Build the tree structure+ const rootFolders: FolderTreeNode[] = [];++ folders.forEach(folder => {+ const node = folderMap.get(folder.Id)!;++ if (!folder.ParentFolderId) {+ // Root folder+ node.depth = 0;+ node.path = [folder.Id];+ node.indentedName = folder.Name;+ rootFolders.push(node);+ } else {+ // Child folder+ const parent = folderMap.get(folder.ParentFolderId);+ if (parent) {+ node.depth = parent.depth + 1;+ node.path = [...parent.path, folder.Id];+ node.indentedName = ' '.repeat(node.depth) + folder.Name;+ parent.children.push(node);+ } else {+ // Parent not found - treat as root+ node.depth = 0;+ node.path = [folder.Id];+ node.indentedName = folder.Name;+ rootFolders.push(node);+ }+ }+ });++ // Sort folders by Weight and Name+ const sortFolders = (nodes: FolderTreeNode[]): void => {+ nodes.sort((a, b) => {+ if (a.Weight !== b.Weight) {+ return (a.Weight || 0) - (b.Weight || 0);+ }+ return a.Name.localeCompare(b.Name);+ });+ nodes.forEach(node => sortFolders(node.children));+ };++ sortFolders(rootFolders);+ return rootFolders;+ }, []);++ /**+ * Get folder ID path from root to specified folder.+ */+ const getFolderIdPath = useCallback((folderId: string, folders: Folder[]): string[] => {+ const path: string[] = [];+ let currentId: string | null = folderId;+ let iterations = 0;++ while (currentId && iterations < 5) {+ const folder = folders.find(f => f.Id === currentId);+ if (!folder) break;+ path.unshift(folder.Id);+ currentId = folder.ParentFolderId || null;+ iterations++;+ }++ return path;+ }, []);++ /**+ * Toggle folder expand/collapse.+ */+ const toggleFolder = useCallback((folderId: string): void => {+ setExpandedFolders(prev => {+ const next = new Set(prev);+ if (next.has(folderId)) {+ next.delete(folderId);+ } else {+ next.add(folderId);+ }+ return next;+ });+ }, []);++ /**+ * Auto-expand folders when selected folder changes.+ */+ useEffect(() => {+ if (selectedFolderId && folders.length > 0) {+ const fullPath = getFolderIdPath(selectedFolderId, folders);+ if (fullPath.length > 0) {+ // Expand all folders in the path including the selected folder+ setExpandedFolders(new Set(fullPath));+ }+ } else {+ setExpandedFolders(new Set());+ }+ }, [selectedFolderId, folders, getFolderIdPath]);++ const folderTree = useMemo(() => buildFolderTree(folders), [folders, buildFolderTree]);++ /**+ * Handle folder selection.+ */+ const handleSelectFolder = useCallback((folderId: string | null): void => {+ onFolderChange(folderId);+ onClose();+ }, [onFolderChange, onClose]);++ const styles = StyleSheet.create({+ chevronButton: {+ padding: 4,+ marginLeft: 8,+ borderRadius: 4,+ },+ closeButton: {+ padding: 4,+ position: 'absolute',+ right: 0,+ top: 0,+ },+ folderIcon: {+ marginLeft: 8,+ },+ folderOption: {+ alignItems: 'center',+ borderRadius: 8,+ flexDirection: 'row',+ paddingHorizontal: 12,+ paddingVertical: 12,+ },+ folderOptionActive: {+ backgroundColor: colors.tint + '15',+ },+ folderOptionText: {+ color: colors.text,+ flex: 1,+ fontSize: 16,+ marginLeft: 8,+ },+ folderOptionTextActive: {+ color: colors.tint,+ fontWeight: '600',+ },+ modalContainer: {+ paddingVertical: 16,+ },+ modalHeader: {+ alignItems: 'center',+ flexDirection: 'row',+ justifyContent: 'space-between',+ marginBottom: 16,+ },+ modalTitle: {+ color: colors.text,+ fontSize: 18,+ fontWeight: '600',+ },+ optionsList: {+ maxHeight: 400,+ },+ });++ /**+ * Recursively render folder tree node.+ */+ const renderFolderNode = useCallback((node: FolderTreeNode, depth: number = 0): React.ReactNode => {+ const isExpanded = expandedFolders.has(node.Id);+ const hasChildren = node.children.length > 0;+ const isSelected = selectedFolderId === node.Id;++ return (+ <View key={node.Id}>+ <TouchableOpacity+ style={[+ styles.folderOption,+ isSelected && styles.folderOptionActive,+ ]}+ onPress={() => handleSelectFolder(node.Id)}+ activeOpacity={0.7}+ >+ {/* Indentation */}+ <View style={{ width: depth * 20 }} />++ {/* Expand/collapse chevron */}+ {hasChildren ? (+ <TouchableOpacity+ onPress={(e) => {+ e.stopPropagation();+ toggleFolder(node.Id);+ }}+ 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, marginLeft: 8 }} />+ )}++ {/* Folder icon */}+ <MaterialIcons+ name="folder"+ size={22}+ color={isSelected ? colors.tint : colors.textMuted}+ style={styles.folderIcon}+ />++ {/* Folder name */}+ <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, handleSelectFolder, toggleFolder, colors, styles]);++ const modalContent = (+ <View style={styles.modalContainer}>+ <View style={styles.modalHeader}>+ <Text style={styles.modalTitle}>{t('items.folders.selectFolder')}</Text>+ <TouchableOpacity+ style={styles.closeButton}+ onPress={onClose}+ >+ <MaterialIcons name="close" size={24} color={colors.textMuted} />+ </TouchableOpacity>+ </View>++ <ScrollView style={styles.optionsList}>+ {/* No folder option */}+ <TouchableOpacity+ style={[+ styles.folderOption,+ !selectedFolderId && styles.folderOptionActive,+ ]}+ onPress={() => handleSelectFolder(null)}+ >+ <MaterialIcons+ name="inbox"+ size={22}+ color={!selectedFolderId ? colors.tint : colors.textMuted}+ style={{ marginLeft: 8 }}+ />+ <Text+ style={[+ styles.folderOptionText,+ !selectedFolderId && styles.folderOptionTextActive,+ ]}+ >+ —+ </Text>+ {!selectedFolderId && (+ <MaterialIcons name="check" size={20} color={colors.tint} />+ )}+ </TouchableOpacity>++ {/* Folder tree (recursive rendering) */}+ {folderTree.map(node => renderFolderNode(node, 0))}+ </ScrollView>+ </View>+ );++ return (+ <ModalWrapper+ isOpen={isOpen}+ onClose={onClose}+ showHeaderBorder={false}+ showFooterBorder={false}+ >+ {modalContent}+ </ModalWrapper>+ );+};++export default FolderSelectorModal;diff --git a/apps/mobile-app/components/form/ItemNameField.tsx b/apps/mobile-app/components/form/ItemNameField.tsxindex e231fc271..66b53fe72 100644--- a/apps/mobile-app/components/form/ItemNameField.tsx+++ b/apps/mobile-app/components/form/ItemNameField.tsx@@ -1,23 +1,22 @@import MaterialIcons from '@expo/vector-icons/MaterialIcons';-import React, { useState, useCallback, forwardRef, useImperativeHandle, useRef } from 'react';+import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import {- Modal,StyleSheet,Text,TextInput,- TouchableOpacity,- TouchableWithoutFeedback,View,- ScrollView,} from 'react-native';+import { FolderSelectorModal } from '@/components/folders/FolderSelectorModal';import { RobustPressable } from '@/components/ui/RobustPressable';import { useColors } from '@/hooks/useColorScheme';type Folder = {Id: string;Name: string;+ ParentFolderId: string | null;+ Weight: number;};export interface ItemNameFieldRef {@@ -48,8 +47,8 @@ export const ItemNameField = forwardRef<ItemNameFieldRef, IItemNameFieldProps>((}, ref) => {const { t } = useTranslation();const colors = useColors();- const [showModal, setShowModal] = useState(false);const inputRef = useRef<TextInput>(null);+ const [showModal, setShowModal] = useState(false);useImperativeHandle(ref, () => ({/**@@ -60,30 +59,10 @@ export const ItemNameField = forwardRef<ItemNameFieldRef, IItemNameFieldProps>((}}));- const selectedFolder = folders.find(f => f.Id === selectedFolderId);const hasFolders = folders.length > 0;-- /**- * Handle folder selection.- */- const handleSelectFolder = useCallback((folderId: string | null): void => {- onFolderChange(folderId);- setShowModal(false);- }, [onFolderChange]);+ const selectedFolder = folders.find(f => f.Id === selectedFolderId);const styles = StyleSheet.create({- backdrop: {- alignItems: 'center',- backgroundColor: 'rgba(0, 0, 0, 0.5)',- flex: 1,- justifyContent: 'center',- },- closeButton: {- padding: 4,- position: 'absolute',- right: 16,- top: 16,- },container: {backgroundColor: colors.background,borderColor: colors.accentBorder,@@ -107,26 +86,6 @@ export const ItemNameField = forwardRef<ItemNameFieldRef, IItemNameFieldProps>((fontWeight: '500',maxWidth: 60,},- folderOption: {- alignItems: 'center',- borderRadius: 8,- flexDirection: 'row',- gap: 12,- paddingHorizontal: 12,- paddingVertical: 12,- },- folderOptionActive: {- backgroundColor: colors.tint + '15',- },- folderOptionText: {- color: colors.text,- flex: 1,- fontSize: 16,- },- folderOptionTextActive: {- color: colors.tint,- fontWeight: '600',- },input: {color: colors.text,flex: 1,@@ -140,27 +99,9 @@ export const ItemNameField = forwardRef<ItemNameFieldRef, IItemNameFieldProps>((fontWeight: '500',marginBottom: 6,},- modalContainer: {- backgroundColor: colors.background,- borderRadius: 12,- marginHorizontal: 20,- maxHeight: '70%',- maxWidth: 400,- padding: 20,- width: '90%',- },- optionsList: {- marginTop: 16,- },requiredAsterisk: {color: colors.destructive,},- title: {- color: colors.text,- fontSize: 18,- fontWeight: '600',- marginBottom: 4,- },wrapper: {marginBottom: 16,},@@ -198,89 +139,14 @@ export const ItemNameField = forwardRef<ItemNameFieldRef, IItemNameFieldProps>(()}</View>- <Modal- visible={showModal}- transparent- animationType="fade"- onRequestClose={() => setShowModal(false)}- >- <TouchableWithoutFeedback onPress={() => setShowModal(false)}>- <View style={styles.backdrop}>- <TouchableWithoutFeedback>- <View style={styles.modalContainer}>- <Text style={styles.title}>{t('items.folders.selectFolder')}</Text>-- <TouchableOpacity- style={styles.closeButton}- onPress={() => setShowModal(false)}- >- <MaterialIcons name="close" size={24} color={colors.textMuted} />- </TouchableOpacity>-- <ScrollView style={styles.optionsList}>- {/* No folder option */}- <TouchableOpacity- style={[- styles.folderOption,- !selectedFolderId && styles.folderOptionActive,- ]}- onPress={() => handleSelectFolder(null)}- activeOpacity={0.7}- >- <MaterialIcons- name="folder-open"- size={22}- color={!selectedFolderId ? colors.tint : colors.textMuted}- />- <Text- style={[- styles.folderOptionText,- !selectedFolderId && styles.folderOptionTextActive,- ]}- >- {t('items.folders.noFolder')}- </Text>- {!selectedFolderId && (- <MaterialIcons name="check" size={20} color={colors.tint} />- )}- </TouchableOpacity>-- {/* Folder options */}- {folders.map(folder => (- <TouchableOpacity- key={folder.Id}- style={[- styles.folderOption,- selectedFolderId === folder.Id && styles.folderOptionActive,- ]}- onPress={() => handleSelectFolder(folder.Id)}- activeOpacity={0.7}- >- <MaterialIcons- name="folder"- size={22}- color={selectedFolderId === folder.Id ? colors.tint : colors.textMuted}- />- <Text- style={[- styles.folderOptionText,- selectedFolderId === folder.Id && styles.folderOptionTextActive,- ]}- numberOfLines={1}- >- {folder.Name}- </Text>- {selectedFolderId === folder.Id && (- <MaterialIcons name="check" size={20} color={colors.tint} />- )}- </TouchableOpacity>- ))}- </ScrollView>- </View>- </TouchableWithoutFeedback>- </View>- </TouchableWithoutFeedback>- </Modal>+ {/* Folder selector modal with tree view */}+ <FolderSelectorModal+ folders={folders}+ selectedFolderId={selectedFolderId}+ onFolderChange={onFolderChange}+ isOpen={showModal}+ onClose={() => setShowModal(false)}+ /></View>);});