@wordpress/block-editor 14.7.1-next.082ed6819.0 → 14.8.1-next.cd6172eb0.0

package/build-module/store/selectors.js

@@ -1,4 +1,3 @@
-/* wp:polyfill */
 /**
  * WordPress dependencies
  */
@@ -2469,13 +2468,6 @@ export function __unstableIsWithinBlockOverlay(state, clientId) {
   }
   return false;
 }
-function isWithinBlock(state, clientId, parentClientId) {
-  let parent = state.blocks.parents.get(clientId);
-  while (!!parent && parent !== parentClientId) {
-    parent = state.blocks.parents.get(parent);
-  }
-  return parent === parentClientId;
-}
 
 /**
  * @typedef {import('../components/block-editing-mode').BlockEditingMode} BlockEditingMode
@@ -2515,55 +2507,20 @@ export const getBlockEditingMode = createRegistrySelector(select => (state, clie
   if (clientId === null) {
     clientId = '';
   }
+  const isNavMode = isNavigationMode(state);
 
-  // In zoom-out mode, override the behavior set by
-  // __unstableSetBlockEditingMode to only allow editing the top-level
-  // sections.
-  if (isZoomOut(state)) {
-    const sectionRootClientId = getSectionRootClientId(state);
-    if (clientId === '' /* ROOT_CONTAINER_CLIENT_ID */) {
-      return sectionRootClientId ? 'disabled' : 'contentOnly';
-    }
-    if (clientId === sectionRootClientId) {
-      return 'contentOnly';
-    }
-    const sectionsClientIds = getBlockOrder(state, sectionRootClientId);
-
-    // Sections are always contentOnly.
-    if (sectionsClientIds?.includes(clientId)) {
-      return 'contentOnly';
-    }
-    return 'disabled';
+  // If the editor is currently not in navigation mode, check if the clientId
+  // has an editing mode set in the regular derived map.
+  // There may be an editing mode set here for synced patterns or in zoomed out
+  // mode.
+  if (!isNavMode && state.derivedBlockEditingModes?.has(clientId)) {
+    return state.derivedBlockEditingModes.get(clientId);
   }
-  const editorMode = __unstableGetEditorMode(state);
-  if (editorMode === 'navigation') {
-    const sectionRootClientId = getSectionRootClientId(state);
-
-    // The root section is "default mode"
-    if (clientId === sectionRootClientId) {
-      return 'default';
-    }
-
-    // Sections should always be contentOnly in navigation mode.
-    const sectionsClientIds = getBlockOrder(state, sectionRootClientId);
-    if (sectionsClientIds.includes(clientId)) {
-      return 'contentOnly';
-    }
 
-    // Blocks outside sections should be disabled.
-    const isWithinSectionRoot = isWithinBlock(state, clientId, sectionRootClientId);
-    if (!isWithinSectionRoot) {
-      return 'disabled';
-    }
-
-    // The rest of the blocks depend on whether they are content blocks or not.
-    // This "flattens" the sections tree.
-    const name = getBlockName(state, clientId);
-    const {
-      hasContentRoleAttribute
-    } = unlock(select(blocksStore));
-    const isContent = hasContentRoleAttribute(name);
-    return isContent ? 'contentOnly' : 'disabled';
+  // If the editor *is* in navigation mode, the block editing mode states
+  // are stored in the derivedNavModeBlockEditingModes map.
+  if (isNavMode && state.derivedNavModeBlockEditingModes?.has(clientId)) {
+    return state.derivedNavModeBlockEditingModes.get(clientId);
   }
 
   // In normal mode, consider that an explicitely set editing mode takes over.
@@ -2573,7 +2530,7 @@ export const getBlockEditingMode = createRegistrySelector(select => (state, clie
   }
 
   // In normal mode, top level is default mode.
-  if (!clientId) {
+  if (clientId === '') {
     return 'default';
   }
   const rootClientId = getBlockRootClientId(state, clientId);