refactor(noElement): use the full array of VNodes from the default sl…

…ot (#1474)
empathyco · May 22, 2024 · 8fb904c · 8fb904c
1 parent fe08ca2
commit 8fb904c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/packages/x-components/src/components/global-x-bus.vue b/packages/x-components/src/components/global-x-bus.vue
@@ -13,7 +13,7 @@
    */
   export default defineComponent({
     name: 'GlobalXBus',
-    setup(_, { listeners }) {
+    setup(_, { listeners, slots }) {
       const xBus = useXBus();
 
       /**
@@ -25,9 +25,8 @@
           callback(eventPayload as never, metadata);
         });
       });
-    },
-    render() {
-      return useNoElementRender(this.$slots);
+
+      return () => useNoElementRender(slots);
     }
   });
 </script>

diff --git a/packages/x-components/src/components/no-element.ts b/packages/x-components/src/components/no-element.ts
@@ -8,7 +8,7 @@ import { useNoElementRender } from '../composables/use-no-element-render';
  * @internal
  */
 export const NoElement = defineComponent({
-  render() {
-    return useNoElementRender(this.$slots);
+  setup(props, { slots }) {
+    return () => useNoElementRender(slots);
   }
 });
diff --git a/packages/x-components/src/composables/__tests__/use-no-element-render.spec.ts b/packages/x-components/src/composables/__tests__/use-no-element-render.spec.ts
@@ -11,8 +11,8 @@ const renderUseNoElementRender = ({
   const wrapper = mount(
     component ??
       (defineComponent({
-        render() {
-          return useNoElementRender(this.$slots);
+        setup(props, { slots }) {
+          return () => useNoElementRender(slots);
         }
       }) as ComponentOptions<Vue>),
     {

diff --git a/packages/x-components/src/composables/use-no-element-render.ts b/packages/x-components/src/composables/use-no-element-render.ts
@@ -11,9 +11,8 @@ import { VNode } from 'vue/types/vnode';
  */
 export function useNoElementRender(
   slots: { [key: string]: VNode[] | undefined } | SetupContext['slots']
-): VNode {
-  const defaultSlotContent =
-    typeof slots.default === 'function' ? slots.default()?.[0] : slots.default?.[0];
+): VNode | VNode[] {
+  const defaultSlotContent = typeof slots.default === 'function' ? slots.default() : slots.default;
 
   return defaultSlotContent ?? h();
 }
diff --git a/packages/x-components/src/x-modules/facets/components/preselected-filters.vue b/packages/x-components/src/x-modules/facets/components/preselected-filters.vue
@@ -28,7 +28,7 @@
         default: () => []
       }
     },
-    setup(props) {
+    setup(props, { slots }) {
       const xBus = useXBus();
 
       /**
@@ -67,9 +67,8 @@
        * computed prop changes.
        */
       watch(preselectedFilters, emitPreselectedFilters, { immediate: true });
-    },
-    render() {
-      return useNoElementRender(this.$slots);
+
+      return () => useNoElementRender(slots);
     }
   });
 </script>