From f91f6bd1ec74400a4443fcb4e0a4d017b36acb24 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 12 Feb 2024 13:02:20 +0000
Subject: [PATCH] Refactor #5257

---
 components/lib/accordion/Accordion.vue                       | 3 ++-
 components/lib/accordiontab/AccordionTab.vue                 | 3 ++-
 components/lib/column/Column.vue                             | 1 +
 components/lib/columngroup/ColumnGroup.vue                   | 1 +
 components/lib/confirmpopup/ConfirmPopup.vue                 | 2 +-
 components/lib/contextmenu/ContextMenu.vue                   | 2 +-
 components/lib/datatable/DataTable.vue                       | 3 ++-
 components/lib/dataview/DataView.vue                         | 3 ++-
 .../lib/dataviewlayoutoptions/DataViewLayoutOptions.vue      | 3 ++-
 components/lib/deferredcontent/DeferredContent.vue           | 3 ++-
 components/lib/dialog/Dialog.vue                             | 2 +-
 components/lib/divider/Divider.vue                           | 5 +++--
 12 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/components/lib/accordion/Accordion.vue b/components/lib/accordion/Accordion.vue
index dfd54e2b5..e9fb3fa53 100755
--- a/components/lib/accordion/Accordion.vue
+++ b/components/lib/accordion/Accordion.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <div v-for="(tab, i) of tabs" :key="getKey(tab, i)" :class="cx('tab.root', { tab, index: i })" v-bind="getTabPT(tab, 'root', i)" data-pc-name="accordiontab" :data-pc-index="i" :data-p-active="isTabActive(i)">
             <div
                 :style="getTabProp(tab, 'headerStyle')"
