feat: add IconGrid, EntityPicker controls and enhance search panel
CI / lint-and-check (push) Failing after 4m56s
CI / test (push) Has been skipped
CI / docker-build (push) Has been skipped

Port icon grid and entity picker patterns from wled-screen-controller.
IconGrid replaces plain <select> elements with visual icon grids for
known item sets (widget type, icon type, healthcheck method, permission
level). EntityPicker replaces search dropdowns with a command-palette
style overlay with keyboard navigation and filtering.

Enhance SearchDialog with keyboard navigation (arrow keys, Enter,
Escape), grouped results with section headers, active highlight,
and a footer with shortcut hints.
This commit is contained in:
2026-03-25 11:58:21 +03:00
parent 54a30ca4ca
commit 8d7847889e
11 changed files with 744 additions and 195 deletions
+72 -116
View File
@@ -1,6 +1,10 @@
<script lang="ts">
import { t } from 'svelte-i18n';
import { EntityType, TargetType, PermissionLevel } from '$lib/utils/constants.js';
import IconGrid from '$lib/components/ui/IconGrid.svelte';
import EntityPicker from '$lib/components/ui/EntityPicker.svelte';
import type { IconGridItem } from '$lib/components/ui/IconGrid.svelte';
import type { EntityPickerItem } from '$lib/components/ui/EntityPicker.svelte';
interface PermissionRecord {
id: string;
@@ -51,34 +55,44 @@
let selectedTargetType = $state<string>(TargetType.USER);
let selectedTargetId = $state('');
let selectedLevel = $state<string>(PermissionLevel.VIEW);
let entitySearchQuery = $state('');
let targetSearchQuery = $state('');
let showEntityDropdown = $state(false);
let showTargetDropdown = $state(false);
let entityOptions = $derived(
selectedEntityType === EntityType.APP ? apps : boards
const entityTypeItems: IconGridItem[] = [
{ value: EntityType.BOARD, icon: '📋', label: $t('admin.perm_board') ?? 'Board' },
{ value: EntityType.APP, icon: '🌐', label: $t('admin.perm_app') ?? 'App' }
];
const targetTypeItems: IconGridItem[] = [
{ value: TargetType.USER, icon: '👤', label: $t('admin.perm_user') ?? 'User' },
{ value: TargetType.GROUP, icon: '👥', label: $t('admin.perm_group') ?? 'Group' }
];
const levelItems: IconGridItem[] = [
{ value: PermissionLevel.VIEW, icon: '👁', label: $t('admin.perm_view') ?? 'View' },
{ value: PermissionLevel.EDIT, icon: '✏️', label: $t('admin.perm_edit') ?? 'Edit' },
{ value: PermissionLevel.ADMIN, icon: '🔑', label: $t('admin.perm_admin') ?? 'Admin' }
];
const entityPickerItems: EntityPickerItem[] = $derived(
(selectedEntityType === EntityType.APP ? apps : boards).map((opt) => ({
value: opt.id,
label: opt.name
}))
);
let targetOptions = $derived(
selectedTargetType === TargetType.USER ? users : groups
const targetPickerItems: EntityPickerItem[] = $derived(
(selectedTargetType === TargetType.USER ? users : groups).map((opt) => ({
value: opt.id,
label: opt.name
}))
);
let filteredEntityOptions = $derived(
entitySearchQuery.length > 0
? entityOptions.filter((opt) =>
opt.name.toLowerCase().includes(entitySearchQuery.toLowerCase())
)
: entityOptions
);
function handleEntityTypeChange() {
selectedEntityId = '';
}
let filteredTargetOptions = $derived(
targetSearchQuery.length > 0
? targetOptions.filter((opt) =>
opt.name.toLowerCase().includes(targetSearchQuery.toLowerCase())
)
: targetOptions
);
function handleTargetTypeChange() {
selectedTargetId = '';
}
function handleGrant() {
if (!selectedEntityId || !selectedTargetId) return;
@@ -91,8 +105,6 @@
});
selectedEntityId = '';
selectedTargetId = '';
entitySearchQuery = '';
targetSearchQuery = '';
}
function handleRevoke(perm: PermissionRecord) {
@@ -104,18 +116,6 @@
});
}
function selectEntity(option: SelectOption) {
selectedEntityId = option.id;
entitySearchQuery = option.name;
showEntityDropdown = false;
}
function selectTarget(option: SelectOption) {
selectedTargetId = option.id;
targetSearchQuery = option.name;
showTargetDropdown = false;
}
function getEntityName(entityType: string, entityId: string): string {
const list = entityType === EntityType.APP ? apps : boards;
return list.find((e) => e.id === entityId)?.name ?? entityId;
@@ -133,100 +133,56 @@
<h3 class="mb-3 text-sm font-semibold text-card-foreground">{$t('admin.perm_title')}</h3>
<div class="grid grid-cols-1 gap-3 sm:grid-cols-5">
<div>
<label for="perm-entity-type" class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_entity_type')}</label>
<select
id="perm-entity-type"
<label class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_entity_type')}</label>
<IconGrid
items={entityTypeItems}
bind:value={selectedEntityType}
onchange={() => { selectedEntityId = ''; entitySearchQuery = ''; }}
class="w-full rounded border border-input bg-background px-2 py-1.5 text-sm text-foreground"
>
<option value={EntityType.BOARD}>{$t('admin.perm_board')}</option>
<option value={EntityType.APP}>{$t('admin.perm_app')}</option>
</select>
</div>
<div>
<label for="perm-entity-search" class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_entity')}</label>
<div class="relative">
<input
id="perm-entity-search"
type="text"
bind:value={entitySearchQuery}
onfocus={() => { showEntityDropdown = true; }}
onblur={() => { setTimeout(() => { showEntityDropdown = false; }, 200); }}
placeholder={$t('admin.perm_search_placeholder')}
class="w-full rounded border border-input bg-background px-2 py-1.5 text-sm text-foreground placeholder:text-muted-foreground"
onchange={handleEntityTypeChange}
columns={2}
/>
{#if showEntityDropdown && filteredEntityOptions.length > 0}
<div class="absolute z-10 mt-1 max-h-40 w-full overflow-y-auto rounded border border-border bg-card shadow-lg">
{#each filteredEntityOptions as option (option.id)}
<button
type="button"
class="w-full px-3 py-1.5 text-left text-sm text-foreground hover:bg-accent"
onmousedown={() => selectEntity(option)}
>
{option.name}
</button>
{/each}
</div>
{/if}
</div>
</div>
<div>
<label for="perm-target-type" class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_target_type')}</label>
<select
id="perm-target-type"
<label class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_entity')}</label>
<EntityPicker
items={entityPickerItems}
bind:value={selectedEntityId}
placeholder={$t('admin.perm_select')}
searchPlaceholder={$t('admin.perm_search_placeholder')}
/>
</div>
<div>
<label class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_target_type')}</label>
<IconGrid
items={targetTypeItems}
bind:value={selectedTargetType}
onchange={() => { selectedTargetId = ''; targetSearchQuery = ''; }}
class="w-full rounded border border-input bg-background px-2 py-1.5 text-sm text-foreground"
>
<option value={TargetType.USER}>{$t('admin.perm_user')}</option>
<option value={TargetType.GROUP}>{$t('admin.perm_group')}</option>
</select>
</div>
<div>
<label for="perm-target-search" class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_target')}</label>
<div class="relative">
<input
id="perm-target-search"
type="text"
bind:value={targetSearchQuery}
onfocus={() => { showTargetDropdown = true; }}
onblur={() => { setTimeout(() => { showTargetDropdown = false; }, 200); }}
placeholder={$t('admin.perm_search_placeholder')}
class="w-full rounded border border-input bg-background px-2 py-1.5 text-sm text-foreground placeholder:text-muted-foreground"
onchange={handleTargetTypeChange}
columns={2}
/>
{#if showTargetDropdown && filteredTargetOptions.length > 0}
<div class="absolute z-10 mt-1 max-h-40 w-full overflow-y-auto rounded border border-border bg-card shadow-lg">
{#each filteredTargetOptions as option (option.id)}
<button
type="button"
class="w-full px-3 py-1.5 text-left text-sm text-foreground hover:bg-accent"
onmousedown={() => selectTarget(option)}
>
{option.name}
</button>
{/each}
</div>
{/if}
</div>
</div>
<div>
<label for="perm-level" class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_level')}</label>
<label class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_target')}</label>
<EntityPicker
items={targetPickerItems}
bind:value={selectedTargetId}
placeholder={$t('admin.perm_select')}
searchPlaceholder={$t('admin.perm_search_placeholder')}
/>
</div>
<div>
<label class="mb-1 block text-xs text-muted-foreground">{$t('admin.perm_level')}</label>
<div class="flex gap-1">
<select
id="perm-level"
<div class="flex-1">
<IconGrid
items={levelItems}
bind:value={selectedLevel}
class="w-full rounded border border-input bg-background px-2 py-1.5 text-sm text-foreground"
>
<option value={PermissionLevel.VIEW}>{$t('admin.perm_view')}</option>
<option value={PermissionLevel.EDIT}>{$t('admin.perm_edit')}</option>
<option value={PermissionLevel.ADMIN}>{$t('admin.perm_admin')}</option>
</select>
columns={3}
/>
</div>
<button
type="button"
onclick={handleGrant}
disabled={!selectedEntityId || !selectedTargetId}
class="shrink-0 rounded bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90 disabled:opacity-50"
class="shrink-0 self-start rounded bg-primary px-3 py-2 text-xs font-medium text-primary-foreground hover:bg-primary/90 disabled:opacity-50"
>
{$t('admin.perm_grant')}
</button>
+13 -9
View File
@@ -4,6 +4,8 @@
import type { z } from 'zod';
import type { createAppSchema } from '$lib/utils/validators.js';
import AppIconPicker from './AppIconPicker.svelte';
import IconGrid from '$lib/components/ui/IconGrid.svelte';
import type { IconGridItem } from '$lib/components/ui/IconGrid.svelte';
type AppSchema = z.infer<typeof createAppSchema>;
@@ -19,6 +21,11 @@
});
let showAdvanced = $state(false);
const healthcheckMethodItems: IconGridItem[] = [
{ value: 'GET', icon: '🔍', label: 'GET', desc: 'Full response' },
{ value: 'HEAD', icon: '📋', label: 'HEAD', desc: 'Headers only' }
];
</script>
<form method="POST" {action} use:enhance class="space-y-4">
@@ -140,20 +147,17 @@
<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
<div>
<label
for="healthcheckMethod"
class="mb-1 block text-sm font-medium text-card-foreground"
>
{$t('app.healthcheck_method')}
</label>
<select
id="healthcheckMethod"
<IconGrid
items={healthcheckMethodItems}
value={$form.healthcheckMethod ?? 'GET'}
onchange={(v) => ($form.healthcheckMethod = v as 'GET' | 'HEAD')}
name="healthcheckMethod"
bind:value={$form.healthcheckMethod}
class="w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus:outline-none focus:ring-2 focus:ring-ring"
>
<option value="GET">GET</option>
<option value="HEAD">HEAD</option>
</select>
columns={2}
/>
</div>
<div>
+17 -11
View File
@@ -1,5 +1,7 @@
<script lang="ts">
import { t } from 'svelte-i18n';
import IconGrid from '$lib/components/ui/IconGrid.svelte';
import type { IconGridItem } from '$lib/components/ui/IconGrid.svelte';
interface Props {
iconType: string;
@@ -9,9 +11,15 @@
let { iconType = $bindable('lucide'), iconValue = $bindable(''), onchange }: Props = $props();
function handleTypeChange(e: Event) {
const target = e.target as HTMLSelectElement;
iconType = target.value;
const iconTypeItems: IconGridItem[] = [
{ value: 'lucide', icon: '◇', label: $t('app.icon_lucide') ?? 'Lucide' },
{ value: 'simple', icon: '◆', label: $t('app.icon_simple') ?? 'Simple Icons' },
{ value: 'url', icon: '🔗', label: $t('app.icon_url') ?? 'Image URL' },
{ value: 'emoji', icon: '😀', label: $t('app.icon_emoji') ?? 'Emoji' }
];
function handleTypeChange(value: string) {
iconType = value;
iconValue = '';
onchange?.(iconType, iconValue);
}
@@ -27,16 +35,14 @@
<label class="block text-sm font-medium text-card-foreground">{$t('app.icon')}</label>
<div class="flex gap-2">
<select
<div class="w-44 shrink-0">
<IconGrid
items={iconTypeItems}
value={iconType}
onchange={handleTypeChange}
class="rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus:outline-none focus:ring-2 focus:ring-ring"
>
<option value="lucide">{$t('app.icon_lucide')}</option>
<option value="simple">{$t('app.icon_simple')}</option>
<option value="url">{$t('app.icon_url')}</option>
<option value="emoji">{$t('app.icon_emoji')}</option>
</select>
columns={2}
/>
</div>
<input
type="text"
+98 -24
View File
@@ -2,15 +2,13 @@
import { t } from 'svelte-i18n';
import { search } from '$lib/stores/search.svelte.js';
import SearchResult from './SearchResult.svelte';
import { goto } from '$app/navigation';
let inputEl: HTMLInputElement;
const appResults = $derived(search.results.filter((r) => r.type === 'app'));
const boardResults = $derived(search.results.filter((r) => r.type === 'board'));
let resultsEl: HTMLDivElement;
$effect(() => {
if (search.open && inputEl) {
// Focus input when dialog opens
requestAnimationFrame(() => inputEl?.focus());
}
});
@@ -20,19 +18,66 @@
search.close();
}
}
function handleKeydown(e: KeyboardEvent) {
if (e.key === 'ArrowDown') {
e.preventDefault();
search.moveSelection(1);
scrollActiveIntoView();
} else if (e.key === 'ArrowUp') {
e.preventDefault();
search.moveSelection(-1);
scrollActiveIntoView();
} else if (e.key === 'Enter') {
e.preventDefault();
const item = search.selectCurrent();
if (item) {
if (item.action) {
item.action();
} else if (item.type === 'app') {
window.open(item.url, '_blank', 'noopener,noreferrer');
} else {
goto(item.url);
}
search.close();
}
} else if (e.key === 'Tab') {
e.preventDefault();
}
}
function scrollActiveIntoView() {
requestAnimationFrame(() => {
const el = resultsEl?.querySelector('.search-active');
el?.scrollIntoView({ block: 'nearest' });
});
}
// Track flat index offset per group for keyboard highlight
function getFlatIndexOffset(groupIdx: number): number {
let offset = 0;
for (let i = 0; i < groupIdx; i++) {
offset += search.grouped[i].items.length;
}
return offset;
}
const isMac = $derived(
typeof navigator !== 'undefined' && navigator.platform?.toLowerCase().includes('mac')
);
</script>
{#if search.open}
<!-- Backdrop -->
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
class="fixed inset-0 z-50 flex items-start justify-center bg-black/50 pt-[15vh] backdrop-blur-sm"
onclick={handleBackdropClick}
onkeydown={(e) => e.key === 'Escape' && search.close()}
style="animation: searchFadeIn 0.15s ease-out"
>
<!-- Dialog -->
<div
class="w-full max-w-lg rounded-lg border border-border bg-popover shadow-2xl"
class="flex w-full max-w-lg flex-col rounded-lg border border-border bg-popover shadow-2xl"
style="max-height: 60vh; animation: searchSlideDown 0.2s cubic-bezier(0.16, 1, 0.3, 1)"
role="dialog"
aria-label={$t('search.placeholder')}
>
@@ -57,6 +102,7 @@
type="text"
placeholder={$t('search.placeholder')}
class="flex-1 bg-transparent text-sm text-foreground placeholder:text-muted-foreground focus:outline-none"
onkeydown={handleKeydown}
/>
<kbd
class="hidden rounded border border-border bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground sm:inline"
@@ -66,7 +112,7 @@
</div>
<!-- Results -->
<div class="max-h-[50vh] overflow-y-auto p-2">
<div class="overflow-y-auto p-2" bind:this={resultsEl}>
{#if search.loading}
<div class="flex items-center justify-center py-8">
<div
@@ -84,29 +130,57 @@
{$t('search.no_results', { values: { query: search.query } })}
</p>
{:else}
{#if appResults.length > 0}
{#each search.grouped as group, groupIdx (group.key)}
<div class="mb-2">
<p class="mb-1 px-3 text-xs font-medium uppercase tracking-wider text-muted-foreground">
{$t('search.apps')}
<p
class="mb-1 px-3 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground"
>
{$t(`search.${group.label}s`) ?? group.label}
</p>
{#each appResults as result (result.id)}
<SearchResult {result} onselect={() => search.close()} />
{#each group.items as result, itemIdx (result.id)}
{@const flatIdx = getFlatIndexOffset(groupIdx) + itemIdx}
<SearchResult
{result}
active={flatIdx === search.selectedIdx}
onselect={() => search.close()}
onhover={() => (search.selectedIdx = flatIdx)}
/>
{/each}
</div>
{/each}
{/if}
</div>
{#if boardResults.length > 0}
<div>
<p class="mb-1 px-3 text-xs font-medium uppercase tracking-wider text-muted-foreground">
{$t('search.boards')}
</p>
{#each boardResults as result (result.id)}
<SearchResult {result} onselect={() => search.close()} />
{/each}
</div>
{/if}
{/if}
<!-- Footer -->
<div class="border-t border-border px-4 py-1.5 text-[11px] text-muted-foreground">
<span class="inline-flex items-center gap-3">
<span>↑↓ {$t('search.nav_hint') ?? 'navigate'}</span>
<span>{$t('search.select_hint') ?? 'select'}</span>
<span>esc {$t('search.close_hint') ?? 'close'}</span>
<span class="ml-auto">{isMac ? '⌘' : 'Ctrl'}+K</span>
</span>
</div>
</div>
</div>
{/if}
<style>
@keyframes searchFadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes searchSlideDown {
from {
opacity: 0;
transform: translateY(-12px) scale(0.98);
}
to {
opacity: 1;
transform: translateY(0) scale(1);
}
}
</style>
+15 -3
View File
@@ -3,10 +3,12 @@
interface Props {
result: SearchResultItem;
active?: boolean;
onselect: () => void;
onhover?: () => void;
}
let { result, onselect }: Props = $props();
let { result, active = false, onselect, onhover }: Props = $props();
const href = $derived(result.type === 'app' ? result.url : `/boards/${result.id}`);
const isExternal = $derived(result.type === 'app');
@@ -17,11 +19,14 @@
target={isExternal ? '_blank' : undefined}
rel={isExternal ? 'noopener noreferrer' : undefined}
onclick={onselect}
class="flex items-center gap-3 rounded-md px-3 py-2.5 transition-colors hover:bg-accent"
onmouseenter={onhover}
class="flex items-center gap-3 rounded-md px-3 py-2.5 transition-colors
{active ? 'search-active bg-primary/15 text-foreground' : 'hover:bg-accent'}"
>
<!-- Icon -->
<div
class="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-muted text-muted-foreground"
class="flex h-9 w-9 shrink-0 items-center justify-center rounded-md
{active ? 'bg-primary/20 text-primary' : 'bg-muted text-muted-foreground'}"
>
{#if result.icon}
<span class="text-lg">{result.icon}</span>
@@ -76,4 +81,11 @@
>
{result.type}
</span>
<!-- Enter hint when active -->
{#if active}
<kbd class="shrink-0 rounded border border-border bg-muted px-1 py-0.5 text-[10px] text-muted-foreground">
</kbd>
{/if}
</a>
+240
View File
@@ -0,0 +1,240 @@
<script lang="ts">
import { t } from 'svelte-i18n';
import { Search } from 'lucide-svelte';
export interface EntityPickerItem {
value: string;
label: string;
icon?: string | null;
desc?: string | null;
}
interface Props {
items: EntityPickerItem[];
value: string;
onchange?: (value: string) => void;
placeholder?: string;
searchPlaceholder?: string;
allowNone?: boolean;
noneLabel?: string;
name?: string;
}
let {
items,
value = $bindable(),
onchange,
placeholder = '',
searchPlaceholder = '',
allowNone = false,
noneLabel = '—',
name
}: Props = $props();
let open = $state(false);
let query = $state('');
let highlightIdx = $state(0);
let listEl: HTMLDivElement;
let inputEl: HTMLInputElement;
const selectedItem = $derived(items.find((i) => i.value === value));
const allItems = $derived.by(() => {
const result: (EntityPickerItem & { _isNone?: boolean })[] = [];
if (allowNone) {
result.push({ value: '', label: noneLabel, icon: null, desc: null, _isNone: true });
}
result.push(...items);
return result;
});
const filtered = $derived.by(() => {
if (!query.trim()) return allItems;
const q = query.toLowerCase().trim();
return allItems.filter(
(i) =>
i.label.toLowerCase().includes(q) || (i.desc && i.desc.toLowerCase().includes(q))
);
});
$effect(() => {
if (open) {
// Reset highlight to current value when opened
const idx = filtered.findIndex((i) => i.value === value);
highlightIdx = idx >= 0 ? idx : 0;
}
});
function openPicker() {
query = '';
highlightIdx = 0;
open = true;
requestAnimationFrame(() => inputEl?.focus());
}
function closePicker() {
open = false;
query = '';
}
function selectItem(item: EntityPickerItem) {
value = item.value;
closePicker();
onchange?.(item.value);
}
function handleKeydown(e: KeyboardEvent) {
if (e.key === 'ArrowDown') {
e.preventDefault();
highlightIdx = Math.min(highlightIdx + 1, filtered.length - 1);
scrollHighlightIntoView();
} else if (e.key === 'ArrowUp') {
e.preventDefault();
highlightIdx = Math.max(highlightIdx - 1, 0);
scrollHighlightIntoView();
} else if (e.key === 'Enter') {
e.preventDefault();
if (filtered[highlightIdx]) {
selectItem(filtered[highlightIdx]);
}
} else if (e.key === 'Escape') {
e.preventDefault();
closePicker();
} else if (e.key === 'Tab') {
e.preventDefault();
}
}
function scrollHighlightIntoView() {
requestAnimationFrame(() => {
const el = listEl?.querySelector('.ep-highlight');
el?.scrollIntoView({ block: 'nearest' });
});
}
function handleBackdropClick(e: MouseEvent) {
if (e.target === e.currentTarget) closePicker();
}
// Reset highlight when query changes
$effect(() => {
query; // track
highlightIdx = 0;
});
</script>
{#if name}
<input type="hidden" {name} {value} />
{/if}
<button
type="button"
class="flex w-full items-center gap-2 rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground transition-colors hover:border-primary focus:outline-none focus:ring-2 focus:ring-ring"
onclick={openPicker}
>
{#if selectedItem}
{#if selectedItem.icon}
<span class="flex h-4 w-4 shrink-0 items-center justify-center text-muted-foreground">
<span>{selectedItem.icon}</span>
</span>
{/if}
<span class="flex-1 truncate text-left">{selectedItem.label}</span>
{:else if allowNone && !value}
<span class="flex-1 text-left text-muted-foreground">{noneLabel}</span>
{:else if placeholder}
<span class="flex-1 text-left text-muted-foreground">{placeholder}</span>
{/if}
<span class="shrink-0 text-xs text-muted-foreground">&#x25BE;</span>
</button>
{#if open}
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
class="fixed inset-0 z-50 flex items-start justify-center bg-black/50 pt-[15vh] backdrop-blur-sm"
onclick={handleBackdropClick}
onkeydown={() => {}}
style="animation: epFadeIn 0.15s ease-out"
>
<div
class="flex w-full max-w-md flex-col rounded-lg border border-border bg-popover shadow-2xl"
style="max-height: 60vh; animation: epSlideDown 0.2s cubic-bezier(0.16, 1, 0.3, 1)"
role="dialog"
aria-label={searchPlaceholder || 'Select entity'}
>
<!-- Search row -->
<div class="flex items-center gap-2 border-b border-border px-3 py-2.5">
<Search size={16} class="shrink-0 text-muted-foreground" />
<input
bind:this={inputEl}
bind:value={query}
type="text"
placeholder={searchPlaceholder || $t('admin.perm_search_placeholder') || 'Search...'}
class="flex-1 bg-transparent text-sm text-foreground placeholder:text-muted-foreground focus:outline-none"
autocomplete="off"
spellcheck="false"
onkeydown={handleKeydown}
/>
</div>
<!-- List -->
<div class="overflow-y-auto py-1" bind:this={listEl}>
{#if filtered.length === 0}
<div class="py-6 text-center text-sm text-muted-foreground"></div>
{:else}
{#each filtered as item, i (item.value + (item._isNone ? '_none' : ''))}
<button
type="button"
class="flex w-full items-center gap-3 px-3 py-2 text-left text-sm transition-colors
{i === highlightIdx ? 'ep-highlight bg-accent' : 'hover:bg-accent/50'}
{item.value === value && !item._isNone ? 'border-l-[3px] border-l-primary' : 'border-l-[3px] border-l-transparent'}"
onclick={() => selectItem(item)}
onmouseenter={() => (highlightIdx = i)}
>
{#if item.icon}
<span
class="flex h-5 w-5 shrink-0 items-center justify-center text-muted-foreground"
>
<span>{item.icon}</span>
</span>
{/if}
<span class="flex-1 truncate text-foreground">{item.label}</span>
{#if item.desc}
<span class="shrink-0 truncate text-xs text-muted-foreground" style="max-width: 40%">
{item.desc}
</span>
{/if}
</button>
{/each}
{/if}
</div>
<!-- Footer -->
<div
class="border-t border-border px-3 py-1.5 text-[11px] text-muted-foreground"
>
↑↓ navigate · Enter select · Esc close
</div>
</div>
</div>
{/if}
<style>
@keyframes epFadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes epSlideDown {
from {
opacity: 0;
transform: translateY(-12px) scale(0.98);
}
to {
opacity: 1;
transform: translateY(0) scale(1);
}
}
</style>
+189
View File
@@ -0,0 +1,189 @@
<script lang="ts">
import { t } from 'svelte-i18n';
export interface IconGridItem {
value: string;
icon: string;
label: string;
desc?: string;
}
interface Props {
items: IconGridItem[];
value: string;
onchange?: (value: string) => void;
columns?: number;
placeholder?: string;
name?: string;
}
let { items, value = $bindable(), onchange, columns = 2, placeholder = '', name }: Props =
$props();
let open = $state(false);
let triggerEl: HTMLButtonElement;
let popupEl: HTMLDivElement;
let filterQuery = $state('');
const selectedItem = $derived(items.find((i) => i.value === value));
const showFilter = $derived(items.length > 9);
const filteredItems = $derived(
filterQuery
? items.filter((i) => {
const text = `${i.label} ${i.desc || ''}`.toLowerCase();
return text.includes(filterQuery.toLowerCase());
})
: items
);
function toggle() {
if (open) {
close();
} else {
openPopup();
}
}
function openPopup() {
open = true;
filterQuery = '';
requestAnimationFrame(() => positionPopup());
}
function close() {
open = false;
filterQuery = '';
}
function select(item: IconGridItem) {
value = item.value;
close();
onchange?.(item.value);
}
function positionPopup() {
if (!triggerEl || !popupEl) return;
const rect = triggerEl.getBoundingClientRect();
const gap = 6;
const pad = 8;
const popupW = Math.max(rect.width, 220);
const spaceBelow = window.innerHeight - rect.bottom - gap - pad;
const spaceAbove = rect.top - gap - pad;
const openUp = spaceBelow < 200 && spaceAbove > spaceBelow;
const available = openUp ? spaceAbove : spaceBelow;
let left = rect.left;
if (left + popupW > window.innerWidth - pad) left = window.innerWidth - pad - popupW;
if (left < pad) left = pad;
popupEl.style.left = `${left}px`;
popupEl.style.width = `${popupW}px`;
popupEl.style.maxHeight = `${available}px`;
if (openUp) {
popupEl.style.top = '';
popupEl.style.bottom = `${window.innerHeight - rect.top + gap}px`;
} else {
popupEl.style.top = `${rect.bottom + gap}px`;
popupEl.style.bottom = '';
}
}
function handleKeydown(e: KeyboardEvent) {
if (e.key === 'Escape') {
e.preventDefault();
close();
}
}
function handleClickOutside(e: MouseEvent) {
const target = e.target as HTMLElement;
if (open && !target.closest('.icon-grid-popup') && !target.closest('.icon-grid-trigger')) {
close();
}
}
</script>
<svelte:window onclick={handleClickOutside} onkeydown={handleKeydown} />
{#if name}
<input type="hidden" {name} {value} />
{/if}
<button
type="button"
class="icon-grid-trigger flex w-full items-center gap-2 rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground transition-colors hover:border-primary focus:outline-none focus:ring-2 focus:ring-ring"
bind:this={triggerEl}
onclick={toggle}
>
{#if selectedItem}
<span class="flex h-5 w-5 shrink-0 items-center justify-center text-muted-foreground">
<span class="text-base">{selectedItem.icon}</span>
</span>
<span class="flex-1 text-left">{selectedItem.label}</span>
{:else if placeholder}
<span class="flex-1 text-left text-muted-foreground">{placeholder}</span>
{/if}
<span class="shrink-0 text-xs text-muted-foreground">&#x25BE;</span>
</button>
{#if open}
<div
class="icon-grid-popup fixed z-50 overflow-y-auto rounded-lg border border-border bg-popover shadow-xl"
bind:this={popupEl}
style="animation: iconGridSlideIn 0.15s ease-out"
>
{#if showFilter}
<div class="border-b border-border px-3 py-2">
<input
type="text"
bind:value={filterQuery}
placeholder={$t('common.search_filter') ?? 'Filter...'}
class="w-full bg-transparent text-sm text-foreground placeholder:text-muted-foreground focus:outline-none"
autofocus
/>
</div>
{/if}
<div
class="grid gap-1 p-1.5"
style:grid-template-columns="repeat({columns}, 1fr)"
>
{#each filteredItems as item (item.value)}
<button
type="button"
class="flex flex-col items-center gap-1 rounded-md px-2 py-2.5 text-center transition-colors
{item.value === value
? 'border-2 border-primary bg-primary/10 text-foreground'
: 'border-2 border-transparent hover:bg-accent text-foreground'}"
onclick={() => select(item)}
>
<span class="flex h-6 w-6 items-center justify-center">
<span class="text-lg">{item.icon}</span>
</span>
<span class="text-xs font-medium leading-tight">{item.label}</span>
{#if item.desc}
<span class="text-[10px] leading-tight text-muted-foreground">{item.desc}</span>
{/if}
</button>
{/each}
{#if filteredItems.length === 0}
<div class="col-span-full py-4 text-center text-xs text-muted-foreground">
{$t('search.no_results', { values: { query: filterQuery } })}
</div>
{/if}
</div>
</div>
{/if}
<style>
@keyframes iconGridSlideIn {
from {
opacity: 0;
transform: translateY(-4px) scale(0.98);
}
to {
opacity: 1;
transform: translateY(0) scale(1);
}
}
</style>
@@ -1,5 +1,9 @@
<script lang="ts">
import { t } from 'svelte-i18n';
import IconGrid from '$lib/components/ui/IconGrid.svelte';
import EntityPicker from '$lib/components/ui/EntityPicker.svelte';
import type { IconGridItem } from '$lib/components/ui/IconGrid.svelte';
import type { EntityPickerItem } from '$lib/components/ui/EntityPicker.svelte';
interface Props {
sectionId: string;
@@ -31,6 +35,26 @@
let statusLabel = $state('');
let statusAppIds = $state<string[]>([]);
const widgetTypeItems: IconGridItem[] = [
{ value: 'app', icon: '🖥️', label: 'App' },
{ value: 'bookmark', icon: '🔖', label: 'Bookmark' },
{ value: 'note', icon: '📝', label: 'Note' },
{ value: 'embed', icon: '🧩', label: 'Embed' },
{ value: 'status', icon: '📊', label: 'Status' }
];
const noteFormatItems: IconGridItem[] = [
{ value: 'markdown', icon: '📝', label: 'Markdown' },
{ value: 'text', icon: '📄', label: 'Plain Text' }
];
const appPickerItems: EntityPickerItem[] = $derived(
apps.map((app) => ({
value: app.id,
label: app.name
}))
);
function resetForm() {
selectedWidgetType = 'app';
selectedAppId = '';
@@ -94,40 +118,30 @@
</script>
<div class="mb-3 rounded-lg border border-border bg-muted/50 p-3">
<!-- Widget Type Selector -->
<!-- Widget Type Selector (Icon Grid) -->
<div class="mb-3">
<label for="widget-type-{sectionId}" class="mb-1 block text-sm font-medium text-foreground">
<label class="mb-1 block text-sm font-medium text-foreground">
Widget Type
</label>
<select
id="widget-type-{sectionId}"
<IconGrid
items={widgetTypeItems}
bind:value={selectedWidgetType}
class="w-full rounded-lg border border-input bg-background px-3 py-2 text-sm text-foreground transition-colors focus:border-primary focus:outline-none focus:ring-2 focus:ring-ring/30"
>
<option value="app">App</option>
<option value="bookmark">Bookmark</option>
<option value="note">Note</option>
<option value="embed">Embed</option>
<option value="status">Status</option>
</select>
columns={5}
/>
</div>
<!-- Type-specific config forms -->
{#if selectedWidgetType === 'app'}
<div>
<label for="widget-app-{sectionId}" class="mb-1 block text-sm font-medium text-foreground">
<label class="mb-1 block text-sm font-medium text-foreground">
{$t('widget.select_app')}
</label>
<select
id="widget-app-{sectionId}"
<EntityPicker
items={appPickerItems}
bind:value={selectedAppId}
class="w-full rounded-lg border border-input bg-background px-3 py-2 text-sm text-foreground transition-colors focus:border-primary focus:outline-none focus:ring-2 focus:ring-ring/30"
>
<option value="">{$t('widget.choose_app')}</option>
{#each apps as app (app.id)}
<option value={app.id}>{app.name}</option>
{/each}
</select>
placeholder={$t('widget.choose_app')}
searchPlaceholder={$t('widget.choose_app')}
/>
</div>
{:else if selectedWidgetType === 'bookmark'}
<div class="grid gap-3 sm:grid-cols-2">
@@ -177,15 +191,12 @@
{:else if selectedWidgetType === 'note'}
<div class="space-y-3">
<div>
<label for="note-format-{sectionId}" class="mb-1 block text-sm font-medium text-foreground">Format</label>
<select
id="note-format-{sectionId}"
<label class="mb-1 block text-sm font-medium text-foreground">Format</label>
<IconGrid
items={noteFormatItems}
bind:value={noteFormat}
class="w-full rounded-lg border border-input bg-background px-3 py-2 text-sm text-foreground transition-colors focus:border-primary focus:outline-none focus:ring-2 focus:ring-ring/30"
>
<option value="markdown">Markdown</option>
<option value="text">Plain Text</option>
</select>
columns={2}
/>
</div>
<div>
<label for="note-content-{sectionId}" class="mb-1 block text-sm font-medium text-foreground">Content</label>
+5
View File
@@ -258,6 +258,11 @@
"search.no_results": "No results for \"{query}\"",
"search.apps": "Apps",
"search.boards": "Boards",
"search.nav_hint": "navigate",
"search.select_hint": "select",
"search.close_hint": "close",
"common.search_filter": "Filter...",
"common.save": "Save",
"common.cancel": "Cancel",
+5
View File
@@ -246,6 +246,11 @@
"search.no_results": "Ничего не найдено по запросу «{query}»",
"search.apps": "Приложения",
"search.boards": "Доски",
"search.nav_hint": "навигация",
"search.select_hint": "выбрать",
"search.close_hint": "закрыть",
"common.search_filter": "Фильтр...",
"common.save": "Сохранить",
"common.cancel": "Отмена",
"common.delete": "Удалить",
+47
View File
@@ -5,17 +5,49 @@ export interface SearchResultItem {
description: string | null;
url: string;
icon: string | null;
/** Optional action (e.g. "open in new tab"). If present, item acts as a command. */
action?: () => void;
}
export interface SearchGroup {
key: string;
label: string;
items: SearchResultItem[];
}
const GROUP_ORDER: Record<string, number> = { app: 0, board: 1 };
class SearchStore {
open = $state(false);
query = $state('');
results = $state<SearchResultItem[]>([]);
loading = $state(false);
error = $state<string | null>(null);
selectedIdx = $state(0);
#debounceTimer: ReturnType<typeof setTimeout> | null = null;
/** Grouped results for rendering, preserving group order. */
get grouped(): SearchGroup[] {
const map = new Map<string, SearchResultItem[]>();
for (const item of this.results) {
const existing = map.get(item.type);
if (existing) {
existing.push(item);
} else {
map.set(item.type, [item]);
}
}
return Array.from(map.entries())
.sort(([a], [b]) => (GROUP_ORDER[a] ?? 99) - (GROUP_ORDER[b] ?? 99))
.map(([key, items]) => ({ key, label: key, items }));
}
/** Flat list of items in render order (for keyboard navigation). */
get flatItems(): SearchResultItem[] {
return this.grouped.flatMap((g) => g.items);
}
constructor() {
if (typeof window !== 'undefined') {
const handleKeyDown = (e: KeyboardEvent) => {
@@ -97,6 +129,7 @@ class SearchStore {
}
this.results = items;
this.selectedIdx = 0;
} catch {
this.error = 'Search failed';
this.results = [];
@@ -105,12 +138,25 @@ class SearchStore {
}
}
moveSelection(delta: number) {
const flat = this.flatItems;
if (flat.length === 0) return;
this.selectedIdx = Math.max(0, Math.min(this.selectedIdx + delta, flat.length - 1));
}
selectCurrent(): SearchResultItem | null {
const flat = this.flatItems;
if (this.selectedIdx < 0 || this.selectedIdx >= flat.length) return null;
return flat[this.selectedIdx];
}
toggle() {
this.open = !this.open;
if (!this.open) {
this.query = '';
this.results = [];
this.error = null;
this.selectedIdx = 0;
}
}
@@ -119,6 +165,7 @@ class SearchStore {
this.query = '';
this.results = [];
this.error = null;
this.selectedIdx = 0;
}
}