Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/runtime/components/prose/Accordion.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<script lang="ts">
import type { AppConfig } from '@nuxt/schema'
import theme from '#build/ui/prose/accordion'
import type { AccordionProps } from '../../types'
import type { ComponentConfig } from '../../types/tv'

type ProseAccordion = ComponentConfig<typeof theme, AppConfig, 'accordion', 'ui.prose'>

export interface ProseAccordionProps {
type?: 'single' | 'multiple'
class?: any
ui?: ProseAccordion['slots'] & AccordionProps['ui']
}

export interface ProseAccordionSlots {
Expand All @@ -29,6 +31,7 @@ const slots = defineSlots<ProseAccordionSlots>()

const appConfig = useAppConfig() as ProseAccordion['AppConfig']

// eslint-disable-next-line vue/no-dupe-keys
const ui = computed(() => tv({ extend: tv(theme), ...(appConfig.ui?.prose?.accordion || {}) }))

const rerenderCount = ref(1)
Expand Down Expand Up @@ -62,7 +65,7 @@ onBeforeUpdate(() => rerenderCount.value++)
</script>

<template>
<UAccordion :type="type" :items="items" :unmount-on-hide="false" :class="props.class" :ui="transformUI(ui())">
<UAccordion :type="type" :items="items" :unmount-on-hide="false" :class="props.class" :ui="transformUI(ui(), props.ui)">
<template #content="{ item }">
<component :is="item.component" />
</template>
Expand Down
6 changes: 3 additions & 3 deletions src/runtime/components/prose/Collapsible.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import type { AppConfig } from '@nuxt/schema'
import theme from '#build/ui/prose/collapsible'
import type { IconProps } from '../../types'
import type { IconProps, CollapsibleProps } from '../../types'
import type { ComponentConfig } from '../../types/tv'

type ProseCollapsible = ComponentConfig<typeof theme, AppConfig, 'collapsible', 'ui.prose'>
Expand All @@ -28,7 +28,7 @@ export interface ProseCollapsibleProps {
*/
closeText?: string
class?: any
ui?: ProseCollapsible['slots']
ui?: ProseCollapsible['slots'] & CollapsibleProps['ui']
}

export interface ProseCollapsibleSlots {
Expand Down Expand Up @@ -56,7 +56,7 @@ const ui = computed(() => tv({ extend: tv(theme), ...(appConfig.ui?.prose?.colla
</script>

<template>
<UCollapsible :unmount-on-hide="false" :class="props.class" :ui="transformUI(ui)">
<UCollapsible :unmount-on-hide="false" :class="props.class" :ui="transformUI(ui, props.ui)">
<template #default="{ open }">
<button :class="ui.trigger({ class: props.ui?.trigger })">
<UIcon :name="icon || appConfig.ui.icons.chevronDown" :class="ui.triggerIcon({ class: props.ui?.triggerIcon })" />
Expand Down
5 changes: 4 additions & 1 deletion src/runtime/components/prose/Tabs.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script lang="ts">
import type { AppConfig } from '@nuxt/schema'
import theme from '#build/ui/prose/tabs'
import type { TabsProps } from '../../types'
import type { ComponentConfig } from '../../types/tv'

type ProseTabs = ComponentConfig<typeof theme, AppConfig, 'tabs', 'ui.prose'>
Expand All @@ -20,6 +21,7 @@ export interface ProseTabsProps {
*/
hash?: string
class?: any
ui?: ProseTabs['slots'] & TabsProps['ui']
}

export interface ProseTabsSlots {
Expand All @@ -43,6 +45,7 @@ const model = defineModel<string>()

const appConfig = useAppConfig() as ProseTabs['AppConfig']

// eslint-disable-next-line vue/no-dupe-keys
const ui = computed(() => tv({ extend: tv(theme), ...(appConfig.ui?.prose?.tabs || {}) }))

const rerenderCount = ref(1)
Expand Down Expand Up @@ -112,7 +115,7 @@ onBeforeUpdate(() => rerenderCount.value++)
:items="items"
:class="props.class"
:unmount-on-hide="false"
:ui="transformUI(ui())"
:ui="transformUI(ui(), props.ui)"
@update:model-value="onUpdateModelValue"
>
<template #content="{ item }">
Expand Down
Loading