3 Commits

Author SHA1 Message Date
Elijah Duffy
ade904d0c9 1.1.2 2026-03-13 16:27:42 -07:00
Elijah Duffy
50c052a3c3 combobox: don't use portal for picker
fixes z-stacking issues when used within dialogs
2026-03-13 16:27:35 -07:00
Elijah Duffy
bcfd3ea740 dialog: add z-index to dialog api 2026-03-13 16:27:13 -07:00
3 changed files with 59 additions and 51 deletions

View File

@@ -4,7 +4,7 @@
"type": "git", "type": "git",
"url": "https://gitea.auvem.com/svelte-toolkit/sui.git" "url": "https://gitea.auvem.com/svelte-toolkit/sui.git"
}, },
"version": "1.1.1", "version": "1.1.2",
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
"build": "vite build && pnpm run prepack", "build": "vite build && pnpm run prepack",

View File

@@ -41,8 +41,7 @@
import Label from './Label.svelte'; import Label from './Label.svelte';
import StyledRawInput from './StyledRawInput.svelte'; import StyledRawInput from './StyledRawInput.svelte';
import { InputValidatorEvent, validate, type ValidatorOptions } from '@svelte-toolkit/validate'; import { InputValidatorEvent, validate, type ValidatorOptions } from '@svelte-toolkit/validate';
import { onMount, tick, untrack, type Snippet } from 'svelte'; import { untrack, type Snippet } from 'svelte';
import { Portal } from '@jsrob/svelte-portal';
import { scale } from 'svelte/transition'; import { scale } from 'svelte/transition';
import { generateIdentifier, type IconDef } from './util'; import { generateIdentifier, type IconDef } from './util';
import type { ClassValue, MouseEventHandler } from 'svelte/elements'; import type { ClassValue, MouseEventHandler } from 'svelte/elements';
@@ -502,8 +501,7 @@
<svelte:window onclick={handleWindowClick} /> <svelte:window onclick={handleWindowClick} />
<!-- Combobox picker --> <!-- Combobox picker -->
<Portal target="body"> {#if open}
{#if open}
<!-- Picker container --> <!-- Picker container -->
<div <div
class={[ class={[
@@ -548,8 +546,7 @@
{/if} {/if}
{/each} {/each}
</div> </div>
{/if} {/if}
</Portal>
<!-- Combobox main input container --> <!-- Combobox main input container -->
<div class={classValue}> <div class={classValue}>

View File

@@ -43,6 +43,14 @@
title: (title: string) => void; title: (title: string) => void;
/** Focuses the dialog */ /** Focuses the dialog */
focus: () => void; 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 = { type DialogControlButton = {
@@ -170,6 +178,7 @@
let dialogContainer = $state<HTMLDivElement | null>(null); let dialogContainer = $state<HTMLDivElement | null>(null);
let error = $state<ErrorMessage | null>(null); let error = $state<ErrorMessage | null>(null);
let stackIndex = $state(-1); let stackIndex = $state(-1);
const zIndex = $derived(1000 + stackIndex * 100);
/** handles open change */ /** handles open change */
const handleOpenChange = (localOpen: boolean) => { const handleOpenChange = (localOpen: boolean) => {
@@ -227,7 +236,9 @@
isFrozen: () => frozen, isFrozen: () => frozen,
canContinue: () => !loading && !disabled && !frozen, canContinue: () => !loading && !disabled && !frozen,
title: (newTitle) => (title = newTitle), title: (newTitle) => (title = newTitle),
focus: () => dialogPage?.focus() focus: () => dialogPage?.focus(),
stackIndex: () => stackIndex,
zIndex: () => zIndex
}; };
/** Returns the current state of the dialog */ /** Returns the current state of the dialog */
@@ -256,7 +267,7 @@
classValue classValue
]} ]}
style={// increase z-index and decrease opacity for each nested dialog style={// increase z-index and decrease opacity for each nested dialog
`z-index: ${1000 + stackIndex}`} `z-index: ${zIndex}`}
transition:fade={{ duration: 150 }} transition:fade={{ duration: 150 }}
onclick={(e) => { onclick={(e) => {
const target = e.target as HTMLElement; const target = e.target as HTMLElement;