From 4b4e07747cc3650258d400a5e73c9f597459556c Mon Sep 17 00:00:00 2001
From: hhvrc <github@heavenvr.tech>
Date: Mon, 11 Nov 2024 11:17:47 +0100
Subject: [PATCH] Update shadcn-svelte components

---
 .../dropdown-menu-checkbox-item.svelte        | 15 +++++---
 .../ui/menubar/menubar-checkbox-item.svelte   | 15 +++++---
 src/lib/components/ui/menubar/menubar.svelte  |  2 +-
 src/lib/components/ui/sonner/sonner.svelte    | 29 +++++++-------
 .../components/ui/table/table-footer.svelte   |  6 +--
 src/lib/hooks/is-mobile.svelte.ts             | 38 +++++++++----------
 6 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
index f5f9db4..20e3777 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
@@ -1,35 +1,40 @@
 <script lang="ts">
-	import { DropdownMenu as DropdownMenuPrimitive, type WithoutChild } from "bits-ui";
+	import { DropdownMenu as DropdownMenuPrimitive, type WithoutChildrenOrChild } from "bits-ui";
 	import Check from "lucide-svelte/icons/check";
 	import Minus from "lucide-svelte/icons/minus";
 	import { cn } from "$lib/utils.js";
+	import type { Snippet } from "svelte";
 
 	let {
 		ref = $bindable(null),
 		checked = $bindable(false),
+		indeterminate = $bindable(false),
 		class: className,
 		children: childrenProp,
 		...restProps
-	}: WithoutChild<DropdownMenuPrimitive.CheckboxItemProps> = $props();
+	}: WithoutChildrenOrChild<DropdownMenuPrimitive.CheckboxItemProps> & {
+		children?: Snippet;
+	} = $props();
 </script>
 
 <DropdownMenuPrimitive.CheckboxItem
 	bind:ref
 	bind:checked
+	bind:indeterminate
 	class={cn(
 		"data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
 		className
 	)}
 	{...restProps}
 >
