Skip to content

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

Update logo picker UI (#2159)

Leendert de Borsta8181dfaa4b9
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
index 4736317f0..5f7c1ff3a 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
@@ -38,21 +38,21 @@ const ItemLogoPicker: React.FC<ItemLogoPickerProps> = ({ item, pendingSelection,
*/
const renderPreview = (): React.ReactNode => {
if (pendingPreview) {
- return <img src={pendingPreview} alt="" className="w-8 h-8 object-contain" />;
+ return <img src={pendingPreview} alt="" className="w-6 h-6 object-contain" />;
}
if (effectiveLogo?.Kind === LogoKinds.Builtin) {
const svg = getAppIconSvg(effectiveLogo.Source);
if (svg) {
- return <div className="w-8 h-8" dangerouslySetInnerHTML={{ __html: svg }} />;
+ return <div className="w-6 h-6" dangerouslySetInnerHTML={{ __html: svg }} />;
}
}
if (effectiveLogo?.Kind === LogoKinds.Custom) {
const src = item.Logo ? SqliteClient.imgSrcFromBytes(item.Logo) : null;
if (src) {
- return <img src={src} alt="" className="w-8 h-8 object-contain" />;
+ return <img src={src} alt="" className="w-6 h-6 object-contain" />;
}
}
- return <ItemIconComponent item={{ ...item, LogoInfo: effectiveLogo }} className="w-8 h-8" />;
+ return <ItemIconComponent item={{ ...item, LogoInfo: effectiveLogo }} className="w-6 h-6" />;
};
/**
@@ -76,22 +76,21 @@ const ItemLogoPicker: React.FC<ItemLogoPickerProps> = ({ item, pendingSelection,
return (
<>
- <div className="flex items-center gap-3">
- <div className="flex items-center justify-center w-12 h-12 rounded-lg bg-gray-100 dark:bg-gray-700 flex-shrink-0">
- {renderPreview()}
- </div>
- <div className="min-w-0 flex-1">
- <p className="text-sm font-medium text-gray-700 dark:text-gray-300">{t('items.logo.logo')}</p>
- <p className="text-xs text-gray-500 dark:text-gray-400 truncate">{renderProvenance()}</p>
- </div>
- <button
- type="button"
- onClick={() => setIsPickerOpen(true)}
- className="px-3 py-1.5 text-sm rounded-lg border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"
- >
- {t('items.logo.change')}
- </button>
- </div>
+ <button
+ type="button"
+ onClick={() => setIsPickerOpen(true)}
+ title={`${t('items.logo.chooseLogo')} — ${renderProvenance()}`}
+ aria-label={t('items.logo.chooseLogo')}
+ className="group relative flex items-center justify-center w-[calc(2.5rem+2px)] h-[calc(2.5rem+2px)] flex-shrink-0 cursor-pointer rounded-md bg-gray-100 dark:bg-gray-700 border border-gray-300 dark:border-gray-600 hover:bg-gray-200 dark:hover:bg-gray-600 hover:border-primary-500 dark:hover:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors"
+ >
+ {renderPreview()}
+ {/* Hovering dims the logo and reveals a full-size pencil, so the click target reads as "edit" without a badge too small to recognise. */}
+ <span className="absolute inset-0 flex items-center justify-center rounded-md bg-gray-900/60 text-white opacity-0 group-hover:opacity-100 transition-opacity">
+ <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+ </svg>
+ </span>
+ </button>
<LogoPickerModal
isOpen={isPickerOpen}
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 5cda632e3..b5d224900 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
@@ -17,6 +17,8 @@ type ItemNameInputProps = {
folders: Folder[];
selectedFolderId: string | null | undefined;
onFolderChange: (folderId: string | null) => void;
+ // Optional control rendered directly left of the input (the item logo).
+ logoSlot?: React.ReactNode;
};
/**
@@ -29,7 +31,8 @@ const ItemNameInput: React.FC<ItemNameInputProps> = ({
onChange,
folders,
selectedFolderId,
- onFolderChange
+ onFolderChange,
+ logoSlot
}) => {
const { t } = useTranslation();
const [showFolderModal, setShowFolderModal] = useState(false);
@@ -177,36 +180,38 @@ const ItemNameInput: React.FC<ItemNameInputProps> = ({
<label htmlFor="itemName" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
{t('items.itemName')} <span className="text-red-500">*</span>
</label>
- <div className="relative flex items-center">
- <input
- ref={inputRef}
- id="itemName"
- type="text"
- value={value}
- onChange={handleNameChange}
- className={`w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:text-white ${selectedFolderId ? 'pr-28' : 'pr-10'}`}
- required
- />
- {/* Folder Button inside input - always visible, width adjusts based on whether a folder is selected */}
- <button
- type="button"
- onClick={handleOpenFolderModal}
- className={`absolute right-1 z-10 flex items-center gap-1 px-2 py-1 rounded transition-colors text-xs ${
- selectedFolderId
- ? 'bg-primary-100 dark:bg-primary-900/30 text-primary-600 dark:text-primary-400 hover:bg-primary-200 dark:hover:bg-primary-900/50'
- : 'text-gray-500 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-600'
- }`}
- title={selectedFolder?.Name || '-'}
- >
- <svg className="w-4 h-4 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" />
- </svg>
- {selectedFolderId && (
- <span className="max-w-16 truncate">
- {selectedFolder?.Name}
- </span>
- )}
- </button>
+ <div className="flex items-stretch gap-2">
+ {logoSlot}
+ <div className="relative flex items-center flex-1 min-w-0">
+ <input
+ ref={inputRef}
+ id="itemName"
+ type="text"
+ value={value}
+ onChange={handleNameChange}
+ className={`w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:text-white ${selectedFolderId ? 'pr-28' : 'pr-10'}`}
+ required
+ />
+ <button
+ type="button"
+ onClick={handleOpenFolderModal}
+ className={`absolute right-1 z-10 flex items-center gap-1 px-2 py-1 rounded transition-colors text-xs ${
+ selectedFolderId
+ ? 'bg-primary-100 dark:bg-primary-900/30 text-primary-600 dark:text-primary-400 hover:bg-primary-200 dark:hover:bg-primary-900/50'
+ : 'text-gray-500 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-600'
+ }`}
+ title={selectedFolder?.Name || '-'}
+ >
+ <svg className="w-4 h-4 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" />
+ </svg>
+ {selectedFolderId && (
+ <span className="max-w-16 truncate">
+ {selectedFolder?.Name}
+ </span>
+ )}
+ </button>
+ </div>
</div>
</div>
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
index 3e13d7e14..098055d37 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
@@ -1391,12 +1391,6 @@ const ItemAddEdit: React.FC = () => {
{/* Item Name and Primary fields block */}
<FormSection>
- <ItemLogoPicker
- item={item}
- pendingSelection={logoSelection}
- pendingPreview={logoPreview}
- onSelect={handleLogoSelect}
- />
<ItemNameInput
inputRef={nameInputRef}
value={item.Name || ''}
@@ -1404,6 +1398,14 @@ const ItemAddEdit: React.FC = () => {
folders={folders}
selectedFolderId={item.FolderId}
onFolderChange={(folderId) => setItem({ ...item, FolderId: folderId })}
+ logoSlot={
+ <ItemLogoPicker
+ item={item}
+ pendingSelection={logoSelection}
+ pendingPreview={logoPreview}
+ onSelect={handleLogoSelect}
+ />
+ }
/>
{/* Alternative item title suggestions (create mode) */}
{!isEditMode && ((): React.ReactNode => {