Fix use of __experimentalCreatePrepareEditableTree without __experime…

…ntalCreateOnChangeEditableValue
WordPress · Mar 6, 2019 · c3adf18 · c3adf18
1 parent 078041b
commit c3adf18
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/rich-text/src/create.js b/packages/rich-text/src/create.js
@@ -57,6 +57,13 @@ function toFormat( { type, attributes } ) {
 		return attributes ? { type, attributes } : { type };
 	}
 
+	if (
+		formatType.__experimentalCreatePrepareEditableTree &&
+		! formatType.__experimentalCreateOnChangeEditableValue
+	) {
+		return null;
+	}
+
 	if ( ! attributes ) {
 		return { type: formatType.name };
 	}

diff --git a/packages/rich-text/src/register-format-type.js b/packages/rich-text/src/register-format-type.js
@@ -139,7 +139,7 @@ export function registerFormatType( name, settings ) {
 	} );
 
 	if (
-		settings.__experimentalGetPropsForEditableTreePreparation
+		settings.__experimentalCreatePrepareEditableTree
 	) {
 		addFilter( 'experimentalRichText', name, ( OriginalComponent ) => {
 			let Component = OriginalComponent;
@@ -193,17 +193,19 @@ export function registerFormatType( name, settings ) {
 				};
 			}
 
-			const hocs = [
-				withSelect( ( sel, { clientId, identifier } ) => ( {
+			const hocs = [];
+
+			if ( settings.__experimentalGetPropsForEditableTreePreparation ) {
+				hocs.push( withSelect( ( sel, { clientId, identifier } ) => ( {
 					[ `format_${ name }` ]: settings.__experimentalGetPropsForEditableTreePreparation(
 						sel,
 						{
 							richTextIdentifier: identifier,
 							blockClientId: clientId,
 						}
 					),
-				} ) ),
-			];
+				} ) ) );
+			}
 
 			if ( settings.__experimentalGetPropsForEditableTreeChangeHandler ) {
 				hocs.push( withDispatch( ( disp, { clientId, identifier } ) => {