Make the block Remove button appear on focus. (#6279)

* Make the block Remove button appear on focus. * Pass ...props.
WordPress · Apr 19, 2018 · 473ef22 · 473ef22
1 parent 7168a78
commit 473ef22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/editor/components/block-settings-menu/block-remove-button.js b/editor/components/block-settings-menu/block-remove-button.js
@@ -12,7 +12,7 @@ import { compose } from '@wordpress/element';
 import { withDispatch } from '@wordpress/data';
 import { withEditorSettings } from '@wordpress/blocks';
 
-export function BlockRemoveButton( { onRemove, onClick = noop, isLocked, role } ) {
+export function BlockRemoveButton( { onRemove, onClick = noop, isLocked, role, ...props } ) {
 	if ( isLocked ) {
 		return null;
 	}
@@ -26,6 +26,7 @@ export function BlockRemoveButton( { onRemove, onClick = noop, isLocked, role }
 			icon="trash"
 			label={ label }
 			role={ role }
+			{ ...props }
 		/>
 	);
 }

diff --git a/editor/components/block-settings-menu/index.js b/editor/components/block-settings-menu/index.js
@@ -101,7 +101,11 @@ export class BlockSettingsMenu extends Component {
 						</NavigableMenu>
 					) }
 				/>
-				<BlockRemoveButton uids={ uids } />
+				<BlockRemoveButton
+					uids={ uids }
+					onFocus={ this.onFocus }
+					onBlur={ this.onBlur }
+				/>
 			</div>
 		);
 	}