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

Media & Text Block: Add image fill option #14445

Merged
merged 14 commits into from
Apr 3, 2019
Merged

Media & Text Block: Add image fill option #14445

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3957907
Add image fill option to Media & Text block
frontdevde Mar 14, 2019
d927670
Update label copy
frontdevde Mar 21, 2019
a8221bd
Move imageFillStyles inline
frontdevde Mar 29, 2019
7ebbe4b
Use identical semantic structure for both image and imageFill
frontdevde Mar 29, 2019
f9eec3d
Reset attributes on onSelectMedia
frontdevde Mar 29, 2019
8636fea
Ensure attributes are reset properly
frontdevde Apr 1, 2019
c115077
Remove default for imageFill to prevent tests failing
frontdevde Apr 1, 2019
384ac16
Add fixtures for image fill tests with/without focal point selected
frontdevde Apr 1, 2019
242498e
Visually hide the image but make it accessible to assistive technolo…
frontdevde Apr 1, 2019
e8e03b3
Remove unnecessary deprecation
frontdevde Apr 3, 2019
4aea210
Update changelog
frontdevde Apr 3, 2019
f3d3640
Merge branch 'master' into update/media-text-block-image-fill
frontdevde Apr 3, 2019
b382d74
Change default background-position to 50%/50% and update fixtures
frontdevde Apr 3, 2019
6c4a388
Updated the transforms snapshot.
jorgefilipecosta Apr 3, 2019
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
Prev Previous commit
Next Next commit
Add fixtures for image fill tests with/without focal point selected
  • Loading branch information
