Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Tweak browser extension back button to be subfolder aware (#1695)
Leendert de Borst6e30bc424a15
diff --git a/apps/browser-extension/src/entrypoints/popup/App.tsx b/apps/browser-extension/src/entrypoints/popup/App.tsxindex 54a0bc05c..4dae542f8 100644--- a/apps/browser-extension/src/entrypoints/popup/App.tsx+++ b/apps/browser-extension/src/entrypoints/popup/App.tsx@@ -186,12 +186,12 @@ const App: React.FC = () => {{ path: '/upgrade', element: <Upgrade />, showBackButton: false },{ path: '/auth-settings', element: <AuthSettings />, showBackButton: true, title: t('common.settings') },{ path: '/items', element: <ItemsList />, showBackButton: false },- { path: '/items/folder/:folderId', element: <ItemsList />, showBackButton: true, title: t('items.title') },+ { path: '/items/folder/:folderId', element: <ItemsList />, showBackButton: true },{ path: '/items/select-type', element: <ItemTypeSelector />, showBackButton: true, title: t('itemTypes.selectType') },- { path: '/items/add', element: <ItemAddEdit />, showBackButton: true, title: t('items.addItem') },+ { path: '/items/add', element: <ItemAddEdit />, showBackButton: true },{ path: '/items/deleted', element: <RecentlyDeleted />, showBackButton: true, title: t('recentlyDeleted.title') },- { path: '/items/:id', element: <ItemDetails />, showBackButton: true, title: t('items.itemDetails') },- { path: '/items/:id/edit', element: <ItemAddEdit />, showBackButton: true, title: t('items.editItem') },+ { path: '/items/:id/edit', element: <ItemAddEdit />, showBackButton: true },+ { path: '/items/:id', element: <ItemDetails />, showBackButton: true },{ path: '/passkeys/create', element: <PasskeyCreate />, layout: LayoutType.PASSKEY },{ path: '/passkeys/authenticate', element: <PasskeyAuthenticate />, layout: LayoutType.PASSKEY },{ path: '/emails', element: <EmailsList />, showBackButton: false },diff --git a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsx b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsxindex 6c328d01f..43e2392bd 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsx@@ -1,4 +1,4 @@-import React, { useMemo } from 'react';+import React, { useMemo, useCallback } from 'react';import { useTranslation } from 'react-i18next';import { useNavigate, useLocation } from 'react-router-dom';@@ -72,6 +72,32 @@ const FolderBreadcrumb: React.FC<FolderBreadcrumbProps> = ({return fullPath;}, [folderId, dbContext?.sqliteClient, location.pathname]);+ /**+ * Handle breadcrumb navigation.+ * Uses navigate with negative delta to go back in history when clicking a parent folder.+ * This properly cleans up the history stack instead of adding duplicate entries.+ */+ const handleBreadcrumbClick = useCallback((targetPath: string, targetIndex: number) => {+ /*+ * Calculate how many steps back we need to go.+ * targetIndex is the position in the breadcrumb array (0 = root, 1 = first folder, etc.)+ * Current location is at (breadcrumbs.length) in the hierarchy.+ *+ * If we're on folder hierarchy: Root > A > B > C+ * - Breadcrumbs shown: [Root, A, B] (C is current, not shown)+ * - Click "A" (index 1): need to go back (breadcrumbs.length - targetIndex) = 2 steps+ */+ const stepsBack = breadcrumbs.length - targetIndex;++ if (stepsBack > 0) {+ // Go back in history to clean up the stack+ navigate(-stepsBack);+ } else {+ // Fallback to direct navigation with replace+ navigate(targetPath, { replace: true });+ }+ }, [navigate, breadcrumbs.length]);+/** Check if we're currently on the root items page.* Match both /items and /items/ (with or without trailing slash)@@ -100,7 +126,7 @@ const FolderBreadcrumb: React.FC<FolderBreadcrumbProps> = ({</span>) : (<button- onClick={() => navigate(rootPath)}+ onClick={() => handleBreadcrumbClick(rootPath, -1)}className="hover:text-orange-600 dark:hover:text-orange-400 transition-colors flex-shrink-0 flex items-center gap-1"><svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">@@ -109,7 +135,7 @@ const FolderBreadcrumb: React.FC<FolderBreadcrumbProps> = ({{rootLabelText}</button>)}- {breadcrumbs.map((crumb) => {+ {breadcrumbs.map((crumb, index) => {const crumbPath = `/items/folder/${crumb.id}`;return (@@ -118,7 +144,7 @@ const FolderBreadcrumb: React.FC<FolderBreadcrumbProps> = ({<polyline points="9 6 15 12 9 18" /></svg><button- onClick={() => navigate(crumbPath)}+ onClick={() => handleBreadcrumbClick(crumbPath, index)}className="hover:text-orange-600 dark:hover:text-orange-400 transition-colors truncate"title={crumb.name}>diff --git a/apps/browser-extension/src/entrypoints/popup/components/Layout/Header.tsx b/apps/browser-extension/src/entrypoints/popup/components/Layout/Header.tsxindex 81dc36733..4b10cd2d2 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Layout/Header.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Layout/Header.tsx@@ -1,9 +1,10 @@-import React, { useCallback } from 'react';+import React, { useCallback, useMemo } from 'react';import { useTranslation } from 'react-i18next';import { useNavigate, useLocation, useSearchParams } from 'react-router-dom';import Logo from '@/entrypoints/popup/components/Logo';import { useApp } from '@/entrypoints/popup/context/AppContext';+import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';import ServerSyncIndicator from './ServerSyncIndicator';@@ -32,6 +33,7 @@ const Header: React.FC<HeaderProps> = ({const navigate = useNavigate();const location = useLocation();const [searchParams] = useSearchParams();+ const { backButtonTitle: customBackButtonTitle } = useHeaderButtons();// Updated route matching logic to handle URL parametersconst currentRoute = routes?.find(route => {@@ -41,6 +43,25 @@ const Header: React.FC<HeaderProps> = ({return regex.test(location.pathname);});+ /**+ * Determine the back button title.+ * Priority: 1. Custom title from page (via context), 2. Static title from route config+ */+ const backButtonTitle = useMemo(() => {+ // If no back button, return undefined+ if (!currentRoute?.showBackButton) {+ return currentRoute?.title;+ }++ // Priority 1: Use custom back button title if set by the page+ if (customBackButtonTitle) {+ return customBackButtonTitle;+ }++ // Priority 2: Use static title from route config+ return currentRoute?.title;+ }, [currentRoute, customBackButtonTitle]);+/*** Handle back button click.* Uses browser history if available, otherwise falls back to returnTo parameter@@ -103,9 +124,9 @@ const Header: React.FC<HeaderProps> = ({<svg className="w-5 h-5 text-gray-500 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 19l-7-7 7-7" /></svg>- {currentRoute.title && (+ {backButtonTitle && (<h1 className="text-lg font-medium text-gray-900 dark:text-white ml-2">- {currentRoute.title}+ {backButtonTitle}</h1>)}</div>diff --git a/apps/browser-extension/src/entrypoints/popup/context/HeaderButtonsContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/HeaderButtonsContext.tsxindex 12418d8bf..596426b83 100644--- a/apps/browser-extension/src/entrypoints/popup/context/HeaderButtonsContext.tsx+++ b/apps/browser-extension/src/entrypoints/popup/context/HeaderButtonsContext.tsx@@ -3,6 +3,8 @@ import React, { createContext, useContext, useState, useCallback, useMemo } fromtype HeaderButtonsContextType = {setHeaderButtons: (buttons: React.ReactNode) => void;headerButtons: React.ReactNode;+ setBackButtonTitle: (title: string | null) => void;+ backButtonTitle: string | null;}/**@@ -15,15 +17,22 @@ export const HeaderButtonsContext = createContext<HeaderButtonsContextType | und*/export const HeaderButtonsProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {const [headerButtons, setHeaderButtons] = useState<React.ReactNode>(null);+ const [backButtonTitle, setBackButtonTitle] = useState<string | null>(null);const handleSetHeaderButtons = useCallback((buttons: React.ReactNode) => {setHeaderButtons(buttons);}, []);+ const handleSetBackButtonTitle = useCallback((title: string | null) => {+ setBackButtonTitle(title);+ }, []);+const value = useMemo(() => ({setHeaderButtons: handleSetHeaderButtons,- headerButtons- }), [handleSetHeaderButtons, headerButtons]);+ headerButtons,+ setBackButtonTitle: handleSetBackButtonTitle,+ backButtonTitle+ }), [handleSetHeaderButtons, headerButtons, handleSetBackButtonTitle, backButtonTitle]);return (<HeaderButtonsContext.Provider value={value}>@@ -39,6 +48,8 @@ export const HeaderButtonsProvider: React.FC<{ children: React.ReactNode }> = ({export const useHeaderButtons = (): {setHeaderButtons: (buttons: React.ReactNode) => void;headerButtons: React.ReactNode;+ setBackButtonTitle: (title: string | null) => void;+ backButtonTitle: string | null;} => {const context = useContext(HeaderButtonsContext);if (context === undefined) {diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsxindex 20cc7aa5b..e136776ee 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx@@ -82,7 +82,7 @@ const ItemAddEdit: React.FC = () => {const folderIdParam = searchParams.get('folderId');const { executeVaultMutationAsync } = useVaultMutate();- const { setHeaderButtons } = useHeaderButtons();+ const { setHeaderButtons, setBackButtonTitle } = useHeaderButtons();const { setIsInitialLoading } = useLoading();const { generateAlias, generateRandomEmailPrefix, lastGeneratedValues } = useAliasGenerator();const { detectService } = useServiceDetection();@@ -1018,6 +1018,28 @@ const ItemAddEdit: React.FC = () => {return (): void => setHeaderButtons(null);}, [setHeaderButtons, isEditMode, t, handleSave, isSaving]);+ // Set back button title dynamically+ useEffect(() => {+ if (isEditMode) {+ // Edit mode: back button goes to item details+ setBackButtonTitle(t('items.itemDetails'));+ } else if (folderIdParam && dbContext?.sqliteClient) {+ // Create mode with folder: back button goes to folder+ const allFolders = dbContext.sqliteClient.folders.getAll();+ const folder = allFolders.find(f => f.Id === folderIdParam);+ if (folder) {+ setBackButtonTitle(folder.Name);+ } else {+ setBackButtonTitle(t('items.title'));+ }+ } else {+ // Create mode at root: back button goes to Items+ setBackButtonTitle(t('items.title'));+ }++ return (): void => setBackButtonTitle(null);+ }, [setBackButtonTitle, isEditMode, folderIdParam, dbContext?.sqliteClient, t]);+/*** Render a field input based on field type.* @param onRemove - Optional callback to render an X button inside the input for removable fieldsdiff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsxindex d7a3d246c..e47a0d3c3 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx@@ -33,7 +33,7 @@ const ItemDetails: React.FC = (): React.ReactElement => {const dbContext = useDb();const [item, setItem] = useState<Item | null>(null);const { setIsInitialLoading } = useLoading();- const { setHeaderButtons } = useHeaderButtons();+ const { setHeaderButtons, setBackButtonTitle } = useHeaderButtons();/*** Open the item details in a new expanded popup.@@ -101,6 +101,27 @@ const ItemDetails: React.FC = (): React.ReactElement => {return () => setHeaderButtons(null);}, [setHeaderButtons]);+ // Set back button title based on item's folder+ useEffect(() => {+ if (item && dbContext?.sqliteClient) {+ if (item.FolderId) {+ // Item is in a folder - show folder name+ const allFolders = dbContext.sqliteClient.folders.getAll();+ const folder = allFolders.find(f => f.Id === item.FolderId);+ if (folder) {+ setBackButtonTitle(folder.Name);+ } else {+ setBackButtonTitle(t('items.title'));+ }+ } else {+ // Item is at root - show "Items"+ setBackButtonTitle(t('items.title'));+ }+ }++ return () => setBackButtonTitle(null);+ }, [item, dbContext?.sqliteClient, setBackButtonTitle, t]);+if (!item) {return <div>{t('common.loading')}</div>;}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsxindex 4d93209db..3cd96b5aa 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx@@ -119,7 +119,7 @@ const ItemsList: React.FC = () => {const navigate = useNavigate();const { syncVault } = useVaultSync();const { executeVaultMutationAsync } = useVaultMutate();- const { setHeaderButtons } = useHeaderButtons();+ const { setHeaderButtons, setBackButtonTitle } = useHeaderButtons();const [items, setItems] = useState<Item[]>([]);// Initialize searchTerm from URL query parameter (restored from back navigation or popup restore)const [searchTerm, setSearchTerm] = useState(() => {@@ -370,6 +370,32 @@ const ItemsList: React.FC = () => {return () => setHeaderButtons(null);}, [setHeaderButtons, handleAddItem, t]);+ // Set back button title for folder view+ useEffect(() => {+ if (folderIdParam && dbContext?.sqliteClient) {+ const allFolders = dbContext.sqliteClient.folders.getAll();+ const currentFolder = allFolders.find(f => f.Id === folderIdParam);++ if (currentFolder && currentFolder.ParentFolderId) {+ // Has parent folder - show parent folder name+ const parentFolder = allFolders.find(f => f.Id === currentFolder.ParentFolderId);+ if (parentFolder) {+ setBackButtonTitle(parentFolder.Name);+ } else {+ setBackButtonTitle(t('items.title'));+ }+ } else if (currentFolder) {+ // Root folder - show "Items"+ setBackButtonTitle(t('items.title'));+ } else {+ // Folder not found - fallback to "Items"+ setBackButtonTitle(t('items.title'));+ }+ }++ return () => setBackButtonTitle(null);+ }, [folderIdParam, dbContext?.sqliteClient, setBackButtonTitle, t]);+/*** Load items list on mount and on sqlite client change.*/