Skip to content

Refactor Link UI controls with better props #71515

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.

Sign up for GitHub

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

Merged
getdave merged 2 commits into from
Sep 5, 2025
Merged

Refactor Link UI controls with better props #71515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78374ec
Refactor Link UI controls with better props
getdave Sep 5, 2025
5e2d857
Tweak LinkUiTools rendering condition
getdave Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions packages/block-library/src/navigation-link/link-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function UnforwardedLinkUI( props, ref ) {
const [ addingPage, setAddingPage ] = useState( false );
const [ focusAddBlockButton, setFocusAddBlockButton ] = useState( false );
const [ focusAddPageButton, setFocusAddPageButton ] = useState( false );
const { canCreate: canCreatePage } = useResourcePermissions( {
const permissions = useResourcePermissions( {
kind: 'postType',
name: postType,
} );
Expand Down Expand Up @@ -142,8 +142,13 @@ function UnforwardedLinkUI( props, ref ) {
onChange={ props.onChange }
onRemove={ props.onRemove }
onCancel={ props.onCancel }
renderControlBottom={ () =>
! link?.url?.length && (
renderControlBottom={ () => {
// Don't show the tools when there is submitted link (preview state).
if ( link?.url?.length ) {
return null;
}

return (
<LinkUITools
focusAddBlockButton={ focusAddBlockButton }
focusAddPageButton={ focusAddPageButton }
Expand All @@ -155,11 +160,16 @@ function UnforwardedLinkUI( props, ref ) {
setAddingPage( true );
setFocusAddPageButton( false );
} }
blockEditingMode={ blockEditingMode }
canCreatePage={ canCreatePage }
canAddPage={
permissions?.canCreate &&
type === 'page'
}
canAddBlock={
blockEditingMode === 'default'
}
/>
)
}
);
} }
/>
</div>
) }
Expand Down Expand Up @@ -199,8 +209,8 @@ const LinkUITools = ( {
setAddingPage,
focusAddBlockButton,
focusAddPageButton,
canCreatePage,
blockEditingMode,
canAddPage,
Copy link
Contributor

@scruffian scruffian Sep 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change the name?

Copy link
Contributor Author

@getdave getdave Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistency with the other one and to distinguish it from the idea of permissions being the only thing that that is regulating the display.

canAddBlock,
} ) => {
const blockInserterAriaRole = 'listbox';
const addBlockButtonRef = useRef();
Expand All @@ -220,9 +230,14 @@ const LinkUITools = ( {
}
}, [ focusAddPageButton ] );

// Don't render anything if neither button should be shown
if ( ! canAddPage && ! canAddBlock ) {
return null;
}

return (
<VStack spacing={ 0 } className="link-ui-tools">
{ canCreatePage && (
{ canAddPage && (
<Button
__next40pxDefaultSize
ref={ addPageButtonRef }
Expand All @@ -236,7 +251,7 @@ const LinkUITools = ( {
{ __( 'Create page' ) }
</Button>
) }
{ blockEditingMode === 'default' && (
{ canAddBlock && (
<Button
__next40pxDefaultSize
ref={ addBlockButtonRef }
Expand Down
Loading