-
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
Move linkUI to own custom appender in navigation block #68109
Open
jeryj
wants to merge
14
commits into
trunk
Choose a base branch
from
update/navigation-custom-appender
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+262
−240
Open
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
96f01f3
Move linkUI to own custom appender in navigation block
jeryj 8ff71d7
Create link or block from NavigationLinkAppender
jeryj eb97366
Create own file for NavigationLinkAppender and add to submenu navigat…
jeryj f0bf361
Remove openedBy ref from submenus
jeryj 3d6c8a8
Move navigation block tests to steps
jeryj d328bad
Add back in functionality to remove empty links
jeryj 6b8867b
Pass navigation block id as the root client Id so the right blocks sh…
jeryj f53e571
Fix appender insertion order via quick inserter
jeryj 18cfff0
Update tests for closing link overlay to go straight to appender
jeryj 01d0e68
Close link ui after insertion
7ad1633
Open link ui when added
9bd8fd3
Fix duplicate locator issue in test
jeryj 9e0ec83
Focus link on popover close when newly added
jeryj e47dec2
Do not open popover if just added and url-like label
jeryj 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
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 |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/** | ||
* WordPress dependencies | ||
*/ | ||
import { useDispatch } from '@wordpress/data'; | ||
import { useState, useRef } from '@wordpress/element'; | ||
import { store as blockEditorStore } from '@wordpress/block-editor'; | ||
import { Icon, plus } from '@wordpress/icons'; | ||
import { Button } from '@wordpress/components'; | ||
import { createBlock } from '@wordpress/blocks'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import { LinkUI } from './link-ui'; | ||
import { updateAttributes } from './update-attributes'; | ||
|
||
export default function NavigationLinkAppender( { rootClientId } ) { | ||
const { insertBlock } = useDispatch( blockEditorStore ); | ||
const [ isLinkOpen, setIsLinkOpen ] = useState( false ); | ||
const [ popoverAnchor, setPopoverAnchor ] = useState( null ); | ||
const linkUIref = useRef(); | ||
|
||
const createNewLink = ( attributes ) => { | ||
const block = createBlock( 'core/navigation-link', attributes ); | ||
|
||
insertBlock( block, undefined, rootClientId ); | ||
}; | ||
|
||
return ( | ||
<> | ||
<Button | ||
__next40pxDefaultSize | ||
ref={ setPopoverAnchor } | ||
className="block-editor-button-block-appender" | ||
onClick={ () => setIsLinkOpen( ( state ) => ! state ) } | ||
aria-haspopup | ||
aria-expanded={ isLinkOpen } | ||
label="Add block" | ||
showTooltip | ||
> | ||
<Icon icon={ plus } /> | ||
</Button> | ||
{ isLinkOpen && ( | ||
<LinkUI | ||
ref={ linkUIref } | ||
clientId={ rootClientId } | ||
link={ { | ||
url: undefined, | ||
label: undefined, | ||
id: undefined, | ||
kind: undefined, | ||
type: undefined, | ||
opensInNewTab: false, | ||
} } | ||
onClose={ () => { | ||
setIsLinkOpen( false ); | ||
} } | ||
onChange={ ( updatedValue ) => { | ||
updateAttributes( updatedValue, createNewLink ); | ||
} } | ||
anchor={ popoverAnchor } | ||
/> | ||
) } | ||
</> | ||
); | ||
} |
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
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.
This wrapper should get removed. It was added while exploring a previous route.