Skip to content

Commit d70fb0d

Browse files
Updating buttons to accomidate checkbox using the close button as the loading button as well
1 parent 5bdb7dd commit d70fb0d

File tree

1 file changed

+22
-4
lines changed

1 file changed

+22
-4
lines changed

src/plugin/components/SaveFieldButtons.vue

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
v-bind="$attrs"
55
>
66
<v-btn
7+
v-if="!settings.hideSaveIcon"
78
class="ms-1"
89
:color="settings.saveButtonColor"
910
:disabled="hasErrors"
@@ -14,19 +15,20 @@
1415
@click="saveValue"
1516
>
1617
<v-icon
17-
v-if="!loading && !settings.hideSaveIcon"
18+
v-if="!loading"
1819
:color="hasErrors ? 'error' : settings.saveIconColor"
1920
:icon="theSaveIcon"
2021
/>
2122
<v-icon
22-
v-else-if="!settings.hideSaveIcon"
23+
v-else
2324
:class="loadingIconClasses"
2425
:color="settings.loadingIconColor"
2526
:icon="theLoadingIcon"
2627
/>
2728
</v-btn>
29+
2830
<v-btn
29-
class="ms-1"
31+
:class="cancelButtonClasses"
3032
:color="settings.cancelButtonColor"
3133
icon
3234
:size="settings.cancelButtonSize"
@@ -35,6 +37,13 @@
3537
@click="closeField"
3638
>
3739
<v-icon
40+
v-if="settings.hideSaveIcon && loading"
41+
:class="loadingIconClasses"
42+
:color="settings.loadingIconColor"
43+
:icon="theLoadingIcon"
44+
/>
45+
<v-icon
46+
v-else
3847
class="text-default"
3948
:color="settings.cancelIconColor"
4049
:icon="theCancelIcon"
@@ -46,7 +55,10 @@
4655
<script setup lang="ts">
4756
import { SaveFieldButtons } from '@/types';
4857
import type { IconOptions } from 'vuetify';
49-
import { useSaveFieldsContainerClass } from '../composables/classes';
58+
import {
59+
useCancelButtonClass,
60+
useSaveFieldsContainerClass,
61+
} from '../composables/classes';
5062
import { useGetIcon } from '../composables/icons';
5163
5264
const attrs = useAttrs();
@@ -76,6 +88,12 @@ const loadingIconClasses = computed(() => {
7688
return '';
7789
});
7890
91+
const cancelButtonClasses = computed(() => {
92+
return useCancelButtonClass({
93+
cancelButtonVariant: settings.cancelButtonVariant,
94+
});
95+
});
96+
7997
const theCancelIcon = computed(() => {
8098
return useGetIcon({
8199
icon: props.cancelIcon,

0 commit comments

Comments
 (0)