From 0e05d0c5a0fb4139a21a430d0dbe4a383fa12c60 Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Fri, 17 May 2019 13:22:08 +0200
Subject: [PATCH] RichText: Revert removing isSelected from block context
 (#15698)

Removing it generates a regression where inserting a new list block, the block is not selected
---
 .../block-editor/src/components/rich-text/index.native.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/rich-text/index.native.js b/packages/block-editor/src/components/rich-text/index.native.js
index 79fc7c2839fef..6d2275d8e783e 100644
--- a/packages/block-editor/src/components/rich-text/index.native.js
+++ b/packages/block-editor/src/components/rich-text/index.native.js
@@ -821,12 +821,16 @@ RichText.defaultProps = {
 
 const RichTextContainer = compose( [
 	withInstanceId,
-	withBlockEditContext( ( { clientId, onFocus, onCaretVerticalPositionChange }, ownProps ) => {
-		// ownProps.onFocus needs precedence over the block edit context
+	withBlockEditContext( ( { clientId, onFocus, onCaretVerticalPositionChange, isSelected }, ownProps ) => {
+		// ownProps.onFocus and isSelected needs precedence over the block edit context
+		if ( ownProps.isSelected !== undefined ) {
+			isSelected = ownProps.isSelected;
+		}
 		if ( ownProps.onFocus !== undefined ) {
 			onFocus = ownProps.onFocus;
 		}
 		return {
+			isSelected,
 			clientId,
 			onFocus,
 			onCaretVerticalPositionChange,