@@ -64,6 +64,7 @@ import BaseAccordion from './BaseAccordion.vue';
 export default {
     name: 'Accordion',
     extends: BaseAccordion,
+    inheritAttrs: false,
     emits: ['update:activeIndex', 'tab-open', 'tab-close', 'tab-click'],
     data() {
         return {
diff --git a/components/lib/accordiontab/AccordionTab.vue b/components/lib/accordiontab/AccordionTab.vue
index c5f577a91..946b8a373 100755
--- a/components/lib/accordiontab/AccordionTab.vue
+++ b/components/lib/accordiontab/AccordionTab.vue
@@ -7,6 +7,7 @@ import BaseAccordionTab from './BaseAccordionTab.vue';
 
 export default {
     name: 'AccordionTab',
-    extends: BaseAccordionTab
+    extends: BaseAccordionTab,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/column/Column.vue b/components/lib/column/Column.vue
index 82a8903ea..0af6b2219 100755
--- a/components/lib/column/Column.vue
+++ b/components/lib/column/Column.vue
@@ -4,6 +4,7 @@ import BaseColumn from './BaseColumn.vue';
 export default {
     name: 'Column',
     extends: BaseColumn,
+    inheritAttrs: false,
     inject: ['$columns'],
     mounted() {
         this.$columns?.add(this.$);
diff --git a/components/lib/columngroup/ColumnGroup.vue b/components/lib/columngroup/ColumnGroup.vue
index c2144a286..b69504c43 100755
--- a/components/lib/columngroup/ColumnGroup.vue
+++ b/components/lib/columngroup/ColumnGroup.vue
@@ -4,6 +4,7 @@ import BaseColumnGroup from './BaseColumnGroup.vue';
 export default {
     name: 'ColumnGroup',
     extends: BaseColumnGroup,
+    inheritAttrs: false,
     inject: ['$columnGroups'],
     mounted() {
         this.$columnGroups?.add(this.$);
diff --git a/components/lib/confirmpopup/ConfirmPopup.vue b/components/lib/confirmpopup/ConfirmPopup.vue
index ab9ee7502..cb528aa32 100644
--- a/components/lib/confirmpopup/ConfirmPopup.vue
+++ b/components/lib/confirmpopup/ConfirmPopup.vue
@@ -1,7 +1,7 @@
 <template>
     <Portal>
         <transition name="p-confirm-popup" @enter="onEnter" @after-enter="onAfterEnter" @leave="onLeave" @after-leave="onAfterLeave" v-bind="ptm('transition')">
-            <div v-if="visible" :ref="containerRef" v-focustrap role="alertdialog" :class="cx('root')" :aria-modal="visible" @click="onOverlayClick" @keydown="onOverlayKeydown" v-bind="{ ...$attrs, ...ptm('root') }">
+            <div v-if="visible" :ref="containerRef" v-focustrap role="alertdialog" :class="cx('root')" :aria-modal="visible" @click="onOverlayClick" @keydown="onOverlayKeydown" v-bind="ptmi('root')">
                 <slot v-if="$slots.container" name="container" :message="confirmation" :onAccept="accept" :onReject="reject" :acceptCallback="accept" :rejectCallback="reject"></slot>
                 <template v-else>
                     <template v-if="!$slots.message">
diff --git a/components/lib/contextmenu/ContextMenu.vue b/components/lib/contextmenu/ContextMenu.vue
index 03f15d133..35af3954e 100755
--- a/components/lib/contextmenu/ContextMenu.vue
+++ b/components/lib/contextmenu/ContextMenu.vue
@@ -1,7 +1,7 @@
 <template>
     <Portal :appendTo="appendTo">
         <transition name="p-contextmenu" @enter="onEnter" @after-enter="onAfterEnter" @leave="onLeave" @after-leave="onAfterLeave" v-bind="ptm('transition')">
-            <div v-if="visible" :ref="containerRef" :class="cx('root')" v-bind="{ ...$attrs, ...ptm('root') }">
+            <div v-if="visible" :ref="containerRef" :class="cx('root')" v-bind="ptmi('root')">
                 <ContextMenuSub
                     :ref="listRef"
                     :id="id + '_list'"
diff --git a/components/lib/datatable/DataTable.vue b/components/lib/datatable/DataTable.vue
index 4333a0c0e..33f2d6a55 100755
--- a/components/lib/datatable/DataTable.vue
+++ b/components/lib/datatable/DataTable.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" data-scrollselectors=".p-datatable-wrapper" v-bind="ptm('root')">
+    <div :class="cx('root')" data-scrollselectors=".p-datatable-wrapper" v-bind="ptmi('root')">
         <slot></slot>
         <div v-if="loading" :class="cx('loadingOverlay')" v-bind="ptm('loadingOverlay')">
             <slot v-if="$slots.loading" name="loading"></slot>
@@ -293,6 +293,7 @@ import TableHeader from './TableHeader.vue';
 export default {
     name: 'DataTable',
     extends: BaseDataTable,
+    inheritAttrs: false,
     emits: [
         'value-change',
         'update:first',
diff --git a/components/lib/dataview/DataView.vue b/components/lib/dataview/DataView.vue
index 9f143d3a3..f9c0a6f6f 100755
--- a/components/lib/dataview/DataView.vue
+++ b/components/lib/dataview/DataView.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <div v-if="$slots.header" :class="cx('header')" v-bind="ptm('header')">
             <slot name="header"></slot>
         </div>
@@ -72,6 +72,7 @@ import BaseDataView from './BaseDataView.vue';
 export default {
     name: 'DataView',
     extends: BaseDataView,
+    inheritAttrs: false,
     emits: ['update:first', 'update:rows', 'page'],
     data() {
         return {
diff --git a/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue b/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue
index af1e9edfe..ab5ee9633 100755
--- a/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue
+++ b/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" role="group" v-bind="ptm('root')">
+    <div :class="cx('root')" role="group" v-bind="ptmi('root')">
         <button :aria-label="listViewAriaLabel" :class="cx('listButton')" @click="changeLayout('list')" type="button" :aria-pressed="isListButtonPressed" v-bind="ptm('listButton')">
             <slot name="listicon">
                 <BarsIcon v-bind="ptm('listIcon')" />
@@ -21,6 +21,7 @@ import BaseDataViewLayoutOptions from './BaseDataViewLayoutOptions.vue';
 export default {
     name: 'DataViewLayoutOptions',
     extends: BaseDataViewLayoutOptions,
+    inheritAttrs: false,
     emits: ['update:modelValue'],
     data() {
         return {
diff --git a/components/lib/deferredcontent/DeferredContent.vue b/components/lib/deferredcontent/DeferredContent.vue
index 93c37748a..c8993e0cf 100755
--- a/components/lib/deferredcontent/DeferredContent.vue
+++ b/components/lib/deferredcontent/DeferredContent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="container" v-bind="ptm('root')">
+    <div ref="container" v-bind="ptmi('root')">
         <slot v-if="loaded"></slot>
     </div>
 </template>
@@ -11,6 +11,7 @@ import DeferredContentStyle from 'primevue/deferredcontent/style';
 export default {
     name: 'DeferredContent',
     extends: BaseComponent,
+    inheritAttrs: false,
     emits: ['load'],
     style: DeferredContentStyle,
     data() {
diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue
index 9fb5c133f..49f77e9ae 100755
--- a/components/lib/dialog/Dialog.vue
+++ b/components/lib/dialog/Dialog.vue
@@ -2,7 +2,7 @@
     <Portal :appendTo="appendTo">
         <div v-if="containerVisible" :ref="maskRef" :class="cx('mask')" :style="sx('mask', true, { position, modal })" @click="onMaskClick" v-bind="ptm('mask')">
             <transition name="p-dialog" @before-enter="onBeforeEnter" @enter="onEnter" @before-leave="onBeforeLeave" @leave="onLeave" @after-leave="onAfterLeave" appear v-bind="ptm('transition')">
-                <div v-if="visible" :ref="containerRef" v-focustrap="{ disabled: !modal }" :class="cx('root')" :style="sx('root')" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal" v-bind="{ ...$attrs, ...ptm('root') }">
+                <div v-if="visible" :ref="containerRef" v-focustrap="{ disabled: !modal }" :class="cx('root')" :style="sx('root')" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal" v-bind="ptmi('root')">
                     <slot v-if="$slots.container" name="container" :onClose="close" :onMaximize="(event) => maximize(event)" :closeCallback="close" :maximizeCallback="(event) => maximize(event)"></slot>
                     <template v-else>
                         <div v-if="showHeader" :ref="headerContainerRef" :class="cx('header')" @mousedown="initDrag" v-bind="ptm('header')">
diff --git a/components/lib/divider/Divider.vue b/components/lib/divider/Divider.vue
index 42009c3a2..9eb164787 100644
--- a/components/lib/divider/Divider.vue
+++ b/components/lib/divider/Divider.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" :style="sx('root')" role="separator" :aria-orientation="layout" v-bind="ptm('root')">
+    <div :class="cx('root')" :style="sx('root')" role="separator" :aria-orientation="layout" v-bind="ptmi('root')">
         <div v-if="$slots.default" :class="cx('content')" v-bind="ptm('content')">
             <slot></slot>
         </div>
@@ -11,6 +11,7 @@ import BaseDivider from './BaseDivider.vue';
 
 export default {
     name: 'Divider',
-    extends: BaseDivider
+    extends: BaseDivider,
+    inheritAttrs: false
 };
 </script>