RichText: Ensure instance is selected before setting back selection (#…

…12737)
WordPress · Dec 9, 2018 · b44a2f1 · b44a2f1
1 parent e7fb179
commit b44a2f1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/editor/src/components/rich-text/index.js b/packages/editor/src/components/rich-text/index.js
@@ -688,9 +688,12 @@ export class RichText extends Component {
 		if ( shouldReapply ) {
 			const record = this.formatToValue( value );
 
-			// Maintain the previous selection:
-			record.start = this.state.start;
-			record.end = this.state.end;
+			// Maintain the previous selection if the instance is currently
+			// selected.
+			if ( isSelected ) {
+				record.start = this.state.start;
+				record.end = this.state.end;
+			}
 
 			this.applyRecord( record );
 		}