From dd84dbbb603fcf404cc499dbc8463cffebb17ff7 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Sun, 11 Feb 2024 08:10:29 +0000
Subject: [PATCH] Refactor #5257

---
 components/lib/autocomplete/AutoComplete.vue       | 3 ++-
 components/lib/avatar/Avatar.vue                   | 3 ++-
 components/lib/avatargroup/AvatarGroup.vue         | 5 +++--
 components/lib/badge/Badge.vue                     | 5 +++--
 components/lib/basecomponent/BaseComponent.vue     | 1 +
 components/lib/blockui/BlockUI.vue                 | 3 ++-
 components/lib/breadcrumb/Breadcrumb.vue           | 7 ++++---
 components/lib/button/Button.vue                   | 7 +++++--
 components/lib/calendar/Calendar.vue               | 3 ++-
 components/lib/card/Card.vue                       | 5 +++--
 components/lib/carousel/Carousel.vue               | 3 ++-
 components/lib/cascadeselect/CascadeSelect.vue     | 3 ++-
 components/lib/chart/Chart.vue                     | 3 ++-
 components/lib/checkbox/Checkbox.vue               | 5 ++++-
 components/lib/chip/Chip.vue                       | 3 ++-
 components/lib/chips/Chips.vue                     | 3 ++-
 components/lib/colorpicker/ColorPicker.vue         | 3 ++-
 components/lib/dock/Dock.vue                       | 3 ++-
 components/lib/dropdown/Dropdown.vue               | 3 ++-
 components/lib/editor/Editor.vue                   | 3 ++-
 components/lib/fieldset/Fieldset.vue               | 3 ++-
 components/lib/fileupload/FileUpload.vue           | 5 +++--
 components/lib/floatlabel/FloatLabel.vue           | 5 +++--
 components/lib/iconfield/IconField.vue             | 7 ++++---
 components/lib/image/Image.vue                     | 2 +-
 components/lib/inlinemessage/InlineMessage.vue     | 3 ++-
 components/lib/inplace/Inplace.vue                 | 3 ++-
 components/lib/inputgroup/InputGroup.vue           | 5 +++--
 components/lib/inputgroupaddon/InputGroupAddon.vue | 5 +++--
 components/lib/inputmask/InputMask.vue             | 3 ++-
 components/lib/inputnumber/InputNumber.vue         | 3 ++-
 components/lib/inputswitch/InputSwitch.vue         | 5 ++++-
 components/lib/splitbutton/SplitButton.vue         | 3 ++-
 33 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/components/lib/autocomplete/AutoComplete.vue b/components/lib/autocomplete/AutoComplete.vue
index 0702b106f..4310ea5f7 100755
--- a/components/lib/autocomplete/AutoComplete.vue
+++ b/components/lib/autocomplete/AutoComplete.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="container" :class="cx('root')" :style="sx('root')" @click="onContainerClick" v-bind="ptm('root')">
+    <div ref="container" :class="cx('root')" :style="sx('root')" @click="onContainerClick" v-bind="ptmi('root')">
         <input
             v-if="!multiple"
             ref="focusInput"
@@ -178,6 +178,7 @@ import BaseAutoComplete from './BaseAutoComplete.vue';
 export default {
     name: 'AutoComplete',
     extends: BaseAutoComplete,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'change', 'focus', 'blur', 'item-select', 'item-unselect', 'dropdown-click', 'clear', 'complete', 'before-show', 'before-hide', 'show', 'hide'],
     outsideClickListener: null,
     resizeListener: null,
diff --git a/components/lib/avatar/Avatar.vue b/components/lib/avatar/Avatar.vue
index 8a8a124de..cbe30f81e 100644
--- a/components/lib/avatar/Avatar.vue
+++ b/components/lib/avatar/Avatar.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" :aria-labelledby="ariaLabelledby" :aria-label="ariaLabel" v-bind="ptm('root')">
+    <div :class="cx('root')" :aria-labelledby="ariaLabelledby" :aria-label="ariaLabel" v-bind="ptmi('root')">
         <slot>
             <span v-if="label" :class="cx('label')" v-bind="ptm('label')">{{ label }}</span>
             <component v-else-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" />
