Update the position of the patterns tab in the inserter menu (#55688)

* Move the patterns tab after the blocks tab in the inserter menu * Remove left-over 'prioritizePatterns' * Update spacing in tab.js
WordPress · Jan 4, 2024 · 889b716 · 889b716
1 parent 30e0d29
commit 889b716
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/packages/block-editor/src/components/inserter/index.js b/packages/block-editor/src/components/inserter/index.js
@@ -186,7 +186,6 @@ class PrivateInserter extends Component {
  clientId={ clientId }
  isAppender={ isAppender }
  showInserterHelpPanel={ showInserterHelpPanel }
- prioritizePatterns={ prioritizePatterns }
  />
  );
  }

diff --git a/packages/block-editor/src/components/inserter/library.js b/packages/block-editor/src/components/inserter/library.js
@@ -26,18 +26,13 @@ function InserterLibrary(
  },
  ref
 ) {
- const { destinationRootClientId, prioritizePatterns } = useSelect(
+ const { destinationRootClientId } = useSelect(
  ( select ) => {
- const { getBlockRootClientId, getSettings } =
- select( blockEditorStore );
-
+ const { getBlockRootClientId } = select( blockEditorStore );
  const _rootClientId =
  rootClientId || getBlockRootClientId( clientId ) || undefined;
  return {
  destinationRootClientId: _rootClientId,
- prioritizePatterns:
- getSettings().__experimentalPreferPatternsOnRoot &&
- ! _rootClientId,
  };
  },
  [ clientId, rootClientId ]
@@ -54,7 +49,6 @@ function InserterLibrary(
  __experimentalInsertionIndex={ __experimentalInsertionIndex }
  __experimentalFilterValue={ __experimentalFilterValue }
  shouldFocusBlock={ shouldFocusBlock }
- prioritizePatterns={ prioritizePatterns }
  ref={ ref }
  />
  );

diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
@@ -45,7 +45,6 @@ function InserterMenu(
  showMostUsedBlocks,
  __experimentalFilterValue = '',
  shouldFocusBlock = true,
- prioritizePatterns,
  },
  ref
 ) {
@@ -258,7 +257,6 @@ function InserterMenu(
  <InserterTabs
  showPatterns={ showPatterns }
  showMedia={ showMedia }
- prioritizePatterns={ prioritizePatterns }
  onSelect={ handleSetSelectedTab }
  tabsContents={ inserterTabsContents }
  />

diff --git a/packages/block-editor/src/components/inserter/tabs.js b/packages/block-editor/src/components/inserter/tabs.js
@@ -32,13 +32,11 @@ function InserterTabs( {
  showPatterns = false,
  showMedia = false,
  onSelect,
- prioritizePatterns = false,
  tabsContents,
 } ) {
  const tabs = [
- prioritizePatterns && showPatterns && patternsTab,
  blocksTab,
- ! prioritizePatterns && showPatterns && patternsTab,
+ showPatterns && patternsTab,
  showMedia && mediaTab,
  ].filter( Boolean );