-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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
Add link rel and link class to image block inspector (see #7504) #7771
Merged
Merged
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
bde8135
Add link classes and rel attribute to image block (see #7504)
bedb73c
Make labels consistent with classic editor.
3c6f9da
Fix coding standards error
dfff33c
Add tests
c5bfce5
Consolidate check for presence of image link
41bd3d9
Rebase, incorporate upstream changes
d538faf
Merge branch 'upstream' into add/image-details
976f59d
Merge branch 'master' into add/image-details
05e7ebf
Changes as per review
3b5dc11
Merge branch 'upstream' into add/image-details
38f669a
Fix tests
b4e4409
Merge branch 'upstream' into add/image-details
df50d10
Merge branch 'upstream' into add/image-details
48dc15f
Resolve final review comment
2b44182
Update CONTRIBUTORS.md
1b14c6c
Merge branch 'upstream' into add/image-details
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
3 changes: 3 additions & 0 deletions
3
test/integration/full-content/fixtures/core__image__custom-link-class.html
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,3 @@ | ||
<!-- wp:core/image {"linkDestination":"custom"} --> | ||
<figure class="wp-block-image"><a class="custom-link" href="https://wordpress.org/"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt="" /></a></figure> | ||
<!-- /wp:core/image --> |
17 changes: 17 additions & 0 deletions
17
test/integration/full-content/fixtures/core__image__custom-link-class.json
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,17 @@ | ||
[ | ||
{ | ||
"clientId": "_clientId_0", | ||
"name": "core/image", | ||
"isValid": true, | ||
"attributes": { | ||
"url": "https://cldup.com/uuUqE_dXzy.jpg", | ||
"alt": "", | ||
"caption": "", | ||
"href": "https://wordpress.org/", | ||
"linkDestination": "custom", | ||
"linkClass": "custom-link" | ||
}, | ||
"innerBlocks": [], | ||
"originalContent": "<figure class=\"wp-block-image\"><a class=\"custom-link\" href=\"https://wordpress.org/\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"\" /></a></figure>" | ||
} | ||
] |
22 changes: 22 additions & 0 deletions
22
test/integration/full-content/fixtures/core__image__custom-link-class.parsed.json
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,22 @@ | ||
[ | ||
{ | ||
"blockName": "core/image", | ||
"attrs": { | ||
"linkDestination": "custom" | ||
}, | ||
"innerBlocks": [], | ||
"innerHTML": "\n<figure class=\"wp-block-image\"><a class=\"custom-link\" href=\"https://wordpress.org/\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"\" /></a></figure>\n", | ||
"innerContent": [ | ||
"\n<figure class=\"wp-block-image\"><a class=\"custom-link\" href=\"https://wordpress.org/\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"\" /></a></figure>\n" | ||
] | ||
}, | ||
{ | ||
"attrs": {}, | ||
"blockName": null, | ||
"innerBlocks": [], | ||
"innerHTML": "\n", | ||
"innerContent": [ | ||
"\n" | ||
] | ||
} | ||
] |
3 changes: 3 additions & 0 deletions
3
test/integration/full-content/fixtures/core__image__custom-link-class.serialized.html
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,3 @@ | ||
<!-- wp:image {"linkDestination":"custom"} --> | ||
<figure class="wp-block-image"><a class="custom-link" href="https://wordpress.org/"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt=""/></a></figure> | ||
<!-- /wp:image --> |
3 changes: 3 additions & 0 deletions
3
test/integration/full-content/fixtures/core__image__custom-link-rel.html
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,3 @@ | ||
<!-- wp:core/image {"linkDestination":"custom"} --> | ||
<figure class="wp-block-image"><a href="https://wordpress.org/" rel="external"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt="" /></a></figure> | ||
<!-- /wp:core/image --> |
17 changes: 17 additions & 0 deletions
17
test/integration/full-content/fixtures/core__image__custom-link-rel.json
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,17 @@ | ||
[ | ||
{ | ||
"clientId": "_clientId_0", | ||
"name": "core/image", | ||
"isValid": true, | ||
"attributes": { | ||
"url": "https://cldup.com/uuUqE_dXzy.jpg", | ||
"alt": "", | ||
"caption": "", | ||
"href": "https://wordpress.org/", | ||
"linkDestination": "custom", | ||
"rel": "external" | ||
}, | ||
"innerBlocks": [], | ||
"originalContent": "<figure class=\"wp-block-image\"><a href=\"https://wordpress.org/\" rel=\"external\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"\" /></a></figure>" | ||
} | ||
] |
22 changes: 22 additions & 0 deletions
22
test/integration/full-content/fixtures/core__image__custom-link-rel.parsed.json
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,22 @@ | ||
[ | ||
{ | ||
"blockName": "core/image", | ||
"attrs": { | ||
"linkDestination": "custom" | ||
}, | ||
"innerBlocks": [], | ||
"innerHTML": "\n<figure class=\"wp-block-image\"><a href=\"https://wordpress.org/\" rel=\"external\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"\" /></a></figure>\n", | ||
"innerContent": [ | ||
"\n<figure class=\"wp-block-image\"><a href=\"https://wordpress.org/\" rel=\"external\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"\" /></a></figure>\n" | ||
] | ||
}, | ||
{ | ||
"attrs": {}, | ||
"blockName": null, | ||
"innerBlocks": [], | ||
"innerHTML": "\n", | ||
"innerContent": [ | ||
"\n" | ||
] | ||
} | ||
] |
3 changes: 3 additions & 0 deletions
3
test/integration/full-content/fixtures/core__image__custom-link-rel.serialized.html
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,3 @@ | ||
<!-- wp:image {"linkDestination":"custom"} --> | ||
<figure class="wp-block-image"><a href="https://wordpress.org/" rel="external"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt=""/></a></figure> | ||
<!-- /wp:image --> |
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.
I wonder if this change creates an "invalid image" warning if you try to upgrade from an image with a link set to open a new tab.
The image shouldn't show up as invalid. I wonder if we should add a deprecated version for this?
To clarify: I didn't have the time to test it but it's a guess.
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 took this for a spin, and things look like they are working as intended.
Screenshot from master:
Checked out this branch and reloaded:
I suspect the problem only occurs when you go the other way. Which is adding the attributes, then checking out a branch that removes them. And sure enough:
Going back to master:
But this shouldn't be a problem unless we choose to remove this feature :D
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.
Checked again, this time I checkout master first, and set the open externally and added a custom link:
Checking out this branch and reloading still worked as expected:
👍 👍
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.
Thanks for the tests @jasmussen :)