From 473ef220e6ed24678871cf8a3237bab84de4ad01 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Thu, 19 Apr 2018 14:15:44 +0200
Subject: [PATCH] Make the block Remove button appear on focus. (#6279)

* Make the block Remove button appear on focus.

* Pass ...props.
---
 .../components/block-settings-menu/block-remove-button.js   | 3 ++-
 editor/components/block-settings-menu/index.js              | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/editor/components/block-settings-menu/block-remove-button.js b/editor/components/block-settings-menu/block-remove-button.js
index aa79688f3efb5d..417cd46cde9606 100644
--- 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
index d63aec2e2d0d1b..4426da524b0124 100644
--- 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>
 		);
 	}