mirror of
https://github.com/appwrite/console.git
synced 2026-11-18 20:47:21 +00:00
add: triggered based focus.
This commit is contained in:
1 parent
eb40103841
commit
4d4bac863f
5 files changed
+94
-41
No files matched your search
+77
-35
@@ -72,9 +72,8 @@
|
||||
import { chunks } from '$lib/helpers/array';
|
||||
import { Submit, trackEvent } from '$lib/actions/analytics';
|
||||
|
||||
import IndexesSuggestions from '../(suggestions)/indexes.svelte';
|
||||
import { showIndexesSuggestions, tableColumnSuggestions } from '../(suggestions)';
|
||||
import { isTabletViewport } from '$lib/stores/viewport';
|
||||
import IndexesSuggestions from '../(suggestions)/indexes.svelte';
|
||||
|
||||
let editRow: EditRow;
|
||||
let editRelatedRow: EditRelatedRow;
|
||||
@@ -87,6 +86,33 @@
|
||||
|
||||
let columnCreationHandler: ((response: RealtimeResponse) => void) | null = null;
|
||||
|
||||
// manual management of focus is needed!
|
||||
const autoFocusAction = (node: HTMLElement, shouldFocus: boolean) => {
|
||||
const button = node.querySelector('button');
|
||||
if (!button) return;
|
||||
|
||||
const handleBlur = () => button.classList.remove('focus-visible');
|
||||
const applyFocus = (focus: boolean) => {
|
||||
if (focus) {
|
||||
button.classList.add('focus-visible');
|
||||
button.focus();
|
||||
} else {
|
||||
button.classList.remove('focus-visible');
|
||||
}
|
||||
};
|
||||
|
||||
button.addEventListener('blur', handleBlur);
|
||||
applyFocus(shouldFocus);
|
||||
|
||||
return {
|
||||
update: applyFocus,
|
||||
destroy() {
|
||||
button.removeEventListener('blur', handleBlur);
|
||||
button.classList.remove('focus-visible');
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
onMount(() => {
|
||||
expandTabs.set(preferences.getKey('tableHeaderExpanded', true));
|
||||
|
||||
@@ -464,39 +490,47 @@
|
||||
{@const isLastRow = currentIndex >= rows.length - 1}
|
||||
|
||||
{#if !$isTabletViewport}
|
||||
<Button
|
||||
icon
|
||||
text
|
||||
size="xs"
|
||||
on:click={() => {
|
||||
if (currentIndex > 0) {
|
||||
databaseRowSheetOptions.update((opts) => ({
|
||||
...opts,
|
||||
row: rows[currentIndex - 1],
|
||||
rowIndex: currentIndex - 1
|
||||
}));
|
||||
}
|
||||
}}
|
||||
disabled={isFirstRow}>
|
||||
<Icon icon={IconChevronUp} />
|
||||
</Button>
|
||||
{@const shouldFocusPrev = !$databaseRowSheetOptions.autoFocus && !isFirstRow}
|
||||
{@const shouldFocusNext =
|
||||
!$databaseRowSheetOptions.autoFocus && isFirstRow && !isLastRow}
|
||||
|
||||
<Button
|
||||
icon
|
||||
text
|
||||
size="xs"
|
||||
on:click={() => {
|
||||
if (currentIndex < rows.length - 1) {
|
||||
databaseRowSheetOptions.update((opts) => ({
|
||||
...opts,
|
||||
row: rows[currentIndex + 1],
|
||||
rowIndex: currentIndex + 1
|
||||
}));
|
||||
}
|
||||
}}
|
||||
disabled={isLastRow}>
|
||||
<Icon icon={IconChevronDown} />
|
||||
</Button>
|
||||
<div use:autoFocusAction={shouldFocusPrev} class:nav-button-wrapper={shouldFocusPrev}>
|
||||
<Button
|
||||
icon
|
||||
text
|
||||
size="xs"
|
||||
on:click={() => {
|
||||
if (currentIndex > 0) {
|
||||
databaseRowSheetOptions.update((opts) => ({
|
||||
...opts,
|
||||
row: rows[currentIndex - 1],
|
||||
rowIndex: currentIndex - 1
|
||||
}));
|
||||
}
|
||||
}}
|
||||
disabled={isFirstRow}>
|
||||
<Icon icon={IconChevronUp} />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div use:autoFocusAction={shouldFocusNext} class:nav-button-wrapper={shouldFocusNext}>
|
||||
<Button
|
||||
icon
|
||||
text
|
||||
size="xs"
|
||||
on:click={() => {
|
||||
if (currentIndex < rows.length - 1) {
|
||||
databaseRowSheetOptions.update((opts) => ({
|
||||
...opts,
|
||||
row: rows[currentIndex + 1],
|
||||
rowIndex: currentIndex + 1
|
||||
}));
|
||||
}
|
||||
}}
|
||||
disabled={isLastRow}>
|
||||
<Icon icon={IconChevronDown} />
|
||||
</Button>
|
||||
</div>
|
||||
{/if}
|
||||
{/snippet}
|
||||
|
||||
@@ -504,7 +538,8 @@
|
||||
<EditRow
|
||||
bind:this={editRow}
|
||||
bind:row={$databaseRowSheetOptions.row}
|
||||
bind:rowId={$databaseRowSheetOptions.rowId} />
|
||||
bind:rowId={$databaseRowSheetOptions.rowId}
|
||||
autoFocus={$databaseRowSheetOptions.autoFocus} />
|
||||
{/key}
|
||||
</SideSheet>
|
||||
|
||||
@@ -574,3 +609,10 @@
|
||||
</Dialog>
|
||||
|
||||
<IndexesSuggestions />
|
||||
|
||||
<style lang="scss">
|
||||
// not the best solution but needed!
|
||||
.nav-button-wrapper :global(button.focus-visible) {
|
||||
outline: var(--border-width-l) solid var(--border-focus);
|
||||
}
|
||||
</style>
|
||||
+1
-1
@@ -92,7 +92,7 @@
|
||||
</Layout.Stack>
|
||||
|
||||
{#if topEndActions}
|
||||
<Layout.Stack direction="row" gap="m" alignItems="center" inline>
|
||||
<Layout.Stack direction="row" gap="xs" alignItems="center" inline>
|
||||
{@render topEndActions()}
|
||||
</Layout.Stack>
|
||||
{/if}
|
||||
|
||||
+6
-2
@@ -25,10 +25,12 @@
|
||||
|
||||
let {
|
||||
row = $bindable(),
|
||||
rowId = $bindable(null)
|
||||
rowId = $bindable(null),
|
||||
autoFocus = true
|
||||
}: {
|
||||
row?: Models.Row | null;
|
||||
rowId?: string | null;
|
||||
autoFocus?: boolean;
|
||||
} = $props();
|
||||
|
||||
let loading = $state(false);
|
||||
@@ -82,7 +84,9 @@
|
||||
$effect(() => {
|
||||
if (row) {
|
||||
work = initWork();
|
||||
requestAnimationFrame(() => focusFirstInput());
|
||||
if (autoFocus) {
|
||||
requestAnimationFrame(() => focusFirstInput());
|
||||
}
|
||||
} else {
|
||||
work = null;
|
||||
}
|
||||
|
||||
+7
-2
@@ -809,6 +809,7 @@
|
||||
const focusedRow = $paginatedRows.items.find((row) => row.$id === focusedRowId);
|
||||
|
||||
previouslyFocusedElement = document.activeElement;
|
||||
$databaseRowSheetOptions.autoFocus = false;
|
||||
onSelectSheetOption('update', null, 'row', focusedRow);
|
||||
}}>
|
||||
<svelte:fragment slot="header" let:root>
|
||||
@@ -935,6 +936,7 @@
|
||||
hide();
|
||||
previouslyFocusedElement =
|
||||
document.activeElement;
|
||||
$databaseRowSheetOptions.autoFocus = false;
|
||||
onSelectSheetOption(
|
||||
'update',
|
||||
null,
|
||||
@@ -985,8 +987,10 @@
|
||||
<SheetOptions
|
||||
type="row"
|
||||
column={rowColumn}
|
||||
onSelect={(option) =>
|
||||
onSelectSheetOption(option, null, 'row', row)}
|
||||
onSelect={(option) => {
|
||||
$databaseRowSheetOptions.autoFocus = true;
|
||||
onSelectSheetOption(option, null, 'row', row);
|
||||
}}
|
||||
onVisibilityChanged={(visible) => {
|
||||
canShowDatetimePopover = !visible;
|
||||
}}>
|
||||
@@ -1113,6 +1117,7 @@
|
||||
rowColumn
|
||||
);
|
||||
} else {
|
||||
$databaseRowSheetOptions.autoFocus = true;
|
||||
onSelectSheetOption('update', null, 'row', row);
|
||||
}
|
||||
}} />
|
||||
|
||||
+3
-1
@@ -72,6 +72,7 @@ export const databaseRowSheetOptions = writable<
|
||||
rowId?: string;
|
||||
rows: Models.Row[];
|
||||
rowIndex?: number;
|
||||
autoFocus?: boolean;
|
||||
}
|
||||
>({
|
||||
title: null,
|
||||
@@ -79,7 +80,8 @@ export const databaseRowSheetOptions = writable<
|
||||
row: null,
|
||||
rowId: null, // for loading from a given id
|
||||
rows: [],
|
||||
rowIndex: -1
|
||||
rowIndex: -1,
|
||||
autoFocus: true
|
||||
});
|
||||
|
||||
export const databaseRelatedRowSheetOptions = writable<
|
||||
|
||||
Reference in new issue
Block a user