Skip to content

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

Show item filter dropdown on recently deleted page in browser extension (#2090)

Leendert de Borst03eed2e54169
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx
new file mode 100644
index 000000000..3e6c65b18
--- /dev/null
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx
@@ -0,0 +1,196 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { ITEM_TYPE_OPTIONS } from '@/entrypoints/popup/components/Items/ItemTypeSelector';
+
+import { isItemTypeFilter, type ItemFilterType } from '@/utils/itemFilters';
+
+/**
+ * Filter selection that includes the dedicated "deleted" page as an option too.
+ */
+export type ItemFilterSelection = ItemFilterType | 'deleted';
+
+type ItemFilterDropdownProps = {
+ /** Title shown on the trigger button. */
+ title: string;
+ /** Count shown next to the title on the trigger. Pass undefined to hide. */
+ count?: number;
+ /** Currently active selection — used to highlight the matching menu row. */
+ activeFilter: ItemFilterSelection;
+ /** Number of items currently in the Recently Deleted page (badge). */
+ recentlyDeletedCount: number;
+ /** Whether to render the "Show folders" toggle row. */
+ showFoldersToggle?: boolean;
+ /** Current value of the "Show folders" preference. */
+ showFolders?: boolean;
+ /** Toggle the "Show folders" preference. */
+ onToggleShowFolders?: (next: boolean) => void;
+ /** Called when the user picks a non-deleted filter. */
+ onSelectFilter: (filter: ItemFilterType) => void;
+ /** Called when the user picks "Recently deleted". */
+ onSelectRecentlyDeleted: () => void;
+};
+
+/**
+ * Dropdown that lets the user switch between item filters (All, type filters,
+ * passkeys/attachments/TOTP) and jump to the Recently Deleted page. Used on the
+ * items list and Recently Deleted pages so both share the same navigation menu.
+ */
+const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({
+ title,
+ count,
+ activeFilter,
+ recentlyDeletedCount,
+ showFoldersToggle = false,
+ showFolders = false,
+ onToggleShowFolders,
+ onSelectFilter,
+ onSelectRecentlyDeleted,
+}) => {
+ const { t } = useTranslation();
+ const [isOpen, setIsOpen] = useState(false);
+
+ /** Compose the className for a row, applying the active-state highlight. */
+ const itemRowClass = (selected: boolean) : string =>
+ `w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
+ selected
+ ? 'bg-orange-50 dark:bg-orange-900/20 text-orange-600 dark:text-orange-400'
+ : 'text-gray-700 dark:text-gray-300'
+ }`;
+
+ /** Close the menu and notify the parent of the new filter. */
+ const handleSelectFilter = (filter: ItemFilterType) : void => {
+ setIsOpen(false);
+ onSelectFilter(filter);
+ };
+
+ /** Close the menu and notify the parent that the user picked Recently Deleted. */
+ const handleSelectRecentlyDeleted = () : void => {
+ setIsOpen(false);
+ onSelectRecentlyDeleted();
+ };
+
+ return (
+ <div className="relative min-w-0">
+ <button
+ onClick={() => setIsOpen(!isOpen)}
+ className="flex items-center gap-1 text-gray-900 dark:text-white text-xl hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none min-w-0"
+ >
+ <h2 className="flex items-baseline gap-1.5 min-w-0 overflow-hidden">
+ <span className="truncate">{title}</span>
+ {count !== undefined && (
+ <span className="text-sm text-gray-500 dark:text-gray-400 shrink-0">
+ ({count})
+ </span>
+ )}
+ </h2>
+ <svg
+ className="w-4 h-4 mt-1 shrink-0"
+ viewBox="0 0 24 24"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth="2"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ >
+ <polyline points="6 9 12 15 18 9" />
+ </svg>
+ </button>
+
+ {isOpen && (
+ <>
+ <div
+ className="fixed inset-0 z-10"
+ onClick={() => setIsOpen(false)}
+ />
+ <div className="absolute left-0 top-full mt-1 w-72 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-xl ring-1 ring-black/5 dark:ring-white/10 z-20">
+ <div className="py-1">
+ <div className="relative">
+ <button
+ onClick={() => handleSelectFilter('all')}
+ className={itemRowClass(activeFilter === 'all')}
+ >
+ {t('items.title')}
+ </button>
+ {showFoldersToggle && onToggleShowFolders && (
+ <button
+ onClick={(e) => {
+ e.stopPropagation();
+ const next = !showFolders;
+ onToggleShowFolders(next);
+ setIsOpen(false);
+ }}
+ className="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1.5 px-2 py-1 text-xs text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 rounded hover:bg-gray-200 dark:hover:bg-gray-600"
+ >
+ <span>{t('items.filters.folders')}</span>
+ <svg
+ className={`w-5 h-5 ${showFolders ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}`}
+ viewBox="0 0 24 24"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth="2"
+ >
+ <rect x="3" y="3" width="18" height="18" rx="2" />
+ {showFolders && (
+ <polyline points="7 12 10 15 17 8" />
+ )}
+ </svg>
+ </button>
+ )}
+ </div>
+ <div className="border-t border-gray-200 dark:border-gray-700 my-1" />
+ {ITEM_TYPE_OPTIONS.map((option) => {
+ const selected = isItemTypeFilter(activeFilter as ItemFilterType) && activeFilter === option.type;
+ return (
+ <button
+ key={option.type}
+ onClick={() => handleSelectFilter(option.type)}
+ className={`${itemRowClass(selected)} flex items-center gap-2`}
+ >
+ <span className={selected ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}>
+ {option.iconSvg}
+ </span>
+ {t(option.titleKey)}
+ </button>
+ );
+ })}
+ <div className="border-t border-gray-200 dark:border-gray-700 my-1" />
+ <button
+ onClick={() => handleSelectFilter('passkeys')}
+ className={itemRowClass(activeFilter === 'passkeys')}
+ >
+ {t('items.filters.passkeys')}
+ </button>
+ <button
+ onClick={() => handleSelectFilter('attachments')}
+ className={itemRowClass(activeFilter === 'attachments')}
+ >
+ {t('common.attachments')}
+ </button>
+ <button
+ onClick={() => handleSelectFilter('totp')}
+ className={itemRowClass(activeFilter === 'totp')}
+ >
+ {t('items.filters.totp')}
+ </button>
+ <div className="border-t border-gray-200 dark:border-gray-700 my-1" />
+ <button
+ onClick={handleSelectRecentlyDeleted}
+ className={`${itemRowClass(activeFilter === 'deleted')} flex items-center justify-between`}
+ >
+ <span>{t('recentlyDeleted.title')}</span>
+ {recentlyDeletedCount > 0 && (
+ <span className={activeFilter === 'deleted' ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}>
+ {recentlyDeletedCount}
+ </span>
+ )}
+ </button>
+ </div>
+ </div>
+ </>
+ )}
+ </div>
+ );
+};
+
+export default ItemFilterDropdown;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
index 5a7aa6085..8e8bb7f31 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -9,6 +9,7 @@ import HeaderButton from '@/entrypoints/popup/components/HeaderButton';
import { HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';
import FolderPill from '@/entrypoints/popup/components/Items/FolderPill';
import ItemCard from '@/entrypoints/popup/components/Items/ItemCard';
+import ItemFilterDropdown from '@/entrypoints/popup/components/Items/ItemFilterDropdown';
import { ITEM_TYPE_OPTIONS } from '@/entrypoints/popup/components/Items/ItemTypeSelector';
import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';
import ReloadButton from '@/entrypoints/popup/components/ReloadButton';
@@ -114,7 +115,6 @@ const ItemsList: React.FC = () => {
const urlFilter = searchParams.get('filter');
return urlFilter ? parseItemFilterType(urlFilter) : getStoredFilter();
});
- const [showFilterMenu, setShowFilterMenu] = useState(false);
const [showFolderModal, setShowFolderModal] = useState(false);
const [showDeleteFolderModal, setShowDeleteFolderModal] = useState(false);
const [showEditFolderModal, setShowEditFolderModal] = useState(false);
@@ -744,29 +744,24 @@ const ItemsList: React.FC = () => {
<FolderBreadcrumb folderId={currentFolderId} />
<div className="flex justify-between items-center gap-2 mb-4">
- <div className="relative min-w-0 flex-1 flex items-center gap-2">
- <button
- onClick={() => setShowFilterMenu(!showFilterMenu)}
- className="flex items-center gap-1 text-gray-900 dark:text-white text-xl hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none min-w-0"
- >
- <h2 className="flex items-baseline gap-1.5 min-w-0 overflow-hidden">
- <span className="truncate">{getFilterTitle()}</span>
- <span className="text-sm text-gray-500 dark:text-gray-400 shrink-0">
- ({filteredItems.length})
- </span>
- </h2>
- <svg
- className="w-4 h-4 mt-1 shrink-0"
- viewBox="0 0 24 24"
- fill="none"
- stroke="currentColor"
- strokeWidth="2"
- strokeLinecap="round"
- strokeLinejoin="round"
- >
- <polyline points="6 9 12 15 18 9" />
- </svg>
- </button>
+ <div className="min-w-0 flex-1 flex items-center gap-2">
+ <ItemFilterDropdown
+ title={getFilterTitle()}
+ count={filteredItems.length}
+ activeFilter={filterType}
+ recentlyDeletedCount={recentlyDeletedCount}
+ showFoldersToggle={!currentFolderId}
+ showFolders={showFolders}
+ onToggleShowFolders={(next) => {
+ setShowFolders(next);
+ LocalPreferencesService.setShowFolders(next);
+ }}
+ onSelectFilter={(newFilter) => {
+ setItemFilterType(newFilter);
+ storeFilter(newFilter);
+ }}
+ onSelectRecentlyDeleted={() => navigate('/items/deleted')}
+ />
{/* Edit and Delete buttons when inside a folder */}
{currentFolderId && (
<div className="flex items-center gap-1 shrink-0">
@@ -791,142 +786,6 @@ const ItemsList: React.FC = () => {
</button>
</div>
)}
- {showFilterMenu && (
- <>
- <div
- className="fixed inset-0 z-10"
- onClick={() => {
- setShowFilterMenu(false);
- }}
- />
- <div className="absolute left-0 top-full mt-1 w-72 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-xl ring-1 ring-black/5 dark:ring-white/10 z-20">
- <div className="py-1">
- {/* All items filter with show folders toggle (only show toggle on root view) */}
- <div className="relative">
- <button
- onClick={() => {
- const newFilter = 'all';
- setItemFilterType(newFilter);
- storeFilter(newFilter);
- setShowFilterMenu(false);
- }}
- className={`w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
- filterType === 'all' ? 'bg-orange-50 dark:bg-orange-900/20 text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'
- }`}
- >
- {t('items.title')}
- </button>
- {!currentFolderId && (
- <button
- onClick={(e) => {
- e.stopPropagation();
- const newValue = !showFolders;
- setShowFolders(newValue);
- LocalPreferencesService.setShowFolders(newValue);
- setShowFilterMenu(false);
- }}
- className="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1.5 px-2 py-1 text-xs text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 rounded hover:bg-gray-200 dark:hover:bg-gray-600"
- >
- <span>{t('items.filters.folders')}</span>
- <svg
- className={`w-5 h-5 ${showFolders ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}`}
- viewBox="0 0 24 24"
- fill="none"
- stroke="currentColor"
- strokeWidth="2"
- >
- <rect x="3" y="3" width="18" height="18" rx="2" />
- {showFolders && (
- <polyline points="7 12 10 15 17 8" />
- )}
- </svg>
- </button>
- )}
- </div>
- <div className="border-t border-gray-200 dark:border-gray-700 my-1" />
- {/* Item type filters - dynamically generated from ItemTypes */}
- {ITEM_TYPE_OPTIONS.map((option) => (
- <button
- key={option.type}
- onClick={() => {
- const newFilter = option.type;
- setItemFilterType(newFilter);
- storeFilter(newFilter);
- setShowFilterMenu(false);
- }}
- className={`w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 flex items-center gap-2 ${
- filterType === option.type ? 'bg-orange-50 dark:bg-orange-900/20 text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'
- }`}
- >
- <span className={filterType === option.type ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}>
- {option.iconSvg}
- </span>
- {t(option.titleKey)}
- </button>
- ))}
- <div className="border-t border-gray-200 dark:border-gray-700 my-1" />
- {/* Passkeys filter */}
- <button
- onClick={() => {
- const newFilter = 'passkeys';
- setItemFilterType(newFilter);
- storeFilter(newFilter);
- setShowFilterMenu(false);
- }}
- className={`w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
- filterType === 'passkeys' ? 'bg-orange-50 dark:bg-orange-900/20 text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'
- }`}
- >
- {t('items.filters.passkeys')}
- </button>
- {/* Attachments filter */}
- <button
- onClick={() => {
- const newFilter = 'attachments';
- setItemFilterType(newFilter);
- storeFilter(newFilter);
- setShowFilterMenu(false);
- }}
- className={`w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
- filterType === 'attachments' ? 'bg-orange-50 dark:bg-orange-900/20 text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'
- }`}
- >
- {t('common.attachments')}
- </button>
- {/* TOTP filter */}
- <button
- onClick={() => {
- const newFilter = 'totp';
- setItemFilterType(newFilter);
- storeFilter(newFilter);
- setShowFilterMenu(false);
- }}
- className={`w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
- filterType === 'totp' ? 'bg-orange-50 dark:bg-orange-900/20 text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'
- }`}
- >
- {t('items.filters.totp')}
- </button>
- <div className="border-t border-gray-200 dark:border-gray-700 my-1" />
- {/* Recently deleted link */}
- <button
- onClick={() => {
- setShowFilterMenu(false);
- navigate('/items/deleted');
- }}
- className="w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 text-gray-700 dark:text-gray-300 flex items-center justify-between"
- >
- <span>{t('recentlyDeleted.title')}</span>
- {recentlyDeletedCount > 0 && (
- <span className="text-gray-400 dark:text-gray-500">
- {recentlyDeletedCount}
- </span>
- )}
- </button>
- </div>
- </div>
- </>
- )}
</div>
<div className="flex items-center gap-1">
{/* Sort button */}
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
index 8d06b1d32..7b96f3a89 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
@@ -1,16 +1,18 @@
import React, { useState, useEffect, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
import ConfirmDeleteModal from '@/entrypoints/popup/components/Dialogs/ConfirmDeleteModal';
+import ItemFilterDropdown from '@/entrypoints/popup/components/Items/ItemFilterDropdown';
import ItemIcon from '@/entrypoints/popup/components/Items/ItemIcon';
import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';
-import PageTitle from '@/entrypoints/popup/components/PageTitle';
import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
import { TRASH_RETENTION_DAYS } from '@/utils/constants/vault';
import type { Item } from '@/utils/dist/core/models/vault';
+import type { ItemFilterType } from '@/utils/itemFilters';
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
@@ -33,6 +35,7 @@ const getDaysRemaining = (deletedAt: string, retentionDays: number = TRASH_RETEN
*/
const RecentlyDeleted: React.FC = () => {
const { t } = useTranslation();
+ const navigate = useNavigate();
const dbContext = useDb();
const { executeVaultMutationAsync } = useVaultMutate();
const { setHeaderButtons } = useHeaderButtons();
@@ -147,10 +150,16 @@ const RecentlyDeleted: React.FC = () => {
return (
<div>
<div className="flex justify-between items-center mb-4">
- <PageTitle className="flex items-baseline gap-1.5">
- {t('recentlyDeleted.title')}
- <span className="text-sm text-gray-500 dark:text-gray-400">({items.length})</span>
- </PageTitle>
+ <ItemFilterDropdown
+ title={t('recentlyDeleted.title')}
+ count={items.length}
+ activeFilter="deleted"
+ recentlyDeletedCount={items.length}
+ onSelectFilter={(filter: ItemFilterType) => {
+ navigate(`/items?filter=${encodeURIComponent(filter)}`);
+ }}
+ onSelectRecentlyDeleted={() => {/* already on this page */}}
+ />
{items.length > 0 && (
<button
onClick={() => setShowConfirmEmptyAll(true)}