feat(Template): allow template functions to return a React element

algolia · Feb 9, 2016 · 748077d · 748077d
1 parent 0f9296d
commit 748077d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/components/Template.js b/src/components/Template.js
@@ -27,16 +27,22 @@ function Template(props) {
   }
 
   const otherProps = omit(props, keys(Template.propTypes));
-  const isElement = React.isValidElement(content);
+
+  if (React.isValidElement(content)) {
+    return (
+      <div
+        {...otherProps}
+        className={props.cssClass}
+      >{content}</div>
+    );
+  }
 
   return (
     <div
       {...otherProps}
       className={props.cssClass}
-      dangerouslySetInnerHTML={isElement ? null : {__html: content}}
-    >
-      {isElement ? content : null}
-    </div>
+      dangerouslySetInnerHTML={{__html: content}}
+    />
   );
 }
 

diff --git a/src/components/__tests__/Template-test.js b/src/components/__tests__/Template-test.js
@@ -54,7 +54,7 @@ describe('Template', () => {
       const out = renderer.getRenderOutput();
 
       const content = 'it also works with functions';
-      expect(out).toEqualJSX(<div className={undefined} dangerouslySetInnerHTML={null}><p>{content}</p></div>);
+      expect(out).toEqualJSX(<div className={undefined}><p>{content}</p></div>);
     });
 
     it('can configure compilation options', () => {