refactor(ContentRenderer): simplify conditions (#1715)

nuxt · Nov 30, 2022 · 5dfa181 · 5dfa181
1 parent 67e1f53
commit 5dfa181
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/runtime/components/ContentRenderer.vue b/src/runtime/components/ContentRenderer.vue
@@ -60,7 +60,7 @@ export default defineComponent({
 
     const { value, excerpt, tag } = ctx
 
-    if ((!value || !value?.body?.children?.length) && slots?.empty) {
+    if (!value?.body?.children?.length && slots?.empty) {
       // Fallback on `empty` slot.
       return slots.empty({ value, excerpt, tag, ...this.$attrs })
     }
@@ -70,7 +70,7 @@ export default defineComponent({
     }
 
     // Use built-in ContentRendererMarkdown
-    if (value && value?._type === 'markdown' && value?.body?.children?.length) {
+    if (value?._type === 'markdown' && value?.body?.children?.length) {
       return h(
         ContentRendererMarkdown,
         {

diff --git a/test/basic.test.ts b/test/basic.test.ts
@@ -96,7 +96,8 @@ describe('Basic usage', async () => {
 
   test('Empty slot', async () => {
     const html = await $fetch('/features/empty-slot')
-    expect(html).contains('Empty!!!')
+    expect(html).contains('Nullish Document!!!')
+    expect(html).contains('Empty Child!!!')
   })
 
   test('<ContentDoc> head management (if same path)', async () => {

diff --git a/test/custom-api-base.test.ts b/test/custom-api-base.test.ts
@@ -105,7 +105,8 @@ describe('Custom api baseURL', async () => {
 
   test('Empty slot', async () => {
     const html = await $fetch('/features/empty-slot')
-    expect(html).contains('Empty!!!')
+    expect(html).contains('Nullish Document!!!')
+    expect(html).contains('Empty Child!!!')
   })
 
   test('<ContentDoc> head management (if same path)', async () => {

diff --git a/test/fixtures/basic/pages/features/empty-slot.vue b/test/fixtures/basic/pages/features/empty-slot.vue
@@ -1,13 +1,23 @@
 <template>
-  <ContentRenderer :value="emptyDocument">
-    <template #empty>
-      Empty!!!
-    </template>
-  </ContentRenderer>
+  <div>
+    <ContentRenderer :value="nullishDocument">
+      <template #empty>
+        Nullish Document!!!
+      </template>
+    </ContentRenderer>
+
+    <ContentRenderer :value="emptyChild">
+      <template #empty>
+        Empty Child!!!
+      </template>
+    </ContentRenderer>
+  </div>
 </template>
 
 <script setup>
-const emptyDocument = {
+const nullishDocument = null
+
+const emptyChild = {
   _path: '/_markdown',
   _dir: '',
   _draft: false,