From 5250943440dfbe39bdfd5215d38459eaa6fc92b0 Mon Sep 17 00:00:00 2001
From: tugcekucukoglu <tugcekucukoglu.860@gmail.com>
Date: Tue, 19 Mar 2024 17:14:13 +0300
Subject: [PATCH] Refactor

---
 components/lib/autocomplete/AutoComplete.d.ts | 10 +-
 components/lib/autocomplete/AutoComplete.vue  | 20 ++--
 .../lib/autocomplete/BaseAutoComplete.vue     |  8 --
 components/lib/calendar/BaseCalendar.vue      |  8 --
 components/lib/calendar/Calendar.d.ts         | 10 +-
 components/lib/calendar/Calendar.vue          | 19 ++--
 components/lib/dropdown/BaseDropdown.vue      | 16 ----
 components/lib/dropdown/Dropdown.d.ts         | 19 +---
 components/lib/dropdown/Dropdown.vue          | 14 ++-
 components/lib/inputmask/InputMask.vue        |  4 +-
 .../lib/inputnumber/BaseInputNumber.vue       | 12 ---
 components/lib/inputnumber/InputNumber.d.ts   | 95 +++++++------------
 components/lib/inputnumber/InputNumber.vue    | 41 +++-----
 components/lib/listbox/BaseListbox.vue        |  1 -
 components/lib/listbox/Listbox.d.ts           |  6 +-
 components/lib/listbox/Listbox.vue            |  9 +-
 .../lib/multiselect/BaseMultiSelect.vue       | 16 ----
 components/lib/multiselect/MultiSelect.d.ts   | 18 +---
 components/lib/multiselect/MultiSelect.vue    |  7 +-
 19 files changed, 86 insertions(+), 247 deletions(-)

diff --git a/components/lib/autocomplete/AutoComplete.d.ts b/components/lib/autocomplete/AutoComplete.d.ts
index bdee223a8..52165051b 100755
--- a/components/lib/autocomplete/AutoComplete.d.ts
+++ b/components/lib/autocomplete/AutoComplete.d.ts
@@ -7,7 +7,7 @@
  * @module autocomplete
  *
  */
