Skip to content

Add token UI concept to Link UI #57755

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

Closed
getdave wants to merge 3 commits into from
Closed

Add token UI concept to Link UI #57755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fec385a
Show link preview on edit view
getdave Jan 11, 2024
0dab64d
Conditionally display Link field and Preview
getdave Jan 11, 2024
9f0acdc
Rename the search field at all times
getdave Jan 11, 2024
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
72 changes: 37 additions & 35 deletions packages/block-editor/src/components/link-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,7 @@ function LinkControl( {

const currentInputIsEmpty = ! currentUrlInputValue?.trim()?.length;

const shownUnlinkControl =
onRemove && value && ! isEditingLink && ! isCreatingPage;
const shownUnlinkControl = onRemove && value && ! isCreatingPage;

const showActions = isEditingLink && hasLinkValue;

Expand All @@ -356,6 +355,41 @@ function LinkControl( {
</div>
) }

{ hasLinkValue && ! isCreatingPage && (
<LinkPreview
key={ value?.url } // force remount when URL changes to avoid race conditions for rich previews
value={ value }
isEditing={ isEditing }
onEditClick={ () => setIsEditingLink( true ) }
hasRichPreviews={ hasRichPreviews }
hasUnlinkControl={ shownUnlinkControl }
additionalControls={ () => {
// Expose the "Opens in new tab" settings in the preview
// as it is the most common setting to change.
if (
! isEditing &&
settings?.find(
( setting ) => setting.id === 'opensInNewTab'
)
) {
return (
<LinkSettings
value={ internalControlValue }
settings={ settings?.filter(
( { id } ) => id === 'opensInNewTab'
) }
onChange={ onChange }
/>
);
}
} }
onRemove={ () => {
onRemove();
setIsEditingLink( true );
} }
/>
) }

{ isEditing && (
<>
<div
Expand All @@ -377,6 +411,7 @@ function LinkControl( {
size="__unstable-large"
/>
) }

<LinkControlSearchInput
currentLink={ value }
className="block-editor-link-control__field block-editor-link-control__search-input"
Expand Down Expand Up @@ -420,39 +455,6 @@ function LinkControl( {
</>
) }

{ value && ! isEditingLink && ! isCreatingPage && (
<LinkPreview
key={ value?.url } // force remount when URL changes to avoid race conditions for rich previews
value={ value }
onEditClick={ () => setIsEditingLink( true ) }
hasRichPreviews={ hasRichPreviews }
hasUnlinkControl={ shownUnlinkControl }
additionalControls={ () => {
// Expose the "Opens in new tab" settings in the preview
// as it is the most common setting to change.
if (
settings?.find(
( setting ) => setting.id === 'opensInNewTab'
)
) {
return (
<LinkSettings
value={ internalControlValue }
settings={ settings?.filter(
( { id } ) => id === 'opensInNewTab'
) }
onChange={ onChange }
/>
);
}
} }
onRemove={ () => {
onRemove();
setIsEditingLink( true );
} }
/>
) }

{ showSettings && (
<div className="block-editor-link-control__tools">
{ ! currentInputIsEmpty && (
Expand Down
3 changes: 3 additions & 0 deletions packages/block-editor/src/components/link-control/link-preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default function LinkPreview( {
hasUnlinkControl = false,
onRemove,
additionalControls,
isEditing,
} ) {
// Avoid fetching if rich previews are not desired.
const showRichPreviews = hasRichPreviews ? value?.url : null;
Expand Down Expand Up @@ -120,7 +121,9 @@ export default function LinkPreview( {
className="block-editor-link-control__search-item-action"
onClick={ onEditClick }
size="compact"
disabled={ isEditing }
/>

{ hasUnlinkControl && (
<Button
icon={ linkOff }
Expand Down
1 change: 1 addition & 0 deletions packages/block-editor/src/components/link-control/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ $block-editor-link-control-number-of-actions: 1;
width: 100%;
cursor: default;
padding: $grid-unit-20;
border-bottom: 1px solid $gray-200;
}

.block-editor-link-control__search-item-header {
Expand Down