fix: Add support for renderable Arrays of strings (#275)

doctyper · cwelch5 · commit aad5457f3d61 · 2017-05-09T10:54:59.000-07:00
* fix: Add support for anything renderable as children rather than just strings. Fixes #272
diff --git a/src/Helmet.js b/src/Helmet.js
@@ -187,7 +187,13 @@ const Helmet = (Component) => class HelmetWrapper extends React.Component {
                 return warn(`Only elements types ${VALID_TAG_NAMES.join(", ")} are allowed. Helmet does not support rendering <${child.type}> elements. Refer to our API for more information.`);
             }
 
-            if (nestedChildren && typeof nestedChildren !== "string") {
+            if (
+                nestedChildren &&
+                typeof nestedChildren !== "string" &&
+                (
+                    !Array.isArray(nestedChildren) || nestedChildren.some(nestedChild => typeof nestedChild !== "string")
+                )
+            ) {
                 throw new Error(`Helmet expects a string as a child of <${child.type}>. Did you forget to wrap your children in braces? ( <${child.type}>{\`\`}</${child.type}> ) Refer to our API for more information.`);
             }
         }
diff --git a/src/HelmetUtils.js b/src/HelmetUtils.js
@@ -301,8 +301,8 @@ const handleClientStateChange = (newState) => {
 };
 
 const updateTitle = (title, attributes) => {
-    if (typeof title === "string" && document.title !== title) {
-        document.title = title;
+    if (typeof title !== "undefined" && document.title !== title) {
+        document.title = Array.isArray(title) ? title.join("") : title;
     }
 
     updateAttributes(TAG_NAMES.TITLE, attributes);

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,13 @@ const Helmet = (Component) => class HelmetWrapper extends React.Component {`
`187`	`187`	return warn(`Only elements types ${VALID_TAG_NAMES.join(", ")} are allowed. Helmet does not support rendering <${child.type}> elements. Refer to our API for more information.`);
`188`	`188`	`}`
`189`	`189`
`190`		`- if (nestedChildren && typeof nestedChildren !== "string") {`
	`190`	`+ if (`
	`191`	`+ nestedChildren &&`
	`192`	`+ typeof nestedChildren !== "string" &&`
	`193`	`+ (`
	`194`	`+ !Array.isArray(nestedChildren) \|\| nestedChildren.some(nestedChild => typeof nestedChild !== "string")`
	`195`	`+ )`
	`196`	`+ ) {`
`191`	`197`	throw new Error(`Helmet expects a string as a child of <${child.type}>. Did you forget to wrap your children in braces? ( <${child.type}>{\`\`}</${child.type}> ) Refer to our API for more information.`);
`192`	`198`	`}`
`193`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,8 +301,8 @@ const handleClientStateChange = (newState) => {`
`301`	`301`	`};`
`302`	`302`
`303`	`303`	`const updateTitle = (title, attributes) => {`
`304`		`- if (typeof title === "string" && document.title !== title) {`
`305`		`- document.title = title;`
	`304`	`+ if (typeof title !== "undefined" && document.title !== title) {`
	`305`	`+ document.title = Array.isArray(title) ? title.join("") : title;`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`updateAttributes(TAG_NAMES.TITLE, attributes);`