@@ -15,6 +15,7 @@ import BaseAvatar from './BaseAvatar.vue';
 export default {
     name: 'Avatar',
     extends: BaseAvatar,
+    inheritAttrs: false,
     emits: ['error'],
     methods: {
         onError(event) {
diff --git a/components/lib/avatargroup/AvatarGroup.vue b/components/lib/avatargroup/AvatarGroup.vue
index a4fb3c572..bfc97414a 100644
--- a/components/lib/avatargroup/AvatarGroup.vue
+++ b/components/lib/avatargroup/AvatarGroup.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <slot></slot>
     </div>
 </template>
@@ -9,6 +9,7 @@ import BaseAvatarGroup from './BaseAvatarGroup.vue';
 
 export default {
     name: 'AvatarGroup',
-    extends: BaseAvatarGroup
+    extends: BaseAvatarGroup,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/badge/Badge.vue b/components/lib/badge/Badge.vue
index 2ab73d911..d1dc2e338 100644
--- a/components/lib/badge/Badge.vue
+++ b/components/lib/badge/Badge.vue
@@ -1,5 +1,5 @@
 <template>
-    <span :class="cx('root')" v-bind="ptm('root')">
+    <span :class="cx('root')" v-bind="ptmi('root')">
         <slot>{{ value }}</slot>
     </span>
 </template>
@@ -9,6 +9,7 @@ import BaseBadge from './BaseBadge.vue';
 
 export default {
     name: 'Badge',
-    extends: BaseBadge
+    extends: BaseBadge,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index 382d8bc9e..eb3ede7bc 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -194,6 +194,7 @@ export default {
             return this._getPTValue(this.pt, key, { ...this.$params, ...params });
         },
         ptmi(key = '', params = {}) {
+            // inheritAttrs:true without `pt:*`
             return mergeProps(this.$_attrsNoPT, this.ptm(key, params));
         },
         ptmo(obj = {}, key = '', params = {}) {
diff --git a/components/lib/blockui/BlockUI.vue b/components/lib/blockui/BlockUI.vue
index 2cf65731d..2dc8b68fe 100755
--- a/components/lib/blockui/BlockUI.vue
+++ b/components/lib/blockui/BlockUI.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="container" :class="cx('root')" :aria-busy="isBlocked" v-bind="ptm('root')">
+    <div ref="container" :class="cx('root')" :aria-busy="isBlocked" v-bind="ptmi('root')">
         <slot></slot>
     </div>
 </template>
@@ -11,6 +11,7 @@ import BaseBlockUI from './BaseBlockUI.vue';
 export default {
     name: 'BlockUI',
     extends: BaseBlockUI,
+    inheritAttrs: false,
     emits: ['block', 'unblock'],
     mask: null,
     data() {
diff --git a/components/lib/breadcrumb/Breadcrumb.vue b/components/lib/breadcrumb/Breadcrumb.vue
index 1ec7cb97d..0cb14c1e7 100755
--- a/components/lib/breadcrumb/Breadcrumb.vue
+++ b/components/lib/breadcrumb/Breadcrumb.vue
@@ -1,5 +1,5 @@
 <template>
-    <nav :class="cx('root')" v-bind="ptm('root')">
+    <nav :class="cx('root')" v-bind="ptmi('root')">
         <ol :class="cx('menu')" v-bind="ptm('menu')">
             <BreadcrumbItem v-if="home" :item="home" :class="cx('home')" :templates="$slots" :pt="pt" :unstyled="unstyled" v-bind="ptm('home')" />
             <template v-for="(item, i) of model" :key="item.label + '_' + i">
@@ -22,9 +22,10 @@ import BreadcrumbItem from './BreadcrumbItem.vue';
 export default {
     name: 'Breadcrumb',
     extends: BaseBreadcrumb,
+    inheritAttrs: false,
     components: {
-        BreadcrumbItem: BreadcrumbItem,
-        ChevronRightIcon: ChevronRightIcon
+        BreadcrumbItem,
+        ChevronRightIcon
     }
 };
 </script>
diff --git a/components/lib/button/Button.vue b/components/lib/button/Button.vue
index 83757455f..5134e3ddb 100755
--- a/components/lib/button/Button.vue
+++ b/components/lib/button/Button.vue
@@ -1,5 +1,5 @@
 <template>
-    <button v-ripple :class="cx('root')" type="button" :aria-label="defaultAriaLabel" :disabled="disabled" v-bind="getPTOptions('root')" :data-pc-severity="severity">
+    <button v-ripple :class="cx('root')" type="button" :aria-label="defaultAriaLabel" :disabled="disabled" v-bind="getPTOptions('root')" :data-p-severity="severity">
         <slot>
             <slot v-if="loading" name="loadingicon" :class="[cx('loadingIcon'), cx('icon')]">
                 <span v-if="loadingIcon" :class="[cx('loadingIcon'), cx('icon'), loadingIcon]" v-bind="ptm('loadingIcon')" />
@@ -23,9 +23,12 @@ import BaseButton from './BaseButton.vue';
 export default {
     name: 'Button',
     extends: BaseButton,
+    inheritAttrs: false,
     methods: {
         getPTOptions(key) {
-            return this.ptm(key, {
+            const _ptm = key === 'root' ? this.ptmi : this.ptm;
+
+            return _ptm(key, {
                 context: {
                     disabled: this.disabled
                 }
diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue
index 052097ee1..8c8e884b2 100755
--- a/components/lib/calendar/Calendar.vue
+++ b/components/lib/calendar/Calendar.vue
@@ -1,5 +1,5 @@
 <template>
-    <span ref="container" :id="d_id" :class="cx('root')" :style="sx('root')" v-bind="ptm('root')">
+    <span ref="container" :id="d_id" :class="cx('root')" :style="sx('root')" v-bind="ptmi('root')">
         <input
             v-if="!inline"
             :ref="inputRef"
@@ -521,6 +521,7 @@ import BaseCalendar from './BaseCalendar.vue';
 export default {
     name: 'Calendar',
     extends: BaseCalendar,
+    inheritAttrs: false,
     emits: ['show', 'hide', 'input', 'month-change', 'year-change', 'date-select', 'update:modelValue', 'today-click', 'clear-click', 'focus', 'blur', 'keydown'],
     navigationState: null,
     timePickerChange: false,
diff --git a/components/lib/card/Card.vue b/components/lib/card/Card.vue
index 4052ca48c..54248b1dc 100755
--- a/components/lib/card/Card.vue
+++ b/components/lib/card/Card.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>
@@ -27,6 +27,7 @@ import BaseCard from './BaseCard.vue';
 
 export default {
     name: 'Card',
-    extends: BaseCard
+    extends: BaseCard,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/carousel/Carousel.vue b/components/lib/carousel/Carousel.vue
index cc3d974cb..4a0019af4 100755
--- a/components/lib/carousel/Carousel.vue
+++ b/components/lib/carousel/Carousel.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" role="region" v-bind="ptm('root')">
+    <div :class="cx('root')" role="region" v-bind="ptmi('root')">
         <div v-if="$slots.header" :class="cx('header')" v-bind="ptm('header')">
             <slot name="header"></slot>
         </div>
@@ -107,6 +107,7 @@ import BaseCarousel from './BaseCarousel.vue';
 export default {
     name: 'Carousel',
     extends: BaseCarousel,
+    inheritAttrs: false,
     emits: ['update:page'],
     isRemainingItemsAdded: false,
     data() {
diff --git a/components/lib/cascadeselect/CascadeSelect.vue b/components/lib/cascadeselect/CascadeSelect.vue
index 732879c2a..cf81a3b4d 100644
--- a/components/lib/cascadeselect/CascadeSelect.vue
+++ b/components/lib/cascadeselect/CascadeSelect.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="container" :class="cx('root')" :style="sx('root')" @click="onContainerClick($event)" v-bind="ptm('root')">
+    <div ref="container" :class="cx('root')" :style="sx('root')" @click="onContainerClick($event)" v-bind="ptmi('root')">
         <div class="p-hidden-accessible" v-bind="ptm('hiddenInputWrapper')" :data-p-hidden-accessible="true">
             <input
                 ref="focusInput"
@@ -89,6 +89,7 @@ import CascadeSelectSub from './CascadeSelectSub.vue';
 export default {
     name: 'CascadeSelect',
     extends: BaseCascadeSelect,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'change', 'focus', 'blur', 'click', 'group-change', 'before-show', 'before-hide', 'hide', 'show'],
     outsideClickListener: null,
     scrollHandler: null,
diff --git a/components/lib/chart/Chart.vue b/components/lib/chart/Chart.vue
index f77c7deb9..f3a9fba8f 100755
--- a/components/lib/chart/Chart.vue
+++ b/components/lib/chart/Chart.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" :style="sx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" :style="sx('root')" v-bind="ptmi('root')">
         <canvas ref="canvas" :width="width" :height="height" @click="onCanvasClick($event)" v-bind="{ ...canvasProps, ...ptm('canvas') }"></canvas>
     </div>
 </template>
@@ -10,6 +10,7 @@ import BaseChart from './BaseChart.vue';
 export default {
     name: 'Chart',
     extends: BaseChart,
+    inheritAttrs: false,
     emits: ['select', 'loaded'],
     chart: null,
     watch: {
diff --git a/components/lib/checkbox/Checkbox.vue b/components/lib/checkbox/Checkbox.vue
index c85fafb9e..69eca6f48 100755
--- a/components/lib/checkbox/Checkbox.vue
+++ b/components/lib/checkbox/Checkbox.vue
@@ -35,10 +35,13 @@ import BaseCheckbox from './BaseCheckbox.vue';
 export default {
     name: 'Checkbox',
     extends: BaseCheckbox,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'change', 'focus', 'blur'],
     methods: {
         getPTOptions(key) {
-            return this.ptm(key, {
+            const _ptm = key === 'root' ? this.ptmi : this.ptm;
+
+            return _ptm(key, {
                 context: {
                     checked: this.checked,
                     disabled: this.disabled
diff --git a/components/lib/chip/Chip.vue b/components/lib/chip/Chip.vue
index 00ec627cb..1333ce72e 100644
--- a/components/lib/chip/Chip.vue
+++ b/components/lib/chip/Chip.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="visible" :class="cx('root')" :aria-label="label" v-bind="ptm('root')">
+    <div v-if="visible" :class="cx('root')" :aria-label="label" v-bind="ptmi('root')">
         <slot>
             <img v-if="image" :src="image" v-bind="ptm('image')" />
             <component v-else-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" v-bind="ptm('icon')" />
@@ -19,6 +19,7 @@ import BaseChip from './BaseChip.vue';
 export default {
     name: 'Chip',
     extends: BaseChip,
+    inheritAttrs: false,
     emits: ['remove'],
     data() {
         return {
diff --git a/components/lib/chips/Chips.vue b/components/lib/chips/Chips.vue
index 9b79958b3..4e3a209fd 100755
--- a/components/lib/chips/Chips.vue
+++ b/components/lib/chips/Chips.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <ul
             ref="container"
             :class="cx('container')"
@@ -64,6 +64,7 @@ import BaseChips from './BaseChips.vue';
 export default {
     name: 'Chips',
     extends: BaseChips,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'add', 'remove', 'focus', 'blur'],
     data() {
         return {
diff --git a/components/lib/colorpicker/ColorPicker.vue b/components/lib/colorpicker/ColorPicker.vue
index 42d6bc420..3a4fcebdd 100755
--- a/components/lib/colorpicker/ColorPicker.vue
+++ b/components/lib/colorpicker/ColorPicker.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="container" :class="cx('root')" v-bind="ptm('root')">
+    <div ref="container" :class="cx('root')" v-bind="ptmi('root')">
         <input v-if="!inline" ref="input" type="text" :class="cx('input')" readonly="readonly" :tabindex="tabindex" :disabled="disabled" @click="onInputClick" @keydown="onInputKeydown" v-bind="ptm('input')" />
         <Portal :appendTo="appendTo" :disabled="inline">
             <transition name="p-connected-overlay" @enter="onOverlayEnter" @leave="onOverlayLeave" @after-leave="onOverlayAfterLeave" v-bind="ptm('transition')">
@@ -29,6 +29,7 @@ import BaseColorPicker from './BaseColorPicker.vue';
 export default {
     name: 'ColorPicker',
     extends: BaseColorPicker,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'change', 'show', 'hide'],
     data() {
         return {
diff --git a/components/lib/dock/Dock.vue b/components/lib/dock/Dock.vue
index 7a9cce255..19f32c0f7 100644
--- a/components/lib/dock/Dock.vue
+++ b/components/lib/dock/Dock.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="containerClass" :style="style" v-bind="ptm('root')">
+    <div :class="containerClass" :style="style" v-bind="ptmi('root')">
         <DockSub :model="model" :templates="$slots" :tooltipOptions="tooltipOptions" :position="position" :menuId="menuId" :aria-label="ariaLabel" :aria-labelledby="ariaLabelledby" :tabindex="tabindex" :pt="pt" :unstyled="unstyled"></DockSub>
     </div>
 </template>
@@ -11,6 +11,7 @@ import DockSub from './DockSub.vue';
 export default {
     name: 'Dock',
     extends: BaseDock,
+    inheritAttrs: false,
     matchMediaListener: null,
     data() {
         return {
diff --git a/components/lib/dropdown/Dropdown.vue b/components/lib/dropdown/Dropdown.vue
index a56b3c21e..865f7eb07 100755
--- a/components/lib/dropdown/Dropdown.vue
+++ b/components/lib/dropdown/Dropdown.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="container" :id="id" :class="cx('root')" @click="onContainerClick" v-bind="ptm('root')">
+    <div ref="container" :id="id" :class="cx('root')" @click="onContainerClick" v-bind="ptmi('root')">
         <input
             v-if="editable"
             ref="focusInput"
@@ -194,6 +194,7 @@ import BaseDropdown from './BaseDropdown.vue';
 export default {
     name: 'Dropdown',
     extends: BaseDropdown,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'change', 'focus', 'blur', 'before-show', 'before-hide', 'show', 'hide', 'filter'],
     outsideClickListener: null,
     scrollHandler: null,
diff --git a/components/lib/editor/Editor.vue b/components/lib/editor/Editor.vue
index fe255131f..27ee7f38e 100755
--- a/components/lib/editor/Editor.vue
+++ b/components/lib/editor/Editor.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <div ref="toolbarElement" :class="cx('toolbar')" v-bind="ptm('toolbar')">
             <slot name="toolbar">
                 <span class="ql-formats" v-bind="ptm('formats')">
@@ -62,6 +62,7 @@ const QuillJS = (function () {
 export default {
     name: 'Editor',
     extends: BaseEditor,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'text-change', 'selection-change', 'load'],
     data() {
         return {
diff --git a/components/lib/fieldset/Fieldset.vue b/components/lib/fieldset/Fieldset.vue
index f15ffceae..95fb7c7ec 100755
--- a/components/lib/fieldset/Fieldset.vue
+++ b/components/lib/fieldset/Fieldset.vue
@@ -1,5 +1,5 @@
 <template>
-    <fieldset :class="cx('root')" v-bind="ptm('root')">
+    <fieldset :class="cx('root')" v-bind="ptmi('root')">
         <legend :class="cx('legend')" v-bind="ptm('legend')">
             <slot v-if="!toggleable" name="legend">
                 <span :id="id + '_header'" :class="cx('legendtitle')" v-bind="ptm('legendtitle')">{{ legend }}</span>
@@ -45,6 +45,7 @@ import BaseFieldset from './BaseFieldset.vue';
 export default {
     name: 'Fieldset',
     extends: BaseFieldset,
+    inheritAttrs: false,
     emits: ['update:collapsed', 'toggle'],
     data() {
         return {
diff --git a/components/lib/fileupload/FileUpload.vue b/components/lib/fileupload/FileUpload.vue
index 76ce883eb..1f64095e4 100755
--- a/components/lib/fileupload/FileUpload.vue
+++ b/components/lib/fileupload/FileUpload.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="isAdvanced" :class="cx('root')" v-bind="ptm('root')">
+    <div v-if="isAdvanced" :class="cx('root')" v-bind="ptmi('root')">
         <input ref="fileInput" type="file" @change="onFileSelect" :multiple="multiple" :accept="accept" :disabled="chooseDisabled" v-bind="ptm('input')" />
         <div :class="cx('buttonbar')" v-bind="ptm('buttonbar')">
             <slot name="header" :files="files" :uploadedFiles="uploadedFiles" :chooseCallback="choose" :uploadCallback="upload" :clearCallback="clear">
@@ -37,7 +37,7 @@
             </div>
         </div>
     </div>
-    <div v-else-if="isBasic" :class="cx('root')" v-bind="ptm('root')">
+    <div v-else-if="isBasic" :class="cx('root')" v-bind="ptmi('root')">
         <FileUploadMessage v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :unstyled="unstyled" :pt="ptm('messages')">{{ msg }}</FileUploadMessage>
         <span v-ripple :class="chooseButtonClass" :style="style" @mouseup="onBasicUploaderClick" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" tabindex="0" v-bind="ptm('chooseButton')">
             <slot v-if="!hasFiles || auto" name="uploadicon" :class="cx('uploadIcon')">
@@ -67,6 +67,7 @@ import FileContent from './FileContent.vue';
 export default {
     name: 'FileUpload',
     extends: BaseFileUpload,
+    inheritAttrs: false,
     emits: ['select', 'uploader', 'before-upload', 'progress', 'upload', 'error', 'before-send', 'clear', 'remove', 'remove-uploaded-file'],
     duplicateIEEvent: false,
     data() {
diff --git a/components/lib/floatlabel/FloatLabel.vue b/components/lib/floatlabel/FloatLabel.vue
index a5c6c23b2..44e7d8357 100644
--- a/components/lib/floatlabel/FloatLabel.vue
+++ b/components/lib/floatlabel/FloatLabel.vue
@@ -1,5 +1,5 @@
 <template>
-    <span :class="cx('root')" v-bind="ptm('root')">
+    <span :class="cx('root')" v-bind="ptmi('root')">
         <slot />
     </span>
 </template>
@@ -9,6 +9,7 @@ import BaseFloatLabel from './BaseFloatLabel.vue';
 
 export default {
     name: 'FloatLabel',
-    extends: BaseFloatLabel
+    extends: BaseFloatLabel,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/iconfield/IconField.vue b/components/lib/iconfield/IconField.vue
index 6fba393b0..fdcb6105f 100644
--- a/components/lib/iconfield/IconField.vue
+++ b/components/lib/iconfield/IconField.vue
@@ -1,14 +1,15 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <slot />
     </div>
 </template>
 
 <script>
-import BaseIconFeild from './BaseIconField.vue';
+import BaseIconField from './BaseIconField.vue';
 
 export default {
     name: 'IconField',
-    extends: BaseIconFeild
+    extends: BaseIconField,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/image/Image.vue b/components/lib/image/Image.vue
index b28b68c4e..dbce7f2d5 100644
--- a/components/lib/image/Image.vue
+++ b/components/lib/image/Image.vue
@@ -1,5 +1,5 @@
 <template>
-    <span :class="containerClass" :style="style" v-bind="ptm('root')">
+    <span :class="containerClass" :style="style" v-bind="ptmi('root')">
         <slot name="image" :onError="onError" :errorCallback="onError">
             <img :style="imageStyle" :class="[cx('image'), imageClass]" @error="onError" v-bind="{ ...$attrs, ...ptm('image') }" />
         </slot>
diff --git a/components/lib/inlinemessage/InlineMessage.vue b/components/lib/inlinemessage/InlineMessage.vue
index 14350d90a..0d5b7113d 100755
--- a/components/lib/inlinemessage/InlineMessage.vue
+++ b/components/lib/inlinemessage/InlineMessage.vue
@@ -1,5 +1,5 @@
 <template>
-    <div role="alert" aria-live="assertive" aria-atomic="true" :class="cx('root')" v-bind="ptm('root')">
+    <div role="alert" aria-live="assertive" aria-atomic="true" :class="cx('root')" v-bind="ptmi('root')">
         <slot name="icon">
             <component :is="icon ? 'span' : iconComponent" :class="cx('icon')" v-bind="ptm('icon')"></component>
         </slot>
@@ -19,6 +19,7 @@ import BaseInlineMessage from './BaseInlineMessage.vue';
 export default {
     name: 'InlineMessage',
     extends: BaseInlineMessage,
+    inheritAttrs: false,
     timeout: null,
     data() {
         return {
diff --git a/components/lib/inplace/Inplace.vue b/components/lib/inplace/Inplace.vue
index dbf67f09b..e97f60318 100755
--- a/components/lib/inplace/Inplace.vue
+++ b/components/lib/inplace/Inplace.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-focustrap :class="cx('root')" aria-live="polite" v-bind="ptm('root')">
+    <div v-focustrap :class="cx('root')" aria-live="polite" v-bind="ptmi('root')">
         <div v-if="!d_active" ref="display" :class="cx('display')" :tabindex="$attrs.tabindex || '0'" role="button" @click="open" @keydown.enter="open" v-bind="{ ...displayProps, ...ptm('display') }">
             <slot name="display"></slot>
         </div>
@@ -25,6 +25,7 @@ import BaseInplace from './BaseInplace.vue';
 export default {
     name: 'Inplace',
     extends: BaseInplace,
+    inheritAttrs: false,
     emits: ['open', 'close', 'update:active'],
     data() {
         return {
diff --git a/components/lib/inputgroup/InputGroup.vue b/components/lib/inputgroup/InputGroup.vue
index 0b9ca67ad..2d162da50 100644
--- a/components/lib/inputgroup/InputGroup.vue
+++ b/components/lib/inputgroup/InputGroup.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <slot />
     </div>
 </template>
@@ -9,6 +9,7 @@ import BaseInputGroup from './BaseInputGroup.vue';
 
 export default {
     name: 'InputGroup',
-    extends: BaseInputGroup
+    extends: BaseInputGroup,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/inputgroupaddon/InputGroupAddon.vue b/components/lib/inputgroupaddon/InputGroupAddon.vue
index c7f98a819..0200d068e 100644
--- a/components/lib/inputgroupaddon/InputGroupAddon.vue
+++ b/components/lib/inputgroupaddon/InputGroupAddon.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')">
+    <div :class="cx('root')" v-bind="ptmi('root')">
         <slot />
     </div>
 </template>
@@ -9,6 +9,7 @@ import BaseInputGroupAddon from './BaseInputGroupAddon.vue';
 
 export default {
     name: 'InputGroupAddon',
-    extends: BaseInputGroupAddon
+    extends: BaseInputGroupAddon,
+    inheritAttrs: false
 };
 </script>
diff --git a/components/lib/inputmask/InputMask.vue b/components/lib/inputmask/InputMask.vue
index 1961556bd..3ec086167 100755
--- a/components/lib/inputmask/InputMask.vue
+++ b/components/lib/inputmask/InputMask.vue
@@ -1,5 +1,5 @@
 <template>
-    <input :class="cx('root')" :readonly="readonly" @input="onInput" @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" @keypress="onKeyPress" @paste="onPaste" v-bind="ptm('root', ptmParams)" />
+    <input :class="cx('root')" :readonly="readonly" @input="onInput" @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" @keypress="onKeyPress" @paste="onPaste" v-bind="ptmi('root', ptmParams)" />
 </template>
 
 <script>
@@ -9,6 +9,7 @@ import BaseInputMask from './BaseInputMask.vue';
 export default {
     name: 'InputMask',
     extends: BaseInputMask,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'focus', 'blur', 'keydown', 'complete', 'keypress', 'paste'],
     watch: {
         mask(newMask, oldMask) {
diff --git a/components/lib/inputnumber/InputNumber.vue b/components/lib/inputnumber/InputNumber.vue
index a801dfaa4..8a8ba3bad 100755
--- a/components/lib/inputnumber/InputNumber.vue
+++ b/components/lib/inputnumber/InputNumber.vue
@@ -1,5 +1,5 @@
 <template>
-    <span :class="cx('root')" v-bind="ptm('root')">
+    <span :class="cx('root')" v-bind="ptmi('root')">
         <INInputText
             ref="input"
             :id="inputId"
@@ -90,6 +90,7 @@ import BaseInputNumber from './BaseInputNumber.vue';
 export default {
     name: 'InputNumber',
     extends: BaseInputNumber,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'input', 'focus', 'blur'],
     numberFormat: null,
     _numeral: null,
diff --git a/components/lib/inputswitch/InputSwitch.vue b/components/lib/inputswitch/InputSwitch.vue
index 7e2f2583f..8d3d8c5f3 100755
--- a/components/lib/inputswitch/InputSwitch.vue
+++ b/components/lib/inputswitch/InputSwitch.vue
@@ -28,10 +28,13 @@ import BaseInputSwitch from './BaseInputSwitch.vue';
 export default {
     name: 'InputSwitch',
     extends: BaseInputSwitch,
+    inheritAttrs: false,
     emits: ['update:modelValue', 'change', 'focus', 'blur'],
     methods: {
         getPTOptions(key) {
-            return this.ptm(key, {
+            const _ptm = root === 'root' ? this.ptmi : this.ptm;
+
+            return _ptm(key, {
                 context: {
                     checked: this.checked,
                     disabled: this.disabled
diff --git a/components/lib/splitbutton/SplitButton.vue b/components/lib/splitbutton/SplitButton.vue
index 82c665cac..1efd3c116 100755
--- a/components/lib/splitbutton/SplitButton.vue
+++ b/components/lib/splitbutton/SplitButton.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="containerClass" :style="style" v-bind="ptm('root')" :data-pc-severity="severity">
+    <div :class="containerClass" :style="style" v-bind="ptmi('root')" :data-p-severity="severity">
         <PVSButton
             type="button"
             :class="cx('button')"
@@ -69,6 +69,7 @@ import BaseSplitButton from './BaseSplitButton.vue';
 export default {
     name: 'SplitButton',
     extends: BaseSplitButton,
+    inheritAttrs: false,
     emits: ['click'],
     data() {
         return {