Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(<ContentRenderer>): prioritize default slot #1460

Merged
merged 2 commits into from
Aug 17, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/runtime/components/ContentRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ export default defineComponent({

const { value, excerpt, tag } = ctx

if (!value && slots?.empty) {
// Fallback on `empty` slot.
return slots.empty({ value, excerpt, tag, ...this.$attrs })
}

if (slots?.default) {
return slots.default({ value, excerpt, tag, ...this.$attrs })
}

// Use built-in ContentRendererMarkdown
if (value && value?._type === 'markdown' && value?.body?.children?.length) {
return h(
Expand All @@ -73,16 +82,6 @@ export default defineComponent({
)
}

if (value && slots?.default) {
return slots.default({ value, excerpt, tag, ...this.$attrs })
} else if (slots?.empty) {
// Fallback on `empty` slot.
return slots.empty({ value, excerpt, tag, ...this.$attrs })
} else if (slots?.default) {
// Fallback on `default` slot with undefined `value` if no `empty` slot.
return slots.default({ value, excerpt, tag, ...this.$attrs })
}

// Fallback on JSON.stringify if no slot at all.
return h(
'pre',
Expand Down
5 changes: 5 additions & 0 deletions test/features/renderer-markdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,10 @@ export const testMarkdownRenderer = () => {
const html = await $fetch('/features/custom-paragraph')
expect(html).contains('[Paragraph]')
})

test('override default slot', async () => {
const html = await $fetch('/features/slotted-content-renderer')
expect(html).contains('The default slot is overridden')
})
})
}
18 changes: 18 additions & 0 deletions test/fixtures/basic/pages/features/slotted-content-renderer.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<template>
<main>
<ContentRenderer :value="data">
<Alert>
The default slot is overridden.
</Alert>
<ContentRendererMarkdown :value="data" />
<template #empty>
<p>No content found.</p>
</template>
</ContentRenderer>
</main>
</template>

<script setup lang="ts">
const path = '/'
const { data } = await useAsyncData(`content-${path}`, () => queryContent().where({ _path: path, draft: { $ne: true } }).findOne())
</script>