-	{#snippet children({ checked })}
+	{#snippet children({ checked, indeterminate })}
 		<span class="absolute left-2 flex size-3.5 items-center justify-center">
-			{#if checked === "indeterminate"}
+			{#if indeterminate}
 				<Minus class="size-4" />
 			{:else}
 				<Check class={cn("size-4", !checked && "text-transparent")} />
 			{/if}
 		</span>
-		{@render childrenProp?.({ checked })}
+		{@render childrenProp?.()}
 	{/snippet}
 </DropdownMenuPrimitive.CheckboxItem>
diff --git a/src/lib/components/ui/menubar/menubar-checkbox-item.svelte b/src/lib/components/ui/menubar/menubar-checkbox-item.svelte
index e63c028..9f7646a 100644
--- a/src/lib/components/ui/menubar/menubar-checkbox-item.svelte
+++ b/src/lib/components/ui/menubar/menubar-checkbox-item.svelte
@@ -1,35 +1,40 @@
 <script lang="ts">
-	import { Menubar as MenubarPrimitive, type WithoutChild } from "bits-ui";
+	import { Menubar as MenubarPrimitive, type WithoutChildrenOrChild } from "bits-ui";
 	import Check from "lucide-svelte/icons/check";
 	import Minus from "lucide-svelte/icons/minus";
 	import { cn } from "$lib/utils.js";
+	import type { Snippet } from "svelte";
 
 	let {
 		ref = $bindable(null),
 		class: className,
 		checked = $bindable(false),
+		indeterminate = $bindable(false),
 		children: childrenProp,
 		...restProps
-	}: WithoutChild<MenubarPrimitive.CheckboxItemProps> = $props();
+	}: WithoutChildrenOrChild<MenubarPrimitive.CheckboxItemProps> & {
+		children?: Snippet;
+	} = $props();
 </script>
 
 <MenubarPrimitive.CheckboxItem
 	bind:ref
 	bind:checked
+	bind:indeterminate
 	class={cn(
 		"data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
 		className
 	)}
 	{...restProps}
 >
-	{#snippet children({ checked })}
+	{#snippet children({ checked, indeterminate })}
 		<span class="absolute left-2 flex size-3.5 items-center justify-center">
-			{#if checked === "indeterminate"}
+			{#if indeterminate}
 				<Minus class="size-4" />
 			{:else}
 				<Check class={cn("size-4", !checked && "text-transparent")} />
 			{/if}
 		</span>
-		{@render childrenProp?.({ checked })}
+		{@render childrenProp?.()}
 	{/snippet}
 </MenubarPrimitive.CheckboxItem>
diff --git a/src/lib/components/ui/menubar/menubar.svelte b/src/lib/components/ui/menubar/menubar.svelte
index 3f63eef..55c34c6 100644
--- a/src/lib/components/ui/menubar/menubar.svelte
+++ b/src/lib/components/ui/menubar/menubar.svelte
@@ -11,6 +11,6 @@
 
 <MenubarPrimitive.Root
 	bind:ref
-	class={cn("bg-background flex h-16 items-center space-x-1 rounded-md border p-1", className)}
+	class={cn("bg-background flex h-10 items-center space-x-1 rounded-md border p-1", className)}
 	{...restProps}
 />
diff --git a/src/lib/components/ui/sonner/sonner.svelte b/src/lib/components/ui/sonner/sonner.svelte
index 92bf36e..c2f965c 100644
--- a/src/lib/components/ui/sonner/sonner.svelte
+++ b/src/lib/components/ui/sonner/sonner.svelte
@@ -1,21 +1,20 @@
 <script lang="ts">
-  import { Toaster as Sonner, type ToasterProps as SonnerProps } from 'svelte-sonner';
-  import { ColorSchemeStore } from '$lib/stores/ColorSchemeStore';
+	import { Toaster as Sonner, type ToasterProps as SonnerProps } from "svelte-sonner";
+	import { ColorSchemeStore } from '$lib/stores/ColorSchemeStore';
 
-  let restProps: SonnerProps = $props();
+	let restProps: SonnerProps = $props();
 </script>
 
 <Sonner
-  theme={$ColorSchemeStore}
-  class="toaster group"
-  toastOptions={{
-    classes: {
-      toast:
-        'group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg',
-      description: 'group-[.toast]:text-muted-foreground',
-      actionButton: 'group-[.toast]:bg-primary group-[.toast]:text-primary-foreground',
-      cancelButton: 'group-[.toast]:bg-muted group-[.toast]:text-muted-foreground',
-    },
-  }}
-  {...restProps}
+	theme={$ColorSchemeStore}
+	class="toaster group"
+	toastOptions={{
+		classes: {
+			toast: "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
+			description: "group-[.toast]:text-muted-foreground",
+			actionButton: "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",
+			cancelButton: "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",
+		},
+	}}
+	{...restProps}
 />
diff --git a/src/lib/components/ui/table/table-footer.svelte b/src/lib/components/ui/table/table-footer.svelte
index 68266ce..0267c47 100644
--- a/src/lib/components/ui/table/table-footer.svelte
+++ b/src/lib/components/ui/table/table-footer.svelte
@@ -11,10 +11,6 @@
 	}: WithElementRef<HTMLAttributes<HTMLTableSectionElement>> = $props();
 </script>
 
-<tfoot
-	bind:this={ref}
-	class={cn("bg-muted/50 text-primary-foreground font-medium", className)}
-	{...restProps}
->
+<tfoot bind:this={ref} class={cn("bg-muted/50 font-medium", className)} {...restProps}>
 	{@render children?.()}
 </tfoot>
diff --git a/src/lib/hooks/is-mobile.svelte.ts b/src/lib/hooks/is-mobile.svelte.ts
index df3778d..87bea4b 100644
--- a/src/lib/hooks/is-mobile.svelte.ts
+++ b/src/lib/hooks/is-mobile.svelte.ts
@@ -3,25 +3,25 @@ import { untrack } from "svelte";
 const MOBILE_BREAKPOINT = 768;
 
 export class IsMobile {
-  #current = $state<boolean>(false);
+	#current = $state<boolean>(false);
 
-  constructor() {
-    $effect(() => {
-      return untrack(() => {
-        const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
-        const onChange = () => {
-          this.#current = window.innerWidth < MOBILE_BREAKPOINT;
-        };
-        mql.addEventListener("change", onChange);
-        onChange();
-        return () => {
-          mql.removeEventListener("change", onChange);
-        };
-      });
-    });
-  }
+	constructor() {
+		$effect(() => {
+			return untrack(() => {
+				const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
+				const onChange = () => {
+					this.#current = window.innerWidth < MOBILE_BREAKPOINT;
+				};
+				mql.addEventListener("change", onChange);
+				onChange();
+				return () => {
+					mql.removeEventListener("change", onChange);
+				};
+			});
+		});
+	}
 
-  get current() {
-    return this.#current;
-  }
+	get current() {
+		return this.#current;
+	}
 }