-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Navigation Submenu: Use a different icon for the submenu when in the list view #46075
Closed
+10
−2
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ import { | |
__experimentalTruncate as Truncate, | ||
} from '@wordpress/components'; | ||
import { forwardRef } from '@wordpress/element'; | ||
import { Icon, lock } from '@wordpress/icons'; | ||
import { Icon, lock, customLink } from '@wordpress/icons'; | ||
import { SPACE, ENTER } from '@wordpress/keycodes'; | ||
|
||
/** | ||
|
@@ -27,7 +27,7 @@ import { useBlockLock } from '../block-lock'; | |
function ListViewBlockSelectButton( | ||
{ | ||
className, | ||
block: { clientId }, | ||
block, | ||
onClick, | ||
onToggleExpanded, | ||
tabIndex, | ||
|
@@ -38,6 +38,7 @@ function ListViewBlockSelectButton( | |
}, | ||
ref | ||
) { | ||
const { clientId } = block; | ||
const blockInformation = useBlockDisplayInformation( clientId ); | ||
const blockTitle = useBlockDisplayTitle( { | ||
clientId, | ||
|
@@ -60,6 +61,13 @@ function ListViewBlockSelectButton( | |
} | ||
} | ||
|
||
// This is a very annoying kind of exception. | ||
// Maybe we need to have a config that allows blocks | ||
// to have a different icon in the list view? | ||
if ( block.name === 'core/navigation-submenu' ) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should track this in #46166 if it goes ahead "as is". |
||
blockInformation.icon = customLink; | ||
} | ||
Comment on lines
+67
to
+69
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think as and when we do this we need to commit to making a follow up Issue. |
||
|
||
return ( | ||
<> | ||
<Button | ||
|
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.
Let's do some dependency inversion on this.
I think we could consider something akin to
__experimentalLabel
.Basically I'm suggesting a way to dynamically fetch the icon which the block is responsible for defining. Perhaps by passing in a
context
we can allow the block to determine which icon to display.