Type Tabs using $$Props

This commit is contained in:
Ryan Gossiaux
2022-02-07 15:25:19 -08:00
parent a582f79170
commit 6bc781b86e
6 changed files with 91 additions and 17 deletions

View File

@@ -1,3 +1,12 @@
<script lang="ts" context="module">
type TTabProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {
disabled?: boolean;
};
</script>
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte"; import { onMount } from "svelte";
import { Focus, focusIn } from "$lib/utils/focus-management"; import { Focus, focusIn } from "$lib/utils/focus-management";
@@ -9,15 +18,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 = TTabProps<typeof slotProps, TAsProp>;
export let as: SupportedAs = "button"; export let as: SupportedAs = "button";
export let use: HTMLActionArray = []; export let use: HTMLActionArray = [];
export let disabled = false; export let disabled = false;
/***** Events *****/
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Component *****/
let api = useTabsContext("Tab"); let api = useTabsContext("Tab");
let id = `headlessui-tabs-tab-${useId()}`; let id = `headlessui-tabs-tab-${useId()}`;
let tabRef: HTMLElement | null = null; let tabRef: HTMLElement | null = null;

View File

@@ -36,6 +36,15 @@
return context; return context;
} }
type TTabGroupProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {
defaultIndex?: number;
vertical?: boolean;
manual?: boolean;
};
</script> </script>
<script lang="ts"> <script lang="ts">
@@ -52,10 +61,11 @@
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(), [
"change", /***** Props *****/
]); type TAsProp = $$Generic<SupportedAs>;
type $$Props = TTabGroupProps<typeof slotProps, TAsProp>;
export let as: SupportedAs = "div"; export let as: SupportedAs = "div";
export let use: HTMLActionArray = []; export let use: HTMLActionArray = [];
@@ -63,13 +73,18 @@
export let vertical = false; export let vertical = false;
export let manual = false; export let manual = false;
/***** Events *****/
const forwardEvents = forwardEventsBuilder(get_current_component(), [
"change",
]);
const dispatch = createEventDispatcher();
/***** Component *****/
let selectedIndex: StateDefinition["selectedIndex"] = null; let selectedIndex: StateDefinition["selectedIndex"] = null;
let tabs: StateDefinition["tabs"] = []; let tabs: StateDefinition["tabs"] = [];
let panels: StateDefinition["panels"] = []; let panels: StateDefinition["panels"] = [];
let listRef: StateDefinition["listRef"] = writable(null); let listRef: StateDefinition["listRef"] = writable(null);
const dispatch = createEventDispatcher();
let api = writable<StateDefinition>({ let api = writable<StateDefinition>({
selectedIndex, selectedIndex,
orientation: vertical ? "vertical" : "horizontal", orientation: vertical ? "vertical" : "horizontal",

View File

@@ -1,15 +1,29 @@
<script lang="ts" context="module">
type TTabListProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {};
</script>
<script lang="ts"> <script lang="ts">
import { useTabsContext } from "./TabGroup.svelte"; import { useTabsContext } from "./TabGroup.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";
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 = TTabListProps<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 = useTabsContext("TabList"); let api = useTabsContext("TabList");
let listRef = $api.listRef; let listRef = $api.listRef;

View File

@@ -1,3 +1,10 @@
<script lang="ts" context="module">
type TTabPanelProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {};
</script>
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte"; import { onMount } from "svelte";
import { useTabsContext } from "./TabGroup.svelte"; import { useTabsContext } from "./TabGroup.svelte";
@@ -6,13 +13,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 { writable } from "svelte/store"; import { writable } from "svelte/store";
const forwardEvents = forwardEventsBuilder(get_current_component());
/***** Props *****/
type TAsProp = $$Generic<SupportedAs>;
type $$Props = TTabPanelProps<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 elementRef = writable<HTMLElement | null>(null); let elementRef = writable<HTMLElement | null>(null);
let api = useTabsContext("TabPanel"); let api = useTabsContext("TabPanel");
let id = `headlessui-tabs-panel-${useId()}`; let id = `headlessui-tabs-panel-${useId()}`;

View File

@@ -1,15 +1,29 @@
<script lang="ts" context="module">
type TTabPanelsProps<
TSlotProps extends {},
TAsProp extends SupportedAs
> = TPassThroughProps<TSlotProps, TAsProp> & {};
</script>
<script lang="ts"> <script lang="ts">
import { useTabsContext } from "./TabGroup.svelte"; import { useTabsContext } from "./TabGroup.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";
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 = TTabPanelsProps<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 = useTabsContext("TabPanels"); let api = useTabsContext("TabPanels");
$: slotProps = { selectedIndex: $api.selectedIndex }; $: slotProps = { selectedIndex: $api.selectedIndex };
</script> </script>

View File

@@ -56,7 +56,6 @@
> >
{#each tabs as tab, tabIdx (tab.name)} {#each tabs as tab, tabIdx (tab.name)}
<Tab <Tab
key={tab.name}
disabled={tab.disabled} disabled={tab.disabled}
class={({ selected }) => class={({ selected }) =>
classNames( classNames(
@@ -85,7 +84,7 @@
<TabPanels class="mt-4"> <TabPanels class="mt-4">
{#each tabs as tab (tab.name)} {#each tabs as tab (tab.name)}
<TabPanel class="bg-white rounded-lg p-4 shadow" key={tab.name}> <TabPanel class="bg-white rounded-lg p-4 shadow">
{tab.content} {tab.content}
</TabPanel> </TabPanel>
{/each} {/each}