From cadc7e87c4c1e6169d1184e4b2d4c09aecaa36d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?=
 <tugcekucukoglu.860@gmail.com>
Date: Tue, 2 May 2023 11:01:27 +0300
Subject: [PATCH] Refactor #3885 - button updates

---
 .../lib/confirmdialog/ConfirmDialog.d.ts      | 22 ++++++-------------
 .../lib/confirmdialog/ConfirmDialog.vue       |  8 +++----
 components/lib/confirmpopup/ConfirmPopup.d.ts | 15 +++++--------
 components/lib/confirmpopup/ConfirmPopup.vue  |  8 +++----
 components/lib/dialog/Dialog.d.ts             |  8 +++----
 components/lib/dialog/Dialog.vue              |  5 +++--
 components/lib/inplace/Inplace.d.ts           |  9 ++++----
 components/lib/inplace/Inplace.vue            |  4 ++--
 8 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/components/lib/confirmdialog/ConfirmDialog.d.ts b/components/lib/confirmdialog/ConfirmDialog.d.ts
index 71516e6f29..cf91643521 100644
--- a/components/lib/confirmdialog/ConfirmDialog.d.ts
+++ b/components/lib/confirmdialog/ConfirmDialog.d.ts
@@ -8,6 +8,7 @@
  *
  */
 import { VNode } from 'vue';
+import { ButtonPassThroughOptions } from '../button';
 import { ConfirmationOptions } from '../confirmationoptions';
 import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
 
@@ -40,12 +41,9 @@ export interface ConfirmDialogPassThroughOptions {
     headerTitle?: ConfirmDialogPassThroughOptionType;
     /**
      * Uses to pass attributes to the close button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    closeButton?: ConfirmDialogPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the close icon's DOM element.
-     */
-    closeIcon?: ConfirmDialogPassThroughOptionType;
+    closeButton?: ButtonPassThroughOptions;
     /**
      * Uses to pass attributes to the content's DOM element.
      */
@@ -64,20 +62,14 @@ export interface ConfirmDialogPassThroughOptions {
     message?: ConfirmDialogPassThroughOptionType;
     /**
      * Uses to pass attributes to the reject button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    rejectButton?: ConfirmDialogPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the reject icon's DOM element.
-     */
-    rejectIcon?: ConfirmDialogPassThroughOptionType;
+    rejectButton?: ButtonPassThroughOptions;
     /**
      * Uses to pass attributes to the accept button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    acceptButton?: ConfirmDialogPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the accept icon's DOM element.
-     */
-    acceptIcon?: ConfirmDialogPassThroughOptionType;
+    acceptButton?: ButtonPassThroughOptions;
 }
 
 /**
diff --git a/components/lib/confirmdialog/ConfirmDialog.vue b/components/lib/confirmdialog/ConfirmDialog.vue
index 67ce68b614..3c5970e29a 100644
--- a/components/lib/confirmdialog/ConfirmDialog.vue
+++ b/components/lib/confirmdialog/ConfirmDialog.vue
@@ -22,17 +22,17 @@
         </template>
         <component v-else :is="$slots.message" :message="confirmation"></component>
         <template #footer>
-            <CDButton :label="rejectLabel" :class="rejectClass" iconPos="left" @click="reject()" :autofocus="autoFocusReject" v-bind="ptm('rejectButton')">
+            <CDButton :label="rejectLabel" :class="rejectClass" iconPos="left" @click="reject()" :autofocus="autoFocusReject" :pt="ptm('rejectButton')">
                 <template #icon="iconProps">
                     <slot name="rejecticon">
-                        <span :class="[rejectIcon, iconProps.class]" v-bind="ptm('rejectIcon')" />
+                        <span :class="[rejectIcon, iconProps.class]" v-bind="ptm('rejectButton')['icon']" />
                     </slot>
                 </template>
             </CDButton>
-            <CDButton :label="acceptLabel" :class="acceptClass" iconPos="left" @click="accept()" :autofocus="autoFocusAccept" v-bind="ptm('acceptButton')">
+            <CDButton :label="acceptLabel" :class="acceptClass" iconPos="left" @click="accept()" :autofocus="autoFocusAccept" :pt="ptm('acceptButton')">
                 <template #icon="iconProps">
                     <slot name="accepticon">
-                        <span :class="[acceptIcon, iconProps.class]" v-bind="ptm('acceptIcon')" />
+                        <span :class="[acceptIcon, iconProps.class]" v-bind="ptm('acceptButton')['icon']" />
                     </slot>
                 </template>
             </CDButton>
diff --git a/components/lib/confirmpopup/ConfirmPopup.d.ts b/components/lib/confirmpopup/ConfirmPopup.d.ts
index 002fbded5e..d11a8e5398 100644
--- a/components/lib/confirmpopup/ConfirmPopup.d.ts
+++ b/components/lib/confirmpopup/ConfirmPopup.d.ts
@@ -8,6 +8,7 @@
  *
  */
 import { VNode } from 'vue';
+import { ButtonPassThroughOptions } from '../button';
 import { ConfirmationOptions } from '../confirmationoptions';
 import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
 
@@ -48,20 +49,14 @@ export interface ConfirmPopupPassThroughOptions {
     footer?: ConfirmPopupPassThroughOptionType;
     /**
      * Uses to pass attributes to the reject button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    rejectButton?: ConfirmPopupPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the reject icon's DOM element.
-     */
-    rejectIcon?: ConfirmPopupPassThroughOptionType;
+    rejectButton?: ButtonPassThroughOptions;
     /**
      * Uses to pass attributes to the accept button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    acceptButton?: ConfirmPopupPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the accept icon's DOM element.
-     */
-    acceptIcon?: ConfirmPopupPassThroughOptionType;
+    acceptButton?: ButtonPassThroughOptions;
 }
 
 /**
diff --git a/components/lib/confirmpopup/ConfirmPopup.vue b/components/lib/confirmpopup/ConfirmPopup.vue
index 81f1e0d3b9..f0aaf55596 100644
--- a/components/lib/confirmpopup/ConfirmPopup.vue
+++ b/components/lib/confirmpopup/ConfirmPopup.vue
@@ -13,17 +13,17 @@
                 </template>
                 <component v-else :is="$slots.message" :message="confirmation"></component>
                 <div class="p-confirm-popup-footer" v-bind="ptm('footer')">
-                    <CPButton :label="rejectLabel" :class="rejectClass" @click="reject()" @keydown="onRejectKeydown" :autofocus="autoFocusReject" v-bind="ptm('rejectButton')">
+                    <CPButton :label="rejectLabel" :class="rejectClass" @click="reject()" @keydown="onRejectKeydown" :autofocus="autoFocusReject" :pt="ptm('rejectButton')">
                         <template #icon="iconProps">
                             <slot name="rejecticon">
-                                <span :class="[rejectIcon, iconProps.class]" v-bind="ptm('rejectIcon')" />
+                                <span :class="[rejectIcon, iconProps.class]" v-bind="ptm('rejectButton')['icon']" />
                             </slot>
                         </template>
                     </CPButton>
-                    <CPButton :label="acceptLabel" :class="acceptClass" @click="accept()" @keydown="onAcceptKeydown" :autofocus="autoFocusAccept" v-bind="ptm('acceptButton')">
+                    <CPButton :label="acceptLabel" :class="acceptClass" @click="accept()" @keydown="onAcceptKeydown" :autofocus="autoFocusAccept" :pt="ptm('acceptButton')">
                         <template #icon="iconProps">
                             <slot name="accepticon">
-                                <span :class="[acceptIcon, iconProps.class]" v-bind="ptm('acceptIcon')" />
+                                <span :class="[acceptIcon, iconProps.class]" v-bind="ptm('acceptButton')['icon']" />
                             </slot>
                         </template>
                     </CPButton>
diff --git a/components/lib/dialog/Dialog.d.ts b/components/lib/dialog/Dialog.d.ts
index cd3cf9f71f..cee83f9e8a 100755
--- a/components/lib/dialog/Dialog.d.ts
+++ b/components/lib/dialog/Dialog.d.ts
@@ -8,6 +8,7 @@
  *
  */
 import { HTMLAttributes, VNode } from 'vue';
+import { ButtonPassThroughOptions } from '../button';
 import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
 
 export declare type DialogPassThroughOptionType = DialogPassThroughAttributes | ((options: DialogPassThroughMethodOptions) => DialogPassThroughAttributes) | null | undefined;
@@ -51,12 +52,9 @@ export interface DialogPassThroughOptions {
     maximizableIcon?: DialogPassThroughOptionType;
     /**
      * Uses to pass attributes to the close button's DOM element.
+     *  @see {@link ButtonPassThroughOptions}
      */
-    closeButton?: DialogPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the close icon's DOM element.
-     */
-    closeIcon?: DialogPassThroughOptionType;
+    closeButton?: ButtonPassThroughOptions;
     /**
      * Uses to pass attributes to the content's DOM element.
      */
diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue
index 356b21098b..1abb9efa0e 100755
--- a/components/lib/dialog/Dialog.vue
+++ b/components/lib/dialog/Dialog.vue
@@ -32,10 +32,11 @@
                                 @click="close"
                                 :aria-label="closeAriaLabel"
                                 type="button"
-                                v-bind="{ ...closeButtonProps, ...ptm('closeButton') }"
+                                :pt="ptm('closeButton')"
+                                v-bind="closeButtonProps"
                             >
                                 <slot name="closeicon">
-                                    <component :is="closeIcon ? 'span' : 'TimesIcon'" :class="['p-dialog-header-close-icon', closeIcon]" v-bind="ptm('closeIcon')"></component>
+                                    <component :is="closeIcon ? 'span' : 'TimesIcon'" :class="['p-dialog-header-close-icon', closeIcon]" v-bind="ptm('closeButton')['icon']"></component>
                                 </slot>
                             </button>
                         </div>
diff --git a/components/lib/inplace/Inplace.d.ts b/components/lib/inplace/Inplace.d.ts
index 5736f4896a..bab27b718d 100755
--- a/components/lib/inplace/Inplace.d.ts
+++ b/components/lib/inplace/Inplace.d.ts
@@ -7,7 +7,9 @@
  * @module inplace
  *
  */
+
 import { ButtonHTMLAttributes, HTMLAttributes, VNode } from 'vue';
+import { ButtonPassThroughOptions } from '../button';
 import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
 
 export declare type InplacePassThroughOptionType = InplacePassThroughAttributes | ((options: InplacePassThroughMethodOptions) => InplacePassThroughAttributes) | null | undefined;
@@ -39,12 +41,9 @@ export interface InplacePassThroughOptions {
     content?: InplacePassThroughOptionType;
     /**
      * Uses to pass attributes to the close button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    closeButton?: InplacePassThroughOptionType;
-    /**
-     * Uses to pass attributes to the close icon's DOM element.
-     */
-    closeIcon?: InplacePassThroughOptionType;
+    closeButton?: ButtonPassThroughOptions;
 }
 
 /**
diff --git a/components/lib/inplace/Inplace.vue b/components/lib/inplace/Inplace.vue
index 6f720ca482..b757cd82f6 100755
--- a/components/lib/inplace/Inplace.vue
+++ b/components/lib/inplace/Inplace.vue
@@ -5,10 +5,10 @@
         </div>
         <div v-else class="p-inplace-content" v-bind="ptm('content')">
             <slot name="content"></slot>
-            <IPButton v-if="closable" :aria-label="closeAriaLabel" @click="close" v-bind="{ ...closeButtonProps, ...ptm('closeButton') }">
+            <IPButton v-if="closable" :aria-label="closeAriaLabel" @click="close" :pt="ptm('closeButton')" v-bind="closeButtonProps">
                 <template #icon>
                     <slot name="closeicon">
-                        <component :is="closeIcon ? 'span' : 'TimesIcon'" :class="closeIcon" v-bind="ptm('closeIcon')"></component>
+                        <component :is="closeIcon ? 'span' : 'TimesIcon'" :class="closeIcon" v-bind="ptm('closeButton')['icon']"></component>
                     </slot>
                 </template>
             </IPButton>