add heading level to inspector and keep it always expanded

WordPress · Aug 2, 2019 · 29c994d · 29c994d
1 parent fde881a
commit 29c994d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
@@ -61,15 +61,15 @@ function HeadingEdit( {
 	return (
 		<>
 			<BlockControls>
-				<HeadingToolbar align={ align } setAttributes={ setAttributes } minLevel={ 2 } maxLevel={ 5 } selectedLevel={ level } onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) } />
+				<HeadingToolbar minLevel={ 2 } maxLevel={ 5 } 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 } ) } />
+					<HeadingToolbar expanded={ true } minLevel={ 1 } maxLevel={ 7 } selectedLevel={ level } onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) } />
 				</PanelBody>
 				<HeadingColorUI
 					setTextColor={ setTextColor }

diff --git a/packages/block-library/src/heading/heading-toolbar.js b/packages/block-library/src/heading/heading-toolbar.js
@@ -27,9 +27,9 @@ class HeadingToolbar extends Component {
 	}
 
 	render() {
-		const { isCollapsed, minLevel, maxLevel, selectedLevel, onChange } = this.props;
+		const { expanded, isCollapsed, minLevel, maxLevel, selectedLevel, onChange } = this.props;
 		return (
-			<Toolbar isCollapsed={ isCollapsed } controls={ range( minLevel, maxLevel ).map( ( index ) => this.createLevelControl( index, selectedLevel, onChange ) ) } />
+			<Toolbar isCollapsed={ ! expanded && isCollapsed } controls={ range( minLevel, maxLevel ).map( ( index ) => this.createLevelControl( index, selectedLevel, onChange ) ) } />
 		);
 	}
 }