@frontdevde
frontdevde committed Apr 3, 2019
commit 384ac1619291016f8a3d7d1a7f929b4aab57778c
13 changes: 13 additions & 0 deletions packages/e2e-tests/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- wp:media-text {"mediaId":11,"mediaType":"image","imageFill":true} -->
<div class="wp-block-media-text alignwide is-image-fill">
<figure class="wp-block-media-text__media"
style="background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:initial">
<img src="http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg" alt="My alt text"
class="wp-image-11" /></figure>
<div class="wp-block-media-text__content">
<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
<p class="has-large-font-size">My Content</p>
<!-- /wp:paragraph -->
</div>
</div>
<!-- /wp:media-text -->
34 changes: 34 additions & 0 deletions packages/e2e-tests/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[
{
"clientId": "_clientId_0",
"name": "core/media-text",
"isValid": true,
"attributes": {
"align": "wide",
"mediaAlt": "My alt text",
"mediaPosition": "left",
"mediaId": 11,
"mediaUrl": "http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg",
"mediaType": "image",
"mediaWidth": 50,
"isStackedOnMobile": false,
"imageFill": true
},
"innerBlocks": [
{
"clientId": "_clientId_0",
"name": "core/paragraph",
"isValid": true,
"attributes": {
"content": "My Content",
"dropCap": false,
"placeholder": "Content…",
"fontSize": "large"
},
"innerBlocks": [],
"originalContent": "<p class=\"has-large-font-size\">My Content</p>"
}
],
"originalContent": "<div class=\"wp-block-media-text alignwide is-image-fill\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:initial\">\n\t\t<img src=\"http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg\" alt=\"My alt text\"\n\t\t\tclass=\"wp-image-11\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>"
}
]
30 changes: 30 additions & 0 deletions ...2e-tests/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.parsed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[
{
"blockName": "core/media-text",
"attrs": {
"mediaId": 11,
"mediaType": "image",
"imageFill": true
},
"innerBlocks": [
{
"blockName": "core/paragraph",
"attrs": {
"placeholder": "Content…",
"fontSize": "large"
},
"innerBlocks": [],
"innerHTML": "\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t",
"innerContent": [
"\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t"
]
}
],
"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:initial\">\n\t\t<img src=\"http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg\" alt=\"My alt text\"\n\t\t\tclass=\"wp-image-11\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
"innerContent": [
"\n<div class=\"wp-block-media-text alignwide is-image-fill\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:initial\">\n\t\t<img src=\"http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg\" alt=\"My alt text\"\n\t\t\tclass=\"wp-image-11\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
null,
"\n\t</div>\n</div>\n"
]
}
]
5 changes: 5 additions & 0 deletions ...ests/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:media-text {"mediaId":11,"mediaType":"image","imageFill":true} -->
<div class="wp-block-media-text alignwide is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:initial"><img src="http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg" alt="My alt text" class="wp-image-11"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
<p class="has-large-font-size">My Content</p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:media-text -->
13 changes: 13 additions & 0 deletions ...ges/e2e-tests/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- wp:media-text {"mediaId":11,"mediaType":"image","imageFill":true,"focalPoint":{"x":0.8470588235294118,"y":0.8470588235294118}} -->
<div class="wp-block-media-text alignwide is-image-fill">
<figure class="wp-block-media-text__media"
style="background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:84.70588235294117% 84.70588235294117%">
<img src="http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg" alt="My alt text"
class="wp-image-11" /></figure>
<div class="wp-block-media-text__content">
<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
<p class="has-large-font-size">My Content</p>
<!-- /wp:paragraph -->
</div>
</div>
<!-- /wp:media-text -->
38 changes: 38 additions & 0 deletions ...ges/e2e-tests/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"clientId": "_clientId_0",
"name": "core/media-text",
"isValid": true,
"attributes": {
"align": "wide",
"mediaAlt": "My alt text",
"mediaPosition": "left",
"mediaId": 11,
"mediaUrl": "http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg",
"mediaType": "image",
"mediaWidth": 50,
"isStackedOnMobile": false,
"imageFill": true,
"focalPoint": {
"x": 0.8470588235294118,
"y": 0.8470588235294118
}
},
"innerBlocks": [
{
"clientId": "_clientId_0",
"name": "core/paragraph",
"isValid": true,
"attributes": {
"content": "My Content",
"dropCap": false,
"placeholder": "Content…",
"fontSize": "large"
},
"innerBlocks": [],
"originalContent": "<p class=\"has-large-font-size\">My Content</p>"
}
],
"originalContent": "<div class=\"wp-block-media-text alignwide is-image-fill\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:84.70588235294117% 84.70588235294117%\">\n\t\t<img src=\"http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg\" alt=\"My alt text\"\n\t\t\tclass=\"wp-image-11\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>"
}
]
34 changes: 34 additions & 0 deletions ...-tests/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.parsed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[
{
"blockName": "core/media-text",
"attrs": {
"mediaId": 11,
"mediaType": "image",
"imageFill": true,
"focalPoint": {
"x": 0.8470588235294118,
"y": 0.8470588235294118
}
},
"innerBlocks": [
{
"blockName": "core/paragraph",
"attrs": {
"placeholder": "Content…",
"fontSize": "large"
},
"innerBlocks": [],
"innerHTML": "\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t",
"innerContent": [
"\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t"
]
}
],
"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:84.70588235294117% 84.70588235294117%\">\n\t\t<img src=\"http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg\" alt=\"My alt text\"\n\t\t\tclass=\"wp-image-11\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
"innerContent": [
"\n<div class=\"wp-block-media-text alignwide is-image-fill\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:84.70588235294117% 84.70588235294117%\">\n\t\t<img src=\"http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg\" alt=\"My alt text\"\n\t\t\tclass=\"wp-image-11\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
null,
"\n\t</div>\n</div>\n"
]
}
]
5 changes: 5 additions & 0 deletions ...ts/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:media-text {"mediaId":11,"mediaType":"image","imageFill":true,"focalPoint":{"x":0.8470588235294118,"y":0.8470588235294118}} -->
<div class="wp-block-media-text alignwide is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:84.70588235294117% 84.70588235294117%"><img src="http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg" alt="My alt text" class="wp-image-11"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
<p class="has-large-font-size">My Content</p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:media-text -->