RichText: Use a simplified format for rich text values

blocks/api/matchers.js

@@ -1,14 +1,14 @@
-/**
- * WordPress dependencies
- */
-import { createElement } from '@wordpress/element';
-
 /**
  * External dependencies
  */
 import { nodeListToReact, nodeToReact } from 'dom-react';
 export { attr, prop, html, text, query } from 'hpq';
 
+/**
+ * WordPress dependencies
+ */
+import { createSimpleElement } from '@wordpress/element';
+
 export const children = ( selector ) => {
 	return ( domNode ) => {
 		let match = domNode;
@@ -18,7 +18,7 @@ export const children = ( selector ) => {
 		}
 
 		if ( match ) {
-			return nodeListToReact( match.childNodes || [], createElement );
+			return nodeListToReact( match.childNodes || [], createSimpleElement );
 		}
 
 		return [];
@@ -33,6 +33,6 @@ export const node = ( selector ) => {
 			match = domNode.querySelector( selector );
 		}
 
-		return nodeToReact( match, createElement );
+		return nodeToReact( match, createSimpleElement );
 	};
 };

blocks/api/utils.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { every, keys, isEqual, isFunction, isString } from 'lodash';
+import { every, keys, isEqual, isFunction, isString, omit } from 'lodash';
 import { default as tinycolor, mostReadable } from 'tinycolor2';
 
 /**

core-blocks/test/fixtures/core__heading__h2-em.json

@@ -8,7 +8,7 @@
                 "The ",
                 {
                     "type": "em",
-                    "children": "Inserter"
+                    "children": [ "Inserter" ]
                 },
                 " Tool"
             ],

core-blocks/test/fixtures/core__list__ul.json

@@ -8,31 +8,31 @@
             "values": [
                 {
                     "type": "li",
-                    "children": "Text & Headings"
+                    "children": [ "Text & Headings" ]
                 },
                 {
                     "type": "li",
-                    "children": "Images & Videos"
+                    "children": [ "Images & Videos" ]
                 },
                 {
                     "type": "li",
-                    "children": "Galleries"
+                    "children": [ "Galleries" ]
                 },
                 {
                     "type": "li",
-                    "children": "Embeds, like YouTube, Tweets, or other WordPress posts."
+                    "children": [ "Embeds, like YouTube, Tweets, or other WordPress posts." ]
                 },
                 {
                     "type": "li",
-                    "children": "Layout blocks, like Buttons, Hero Images, Separators, etc."
+                    "children": [ "Layout blocks, like Buttons, Hero Images, Separators, etc." ]
                 },
                 {
                     "type": "li",
                     "children": [
                         "And ",
                         {
                             "type": "em",
-                            "children": "Lists"
+                            "children": [ "Lists" ]
                         },
                         " like this one of course :)"
                     ]

core-blocks/test/fixtures/core__preformatted.json

@@ -8,11 +8,12 @@
                 "Some ",
                 {
                     "type": "em",
-                    "children": "preformatted"
+                    "children": [ "preformatted" ]
                 },
                 " text...",
                 {
-                    "type": "br"
+					"type": "br",
+					"children": []
                 },
                 "And more!"
             ]

core-blocks/test/fixtures/core__pullquote.json

@@ -8,13 +8,9 @@
                 {
                     "children": {
                         "type": "p",
-                        "key": null,
-                        "ref": null,
                         "props": {
-                            "children": "Testing pullquote block..."
-                        },
-                        "_owner": null,
-                        "_store": {}
+                            "children": [ "Testing pullquote block..." ]
+                        }
                     }
                 }
             ],

core-blocks/test/fixtures/core__pullquote__multi-paragraph.json

@@ -8,37 +8,25 @@
                 {
                     "children": {
                         "type": "p",
-                        "key": null,
-                        "ref": null,
                         "props": {
                             "children": [
                                 "Paragraph ",
                                 {
                                     "type": "strong",
-                                    "key": "_domReact71",
-                                    "ref": null,
                                     "props": {
-                                        "children": "one"
-                                    },
-                                    "_owner": null,
-                                    "_store": {}
+                                        "children": [ "one" ]
+                                    }
                                 }
                             ]
-                        },
-                        "_owner": null,
-                        "_store": {}
+                        }
                     }
                 },
                 {
                     "children": {
                         "type": "p",
-                        "key": null,
-                        "ref": null,
                         "props": {
-                            "children": "Paragraph two"
-                        },
-                        "_owner": null,
-                        "_store": {}
+                            "children": [ "Paragraph two" ]
+                        }
                     }
                 }
             ],

core-blocks/test/fixtures/core__quote__style-1.json

@@ -8,13 +8,9 @@
                 {
                     "children": {
                         "type": "p",
-                        "key": null,
-                        "ref": null,
                         "props": {
-                            "children": "The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery."
-                        },
-                        "_owner": null,
-                        "_store": {}
+                            "children": [ "The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery." ]
+                        }
                     }
                 }
             ],

core-blocks/test/fixtures/core__quote__style-2.json

@@ -8,13 +8,9 @@
                 {
                     "children": {
                         "type": "p",
-                        "key": null,
-                        "ref": null,
                         "props": {
-                            "children": "There is no greater agony than bearing an untold story inside you."
-                        },
-                        "_owner": null,
-                        "_store": {}
+                            "children": [ "There is no greater agony than bearing an untold story inside you." ]
+                        }
                     }
                 }
             ],

core-blocks/test/fixtures/core__subhead.json

@@ -8,7 +8,7 @@
                 "This is a ",
                 {
                     "type": "em",
-                    "children": "subhead"
+                    "children": [ "subhead" ]
                 },
                 "."
             ]