@energysage/es-ds-components 3.0.0-alpha.11 → 3.0.0-alpha.12

package/components/es-accordion-list.vue

@@ -17,19 +17,27 @@ const props = withDefaults(defineProps<Props>(), {
 // eslint-disable-next-line vue/require-prop-types
 const model = defineModel();
 
-const children = useSlots().default?.() || [];
+// get the list of elements provided as children to the default slot
+const initialChildren = useSlots().default?.() || [];
+const children: any[] = [];
+initialChildren.forEach((child) => {
+    // unless this has a v-for element and we instead need to access its children
+    if (typeof child.type === 'symbol' && Array.isArray(child.children)) {
+        children.push(...child.children);
+    } else {
+        children.push(child);
+    }
+});
 
 const activeIndex = ref();
 
 watch(model, (newVal) => {
     if (newVal) {
-        // @ts-expect-error not sure
         activeIndex.value = children.findIndex((child) => child.props.id === newVal);
     }
 });
 
 const accordionTabs = children.map((child, index) => {
-    // @ts-expect-error not sure
     if (child.props.id === props.initialExpandedId || child.props.id === model.value) {
         activeIndex.value = index;
     }
@@ -38,7 +46,6 @@ const accordionTabs = children.map((child, index) => {
 
 const updateActiveIndex = (index: any) => {
     if (model.value) {
-        // @ts-expect-error not sure
         model.value = children[index]?.props.id || '';
     }
 };
@@ -99,7 +106,6 @@ const updateActiveIndex = (index: any) => {
                     role="heading"
                     aria-level="3"
                     :class="{ 'h3 mb-0': variant === 'minimal' }">
-                    <!-- @vue-expect-error -->
                     <component
                         :is="item"
                         v-for="item in tab.title()"
@@ -107,7 +113,6 @@ const updateActiveIndex = (index: any) => {
                 </span>
                 <icon-chevron-down class="es-accordion-icon flex-shrink-0 ml-200" />
             </template>
-            <!-- @vue-expect-error -->
             <component
                 :is="item"
                 v-for="item in tab.default()"

package/components/es-tabs.vue

@@ -6,7 +6,16 @@ import TabView from 'primevue/tabview';
 const model = defineModel<number>();
 
 // get the list of elements provided as children to the default slot
-const panels = useSlots().default?.() || [];
+const initialChildren = useSlots().default?.() || [];
+const panels: any[] = [];
+initialChildren.forEach((child) => {
+    // unless this has a v-for element and we instead need to access its children
+    if (typeof child.type === 'symbol' && Array.isArray(child.children)) {
+        panels.push(...child.children);
+    } else {
+        panels.push(child);
+    }
+});
 
 // keep track of the active tab index
 //  - from above, if v-model is used
@@ -36,7 +45,6 @@ const updateActiveIndex = (index: number) => {
             panelContainer: 'tab-content',
         }"
         @update:active-index="updateActiveIndex">
-        <!-- @vue-expect-error -->
         <tab-panel
             v-for="(panel, index) in panels"
             :key="index"
@@ -60,7 +68,6 @@ const updateActiveIndex = (index: number) => {
                     ],
                 }),
             }">
-            <!-- @vue-expect-error -->
             <component
                 :is="item"
                 v-for="(item, idx) in panel.children.default()"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@energysage/es-ds-components",
-    "version": "3.0.0-alpha.11",
+    "version": "3.0.0-alpha.12",
     "private": false,
     "type": "module",
     "description": "An EnergySage Vue component library",
@@ -17,7 +17,7 @@
     "author": "EnergySage",
     "license": "MIT",
     "dependencies": {
-        "@energysage/es-ds-styles": "^3.0.0-alpha.8",
+        "@energysage/es-ds-styles": "^3.0.0-alpha.10",
         "@nuxtjs/google-fonts": "^3.2.0",
         "@vuelidate/core": "^2.0.3",
         "@vuelidate/validators": "^2.0.4",