Skip to content

Commit 698b2c4

Browse files
committed
Merge branch 'v3' into feat/handle-prose-comp
2 parents 66ec25d + cc50ef6 commit 698b2c4

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

docs/app/components/content/ComponentCode.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,23 +239,23 @@ ${props.slots?.default}
239239
}
240240
241241
const prop = meta?.meta?.props?.find((prop: any) => prop.name === key)
242+
const propDefault = prop && (prop.default ?? prop.tags?.find(tag => tag.name === 'defaultValue')?.text ?? componentTheme?.defaultVariants?.[prop.name])
242243
const name = kebabCase(key)
243244
244245
if (typeof value === 'boolean') {
245-
if (value && prop?.default === 'true') {
246+
if (value && (propDefault === 'true' || propDefault === '`true`' || propDefault === true)) {
246247
continue
247248
}
248-
if (!value && (!prop?.default || prop.default === 'false')) {
249+
if (!value && (!propDefault || propDefault === 'false' || propDefault === '`false`' || propDefault === false)) {
249250
continue
250251
}
251252
252-
code += value ? ` ${name}` : ` :${key}="false"`
253+
code += value ? ` ${name}` : ` :${name}="false"`
253254
} else if (typeof value === 'object') {
254255
const parsedValue = !props.external?.includes(key) ? json5.stringify(value, null, 2).replace(/,([ |\t\n]+[}|\])])/g, '$1') : key
255256
256257
code += ` :${name}="${parsedValue}"`
257258
} else {
258-
const propDefault = prop && (prop.default ?? prop.tags?.find(tag => tag.name === 'defaultValue')?.text ?? componentTheme?.defaultVariants?.[prop.name])
259259
if (propDefault === value) {
260260
continue
261261
}

src/runtime/components/Accordion.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ import UIcon from './Icon.vue'
9898
const props = withDefaults(defineProps<AccordionProps<T>>(), {
9999
type: 'single',
100100
collapsible: true,
101+
unmountOnHide: true,
101102
labelKey: 'label'
102103
})
103104
const emits = defineEmits<AccordionEmits>()

src/runtime/components/Collapsible.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ extendDevtoolsMeta({ example: 'CollapsibleExample' })
3434
import { CollapsibleRoot, CollapsibleTrigger, CollapsibleContent, useForwardPropsEmits } from 'reka-ui'
3535
import { reactivePick } from '@vueuse/core'
3636
37-
const props = defineProps<CollapsibleProps>()
37+
const props = withDefaults(defineProps<CollapsibleProps>(), {
38+
unmountOnHide: true
39+
})
3840
const emits = defineEmits<CollapsibleEmits>()
3941
const slots = defineSlots<CollapsibleSlots>()
4042

src/runtime/components/NavigationMenu.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ import UCollapsible from './Collapsible.vue'
141141
const props = withDefaults(defineProps<NavigationMenuProps<I>>(), {
142142
orientation: 'horizontal',
143143
delayDuration: 0,
144-
labelKey: 'label',
145-
unmountOnHide: true
144+
unmountOnHide: true,
145+
labelKey: 'label'
146146
})
147147
const emits = defineEmits<NavigationMenuEmits>()
148148
const slots = defineSlots<NavigationMenuSlots<T>>()

src/runtime/components/Tabs.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ const props = withDefaults(defineProps<TabsProps<T>>(), {
9696
content: true,
9797
defaultValue: '0',
9898
orientation: 'horizontal',
99+
unmountOnHide: true,
99100
labelKey: 'label'
100101
})
101102
const emits = defineEmits<TabsEmits>()

0 commit comments

Comments
 (0)