Skip to content

Commit 8c9b779

Browse files
committed
fix: move field loader spinner next to error message
1 parent b3f0944 commit 8c9b779

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

adminforth/spa/src/components/ColumnValueInputWrapper.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
@update:inValidity="$emit('update:inValidity', { name: column.name, value: $event })"
5454
@update:emptiness="$emit('update:emptiness', { name: column.name, value: $event })"
5555
/>
56-
<Spinner v-if="shouldWeShowSpinner" class="w-3 absolute top-1.5 left-3.5"/>
56+
<div v-if="columnsWithErrors[column.name] && validatingMode && !isValidating" class="af-invalid-field-message mt-1 text-xs text-lightInputErrorColor dark:text-darkInputErrorColor">{{ columnsWithErrors[column.name] }}</div>
57+
<Spinner v-if="shouldWeShowSpinner" class="w-4 mt-1"/>
58+
<div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-lightFormFieldTextColor dark:text-darkFormFieldTextColor">{{ column.editingNote[mode] }}</div>
5759
</template>
5860

5961
<script setup lang="ts">
@@ -72,7 +74,8 @@
7274
setCurrentValue: Function,
7375
readonly?: boolean,
7476
columnsWithErrors: Record<string, string>,
75-
isValidating: boolean
77+
isValidating: boolean,
78+
validatingMode: boolean,
7679
}>();
7780
7881
const shouldWeShowSpinner = ref(false);

adminforth/spa/src/components/GroupsTable.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@
5858
:readonly="readonlyColumns?.includes(column.name)"
5959
:columnsWithErrors="columnsWithErrors"
6060
:isValidating="isValidating"
61+
:validatingMode="validatingMode"
6162
/>
62-
<div v-if="columnsWithErrors[column.name] && validatingMode && !isValidating" class="af-invalid-field-message mt-1 text-xs text-lightInputErrorColor dark:text-darkInputErrorColor">{{ columnsWithErrors[column.name] }}</div>
63-
<div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-lightFormFieldTextColor dark:text-darkFormFieldTextColor">{{ column.editingNote[mode] }}</div>
6463
</td>
6564
</tr>
6665
</tbody>

0 commit comments

Comments
 (0)