better handling of inserter

WordPress · Sep 24, 2019 · 7b6fe60 · 7b6fe60
1 parent 76a1ed0
commit 7b6fe60
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/packages/block-editor/src/components/inserter/index.js b/packages/block-editor/src/components/inserter/index.js
@@ -1,15 +1,14 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
 import {
 	get,
 } from 'lodash';
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Dropdown, IconButton, Button, Icon } from '@wordpress/components';
+import { Dropdown, IconButton } from '@wordpress/components';
 import { Component } from '@wordpress/element';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose, ifCondition } from '@wordpress/compose';
@@ -66,9 +65,15 @@ class Inserter extends Component {
 	renderToggle( { onToggle, isOpen } ) {
 		const {
 			disabled,
+			hasOneAllowedItem,
+			createIfOne,
 			renderToggle = defaultRenderToggle,
 		} = this.props;
 
+		if ( hasOneAllowedItem ) {
+			onToggle = createIfOne;
+		}
+
 		return renderToggle( { onToggle, isOpen, disabled } );
 	}
 
@@ -95,23 +100,8 @@ class Inserter extends Component {
 	}
 
 	render() {
-		const { position, hasOneAllowedItem, createIfOne } = this.props;
-		let toggle = null;
-		if ( hasOneAllowedItem ) {
-			toggle = () => {
-				return (
-					<Button
-						className={ classnames( 'block-editor-button-block-appender' ) }
-						onClick={ createIfOne }
-					>
-						<span className="screen-reader-text">{ __( 'Add Block' ) }</span>
-						<Icon icon="insert" />
-					</Button>
-				);
-			};
-		} else {
-			toggle = this.renderToggle;
-		}
+		const { position } = this.props;
+		const toggle = this.renderToggle;
 
 		return (
 			<Dropdown