From c1ccc150fdc46c1e1a044a71ff29b8ba25f98dca Mon Sep 17 00:00:00 2001
From: Daniel Lautzenheiser <lautzd@gmail.com>
Date: Mon, 23 Oct 2023 10:58:09 -0400
Subject: [PATCH] fix: properly detect changes (#947)

---
 packages/core/src/reducers/entryDraft.ts | 29 +++++++-----------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/packages/core/src/reducers/entryDraft.ts b/packages/core/src/reducers/entryDraft.ts
index cc8a7fae8..0a979f61a 100644
--- a/packages/core/src/reducers/entryDraft.ts
+++ b/packages/core/src/reducers/entryDraft.ts
@@ -161,20 +161,13 @@ function entryDraftReducer(
     }
 
     case DRAFT_UPDATE: {
-      let newState = { ...state };
-      if (!newState.entry) {
+      if (!state.entry) {
         return state;
       }
 
       const { data } = action.payload;
 
-      newState = {
-        ...newState,
-        entry: {
-          ...newState.entry,
-          data,
-        },
-      };
+      const newState = set(state, 'entry.data', data);
 
       let hasChanged =
         !isEqual(newState.entry?.meta, newState.original?.meta) ||
@@ -194,8 +187,7 @@ function entryDraftReducer(
     }
 
     case DRAFT_CHANGE_FIELD: {
-      let newState = { ...state };
-      if (!newState.entry) {
+      if (!state.entry) {
         return state;
       }
 
@@ -204,26 +196,21 @@ function entryDraftReducer(
         ? ['meta']
         : (i18n && getDataPath(i18n.currentLocale, i18n.defaultLocale)) || ['data'];
 
-      const newEntry = cloneDeep(newState.entry);
-
-      newState = {
-        ...newState,
-        entry: set(newEntry, `${dataPath.join('.')}.${path}`, value),
-      };
+      let newState = set(state, `entry.${dataPath.join('.')}.${path}`, value);
 
       if (i18n) {
         newState = duplicateI18nFields(newState, field, i18n.locales, i18n.defaultLocale, path);
       }
 
       let hasChanged =
-        !isEqual(newEntry?.meta, newState.original?.meta) ||
-        !isEqual(newEntry?.data, newState.original?.data);
+        !isEqual(newState.entry?.meta, newState.original?.meta) ||
+        !isEqual(newState.entry?.data, newState.original?.data);
 
-      const i18nData = newEntry?.i18n ?? {};
+      const i18nData = newState.entry?.i18n ?? {};
       for (const locale in i18nData) {
         hasChanged =
           hasChanged ||
-          !isEqual(newEntry?.i18n?.[locale]?.data, newState.original?.i18n?.[locale]?.data);
+          !isEqual(newState.entry?.i18n?.[locale]?.data, newState.original?.i18n?.[locale]?.data);
       }
 
       return {