Compare commits
3 Commits
v1.1.1
...
ade904d0c9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ade904d0c9 | ||
|
|
50c052a3c3 | ||
|
|
bcfd3ea740 |
@@ -4,7 +4,7 @@
|
||||
"type": "git",
|
||||
"url": "https://gitea.auvem.com/svelte-toolkit/sui.git"
|
||||
},
|
||||
"version": "1.1.1",
|
||||
"version": "1.1.2",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
"build": "vite build && pnpm run prepack",
|
||||
|
||||
@@ -41,8 +41,7 @@
|
||||
import Label from './Label.svelte';
|
||||
import StyledRawInput from './StyledRawInput.svelte';
|
||||
import { InputValidatorEvent, validate, type ValidatorOptions } from '@svelte-toolkit/validate';
|
||||
import { onMount, tick, untrack, type Snippet } from 'svelte';
|
||||
import { Portal } from '@jsrob/svelte-portal';
|
||||
import { untrack, type Snippet } from 'svelte';
|
||||
import { scale } from 'svelte/transition';
|
||||
import { generateIdentifier, type IconDef } from './util';
|
||||
import type { ClassValue, MouseEventHandler } from 'svelte/elements';
|
||||
@@ -502,54 +501,52 @@
|
||||
<svelte:window onclick={handleWindowClick} />
|
||||
|
||||
<!-- Combobox picker -->
|
||||
<Portal target="body">
|
||||
{#if open}
|
||||
<!-- Picker container -->
|
||||
<div
|
||||
class={[
|
||||
'picker absolute top-0 left-0 z-50 overflow-y-auto px-2 py-3',
|
||||
'rounded-sm border shadow-lg shadow-black/25 outline-hidden',
|
||||
'border-sui-accent dark:border-sui-accent/50 dark:bg-sui-text-800 bg-white dark:sm:bg-slate-800',
|
||||
'text-sui-text dark:text-sui-background',
|
||||
open && pickerPosition === 'top' && 'mb-[var(--outer-gap)]',
|
||||
open && pickerPosition === 'bottom' && 'mt-[var(--outer-gap)]'
|
||||
]}
|
||||
bind:this={pickerContainer}
|
||||
transition:scale={{ duration: 200 }}
|
||||
role="listbox"
|
||||
onkeydown={(e) => {
|
||||
if (e.key === 'Escape') {
|
||||
popover.setOpen(false);
|
||||
searchInput?.focus();
|
||||
}
|
||||
}}
|
||||
onscroll={(e) => {
|
||||
if (!onscroll) return;
|
||||
const target = e.target as HTMLDivElement;
|
||||
if (!target) return;
|
||||
{#if open}
|
||||
<!-- Picker container -->
|
||||
<div
|
||||
class={[
|
||||
'picker absolute top-0 left-0 z-50 overflow-y-auto px-2 py-3',
|
||||
'rounded-sm border shadow-lg shadow-black/25 outline-hidden',
|
||||
'border-sui-accent dark:border-sui-accent/50 dark:bg-sui-text-800 bg-white dark:sm:bg-slate-800',
|
||||
'text-sui-text dark:text-sui-background',
|
||||
open && pickerPosition === 'top' && 'mb-[var(--outer-gap)]',
|
||||
open && pickerPosition === 'bottom' && 'mt-[var(--outer-gap)]'
|
||||
]}
|
||||
bind:this={pickerContainer}
|
||||
transition:scale={{ duration: 200 }}
|
||||
role="listbox"
|
||||
onkeydown={(e) => {
|
||||
if (e.key === 'Escape') {
|
||||
popover.setOpen(false);
|
||||
searchInput?.focus();
|
||||
}
|
||||
}}
|
||||
onscroll={(e) => {
|
||||
if (!onscroll) return;
|
||||
const target = e.target as HTMLDivElement;
|
||||
if (!target) return;
|
||||
|
||||
const margin = 10; // 10px margin for top & bottom
|
||||
const atTop = target.scrollTop < margin;
|
||||
const atBottom = target.scrollTop + target.clientHeight > target.scrollHeight - margin;
|
||||
onscroll({ event: e, top: atTop, bottom: atBottom, searchInput: searchInput?.value ?? '' });
|
||||
}}
|
||||
tabindex="0"
|
||||
{@attach minWidth({ options, mode: pickerWidth, matchElem: searchInput })}
|
||||
{...popover.floating()}
|
||||
>
|
||||
{#each filteredItems as opt (opt.value)}
|
||||
{@render option(opt)}
|
||||
const margin = 10; // 10px margin for top & bottom
|
||||
const atTop = target.scrollTop < margin;
|
||||
const atBottom = target.scrollTop + target.clientHeight > target.scrollHeight - margin;
|
||||
onscroll({ event: e, top: atTop, bottom: atBottom, searchInput: searchInput?.value ?? '' });
|
||||
}}
|
||||
tabindex="0"
|
||||
{@attach minWidth({ options, mode: pickerWidth, matchElem: searchInput })}
|
||||
{...popover.floating()}
|
||||
>
|
||||
{#each filteredItems as opt (opt.value)}
|
||||
{@render option(opt)}
|
||||
{:else}
|
||||
<!-- Display loading state or not found if no options available -->
|
||||
{#if loading}
|
||||
{@render option(loadingOption, true)}
|
||||
{:else}
|
||||
<!-- Display loading state or not found if no options available -->
|
||||
{#if loading}
|
||||
{@render option(loadingOption, true)}
|
||||
{:else}
|
||||
{@render option(notFoundOption, true)}
|
||||
{/if}
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
</Portal>
|
||||
{@render option(notFoundOption, true)}
|
||||
{/if}
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Combobox main input container -->
|
||||
<div class={classValue}>
|
||||
|
||||
@@ -43,6 +43,14 @@
|
||||
title: (title: string) => void;
|
||||
/** Focuses the dialog */
|
||||
focus: () => void;
|
||||
/** Returns the stack index for this dialog */
|
||||
stackIndex: () => number;
|
||||
/**
|
||||
* Returns the z-index of this dialog, where each incremental stack
|
||||
* index increases the z-index by 100 starting from 1000. This can be
|
||||
* used to layer custom elements on top of and within the dialog.
|
||||
*/
|
||||
zIndex: () => number;
|
||||
}
|
||||
|
||||
type DialogControlButton = {
|
||||
@@ -170,6 +178,7 @@
|
||||
let dialogContainer = $state<HTMLDivElement | null>(null);
|
||||
let error = $state<ErrorMessage | null>(null);
|
||||
let stackIndex = $state(-1);
|
||||
const zIndex = $derived(1000 + stackIndex * 100);
|
||||
|
||||
/** handles open change */
|
||||
const handleOpenChange = (localOpen: boolean) => {
|
||||
@@ -227,7 +236,9 @@
|
||||
isFrozen: () => frozen,
|
||||
canContinue: () => !loading && !disabled && !frozen,
|
||||
title: (newTitle) => (title = newTitle),
|
||||
focus: () => dialogPage?.focus()
|
||||
focus: () => dialogPage?.focus(),
|
||||
stackIndex: () => stackIndex,
|
||||
zIndex: () => zIndex
|
||||
};
|
||||
|
||||
/** Returns the current state of the dialog */
|
||||
@@ -256,7 +267,7 @@
|
||||
classValue
|
||||
]}
|
||||
style={// increase z-index and decrease opacity for each nested dialog
|
||||
`z-index: ${1000 + stackIndex}`}
|
||||
`z-index: ${zIndex}`}
|
||||
transition:fade={{ duration: 150 }}
|
||||
onclick={(e) => {
|
||||
const target = e.target as HTMLElement;
|
||||
|
||||
Reference in New Issue
Block a user