Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c99c16b48 | ||
|
|
ffe9c0369b | ||
|
|
622481a1ca | ||
|
|
ebdca97527 | ||
|
|
bb27d0c9d7 | ||
|
|
ade904d0c9 | ||
|
|
50c052a3c3 | ||
|
|
bcfd3ea740 |
@@ -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",
|
||||||
|
|||||||
@@ -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,7 +501,6 @@
|
|||||||
<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
|
||||||
@@ -549,7 +547,6 @@
|
|||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</Portal>
|
|
||||||
|
|
||||||
<!-- Combobox main input container -->
|
<!-- Combobox main input container -->
|
||||||
<div class={classValue}>
|
<div class={classValue}>
|
||||||
|
|||||||
@@ -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 = {
|
||||||
@@ -68,9 +76,9 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores internal state of the dialog, everything necessary to render
|
* Stores internal state of the dialog, everything necessary to render
|
||||||
* internal snippets.
|
* internal and override capable snippets.
|
||||||
*/
|
*/
|
||||||
type DialogState = {
|
export type DialogState = {
|
||||||
frozen: boolean;
|
frozen: boolean;
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
disabled: boolean;
|
disabled: boolean;
|
||||||
@@ -104,9 +112,9 @@
|
|||||||
/** Bindable open state of the dialog */
|
/** Bindable open state of the dialog */
|
||||||
open?: boolean;
|
open?: boolean;
|
||||||
/** Title of the dialog */
|
/** Title of the dialog */
|
||||||
title: string | Snippet;
|
title: string | Snippet<[state: DialogState]>;
|
||||||
/** Description of the dialog, optionally rendered below the title */
|
/** Description of the dialog, optionally rendered below the title */
|
||||||
description?: string | Snippet;
|
description?: string | Snippet<[state: DialogState]>;
|
||||||
/** Size of the dialog (default: 'sm') */
|
/** Size of the dialog (default: 'sm') */
|
||||||
size?: 'sm' | 'md' | 'lg' | 'max';
|
size?: 'sm' | 'md' | 'lg' | 'max';
|
||||||
/** Additional classes for the dialog */
|
/** Additional classes for the dialog */
|
||||||
@@ -114,7 +122,7 @@
|
|||||||
/** Content of the dialog */
|
/** Content of the dialog */
|
||||||
children?: Snippet;
|
children?: Snippet;
|
||||||
/** Bottom controls for the dialog */
|
/** Bottom controls for the dialog */
|
||||||
controls?: Snippet | DialogControls;
|
controls?: Snippet<[state: DialogState]> | DialogControls;
|
||||||
/** Sets bottom alignment of controls (default: end) */
|
/** Sets bottom alignment of controls (default: end) */
|
||||||
controlsAlign?: 'start' | 'center' | 'end';
|
controlsAlign?: 'start' | 'center' | 'end';
|
||||||
/** Top-right close control */
|
/** Top-right close control */
|
||||||
@@ -133,8 +141,10 @@
|
|||||||
onopenchange?: ({ open, dialog }: { open: boolean; dialog: DialogAPI }) => void;
|
onopenchange?: ({ open, dialog }: { open: boolean; dialog: DialogAPI }) => void;
|
||||||
/** If default controls are used, controls loading state of submit button */
|
/** If default controls are used, controls loading state of submit button */
|
||||||
loading?: boolean;
|
loading?: boolean;
|
||||||
/** If default controls are used, freezes all interactions */
|
/** If default controls are used, freezes all interactions preventing user input */
|
||||||
frozen?: boolean;
|
frozen?: boolean;
|
||||||
|
/** If enabled, automatically freezes dialog when loading (default: true) */
|
||||||
|
autoFreeze?: boolean;
|
||||||
/** If default controls are used, disables submit button */
|
/** If default controls are used, disables submit button */
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
}
|
}
|
||||||
@@ -154,6 +164,7 @@
|
|||||||
onopenchange,
|
onopenchange,
|
||||||
loading = $bindable(false),
|
loading = $bindable(false),
|
||||||
frozen = $bindable(false),
|
frozen = $bindable(false),
|
||||||
|
autoFreeze = true,
|
||||||
disabled = $bindable(false)
|
disabled = $bindable(false)
|
||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
|
|
||||||
@@ -170,6 +181,9 @@
|
|||||||
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);
|
||||||
|
|
||||||
|
const reallyFrozen = $derived(autoFreeze ? frozen || loading : frozen);
|
||||||
|
|
||||||
/** handles open change */
|
/** handles open change */
|
||||||
const handleOpenChange = (localOpen: boolean) => {
|
const handleOpenChange = (localOpen: boolean) => {
|
||||||
@@ -227,13 +241,15 @@
|
|||||||
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 */
|
||||||
export const getState = (): DialogState => {
|
export const getState = (): DialogState => {
|
||||||
return {
|
return {
|
||||||
frozen,
|
frozen: reallyFrozen,
|
||||||
loading,
|
loading,
|
||||||
disabled,
|
disabled,
|
||||||
api: dialogAPI
|
api: dialogAPI
|
||||||
@@ -256,15 +272,15 @@
|
|||||||
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;
|
||||||
if (open && !frozen && !dialogContainer?.contains(target) && target !== dialogContainer)
|
if (open && !reallyFrozen && !dialogContainer?.contains(target) && target !== dialogContainer)
|
||||||
open = false;
|
open = false;
|
||||||
}}
|
}}
|
||||||
onkeydown={(e) => {
|
onkeydown={(e) => {
|
||||||
if (e.key === 'Escape' && !frozen) {
|
if (e.key === 'Escape' && !reallyFrozen) {
|
||||||
if (stackIndex === dialogStack.length - 1) {
|
if (stackIndex === dialogStack.length - 1) {
|
||||||
// only close if this dialog is the topmost dialog
|
// only close if this dialog is the topmost dialog
|
||||||
open = false;
|
open = false;
|
||||||
@@ -331,7 +347,9 @@
|
|||||||
controlsAlign === 'end' && 'justify-end'
|
controlsAlign === 'end' && 'justify-end'
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{#if controls && typeof controls === 'function'}{@render controls()}{:else if controls?.flip}
|
{#if controls && typeof controls === 'function'}{@render controls(
|
||||||
|
getState()
|
||||||
|
)}{:else if controls?.flip}
|
||||||
{#if controls.ok !== null}
|
{#if controls.ok !== null}
|
||||||
{@render dialogOkButton(getState(), controls.ok)}
|
{@render dialogOkButton(getState(), controls.ok)}
|
||||||
{/if}
|
{/if}
|
||||||
@@ -361,7 +379,7 @@
|
|||||||
state.api.close();
|
state.api.close();
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
disabled={state.frozen}
|
disabled={state.frozen || state.disabled}
|
||||||
>
|
>
|
||||||
{opts?.label || 'Cancel'}
|
{opts?.label || 'Cancel'}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -406,10 +424,10 @@
|
|||||||
</button>
|
</button>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|
||||||
{#snippet stringOrSnippet(val: string | Snippet)}
|
{#snippet stringOrSnippet(val: string | Snippet<[state: DialogState]>)}
|
||||||
{#if typeof val === 'string'}
|
{#if typeof val === 'string'}
|
||||||
{val}
|
{val}
|
||||||
{:else}
|
{:else}
|
||||||
{@render val()}
|
{@render val(getState())}
|
||||||
{/if}
|
{/if}
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|||||||
@@ -23,12 +23,22 @@
|
|||||||
activeIndex?: number;
|
activeIndex?: number;
|
||||||
/** Callback fired when the active tab changes */
|
/** Callback fired when the active tab changes */
|
||||||
onchange?: (event: { index: number; tab: TabPage }) => void;
|
onchange?: (event: { index: number; tab: TabPage }) => void;
|
||||||
/** Applies layout padding to the tab header & content areas (default: false) */
|
/** Applies layout padding to the tab header (default: false) */
|
||||||
padded?: boolean;
|
padHeader?: boolean;
|
||||||
|
/** Applies layout padding to the content areas (default: false) */
|
||||||
|
padContent?: 'padding' | 'margin' | 'none';
|
||||||
|
/** Additional classes applied to the outer container */
|
||||||
class?: ClassValue | null;
|
class?: ClassValue | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { pages, activeIndex = 0, onchange, padded = false, class: classValue }: Props = $props();
|
let {
|
||||||
|
pages,
|
||||||
|
activeIndex = 0,
|
||||||
|
onchange,
|
||||||
|
padHeader = false,
|
||||||
|
padContent = 'none',
|
||||||
|
class: classValue
|
||||||
|
}: Props = $props();
|
||||||
|
|
||||||
let primaryContainerEl: HTMLDivElement;
|
let primaryContainerEl: HTMLDivElement;
|
||||||
let tabContainerEl: HTMLDivElement;
|
let tabContainerEl: HTMLDivElement;
|
||||||
@@ -99,7 +109,7 @@
|
|||||||
bind:this={tabContainerEl}
|
bind:this={tabContainerEl}
|
||||||
class={[
|
class={[
|
||||||
'border-sui-text/15 relative mb-4 flex items-center gap-5 border-b-2',
|
'border-sui-text/15 relative mb-4 flex items-center gap-5 border-b-2',
|
||||||
padded && 'px-layout'
|
padHeader && 'px-layout'
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{#each pages as page, i (page.title)}
|
{#each pages as page, i (page.title)}
|
||||||
@@ -134,7 +144,7 @@
|
|||||||
|
|
||||||
{#key activeIndex}
|
{#key activeIndex}
|
||||||
<div
|
<div
|
||||||
class={[padded && 'px-layout']}
|
class={[padContent === 'padding' && 'px-layout', padContent === 'margin' && 'mx-layout']}
|
||||||
in:flyX={{ direction: activeIndex > prevIndex ? 1 : -1, duration: 180, delay: 181 }}
|
in:flyX={{ direction: activeIndex > prevIndex ? 1 : -1, duration: 180, delay: 181 }}
|
||||||
out:flyX={{ direction: activeIndex > prevIndex ? -1 : 1, duration: 180 }}
|
out:flyX={{ direction: activeIndex > prevIndex ? -1 : 1, duration: 180 }}
|
||||||
onoutrostart={lockHeight}
|
onoutrostart={lockHeight}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ export {
|
|||||||
default as Dialog,
|
default as Dialog,
|
||||||
type DialogAPI,
|
type DialogAPI,
|
||||||
type DialogControls,
|
type DialogControls,
|
||||||
|
type DialogState,
|
||||||
dialogCancelButton,
|
dialogCancelButton,
|
||||||
dialogCloseButton,
|
dialogCloseButton,
|
||||||
dialogOkButton
|
dialogOkButton
|
||||||
|
|||||||
@@ -537,15 +537,6 @@
|
|||||||
bind:open={dialogOpen}
|
bind:open={dialogOpen}
|
||||||
title="Dialog Title"
|
title="Dialog Title"
|
||||||
size="sm"
|
size="sm"
|
||||||
controls={{
|
|
||||||
ok: {
|
|
||||||
action: (dialog) => {
|
|
||||||
dialog.close();
|
|
||||||
alert('Dialog submitted!');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
cancel: null
|
|
||||||
}}
|
|
||||||
onopen={(dialog) => {
|
onopen={(dialog) => {
|
||||||
dialog.error('Example error message!');
|
dialog.error('Example error message!');
|
||||||
dialog.loading();
|
dialog.loading();
|
||||||
@@ -554,6 +545,19 @@
|
|||||||
}, 2000);
|
}, 2000);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
{#snippet controls(state)}
|
||||||
|
<Button onclick={() => state.api.close()}>Cancel</Button>
|
||||||
|
<Button
|
||||||
|
onclick={() => {
|
||||||
|
state.api.close();
|
||||||
|
alert('Dialog submitted!');
|
||||||
|
}}
|
||||||
|
loading={state.loading}
|
||||||
|
>
|
||||||
|
Submit
|
||||||
|
</Button>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
<p>This is a dialog content area.</p>
|
<p>This is a dialog content area.</p>
|
||||||
|
|
||||||
<Button onclick={() => (nestedDialogOpen = true)}>Open Nested Dialog</Button>
|
<Button onclick={() => (nestedDialogOpen = true)}>Open Nested Dialog</Button>
|
||||||
|
|||||||
Reference in New Issue
Block a user