Switching pattern categories inserter to Tabs component with arrow key navigation #60257
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,10 @@ import { useState } from '@wordpress/element'; | |
| import { __, isRTL } from '@wordpress/i18n'; | ||
| import { useViewportMatch } from '@wordpress/compose'; | ||
| import { | ||
| __experimentalHStack as HStack, | ||
| FlexBlock, | ||
| Button, | ||
| privateApis as componentsPrivateApis, | ||
| } from '@wordpress/components'; | ||
| import { Icon, chevronRight, chevronLeft } from '@wordpress/icons'; | ||
|
|
||
|
|
@@ -20,41 +19,48 @@ import PatternsExplorerModal from '../block-patterns-explorer'; | |
| import MobileTabNavigation from '../mobile-tab-navigation'; | ||
| import { PatternCategoryPreviews } from './pattern-category-previews'; | ||
| import { usePatternCategories } from './use-pattern-categories'; | ||
| import { unlock } from '../../../lock-unlock'; | ||
|
|
||
| const { Tabs } = unlock( componentsPrivateApis ); | ||
|
|
||
| function BlockPatternsTab( { | ||
| onSelectCategory, | ||
| selectedCategory, | ||
| onInsert, | ||
| rootClientId, | ||
| children, | ||
| } ) { | ||
| const [ showPatternsExplorer, setShowPatternsExplorer ] = useState( false ); | ||
|
|
||
| const categories = usePatternCategories( rootClientId ); | ||
|
|
||
| const isMobile = useViewportMatch( 'medium', '<' ); | ||
|
|
||
| return ( | ||
| <> | ||
| { ! isMobile && ( | ||
| <div className="block-editor-inserter__block-patterns-tabs-container"> | ||
| <Tabs | ||
| selectOnMove={ false } | ||
| selectedTabId={ | ||
| selectedCategory ? selectedCategory.name : null | ||
| } | ||
| orientation={ 'vertical' } | ||
| onSelect={ ( categoryId ) => { | ||
| // Pass the full category object | ||
| onSelectCategory( | ||
| categories.find( | ||
| ( category ) => category.name === categoryId | ||
| ) | ||
| ); | ||
| } } | ||
| > | ||
| <Tabs.TabList className="block-editor-inserter__block-patterns-tablist"> | ||
| { categories.map( ( category ) => ( | ||
| <Tabs.Tab | ||
| key={ category.name } | ||
| tabId={ category.name } | ||
| className="block-editor-inserter__patterns-tab" | ||
| aria-label={ category.label } | ||
| aria-current={ | ||
| category === selectedCategory | ||
|
|
@@ -74,39 +80,47 @@ function BlockPatternsTab( { | |
| } | ||
| /> | ||
| </HStack> | ||
| </Tabs.Tab> | ||
| ) ) } | ||
| </Tabs.TabList> | ||
| { categories.map( ( category ) => ( | ||
| <Tabs.TabPanel | ||
| key={ category.name } | ||
| tabId={ category.name } | ||
| focusable={ false } | ||
| className="block-editor-inserter__patterns-category-panel" | ||
| > | ||
| { children } | ||
| </Tabs.TabPanel> | ||
| ) ) } | ||
| </Tabs> | ||
| <Button | ||
| className="block-editor-inserter__patterns-explore-button" | ||
| onClick={ () => setShowPatternsExplorer( true ) } | ||
| variant="secondary" | ||
| > | ||
| { __( 'Explore all patterns' ) } | ||
| </Button> | ||
| </div> | ||
| ) } | ||
| { isMobile && ( | ||
| <MobileTabNavigation categories={ categories }> | ||
| { ( category ) => ( | ||
| <div className="block-editor-inserter__patterns-category-panel"> | ||
| <PatternCategoryPreviews | ||
| key={ category.name } | ||
| onInsert={ onInsert } | ||
| rootClientId={ rootClientId } | ||
| category={ category } | ||
| showTitlesAsTooltip={ false } | ||
| /> | ||
| </div> | ||
| ) } | ||
| </MobileTabNavigation> | ||
| ) } | ||
| { showPatternsExplorer && ( | ||
| <PatternsExplorerModal | ||
| initialCategory={ selectedCategory || categories[ 0 ] } | ||
|
There was a problem hiding this comment. Are There was a problem hiding this comment. I believe so. I didn't change how |
||
| patternCategories={ categories } | ||
| onModalClose={ () => setShowPatternsExplorer( false ) } | ||
| rootClientId={ rootClientId } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,8 @@ | ||
| /** | ||
| * Internal dependencies | ||
| */ | ||
|
|
||
| import { PatternCategoryPreviews } from './pattern-category-previews'; | ||
|
|
||
| export function PatternCategoryPreviewPanel( { | ||
| rootClientId, | ||
|
|
@@ -20,34 +12,15 @@ export function PatternCategoryPreviewPanel( { | |
| showTitlesAsTooltip, | ||
| patternFilter, | ||
| } ) { | ||
| return ( | ||
|
Comment on lines
-23
to
-36
There was a problem hiding this comment. Can you explain why it was ok to remove all this code? It seems it was handling zoom out and autofocus. There was a problem hiding this comment. This did handle autofocus and zoom out. I'd like to remove autofocus, as none of the other tab components move focus into the panel, nor is it mentioned on the tabs pattern ARIA guide. I played around with it a bit on the keyboard and quite liked not moving autofocus for being able to activate and see the patterns in a category without committing to the category. It makes browsing categories a lot easier IMO. The zoom out mode hook had to be moved up a level to the menu.js. |
||
| <PatternCategoryPreviews | ||
| key={ category.name } | ||
| rootClientId={ rootClientId } | ||
| onInsert={ onInsert } | ||
| onHover={ onHover } | ||
| category={ category } | ||
| showTitlesAsTooltip={ showTitlesAsTooltip } | ||
| patternFilter={ patternFilter } | ||
| /> | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you help me understand why this change is part of this PR? What required the addition of this new param?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously the
useZoomOuthook toggled between zoom in/out mode each time it ran. Passing a param of true/false allows us to intentionally choose if we want to use zoom out mode or not.This param wasn't necessary in the previous set-up because the pattern category panel would unmount (turning zoom out mode off) then re mount a new category (turning zoom out mode back on). There's more context in this comment.