From 66b08abf0696c25c4b175b52780dcaded2f381f5 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: Fri, 9 Jun 2023 15:09:21 +0300
Subject: [PATCH] Fixed #4042 - Positioning defect PrimeVue Button with icon
 slot

---
 components/lib/confirmdialog/ConfirmDialog.vue | 10 +++++-----
 components/lib/confirmpopup/ConfirmPopup.vue   |  6 +++---
 components/lib/splitbutton/SplitButton.vue     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/lib/confirmdialog/ConfirmDialog.vue b/components/lib/confirmdialog/ConfirmDialog.vue
index cd3f31091..5a8400eed 100644
--- a/components/lib/confirmdialog/ConfirmDialog.vue
+++ b/components/lib/confirmdialog/ConfirmDialog.vue
@@ -23,15 +23,15 @@
         </template>
         <component v-else :is="$slots.message" :message="confirmation"></component>
         <template #footer>
-            <CDButton :label="rejectLabel" :class="cx('rejectButton')" iconPos="left" @click="reject()" :autofocus="autoFocusReject" :pt="ptm('rejectButton')">
-                <template #icon="iconProps">
+            <CDButton :label="rejectLabel" :class="cx('rejectButton')" @click="reject()" :autofocus="autoFocusReject" :pt="ptm('rejectButton')">
+                <template v-if="rejectIcon || $slots.rejecticon" #icon="iconProps">
                     <slot name="rejecticon">
                         <span :class="[rejectIcon, iconProps.class]" v-bind="ptm('rejectButton')['icon']" />
                     </slot>
                 </template>
             </CDButton>
-            <CDButton :label="acceptLabel" :class="cx('acceptButton')" iconPos="left" @click="accept()" :autofocus="autoFocusAccept" :pt="ptm('acceptButton')">
-                <template #icon="iconProps">
+            <CDButton :label="acceptLabel" :class="cx('acceptButton')" @click="accept()" :autofocus="autoFocusAccept" :pt="ptm('acceptButton')">
+                <template v-if="acceptIcon || $slots.accepticon" #icon="iconProps">
                     <slot name="accepticon">
                         <span :class="[acceptIcon, iconProps.class]" v-bind="ptm('acceptButton')['icon']" />
                     </slot>
@@ -42,10 +42,10 @@
 </template>
 
 <script>
-import BaseConfirmDialog from './BaseConfirmDialog.vue';
 import Button from 'primevue/button';
 import ConfirmationEventBus from 'primevue/confirmationeventbus';
 import Dialog from 'primevue/dialog';
+import BaseConfirmDialog from './BaseConfirmDialog.vue';
 
 export default {
     name: 'ConfirmDialog',
diff --git a/components/lib/confirmpopup/ConfirmPopup.vue b/components/lib/confirmpopup/ConfirmPopup.vue
index 29e9b0124..c442f0f4b 100644
--- a/components/lib/confirmpopup/ConfirmPopup.vue
+++ b/components/lib/confirmpopup/ConfirmPopup.vue
@@ -14,14 +14,14 @@
                 <component v-else :is="$slots.message" :message="confirmation"></component>
                 <div :class="cx('footer')" v-bind="ptm('footer')">
                     <CPButton :label="rejectLabel" @click="reject()" @keydown="onRejectKeydown" :autofocus="autoFocusReject" :class="cx('rejectButton')" :pt="ptm('rejectButton')">
-                        <template #icon="iconProps">
+                        <template v-if="rejectIcon || $slots.rejecticon" #icon="iconProps">
                             <slot name="rejecticon">
                                 <span :class="[rejectIcon, iconProps.class]" v-bind="ptm('rejectButton')['icon']" />
                             </slot>
                         </template>
                     </CPButton>
                     <CPButton :label="acceptLabel" @click="accept()" @keydown="onAcceptKeydown" :autofocus="autoFocusAccept" :class="cx('acceptButton')" :pt="ptm('acceptButton')">
-                        <template #icon="iconProps">
+                        <template v-if="acceptIcon || $slots.accepticon" #icon="iconProps">
                             <slot name="accepticon">
                                 <span :class="[acceptIcon, iconProps.class]" v-bind="ptm('acceptButton')['icon']" />
                             </slot>
@@ -34,13 +34,13 @@
 </template>
 
 <script>
-import BaseConfirmPopup from './BaseConfirmPopup.vue';
 import Button from 'primevue/button';
 import ConfirmationEventBus from 'primevue/confirmationeventbus';
 import FocusTrap from 'primevue/focustrap';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import { ConnectedOverlayScrollHandler, DomHandler, ZIndexUtils } from 'primevue/utils';
+import BaseConfirmPopup from './BaseConfirmPopup.vue';
 
 export default {
     name: 'ConfirmPopup',
diff --git a/components/lib/splitbutton/SplitButton.vue b/components/lib/splitbutton/SplitButton.vue
index d53e79eb9..2b09c8dff 100755
--- a/components/lib/splitbutton/SplitButton.vue
+++ b/components/lib/splitbutton/SplitButton.vue
@@ -2,7 +2,7 @@
     <div :class="containerClass" :style="style" v-bind="ptm('root')" data-pc-name="splitbutton" :data-pc-severity="severity">
         <slot>
             <PVSButton type="button" :class="cx('button')" :label="label" :disabled="disabled" :aria-label="label" @click="onDefaultButtonClick" :unstyled="unstyled" :pt="ptm('button')" v-bind="buttonProps">
-                <template #icon="slotProps">
+                <template v-if="icon" #icon="slotProps">
                     <slot name="icon" :class="slotProps.class">
                         <span :class="[icon, slotProps.class]" v-bind="ptm('button')['icon']" />
                     </slot>