Refactoring rendering root to be a component

src/components/App/index.js

@@ -6,7 +6,7 @@ import style from './style.css';
 
 import Form from 'components/Form';
 import Message from 'components/Message';
-import renderImage from 'components/SVG';
+import SVG from 'components/SVG';
 import { syntaxes, demoImage } from 'devel';
 
 class App extends React.PureComponent {
@@ -100,7 +100,7 @@ class App extends React.PureComponent {
         <p>Sample warning message</p>
       </Message>
       { image && <div className={ style.render }>
-        { renderImage(image, { ref: this.imageRef }) }
+        <SVG data={ image } imageRef={ this.imageRef }/>
       </div> }
     </React.Fragment>;
   }

src/components/SVG/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import Box from './Box';
 import HorizontalLayout from './HorizontalLayout';
@@ -18,24 +19,26 @@ const nodeTypes = {
   VerticalLayout
 };
 
-const renderChildren = children => {
+const render = (data, extraProps = {}) => {
-  if (!children || children.length === 0) {
+  if (typeof data === 'string') {
-    return;
+    return data;
   }
 
-  return children.length === 1 ?
+  const { type, props } = data;
-    renderImage(children[0]) :
+  const children = (data.children || []).map(
-    children.map((node, i) => renderImage(node, { key: i }));
+    (data, key) => render(data, { key }));
+
+  return React.createElement(
+    nodeTypes[type],
+    { ...extraProps, ...props },
+    children.length === 1 ? children[0] : children);
 };
 
-const renderImage = (node, extraProps = {}) => {
+const SVG = ({ data, imageRef: ref }) => render(data, { ref });
-  if (typeof node === 'string') {
-    return node;
-  }
 
-  const { type, props, children } = node;
+SVG.propTypes = {
-
+  data: PropTypes.object.isRequired,
-  return React.createElement(nodeTypes[type], { ...extraProps, ...props }, renderChildren(children));
+  imageRef: PropTypes.func
 };
 
-export default renderImage;
+export default SVG;