Type Popover with $$Props

This commit is contained in:
Ryan Gossiaux
2022-02-07 17:54:27 -08:00
parent 8e57b808b8
commit a193729ea9
5 changed files with 90 additions and 14 deletions

View File

@@ -39,6 +39,10 @@
} }
return context; return context;
} }
type TPopoverProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {};
</script> </script>
<script lang="ts"> <script lang="ts">
@@ -57,12 +61,19 @@
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, { type TPassThroughProps } from "$lib/utils/Render.svelte";
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Props *****/
type TAsProp = $$Generic<SupportedAs>;
type $$Props = TPopoverProps<typeof slotProps, TAsProp>;
export let as: SupportedAs = "div"; export let as: SupportedAs = "div";
export let use: HTMLActionArray = []; export let use: HTMLActionArray = [];
/***** Events *****/
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Component *****/
const buttonId = `headlessui-popover-button-${useId()}`; const buttonId = `headlessui-popover-button-${useId()}`;
const panelId = `headlessui-popover-panel-${useId()}`; const panelId = `headlessui-popover-panel-${useId()}`;
let popoverState: StateDefinition["popoverState"] = PopoverStates.Closed; let popoverState: StateDefinition["popoverState"] = PopoverStates.Closed;

View File

@@ -1,3 +1,12 @@
<script lang="ts" context="module">
type TPopoverButtonProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {
disabled?: boolean;
};
</script>
<script lang="ts"> <script lang="ts">
import { Keys } from "$lib/utils/keyboard"; import { Keys } from "$lib/utils/keyboard";
import { import {
@@ -13,14 +22,21 @@
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, { type TPassThroughProps } from "$lib/utils/Render.svelte";
import { resolveButtonType } from "$lib/utils/resolve-button-type"; import { resolveButtonType } from "$lib/utils/resolve-button-type";
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Props *****/
type TAsProp = $$Generic<SupportedAs>;
type $$Props = TPopoverButtonProps<typeof slotProps, TAsProp>;
export let as: SupportedAs = "button"; export let as: SupportedAs = "button";
export let use: HTMLActionArray = []; export let use: HTMLActionArray = [];
export let disabled: boolean = false;
export let disabled: Boolean = false; /***** Events *****/
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Component *****/
let api = usePopoverContext("PopoverButton"); let api = usePopoverContext("PopoverButton");
let apiButton = $api.button; let apiButton = $api.button;

View File

@@ -10,6 +10,11 @@
export function usePopoverGroupContext(): PopoverGroupContext | undefined { export function usePopoverGroupContext(): PopoverGroupContext | undefined {
return getContext(POPOVER_GROUP_CONTEXT_NAME); return getContext(POPOVER_GROUP_CONTEXT_NAME);
} }
type TPopoverGroupProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {};
</script> </script>
<script lang="ts"> <script lang="ts">
@@ -19,12 +24,19 @@
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, { type TPassThroughProps } from "$lib/utils/Render.svelte";
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Props *****/
type TAsProp = $$Generic<SupportedAs>;
type $$Props = TPopoverGroupProps<typeof slotProps, TAsProp>;
export let as: SupportedAs = "div"; export let as: SupportedAs = "div";
export let use: HTMLActionArray = []; export let use: HTMLActionArray = [];
/***** Events *****/
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Component *****/
let groupRef: HTMLDivElement | undefined; let groupRef: HTMLDivElement | undefined;
let popovers: PopoverRegisterBag[] = []; let popovers: PopoverRegisterBag[] = [];
@@ -65,15 +77,17 @@
isFocusWithinPopoverGroup, isFocusWithinPopoverGroup,
closeOthers, closeOthers,
}); });
$: slotProps = {};
</script> </script>
<Render <Render
{...$$restProps} {...$$restProps}
{as} {as}
use={[...use, forwardEvents]} use={[...use, forwardEvents]}
slotProps={{}} {slotProps}
name={"PopoverGroup"} name={"PopoverGroup"}
bind:el={groupRef} bind:el={groupRef}
> >
<slot /> <slot {...slotProps} />
</Render> </Render>

View File

@@ -1,3 +1,10 @@
<script lang="ts" context="module">
type TPopoverOverlayProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {};
</script>
<script lang="ts"> <script lang="ts">
import { State, useOpenClosed } from "$lib/internal/open-closed"; import { State, useOpenClosed } from "$lib/internal/open-closed";
import { PopoverStates, usePopoverContext } from "./Popover.svelte"; import { PopoverStates, usePopoverContext } from "./Popover.svelte";
@@ -5,13 +12,23 @@
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, { Features } from "$lib/utils/Render.svelte"; import Render, {
Features,
type TPassThroughProps,
} from "$lib/utils/Render.svelte";
import { useId } from "$lib/hooks/use-id"; import { useId } from "$lib/hooks/use-id";
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Props *****/
type TAsProp = $$Generic<SupportedAs>;
type $$Props = TPopoverOverlayProps<typeof slotProps, TAsProp>;
export let as: SupportedAs = "div"; export let as: SupportedAs = "div";
export let use: HTMLActionArray = []; export let use: HTMLActionArray = [];
/***** Events *****/
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Component *****/
let api = usePopoverContext("PopoverOverlay"); let api = usePopoverContext("PopoverOverlay");
let id = `headlessui-popover-overlay-${useId()}`; let id = `headlessui-popover-overlay-${useId()}`;

View File

@@ -7,6 +7,15 @@
| undefined { | undefined {
return getContext(POPOVER_PANEL_CONTEXT_NAME); return getContext(POPOVER_PANEL_CONTEXT_NAME);
} }
type TPopoverPanelProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {
focus?: boolean;
static?: boolean;
unmount?: boolean;
};
</script> </script>
<script lang="ts"> <script lang="ts">
@@ -25,14 +34,23 @@
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, { Features } from "$lib/utils/Render.svelte"; import Render, {
const forwardEvents = forwardEventsBuilder(get_current_component()); Features,
type TPassThroughProps,
} from "$lib/utils/Render.svelte";
/***** Props *****/
type TAsProp = $$Generic<SupportedAs>;
type $$Props = TPopoverPanelProps<typeof slotProps, TAsProp>;
export let as: SupportedAs = "div"; export let as: SupportedAs = "div";
export let use: HTMLActionArray = []; export let use: HTMLActionArray = [];
export let focus = false; export let focus = false;
/***** Events *****/
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Component *****/
let api = usePopoverContext("PopoverPanel"); let api = usePopoverContext("PopoverPanel");
setContext(POPOVER_PANEL_CONTEXT_NAME, $api.panelId); setContext(POPOVER_PANEL_CONTEXT_NAME, $api.panelId);