@wordpress/block-editor 11.4.0 → 11.6.0

package/build/store/reducer.js

@@ -5,7 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.automaticChangeStatus = automaticChangeStatus;
 exports.blockListSettings = void 0;
 exports.blockVisibility = blockVisibility;
 exports.blocks = void 0;
@@ -1442,9 +1441,16 @@ function selection() {
 
   }
 
+  const selectionStart = selectionHelper(state.selectionStart, action);
+  const selectionEnd = selectionHelper(state.selectionEnd, action);
+
+  if (selectionStart === state.selectionStart && selectionEnd === state.selectionEnd) {
+    return state;
+  }
+
   return {
-    selectionStart: selectionHelper(state.selectionStart, action),
-    selectionEnd: selectionHelper(state.selectionEnd, action)
+    selectionStart,
+    selectionEnd
   };
 }
 /**
@@ -1816,48 +1822,6 @@ function lastBlockAttributesChange() {
 
   return state;
 }
-/**
- * Reducer returning automatic change state.
- *
- * @param {?string} state  Current state.
- * @param {Object}  action Dispatched action.
- *
- * @return {string | undefined} Updated state.
- */
-
-
-function automaticChangeStatus(state, action) {
-  switch (action.type) {
-    case 'MARK_AUTOMATIC_CHANGE':
-      return 'pending';
-
-    case 'MARK_AUTOMATIC_CHANGE_FINAL':
-      if (state === 'pending') {
-        return 'final';
-      }
-
-      return;
-
-    case 'SELECTION_CHANGE':
-      // As long as the state is not final, ignore any selection changes.
-      if (state !== 'final') {
-        return state;
-      }
-
-      return;
-    // Undoing an automatic change should still be possible after mouse
-    // move or after visibility change.
-
-    case 'SET_BLOCK_VISIBILITY':
-    case 'START_TYPING':
-    case 'STOP_TYPING':
-    case 'UPDATE_BLOCK_LIST_SETTINGS':
-      return state;
-  } // TODO: This is a source of bug, as each time there's a change in timing,
-  // or a new action is added, this could break.
-  // Reset the state by default (for any action not handled).
-
-}
 /**
  * Reducer returning current highlighted block.
  *
@@ -1953,7 +1917,7 @@ function temporarilyEditingAsBlocks() {
   return state;
 }
 
-var _default = (0, _data.combineReducers)({
+const combinedReducers = (0, _data.combineReducers)({
   blocks,
   isTyping,
   isBlockInterfaceHidden,
@@ -1971,12 +1935,54 @@ var _default = (0, _data.combineReducers)({
   lastBlockAttributesChange,
   editorMode,
   hasBlockMovingClientId,
-  automaticChangeStatus,
   highlightedBlock,
   lastBlockInserted,
   temporarilyEditingAsBlocks,
   blockVisibility
 });
 
+function withAutomaticChangeReset(reducer) {
+  return (state, action) => {
+    const nextState = reducer(state, action);
+
+    if (!state) {
+      return nextState;
+    } // Take over the last value without creating a new reference.
+
+
+    nextState.automaticChangeStatus = state.automaticChangeStatus;
+
+    if (action.type === 'MARK_AUTOMATIC_CHANGE') {
+      return { ...nextState,
+        automaticChangeStatus: 'pending'
+      };
+    }
+
+    if (action.type === 'MARK_AUTOMATIC_CHANGE_FINAL' && state.automaticChangeStatus === 'pending') {
+      return { ...nextState,
+        automaticChangeStatus: 'final'
+      };
+    } // If there's a change that doesn't affect blocks or selection, maintain
+    // the current status.
+
+
+    if (nextState.blocks === state.blocks && nextState.selection === state.selection) {
+      return nextState;
+    } // As long as the state is not final, ignore any selection changes.
+
+
+    if (nextState.automaticChangeStatus !== 'final' && nextState.selection !== state.selection) {
+      return nextState;
+    } // Reset the status if blocks change or selection changes (when status is final).
+
+
+    return { ...nextState,
+      automaticChangeStatus: undefined
+    };
+  };
+}
+
+var _default = withAutomaticChangeReset(combinedReducers);
+
 exports.default = _default;
 //# sourceMappingURL=reducer.js.map