Rich Text: Add missing keep placeholder on focus prop.

WordPress · Sep 14, 2019 · f9dafd2 · f9dafd2
1 parent 53f2aea
commit f9dafd2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
@@ -336,6 +336,7 @@ class RichTextWrapper extends Component {
 			didAutomaticChange,
 			undo,
 			placeholder,
+			keepPlaceholderOnFocus,
 			// eslint-disable-next-line no-unused-vars
 			allowedFormats,
 			withoutInteractiveFormatting,
@@ -383,7 +384,10 @@ class RichTextWrapper extends Component {
 				selectionEnd={ selectionEnd }
 				onSelectionChange={ onSelectionChange }
 				tagName={ tagName }
-				className={ classnames( classes, className, { 'is-selected': originalIsSelected } ) }
+				className={ classnames( classes, className, {
+					'is-selected': originalIsSelected,
+					'keep-placeholder-on-focus': keepPlaceholderOnFocus,
+				} ) }
 				placeholder={ placeholder }
 				allowedFormats={ adjustedAllowedFormats }
 				withoutInteractiveFormatting={ withoutInteractiveFormatting }

diff --git a/packages/block-editor/src/components/rich-text/style.scss b/packages/block-editor/src/components/rich-text/style.scss
@@ -43,8 +43,14 @@
 	}
 
 	// Could be unset for individual rich text instances.
-	&.is-selected [data-rich-text-placeholder]::after {
-		display: none;
+	&.is-selected {
+		&.keep-placeholder-on-focus [data-rich-text-placeholder] {
+			pointer-events: none;
+		}
+
+		&:not(.keep-placeholder-on-focus) [data-rich-text-placeholder]::after {
+			display: none;
+		}
 	}
 }