Reverted #4646 - For TabView and Accordion

components/lib/accordion/Accordion.vue

@@ -57,7 +57,7 @@
 import ChevronDownIcon from 'primevue/icons/chevrondown';
 import ChevronRightIcon from 'primevue/icons/chevronright';
 import Ripple from 'primevue/ripple';
-import { DomHandler, HelperSet, UniqueComponentId } from 'primevue/utils';
+import { DomHandler, UniqueComponentId } from 'primevue/utils';
 import { mergeProps } from 'vue';
 import BaseAccordion from './BaseAccordion.vue';
 
@@ -65,16 +65,10 @@ export default {
     name: 'Accordion',
     extends: BaseAccordion,
     emits: ['update:activeIndex', 'tab-open', 'tab-close', 'tab-click'],
-    provide() {
-        return {
-            $accordionTabs: this.d_accordionTabs
-        };
-    },
     data() {
         return {
             id: this.$attrs.id,
-            d_activeIndex: this.activeIndex,
+            d_activeIndex: this.activeIndex
-            d_accordionTabs: new HelperSet({ type: 'AccordionTab' })
         };
     },
     watch: {
@@ -88,10 +82,10 @@ export default {
     mounted() {
         this.id = this.id || UniqueComponentId();
     },
-    beforeUnmount() {
-        this.d_accordionTabs.clear();
-    },
     methods: {
+        isAccordionTab(child) {
+            return child.type.name === 'AccordionTab';
+        },
         isTabActive(index) {
             return this.multiple ? this.d_activeIndex && this.d_activeIndex.includes(index) : this.d_activeIndex === index;
         },
@@ -241,7 +235,19 @@ export default {
     },
     computed: {
         tabs() {
-            return this.d_accordionTabs.get(this);
+            return this.$slots.default().reduce((tabs, child) => {
+                if (this.isAccordionTab(child)) {
+                    tabs.push(child);
+                } else if (child.children && child.children instanceof Array) {
+                    child.children.forEach((nestedChild) => {
+                        if (this.isAccordionTab(nestedChild)) {
+                            tabs.push(nestedChild);
+                        }
+                    });
+                }
+
+                return tabs;
+            }, []);
         }
     },
     components: {

components/lib/accordiontab/AccordionTab.vue

@@ -7,13 +7,6 @@ import BaseAccordionTab from './BaseAccordionTab.vue';
 
 export default {
     name: 'AccordionTab',
-    extends: BaseAccordionTab,
+    extends: BaseAccordionTab
-    inject: ['$accordionTabs'],
-    mounted() {
-        this.$accordionTabs?.add(this.$);
-    },
-    unmounted() {
-        this.$accordionTabs?.delete(this.$);
-    }
 };
 </script>

components/lib/tabpanel/TabPanel.vue

@@ -7,13 +7,6 @@ import BaseTabPanel from './BaseTabPanel.vue';
 
 export default {
     name: 'TabPanel',
-    extends: BaseTabPanel,
+    extends: BaseTabPanel
-    inject: ['$tabPanels'],
-    mounted() {
-        this.$tabPanels?.add(this.$);
-    },
-    unmounted() {
-        this.$tabPanels?.delete(this.$);
-    }
 };
 </script>

components/lib/tabview/TabView.vue

@@ -95,7 +95,7 @@
 import ChevronLeftIcon from 'primevue/icons/chevronleft';
 import ChevronRightIcon from 'primevue/icons/chevronright';
 import Ripple from 'primevue/ripple';
-import { DomHandler, HelperSet, UniqueComponentId } from 'primevue/utils';
+import { DomHandler, UniqueComponentId } from 'primevue/utils';
 import { mergeProps } from 'vue';
 import BaseTabView from './BaseTabView.vue';
 
@@ -103,18 +103,12 @@ export default {
     name: 'TabView',
     extends: BaseTabView,
     emits: ['update:activeIndex', 'tab-change', 'tab-click'],
-    provide() {
-        return {
-            $tabPanels: this.d_tabPanels
-        };
-    },
     data() {
         return {
             id: this.$attrs.id,
             d_activeIndex: this.activeIndex,
             isPrevButtonDisabled: true,
-            isNextButtonDisabled: false,
+            isNextButtonDisabled: false
-            d_tabPanels: new HelperSet({ type: 'TabPanel' })
         };
     },
     watch: {
@@ -140,6 +134,9 @@ export default {
         this.d_tabPanels.clear();
     },
     methods: {
+        isTabPanel(child) {
+            return child.type.name === 'TabPanel';
+        },
         isTabActive(index) {
             return this.d_activeIndex === index;
         },
@@ -348,7 +345,19 @@ export default {
     },
     computed: {
         tabs() {
-            return this.d_tabPanels.get(this);
+            return this.$slots.default().reduce((tabs, child) => {
+                if (this.isTabPanel(child)) {
+                    tabs.push(child);
+                } else if (child.children && child.children instanceof Array) {
+                    child.children.forEach((nestedChild) => {
+                        if (this.isTabPanel(nestedChild)) {
+                            tabs.push(nestedChild);
+                        }
+                    });
+                }
+
+                return tabs;
+            }, []);
         },
         prevButtonAriaLabel() {
             return this.$primevue.config.locale.aria ? this.$primevue.config.locale.aria.previous : undefined;

components/lib/treetable/TreeTable.vue

@@ -1,5 +1,6 @@
 <template>
     <div :class="cx('root')" data-scrollselectors=".p-treetable-scrollable-body" role="table" v-bind="ptm('root')" data-pc-name="treetable">
+        <slot></slot>
         <div v-if="loading && loadingMode === 'mask'" :class="cx('loadingWrapper')" v-bind="ptm('loadingWrapper')">
             <div :class="cx('loadingOverlay')" v-bind="ptm('loadingOverlay')">
                 <slot name="loadingicon" :class="cx('loadingIcon')">