From f4a1d4a7c33de5084d993f56f5669039b86f87ca Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Thu, 21 Mar 2024 12:54:39 +0100 Subject: [PATCH] chore(Tabs): improve slots --- playground/pages/tabs.vue | 9 ++------- src/runtime/components/Tabs.vue | 16 ++++++++-------- src/theme/tabs.ts | 3 ++- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/playground/pages/tabs.vue b/playground/pages/tabs.vue index 5fc57dac..bdd509a8 100644 --- a/playground/pages/tabs.vue +++ b/playground/pages/tabs.vue @@ -1,8 +1,7 @@ diff --git a/src/runtime/components/Tabs.vue b/src/runtime/components/Tabs.vue index a920bcee..94591994 100644 --- a/src/runtime/components/Tabs.vue +++ b/src/runtime/components/Tabs.vue @@ -10,7 +10,7 @@ const appConfig = _appConfig as AppConfig & { ui: { tabs: Partial const tabs = tv({ extend: tv(theme), ...(appConfig.ui?.tabs || {}) }) export interface TabsItem { - label: string + label?: string value?: string slot?: string disabled?: boolean @@ -25,13 +25,13 @@ export interface TabsProps extends Omit = (props: { item: T, index: number }) => any +type SlotProps = (props: { item: T, index: number }) => any export type TabsSlots = { - default(): any - content(): SlotFunction + default: SlotProps + content: SlotProps } & { - [key in T['slot'] as string]?: SlotFunction + [key in T['slot'] as string]?: SlotProps } @@ -54,9 +54,9 @@ const ui = computed(() => tv({ extend: tabs, slots: props.ui })()) - - {{ item.label }} - + + {{ item.label }} + diff --git a/src/theme/tabs.ts b/src/theme/tabs.ts index dc16b5cd..bf3721e4 100644 --- a/src/theme/tabs.ts +++ b/src/theme/tabs.ts @@ -5,6 +5,7 @@ export default { // FIXME: Replace transition with `transition-[width,transform]` when available indicator: 'absolute group-data-[orientation=horizontal]:left-0 group-data-[orientation=vertical]:top-0 group-data-[orientation=horizontal]:inset-y-1 group-data-[orientation=vertical]:inset-x-1 group-data-[orientation=horizontal]:w-[--radix-tabs-indicator-size] group-data-[orientation=vertical]:h-[--radix-tabs-indicator-size] group-data-[orientation=horizontal]:translate-x-[--radix-tabs-indicator-position] group-data-[orientation=vertical]:translate-y-[--radix-tabs-indicator-position] transition-transform duration-200 bg-white dark:bg-gray-900 rounded-md shadow-sm', trigger: 'relative inline-flex items-center justify-center shrink-0 w-full h-8 text-gray-500 data-[state=active]:text-gray-900 dark:text-gray-400 dark:data-[state=active]:text-white px-3 text-sm font-medium rounded-md disabled:cursor-not-allowed disabled:opacity-75 transition-colors duration-200 ease-out focus-visible:ring-2 focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400 focus-visible:outline-0', - content: 'focus:outline-none' + content: 'focus:outline-none', + label: 'truncate' } }