Skip to content

feat: clarify label & add help text with link #70451

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
Mamaduka merged 17 commits into from
Sep 16, 2025
Merged

feat: clarify label & add help text with link #70451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9a1a576
feat: restore code
coderGtm Jun 10, 2025
95ebc0d
feat: clarify label & add help text with link
coderGtm Jun 17, 2025
7a0e65c
i18n: remove en-US preset from doc link
coderGtm Jun 17, 2025
87d4657
Merge branch 'WordPress:trunk' into trunk
coderGtm Jun 20, 2025
3c8418a
Merge branch 'WordPress:trunk' into fix/link-rel-text
coderGtm Jun 20, 2025
df5efda
Merge remote-tracking branch 'upstream/trunk' into trunk
coderGtm Sep 1, 2025
0047bd8
Merge branch 'trunk' into fix/link-rel-text
coderGtm Sep 1, 2025
6288f0e
Merge branch 'WordPress:trunk' into fix/link-rel-text
coderGtm Sep 1, 2025
6d46aee
Merge branch 'fix/link-rel-text' of https://github.com/coderGtm/guten…
coderGtm Sep 1, 2025
9c17788
fix: replace span with react fragment
coderGtm Sep 1, 2025
fcf900b
fix: remove unrelated changes
coderGtm Sep 5, 2025
31b697b
Merge remote-tracking branch 'upstream/trunk' into fix/link-rel-text
coderGtm Sep 8, 2025
2b71099
feat: update all 'Link rel' label to 'Link Relation' and add help text
coderGtm Sep 8, 2025
866c08d
Merge remote-tracking branch 'upstream/trunk' into fix/link-rel-text
coderGtm Sep 8, 2025
a2bafbd
refactor: update help text for 'Link Relation' to use interpolated el…
coderGtm Sep 10, 2025
83ef20b
fix: standardize label casing for 'Link Relation' to 'Link relation'
coderGtm Sep 15, 2025
2c610ef
refactor: use 'a' as the link placeholder instead of 'linkRel'
coderGtm Sep 15, 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
20 changes: 18 additions & 2 deletions packages/block-editor/src/components/url-popover/image-url-input-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { useRef, useEffect, useState } from '@wordpress/element';
import {
useRef,
useEffect,
useState,
createInterpolateElement,
} from '@wordpress/element';
import { focus } from '@wordpress/dom';
import {
ToolbarButton,
Expand All @@ -12,6 +17,7 @@ import {
ToggleControl,
TextControl,
__experimentalVStack as VStack,
ExternalLink,
} from '@wordpress/components';
import {
Icon,
Expand Down Expand Up @@ -230,9 +236,19 @@ const ImageURLInputUI = ( {
<TextControl
__next40pxDefaultSize
__nextHasNoMarginBottom
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
value={ rel ?? '' }
onChange={ onSetLinkRel }
help={ createInterpolateElement(
__(
'The <a>Link Relation</a> attribute defines the relationship between a linked resource and the current document.'
),
{
a: (
<ExternalLink href="https://developer.mozilla.org/docs/Web/HTML/Attributes/rel" />
),
}
) }
/>
<TextControl
__next40pxDefaultSize
Expand Down
13 changes: 12 additions & 1 deletion packages/block-library/src/button/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
TextControl,
ToolbarButton,
Popover,
ExternalLink,
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
__experimentalToggleGroupControl as ToggleGroupControl,
Expand Down Expand Up @@ -474,7 +475,17 @@ function ButtonEdit( props ) {
<TextControl
__next40pxDefaultSize
__nextHasNoMarginBottom
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
help={ createInterpolateElement(
__(
'The <a>Link Relation</a> attribute defines the relationship between a linked resource and the current document.'
),
{
a: (
<ExternalLink href="https://developer.mozilla.org/docs/Web/HTML/Attributes/rel" />
),
}
) }
value={ rel || '' }
onChange={ ( newRel ) =>
setAttributes( { rel: newRel } )
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/button/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function ButtonEdit( props ) {
label: __( 'Open in new tab' ),
},
linkRel: {
label: __( 'Link Rel' ),
label: __( 'Link relation' ),
placeholder: _x( 'None', 'Link rel attribute value placeholder' ),
},
};
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/image/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function LinkSettings( {
label: __( 'Open in new tab' ),
},
linkRel: {
label: __( 'Link Rel' ),
label: __( 'Link relation' ),
placeholder: _x( 'None', 'Link rel attribute value placeholder' ),
},
};
Expand Down
22 changes: 19 additions & 3 deletions packages/block-library/src/post-featured-image/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
Button,
Spinner,
TextControl,
ExternalLink,
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
} from '@wordpress/components';
Expand All @@ -30,7 +31,12 @@ import {
privateApis as blockEditorPrivateApis,
store as blockEditorStore,
} from '@wordpress/block-editor';
import { useMemo, useEffect, useState } from '@wordpress/element';
import {
useMemo,
useEffect,
useState,
createInterpolateElement,
} from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';
import { upload } from '@wordpress/icons';
import { store as noticesStore } from '@wordpress/notices';
Expand Down Expand Up @@ -316,7 +322,7 @@ export default function PostFeaturedImageEdit( {
) }
{ isLink && (
<ToolsPanelItem
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
isShownByDefault
hasValue={ () => !! rel }
onDeselect={ () =>
Expand All @@ -328,7 +334,17 @@ export default function PostFeaturedImageEdit( {
<TextControl
__next40pxDefaultSize
__nextHasNoMarginBottom
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
help={ createInterpolateElement(
__(
'The <a>Link Relation</a> attribute defines the relationship between a linked resource and the current document.'
),
{
a: (
<ExternalLink href="https://developer.mozilla.org/docs/Web/HTML/Attributes/rel" />
),
}
) }
value={ rel }
onChange={ ( newRel ) =>
setAttributes( { rel: newRel } )
Expand Down
16 changes: 14 additions & 2 deletions packages/block-library/src/post-title/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ import {
import {
ToggleControl,
TextControl,
ExternalLink,
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
import { useEntityProp, store as coreStore } from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';
import { createInterpolateElement } from '@wordpress/element';

/**
* Internal dependencies
Expand Down Expand Up @@ -205,7 +207,7 @@ export default function PostTitleEdit( {
/>
</ToolsPanelItem>
<ToolsPanelItem
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
isShownByDefault
hasValue={ () => !! rel }
onDeselect={ () =>
Expand All @@ -215,7 +217,17 @@ export default function PostTitleEdit( {
<TextControl
__next40pxDefaultSize
__nextHasNoMarginBottom
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
help={ createInterpolateElement(
__(
'The <a>Link Relation</a> attribute defines the relationship between a linked resource and the current document.'
),
{
a: (
<ExternalLink href="https://developer.mozilla.org/docs/Web/HTML/Attributes/rel" />
),
}
) }
value={ rel }
onChange={ ( newRel ) =>
setAttributes( { rel: newRel } )
Expand Down
15 changes: 13 additions & 2 deletions packages/block-library/src/rss/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ import {
ToggleControl,
ToolbarGroup,
TextControl,
ExternalLink,
__experimentalInputControl as InputControl,
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
} from '@wordpress/components';
import { useState } from '@wordpress/element';
import { createInterpolateElement, useState } from '@wordpress/element';
import { grid, list, edit, rss } from '@wordpress/icons';
import { __, _x } from '@wordpress/i18n';
import { prependHTTP } from '@wordpress/url';
Expand Down Expand Up @@ -301,7 +302,17 @@ export default function RSSEdit( { attributes, setAttributes } ) {
<TextControl
__next40pxDefaultSize
__nextHasNoMarginBottom
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
help={ createInterpolateElement(
__(
'The <a>Link Relation</a> attribute defines the relationship between a linked resource and the current document.'
),
{
a: (
<ExternalLink href="https://developer.mozilla.org/docs/Web/HTML/Attributes/rel" />
),
}
) }
value={ rel || '' }
onChange={ ( value ) => setAttributes( { rel: value } ) }
/>
Expand Down
15 changes: 13 additions & 2 deletions packages/block-library/src/social-link/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ import {
useBlockProps,
store as blockEditorStore,
} from '@wordpress/block-editor';
import { useState, useRef } from '@wordpress/element';
import { useState, useRef, createInterpolateElement } from '@wordpress/element';
import {
Icon,
Button,
Dropdown,
TextControl,
ToolbarButton,
ExternalLink,
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,
Expand Down Expand Up @@ -243,7 +244,17 @@ const SocialLinkEdit = ( {
<TextControl
__next40pxDefaultSize
__nextHasNoMarginBottom
label={ __( 'Link rel' ) }
label={ __( 'Link relation' ) }
help={ createInterpolateElement(
__(
'The <a>Link Relation</a> attribute defines the relationship between a linked resource and the current document.'
),
{
a: (
<ExternalLink href="https://developer.mozilla.org/docs/Web/HTML/Attributes/rel" />
),
}
) }
value={ rel || '' }
onChange={ ( value ) => setAttributes( { rel: value } ) }
/>
Expand Down
Loading