From 110feb2e05fbbb94ff3097a216ba733243bfe1df Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Mon, 3 Jun 2019 15:13:24 +0200
Subject: [PATCH 1/3] Bring consistency to block toolbar for text blocks

---
 packages/block-library/src/heading/edit.js | 15 +++---
 packages/block-library/src/list/block.json |  3 ++
 packages/block-library/src/list/edit.js    | 54 ++++++++++++++--------
 packages/block-library/src/list/save.js    |  8 +++-
 4 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index 7fc4721c9169ab..7cf210271133d5 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -61,19 +61,18 @@ function HeadingEdit( {
 	return (
 		<>
 			<BlockControls>
-				<HeadingToolbar minLevel={ 2 } maxLevel={ 5 } selectedLevel={ level } onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) } />
+				<HeadingToolbar minLevel={ 1 } maxLevel={ 7 } selectedLevel={ level } onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) } />
+				<AlignmentToolbar
+					value={ align }
+					onChange={ ( nextAlign ) => {
+						setAttributes( { align: nextAlign } );
+					} }
+				/>
 			</BlockControls>
 			<InspectorControls>
 				<PanelBody title={ __( 'Heading Settings' ) }>
 					<p>{ __( 'Level' ) }</p>
 					<HeadingToolbar minLevel={ 1 } maxLevel={ 7 } selectedLevel={ level } onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) } />
-					<p>{ __( 'Text Alignment' ) }</p>
-					<AlignmentToolbar
-						value={ align }
-						onChange={ ( nextAlign ) => {
-							setAttributes( { align: nextAlign } );
-						} }
-					/>
 				</PanelBody>
 				<HeadingColorUI
 					setTextColor={ setTextColor }
diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
index 26cdf8c19d6780..23a766e33ad5aa 100644
--- a/packages/block-library/src/list/block.json
+++ b/packages/block-library/src/list/block.json
@@ -2,6 +2,9 @@
 	"name": "core/list",
 	"category": "common",
 	"attributes": {
+		"align": {
+			"type": "string"
+		},
 		"ordered": {
 			"type": "boolean",
 			"default": false
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index 585aecd6aa7ab8..841ae1a58cc7e4 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -3,7 +3,11 @@
  */
 import { __ } from '@wordpress/i18n';
 import { createBlock } from '@wordpress/blocks';
-import { RichText } from '@wordpress/block-editor';
+import {
+	AlignmentToolbar,
+	BlockControls,
+	RichText,
+} from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -17,24 +21,38 @@ export default function ListEdit( {
 	onReplace,
 	className,
 } ) {
-	const { ordered, values } = attributes;
+	const { align, ordered, values } = attributes;
 
 	return (
-		<RichText
-			identifier="values"
-			multiline="li"
-			tagName={ ordered ? 'ol' : 'ul' }
-			onChange={ ( nextValues ) => setAttributes( { values: nextValues } ) }
-			value={ values }
-			wrapperClassName="block-library-list"
-			className={ className }
-			placeholder={ __( 'Write list…' ) }
-			onMerge={ mergeBlocks }
-			onSplit={ ( value ) => createBlock( name, { ordered, values: value } ) }
-			__unstableOnSplitMiddle={ () => createBlock( 'core/paragraph' ) }
-			onReplace={ onReplace }
-			onRemove={ () => onReplace( [] ) }
-			onTagNameChange={ ( tag ) => setAttributes( { ordered: tag === 'ol' } ) }
-		/>
+		<>
+			<BlockControls>
+				<AlignmentToolbar
+					value={ align }
+					onChange={ ( nextAlign ) => {
+						setAttributes( { align: nextAlign } );
+					} }
+				/>
+			</BlockControls>
+			<RichText
+				identifier="values"
+				multiline="li"
+				tagName={ ordered ? 'ol' : 'ul' }
+				onChange={ ( nextValues ) => setAttributes( { values: nextValues } ) }
+				value={ values }
+				wrapperClassName="block-library-list"
+				className={ className }
+				placeholder={ __( 'Write list…' ) }
+				onMerge={ mergeBlocks }
+				onSplit={ ( value ) => createBlock( name, { ordered, values: value } ) }
+				__unstableOnSplitMiddle={ () => createBlock( 'core/paragraph' ) }
+				onReplace={ onReplace }
+				onRemove={ () => onReplace( [] ) }
+				onTagNameChange={ ( tag ) => setAttributes( { ordered: tag === 'ol' } ) }
+				style={ {
+					textAlign: align,
+					listStylePosition: 'inside',
+				} }
+			/>
+		</>
 	);
 }
diff --git a/packages/block-library/src/list/save.js b/packages/block-library/src/list/save.js
index 9b0ff55b44cd5d..435a15b93ad13b 100644
--- a/packages/block-library/src/list/save.js
+++ b/packages/block-library/src/list/save.js
@@ -4,10 +4,14 @@
 import { RichText } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
-	const { ordered, values } = attributes;
+	const { align, ordered, values } = attributes;
 	const tagName = ordered ? 'ol' : 'ul';
+	const styles = {
+		textAlign: align,
+		listStylePosition: 'inside',
+	};
 
 	return (
-		<RichText.Content tagName={ tagName } value={ values } multiline="li" />
+		<RichText.Content tagName={ tagName } style={ styles } value={ values } multiline="li" />
 	);
 }

From c8ed3f89be3ad7e6b870ffe2b69e857c3a4a59ad Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Mon, 3 Jun 2019 15:25:35 +0200
Subject: [PATCH 2/3] Make heading toolbar collapsed inside the block toolbar

---
 packages/block-library/src/heading/edit.js            | 8 +++++++-
 packages/block-library/src/heading/heading-toolbar.js | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index 7cf210271133d5..0d111636160434 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -61,7 +61,13 @@ function HeadingEdit( {
 	return (
 		<>
 			<BlockControls>
-				<HeadingToolbar minLevel={ 1 } maxLevel={ 7 } selectedLevel={ level } onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) } />
+				<HeadingToolbar
+					isCollapsed
+					minLevel={ 1 }
+					maxLevel={ 7 }
+					selectedLevel={ level }
+					onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) }
+				/>
 				<AlignmentToolbar
 					value={ align }
 					onChange={ ( nextAlign ) => {
diff --git a/packages/block-library/src/heading/heading-toolbar.js b/packages/block-library/src/heading/heading-toolbar.js
index b01ff2c1c202a4..7750018f8a7b4c 100644
--- a/packages/block-library/src/heading/heading-toolbar.js
+++ b/packages/block-library/src/heading/heading-toolbar.js
@@ -23,9 +23,14 @@ class HeadingToolbar extends Component {
 	}
 
 	render() {
-		const { minLevel, maxLevel, selectedLevel, onChange } = this.props;
+		const { isCollapsed, minLevel, maxLevel, selectedLevel, onChange } = this.props;
+
 		return (
-			<Toolbar controls={ range( minLevel, maxLevel ).map( ( index ) => this.createLevelControl( index, selectedLevel, onChange ) ) } />
+			<Toolbar
+				controls={ range( minLevel, maxLevel ).map( ( index ) => this.createLevelControl( index, selectedLevel, onChange ) ) }
+				icon="heading"
+				isCollapsed={ isCollapsed }
+			/>
 		);
 	}
 }

From dac403079c217eeac2c2e41d31a5ce0a210f1abe Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Tue, 18 Jun 2019 09:04:05 +0200
Subject: [PATCH 3/3] Ensure that text align styles do not get updated for RTL
 version

---
 packages/block-library/src/style.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/block-library/src/style.scss b/packages/block-library/src/style.scss
index f9a2909ff360a8..540fd4cd99ec51 100644
--- a/packages/block-library/src/style.scss
+++ b/packages/block-library/src/style.scss
@@ -153,10 +153,12 @@
 }
 
 .has-text-align-left {
+	/*rtl:ignore*/
 	text-align: left;
 }
 
 .has-text-align-right {
+	/*rtl:ignore*/
 	text-align: right;
 }