From 1809f64ddd8537af6debcf41964792361b68c57e Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 31 Jul 2020 18:12:57 -0400
Subject: [PATCH] Prevent field flash on resize

---
 .../fields/components/field-select/field-select.vue        | 2 +-
 .../components/fields-management/fields-management.vue     | 1 +
 app/src/stores/fields/fields.ts                            | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue
index 000993e37c..8327fae225 100644
--- a/app/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue
+++ b/app/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="hidden ? 'half' : field.system.width">
+	<div :class="field.system.width || 'full'">
 		<v-menu attached close-on-content-click>
 			<template #activator="{ toggle, active }">
 				<v-input class="field" :class="{ hidden, active }" readonly @click="toggle">
diff --git a/app/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue b/app/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue
index 400685ecba..6405ec8488 100644
--- a/app/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue
+++ b/app/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue
@@ -36,6 +36,7 @@
 				v-for="field in sortedHiddenFields"
 				:key="field.field"
 				:field="field"
+				hidden
 				@toggle-visibility="toggleVisibility($event, 'hidden')"
 				@edit="openFieldSetup(field)"
 			/>
diff --git a/app/src/stores/fields/fields.ts b/app/src/stores/fields/fields.ts
index 36c6a6b188..9e6003c785 100644
--- a/app/src/stores/fields/fields.ts
+++ b/app/src/stores/fields/fields.ts
@@ -156,15 +156,14 @@ export const useFieldsStore = createStore({
 			// Update locally first, so the changes are visible immediately
 			this.state.fields = this.state.fields.map((field) => {
 				if (field.collection === collectionKey && field.field === fieldKey) {
-					return {
-						...field,
-						...updates,
-					};
+					return merge({}, field, updates);
 				}
 
 				return field;
 			});
 
+
+
 			// Save to API, and update local state again to make sure everything is in sync with the
 			// API
 			try {