Skip to content
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

Jump to bottom

Media & Text block: Remove the link option when the featured image is used #60510

Merged
merged 12 commits into from
May 31, 2024
Merged

Media & Text block: Remove the link option when the featured image is used #60510

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
347546b
Media & Text block: Fix the linked featured image
carolinan Apr 5, 2024
fa31749
Merge branch 'trunk' into update/media-text-linked-featured-image
carolinan Apr 12, 2024
9a93cb2
Merge branch 'trunk' into update/media-text-linked-featured-image
carolinan Apr 12, 2024
da8be98
Hide the toolbar link control when the featured image is used
carolinan Apr 22, 2024
97f85d7
Add the Link to Post option and the markup for the link
carolinan Apr 22, 2024
fdaacf9
Target the tag with the class `wp-block-media-text__media` instead of…
carolinan Apr 22, 2024
7061bf8
Update fixtures.
carolinan Apr 22, 2024
2c4d2f3
Merge branch 'trunk' into update/media-text-linked-featured-image
carolinan May 23, 2024
e0d8001
Place the link to post ToggleControl inside a ToolsPanelItem
carolinan May 23, 2024
6e50c3b
Merge branch 'trunk' into update/media-text-linked-featured-image
carolinan May 27, 2024
4be997e
Remove functionality related to the link toggle option
carolinan May 29, 2024
cd5e3f8
Merge branch 'trunk' into update/media-text-linked-featured-image
carolinan May 31, 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
14 changes: 8 additions & 6 deletions packages/block-library/src/media-text/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ function MediaTextEdit( {
mediaId: undefined,
mediaUrl: undefined,
mediaAlt: undefined,
mediaLink: undefined,
linkDestination: undefined,
linkTarget: undefined,
linkClass: undefined,
rel: undefined,
href: undefined,
useFeaturedImage: ! useFeaturedImage,
} );
};
Expand Down Expand Up @@ -446,17 +452,13 @@ function MediaTextEdit( {
</>
) }

{ mediaType === 'image' && (
{ mediaType === 'image' && ! useFeaturedImage && (
<ImageURLInputUI
url={ href || '' }
onChangeUrl={ onSetHref }
linkDestination={ linkDestination }
mediaType={ mediaType }
mediaUrl={
useFeaturedImage && featuredImageURL
? featuredImageURL
: image && image.source_url
}
mediaUrl={ image && image.source_url }
mediaLink={ image && image.link }
linkTarget={ linkTarget }
linkClass={ linkClass }
Expand Down
Loading