Dialog pt updates

components/lib/confirmdialog/ConfirmDialog.d.ts

@@ -40,18 +40,21 @@ export interface ConfirmDialogPassThroughOptions {
      */
     headerTitle?: ConfirmDialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the Button component.
+     * Uses to pass attributes to the header icons' DOM element.
-     * @see {@link ButtonPassThroughOptions}
      */
-    closeButton?: ButtonPassThroughOptions;
+    headerIcons?: ConfirmDialogPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the close button's component.
+     */
+    closeButton?: ConfirmDialogPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the close button icon's component.
+     */
+    closeButtonIcon?: ConfirmDialogPassThroughOptionType;
     /**
      * Uses to pass attributes to the content's DOM element.
      */
     content?: ConfirmDialogPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the footer's DOM element.
-     */
-    footer?: ConfirmDialogPassThroughOptionType;
     /**
      * Uses to pass attributes to the icon's DOM element.
      */
@@ -60,6 +63,10 @@ export interface ConfirmDialogPassThroughOptions {
      * Uses to pass attributes to the message's DOM element.
      */
     message?: ConfirmDialogPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the footer's DOM element.
+     */
+    footer?: ConfirmDialogPassThroughOptionType;
     /**
      * Uses to pass attributes to the Button component.
      * @see {@link ButtonPassThroughOptions}

components/lib/dialog/Dialog.d.ts

@@ -8,7 +8,6 @@
  *
  */
 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,10 +50,13 @@ export interface DialogPassThroughOptions {
      */
     maximizableIcon?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the Button component.
+     * Uses to pass attributes to the close button's component.
-     *  @see {@link ButtonPassThroughOptions}
      */
-    closeButton?: ButtonPassThroughOptions;
+    closeButton?: DialogPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the close button icon's component.
+     */
+    closeButtonIcon?: DialogPassThroughOptionType;
     /**
      * Uses to pass attributes to the content's DOM element.
      */

components/lib/dialog/Dialog.vue

@@ -32,11 +32,10 @@
                                 @click="close"
                                 :aria-label="closeAriaLabel"
                                 type="button"
-                                :pt="ptm('closeButton')"
+                                v-bind="{ ...closeButtonProps, ...ptm('closeButton') }"
-                                v-bind="closeButtonProps"
                             >
                                 <slot name="closeicon">
-                                    <component :is="closeIcon ? 'span' : 'TimesIcon'" :class="['p-dialog-header-close-icon', closeIcon]" v-bind="ptm('closeButton')['icon']"></component>
+                                    <component :is="closeIcon ? 'span' : 'TimesIcon'" :class="['p-dialog-header-close-icon', closeIcon]" v-bind="ptm('closeButtonIcon')"></component>
                                 </slot>
                             </button>
                         </div>