@wordpress/block-editor 7.0.4 → 8.0.3

package/build-module/store/reducer.js

@@ -25,7 +25,8 @@ import { insertAt, moveTo } from './array';
  * @return {Object} Block order map object.
  */
 
-function mapBlockOrder(blocks, rootClientId = '') {
+function mapBlockOrder(blocks) {
+  let rootClientId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   const result = {
     [rootClientId]: []
   };
@@ -50,7 +51,8 @@ function mapBlockOrder(blocks, rootClientId = '') {
  */
 
 
-function mapBlockParents(blocks, rootClientId = '') {
+function mapBlockParents(blocks) {
+  let rootClientId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   return blocks.reduce((result, block) => Object.assign(result, {
     [block.clientId]: rootClientId
   }, mapBlockParents(block.innerBlocks, block.clientId)), {});
@@ -67,7 +69,8 @@ function mapBlockParents(blocks, rootClientId = '') {
  */
 
 
-function flattenBlocks(blocks, transform = identity) {
+function flattenBlocks(blocks) {
+  let transform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : identity;
   const result = {};
   const stack = [...blocks];
 
@@ -133,7 +136,9 @@ function getFlattenedBlockAttributes(blocks) {
  */
 
 
-function getNestedBlockClientIds(blocksOrder, rootClientId = '', controlledInnerBlocks = {}) {
+function getNestedBlockClientIds(blocksOrder) {
+  let rootClientId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  let controlledInnerBlocks = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return reduce(blocksOrder[rootClientId], (result, clientId) => {
     if (!!controlledInnerBlocks[clientId]) {
       return result;
@@ -217,34 +222,35 @@ function buildBlockTree(state, blocks) {
 }
 
 function updateParentInnerBlocksInTree(state, tree, updatedClientIds) {
-  const clientIds = new Set([]);
+  let updateChildrenOfUpdatedClientIds = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  const uncontrolledParents = new Set([]);
   const controlledParents = new Set();
 
   for (const clientId of updatedClientIds) {
-    let current = clientId;
+    let current = updateChildrenOfUpdatedClientIds ? clientId : state.parents[clientId];
 
     do {
       if (state.controlledInnerBlocks[current]) {
-        controlledParents.add(current); // If we reach a controlled parent, break out of the loop.
-
+        // Should stop on controlled blocks.
+        // If we reach a controlled parent, break out of the loop.
+        controlledParents.add(current);
         break;
       } else {
-        clientIds.add(current);
-      } // Should stop on controlled blocks.
-
-
-      current = state.parents[current];
+        // else continue traversing up through parents.
+        uncontrolledParents.add(current);
+        current = state.parents[current];
+      }
     } while (current !== undefined);
   } // To make sure the order of assignments doesn't matter,
   // we first create empty objects and mutates the inner blocks later.
 
 
-  for (const clientId of clientIds) {
+  for (const clientId of uncontrolledParents) {
     tree[clientId] = { ...tree[clientId]
     };
   }
 
-  for (const clientId of clientIds) {
+  for (const clientId of uncontrolledParents) {
     tree[clientId].innerBlocks = (state.order[clientId] || []).map(subClientId => tree[subClientId]);
   } // Controlled parent blocks, need a dedicated key for their inner blocks
   // to be used when doing getBlocks( controlledBlockClientId ).
@@ -269,7 +275,9 @@ function updateParentInnerBlocksInTree(state, tree, updatedClientIds) {
  */
 
 
-const withBlockTree = reducer => (state = {}, action) => {
+const withBlockTree = reducer => function () {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let action = arguments.length > 1 ? arguments[1] : undefined;
   const newState = reducer(state, action);
 
   if (newState === state) {
@@ -285,16 +293,17 @@ const withBlockTree = reducer => (state = {}, action) => {
         const subTree = buildBlockTree(newState, action.blocks);
         newState.tree = updateParentInnerBlocksInTree(newState, { ...newState.tree,
           ...subTree
-        }, action.rootClientId ? [action.rootClientId] : ['']);
+        }, action.rootClientId ? [action.rootClientId] : [''], true);
         break;
       }
 
     case 'UPDATE_BLOCK':
       newState.tree = updateParentInnerBlocksInTree(newState, { ...newState.tree,
-        [action.clientId]: { ...newState.byClientId[action.clientId],
+        [action.clientId]: { ...newState.tree[action.clientId],
+          ...newState.byClientId[action.clientId],
           attributes: newState.attributes[action.clientId]
         }
-      }, [action.clientId]);
+      }, [action.clientId], false);
       break;
 
     case 'UPDATE_BLOCK_ATTRIBUTES':
@@ -307,7 +316,7 @@ const withBlockTree = reducer => (state = {}, action) => {
         }, {});
         newState.tree = updateParentInnerBlocksInTree(newState, { ...newState.tree,
           ...newSubTree
-        }, action.clientIds);
+        }, action.clientIds, false);
         break;
       }
 
@@ -316,7 +325,7 @@ const withBlockTree = reducer => (state = {}, action) => {
         const subTree = buildBlockTree(newState, action.blocks);
         newState.tree = updateParentInnerBlocksInTree(newState, { ...omit(newState.tree, action.replacedClientIds.concat(action.replacedClientIds.map(clientId => 'controlled||' + clientId))),
           ...subTree
-        }, action.blocks.map(b => b.clientId)); // If there are no replaced blocks, it means we're removing blocks so we need to update their parent.
+        }, action.blocks.map(b => b.clientId), false); // If there are no replaced blocks, it means we're removing blocks so we need to update their parent.
 
         const parentsOfRemovedBlocks = [];
 
@@ -326,7 +335,7 @@ const withBlockTree = reducer => (state = {}, action) => {
           }
         }
 
-        newState.tree = updateParentInnerBlocksInTree(newState, newState.tree, parentsOfRemovedBlocks);
+        newState.tree = updateParentInnerBlocksInTree(newState, newState.tree, parentsOfRemovedBlocks, true);
         break;
       }
 
@@ -339,7 +348,7 @@ const withBlockTree = reducer => (state = {}, action) => {
         }
       }
 
-      newState.tree = updateParentInnerBlocksInTree(newState, omit(newState.tree, action.removedClientIds.concat(action.removedClientIds.map(clientId => 'controlled||' + clientId))), parentsOfRemovedBlocks);
+      newState.tree = updateParentInnerBlocksInTree(newState, omit(newState.tree, action.removedClientIds.concat(action.removedClientIds.map(clientId => 'controlled||' + clientId))), parentsOfRemovedBlocks, true);
       break;
 
     case 'MOVE_BLOCKS_TO_POSITION':
@@ -358,7 +367,7 @@ const withBlockTree = reducer => (state = {}, action) => {
           updatedBlockUids.push('');
         }
 
-        newState.tree = updateParentInnerBlocksInTree(newState, newState.tree, updatedBlockUids);
+        newState.tree = updateParentInnerBlocksInTree(newState, newState.tree, updatedBlockUids, true);
         break;
       }
 
@@ -366,7 +375,7 @@ const withBlockTree = reducer => (state = {}, action) => {
     case 'MOVE_BLOCKS_DOWN':
       {
         const updatedBlockUids = [action.rootClientId ? action.rootClientId : ''];
-        newState.tree = updateParentInnerBlocksInTree(newState, newState.tree, updatedBlockUids);
+        newState.tree = updateParentInnerBlocksInTree(newState, newState.tree, updatedBlockUids, true);
         break;
       }
 
@@ -383,7 +392,7 @@ const withBlockTree = reducer => (state = {}, action) => {
             };
             return result;
           }, {})
-        }, updatedBlockUids);
+        }, updatedBlockUids, false);
       }
   }
 
@@ -722,7 +731,10 @@ export const blocks = flow(combineReducers, withSaveReusableBlock, // needs to b
 withBlockTree, // needs to be before withInnerBlocksRemoveCascade
 withInnerBlocksRemoveCascade, withReplaceInnerBlocks, // needs to be after withInnerBlocksRemoveCascade
 withBlockReset, withPersistentBlockChange, withIgnoredBlockChange)({
-  byClientId(state = {}, action) {
+  byClientId() {
+    let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let action = arguments.length > 1 ? arguments[1] : undefined;
+
     switch (action.type) {
       case 'RECEIVE_BLOCKS':
       case 'INSERT_BLOCKS':
@@ -765,7 +777,10 @@ withBlockReset, withPersistentBlockChange, withIgnoredBlockChange)({
     return state;
   },
 
-  attributes(state = {}, action) {
+  attributes() {
+    let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let action = arguments.length > 1 ? arguments[1] : undefined;
+
     switch (action.type) {
       case 'RECEIVE_BLOCKS':
       case 'INSERT_BLOCKS':
@@ -829,7 +844,10 @@ withBlockReset, withPersistentBlockChange, withIgnoredBlockChange)({
     return state;
   },
 
-  order(state = {}, action) {
+  order() {
+    let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let action = arguments.length > 1 ? arguments[1] : undefined;
+
     switch (action.type) {
       case 'RECEIVE_BLOCKS':
         {
@@ -958,7 +976,10 @@ withBlockReset, withPersistentBlockChange, withIgnoredBlockChange)({
 
   // While technically redundant data as the inverse of `order`, it serves as
   // an optimization for the selectors which derive the ancestry of a block.
-  parents(state = {}, action) {
+  parents() {
+    let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let action = arguments.length > 1 ? arguments[1] : undefined;
+
     switch (action.type) {
       case 'RECEIVE_BLOCKS':
         return { ...state,
@@ -992,11 +1013,14 @@ withBlockReset, withPersistentBlockChange, withIgnoredBlockChange)({
     return state;
   },
 
-  controlledInnerBlocks(state = {}, {
-    type,
-    clientId,
-    hasControlledInnerBlocks
-  }) {
+  controlledInnerBlocks() {
+    let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let {
+      type,
+      clientId,
+      hasControlledInnerBlocks
+    } = arguments.length > 1 ? arguments[1] : undefined;
+
     if (type === 'SET_HAS_CONTROLLED_INNER_BLOCKS') {
       return { ...state,
         [clientId]: hasControlledInnerBlocks
@@ -1016,7 +1040,10 @@ withBlockReset, withPersistentBlockChange, withIgnoredBlockChange)({
  * @return {boolean} Updated state.
  */
 
-export function isTyping(state = false, action) {
+export function isTyping() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'START_TYPING':
       return true;
@@ -1036,7 +1063,10 @@ export function isTyping(state = false, action) {
  * @return {string[]} Updated state.
  */
 
-export function draggedBlocks(state = [], action) {
+export function draggedBlocks() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'START_DRAGGING_BLOCKS':
       return action.clientIds;
@@ -1056,7 +1086,10 @@ export function draggedBlocks(state = [], action) {
  * @return {boolean} Updated state.
  */
 
-export function isCaretWithinFormattedText(state = false, action) {
+export function isCaretWithinFormattedText() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'ENTER_FORMATTED_TEXT':
       return true;
@@ -1077,7 +1110,10 @@ export function isCaretWithinFormattedText(state = false, action) {
  * @return {Object} Updated state.
  */
 
-function selectionHelper(state = {}, action) {
+function selectionHelper() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'CLEAR_SELECTED_BLOCK':
       {
@@ -1150,9 +1186,12 @@ function selectionHelper(state = {}, action) {
  */
 
 
-export function selection(state = {}, action) {
+export function selection() {
   var _state$selectionStart, _state$selectionEnd;
 
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'SELECTION_CHANGE':
       return {
@@ -1231,7 +1270,10 @@ export function selection(state = {}, action) {
  * @return {boolean} Updated state.
  */
 
-export function isMultiSelecting(state = false, action) {
+export function isMultiSelecting() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'START_MULTI_SELECT':
       return true;
@@ -1251,7 +1293,10 @@ export function isMultiSelecting(state = false, action) {
  * @return {boolean} Updated state.
  */
 
-export function isSelectionEnabled(state = true, action) {
+export function isSelectionEnabled() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'TOGGLE_SELECTION':
       return action.isSelectionEnabled;
@@ -1272,7 +1317,10 @@ export function isSelectionEnabled(state = true, action) {
  * @return {number|null} Initial position: 0, -1 or null.
  */
 
-export function initialPosition(state = null, action) {
+export function initialPosition() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   if (action.type === 'REPLACE_BLOCKS' && action.initialPosition !== undefined) {
     return action.initialPosition;
   } else if (['SELECT_BLOCK', 'RESET_SELECTION', 'INSERT_BLOCKS', 'REPLACE_INNER_BLOCKS'].includes(action.type)) {
@@ -1281,7 +1329,10 @@ export function initialPosition(state = null, action) {
 
   return state;
 }
-export function blocksMode(state = {}, action) {
+export function blocksMode() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   if (action.type === 'TOGGLE_BLOCK_MODE') {
     const {
       clientId
@@ -1304,7 +1355,10 @@ export function blocksMode(state = {}, action) {
  * @return {Object} Updated state.
  */
 
-export function insertionPoint(state = null, action) {
+export function insertionPoint() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'SHOW_INSERTION_POINT':
       const {
@@ -1333,9 +1387,12 @@ export function insertionPoint(state = null, action) {
  * @return {boolean} Updated state.
  */
 
-export function template(state = {
-  isValid: true
-}, action) {
+export function template() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+    isValid: true
+  };
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'SET_TEMPLATE_VALIDITY':
       return { ...state,
@@ -1354,7 +1411,10 @@ export function template(state = {
  * @return {Object} Updated state.
  */
 
-export function settings(state = SETTINGS_DEFAULTS, action) {
+export function settings() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : SETTINGS_DEFAULTS;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'UPDATE_SETTINGS':
       return { ...state,
@@ -1373,7 +1433,10 @@ export function settings(state = SETTINGS_DEFAULTS, action) {
  * @return {string} Updated state.
  */
 
-export function preferences(state = PREFERENCES_DEFAULTS, action) {
+export function preferences() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : PREFERENCES_DEFAULTS;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'INSERT_BLOCKS':
     case 'REPLACE_BLOCKS':
@@ -1419,7 +1482,10 @@ export function preferences(state = PREFERENCES_DEFAULTS, action) {
  * @return {Object} Updated state.
  */
 
-export const blockListSettings = (state = {}, action) => {
+export const blockListSettings = function () {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     // Even if the replaced blocks have the same client ID, our logic
     // should correct the state.
@@ -1464,7 +1530,10 @@ export const blockListSettings = (state = {}, action) => {
  * @return {string} Updated state.
  */
 
-export function isNavigationMode(state = false, action) {
+export function isNavigationMode() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   // Let inserting block always trigger Edit mode.
   if (action.type === 'INSERT_BLOCKS') {
     return false;
@@ -1485,7 +1554,10 @@ export function isNavigationMode(state = false, action) {
  * @return {string|null} Updated state.
  */
 
-export function hasBlockMovingClientId(state = null, action) {
+export function hasBlockMovingClientId() {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   // Let inserting block always trigger Edit mode.
   if (action.type === 'SET_BLOCK_MOVING_MODE') {
     return action.hasBlockMovingClientId;
@@ -1609,9 +1681,12 @@ export function highlightedBlock(state, action) {
  * @return {Object} Updated state.
  */
 
-export function lastBlockInserted(state = {}, action) {
+export function lastBlockInserted() {
   var _action$meta;
 
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let action = arguments.length > 1 ? arguments[1] : undefined;
+
   switch (action.type) {
     case 'INSERT_BLOCKS':
       if (!action.blocks.length) {