Show Height control in Cover if we only selected an image (#17371)

* refactor-size-control-to-its-panel * rename Size to Dimensions
WordPress · Sep 26, 2019 · 5e854c2 · 5e854c2
1 parent 6ab9d41
commit 5e854c2
Showing 1 changed file with 34 additions and 30 deletions.
diff --git a/packages/block-library/src/cover/edit.js b/packages/block-library/src/cover/edit.js
@@ -329,16 +329,6 @@ class CoverEdit extends Component {
 									onChange={ ( value ) => setAttributes( { focalPoint: value } ) }
 								/>
 							) }
-							<CoverHeightInput
-								value={ temporaryMinHeight || minHeight }
-								onChange={
-									( value ) => {
-										setAttributes( {
-											minHeight: value,
-										} );
-									}
-								}
-							/>
 							<PanelRow>
 								<Button
 									isDefault
@@ -359,27 +349,41 @@ class CoverEdit extends Component {
 						</PanelBody>
 					) }
 					{ ( url || overlayColor.color ) && (
-						<PanelColorSettings
-							title={ __( 'Overlay' ) }
-							initialOpen={ true }
-							colorSettings={ [ {
-								value: overlayColor.color,
-								onChange: setOverlayColor,
-								label: __( 'Overlay Color' ),
-							} ] }
-						>
-							{ !! url && (
-								<RangeControl
-									label={ __( 'Background Opacity' ) }
-									value={ dimRatio }
-									onChange={ setDimRatio }
-									min={ 0 }
-									max={ 100 }
-									step={ 10 }
-									required
+						<>
+							<PanelBody title={ __( 'Dimensions' ) }>
+								<CoverHeightInput
+									value={ temporaryMinHeight || minHeight }
+									onChange={
+										( value ) => {
+											setAttributes( {
+												minHeight: value,
+											} );
+										}
+									}
 								/>
-							) }
-						</PanelColorSettings>
+							</PanelBody>
+							<PanelColorSettings
+								title={ __( 'Overlay' ) }
+								initialOpen={ true }
+								colorSettings={ [ {
+									value: overlayColor.color,
+									onChange: setOverlayColor,
+									label: __( 'Overlay Color' ),
+								} ] }
+							>
+								{ !! url && (
+									<RangeControl
+										label={ __( 'Background Opacity' ) }
+										value={ dimRatio }
+										onChange={ setDimRatio }
+										min={ 0 }
+										max={ 100 }
+										step={ 10 }
+										required
+									/>
+								) }
+							</PanelColorSettings>
+						</>
 					) }
 				</InspectorControls>
 			</>