flowbite-svelte 1.10.4 → 1.10.6

package/dist/sidebar/SidebarDropdownWrapper.svelte

@@ -6,7 +6,6 @@
   import { sidebarDropdownWrapper, type SidebarDropdownWrapperTheme } from ".";
   import type { SidebarDropdownWrapperProps, ParamsType } from "../types";
   import clsx from "clsx";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   type SidebarContext = {
@@ -52,30 +51,30 @@
   }
 </script>
 
-<li class={cn(base(), clsx(className), (theme as SidebarDropdownWrapperTheme)?.base)}>
-  <button {...restProps} onclick={handleDropdown} type="button" class={cn(btn(), clsx(btnClass), (theme as SidebarDropdownWrapperTheme)?.btn)} aria-controls="sidebar-dropdown">
+<li class={base({ class: clsx((theme as SidebarDropdownWrapperTheme)?.base, className) })}>
+  <button {...restProps} onclick={handleDropdown} type="button" class={btn({ class: clsx((theme as SidebarDropdownWrapperTheme)?.btn, btnClass) })} aria-controls="sidebar-dropdown">
     {#if icon}
       {@render icon()}
     {/if}
-    <span class={cn(span(), clsx(spanClass), (theme as SidebarDropdownWrapperTheme)?.span)}>{label}</span>
+    <span class={span({ class: clsx((theme as SidebarDropdownWrapperTheme)?.span, spanClass) })}>{label}</span>
     {#if isOpen}
       {#if arrowup}
         {@render arrowup()}
       {:else}
-        <svg class={cn(svg(), clsx(svgClass), (theme as SidebarDropdownWrapperTheme)?.svg)} aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+        <svg class={svg({ class: clsx((theme as SidebarDropdownWrapperTheme)?.svg, svgClass) })} aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
           <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5 5 1 1 5" />
         </svg>
       {/if}
     {:else if arrowdown}
       {@render arrowdown()}
     {:else}
-      <svg class={cn(svg(), clsx(svgClass), (theme as SidebarDropdownWrapperTheme)?.svg)} aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+      <svg class={svg({ class: clsx((theme as SidebarDropdownWrapperTheme)?.svg, svgClass) })} aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" />
       </svg>
     {/if}
   </button>
   {#if isOpen}
-    <ul class={cn(ul(), clsx(ulClass), (theme as SidebarDropdownWrapperTheme)?.ul)} transition:transition={params as ParamsType}>
+    <ul class={ul({ class: clsx((theme as SidebarDropdownWrapperTheme)?.ul, ulClass) })} transition:transition={params as ParamsType}>
       {@render children()}
     </ul>
   {/if}

package/dist/sidebar/SidebarItem.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import { getContext } from "svelte";
-  import { type SidebarCtxType, type SidebarItemProps, cn } from "..";
+  import clsx from "clsx";
+  import { type SidebarCtxType, type SidebarItemProps } from "..";
 
   let { icon, subtext, href, label, spanClass = "ms-3", activeClass, nonActiveClass, aClass, active, class: className, ...restProps }: SidebarItemProps = $props();
 
@@ -22,12 +23,12 @@
   let aCls = $derived((activeItem ?? sidebarUrl === href) ? (activeClass ?? context.activeClass) : (nonActiveClass ?? context.nonActiveClass));
 </script>
 
-<li class={cn(className)}>
-  <a onclick={context.closeSidebar} {...restProps} {href} aria-current={(activeItem ?? sidebarUrl === href) ? "page" : undefined} class={cn(aCls, aClass)}>
+<li class={clsx(className)}>
+  <a onclick={context.closeSidebar} {...restProps} {href} aria-current={(activeItem ?? sidebarUrl === href) ? "page" : undefined} class={clsx(aCls, aClass)}>
     {#if icon}
       {@render icon()}
     {/if}
-    <span class={cn(spanClass)}>{label}</span>
+    <span class={clsx(spanClass)}>{label}</span>
     {#if subtext}
       {@render subtext()}
     {/if}

package/dist/sidebar/theme.d.ts

@@ -1,4 +1,5 @@
 import { type VariantProps } from "tailwind-variants";
+import type { ClassValue } from "svelte/elements";
 export type SidebarVariants = VariantProps<typeof sidebar>;
 export declare const sidebar: import("tailwind-variants").TVReturnType<{
     position: {
@@ -13,12 +14,8 @@ export declare const sidebar: import("tailwind-variants").TVReturnType<{
         };
     };
     isOpen: {
-        true: {
-            base: string;
-        };
-        false: {
-            base: string;
-        };
+        true: string;
+        false: string;
     };
     breakpoint: {
         sm: {
@@ -66,12 +63,8 @@ export declare const sidebar: import("tailwind-variants").TVReturnType<{
         };
     };
     isOpen: {
-        true: {
-            base: string;
-        };
-        false: {
-            base: string;
-        };
+        true: string;
+        false: string;
     };
     breakpoint: {
         sm: {
@@ -119,12 +112,8 @@ export declare const sidebar: import("tailwind-variants").TVReturnType<{
         };
     };
     isOpen: {
-        true: {
-            base: string;
-        };
-        false: {
-            base: string;
-        };
+        true: string;
+        false: string;
     };
     breakpoint: {
         sm: {
@@ -161,7 +150,7 @@ export declare const sidebar: import("tailwind-variants").TVReturnType<{
     backdrop: string;
 }, undefined, unknown, unknown, undefined>>;
 export type SidebarSlots = keyof typeof sidebar.slots;
-export type SidebarTheme = Partial<Record<SidebarSlots, string>>;
+export type SidebarTheme = Partial<Record<SidebarSlots, ClassValue>>;
 export declare const sidebarButton: import("tailwind-variants").TVReturnType<{
     breakpoint: {
         sm: string;
@@ -187,7 +176,7 @@ export declare const sidebarButton: import("tailwind-variants").TVReturnType<{
         "2xl": string;
     };
 }, undefined, "inline-flex items-center p-0 mt-0 ms-3 text-sm text-gray-500 rounded-lg hover:bg-gray-100 focus:outline-hidden focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600", unknown, unknown, undefined>>;
-export type SidebarButtonTheme = string;
+export type SidebarButtonTheme = ClassValue;
 export declare const sidebarCta: import("tailwind-variants").TVReturnType<{
     [key: string]: {
         [key: string]: import("tailwind-variants").ClassValue | {
@@ -226,7 +215,7 @@ export declare const sidebarCta: import("tailwind-variants").TVReturnType<{
     span: string;
 }, undefined, unknown, unknown, undefined>>;
 export type SidebarCtaSlots = keyof typeof sidebarCta.slots;
-export type SidebarCtaTheme = Partial<Record<SidebarCtaSlots, string>>;
+export type SidebarCtaTheme = Partial<Record<SidebarCtaSlots, ClassValue>>;
 export declare const sidebarBrand: import("tailwind-variants").TVReturnType<{
     [key: string]: {
         [key: string]: import("tailwind-variants").ClassValue | {
@@ -265,7 +254,7 @@ export declare const sidebarBrand: import("tailwind-variants").TVReturnType<{
     span: string;
 }, undefined, unknown, unknown, undefined>>;
 export type SidebarBrandSlots = keyof typeof sidebarBrand.slots;
-export type SidebarBrandTheme = Partial<Record<SidebarBrandSlots, string>>;
+export type SidebarBrandTheme = Partial<Record<SidebarBrandSlots, ClassValue>>;
 export declare const sidebarDropdownWrapper: import("tailwind-variants").TVReturnType<{
     [key: string]: {
         [key: string]: import("tailwind-variants").ClassValue | {
@@ -316,4 +305,4 @@ export declare const sidebarDropdownWrapper: import("tailwind-variants").TVRetur
     ul: string;
 }, undefined, unknown, unknown, undefined>>;
 export type SidebarDropdownWrapperSlots = keyof typeof sidebarDropdownWrapper.slots;
-export type SidebarDropdownWrapperTheme = Partial<Record<SidebarDropdownWrapperSlots, string>>;
+export type SidebarDropdownWrapperTheme = Partial<Record<SidebarDropdownWrapperSlots, ClassValue>>;

package/dist/sidebar/theme.js

@@ -1,4 +1,3 @@
-// theme.ts
 import { tv } from "tailwind-variants";
 export const sidebar = tv({
     slots: {
@@ -14,10 +13,9 @@ export const sidebar = tv({
             absolute: { base: "absolute" },
             static: { base: "static" }
         },
-        // Reintroducing isOpen, but this will only apply when isLargeScreen AND alwaysOpen is false
         isOpen: {
-            true: { base: "block" }, // When explicitly open (hamburger menu clicked)
-            false: { base: "hidden" } // When explicitly closed
+            true: "block",
+            false: "hidden"
         },
         breakpoint: {
             sm: { base: "sm:block" },
@@ -27,58 +25,21 @@ export const sidebar = tv({
             "2xl": { base: "2xl:block" }
         },
         alwaysOpen: {
-            true: { base: "block" } // This variant will ensure it's always block regardless of breakpoints
+            true: { base: "block" } // Always display the sidebar when alwaysOpen is true
         },
         backdrop: {
             true: { backdrop: "bg-gray-900 opacity-75" }
         }
     },
     compoundVariants: [
-        // Rule for responsive display when NOT alwaysOpen
-        {
-            alwaysOpen: false, // Only apply these if the sidebar is NOT always open
-            breakpoint: "sm",
-            class: { base: "sm:block" }
-        },
-        {
-            alwaysOpen: false,
-            breakpoint: "md",
-            class: { base: "md:block" }
-        },
-        {
-            alwaysOpen: false,
-            breakpoint: "lg",
-            class: { base: "lg:block" }
-        },
-        {
-            alwaysOpen: false,
-            breakpoint: "xl",
-            class: { base: "xl:block" }
-        },
-        {
-            alwaysOpen: false,
-            breakpoint: "2xl",
-            class: { base: "2xl:block" }
-        },
-        // Override: When alwaysOpen is true, it should always be visible, ignoring `isOpen` and `breakpoint`
+        // When alwaysOpen is true, override the breakpoint display classes
         {
             alwaysOpen: true,
             class: {
-                base: "!block" // Force block display
-            }
-        },
-        // Another compound variant to hide it below the breakpoint if not alwaysOpen and not explicitly open
-        {
-            alwaysOpen: false,
-            isOpen: false, // If it's not always open AND not explicitly open (via hamburger)
-            class: {
-                base: "hidden" // Hide it by default. Breakpoint rules will override this for larger screens.
+                base: "!block"
             }
         }
-    ],
-    defaultVariants: {
-        isOpen: false // Default to closed on small screens if not specified
-    }
+    ]
 });
 export const sidebarButton = tv({
     base: "inline-flex items-center p-0 mt-0 ms-3 text-sm text-gray-500 rounded-lg hover:bg-gray-100 focus:outline-hidden focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600",

package/dist/skeleton/CardPlaceholder.svelte

@@ -2,7 +2,6 @@
   import clsx from "clsx";
   import { cardPlaceholder, type CardPlaceholderTheme } from ".";
   import type { CardPlaceholderProps } from "../types";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   let { size = "sm", class: className, ...restProps }: CardPlaceholderProps = $props();
@@ -12,22 +11,22 @@
   const { base, imageArea, imageIcon, line, footerArea } = $derived(cardPlaceholder({ size }));
 </script>
 
-<div role="status" {...restProps} class={cn(base(), clsx(className), (theme as CardPlaceholderTheme)?.base)}>
-  <div class={cn(imageArea(), (theme as CardPlaceholderTheme)?.imageArea)}>
-    <svg width="48" height="48" class={cn(imageIcon(), (theme as CardPlaceholderTheme)?.imageIcon)} xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="currentColor" viewBox="0 0 640 512">
+<div role="status" {...restProps} class={base({ class: clsx((theme as CardPlaceholderTheme)?.base, className) })}>
+  <div class={imageArea({ class: clsx((theme as CardPlaceholderTheme)?.imageArea) })}>
+    <svg width="48" height="48" class={imageIcon({ class: clsx((theme as CardPlaceholderTheme)?.imageIcon) })} xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="currentColor" viewBox="0 0 640 512">
       <path d="M480 80C480 35.82 515.8 0 560 0C604.2 0 640 35.82 640 80C640 124.2 604.2 160 560 160C515.8 160 480 124.2 480 80zM0 456.1C0 445.6 2.964 435.3 8.551 426.4L225.3 81.01C231.9 70.42 243.5 64 256 64C268.5 64 280.1 70.42 286.8 81.01L412.7 281.7L460.9 202.7C464.1 196.1 472.2 192 480 192C487.8 192 495 196.1 499.1 202.7L631.1 419.1C636.9 428.6 640 439.7 640 450.9C640 484.6 612.6 512 578.9 512H55.91C25.03 512 .0006 486.1 .0006 456.1L0 456.1z"></path>
     </svg>
   </div>
-  <div class={cn(line({ class: "mb-4 h-2.5 w-1/2" }), (theme as CardPlaceholderTheme)?.line)}></div>
-  <div class={cn(line({ class: "mb-2.5 h-2" }), (theme as CardPlaceholderTheme)?.line)}></div>
-  <div class={cn(line({ class: "mb-2.5 h-2" }), (theme as CardPlaceholderTheme)?.line)}></div>
-  <div class={cn(line({ class: "h-2" }), (theme as CardPlaceholderTheme)?.line)}></div>
-  <div class={cn(footerArea(), (theme as CardPlaceholderTheme)?.footerArea)}>
-    <svg class={cn(line({ class: "h-14 w-14" }), (theme as CardPlaceholderTheme)?.line)} aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+  <div class={line({ class: clsx("mb-4 h-2.5 w-1/2", (theme as CardPlaceholderTheme)?.line) })}></div>
+  <div class={line({ class: clsx("mb-2.5 h-2", (theme as CardPlaceholderTheme)?.line) })}></div>
+  <div class={line({ class: clsx("mb-2.5 h-2", (theme as CardPlaceholderTheme)?.line) })}></div>
+  <div class={line({ class: clsx("h-2", (theme as CardPlaceholderTheme)?.line) })}></div>
+  <div class={footerArea({ class: clsx((theme as CardPlaceholderTheme)?.footerArea) })}>
+    <svg class={line({ class: clsx("h-14 w-14", (theme as CardPlaceholderTheme)?.line) })} aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
       <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-6-3a2 2 0 11-4 0 2 2 0 014 0zm-2 4a5 5 0 00-4.546 2.916A5.986 5.986 0 0010 16a5.986 5.986 0 004.546-2.084A5 5 0 0010 11z" clip-rule="evenodd"></path>
     </svg>
-    <div class={cn(line({ class: "mb-2 h-2.5 w-32" }), (theme as CardPlaceholderTheme)?.line)}></div>
-    <div class={cn(line({ class: "mb-2 h-2 w-32" }), (theme as CardPlaceholderTheme)?.line)}></div>
+    <div class={line({ class: clsx("mb-2 h-2.5 w-32", (theme as CardPlaceholderTheme)?.line) })}></div>
+    <div class={line({ class: clsx("mb-2 h-2 w-32", (theme as CardPlaceholderTheme)?.line) })}></div>
   </div>
   <span class="sr-only">Loading...</span>
 </div>

package/dist/skeleton/ImagePlaceholder.svelte

@@ -2,7 +2,6 @@
   import clsx from "clsx";
   import { imagePlaceholder, type ImagePlaceholderTheme } from ".";
   import type { ImagePlaceholderProps } from "../types";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   let { size = "md", rounded, imgOnly = false, class: className, ...restProps }: ImagePlaceholderProps = $props();
@@ -17,21 +16,49 @@
   );
 </script>
 
-<div role="status" {...restProps} class={cn(base(), clsx(className), (theme as ImagePlaceholderTheme)?.base)}>
-  <div class={cn(image(), (theme as ImagePlaceholderTheme)?.image)}>
-    <svg width="48" height="48" class={cn(svg(), (theme as ImagePlaceholderTheme)?.svg)} xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="currentColor" viewBox="0 0 640 512">
+<div role="status" {...restProps} class={base({ class: clsx(className, (theme as ImagePlaceholderTheme)?.base) })}>
+  <div class={image({ class: clsx((theme as ImagePlaceholderTheme)?.image) })}>
+    <svg width="48" height="48" class={svg({ class: clsx((theme as ImagePlaceholderTheme)?.svg) })} xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="currentColor" viewBox="0 0 640 512">
       <path d="M480 80C480 35.82 515.8 0 560 0C604.2 0 640 35.82 640 80C640 124.2 604.2 160 560 160C515.8 160 480 124.2 480 80zM0 456.1C0 445.6 2.964 435.3 8.551 426.4L225.3 81.01C231.9 70.42 243.5 64 256 64C268.5 64 280.1 70.42 286.8 81.01L412.7 281.7L460.9 202.7C464.1 196.1 472.2 192 480 192C487.8 192 495 196.1 499.1 202.7L631.1 419.1C636.9 428.6 640 439.7 640 450.9C640 484.6 612.6 512 578.9 512H55.91C25.03 512 .0006 486.1 .0006 456.1L0 456.1z"></path>
     </svg>
   </div>
   {#if !imgOnly}
-    <div class={cn(content(), (theme as ImagePlaceholderTheme)?.content)}>
-      <div class={cn(line({ class: "mb-4 h-2.5 w-1/2" }), (theme as ImagePlaceholderTheme)?.line)}></div>
-      <div class={cn(line({ class: "mb-2.5 h-2 w-9/12" }), (theme as ImagePlaceholderTheme)?.line)}></div>
-      <div class={cn(line({ class: "mb-2.5 h-2" }), (theme as ImagePlaceholderTheme)?.line)}></div>
-      <div class={cn(line({ class: "mb-2.5 h-2" }), (theme as ImagePlaceholderTheme)?.line)}></div>
-      <div class={cn(line({ class: "mb-2.5 h-2 w-10/12" }), (theme as ImagePlaceholderTheme)?.line)}></div>
-      <div class={cn(line({ class: "mb-2.5 h-2 w-11/12" }), (theme as ImagePlaceholderTheme)?.line)}></div>
-      <div class={cn(line({ class: "h-2 w-9/12" }), (theme as ImagePlaceholderTheme)?.line)}></div>
+    <div class={content({ class: clsx((theme as ImagePlaceholderTheme)?.content) })}>
+      <div
+        class={line({
+          class: clsx("mb-4 h-2.5 w-1/2", (theme as ImagePlaceholderTheme)?.line)
+        })}
+      ></div>
+      <div
+        class={line({
+          class: clsx("mb-2.5 h-2 w-9/12", (theme as ImagePlaceholderTheme)?.line)
+        })}
+      ></div>
+      <div
+        class={line({
+          class: clsx("mb-2.5 h-2", (theme as ImagePlaceholderTheme)?.line)
+        })}
+      ></div>
+      <div
+        class={line({
+          class: clsx("mb-2.5 h-2", (theme as ImagePlaceholderTheme)?.line)
+        })}
+      ></div>
+      <div
+        class={line({
+          class: clsx("mb-2.5 h-2 w-10/12", (theme as ImagePlaceholderTheme)?.line)
+        })}
+      ></div>
+      <div
+        class={line({
+          class: clsx("mb-2.5 h-2 w-11/12", (theme as ImagePlaceholderTheme)?.line)
+        })}
+      ></div>
+      <div
+        class={line({
+          class: clsx("h-2 w-9/12", (theme as ImagePlaceholderTheme)?.line)
+        })}
+      ></div>
     </div>
   {/if}
   <span class="sr-only">Loading...</span>

package/dist/skeleton/ListPlaceholder.svelte

@@ -2,7 +2,6 @@
   import clsx from "clsx";
   import { listPlaceholder, type ListPlaceholderTheme } from ".";
   import type { ListPlaceholderProps } from "../types";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   let { itemNumber = 5, size = "md", rounded, class: className, ...restProps }: ListPlaceholderProps = $props();
@@ -14,15 +13,34 @@
   let items = $derived([...Array(itemNumber).keys()]);
 </script>
 
-<div role="status" {...restProps} class={cn(base(), clsx(className), (theme as ListPlaceholderTheme)?.base)}>
-  <!-- eslint-disable-next-line @typescript-eslint/no-unused-vars -->
+<div role="status" {...restProps} class={base({ class: clsx(className, (theme as ListPlaceholderTheme)?.base) })}>
   {#each items as _, i}
-    <div class={cn(item({ class: i > 0 ? "pt-4" : "" }), (theme as ListPlaceholderTheme)?.item)}>
-      <div class={cn(itemContent(), (theme as ListPlaceholderTheme)?.itemContent)}>
-        <div class={cn(itemTitle(), (theme as ListPlaceholderTheme)?.itemTitle)}></div>
-        <div class={cn(itemSubtitle(), (theme as ListPlaceholderTheme)?.itemSubtitle)}></div>
+    <div
+      class={item({
+        class: clsx(i > 0 ? "pt-4" : "", (theme as ListPlaceholderTheme)?.item)
+      })}
+    >
+      <div
+        class={itemContent({
+          class: clsx((theme as ListPlaceholderTheme)?.itemContent)
+        })}
+      >
+        <div
+          class={itemTitle({
+            class: clsx((theme as ListPlaceholderTheme)?.itemTitle)
+          })}
+        ></div>
+        <div
+          class={itemSubtitle({
+            class: clsx((theme as ListPlaceholderTheme)?.itemSubtitle)
+          })}
+        ></div>
       </div>
-      <div class={cn(itemExtra(), (theme as ListPlaceholderTheme)?.itemExtra)}></div>
+      <div
+        class={itemExtra({
+          class: clsx((theme as ListPlaceholderTheme)?.itemExtra)
+        })}
+      ></div>
     </div>
   {/each}
   <span class="sr-only">Loading...</span>

package/dist/skeleton/Skeleton.svelte

@@ -2,7 +2,6 @@
   import clsx from "clsx";
   import { skeleton, type SkeletonTheme } from ".";
   import type { SkeletonProps } from "../types";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   let { size = "sm", class: className, ...restProps }: SkeletonProps = $props();
@@ -12,14 +11,30 @@
   const { wrapper, line } = $derived(skeleton({ size }));
 </script>
 
-<div role="status" {...restProps} class={cn(wrapper(), clsx(className), (theme as SkeletonTheme)?.wrapper)}>
-  <div class={cn(line({ class: "mb-4 h-2.5 w-1/2" }), (theme as SkeletonTheme)?.line)}></div>
-  <div class={cn(line({ class: "mb-2.5 h-2 w-9/12" }), (theme as SkeletonTheme)?.line)}></div>
-  <div class={cn(line({ class: "mb-2.5 h-2" }), (theme as SkeletonTheme)?.line)}></div>
-  <div class={cn(line({ class: "mb-2.5 h-2" }), (theme as SkeletonTheme)?.line)}></div>
-  <div class={cn(line({ class: "mb-2.5 h-2 w-10/12" }), (theme as SkeletonTheme)?.line)}></div>
-  <div class={cn(line({ class: "mb-2.5 h-2 w-11/12" }), (theme as SkeletonTheme)?.line)}></div>
-  <div class={cn(line({ class: "h-2 w-9/12" }), (theme as SkeletonTheme)?.line)}></div>
+<div role="status" {...restProps} class={wrapper({ class: clsx(className, (theme as SkeletonTheme)?.wrapper) })}>
+  <div
+    class={line({
+      class: clsx("mb-4 h-2.5 w-1/2", (theme as SkeletonTheme)?.line)
+    })}
+  ></div>
+  <div
+    class={line({
+      class: clsx("mb-2.5 h-2 w-9/12", (theme as SkeletonTheme)?.line)
+    })}
+  ></div>
+  <div class={line({ class: clsx("mb-2.5 h-2", (theme as SkeletonTheme)?.line) })}></div>
+  <div class={line({ class: clsx("mb-2.5 h-2", (theme as SkeletonTheme)?.line) })}></div>
+  <div
+    class={line({
+      class: clsx("mb-2.5 h-2 w-10/12", (theme as SkeletonTheme)?.line)
+    })}
+  ></div>
+  <div
+    class={line({
+      class: clsx("mb-2.5 h-2 w-11/12", (theme as SkeletonTheme)?.line)
+    })}
+  ></div>
+  <div class={line({ class: clsx("h-2 w-9/12", (theme as SkeletonTheme)?.line) })}></div>
   <span class="sr-only">Loading...</span>
 </div>
 

package/dist/skeleton/TestimonialPlaceholder.svelte

@@ -2,7 +2,6 @@
   import { testimonialPlaceholder, type TestimonialPlaceholderTheme } from ".";
   import clsx from "clsx";
   import { type TestimonialPlaceholderProps } from "..";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   let { class: className, ...restProps }: TestimonialPlaceholderProps = $props();
@@ -12,15 +11,35 @@
   const { wrapper, line1, line2, svg, subContent } = testimonialPlaceholder();
 </script>
 
-<div role="status" {...restProps} class={cn(wrapper(), clsx(className), (theme as TestimonialPlaceholderTheme)?.wrapper)}>
-  <div class={cn(line2({ class: "mx-auto mb-2.5 h-2.5 max-w-[640px]" }), (theme as TestimonialPlaceholderTheme)?.line2)}></div>
-  <div class={cn(line2({ class: "mx-auto h-2.5 max-w-[540px]" }), (theme as TestimonialPlaceholderTheme)?.line2)}></div>
-  <div class={cn(subContent(), (theme as TestimonialPlaceholderTheme)?.subContent)}>
-    <svg class={cn(svg(), (theme as TestimonialPlaceholderTheme)?.svg)} aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<div role="status" {...restProps} class={wrapper({ class: clsx(className, (theme as TestimonialPlaceholderTheme)?.wrapper) })}>
+  <div
+    class={line2({
+      class: clsx("mx-auto mb-2.5 h-2.5 max-w-[640px]", (theme as TestimonialPlaceholderTheme)?.line2)
+    })}
+  ></div>
+  <div
+    class={line2({
+      class: clsx("mx-auto h-2.5 max-w-[540px]", (theme as TestimonialPlaceholderTheme)?.line2)
+    })}
+  ></div>
+  <div
+    class={subContent({
+      class: clsx((theme as TestimonialPlaceholderTheme)?.subContent)
+    })}
+  >
+    <svg class={svg({ class: clsx((theme as TestimonialPlaceholderTheme)?.svg) })} aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
       <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-6-3a2 2 0 11-4 0 2 2 0 014 0zm-2 4a5 5 0 00-4.546 2.916A5.986 5.986 0 0010 16a5.986 5.986 0 004.546-2.084A5 5 0 0010 11z" clip-rule="evenodd"></path>
     </svg>
-    <div class={cn(line1({ class: "me-3 h-2.5 w-20" }), (theme as TestimonialPlaceholderTheme)?.line1)}></div>
-    <div class={cn(line1({ class: "h-2 w-24" }), (theme as TestimonialPlaceholderTheme)?.line1)}></div>
+    <div
+      class={line1({
+        class: clsx("me-3 h-2.5 w-20", (theme as TestimonialPlaceholderTheme)?.line1)
+      })}
+    ></div>
+    <div
+      class={line1({
+        class: clsx("h-2 w-24", (theme as TestimonialPlaceholderTheme)?.line1)
+      })}
+    ></div>
   </div>
   <span class="sr-only">Loading...</span>
 </div>

package/dist/skeleton/TextPlaceholder.svelte

@@ -2,7 +2,6 @@
   import clsx from "clsx";
   import { textPlaceholder, type TextPlaceholderTheme } from ".";
   import type { TextPlaceholderProps } from "../types";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   let { size = "sm", class: className, ...restProps }: TextPlaceholderProps = $props();
@@ -16,36 +15,60 @@
   );
 </script>
 
-<div role="status" {...restProps} class={cn(baseWrapper(), clsx(className), (theme as TextPlaceholderTheme)?.baseWrapper)}>
-  <div class={cn(divWrapper({ class: "w-full" }), (theme as TextPlaceholderTheme)?.divWrapper)}>
-    <div class={cn(lineA({ class: "h-2.5 w-32" }), (theme as TextPlaceholderTheme)?.lineA)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-24" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
+<div role="status" {...restProps} class={baseWrapper({ class: clsx(className, (theme as TextPlaceholderTheme)?.baseWrapper) })}>
+  <div
+    class={divWrapper({
+      class: clsx("w-full", (theme as TextPlaceholderTheme)?.divWrapper)
+    })}
+  >
+    <div class={lineA({ class: clsx("h-2.5 w-32", (theme as TextPlaceholderTheme)?.lineA) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-24", (theme as TextPlaceholderTheme)?.lineB) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineB) })}></div>
   </div>
-  <div class={cn(divWrapper({ class: "w-11/12" }), (theme as TextPlaceholderTheme)?.divWrapper)}>
-    <div class={cn(lineA({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineA)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-24" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
+  <div
+    class={divWrapper({
+      class: clsx("w-11/12", (theme as TextPlaceholderTheme)?.divWrapper)
+    })}
+  >
+    <div class={lineA({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineA) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineB) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-24", (theme as TextPlaceholderTheme)?.lineB) })}></div>
   </div>
-  <div class={cn(divWrapper({ class: "w-9/12" }), (theme as TextPlaceholderTheme)?.divWrapper)}>
-    <div class={cn(lineB({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
-    <div class={cn(lineA({ class: "h-2.5 w-80" }), (theme as TextPlaceholderTheme)?.lineA)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
+  <div
+    class={divWrapper({
+      class: clsx("w-9/12", (theme as TextPlaceholderTheme)?.divWrapper)
+    })}
+  >
+    <div class={lineB({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineB) })}></div>
+    <div class={lineA({ class: clsx("h-2.5 w-80", (theme as TextPlaceholderTheme)?.lineA) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineB) })}></div>
   </div>
-  <div class={cn(divWrapper({ class: "w-11/12" }), (theme as TextPlaceholderTheme)?.divWrapper)}>
-    <div class={cn(lineA({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineA)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-24" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
+  <div
+    class={divWrapper({
+      class: clsx("w-11/12", (theme as TextPlaceholderTheme)?.divWrapper)
+    })}
+  >
+    <div class={lineA({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineA) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineB) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-24", (theme as TextPlaceholderTheme)?.lineB) })}></div>
   </div>
-  <div class={cn(divWrapper({ class: "w-10/12" }), (theme as TextPlaceholderTheme)?.divWrapper)}>
-    <div class={cn(lineB({ class: "h-2.5 w-32" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-24" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
-    <div class={cn(lineA({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineA)}></div>
+  <div
+    class={divWrapper({
+      class: clsx("w-10/12", (theme as TextPlaceholderTheme)?.divWrapper)
+    })}
+  >
+    <div class={lineB({ class: clsx("h-2.5 w-32", (theme as TextPlaceholderTheme)?.lineB) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-24", (theme as TextPlaceholderTheme)?.lineB) })}></div>
+    <div class={lineA({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineA) })}></div>
   </div>
-  <div class={cn(divWrapper({ class: "w-8/12" }), (theme as TextPlaceholderTheme)?.divWrapper)}>
-    <div class={cn(lineB({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
-    <div class={cn(lineA({ class: "h-2.5 w-80" }), (theme as TextPlaceholderTheme)?.lineA)}></div>
-    <div class={cn(lineB({ class: "h-2.5 w-full" }), (theme as TextPlaceholderTheme)?.lineB)}></div>
+  <div
+    class={divWrapper({
+      class: clsx("w-8/12", (theme as TextPlaceholderTheme)?.divWrapper)
+    })}
+  >
+    <div class={lineB({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineB) })}></div>
+    <div class={lineA({ class: clsx("h-2.5 w-80", (theme as TextPlaceholderTheme)?.lineA) })}></div>
+    <div class={lineB({ class: clsx("h-2.5 w-full", (theme as TextPlaceholderTheme)?.lineB) })}></div>
   </div>
   <span class="sr-only">Loading...</span>
 </div>

package/dist/skeleton/VideoPlaceholder.svelte

@@ -2,17 +2,16 @@
   import clsx from "clsx";
   import { videoPlaceholder } from ".";
   import type { VideoPlaceholderProps } from "../types";
-  import { cn } from "..";
   import { getTheme } from "../theme/themeUtils";
 
   let { size = "sm", class: className }: VideoPlaceholderProps = $props();
 
   const theme = getTheme("videoPlaceholder");
 
-  const base = $derived(videoPlaceholder({ size }));
+  const base = $derived(videoPlaceholder({ size, class: clsx(theme, className) }));
 </script>
 
-<div role="status" class={cn(base, clsx(className), theme)}>
+<div role="status" class={base}>
   <svg width="48" height="48" class="text-gray-200 dark:text-gray-600" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="currentColor" viewBox="0 0 384 512">
     <path d="M361 215C375.3 223.8 384 239.3 384 256C384 272.7 375.3 288.2 361 296.1L73.03 472.1C58.21 482 39.66 482.4 24.52 473.9C9.377 465.4 0 449.4 0 432V80C0 62.64 9.377 46.63 24.52 38.13C39.66 29.64 58.21 29.99 73.03 39.04L361 215z"></path>
   </svg>