Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Tweak folder selection tree view to expand items up to currently selected entry (#1695)

Leendert de Borst435c5fb4a6a0
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
index 77a5d5287..b947e304b 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
@@ -1,7 +1,7 @@
-import React, { useState, useCallback, useMemo } from 'react';
+import React, { useState, useCallback, useMemo, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
-import { buildFolderTree, type FolderTreeNode } from '@/utils/folderUtils';
+import { buildFolderTree, getFolderIdPath, type FolderTreeNode } from '@/utils/folderUtils';
type Folder = {
Id: string;
@@ -40,6 +40,22 @@ const ItemNameInput: React.FC<ItemNameInputProps> = ({
// Build folder tree
const folderTree = useMemo(() => buildFolderTree(folders), [folders]);
+ /**
+ * Automatically expand parent folders when a folder is pre-selected.
+ * This ensures the selected folder is visible in the tree when the modal opens.
+ */
+ 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 if it has children.
+ setExpandedFolders(new Set(fullPath));
+ }
+ } else {
+ setExpandedFolders(new Set());
+ }
+ }, [selectedFolderId, folders]);
+
/**
* Toggle folder expansion in tree view.
*/