-import { HTMLAttributes, InputHTMLAttributes, TransitionProps, VNode } from 'vue';
+import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
@@ -412,10 +412,6 @@ export interface AutoCompleteProps {
      * Style class of the input field.
      */
     inputClass?: string | object | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement to the focusable input element inside the component.
-     */
-    inputProps?: InputHTMLAttributes | undefined;
     /**
      * Inline style of the overlay panel.
      */
@@ -424,10 +420,6 @@ export interface AutoCompleteProps {
      * Style class of the overlay panel.
      */
     panelClass?: string | object | undefined;
-    /**
-     * Used to pass all properties of the HTMLDivElement to the overlay panel inside the component.
-     */
-    panelProps?: HTMLAttributes | undefined;
     /**
      * Icon to display in the dropdown.
      * @deprecated since v3.27.0. Use 'dropdownicon' slot.
diff --git a/components/lib/autocomplete/AutoComplete.vue b/components/lib/autocomplete/AutoComplete.vue
index eb8a01bb9..14be34fac 100755
--- a/components/lib/autocomplete/AutoComplete.vue
+++ b/components/lib/autocomplete/AutoComplete.vue
@@ -1,6 +1,6 @@
 <template>
     <div ref="container" :class="cx('root')" :style="sx('root')" @click="onContainerClick" v-bind="ptmi('root')">
-        <ACInputText
+        <InputText
             v-if="!multiple"
             ref="focusInput"
             :id="inputId"
@@ -28,7 +28,6 @@
             @input="onInput"
             @change="onChange"
             :unstyled="unstyled"
-            v-bind="inputProps"
             :pt="ptm('input')"
         />
         <ul
@@ -64,7 +63,7 @@
                 </slot>
             </li>
             <li :class="cx('inputToken')" role="option" v-bind="ptm('inputToken')">
-                <ACInputText
+                <InputText
                     ref="focusInput"
                     :id="inputId"
                     :style="inputStyle"
@@ -90,7 +89,6 @@
                     @keydown="onKeyDown"
                     @input="onInput"
                     @change="onChange"
-                    v-bind="inputProps"
                     :pt="ptm('input')"
                 />
             </li>
@@ -118,7 +116,7 @@
                     :style="{ ...panelStyle, 'max-height': virtualScrollerDisabled ? scrollHeight : '' }"
                     @click="onOverlayClick"
                     @keydown="onOverlayKeyDown"
-                    v-bind="{ ...panelProps, ...ptm('panel') }"
+                    v-bind="ptm('panel')"
                 >
                     <slot name="header" :value="modelValue" :suggestions="visibleOptions"></slot>
                     <VirtualScroller :ref="virtualScrollerRef" v-bind="virtualScrollerOptions" :style="{ height: scrollHeight }" :items="visibleOptions" :tabindex="-1" :disabled="virtualScrollerDisabled" :pt="ptm('virtualScroller')">
@@ -943,12 +941,12 @@ export default {
         }
     },
     components: {
-        ACInputText: InputText,
-        VirtualScroller: VirtualScroller,
-        Portal: Portal,
-        ChevronDownIcon: ChevronDownIcon,
-        SpinnerIcon: SpinnerIcon,
-        TimesCircleIcon: TimesCircleIcon
+        InputText,
+        VirtualScroller,
+        Portal,
+        ChevronDownIcon,
+        SpinnerIcon,
+        TimesCircleIcon
     },
     directives: {
         ripple: Ripple
diff --git a/components/lib/autocomplete/BaseAutoComplete.vue b/components/lib/autocomplete/BaseAutoComplete.vue
index 1a36decb2..fd2d60999 100644
--- a/components/lib/autocomplete/BaseAutoComplete.vue
+++ b/components/lib/autocomplete/BaseAutoComplete.vue
@@ -97,10 +97,6 @@ export default {
             type: [String, Object],
             default: null
         },
-        inputProps: {
-            type: null,
-            default: null
-        },
         panelStyle: {
             type: Object,
             default: null
@@ -109,10 +105,6 @@ export default {
             type: [String, Object],
             default: null
         },
-        panelProps: {
-            type: null,
-            default: null
-        },
         dropdownIcon: {
             type: String,
             default: undefined
diff --git a/components/lib/calendar/BaseCalendar.vue b/components/lib/calendar/BaseCalendar.vue
index 6b0e7940f..5bbd95842 100644
--- a/components/lib/calendar/BaseCalendar.vue
+++ b/components/lib/calendar/BaseCalendar.vue
@@ -212,10 +212,6 @@ export default {
             type: Object,
             default: null
         },
-        inputProps: {
-            type: null,
-            default: null
-        },
         panelClass: {
             type: [String, Object],
             default: null
@@ -224,10 +220,6 @@ export default {
             type: Object,
             default: null
         },
-        panelProps: {
-            type: null,
-            default: null
-        },
         ariaLabelledby: {
             type: String,
             default: null
diff --git a/components/lib/calendar/Calendar.d.ts b/components/lib/calendar/Calendar.d.ts
index 1d5e50565..09a955c45 100755
--- a/components/lib/calendar/Calendar.d.ts
+++ b/components/lib/calendar/Calendar.d.ts
@@ -7,7 +7,7 @@
  * @module calendar
  *
  */
-import { HTMLAttributes, InputHTMLAttributes, TransitionProps, VNode } from 'vue';
+import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
@@ -752,10 +752,6 @@ export interface CalendarProps {
      * Style class of the input field.
      */
     inputClass?: string | object | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement to the focusable input element inside the component.
-     */
-    inputProps?: InputHTMLAttributes | undefined;
     /**
      * Inline style of the overlay panel.
      */
@@ -764,10 +760,6 @@ export interface CalendarProps {
      * Style class of the overlay panel.
      */
     panelClass?: string | object | undefined;
-    /**
-     * Used to pass all properties of the HTMLDivElement to the overlay panel inside the component.
-     */
-    panelProps?: HTMLAttributes | undefined;
     /**
      * Establishes relationships between the component and label(s) where its value should be one or more element IDs.
      */
diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue
index 00de9e08a..f8b6adc04 100755
--- a/components/lib/calendar/Calendar.vue
+++ b/components/lib/calendar/Calendar.vue
@@ -1,6 +1,6 @@
 <template>
     <span ref="container" :id="d_id" :class="cx('root')" :style="sx('root')" v-bind="ptmi('root')">
-        <CInputText
+        <InputText
             v-if="!inline"
             :ref="inputRef"
             :id="inputId"
@@ -28,7 +28,6 @@
             @focus="onFocus"
             @blur="onBlur"
             @keydown="onKeyDown"
-            v-bind="inputProps"
             :pt="ptm('input')"
         />
         <slot v-if="showIcon && iconDisplay === 'button'" name="dropdownbutton">
@@ -67,7 +66,7 @@
                     @click="onOverlayClick"
                     @keydown="onOverlayKeyDown"
                     @mouseup="onOverlayMouseUp"
-                    v-bind="{ ...panelProps, ...ptm('panel') }"
+                    v-bind="ptm('panel')"
                 >
                     <template v-if="!timeOnly">
                         <div :class="cx('groupContainer')" v-bind="ptm('groupContainer')">
@@ -3001,13 +3000,13 @@ export default {
         }
     },
     components: {
-        CInputText: InputText,
-        Portal: Portal,
-        CalendarIcon: CalendarIcon,
-        ChevronLeftIcon: ChevronLeftIcon,
-        ChevronRightIcon: ChevronRightIcon,
-        ChevronUpIcon: ChevronUpIcon,
-        ChevronDownIcon: ChevronDownIcon
+        InputText,
+        Portal,
+        CalendarIcon,
+        ChevronLeftIcon,
+        ChevronRightIcon,
+        ChevronUpIcon,
+        ChevronDownIcon
     },
     directives: {
         ripple: Ripple
diff --git a/components/lib/dropdown/BaseDropdown.vue b/components/lib/dropdown/BaseDropdown.vue
index 09028be25..0b59278c1 100644
--- a/components/lib/dropdown/BaseDropdown.vue
+++ b/components/lib/dropdown/BaseDropdown.vue
@@ -62,10 +62,6 @@ export default {
             type: Object,
             default: null
         },
-        inputProps: {
-            type: null,
-            default: null
-        },
         panelClass: {
             type: [String, Object],
             default: null
@@ -74,18 +70,6 @@ export default {
             type: Object,
             default: null
         },
-        panelProps: {
-            type: null,
-            default: null
-        },
-        filterInputProps: {
-            type: null,
-            default: null
-        },
-        clearIconProps: {
-            type: null,
-            default: null
-        },
         appendTo: {
             type: [String, Object],
             default: 'body'
diff --git a/components/lib/dropdown/Dropdown.d.ts b/components/lib/dropdown/Dropdown.d.ts
index 394c611cd..98bfdcab5 100755
--- a/components/lib/dropdown/Dropdown.d.ts
+++ b/components/lib/dropdown/Dropdown.d.ts
@@ -7,7 +7,7 @@
  * @module dropdown
  *
  */
-import { HTMLAttributes, InputHTMLAttributes, TransitionProps, VNode } from 'vue';
+import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
@@ -372,10 +372,6 @@ export interface DropdownProps {
      * Style class of the input field.
      */
     inputClass?: string | object | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement/HTMLSpanElement to the focusable input element inside the component.
-     */
-    inputProps?: InputHTMLAttributes | HTMLAttributes | undefined;
     /**
      * Inline style of the overlay panel.
      */
@@ -384,19 +380,6 @@ export interface DropdownProps {
      * Style class of the overlay panel.
      */
     panelClass?: string | object | undefined;
-    /**
-     * Used to pass all properties of the HTMLDivElement to the overlay panel inside the component.
-     */
-    panelProps?: HTMLAttributes | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement to the filter input inside the component.
-     */
-    filterInputProps?: InputHTMLAttributes | undefined;
-    /**
-     * Used to pass all properties of the HTMLElement to the clear icon inside the component.
-     * @deprecated since v3.26.0. Use 'pt' peroperty.
-     */
-    clearIconProps?: HTMLAttributes | undefined;
     /**
      * A valid query selector or an HTMLElement to specify where the overlay gets attached.
      * @defaultValue body
diff --git a/components/lib/dropdown/Dropdown.vue b/components/lib/dropdown/Dropdown.vue
index e9785fb27..1136d7b04 100755
--- a/components/lib/dropdown/Dropdown.vue
+++ b/components/lib/dropdown/Dropdown.vue
@@ -1,6 +1,6 @@
 <template>
     <div ref="container" :id="id" :class="cx('root')" @click="onContainerClick" v-bind="ptmi('root')">
-        <DInputText
+        <InputText
             v-if="editable"
             ref="focusInput"
             :id="inputId"
@@ -26,7 +26,6 @@
             @blur="onBlur"
             @keydown="onKeyDown"
             @input="onEditableInput"
-            v-bind="inputProps"
             :pt="ptm('input')"
         />
         <span
@@ -47,12 +46,12 @@
             @focus="onFocus"
             @blur="onBlur"
             @keydown="onKeyDown"
-            v-bind="{ ...inputProps, ...ptm('input') }"
+            v-bind="ptm('input')"
         >
             <slot name="value" :value="modelValue" :placeholder="placeholder">{{ label === 'p-emptylabel' ? '&nbsp;' : label || 'empty' }}</slot>
         </span>
         <slot v-if="showClear && modelValue != null" name="clearicon" :class="cx('clearIcon')" :onClick="onClearClick" :clearCallback="onClearClick">
-            <component :is="clearIcon ? 'i' : 'TimesIcon'" ref="clearIcon" :class="[cx('clearIcon'), clearIcon]" @click="onClearClick" v-bind="{ ...clearIconProps, ...ptm('clearIcon') }" data-pc-section="clearicon" />
+            <component :is="clearIcon ? 'i' : 'TimesIcon'" ref="clearIcon" :class="[cx('clearIcon'), clearIcon]" @click="onClearClick" v-bind="ptm('clearIcon')" data-pc-section="clearicon" />
         </slot>
         <div :class="cx('trigger')" v-bind="ptm('trigger')">
             <slot v-if="loading" name="loadingicon" :class="cx('loadingIcon')">
@@ -65,7 +64,7 @@
         </div>
         <Portal :appendTo="appendTo">
             <transition name="p-connected-overlay" @enter="onOverlayEnter" @after-enter="onOverlayAfterEnter" @leave="onOverlayLeave" @after-leave="onOverlayAfterLeave" v-bind="ptm('transition')">
-                <div v-if="overlayVisible" :ref="overlayRef" :class="[cx('panel'), panelClass]" :style="panelStyle" @click="onOverlayClick" @keydown="onOverlayKeyDown" v-bind="{ ...panelProps, ...ptm('panel') }">
+                <div v-if="overlayVisible" :ref="overlayRef" :class="[cx('panel'), panelClass]" :style="panelStyle" @click="onOverlayClick" @keydown="onOverlayKeyDown" v-bind="ptm('panel')">
                     <span
                         ref="firstHiddenFocusableElementOnOverlay"
                         role="presentation"
@@ -80,7 +79,7 @@
                     <slot name="header" :value="modelValue" :options="visibleOptions"></slot>
                     <div v-if="filter" :class="cx('header')" v-bind="ptm('header')">
                         <div :class="cx('filterContainer')" v-bind="ptm('filterContainer')">
-                            <DInputText
+                            <InputText
                                 ref="filterInput"
                                 type="text"
                                 :value="filterValue"
@@ -98,7 +97,6 @@
                                 @keydown="onFilterKeyDown"
                                 @blur="onFilterBlur"
                                 @input="onFilterChange"
-                                v-bind="filterInputProps"
                                 :pt="ptm('filterInput')"
                             />
                             <slot name="filtericon" :class="cx('filterIcon')">
@@ -984,7 +982,7 @@ export default {
         ripple: Ripple
     },
     components: {
-        DInputText: InputText,
+        InputText,
         VirtualScroller,
         Portal,
         TimesIcon,
diff --git a/components/lib/inputmask/InputMask.vue b/components/lib/inputmask/InputMask.vue
index 2062f4289..20ae6c937 100755
--- a/components/lib/inputmask/InputMask.vue
+++ b/components/lib/inputmask/InputMask.vue
@@ -1,5 +1,5 @@
 <template>
-    <IMInputText
+    <InputText
         :value="modelValue"
         :class="cx('root')"
         :readonly="readonly"
@@ -525,7 +525,7 @@ export default {
         }
     },
     components: {
-        IMInputText: InputText
+        InputText
     }
 };
 </script>
diff --git a/components/lib/inputnumber/BaseInputNumber.vue b/components/lib/inputnumber/BaseInputNumber.vue
index 9a5d4bb06..762974396 100644
--- a/components/lib/inputnumber/BaseInputNumber.vue
+++ b/components/lib/inputnumber/BaseInputNumber.vue
@@ -137,18 +137,6 @@ export default {
             type: Object,
             default: null
         },
-        inputProps: {
-            type: null,
-            default: null
-        },
-        incrementButtonProps: {
-            type: null,
-            default: null
-        },
-        decrementButtonProps: {
-            type: null,
-            default: null
-        },
         ariaLabelledby: {
             type: String,
             default: null
diff --git a/components/lib/inputnumber/InputNumber.d.ts b/components/lib/inputnumber/InputNumber.d.ts
index 6b0b66038..99cdebc3d 100755
--- a/components/lib/inputnumber/InputNumber.d.ts
+++ b/components/lib/inputnumber/InputNumber.d.ts
@@ -7,7 +7,7 @@
  * @module inputnumber
  *
  */
-import { ButtonHTMLAttributes, InputHTMLAttributes, VNode } from 'vue';
+import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
@@ -142,6 +142,37 @@ export interface InputNumberState {
     focused: boolean;
 }
 
+/**
+ * Defines valid listeners in InputNumber component.
+ */
+export interface InputNumberButtonListeners {
+    /**
+     * Mouse down event of increment button.
+     * @param {Event} event - Browser event
+     */
+    onMousedown: (event: Event) => void;
+    /**
+     * Mouse up event of increment button.
+     * @param {Event} event - Browser event
+     */
+    onMouseup: (event: Event) => void;
+    /**
+     * Mouse leave event of increment button.
+     * @param {Event} event - Browser event
+     */
+    onMouseleave: (event: Event) => void;
+    /**
+     * Key down event of increment button.
+     * @param {Event} event - Browser event
+     */
+    onKeydown: (event: Event) => void;
+    /**
+     * Key up event of increment button.
+     * @param {Event} event - Browser event
+     */
+    onKeyup: (event: Event) => void;
+}
+
 /**
  * Defines valid properties in InputNumber component.
  */
@@ -295,18 +326,6 @@ export interface InputNumberProps {
      * Inline style of the input field.
      */
     inputStyle?: object | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement to the focusable input element inside the component.
-     */
-    inputProps?: InputHTMLAttributes | undefined;
-    /**
-     * Used to pass all properties of the HTMLButtonElement to increment button inside the component.
-     */
-    incrementButtonProps?: ButtonHTMLAttributes | undefined;
-    /**
-     * Used to pass all properties of the HTMLButtonElement to decrement button inside the component.
-     */
-    decrementButtonProps?: ButtonHTMLAttributes | undefined;
     /**
      * Establishes relationships between the component and label(s) where its value should be one or more element IDs.
      */
@@ -341,60 +360,18 @@ export interface InputNumberSlots {
      */
     incrementbutton(scope: {
         /**
-         * Mouse down event of increment button.
-         * @param {Event} event - Browser event
+         * InputNumber listeners
          */
-        onMousedown: (event: Event) => void;
-        /**
-         * Mouse up event of increment button.
-         * @param {Event} event - Browser event
-         */
-        onMouseup: (event: Event) => void;
-        /**
-         * Mouse leave event of increment button.
-         * @param {Event} event - Browser event
-         */
-        onMouseleave: (event: Event) => void;
-        /**
-         * Key down event of increment button.
-         * @param {Event} event - Browser event
-         */
-        onKeydown: (event: Event) => void;
-        /**
-         * Key up event of increment button.
-         * @param {Event} event - Browser event
-         */
-        onKeyup: (event: Event) => void;
+        listeners: InputNumberButtonListeners;
     }): VNode[];
     /**
      * Custom decrement button template.
      */
     decrementbutton(scope: {
         /**
-         * Mouse down event of decrement button.
-         * @param {Event} event - Browser event
+         * InputNumber listeners
          */
-        onMousedown: (event: Event) => void;
-        /**
-         * Mouse up event of decrement button.
-         * @param {Event} event - Browser event
-         */
-        onMouseup: (event: Event) => void;
-        /**
-         * Mouse leave event of decrement button.
-         * @param {Event} event - Browser event
-         */
-        onMouseleave: (event: Event) => void;
-        /**
-         * Key down event of decrement button.
-         * @param {Event} event - Browser event
-         */
-        onKeydown: (event: Event) => void;
-        /**
-         * Key up event of decrement button.
-         * @param {Event} event - Browser event
-         */
-        onKeyup: (event: Event) => void;
+        listeners: InputNumberButtonListeners;
     }): VNode[];
     /**
      * Custom increment button icon template.
diff --git a/components/lib/inputnumber/InputNumber.vue b/components/lib/inputnumber/InputNumber.vue
index a8a4afe0f..1bce421b4 100755
--- a/components/lib/inputnumber/InputNumber.vue
+++ b/components/lib/inputnumber/InputNumber.vue
@@ -1,6 +1,6 @@
 <template>
     <span :class="cx('root')" v-bind="ptmi('root')">
-        <INInputText
+        <InputText
             ref="input"
             :id="inputId"
             role="spinbutton"
@@ -23,51 +23,34 @@
             @click="onInputClick"
             @focus="onInputFocus"
             @blur="onInputBlur"
-            v-bind="inputProps"
             :pt="ptm('input')"
             :unstyled="unstyled"
         />
         <span v-if="showButtons && buttonLayout === 'stacked'" :class="cx('buttonGroup')" v-bind="ptm('buttonGroup')">
-            <slot name="incrementbutton" v-on="upButtonListeners">
-                <button :class="[cx('incrementButton'), incrementButtonClass]" v-on="upButtonListeners" :disabled="disabled" :tabindex="-1" aria-hidden="true" v-bind="{ ...incrementButtonProps, ...ptm('incrementButton') }">
+            <slot name="incrementbutton" :listeners="upButtonListeners">
+                <button :class="[cx('incrementButton'), incrementButtonClass]" v-on="upButtonListeners" :disabled="disabled" :tabindex="-1" aria-hidden="true" v-bind="ptm('incrementButton')">
                     <slot name="incrementbuttonicon">
                         <component :is="incrementButtonIcon ? 'span' : 'AngleUpIcon'" :class="incrementButtonIcon" v-bind="ptm('incrementButtonIcon')" data-pc-section="incrementbuttonicon" />
                     </slot>
                 </button>
             </slot>
-            <slot name="decrementbutton" v-on="downButtonListeners">
-                <button :class="[cx('decrementButton'), decrementButtonClass]" v-on="downButtonListeners" :disabled="disabled" :tabindex="-1" aria-hidden="true" v-bind="{ ...decrementButtonProps, ...ptm('decrementButton') }">
+            <slot name="decrementbutton" :listeners="downButtonListeners">
+                <button :class="[cx('decrementButton'), decrementButtonClass]" v-on="downButtonListeners" :disabled="disabled" :tabindex="-1" aria-hidden="true" v-bind="ptm('decrementButton')">
                     <slot name="decrementbuttonicon">
                         <component :is="decrementButtonIcon ? 'span' : 'AngleDownIcon'" :class="decrementButtonIcon" v-bind="ptm('decrementButtonIcon')" data-pc-section="decrementbuttonicon" />
                     </slot>
                 </button>
             </slot>
         </span>
-        <slot name="incrementbutton" v-on="upButtonListeners">
-            <button
-                v-if="showButtons && buttonLayout !== 'stacked'"
-                :class="[cx('incrementButton'), incrementButtonClass]"
-                v-on="upButtonListeners"
-                :disabled="disabled"
-                :tabindex="-1"
-                aria-hidden="true"
-                v-bind="{ ...incrementButtonProps, ...ptm('incrementButton') }"
-            >
+        <slot name="incrementbutton" :listeners="upButtonListeners">
+            <button v-if="showButtons && buttonLayout !== 'stacked'" :class="[cx('incrementButton'), incrementButtonClass]" v-on="upButtonListeners" :disabled="disabled" :tabindex="-1" aria-hidden="true" v-bind="ptm('incrementButton')">
                 <slot name="incrementbuttonicon">
                     <component :is="incrementButtonIcon ? 'span' : 'AngleUpIcon'" :class="incrementButtonIcon" v-bind="ptm('incrementButtonIcon')" data-pc-section="incrementbuttonicon" />
                 </slot>
             </button>
         </slot>
-        <slot name="decrementbutton" v-on="downButtonListeners">
-            <button
-                v-if="showButtons && buttonLayout !== 'stacked'"
-                :class="[cx('decrementButton'), decrementButtonClass]"
-                v-on="downButtonListeners"
-                :disabled="disabled"
-                :tabindex="-1"
-                aria-hidden="true"
-                v-bind="{ ...decrementButtonProps, ...ptm('decrementButton') }"
-            >
+        <slot name="decrementbutton" :listeners="downButtonListeners">
+            <button v-if="showButtons && buttonLayout !== 'stacked'" :class="[cx('decrementButton'), decrementButtonClass]" v-on="downButtonListeners" :disabled="disabled" :tabindex="-1" aria-hidden="true" v-bind="ptm('decrementButton')">
                 <slot name="decrementbuttonicon">
                     <component :is="decrementButtonIcon ? 'span' : 'AngleDownIcon'" :class="decrementButtonIcon" v-bind="ptm('decrementButtonIcon')" data-pc-section="decrementbuttonicon" />
                 </slot>
@@ -983,9 +966,9 @@ export default {
         }
     },
     components: {
-        INInputText: InputText,
-        AngleUpIcon: AngleUpIcon,
-        AngleDownIcon: AngleDownIcon
+        InputText,
+        AngleUpIcon,
+        AngleDownIcon
     }
 };
 </script>
diff --git a/components/lib/listbox/BaseListbox.vue b/components/lib/listbox/BaseListbox.vue
index f81b94bc6..5b51eabfa 100644
--- a/components/lib/listbox/BaseListbox.vue
+++ b/components/lib/listbox/BaseListbox.vue
@@ -42,7 +42,6 @@ export default {
             type: Array,
             default: null
         },
-        filterInputProps: null,
         virtualScrollerOptions: {
             type: Object,
             default: null
diff --git a/components/lib/listbox/Listbox.d.ts b/components/lib/listbox/Listbox.d.ts
index 10cfafe7c..47b1a9d01 100755
--- a/components/lib/listbox/Listbox.d.ts
+++ b/components/lib/listbox/Listbox.d.ts
@@ -7,7 +7,7 @@
  * @module listbox
  *
  */
-import { InputHTMLAttributes, VNode } from 'vue';
+import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
@@ -303,10 +303,6 @@ export interface ListboxProps {
      * Fields used when filtering the options, defaults to optionLabel.
      */
     filterFields?: string[] | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement to the filter input inside the component.
-     */
-    filterInputProps?: InputHTMLAttributes | undefined;
     /**
      * Whether to use the virtualScroller feature. The properties of VirtualScroller component can be used like an object in it.
      * @type {VirtualScrollerProps}
diff --git a/components/lib/listbox/Listbox.vue b/components/lib/listbox/Listbox.vue
index c24c17c08..691748b15 100755
--- a/components/lib/listbox/Listbox.vue
+++ b/components/lib/listbox/Listbox.vue
@@ -14,7 +14,7 @@
         <slot name="header" :value="modelValue" :options="visibleOptions"></slot>
         <div v-if="filter" :class="cx('header')" v-bind="ptm('header')">
             <div :class="cx('filterContainer')" v-bind="ptm('filterContainer')">
-                <LInputText
+                <InputText
                     v-model="filterValue"
                     type="text"
                     :class="cx('filterInput')"
@@ -30,7 +30,6 @@
                     @input="onFilterChange"
                     @blur="onFilterBlur"
                     @keydown="onFilterKeyDown"
-                    v-bind="filterInputProps"
                     :pt="ptm('filterInput')"
                 />
 
@@ -737,9 +736,9 @@ export default {
         ripple: Ripple
     },
     components: {
-        LInputText: InputText,
-        VirtualScroller: VirtualScroller,
-        SearchIcon: SearchIcon
+        InputText,
+        VirtualScroller,
+        SearchIcon
     }
 };
 </script>
diff --git a/components/lib/multiselect/BaseMultiSelect.vue b/components/lib/multiselect/BaseMultiSelect.vue
index 2dc453477..f109718a0 100644
--- a/components/lib/multiselect/BaseMultiSelect.vue
+++ b/components/lib/multiselect/BaseMultiSelect.vue
@@ -31,10 +31,6 @@ export default {
             type: String,
             default: null
         },
-        inputProps: {
-            type: null,
-            default: null
-        },
         panelClass: {
             type: String,
             default: null
@@ -43,18 +39,6 @@ export default {
             type: null,
             default: null
         },
-        panelProps: {
-            type: null,
-            default: null
-        },
-        filterInputProps: {
-            type: null,
-            default: null
-        },
-        closeButtonProps: {
-            type: null,
-            default: null
-        },
         dataKey: null,
         filter: Boolean,
         filterPlaceholder: String,
diff --git a/components/lib/multiselect/MultiSelect.d.ts b/components/lib/multiselect/MultiSelect.d.ts
index d242f7e75..bd8bc0146 100755
--- a/components/lib/multiselect/MultiSelect.d.ts
+++ b/components/lib/multiselect/MultiSelect.d.ts
@@ -7,7 +7,7 @@
  * @module multiselect
  *
  */
-import { ButtonHTMLAttributes, HTMLAttributes, InputHTMLAttributes, TransitionProps, VNode } from 'vue';
+import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
@@ -358,10 +358,6 @@ export interface MultiSelectProps {
      * Identifier of the underlying input element.
      */
     inputId?: string | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement to the focusable input element inside the component.
-     */
-    inputProps?: InputHTMLAttributes | undefined;
     /**
      * Inline style of the overlay panel.
      */
@@ -370,18 +366,6 @@ export interface MultiSelectProps {
      * Style class of the overlay panel.
      */
     panelClass?: any;
-    /**
-     * Used to pass all properties of the HTMLDivElement to the overlay panel.
-     */
-    panelProps?: HTMLAttributes | undefined;
-    /**
-     * Used to pass all properties of the HTMLInputElement to the filter input inside the overlay panel.
-     */
-    filterInputProps?: InputHTMLAttributes | undefined;
-    /**
-     * Used to pass all properties of the HTMLButtonElement to the clear button inside the overlay panel.
-     */
-    closeButtonProps?: ButtonHTMLAttributes | undefined;
     /**
      * A property to uniquely identify an option.
      */
diff --git a/components/lib/multiselect/MultiSelect.vue b/components/lib/multiselect/MultiSelect.vue
index 34452ee7d..d6cd13a32 100755
--- a/components/lib/multiselect/MultiSelect.vue
+++ b/components/lib/multiselect/MultiSelect.vue
@@ -55,7 +55,7 @@
         </div>
         <Portal :appendTo="appendTo">
             <transition name="p-connected-overlay" @enter="onOverlayEnter" @after-enter="onOverlayAfterEnter" @leave="onOverlayLeave" @after-leave="onOverlayAfterLeave" v-bind="ptm('transition')">
-                <div v-if="overlayVisible" :ref="overlayRef" :style="panelStyle" :class="[cx('panel'), panelClass]" @click="onOverlayClick" @keydown="onOverlayKeyDown" v-bind="{ ...panelProps, ...ptm('panel') }">
+                <div v-if="overlayVisible" :ref="overlayRef" :style="panelStyle" :class="[cx('panel'), panelClass]" @click="onOverlayClick" @keydown="onOverlayKeyDown" v-bind="ptm('panel')">
                     <span
                         ref="firstHiddenFocusableElementOnOverlay"
                         role="presentation"
@@ -86,7 +86,7 @@
                             </template>
                         </Checkbox>
                         <div v-if="filter" :class="cx('filterContainer')" v-bind="ptm('filterContainer')">
-                            <MSInputText
+                            <InputText
                                 ref="filterInput"
                                 :value="filterValue"
                                 @vue:mounted="onFilterUpdated"
@@ -104,7 +104,6 @@
                                 @keydown="onFilterKeyDown"
                                 @blur="onFilterBlur"
                                 @input="onFilterChange"
-                                v-bind="filterInputProps"
                                 :pt="ptm('filterInput')"
                             />
                             <slot name="filtericon" :class="cx('filterIcon')">
@@ -1090,7 +1089,7 @@ export default {
         ripple: Ripple
     },
     components: {
-        MSInputText: InputText,
+        InputText,
         Checkbox,
         VirtualScroller,
         Portal,