From df2505a6970162b77c2cc856820208d2a8cdb593 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?= Date: Wed, 3 May 2023 17:16:11 +0300 Subject: [PATCH] Dialog pt updates --- .../lib/confirmdialog/ConfirmDialog.d.ts | 21 ++++++++++++------- components/lib/dialog/Dialog.d.ts | 10 +++++---- components/lib/dialog/Dialog.vue | 5 ++--- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/components/lib/confirmdialog/ConfirmDialog.d.ts b/components/lib/confirmdialog/ConfirmDialog.d.ts index 142c36871..caf6718fe 100644 --- a/components/lib/confirmdialog/ConfirmDialog.d.ts +++ b/components/lib/confirmdialog/ConfirmDialog.d.ts @@ -40,18 +40,21 @@ export interface ConfirmDialogPassThroughOptions { */ headerTitle?: ConfirmDialogPassThroughOptionType; /** - * Uses to pass attributes to the Button component. - * @see {@link ButtonPassThroughOptions} + * Uses to pass attributes to the header icons' DOM element. */ - 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} diff --git a/components/lib/dialog/Dialog.d.ts b/components/lib/dialog/Dialog.d.ts index 1e32a3435..693a382b6 100755 --- a/components/lib/dialog/Dialog.d.ts +++ b/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. - * @see {@link ButtonPassThroughOptions} + * Uses to pass attributes to the close button's component. */ - 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. */ diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue index 1abb9efa0..f7aa53de6 100755 --- a/components/lib/dialog/Dialog.vue +++ b/components/lib/dialog/Dialog.vue @@ -32,11 +32,10 @@ @click="close" :aria-label="closeAriaLabel" type="button" - :pt="ptm('closeButton')" - v-bind="closeButtonProps" + v-bind="{ ...closeButtonProps, ...ptm('closeButton') }" > - +