From a582f79170e19907434bfbbbaea50a1e0ae3a69b Mon Sep 17 00:00:00 2001
From: Ryan Gossiaux <ryan.gossiaux@gmail.com>
Date: Mon, 7 Feb 2022 15:25:06 -0800
Subject: [PATCH] Type Switch using $$Props

---
 src/lib/components/switch/Switch.svelte      | 27 ++++++++++++++++----
 src/lib/components/switch/SwitchGroup.svelte | 23 ++++++++++++++---
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/switch/Switch.svelte b/src/lib/components/switch/Switch.svelte
index 856cc90..cea3373 100644
--- a/src/lib/components/switch/Switch.svelte
+++ b/src/lib/components/switch/Switch.svelte
@@ -1,3 +1,12 @@
+<script lang="ts" context="module">
+  type TSwitchProps<
+    TSlotProps extends {},
+    TAsProp extends SupportedAs
+  > = TPassThroughProps<TSlotProps, TAsProp> & {
+    checked: boolean;
+  };
+</script>
+
 <script lang="ts">
   import { useSwitchContext } from "./SwitchGroup.svelte";
   import { useLabelContext } from "$lib/components/label/LabelProvider.svelte";
@@ -9,18 +18,26 @@
   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";
+  import Render, { type TPassThroughProps } from "$lib/utils/Render.svelte";
   import { resolveButtonType } from "$lib/utils/resolve-button-type";
+
+  /***** Props *****/
+  type TAsProp = $$Generic<SupportedAs>;
+  type $$Props = TSwitchProps<typeof slotProps, TAsProp>;
+
+  export let as: SupportedAs = "button";
+  export let use: HTMLActionArray = [];
+  export let checked = false;
+
+  /***** Events *****/
   const forwardEvents = forwardEventsBuilder(get_current_component(), [
     "change",
   ]);
-  export let as: SupportedAs = "button";
-  export let use: HTMLActionArray = [];
-
   const dispatch = createEventDispatcher<{
     change: boolean;
   }>();
-  export let checked = false;
+
+  /***** Component *****/
   let api = useSwitchContext();
   let labelContext = useLabelContext();
   let descriptionContext = useDescriptionContext();
diff --git a/src/lib/components/switch/SwitchGroup.svelte b/src/lib/components/switch/SwitchGroup.svelte
index c027187..cc94625 100644
--- a/src/lib/components/switch/SwitchGroup.svelte
+++ b/src/lib/components/switch/SwitchGroup.svelte
@@ -7,6 +7,11 @@
   export function useSwitchContext(): Writable<StateDefinition> | undefined {
     return getContext(SWITCH_CONTEXT_NAME);
   }
+
+  type TSwitchGroupProps<
+    TSlotProps extends {},
+    TAsProp extends SupportedAs
+  > = TPassThroughProps<TSlotProps, TAsProp> & {};
 </script>
 
 <script lang="ts">
@@ -19,11 +24,19 @@
   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());
+  import Render, { type TPassThroughProps } from "$lib/utils/Render.svelte";
+
+  /***** Props *****/
+  type TAsProp = $$Generic<SupportedAs>;
+  type $$Props = TSwitchGroupProps<typeof slotProps, TAsProp>;
+
   export let as: SupportedAs = "div";
   export let use: HTMLActionArray = [];
 
+  /***** Events *****/
+  const forwardEvents = forwardEventsBuilder(get_current_component());
+
+  /***** Component *****/
   let switchStore: StateDefinition["switchStore"] = writable(null);
 
   let api = writable<StateDefinition>({
@@ -36,18 +49,20 @@
     $switchStore.click();
     $switchStore.focus({ preventScroll: true });
   }
+
+  $: slotProps = {};
 </script>
 
 <Render
   {...$$restProps}
   {as}
   use={[...use, forwardEvents]}
-  slotProps={{}}
+  {slotProps}
   name={"SwitchGroup"}
 >
   <DescriptionProvider name="SwitchDescription">
     <LabelProvider name="SwitchLabel" {onClick}>
-      <slot />
+      <slot {...slotProps} />
     </LabelProvider>
   </DescriptionProvider>
 </Render>