@@ -59,7 +59,7 @@
|
|||||||
import { get_current_component } from "svelte/internal";
|
import { get_current_component } from "svelte/internal";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features } from "$lib/utils/Render.svelte";
|
||||||
const forwardEvents = forwardEventsBuilder(get_current_component(), [
|
const forwardEvents = forwardEventsBuilder(get_current_component(), [
|
||||||
"close",
|
"close",
|
||||||
]);
|
]);
|
||||||
@@ -247,9 +247,8 @@
|
|||||||
on:mousedown={handleWindowMousedown}
|
on:mousedown={handleWindowMousedown}
|
||||||
on:keydown={handleWindowKeydown}
|
on:keydown={handleWindowKeydown}
|
||||||
/>
|
/>
|
||||||
{#if visible}
|
<FocusTrap {containers} {enabled} options={{ initialFocus }} />
|
||||||
<FocusTrap {containers} {enabled} options={{ initialFocus }} />
|
<StackContextProvider
|
||||||
<StackContextProvider
|
|
||||||
element={internalDialogRef}
|
element={internalDialogRef}
|
||||||
onUpdate={(message, element) => {
|
onUpdate={(message, element) => {
|
||||||
return match(message, {
|
return match(message, {
|
||||||
@@ -261,7 +260,7 @@
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<ForcePortalRootContext force={true}>
|
<ForcePortalRootContext force={true}>
|
||||||
<Portal>
|
<Portal>
|
||||||
<PortalGroup target={internalDialogRef}>
|
<PortalGroup target={internalDialogRef}>
|
||||||
@@ -276,6 +275,8 @@
|
|||||||
bind:el={internalDialogRef}
|
bind:el={internalDialogRef}
|
||||||
aria-describedby={describedby}
|
aria-describedby={describedby}
|
||||||
on:click={handleClick}
|
on:click={handleClick}
|
||||||
|
{visible}
|
||||||
|
features={Features.RenderStrategy | Features.Static}
|
||||||
>
|
>
|
||||||
<slot {...slotProps} />
|
<slot {...slotProps} />
|
||||||
</Render>
|
</Render>
|
||||||
@@ -284,5 +285,4 @@
|
|||||||
</PortalGroup>
|
</PortalGroup>
|
||||||
</Portal>
|
</Portal>
|
||||||
</ForcePortalRootContext>
|
</ForcePortalRootContext>
|
||||||
</StackContextProvider>
|
</StackContextProvider>
|
||||||
{/if}
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
import { get_current_component } from "svelte/internal";
|
import { get_current_component } from "svelte/internal";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features } from "$lib/utils/Render.svelte";
|
||||||
const forwardEvents = forwardEventsBuilder(get_current_component());
|
const forwardEvents = forwardEventsBuilder(get_current_component());
|
||||||
|
|
||||||
export let as: SupportedAs = "div";
|
export let as: SupportedAs = "div";
|
||||||
@@ -41,15 +41,15 @@
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if visible}
|
<Render
|
||||||
<Render
|
|
||||||
{...{ ...$$restProps, ...propsWeControl }}
|
{...{ ...$$restProps, ...propsWeControl }}
|
||||||
{as}
|
{as}
|
||||||
{slotProps}
|
{slotProps}
|
||||||
use={[...use, forwardEvents]}
|
use={[...use, forwardEvents]}
|
||||||
name={"DisclosurePanel"}
|
name={"DisclosurePanel"}
|
||||||
bind:el={$panelStore}
|
bind:el={$panelStore}
|
||||||
>
|
{visible}
|
||||||
|
features={Features.RenderStrategy | Features.Static}
|
||||||
|
>
|
||||||
<slot {...slotProps} />
|
<slot {...slotProps} />
|
||||||
</Render>
|
</Render>
|
||||||
{/if}
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import { Keys } from "$lib/utils/keyboard";
|
import { Keys } from "$lib/utils/keyboard";
|
||||||
import { Focus } from "$lib/utils/calculate-active-index";
|
import { Focus } from "$lib/utils/calculate-active-index";
|
||||||
import { State, useOpenClosed } from "$lib/internal/open-closed";
|
import { State, useOpenClosed } from "$lib/internal/open-closed";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features } from "$lib/utils/Render.svelte";
|
||||||
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
|
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
@@ -120,8 +120,7 @@
|
|||||||
$: slotProps = { open: $api.listboxState === ListboxStates.Open };
|
$: slotProps = { open: $api.listboxState === ListboxStates.Open };
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if visible}
|
<Render
|
||||||
<Render
|
|
||||||
{...$$restProps}
|
{...$$restProps}
|
||||||
{...propsWeControl}
|
{...propsWeControl}
|
||||||
{as}
|
{as}
|
||||||
@@ -130,7 +129,8 @@
|
|||||||
name={"ListboxOptions"}
|
name={"ListboxOptions"}
|
||||||
bind:el={$optionsRef}
|
bind:el={$optionsRef}
|
||||||
on:keydown={handleKeyDown}
|
on:keydown={handleKeyDown}
|
||||||
>
|
{visible}
|
||||||
|
features={Features.RenderStrategy | Features.Static}
|
||||||
|
>
|
||||||
<slot {...slotProps} />
|
<slot {...slotProps} />
|
||||||
</Render>
|
</Render>
|
||||||
{/if}
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
import { tick } from "svelte";
|
import { tick } from "svelte";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features } from "$lib/utils/Render.svelte";
|
||||||
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
|
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
|
||||||
import { get_current_component } from "svelte/internal";
|
import { get_current_component } from "svelte/internal";
|
||||||
|
|
||||||
@@ -138,8 +138,7 @@
|
|||||||
$: slotProps = { open: $api.menuState === MenuStates.Open };
|
$: slotProps = { open: $api.menuState === MenuStates.Open };
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if visible}
|
<Render
|
||||||
<Render
|
|
||||||
{...{ ...$$restProps, ...propsWeControl }}
|
{...{ ...$$restProps, ...propsWeControl }}
|
||||||
{as}
|
{as}
|
||||||
{slotProps}
|
{slotProps}
|
||||||
@@ -148,7 +147,8 @@
|
|||||||
name={"MenuItems"}
|
name={"MenuItems"}
|
||||||
on:keydown={handleKeyDown}
|
on:keydown={handleKeyDown}
|
||||||
on:keyup={handleKeyUp}
|
on:keyup={handleKeyUp}
|
||||||
>
|
{visible}
|
||||||
|
features={Features.RenderStrategy | Features.Static}
|
||||||
|
>
|
||||||
<slot {...slotProps} />
|
<slot {...slotProps} />
|
||||||
</Render>
|
</Render>
|
||||||
{/if}
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
import { get_current_component } from "svelte/internal";
|
import { get_current_component } from "svelte/internal";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features } from "$lib/utils/Render.svelte";
|
||||||
const forwardEvents = forwardEventsBuilder(get_current_component());
|
const forwardEvents = forwardEventsBuilder(get_current_component());
|
||||||
|
|
||||||
export let as: SupportedAs = "div";
|
export let as: SupportedAs = "div";
|
||||||
@@ -27,8 +27,7 @@
|
|||||||
$: slotProps = { open: $api.popoverState === PopoverStates.Open };
|
$: slotProps = { open: $api.popoverState === PopoverStates.Open };
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if visible}
|
<Render
|
||||||
<Render
|
|
||||||
{...$$restProps}
|
{...$$restProps}
|
||||||
{as}
|
{as}
|
||||||
{slotProps}
|
{slotProps}
|
||||||
@@ -36,7 +35,8 @@
|
|||||||
name={"PopoverOverlay"}
|
name={"PopoverOverlay"}
|
||||||
on:click={handleClick}
|
on:click={handleClick}
|
||||||
aria-hidden
|
aria-hidden
|
||||||
>
|
{visible}
|
||||||
|
features={Features.RenderStrategy | Features.Static}
|
||||||
|
>
|
||||||
<slot {...slotProps} />
|
<slot {...slotProps} />
|
||||||
</Render>
|
</Render>
|
||||||
{/if}
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
import { get_current_component } from "svelte/internal";
|
import { get_current_component } from "svelte/internal";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features } from "$lib/utils/Render.svelte";
|
||||||
const forwardEvents = forwardEventsBuilder(get_current_component());
|
const forwardEvents = forwardEventsBuilder(get_current_component());
|
||||||
|
|
||||||
export let as: SupportedAs = "div";
|
export let as: SupportedAs = "div";
|
||||||
@@ -135,8 +135,7 @@
|
|||||||
on:keydown={handleWindowKeydown}
|
on:keydown={handleWindowKeydown}
|
||||||
on:focus|capture={handleFocus}
|
on:focus|capture={handleFocus}
|
||||||
/>
|
/>
|
||||||
{#if visible}
|
<Render
|
||||||
<Render
|
|
||||||
{...$$restProps}
|
{...$$restProps}
|
||||||
id={$api.panelId}
|
id={$api.panelId}
|
||||||
{as}
|
{as}
|
||||||
@@ -145,7 +144,8 @@
|
|||||||
name={"PopoverPanel"}
|
name={"PopoverPanel"}
|
||||||
bind:el={$panelStore}
|
bind:el={$panelStore}
|
||||||
on:keydown={handleKeydown}
|
on:keydown={handleKeydown}
|
||||||
>
|
{visible}
|
||||||
|
features={Features.RenderStrategy | Features.Static}
|
||||||
|
>
|
||||||
<slot {...slotProps} />
|
<slot {...slotProps} />
|
||||||
</Render>
|
</Render>
|
||||||
{/if}
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import { get_current_component } from "svelte/internal";
|
import { get_current_component } from "svelte/internal";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features } from "$lib/utils/Render.svelte";
|
||||||
const forwardEvents = forwardEventsBuilder(get_current_component());
|
const forwardEvents = forwardEventsBuilder(get_current_component());
|
||||||
|
|
||||||
export let as: SupportedAs = "div";
|
export let as: SupportedAs = "div";
|
||||||
@@ -31,13 +31,13 @@
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if selected}
|
<Render
|
||||||
<Render
|
|
||||||
{...{ ...$$restProps, ...propsWeControl }}
|
{...{ ...$$restProps, ...propsWeControl }}
|
||||||
{as}
|
{as}
|
||||||
use={[...use, forwardEvents]}
|
use={[...use, forwardEvents]}
|
||||||
name={"TabPanel"}
|
name={"TabPanel"}
|
||||||
>
|
visible={selected}
|
||||||
|
features={Features.RenderStrategy | Features.Static}
|
||||||
|
>
|
||||||
<slot />
|
<slot />
|
||||||
</Render>
|
</Render>
|
||||||
{/if}
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
import { get_current_component } from "svelte/internal";
|
import { get_current_component } from "svelte/internal";
|
||||||
import type { SupportedAs } from "$lib/internal/elements";
|
import type { SupportedAs } from "$lib/internal/elements";
|
||||||
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
import type { HTMLActionArray } from "$lib/hooks/use-actions";
|
||||||
import Render from "$lib/utils/Render.svelte";
|
import Render, { Features, RenderStrategy } from "$lib/utils/Render.svelte";
|
||||||
const forwardEvents = forwardEventsBuilder(get_current_component(), [
|
const forwardEvents = forwardEventsBuilder(get_current_component(), [
|
||||||
"beforeEnter",
|
"beforeEnter",
|
||||||
"beforeLeave",
|
"beforeLeave",
|
||||||
@@ -29,7 +29,6 @@
|
|||||||
export let as: SupportedAs = "div";
|
export let as: SupportedAs = "div";
|
||||||
export let use: HTMLActionArray = [];
|
export let use: HTMLActionArray = [];
|
||||||
|
|
||||||
export let unmount = true;
|
|
||||||
export let enter = "";
|
export let enter = "";
|
||||||
export let enterFrom = "";
|
export let enterFrom = "";
|
||||||
export let enterTo = "";
|
export let enterTo = "";
|
||||||
@@ -186,8 +185,8 @@
|
|||||||
name={"TransitionChild"}
|
name={"TransitionChild"}
|
||||||
bind:el={container}
|
bind:el={container}
|
||||||
class={classes}
|
class={classes}
|
||||||
|
visible={state === TreeStates.Visible}
|
||||||
|
features={Features.RenderStrategy}
|
||||||
>
|
>
|
||||||
{#if state === TreeStates.Visible}
|
|
||||||
<slot />
|
<slot />
|
||||||
{/if}
|
|
||||||
</Render>
|
</Render>
|
||||||
|
|||||||
@@ -126,7 +126,6 @@
|
|||||||
export let use: HTMLActionArray = [];
|
export let use: HTMLActionArray = [];
|
||||||
|
|
||||||
export let show: boolean | undefined = undefined;
|
export let show: boolean | undefined = undefined;
|
||||||
export let unmount = true;
|
|
||||||
export let appear = false;
|
export let appear = false;
|
||||||
|
|
||||||
let openClosedState = useOpenClosed();
|
let openClosedState = useOpenClosed();
|
||||||
@@ -191,12 +190,11 @@
|
|||||||
setContext(TRANSITION_CONTEXT_NAME, transitionBag);
|
setContext(TRANSITION_CONTEXT_NAME, transitionBag);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if state === TreeStates.Visible}
|
{#if state === TreeStates.Visible || $$props.unmount === false}
|
||||||
<TransitionChild
|
<TransitionChild
|
||||||
{...$$restProps}
|
{...$$restProps}
|
||||||
{as}
|
{as}
|
||||||
use={[...use, forwardEvents]}
|
use={[...use, forwardEvents]}
|
||||||
{unmount}
|
|
||||||
on:afterEnter
|
on:afterEnter
|
||||||
on:afterLeave
|
on:afterLeave
|
||||||
on:beforeEnter
|
on:beforeEnter
|
||||||
|
|||||||
@@ -5,6 +5,26 @@
|
|||||||
} from "$lib/internal/elements";
|
} from "$lib/internal/elements";
|
||||||
import { get_current_component, SvelteComponent } from "svelte/internal";
|
import { get_current_component, SvelteComponent } from "svelte/internal";
|
||||||
|
|
||||||
|
export enum Features {
|
||||||
|
/** No features at all */
|
||||||
|
None = 0,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When used, this will allow us to use one of the render strategies.
|
||||||
|
*
|
||||||
|
* **The render strategies are:**
|
||||||
|
* - **Unmount** _(Will unmount the component.)_
|
||||||
|
* - **Hidden** _(Will hide the component using the [hidden] attribute.)_
|
||||||
|
*/
|
||||||
|
RenderStrategy = 1,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When used, this will allow the user of our component to be in control. This can be used when
|
||||||
|
* you want to transition based on some state.
|
||||||
|
*/
|
||||||
|
Static = 2,
|
||||||
|
}
|
||||||
|
|
||||||
export enum RenderStrategy {
|
export enum RenderStrategy {
|
||||||
Unmount,
|
Unmount,
|
||||||
Hidden,
|
Hidden,
|
||||||
@@ -14,13 +34,17 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { ActionArray } from "$lib/hooks/use-actions";
|
import type { ActionArray } from "$lib/hooks/use-actions";
|
||||||
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
|
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
|
||||||
|
const forwardEvents = forwardEventsBuilder(get_current_component());
|
||||||
|
|
||||||
export let name: string;
|
export let name: string;
|
||||||
export let as: SvelteComponent | SupportedElement;
|
export let as: SvelteComponent | SupportedElement;
|
||||||
export let el: HTMLElement | null = null;
|
export let el: HTMLElement | null = null;
|
||||||
export let use: ActionArray = [];
|
export let use: ActionArray = [];
|
||||||
export let slotProps: unknown = {};
|
export let slotProps: unknown = {};
|
||||||
const forwardEvents = forwardEventsBuilder(get_current_component());
|
export let visible = true;
|
||||||
|
export let features: Features = Features.None;
|
||||||
|
// The static and unmount props are only used in conjunction with the render strategies
|
||||||
|
export let unmount = true;
|
||||||
|
|
||||||
if (!as) {
|
if (!as) {
|
||||||
throw new Error(`<${name}> did not provide an \`as\` value to <Render>`);
|
throw new Error(`<${name}> did not provide an \`as\` value to <Render>`);
|
||||||
@@ -34,14 +58,30 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$: classStyle = $$props.class;
|
$: classStyle = $$props.class;
|
||||||
|
|
||||||
|
$: show =
|
||||||
|
visible ||
|
||||||
|
(features & Features.Static && $$props.static) ||
|
||||||
|
!(features & Features.RenderStrategy && unmount);
|
||||||
|
$: hidden =
|
||||||
|
!visible &&
|
||||||
|
!(features & Features.Static && $$props.static) &&
|
||||||
|
features & Features.RenderStrategy &&
|
||||||
|
!unmount;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:component
|
{#if show}
|
||||||
|
<svelte:component
|
||||||
this={element}
|
this={element}
|
||||||
bind:el
|
bind:el
|
||||||
use={[...use, forwardEvents]}
|
use={[...use, forwardEvents]}
|
||||||
{...$$restProps}
|
{...$$restProps}
|
||||||
class={typeof classStyle === "function" ? classStyle(slotProps) : classStyle}
|
class={typeof classStyle === "function"
|
||||||
>
|
? classStyle(slotProps)
|
||||||
|
: classStyle}
|
||||||
|
style={hidden ? "display: none" : $$props.style}
|
||||||
|
hidden={hidden || undefined}
|
||||||
|
>
|
||||||
<slot />
|
<slot />
|
||||||
</svelte:component>
|
</svelte:component>
|
||||||
|
{/if}
|
||||||
|
|||||||
Reference in New Issue
Block a user