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 vertical alignment options #13989

Merged
merged 5 commits into from
Apr 3, 2019
Merged

Media & Text Block: Add vertical alignment options #13989

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50b3883
Add vertical alignment functionality to the media and text block
frontdevde Feb 20, 2019
bab4344
Remove duplicate styles
frontdevde Mar 21, 2019
cd42c26
Add fixture for vertical alignment test
frontdevde Apr 1, 2019
94e253c
Add entry to changelog
frontdevde Apr 2, 2019
f63bf78
Merge branch 'master' into update/media-text-block-v-align
frontdevde Apr 2, 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
10 changes: 10 additions & 0 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 @@ -10,6 +10,7 @@ import { get } from 'lodash';
import { __, _x } from '@wordpress/i18n';
import {
BlockControls,
BlockVerticalAlignmentToolbar,
InnerBlocks,
InspectorControls,
PanelColorSettings,
Expand Down Expand Up @@ -125,13 +126,15 @@ class MediaTextEdit extends Component {
mediaPosition,
mediaType,
mediaWidth,
verticalAlignment,
} = attributes;
const temporaryMediaWidth = this.state.mediaWidth;
const classNames = classnames( className, {
'has-media-on-the-right': 'right' === mediaPosition,
'is-selected': isSelected,
[ backgroundColor.class ]: backgroundColor.class,
'is-stacked-on-mobile': isStackedOnMobile,
[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
} );
const widthString = `${ temporaryMediaWidth || mediaWidth }%`;
const style = {
Expand All @@ -157,6 +160,9 @@ class MediaTextEdit extends Component {
const onMediaAltChange = ( newMediaAlt ) => {
setAttributes( { mediaAlt: newMediaAlt } );
};
const onVerticalAlignmentChange = ( alignment ) => {
setAttributes( { verticalAlignment: alignment } );
};
const mediaTextGeneralSettings = (
<PanelBody title={ __( 'Media & Text Settings' ) }>
<ToggleControl
Expand Down Expand Up @@ -188,6 +194,10 @@ class MediaTextEdit extends Component {
<Toolbar
controls={ toolbarControls }
/>
<BlockVerticalAlignmentToolbar
onChange={ onVerticalAlignmentChange }
value={ verticalAlignment }
/>
</BlockControls>
<div className={ classNames } style={ style } >
{ this.renderMediaArea() }
Expand Down
3 changes: 1 addition & 2 deletions packages/block-library/src/media-text/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
grid-template-areas:
"media-text-media media-text-content"
"resizer resizer";
align-items: center;
frontdevde marked this conversation as resolved.
Show resolved Hide resolved
}

.wp-block-media-text.has-media-on-the-right {
Expand All @@ -16,7 +17,6 @@

.wp-block-media-text .editor-media-container__resizer {
grid-area: media-text-media;
align-self: center;
// The resizer sets a inline width but as we are using a grid layout,
// we set the width on container.
width: 100% !important;
Expand Down Expand Up @@ -62,4 +62,3 @@ figure.block-library-media-text__media-container {
}
}
}

5 changes: 5 additions & 0 deletions packages/block-library/src/media-text/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ const blockAttributes = {
type: 'boolean',
frontdevde marked this conversation as resolved.
Show resolved Hide resolved
default: false,
},
verticalAlignment: {
type: 'string',
frontdevde marked this conversation as resolved.
Show resolved Hide resolved
},
};

export const settings = {
Expand Down Expand Up @@ -156,6 +159,7 @@ export const settings = {
mediaUrl,
mediaWidth,
mediaId,
verticalAlignment,
} = attributes;
const mediaTypeRenders = {
image: () => <img src={ mediaUrl } alt={ mediaAlt } className={ ( mediaId && mediaType === 'image' ) ? `wp-image-${ mediaId }` : null } />,
Expand All @@ -166,6 +170,7 @@ export const settings = {
'has-media-on-the-right': 'right' === mediaPosition,
[ backgroundClass ]: backgroundClass,
'is-stacked-on-mobile': isStackedOnMobile,
[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
} );

let gridTemplateColumns;
Expand Down
16 changes: 13 additions & 3 deletions packages/block-library/src/media-text/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.wp-block-media-text {
display: grid;
}

.wp-block-media-text {
display: grid;
frontdevde marked this conversation as resolved.
Show resolved Hide resolved
grid-template-rows: auto;
align-items: center;
grid-template-areas: "media-text-media media-text-content";
Expand All @@ -13,6 +11,18 @@
}
}

.wp-block-media-text.is-vertically-aligned-top {
align-items: start;
}

.wp-block-media-text.is-vertically-aligned-center {
align-items: center;
}

.wp-block-media-text.is-vertically-aligned-bottom {
align-items: end;
}

.wp-block-media-text .wp-block-media-text__media {
grid-area: media-text-media;
margin: 0;
Expand Down
12 changes: 12 additions & 0 deletions packages/e2e-tests/fixtures/blocks/core__media-text__vertical-align-bottom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!-- wp:media-text {"mediaId":11,"mediaType":"image","verticalAlignment":"bottom"} -->
<div class="wp-block-media-text alignwide is-vertically-aligned-bottom">
<figure class="wp-block-media-text__media"><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__vertical-align-bottom.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,
"verticalAlignment": "bottom"
},
"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-vertically-aligned-bottom\">\n\t<figure class=\"wp-block-media-text__media\"><img\n\t\t\tsrc=\"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 packages/e2e-tests/fixtures/blocks/core__media-text__vertical-align-bottom.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",
"verticalAlignment": "bottom"
},
"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-vertically-aligned-bottom\">\n\t<figure class=\"wp-block-media-text__media\"><img\n\t\t\tsrc=\"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-vertically-aligned-bottom\">\n\t<figure class=\"wp-block-media-text__media\"><img\n\t\t\tsrc=\"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 packages/e2e-tests/fixtures/blocks/core__media-text__vertical-align-bottom.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","verticalAlignment":"bottom"} -->
<div class="wp-block-media-text alignwide is-vertically-aligned-bottom"><figure class="wp-block-media-text__media"><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 -->