From 8b945a786b70a6c4f3c837920ad786e330a6c328 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Wed, 10 Mar 2021 18:21:31 +0100
Subject: [PATCH] look ma, no slots!

---
 .../{DynamicWidgets.vue => DynamicWidgets.js} | 70 ++++++++++++-------
 src/widgets.js                                |  2 +-
 stories/DynamicWidgets.stories.js             |  6 +-
 3 files changed, 50 insertions(+), 28 deletions(-)
 rename src/components/{DynamicWidgets.vue => DynamicWidgets.js} (76%)

diff --git a/src/components/DynamicWidgets.vue b/src/components/DynamicWidgets.js
similarity index 76%
rename from src/components/DynamicWidgets.vue
rename to src/components/DynamicWidgets.js
index 635cf7d3..2b6309c1 100644
--- a/src/components/DynamicWidgets.vue
+++ b/src/components/DynamicWidgets.js
@@ -1,20 +1,5 @@
-<template>
-  <div
-    class="ais-DynamicWidgets"
-    v-show="state"
-  >
-    <div
-      class="ais-DynamicWidgets-widget"
-      v-for="attribute in attributesToRender"
-      :key="attribute"
-    >
-      <slot :name="attribute" />
-    </div>
-  </div>
-</template>
-
-<script>
 import { createWidgetMixin } from '../mixins/widget';
+
 function getAttribute(widget, initOptions) {
   try {
     const { widgetParams } = widget.getWidgetRenderState(initOptions);
@@ -119,7 +104,31 @@ const connectDynamicWidgets = function connectDynamicWidgets(
   };
 };
 
+function getVueAttribute(vnode) {
+  if (!vnode.componentOptions) {
+    return undefined;
+  }
+
+  if (vnode.componentOptions.propsData.attribute) {
+    return vnode.componentOptions.propsData.attribute;
+  }
+  if (Array.isArray(vnode.componentOptions.propsData.attributes)) {
+    return vnode.componentOptions.propsData.attributes[0];
+  }
+
+  if (Array.isArray(vnode.componentOptions.children)) {
+    // return first child with a truthy attribute
+    return vnode.componentOptions.children.reduce(
+      (acc, curr) => (acc ? acc : getVueAttribute(curr)),
+      undefined
+    );
+  }
+
+  return undefined;
+}
+
 export default {
+  name: 'AisDynamicWidgets',
   mixins: [createWidgetMixin({ connector: connectDynamicWidgets })],
   props: {
     transformItems: {
@@ -129,14 +138,28 @@ export default {
       },
     },
   },
+  render(createElement) {
+    if (!this.state) {
+      return createElement(
+        'div',
+        { attrs: { hidden: true } },
+        this.$slots.default
+      );
+    }
+
+    const components = new Map();
+    this.$slots.default.forEach(vnode => {
+      const attribute = getVueAttribute(vnode);
+      if (attribute) components.set(attribute, vnode);
+    });
+
+    return createElement(
+      'div',
+      {},
+      this.state.attributesToRender.map(attribute => components.get(attribute))
+    );
+  },
   computed: {
-    attributesToRender() {
-      if (this.state) {
-        return this.state.attributesToRender;
-      }
-      // render all widgets (hidden) before first render
-      return Object.keys(this.$slots);
-    },
     widgetParams() {
       return {
         transformItems: this.transformItems,
@@ -146,4 +169,3 @@ export default {
     },
   },
 };
-</script>
diff --git a/src/widgets.js b/src/widgets.js
index b1dc1a31..4ea249cf 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -43,4 +43,4 @@ export {
 } from './components/ToggleRefinement.vue';
 export { default as AisVoiceSearch } from './components/VoiceSearch.vue';
 export { default as AisRelevantSort } from './components/RelevantSort.vue';
-export { default as AisDynamicWidgets } from './components/DynamicWidgets.vue';
+export { default as AisDynamicWidgets } from './components/DynamicWidgets';
diff --git a/stories/DynamicWidgets.stories.js b/stories/DynamicWidgets.stories.js
index 9db9b7e1..02f96f52 100644
--- a/stories/DynamicWidgets.stories.js
+++ b/stories/DynamicWidgets.stories.js
@@ -6,9 +6,9 @@ storiesOf('ais-dynamic-widgets', module)
   .add('simple usage', () => ({
     template: `
     <ais-dynamic-widgets :transform-items="transformItems">
-      <ais-refinement-list slot="brand" attribute="brand"></ais-refinement-list>
-      <ais-menu slot="categories" attribute="categories"></ais-menu>
-      <ais-panel slot="hierarchicalCategories.lvl0">
+      <ais-refinement-list attribute="brand"></ais-refinement-list>
+      <ais-menu attribute="categories"></ais-menu>
+      <ais-panel>
         <template slot="header">hierarchy</template>
         <ais-hierarchical-menu :attributes="hierarchicalCategories"></ais-hierarchical-menu>
       </ais-panel>