From 2af89d357806762b42bf607c34408cde089fe933 Mon Sep 17 00:00:00 2001
From: pheralb <pablohdez4340@gmail.com>
Date: Fri, 26 Sep 2025 16:10:15 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Update=20``WithoutChild?=
 =?UTF-8?q?``=20type=20import=20+=20format=20scroll-area.ts=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ui/scroll-area/index.ts            | 15 +++++++--------
 .../ui/scroll-area/scroll-area-scrollbar.svelte   |  4 +++-
 src/components/ui/scroll-area/scroll-area.svelte  |  9 ++++++---
 src/utils/cn.ts                                   | 15 ++-------------
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/components/ui/scroll-area/index.ts b/src/components/ui/scroll-area/index.ts
index 9ed62cf..14aacfa 100644
--- a/src/components/ui/scroll-area/index.ts
+++ b/src/components/ui/scroll-area/index.ts
@@ -1,13 +1,12 @@
-import Scrollbar from "./scroll-area-scrollbar.svelte";
 import Root from "./scroll-area.svelte";
 import Mask from "./scroll-area-mask.svelte";
+import Scrollbar from "./scroll-area-scrollbar.svelte";
 
 export {
-	Root,
-	Scrollbar,
-	Mask,
-  // 
-	Root as ScrollArea,
-	Scrollbar as ScrollAreaScrollbar,
-	Mask as ScrollAreaMask,
+  Root,
+  Scrollbar,
+  Mask,
+  Root as ScrollArea,
+  Scrollbar as ScrollAreaScrollbar,
+  Mask as ScrollAreaMask,
 };
diff --git a/src/components/ui/scroll-area/scroll-area-scrollbar.svelte b/src/components/ui/scroll-area/scroll-area-scrollbar.svelte
index cf62070..d5a0b7c 100644
--- a/src/components/ui/scroll-area/scroll-area-scrollbar.svelte
+++ b/src/components/ui/scroll-area/scroll-area-scrollbar.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
+  import type { WithoutChild } from "@/types/components";
+
+  import { cn } from "@/utils/cn";
   import { ScrollArea as ScrollAreaPrimitive } from "bits-ui";
-  import { cn, type WithoutChild } from "@/utils/cn";
   import { useHasPrimaryTouch } from "@/hooks/use-has-primary-touch";
 
   let {
diff --git a/src/components/ui/scroll-area/scroll-area.svelte b/src/components/ui/scroll-area/scroll-area.svelte
index 3e0b10a..c0f3abe 100644
--- a/src/components/ui/scroll-area/scroll-area.svelte
+++ b/src/components/ui/scroll-area/scroll-area.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
-  import { cn, type WithoutChild } from "@/utils/cn";
-  import { ScrollArea as ScrollAreaPrimitive } from "bits-ui";
+  import type { WithoutChild } from "@/types/components";
+
+  import { cn } from "@/utils/cn";
+  import { useHasPrimaryTouch } from "@/hooks/use-has-primary-touch";
+
   import { Scrollbar } from "./index.js";
   import ScrollAreaMask from "./scroll-area-mask.svelte";
-  import { useHasPrimaryTouch } from "@/hooks/use-has-primary-touch";
+  import { ScrollArea as ScrollAreaPrimitive } from "bits-ui";
 
   type Mask = {
     top: boolean;
diff --git a/src/utils/cn.ts b/src/utils/cn.ts
index cf65760..365058c 100644
--- a/src/utils/cn.ts
+++ b/src/utils/cn.ts
@@ -1,17 +1,6 @@
 import { type ClassValue, clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
- 
+
 export function cn(...inputs: ClassValue[]) {
- return twMerge(clsx(inputs));
+  return twMerge(clsx(inputs));
 }
- 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type WithoutChild<T> = T extends { child?: any } ? Omit<T, "child"> : T;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type WithoutChildren<T> = T extends { children?: any }
- ? Omit<T, "children">
- : T;
-export type WithoutChildrenOrChild<T> = WithoutChildren<WithoutChild<T>>;
-export type WithElementRef<T, U extends HTMLElement = HTMLElement> = T & {
- ref?: U | null;
-};
\ No newline at end of file