@wordpress/block-editor 12.4.0 → 12.6.0

package/build-module/store/selectors.js

@@ -1765,7 +1765,6 @@ const buildBlockTypeItem = (state, {
  *
  * @param    {Object}   state             Editor state.
  * @param    {?string}  rootClientId      Optional root client ID of block list.
- * @param    {?string}  syncStatus        Optional sync status to filter pattern blocks by.
  *
  * @return {WPEditorInserterItem[]} Items that appear in inserter.
  *
@@ -1783,10 +1782,7 @@ const buildBlockTypeItem = (state, {
  */
 
 
-export const getInserterItems = createSelector((state, rootClientId = null, syncStatus) => {
-  const buildBlockTypeInserterItem = buildBlockTypeItem(state, {
-    buildScope: 'inserter'
-  });
+export const getInserterItems = createSelector((state, rootClientId = null) => {
   /*
    * Matches block comment delimiters amid serialized content.
    *
@@ -1800,7 +1796,6 @@ export const getInserterItems = createSelector((state, rootClientId = null, sync
    * - prepended ^\s*
    *
    */
-
   const blockParserTokenizer = /^\s*<!--\s+(\/)?wp:([a-z][a-z0-9_-]*\/)?([a-z][a-z0-9_-]*)\s+({(?:(?=([^}]+|}+(?=})|(?!}\s+\/?-->)[^])*)\5|[^]*?)}\s+)?(\/)?-->/;
 
   const buildReusableBlockInserterItem = reusableBlock => {
@@ -1843,7 +1838,7 @@ export const getInserterItems = createSelector((state, rootClientId = null, sync
       title: reusableBlock.title.raw,
       icon,
       category: 'reusable',
-      keywords: [],
+      keywords: ['reusable'],
       isDisabled: false,
       utility: 1,
       // Deprecated.
@@ -1852,8 +1847,15 @@ export const getInserterItems = createSelector((state, rootClientId = null, sync
     };
   };
 
+  const syncedPatternInserterItems = canInsertBlockTypeUnmemoized(state, 'core/block', rootClientId) ? getReusableBlocks(state).filter(reusableBlock => // Reusable blocks that are fully synced should have no sync status set
+  // for backwards compat between patterns and old reusable blocks, but
+  // some in release 16.1 may have had sync status inadvertantly set to
+  // 'fully' if created in the site editor.
+  reusableBlock.wp_pattern_sync_status === 'fully' || reusableBlock.wp_pattern_sync_status === '' || !reusableBlock.wp_pattern_sync_status).map(buildReusableBlockInserterItem) : [];
+  const buildBlockTypeInserterItem = buildBlockTypeItem(state, {
+    buildScope: 'inserter'
+  });
   const blockTypeInserterItems = getBlockTypes().filter(blockType => canIncludeBlockTypeInInserter(state, blockType, rootClientId)).map(buildBlockTypeInserterItem);
-  const reusableBlockInserterItems = canInsertBlockTypeUnmemoized(state, 'core/block', rootClientId) ? getReusableBlocks(state).filter(reusableBlock => syncStatus === reusableBlock.meta?.sync_status || !syncStatus && reusableBlock.meta?.sync_status === '').map(buildReusableBlockInserterItem) : [];
   const items = blockTypeInserterItems.reduce((accumulator, item) => {
     const {
       variations = []
@@ -1895,7 +1897,7 @@ export const getInserterItems = createSelector((state, rootClientId = null, sync
     noncore: []
   });
   const sortedBlockTypes = [...coreItems, ...nonCoreItems];
-  return [...sortedBlockTypes, ...reusableBlockInserterItems];
+  return [...sortedBlockTypes, ...syncedPatternInserterItems];
 }, (state, rootClientId) => [state.blockListSettings[rootClientId], state.blocks.byClientId, state.blocks.order, state.preferences.insertUsage, state.settings.allowedBlockTypes, state.settings.templateLock, getReusableBlocks(state), getBlockTypes()]);
 /**
  * Determines the items that appear in the available block transforms list.
@@ -1973,8 +1975,10 @@ export const getAllowedBlocks = createSelector((state, rootClientId = null) => {
     return;
   }
 
-  return getBlockTypes().filter(blockType => canIncludeBlockTypeInInserter(state, blockType, rootClientId));
-}, (state, rootClientId) => [state.blockListSettings[rootClientId], state.blocks.byClientId, state.settings.allowedBlockTypes, state.settings.templateLock, getBlockTypes()]);
+  const blockTypes = getBlockTypes().filter(blockType => canIncludeBlockTypeInInserter(state, blockType, rootClientId));
+  const hasReusableBlock = canInsertBlockTypeUnmemoized(state, 'core/block', rootClientId) && getReusableBlocks(state).length > 0;
+  return [...blockTypes, ...(hasReusableBlock ? ['core/block'] : [])];
+}, (state, rootClientId) => [state.blockListSettings[rootClientId], state.blocks.byClientId, state.settings.allowedBlockTypes, state.settings.templateLock, getReusableBlocks(state), getBlockTypes()]);
 export const __experimentalGetAllowedBlocks = createSelector((state, rootClientId = null) => {
   deprecated('wp.data.select( "core/block-editor" ).__experimentalGetAllowedBlocks', {
     alternative: 'wp.data.select( "core/block-editor" ).getAllowedBlocks',
@@ -1997,13 +2001,13 @@ export const __experimentalGetAllowedBlocks = createSelector((state, rootClientI
  * @property {?Array<string>} attributesToCopy Attributes to be copied from adjecent blocks when inserted.
  */
 
-export const __experimentalGetDirectInsertBlock = createSelector((state, rootClientId = null) => {
+export const getDirectInsertBlock = createSelector((state, rootClientId = null) => {
   if (!rootClientId) {
     return;
   }
 
-  const defaultBlock = state.blockListSettings[rootClientId]?.__experimentalDefaultBlock;
-  const directInsert = state.blockListSettings[rootClientId]?.__experimentalDirectInsert;
+  const defaultBlock = state.blockListSettings[rootClientId]?.defaultBlock;
+  const directInsert = state.blockListSettings[rootClientId]?.directInsert;
 
   if (!defaultBlock || !directInsert) {
     return;
@@ -2015,6 +2019,14 @@ export const __experimentalGetDirectInsertBlock = createSelector((state, rootCli
 
   return defaultBlock;
 }, (state, rootClientId) => [state.blockListSettings[rootClientId], state.blocks.tree.get(rootClientId)]);
+export const __experimentalGetDirectInsertBlock = createSelector((state, rootClientId = null) => {
+  deprecated('wp.data.select( "core/block-editor" ).__experimentalGetDirectInsertBlock', {
+    alternative: 'wp.data.select( "core/block-editor" ).getDirectInsertBlock',
+    since: '6.3',
+    version: '6.4'
+  });
+  return getDirectInsertBlock(state, rootClientId);
+}, (state, rootClientId) => [state.blockListSettings[rootClientId], state.blocks.tree.get(rootClientId)]);
 
 const checkAllowListRecursive = (blocks, allowedBlockTypes) => {
   if (typeof allowedBlockTypes === 'boolean') {
@@ -2039,9 +2051,24 @@ const checkAllowListRecursive = (blocks, allowedBlockTypes) => {
   return true;
 };
 
+function getUnsyncedPatterns(state) {
+  var _state$settings$__exp;
+
+  const reusableBlocks = (_state$settings$__exp = state?.settings?.__experimentalReusableBlocks) !== null && _state$settings$__exp !== void 0 ? _state$settings$__exp : EMPTY_ARRAY;
+  return reusableBlocks.filter(reusableBlock => reusableBlock.wp_pattern_sync_status === 'unsynced').map(reusableBlock => {
+    return {
+      name: `core/block/${reusableBlock.id}`,
+      title: reusableBlock.title.raw,
+      categories: ['custom'],
+      content: reusableBlock.content.raw
+    };
+  });
+}
+
 export const __experimentalGetParsedPattern = createSelector((state, patternName) => {
   const patterns = state.settings.__experimentalBlockPatterns;
-  const pattern = patterns.find(({
+  const unsyncedPatterns = getUnsyncedPatterns(state);
+  const pattern = [...patterns, ...unsyncedPatterns].find(({
     name
   }) => name === patternName);
 
@@ -2054,13 +2081,14 @@ export const __experimentalGetParsedPattern = createSelector((state, patternName
       __unstableSkipMigrationLogs: true
     })
   };
-}, state => [state.settings.__experimentalBlockPatterns]);
+}, state => [state.settings.__experimentalBlockPatterns, state.settings.__experimentalReusableBlocks]);
 const getAllAllowedPatterns = createSelector(state => {
   const patterns = state.settings.__experimentalBlockPatterns;
+  const unsyncedPatterns = getUnsyncedPatterns(state);
   const {
     allowedBlockTypes
   } = getSettings(state);
-  const parsedPatterns = patterns.filter(({
+  const parsedPatterns = [...patterns, ...unsyncedPatterns].filter(({
     inserter = true
   }) => !!inserter).map(({
     name
@@ -2069,7 +2097,7 @@ const getAllAllowedPatterns = createSelector(state => {
     blocks
   }) => checkAllowListRecursive(blocks, allowedBlockTypes));
   return allowedPatterns;
-}, state => [state.settings.__experimentalBlockPatterns, state.settings.allowedBlockTypes]);
+}, state => [state.settings.__experimentalBlockPatterns, state.settings.__experimentalReusableBlocks, state.settings.allowedBlockTypes]);
 /**
  * Returns the list of allowed patterns for inner blocks children.
  *
@@ -2087,7 +2115,7 @@ export const __experimentalGetAllowedPatterns = createSelector((state, rootClien
     name
   }) => canInsertBlockType(state, name, rootClientId)));
   return patternsAllowed;
-}, (state, rootClientId) => [state.settings.__experimentalBlockPatterns, state.settings.allowedBlockTypes, state.settings.templateLock, state.blockListSettings[rootClientId], state.blocks.byClientId.get(rootClientId)]);
+}, (state, rootClientId) => [state.settings.__experimentalBlockPatterns, state.settings.__experimentalReusableBlocks, state.settings.allowedBlockTypes, state.settings.templateLock, state.blockListSettings[rootClientId], state.blocks.byClientId.get(rootClientId)]);
 /**
  * Returns the list of patterns based on their declared `blockTypes`
  * and a block's name.
@@ -2311,9 +2339,9 @@ export function __experimentalGetLastBlockAttributeChanges(state) {
  */
 
 function getReusableBlocks(state) {
-  var _state$settings$__exp;
+  var _state$settings$__exp2;
 
-  return (_state$settings$__exp = state?.settings?.__experimentalReusableBlocks) !== null && _state$settings$__exp !== void 0 ? _state$settings$__exp : EMPTY_ARRAY;
+  return (_state$settings$__exp2 = state?.settings?.__experimentalReusableBlocks) !== null && _state$settings$__exp2 !== void 0 ? _state$settings$__exp2 : EMPTY_ARRAY;
 }
 /**
  * Returns whether the navigation mode is enabled.