Add use= support to Popover
Fixes #21 Not sure it's worth doing this component by component instead of figuring out <Render> first but w/e
This commit is contained in:
@@ -52,6 +52,8 @@
|
|||||||
import type { PopoverGroupContext } from "./PopoverGroup.svelte";
|
import type { PopoverGroupContext } from "./PopoverGroup.svelte";
|
||||||
import { getContext, setContext, onMount } from "svelte";
|
import { getContext, setContext, onMount } from "svelte";
|
||||||
import { writable, Writable } from "svelte/store";
|
import { writable, Writable } from "svelte/store";
|
||||||
|
import { ActionArray, useActions } from "$lib/hooks/use-actions";
|
||||||
|
export let use: ActionArray = [];
|
||||||
const buttonId = `headlessui-popover-button-${useId()}`;
|
const buttonId = `headlessui-popover-button-${useId()}`;
|
||||||
const panelId = `headlessui-popover-panel-${useId()}`;
|
const panelId = `headlessui-popover-panel-${useId()}`;
|
||||||
|
|
||||||
@@ -164,6 +166,6 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:window on:focus|capture={handleFocus} on:mousedown={handleMousedown} />
|
<svelte:window on:focus|capture={handleFocus} on:mousedown={handleMousedown} />
|
||||||
<div {...$$restProps}>
|
<div use:useActions={use} {...$$restProps}>
|
||||||
<slot open={popoverState === PopoverStates.Open} close={$api.close} />
|
<slot open={popoverState === PopoverStates.Open} close={$api.close} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -10,6 +10,8 @@
|
|||||||
import { PopoverStates, usePopoverContext } from "./Popover.svelte";
|
import { PopoverStates, usePopoverContext } from "./Popover.svelte";
|
||||||
import { usePopoverGroupContext } from "./PopoverGroup.svelte";
|
import { usePopoverGroupContext } from "./PopoverGroup.svelte";
|
||||||
import { usePopoverPanelContext } from "./PopoverPanel.svelte";
|
import { usePopoverPanelContext } from "./PopoverPanel.svelte";
|
||||||
|
import { ActionArray, useActions } from "$lib/hooks/use-actions";
|
||||||
|
export let use: ActionArray = [];
|
||||||
let buttonStore: Writable<HTMLButtonElement> = getContext("PopoverButtonRef");
|
let buttonStore: Writable<HTMLButtonElement> = getContext("PopoverButtonRef");
|
||||||
export let disabled: Boolean = false;
|
export let disabled: Boolean = false;
|
||||||
let api = usePopoverContext("PopoverButton");
|
let api = usePopoverContext("PopoverButton");
|
||||||
@@ -166,6 +168,7 @@
|
|||||||
<button
|
<button
|
||||||
{...$$restProps}
|
{...$$restProps}
|
||||||
{...propsWeControl}
|
{...propsWeControl}
|
||||||
|
use:useActions={use}
|
||||||
on:click={handleClick}
|
on:click={handleClick}
|
||||||
on:keydown={handleKeyDown}
|
on:keydown={handleKeyDown}
|
||||||
on:keyup={handleKeyUp}
|
on:keyup={handleKeyUp}
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { PopoverRegisterBag } from "./Popover.svelte";
|
import type { PopoverRegisterBag } from "./Popover.svelte";
|
||||||
import { getContext, setContext } from "svelte";
|
import { getContext, setContext } from "svelte";
|
||||||
|
import { ActionArray, useActions } from "$lib/hooks/use-actions";
|
||||||
|
export let use: ActionArray = [];
|
||||||
let groupRef: HTMLDivElement | undefined;
|
let groupRef: HTMLDivElement | undefined;
|
||||||
let popovers: PopoverRegisterBag[] = [];
|
let popovers: PopoverRegisterBag[] = [];
|
||||||
|
|
||||||
@@ -57,6 +59,6 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div {...$$restProps} bind:this={groupRef}>
|
<div use:useActions={use} {...$$restProps} bind:this={groupRef}>
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
import { ActionArray, useActions } from "$lib/hooks/use-actions";
|
||||||
|
|
||||||
import { State } from "$lib/internal/open-closed";
|
import { State } from "$lib/internal/open-closed";
|
||||||
import { getContext } from "svelte";
|
import { getContext } from "svelte";
|
||||||
import type { Writable } from "svelte/store";
|
import type { Writable } from "svelte/store";
|
||||||
import { PopoverStates, usePopoverContext } from "./Popover.svelte";
|
import { PopoverStates, usePopoverContext } from "./Popover.svelte";
|
||||||
|
export let use: ActionArray = [];
|
||||||
|
|
||||||
let api = usePopoverContext("PopoverOverlay");
|
let api = usePopoverContext("PopoverOverlay");
|
||||||
|
|
||||||
@@ -19,7 +22,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if visible}
|
{#if visible}
|
||||||
<div {...$$restProps} on:click={handleClick} aria-hidden>
|
<div use:useActions={use} {...$$restProps} on:click={handleClick} aria-hidden>
|
||||||
<slot open={$api.popoverState === PopoverStates.Open} />
|
<slot open={$api.popoverState === PopoverStates.Open} />
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -25,6 +25,8 @@
|
|||||||
StateDefinition,
|
StateDefinition,
|
||||||
usePopoverContext,
|
usePopoverContext,
|
||||||
} from "./Popover.svelte";
|
} from "./Popover.svelte";
|
||||||
|
import { ActionArray, useActions } from "$lib/hooks/use-actions";
|
||||||
|
export let use: ActionArray = [];
|
||||||
let panelStore: SvelteStore<HTMLDivElement> = getContext("PopoverPanelRef");
|
let panelStore: SvelteStore<HTMLDivElement> = getContext("PopoverPanelRef");
|
||||||
export let focus = false;
|
export let focus = false;
|
||||||
|
|
||||||
@@ -119,7 +121,12 @@
|
|||||||
on:focus|capture={handleFocus}
|
on:focus|capture={handleFocus}
|
||||||
/>
|
/>
|
||||||
{#if visible}
|
{#if visible}
|
||||||
<div {...$$restProps} on:keydown={handleKeydown} bind:this={$panelStore}>
|
<div
|
||||||
|
use:useActions={use}
|
||||||
|
{...$$restProps}
|
||||||
|
on:keydown={handleKeydown}
|
||||||
|
bind:this={$panelStore}
|
||||||
|
>
|
||||||
<slot open={$api.popoverState === PopoverStates.Open} close={$api.close} />
|
<slot open={$api.popoverState === PopoverStates.Open} close={$api.close} />
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
Reference in New Issue
Block a user