Move createSimpleElement to wordpress/element

WordPress · Jun 27, 2018 · 1634a05 · 1634a05
1 parent db6c40f
commit 1634a05
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 24 deletions.
diff --git a/blocks/api/index.js b/blocks/api/index.js
@@ -39,7 +39,6 @@ export {
 } from './registration';
 export {
 	isUnmodifiedDefaultBlock,
-	createSimpleElement,
 } from './utils';
 export {
 	doBlocksMatchTemplate,

diff --git a/blocks/api/matchers.js b/blocks/api/matchers.js
@@ -5,9 +5,9 @@ import { nodeListToReact, nodeToReact } from 'dom-react';
 export { attr, prop, html, text, query } from 'hpq';
 
 /**
- * Internal dependencies
+ * WordPress dependencies
  */
-import { createSimpleElement } from './utils';
+import { createSimpleElement } from '@wordpress/element';
 
 export const children = ( selector ) => {
 	return ( domNode ) => {

diff --git a/blocks/api/utils.js b/blocks/api/utils.js
@@ -118,21 +118,3 @@ export function normalizeIconObject( icon ) {
 	}
 	return icon;
 }
-
-/**
- * Creates a simplified element representation.
- *
- * @param {string} type
- * @param {Object} props
- * @param {Array?} children
- *
- * @return {Object} Element.
- */
-export function createSimpleElement( type, props, ...children ) {
-	return {
-		type, props: {
-			...omit( props, [ 'key' ] ),
-			children,
-		},
-	};
-}
diff --git a/editor/components/rich-text/format.js b/editor/components/rich-text/format.js
@@ -7,8 +7,7 @@ import { nodeListToReact } from 'dom-react';
 /**
  * WordPress dependencies
  */
-import { renderToString } from '@wordpress/element';
-import { createSimpleElement } from '@wordpress/blocks';
+import { renderToString, createSimpleElement } from '@wordpress/element';
 
 /**
  * Transforms a WP Element to its corresponding HTML string.

diff --git a/editor/components/rich-text/test/format.js b/editor/components/rich-text/test/format.js
@@ -6,7 +6,7 @@ import { shallow } from 'enzyme';
 /**
  * WordPress dependencies
  */
-import { createSimpleElement } from '@wordpress/blocks';
+import { createSimpleElement } from '@wordpress/element';
 
 /**
  * Internal dependencies

diff --git a/packages/element/src/index.js b/packages/element/src/index.js
@@ -19,6 +19,7 @@ import {
 	flowRight,
 	isString,
 	upperFirst,
+	omit,
 } from 'lodash';
 
 /**
@@ -45,6 +46,24 @@ import serialize from './serialize';
  */
 export { createElement };
 
+/**
+ * Creates a simplified element representation.
+ *
+ * @param {string} type
+ * @param {Object} props
+ * @param {Array?} children
+ *
+ * @return {Object} Element.
+ */
+export function createSimpleElement( type, props, ...children ) {
+	return {
+		type, props: {
+			...omit( props, [ 'key' ] ),
+			children,
+		},
+	};
+}
+
 /**
  * Returns an object tracking a reference to a rendered element via its
  * `current` property as either a DOMElement or Element, dependent upon the