Fixed #5028 - ConfirmDialog & ConfirmPopup: icon option class pt impl…

…ementation defect
primefaces · Jan 4, 2024 · 1332351 · 1332351
1 parent aa5336f
commit 1332351
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/components/lib/confirmdialog/ConfirmDialog.vue b/components/lib/confirmdialog/ConfirmDialog.vue
@@ -21,7 +21,7 @@
             <template v-if="!$slots.message">
                 <slot name="icon">
                     <component v-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" />
-                    <span v-else-if="confirmation.icon" :class="cx('icon')" v-bind="ptm('icon')" />
+                    <span v-else-if="confirmation.icon" :class="[confirmation.icon, cx('icon')]" v-bind="ptm('icon')" />
                 </slot>
                 <span :class="cx('message')" v-bind="ptm('message')">{{ message }}</span>
             </template>

diff --git a/components/lib/confirmdialog/style/ConfirmDialogStyle.js b/components/lib/confirmdialog/style/ConfirmDialogStyle.js
@@ -2,7 +2,7 @@ import BaseStyle from 'primevue/base/style';
 
 const classes = {
     root: 'p-confirm-dialog',
-    icon: ({ instance }) => ['p-confirm-dialog-icon', instance.confirmation ? instance.confirmation.icon : null],
+    icon: 'p-confirm-dialog-icon',
     message: 'p-confirm-dialog-message',
     rejectButton: ({ instance }) => ['p-confirm-dialog-reject', instance.confirmation && !instance.confirmation.rejectClass ? 'p-button-text' : null],
     acceptButton: 'p-confirm-dialog-accept'

diff --git a/components/lib/confirmpopup/ConfirmPopup.vue b/components/lib/confirmpopup/ConfirmPopup.vue
@@ -8,7 +8,7 @@
                         <div :class="cx('content')" v-bind="ptm('content')">
                             <slot name="icon">
                                 <component v-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" />
-                                <span v-else-if="confirmation.icon" :class="cx('icon')" v-bind="ptm('icon')" />
+                                <span v-else-if="confirmation.icon" :class="[confirmation.icon, cx('icon')]" v-bind="ptm('icon')" />
                             </slot>
                             <span :class="cx('message')" v-bind="ptm('message')">{{ confirmation.message }}</span>
                         </div>

diff --git a/components/lib/confirmpopup/style/ConfirmPopupStyle.js b/components/lib/confirmpopup/style/ConfirmPopupStyle.js
@@ -83,7 +83,7 @@ const classes = {
         }
     ],
     content: 'p-confirm-popup-content',
-    icon: ({ instance }) => ['p-confirm-popup-icon', instance.confirmation ? instance.confirmation.icon : null],
+    icon: 'p-confirm-popup-icon',
     message: 'p-confirm-popup-message',
     footer: 'p-confirm-popup-footer',
     rejectButton: ({ instance }) => ['p-confirm-popup-reject', instance.confirmation && !instance.confirmation.rejectClass ? 'p-button-sm p-button-text' : null],