From 550ebc359452f950adf3ca796a75800de3b99b83 Mon Sep 17 00:00:00 2001 From: pheralb Date: Fri, 31 Jan 2025 14:24:30 +0000 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20UI=20components?= =?UTF-8?q?=20to=20Svelte=205=20(bits-ui)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../context-menu-checkbox-item.svelte | 16 ++++++---- .../context-menu/context-menu-content.svelte | 24 +++++++++++---- src/ui/context-menu/context-menu-item.svelte | 16 ++++++---- src/ui/context-menu/context-menu-label.svelte | 16 ++++++---- src/ui/dialog/dialog-content.svelte | 26 +++++++++++----- src/ui/dialog/dialog-description.svelte | 14 ++++++--- src/ui/dialog/dialog-footer.svelte | 14 ++++++--- src/ui/dialog/dialog-header.svelte | 14 ++++++--- src/ui/dialog/dialog-overlay.svelte | 17 +++++++---- src/ui/dialog/dialog-portal.svelte | 10 +++++-- src/ui/dialog/dialog-title.svelte | 14 ++++++--- src/ui/popover/popover-content.svelte | 30 ++++++++++++++----- src/ui/tabs/tabs-content.svelte | 16 ++++++---- src/ui/tabs/tabs-list.svelte | 14 ++++++--- src/ui/tabs/tabs-trigger.svelte | 16 ++++++---- 15 files changed, 183 insertions(+), 74 deletions(-) diff --git a/src/ui/context-menu/context-menu-checkbox-item.svelte b/src/ui/context-menu/context-menu-checkbox-item.svelte index 60e90fc..0189250 100644 --- a/src/ui/context-menu/context-menu-checkbox-item.svelte +++ b/src/ui/context-menu/context-menu-checkbox-item.svelte @@ -6,9 +6,15 @@ type $$Props = ContextMenuPrimitive.CheckboxItemProps; type $$Events = ContextMenuPrimitive.CheckboxItemEvents; - let className: $$Props['class'] = undefined; - export { className as class }; - export let checked: $$Props['checked'] = undefined; + + interface Props { + class?: $$Props['class']; + checked?: $$Props['checked']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, checked = $bindable(undefined), children, ...rest }: Props = $props(); - + {@render children?.()} diff --git a/src/ui/context-menu/context-menu-content.svelte b/src/ui/context-menu/context-menu-content.svelte index 9a992e6..fe95a39 100644 --- a/src/ui/context-menu/context-menu-content.svelte +++ b/src/ui/context-menu/context-menu-content.svelte @@ -5,10 +5,22 @@ type $$Props = ContextMenuPrimitive.ContentProps; - let className: $$Props['class'] = undefined; - export let transition: $$Props['transition'] = flyAndScale; - export let transitionConfig: $$Props['transitionConfig'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + transition?: $$Props['transition']; + transitionConfig?: $$Props['transitionConfig']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { + class: className = undefined, + transition = flyAndScale, + transitionConfig = undefined, + children, + ...rest + }: Props = $props(); + - + {@render children?.()} diff --git a/src/ui/context-menu/context-menu-item.svelte b/src/ui/context-menu/context-menu-item.svelte index a54eb2e..3b86ddd 100644 --- a/src/ui/context-menu/context-menu-item.svelte +++ b/src/ui/context-menu/context-menu-item.svelte @@ -7,9 +7,15 @@ }; type $$Events = ContextMenuPrimitive.ItemEvents; - let className: $$Props['class'] = undefined; - export let inset: $$Props['inset'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + inset?: $$Props['inset']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, inset = undefined, children, ...rest }: Props = $props(); + - + {@render children?.()} diff --git a/src/ui/context-menu/context-menu-label.svelte b/src/ui/context-menu/context-menu-label.svelte index 08bfde7..4dac93b 100644 --- a/src/ui/context-menu/context-menu-label.svelte +++ b/src/ui/context-menu/context-menu-label.svelte @@ -6,14 +6,20 @@ inset?: boolean; }; - let className: $$Props['class'] = undefined; - export let inset: $$Props['inset'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + inset?: $$Props['inset']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, inset = undefined, children, ...rest }: Props = $props(); + - + {@render children?.()} diff --git a/src/ui/dialog/dialog-content.svelte b/src/ui/dialog/dialog-content.svelte index 2a83cc4..1cbd0ed 100644 --- a/src/ui/dialog/dialog-content.svelte +++ b/src/ui/dialog/dialog-content.svelte @@ -8,12 +8,24 @@ type $$Props = DialogPrimitive.ContentProps; - let className: $$Props['class'] = undefined; - export let transition: $$Props['transition'] = flyAndScale; - export let transitionConfig: $$Props['transitionConfig'] = { + interface Props { + class?: $$Props['class']; + transition?: $$Props['transition']; + transitionConfig?: $$Props['transitionConfig']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { + class: className = undefined, + transition = flyAndScale, + transitionConfig = { duration: 200 - }; - export { className as class }; + }, + children, + ...rest + }: Props = $props(); + @@ -25,9 +37,9 @@ 'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] border border-neutral-200 dark:border-neutral-800 dark:bg-neutral-900 bg-white p-6 shadow-lg sm:rounded-lg md:w-full', className )} - {...$$restProps} + {...rest} > - + {@render children?.()} diff --git a/src/ui/dialog/dialog-description.svelte b/src/ui/dialog/dialog-description.svelte index 89cd271..124ed35 100644 --- a/src/ui/dialog/dialog-description.svelte +++ b/src/ui/dialog/dialog-description.svelte @@ -4,10 +4,16 @@ type $$Props = DialogPrimitive.DescriptionProps; - let className: $$Props['class'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, children, ...rest }: Props = $props(); + - - + + {@render children?.()} diff --git a/src/ui/dialog/dialog-footer.svelte b/src/ui/dialog/dialog-footer.svelte index ee5263f..8058160 100644 --- a/src/ui/dialog/dialog-footer.svelte +++ b/src/ui/dialog/dialog-footer.svelte @@ -4,13 +4,19 @@ type $$Props = HTMLAttributes; - let className: $$Props['class'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, children, ...rest }: Props = $props(); +
- + {@render children?.()}
diff --git a/src/ui/dialog/dialog-header.svelte b/src/ui/dialog/dialog-header.svelte index 2432973..3fe4a1f 100644 --- a/src/ui/dialog/dialog-header.svelte +++ b/src/ui/dialog/dialog-header.svelte @@ -4,10 +4,16 @@ type $$Props = HTMLAttributes; - let className: $$Props['class'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, children, ...rest }: Props = $props(); + -
- +
+ {@render children?.()}
diff --git a/src/ui/dialog/dialog-overlay.svelte b/src/ui/dialog/dialog-overlay.svelte index fb1314f..d1c8a25 100644 --- a/src/ui/dialog/dialog-overlay.svelte +++ b/src/ui/dialog/dialog-overlay.svelte @@ -5,12 +5,17 @@ type $$Props = DialogPrimitive.OverlayProps; - let className: $$Props['class'] = undefined; - export let transition: $$Props['transition'] = fade; - export let transitionConfig: $$Props['transitionConfig'] = { + interface Props { + class?: $$Props['class']; + transition?: $$Props['transition']; + transitionConfig?: $$Props['transitionConfig']; + [key: string]: any + } + + let { class: className = undefined, transition = fade, transitionConfig = { duration: 150 - }; - export { className as class }; + }, ...rest }: Props = $props(); + diff --git a/src/ui/dialog/dialog-portal.svelte b/src/ui/dialog/dialog-portal.svelte index 45112b7..c0aee7d 100644 --- a/src/ui/dialog/dialog-portal.svelte +++ b/src/ui/dialog/dialog-portal.svelte @@ -1,8 +1,14 @@ - - + + {@render children?.()} diff --git a/src/ui/dialog/dialog-title.svelte b/src/ui/dialog/dialog-title.svelte index a4b54aa..e8d2776 100644 --- a/src/ui/dialog/dialog-title.svelte +++ b/src/ui/dialog/dialog-title.svelte @@ -4,13 +4,19 @@ type $$Props = DialogPrimitive.TitleProps; - let className: $$Props['class'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, children, ...rest }: Props = $props(); + - + {@render children?.()} diff --git a/src/ui/popover/popover-content.svelte b/src/ui/popover/popover-content.svelte index 796ce56..d13c2df 100644 --- a/src/ui/popover/popover-content.svelte +++ b/src/ui/popover/popover-content.svelte @@ -6,12 +6,26 @@ type $$Props = PopoverPrimitive.ContentProps; - let className: $$Props['class'] = undefined; - export let transition: $$Props['transition'] = flyAndScale; - export let transitionConfig: $$Props['transitionConfig'] = undefined; - export let align: $$Props['align'] = 'center'; - export let sideOffset: $$Props['sideOffset'] = 4; - export { className as class }; + interface Props { + class?: $$Props['class']; + transition?: $$Props['transition']; + transitionConfig?: $$Props['transitionConfig']; + align?: $$Props['align']; + sideOffset?: $$Props['sideOffset']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { + class: className = undefined, + transition = flyAndScale, + transitionConfig = undefined, + align = 'center', + sideOffset = 4, + children, + ...rest + }: Props = $props(); + - + {@render children?.()} diff --git a/src/ui/tabs/tabs-content.svelte b/src/ui/tabs/tabs-content.svelte index 59dfe26..86cde58 100644 --- a/src/ui/tabs/tabs-content.svelte +++ b/src/ui/tabs/tabs-content.svelte @@ -4,9 +4,15 @@ type $$Props = TabsPrimitive.ContentProps; - let className: $$Props['class'] = undefined; - export let value: $$Props['value']; - export { className as class }; + interface Props { + class?: $$Props['class']; + value: $$Props['value']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, value, children, ...rest }: Props = $props(); + - + {@render children?.()} diff --git a/src/ui/tabs/tabs-list.svelte b/src/ui/tabs/tabs-list.svelte index bacbcf4..9165f7d 100644 --- a/src/ui/tabs/tabs-list.svelte +++ b/src/ui/tabs/tabs-list.svelte @@ -4,13 +4,19 @@ type $$Props = TabsPrimitive.ListProps; - let className: $$Props['class'] = undefined; - export { className as class }; + interface Props { + class?: $$Props['class']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, children, ...rest }: Props = $props(); + - + {@render children?.()} diff --git a/src/ui/tabs/tabs-trigger.svelte b/src/ui/tabs/tabs-trigger.svelte index 9420caf..cdf15d8 100644 --- a/src/ui/tabs/tabs-trigger.svelte +++ b/src/ui/tabs/tabs-trigger.svelte @@ -5,9 +5,15 @@ type $$Props = TabsPrimitive.TriggerProps; type $$Events = TabsPrimitive.TriggerEvents; - let className: $$Props['class'] = undefined; - export let value: $$Props['value']; - export { className as class }; + interface Props { + class?: $$Props['class']; + value: $$Props['value']; + children?: import('svelte').Snippet; + [key: string]: any + } + + let { class: className = undefined, value, children, ...rest }: Props = $props(); + - + {@render children?.()}