Only reset unsaved changes when value has changed

packages/presentation/presentation_containers/interfaces/unsaved_changes/initialize_unsaved_changes.ts

@@ -16,6 +16,7 @@ import {
   Subscription,
 } from 'rxjs';
 import {
+  getComparatorFunction,
   getInitialValuesFromComparators,
   PublishesUnsavedChanges,
   PublishingSubject,
@@ -95,9 +96,13 @@ export const initializeUnsavedChanges = <RuntimeState extends {} = {}>(
       unsavedChanges,
       resetUnsavedChanges: () => {
         const lastSaved = lastSavedState$.getValue();
+        const currentState = snapshotRuntimeState();
         for (const key of comparatorKeys) {
-          const setter = comparators[key][1]; // setter function is the 1st element of the tuple
-          setter(lastSaved?.[key] as RuntimeState[typeof key]);
+          const comparator = getComparatorFunction(comparators, key);
+          if (!comparator(lastSaved?.[key], currentState[key], lastSaved, currentState)) {
+            const setter = comparators[key][1]; // setter function is the 1st element of the tuple
+            setter(lastSaved?.[key] as RuntimeState[typeof key]);
+          }
         }
       },
       snapshotRuntimeState,

packages/presentation/presentation_publishing/comparators/index.ts

@@ -8,5 +8,9 @@
  */
 
 export type { ComparatorFunction, ComparatorDefinition, StateComparators } from './types';
-export { getInitialValuesFromComparators, runComparators } from './state_comparators';
+export {
+  getComparatorFunction,
+  getInitialValuesFromComparators,
+  runComparators,
+} from './state_comparators';
 export { getUnchangingComparator } from './fallback_comparator';

packages/presentation/presentation_publishing/comparators/state_comparators.ts

@@ -11,6 +11,14 @@ import { StateComparators } from './types';
 
 const defaultComparator = <T>(a: T, b: T) => a === b;
 
+export function getComparatorFunction<StateType extends object = object>(
+  comparators: StateComparators<StateType>,
+  key: keyof StateType
+) {
+  const customComparator = comparators[key]?.[2]; // 2nd element of the tuple is the custom comparator
+  return customComparator ?? defaultComparator;
+}
+
 export const getInitialValuesFromComparators = <StateType extends object = object>(
   comparators: StateComparators<StateType>,
   comparatorKeys: Array<keyof StateType>
@@ -35,8 +43,7 @@ export const runComparators = <StateType extends object = object>(
   }
   const latestChanges: Partial<StateType> = {};
   for (const key of comparatorKeys) {
-    const customComparator = comparators[key]?.[2]; // 2nd element of the tuple is the custom comparator
-    const comparator = customComparator ?? defaultComparator;
+    const comparator = getComparatorFunction(comparators, key);
     if (!comparator(lastSavedState?.[key], latestState[key], lastSavedState, latestState)) {
       latestChanges[key] = latestState[key];
     }

packages/presentation/presentation_publishing/index.ts

@@ -16,6 +16,7 @@ export interface EmbeddableApiContext {
 }
 
 export {
+  getComparatorFunction,
   getInitialValuesFromComparators,
   getUnchangingComparator,
   runComparators,