Add <Render> to Dialog

This commit is contained in:
Ryan Gossiaux
2021-12-20 18:34:38 -08:00
parent 6bb8554890
commit c73d9bf919
3 changed files with 69 additions and 12 deletions

View File

@@ -55,6 +55,17 @@
import ForcePortalRootContext from "$lib/internal/ForcePortalRootContext.svelte"; import ForcePortalRootContext from "$lib/internal/ForcePortalRootContext.svelte";
import Portal from "$lib/components/portal/Portal.svelte"; import Portal from "$lib/components/portal/Portal.svelte";
import PortalGroup from "$lib/components/portal/PortalGroup.svelte"; import PortalGroup from "$lib/components/portal/PortalGroup.svelte";
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
import { get_current_component } from "svelte/internal";
import type { SupportedAs } from "$lib/internal/elements";
import type { HTMLActionArray } from "$lib/hooks/use-actions";
import Render from "$lib/utils/Render.svelte";
const forwardEvents = forwardEventsBuilder(get_current_component(), [
"close",
]);
export let as: SupportedAs = "div";
export let use: HTMLActionArray = [];
export let open: Boolean | undefined = undefined; export let open: Boolean | undefined = undefined;
export let initialFocus: HTMLElement | null = null; export let initialFocus: HTMLElement | null = null;
@@ -217,7 +228,8 @@
} }
}); });
function handleClick(event: MouseEvent) { function handleClick(e: CustomEvent) {
let event = e as any as MouseEvent;
event.stopPropagation(); event.stopPropagation();
} }
@@ -227,6 +239,8 @@
"aria-modal": dialogState === DialogStates.Open ? true : undefined, "aria-modal": dialogState === DialogStates.Open ? true : undefined,
"aria-labelledby": titleId, "aria-labelledby": titleId,
}; };
$: slotProps = { open };
</script> </script>
<svelte:window <svelte:window
@@ -253,14 +267,18 @@
<PortalGroup target={internalDialogRef}> <PortalGroup target={internalDialogRef}>
<ForcePortalRootContext force={false}> <ForcePortalRootContext force={false}>
<DescriptionProvider name={"Dialog.Description"} let:describedby> <DescriptionProvider name={"Dialog.Description"} let:describedby>
<div <Render
{...{ ...$$restProps, ...propsWeControl }} {...{ ...$$restProps, ...propsWeControl }}
bind:this={internalDialogRef} {as}
{slotProps}
use={[...use, forwardEvents]}
name={"Dialog"}
bind:el={internalDialogRef}
aria-describedby={describedby} aria-describedby={describedby}
on:click={handleClick} on:click={handleClick}
> >
<slot {open} /> <slot {...slotProps} />
</div> </Render>
</DescriptionProvider> </DescriptionProvider>
</ForcePortalRootContext> </ForcePortalRootContext>
</PortalGroup> </PortalGroup>

View File

@@ -1,20 +1,42 @@
<script lang="ts"> <script lang="ts">
import { DialogStates, useDialogContext } from "./Dialog.svelte"; import { DialogStates, useDialogContext } from "./Dialog.svelte";
import { useId } from "$lib/hooks/use-id"; import { useId } from "$lib/hooks/use-id";
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
import { get_current_component } from "svelte/internal";
import type { SupportedAs } from "$lib/internal/elements";
import type { HTMLActionArray } from "$lib/hooks/use-actions";
import Render from "$lib/utils/Render.svelte";
const forwardEvents = forwardEventsBuilder(get_current_component());
export let as: SupportedAs = "div";
export let use: HTMLActionArray = [];
let api = useDialogContext("DialogOverlay"); let api = useDialogContext("DialogOverlay");
let id = `headlessui-dialog-overlay-${useId()}`; let id = `headlessui-dialog-overlay-${useId()}`;
function handleClick(event: MouseEvent) {
function handleClick(e: CustomEvent) {
let event = e as any as MouseEvent;
if (event.target !== event.currentTarget) return; if (event.target !== event.currentTarget) return;
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
$api.close(); $api.close();
} }
$: propsWeControl = { $: propsWeControl = {
id, id,
"aria-hidden": true, "aria-hidden": true,
}; };
$: slotProps = { open: $api.dialogState === DialogStates.Open };
</script> </script>
<div {...{ ...$$restProps, ...propsWeControl }} on:click={handleClick}> <Render
<slot open={$api.dialogState === DialogStates.Open} /> {...{ ...$$restProps, ...propsWeControl }}
</div> {as}
{slotProps}
use={[...use, forwardEvents]}
name={"DialogOverlay"}
on:click={handleClick}
>
<slot {...slotProps} />
</Render>

View File

@@ -2,6 +2,15 @@
import { DialogStates, useDialogContext } from "./Dialog.svelte"; import { DialogStates, useDialogContext } from "./Dialog.svelte";
import { useId } from "$lib/hooks/use-id"; import { useId } from "$lib/hooks/use-id";
import { onMount } from "svelte"; import { onMount } from "svelte";
import { forwardEventsBuilder } from "$lib/internal/forwardEventsBuilder";
import { get_current_component } from "svelte/internal";
import type { SupportedAs } from "$lib/internal/elements";
import type { HTMLActionArray } from "$lib/hooks/use-actions";
import Render from "$lib/utils/Render.svelte";
const forwardEvents = forwardEventsBuilder(get_current_component());
export let as: SupportedAs = "h2";
export let use: HTMLActionArray = [];
let api = useDialogContext("DialogTitle"); let api = useDialogContext("DialogTitle");
let id = `headlessui-dialog-title-${useId()}`; let id = `headlessui-dialog-title-${useId()}`;
@@ -12,8 +21,16 @@
$: propsWeControl = { $: propsWeControl = {
id, id,
}; };
$: slotProps = { open: $api.dialogState === DialogStates.Open };
</script> </script>
<h2 {...{ ...$$restProps, ...propsWeControl }}> <Render
<slot open={$api.dialogState === DialogStates.Open} /> {...{ ...$$restProps, ...propsWeControl }}
</h2> {as}
{slotProps}
use={[...use, forwardEvents]}
name={"DialogTitle"}
>
<slot {...slotProps} />
</Render>