@dative-gpi/foundation-shared-components 0.0.228 → 0.0.230

package/components/FSTabs.vue

@@ -10,24 +10,15 @@
     @update:modelValue="$emit('update:tab', $event)"
     v-bind="$attrs"
   >
-    <template
-      v-for="(component, index) in getChildren()"
-      :key="index"
-    >
-      <component
-        :is="component"
-      />
-    </template>
+    <slot/>
   </v-tabs>
 </template>
 
 <script lang="ts">
-import type { PropType } from "vue";
-import { computed, defineComponent } from "vue";
+import { computed, defineComponent, type PropType } from "vue";
 
-import { useColors, useSlots } from "@dative-gpi/foundation-shared-components/composables";
-import type { ColorBase} from "@dative-gpi/foundation-shared-components/models";
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+import { useColors } from "@dative-gpi/foundation-shared-components/composables";
 
 export default defineComponent({
   name: "FSTabs",
@@ -44,7 +35,6 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const { getChildren } = useSlots();
     const { getColors } = useColors();
 
     const colors = computed(() => getColors(props.color));
@@ -62,8 +52,7 @@ export default defineComponent({
     }));
 
     return {
-      style,
-      getChildren
+      style
     };
   }
 });

package/components/FSWindow.vue

@@ -27,8 +27,7 @@
 </template>
 
 <script lang="ts">
-import type { PropType, VNode } from "vue";
-import { computed, defineComponent } from "vue";
+import { computed, defineComponent, type PropType, type VNode } from "vue";
 
 import { useSlots } from "@dative-gpi/foundation-shared-components/composables";
 import { sizeToVar } from "@dative-gpi/foundation-shared-components/utils";
@@ -60,7 +59,7 @@ export default defineComponent({
       style,
       getChildren,
       value
-    }
+    };
   }
 });
 </script>

package/composables/useSlots.ts

@@ -1,32 +1,51 @@
-import type { Slot} from "vue";
-import { useSlots as useVueSlots } from "vue"
+import { type Slot, useSlots as useVueSlots } from "vue"
 
 export const useSlots = () => {
-    const getChildren = (name: string | undefined = undefined): any => {
-        const innerSlots = { ...useVueSlots() };
-        const innerName = name ?? "default";
-        if (innerSlots[innerName] != null) {
-            const slot = innerSlots[innerName]!;
-            switch (typeof(slot()[0].type)) {
-                // Directive wrapper (v-for, v-if)
-                case "symbol":
-                    switch (slot()[0].type) {
-                        case Symbol.for("v-fgt"): return slot()[0].children;
-                        case Symbol.for("v-cmt"): return slot();
-                        default:                  return slot();
-                    }
-                // Custom component
-                case "object": return slot();
-                // Pre-existing component
-                case "string": return slot();
-            }
-            return slot();
+  const getChildren = (name: string | undefined = undefined): any => {
+    const innerSlots = { ...useVueSlots() };
+    const innerName = name ?? "default";
+    if (innerSlots[innerName] != null) {
+      const slot = innerSlots[innerName]!;
+      switch (typeof(slot()[0].type)) {
+        // Directive wrapper (v-for, v-if)
+        case "symbol":
+          switch (slot()[0].type) {
+            case Symbol.for("v-fgt"): return recursiveGetChildren(slot()[0].children);
+            case Symbol.for("v-cmt"): return slot();
+            default:                  return slot();
+          }
+        // Custom component
+        case "object": return slot();
+        // Pre-existing component
+        case "string": return slot();
+      }
+      return slot();
+    }
+    return null;
+  };
+
+  const recursiveGetChildren = (element: any): any => {
+    if (element == null) {
+      return null;
+    }
+    switch (typeof(element[0].type)) {
+      // Directive wrapper (v-for, v-if)
+      case "symbol":
+        switch (element[0].type) {
+          case Symbol.for("v-fgt"): return recursiveGetChildren(element[0].children);
+          case Symbol.for("v-cmt"): return element;
+          default:                  return element;
         }
-        return null;
-    };
+      // Custom component
+      case "object": return element;
+      // Pre-existing component
+      case "string": return element;
+    }
+    return element;
+  };
 
-    return {
-        slots: { ...useVueSlots() } as { [label: string]: Slot<any> },
-        getChildren
-    };
+  return {
+    slots: { ...useVueSlots() } as { [label: string]: Slot<any> },
+    getChildren
+  };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "0.0.228",
+  "version": "0.0.230",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "0.0.228",
-    "@dative-gpi/foundation-shared-services": "0.0.228"
+    "@dative-gpi/foundation-shared-domain": "0.0.230",
+    "@dative-gpi/foundation-shared-services": "0.0.230"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "ca012ee265fbeeddb5ce423de66b84a324143b8f"
+  "gitHead": "93365f65d39d6c9cc3821ffb48cba187200deaf9"
 }