From b4a46ad2909f9ca0296666f55891b1c534a6b65a Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Fri, 17 Jan 2020 16:52:47 -0500
Subject: [PATCH] Block Editor: Unify responsive block control group wrapper

---
 .../responsive-block-control/index.js         | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/block-editor/src/components/responsive-block-control/index.js b/packages/block-editor/src/components/responsive-block-control/index.js
index 821f27b309d70b..8a3d3eef08145e 100644
--- a/packages/block-editor/src/components/responsive-block-control/index.js
+++ b/packages/block-editor/src/components/responsive-block-control/index.js
@@ -1,10 +1,13 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
-
 import { Fragment } from '@wordpress/element';
-
 import { ToggleControl } from '@wordpress/components';
 
 /**
@@ -93,23 +96,20 @@ function ResponsiveBlockControl( props ) {
 					onChange={ onIsResponsiveChange }
 					help={ toggleHelpText }
 				/>
-
-				{ ! isResponsive && (
-					<div className="block-editor-responsive-block-control__group">
-						{ defaultControl }
-					</div>
-				) }
-
-				{ isResponsive && (
-					<div
-						className="block-editor-responsive-block-control__group is-responsive"
-						hidden={ ! isResponsive }
-					>
-						{ renderResponsiveControls
+				<div
+					className={ classnames(
+						'block-editor-responsive-block-control__group',
+						{
+							'is-responsive': isResponsive,
+						}
+					) }
+				>
+					{ ! isResponsive && defaultControl }
+					{ isResponsive &&
+						( renderResponsiveControls
 							? renderResponsiveControls( viewports )
-							: defaultResponsiveControls() }
-					</div>
-				) }
+							: defaultResponsiveControls() ) }
+				</div>
 			</div>
 		</fieldset>
 	);