Add featured image to Media & Text block #51491
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
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 |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ import { | |
| } from '@wordpress/components'; | ||
| import { isBlobURL, getBlobTypeByURL } from '@wordpress/blob'; | ||
| import { pullLeft, pullRight } from '@wordpress/icons'; | ||
| import { useEntityProp, store as coreStore } from '@wordpress/core-data'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
|
|
@@ -127,7 +127,12 @@ function attributesFromMedia( { | |
| }; | ||
| } | ||
|
|
||
| function MediaTextEdit( { | ||
| attributes, | ||
| isSelected, | ||
| setAttributes, | ||
| context: { postId, postType }, | ||
| } ) { | ||
| const { | ||
| focalPoint, | ||
| href, | ||
|
|
@@ -145,9 +150,42 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) { | |
| rel, | ||
| verticalAlignment, | ||
| allowedBlocks, | ||
| useFeaturedImage, | ||
| } = attributes; | ||
| const mediaSizeSlug = attributes.mediaSizeSlug || DEFAULT_MEDIA_SIZE_SLUG; | ||
|
|
||
| const [ featuredImage ] = useEntityProp( | ||
| 'postType', | ||
| postType, | ||
| 'featured_media', | ||
| postId | ||
| ); | ||
|
|
||
| const featuredImageMedia = useSelect( | ||
| ( select ) => | ||
| featuredImage && | ||
| select( coreStore ).getMedia( featuredImage, { context: 'view' } ), | ||
| [ featuredImage ] | ||
| ); | ||
|
|
||
| const featuredImageURL = useFeaturedImage | ||
| ? featuredImageMedia?.source_url | ||
| : ''; | ||
| const featuredImageAlt = useFeaturedImage | ||
| ? featuredImageMedia?.alt_text | ||
| : ''; | ||
|
|
||
| const toggleUseFeaturedImage = () => { | ||
| setAttributes( { | ||
| imageFill: false, | ||
| mediaType: 'image', | ||
|
There was a problem hiding this comment. If we set
However, I do know that the There was a problem hiding this comment. By setting We should be able to use There was a problem hiding this comment. Thank you. |
||
| mediaId: undefined, | ||
| mediaUrl: undefined, | ||
| mediaAlt: undefined, | ||
| useFeaturedImage: ! useFeaturedImage, | ||
| } ); | ||
| }; | ||
|
|
||
| const { imageSizes, image } = useSelect( | ||
| ( select ) => { | ||
| const { getSettings } = select( blockEditorStore ); | ||
|
|
@@ -252,24 +290,30 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) { | |
| } | ||
| /> | ||
| ) } | ||
| { imageFill && | ||
| ( mediaUrl || featuredImageURL ) && | ||
| mediaType === 'image' && ( | ||
| <FocalPointPicker | ||
| __nextHasNoMarginBottom | ||
| label={ __( 'Focal point picker' ) } | ||
| url={ | ||
| useFeaturedImage && featuredImageURL | ||
| ? featuredImageURL | ||
| : mediaUrl | ||
| } | ||
| value={ focalPoint } | ||
| onChange={ ( value ) => | ||
| setAttributes( { focalPoint: value } ) | ||
| } | ||
| onDragStart={ imperativeFocalPointPreview } | ||
| onDrag={ imperativeFocalPointPreview } | ||
| /> | ||
| ) } | ||
| { mediaType === 'image' && ( mediaUrl || featuredImageURL ) && ( | ||
| <TextareaControl | ||
| __nextHasNoMarginBottom | ||
| label={ __( 'Alternative text' ) } | ||
| value={ mediaAlt || featuredImageAlt } | ||
draganescu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| onChange={ onMediaAltChange } | ||
| help={ | ||
| <> | ||
|
|
@@ -293,7 +337,7 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) { | |
| ) } | ||
| /> | ||
| ) } | ||
| { ( mediaUrl || featuredImageURL ) && ( | ||
| <RangeControl | ||
| __nextHasNoMarginBottom | ||
| label={ __( 'Media width' ) } | ||
|
|
@@ -353,7 +397,11 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) { | |
| onChangeUrl={ onSetHref } | ||
| linkDestination={ linkDestination } | ||
| mediaType={ mediaType } | ||
| mediaUrl={ | ||
| useFeaturedImage && featuredImageURL | ||
| ? featuredImageURL | ||
| : image && image.source_url | ||
| } | ||
| mediaLink={ image && image.link } | ||
| linkTarget={ linkTarget } | ||
| linkClass={ linkClass } | ||
|
|
@@ -370,6 +418,7 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) { | |
| commitWidthChange={ commitWidthChange } | ||
| ref={ refMediaContainer } | ||
| enableResize={ blockEditingMode === 'default' } | ||
| toggleUseFeaturedImage={ toggleUseFeaturedImage } | ||
| { ...{ | ||
| focalPoint, | ||
| imageFill, | ||
|
|
@@ -381,6 +430,9 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) { | |
| mediaType, | ||
| mediaUrl, | ||
| mediaWidth, | ||
| useFeaturedImage, | ||
| featuredImageURL, | ||
| featuredImageAlt, | ||
| } } | ||
| /> | ||
| { mediaPosition !== 'right' && <div { ...innerBlocksProps } /> } | ||
|
|
||
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,65 @@ | ||
| <?php | ||
| /** | ||
| * Server-side rendering of the `core/media-text` block. | ||
| * | ||
| * @package WordPress | ||
| */ | ||
|
|
||
| /** | ||
| * Renders the `core/media-text` block on server. | ||
| * | ||
| * @param array $attributes The block attributes. | ||
| * @param string $content The block rendered content. | ||
| * | ||
| * @return string Returns the Media & Text block markup, if useFeaturedImage is true. | ||
| */ | ||
| function render_block_core_media_text( $attributes, $content ) { | ||
| if ( false === $attributes['useFeaturedImage'] ) { | ||
| return $content; | ||
| } | ||
|
|
||
| if ( in_the_loop() ) { | ||
| update_post_thumbnail_cache(); | ||
| } | ||
|
|
||
| $current_featured_image = get_the_post_thumbnail_url(); | ||
| if ( ! $current_featured_image ) { | ||
| return $content; | ||
| } | ||
|
|
||
| $processor = new WP_HTML_Tag_Processor( $content ); | ||
| if ( isset( $attributes['imageFill'] ) && $attributes['imageFill'] ) { | ||
| if ( isset( $attributes['focalPoint'] ) ) { | ||
| $position = round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%'; | ||
| } else { | ||
| $position = '50% 50%'; | ||
| } | ||
carolinan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $processor->next_tag( 'figure' ); | ||
| $processor->set_attribute( 'style', 'background-image:url(' . esc_url( $current_featured_image ) . ');background-position:' . $position . ';' ); | ||
| } | ||
| $processor->next_tag( 'img' ); | ||
| $media_size_slug = 'full'; | ||
| if ( isset( $attributes['mediaSizeSlug'] ) ) { | ||
| $media_size_slug = $attributes['mediaSizeSlug']; | ||
| } | ||
| $processor->set_attribute( 'src', esc_url( $current_featured_image ) ); | ||
| $processor->set_attribute( 'alt', esc_attr( $processor->get_attribute( 'alt' ) ) ); | ||
carolinan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $processor->set_attribute( 'class', 'wp-image-' . get_post_thumbnail_id() . ' size-' . $media_size_slug ); | ||
|
|
||
| $content = $processor->get_updated_html(); | ||
|
|
||
| return $content; | ||
| } | ||
|
|
||
| /** | ||
| * Registers the `core/media-text` block renderer on server. | ||
| */ | ||
| function register_block_core_media_text() { | ||
| register_block_type_from_metadata( | ||
| __DIR__ . '/media-text', | ||
| array( | ||
| 'render_callback' => 'render_block_core_media_text', | ||
| ) | ||
| ); | ||
| } | ||
| add_action( 'init', 'register_block_core_media_text' ); | ||
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.
Since we check for
featuredImageURLandfeaturedImageAltasboolin many places can we set them tofalseif they have no value? IMO the way JS saysfalse || ''isfalseis better if we default to testing forfalse? Is there any downside?Alternatively we could make
hasFeaturedImageAltandhasFeaturedImageURL, respectively. set to!== '', then use these inboolchecks 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.
I tried this, but it meant that the alt text was set to the string "false" instead of being empty when:
It shows the text "false" inside the alt text option in the editor, and in the attribute.
So this condition on line 316 also needs to be updated.
value={ mediaAlt || featuredImageAlt }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.
@draganescu I think I did not fully understand what to do here.
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.
It means we need the empty string, In which case it means we should not check for
value={ mediaAlt || featuredImageAlt }later but instead forvalue={ mediaAlt || featuredImageAlt !== '' }. That's it :)