[Block Editor - Inserter]: preload media categories empty check - cli…

…ent side (#47503) * [Block Editor - Inserter]: preload media categories empty client side * show media tab if `enableOpenverseMediaCategory` setting is `true`
WordPress · Feb 21, 2023 · 0cbd7ce · 0cbd7ce · github-actions · Feb 21, 2023
1 parent 8548085
commit 0cbd7ce
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 38 deletions.
diff --git a/lib/compat/wordpress-6.2/edit-form-blocks.php b/lib/compat/wordpress-6.2/edit-form-blocks.php
diff --git a/lib/load.php b/lib/load.php
@@ -86,7 +86,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.2/block-template-utils.php';
 require __DIR__ . '/compat/wordpress-6.2/get-global-styles-and-settings.php';
 require __DIR__ . '/compat/wordpress-6.2/default-filters.php';
-require __DIR__ . '/compat/wordpress-6.2/edit-form-blocks.php';
 require __DIR__ . '/compat/wordpress-6.2/site-editor.php';
 require __DIR__ . '/compat/wordpress-6.2/block-editor.php';
 require __DIR__ . '/compat/wordpress-6.2/block-editor-settings.php';

diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
@@ -67,27 +67,33 @@ function InserterMenu(
  insertionIndex: __experimentalInsertionIndex,
  shouldFocusBlock,
  } );
- const { showPatterns, inserterItems } = useSelect(
- ( select ) => {
- const { __experimentalGetAllowedPatterns, getInserterItems } =
- select( blockEditorStore );
- return {
- showPatterns: !! __experimentalGetAllowedPatterns(
- destinationRootClientId
- ).length,
- inserterItems: getInserterItems( destinationRootClientId ),
- };
- },
- [ destinationRootClientId ]
- );
+ const { showPatterns, inserterItems, enableOpenverseMediaCategory } =
+ useSelect(
+ ( select ) => {
+ const {
+ __experimentalGetAllowedPatterns,
+ getInserterItems,
+ getSettings,
+ } = select( blockEditorStore );
+ return {
+ showPatterns: !! __experimentalGetAllowedPatterns(
+ destinationRootClientId
+ ).length,
+ inserterItems: getInserterItems( destinationRootClientId ),
+ enableOpenverseMediaCategory:
+ getSettings().enableOpenverseMediaCategory,
+ };
+ },
+ [ destinationRootClientId ]
+ );
  const hasReusableBlocks = useMemo( () => {
  return inserterItems.some(
  ( { category } ) => category === 'reusable'
  );
  }, [ inserterItems ] );
 
  const mediaCategories = useMediaCategories( destinationRootClientId );
- const showMedia = !! mediaCategories.length;
+ const showMedia = !! mediaCategories.length || enableOpenverseMediaCategory;
 
  const onInsert = useCallback(
  ( blocks, meta, shouldForceFocusBlock ) => {