Raw handling: preserve image ID #6638
Merged
Conversation
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
aduth
approved these changes
May 10, 2018
blocks/api/raw-handling/utils.js
Outdated
| ); | ||
| Array.from( node.classList ).forEach( ( name ) => { | ||
| if ( find( classes, ( item ) => { | ||
| return typeof item === 'string' ? item === name : item.test( name ); |
There was a problem hiding this comment.
I had trouble interpreting this return as not being part of the forEach but rather an inline predicate for the find. Can we extract this out? Or maybe normalize the classes schema item to a function?
classes = classes.map( ( item ) => {
if ( typeof item === 'string' ) {
return ( className ) => className === item;
} else if ( item instanceof RegExp ) {
return ( className ) => item.test( className );
}
} );
// ...
const newArray.from( node.classList ).forEach( ( name ) => {
if ( ! classes.some( ( isMatch ) => isMatch( name ) ) {
node.classList.remove( name );
}
} );
core-blocks/image/index.js
Outdated
| @@ -61,7 +61,7 @@ const blockAttributes = { | |||
| const imageSchema = { | |||
| img: { | |||
| attributes: [ 'src', 'alt' ], | |||
| classes: [ 'alignleft', 'aligncenter', 'alignright', 'alignnone' ], | |||
| classes: [ 'alignleft', 'aligncenter', 'alignright', 'alignnone', /wp-image-\d+/ ], | |||
There was a problem hiding this comment.
Valid image class: the-dog-yawp-image-1 ?
core-blocks/image/index.js
Outdated
| @@ -101,10 +101,13 @@ export const settings = { | |||
| isMatch: ( node ) => node.nodeName === 'FIGURE' && !! node.querySelector( 'img' ), | |||
| schema, | |||
| transform: ( node ) => { | |||
| const matches = /align(left|center|right)/.exec( node.className ); | |||
| const align = matches ? matches[ 1 ] : undefined; | |||
| const className = node.className + ' ' + node.querySelector( 'img' ).className; | |||
There was a problem hiding this comment.
What is being done here with the concatenation?
Can you add an inline comment?
There was a problem hiding this comment.
Yes, I'll add a comment. The class we need here is on the image, and for alignment it would be good to look at both the image and figure. Doesn't hurt.
mtias
added
the
[Feature] Media
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
When copy pasting an image from the old editor, or converting a classic block to blocks, image IDs are dropped. We should preserve this information so the the correct image is selected in the media library on editing the image, and so that the image is made responsive on the front-end.
How has this been tested?
Convert some old WP content to blocks.
Screenshots
Types of changes
Checklist: