Properly handle text nodes and allow htmltools tags

alandipert · alandipert · commit 2b96174de1fd · 2019-01-07T01:01:33.000-08:00
diff --git a/inst/www/react-tools/react-tools.js b/inst/www/react-tools/react-tools.js
@@ -11,9 +11,14 @@ window.reactR = (function () {
             && !components.hasOwnProperty(tag.name)) {
             throw new Error("Unknown component: " + tag.name);
         }
-        var args = [components[tag.name], tag.attribs];
+        var elem = components.hasOwnProperty(tag.name) ? components[tag.name] : tag.name,
+            args = [elem, tag.attribs];
         for (var i = 0; i < tag.children.length; i++) {
-            args.push(hydrate(components, tag.children[i]));
+            if (typeof tag.children[i] === 'string') {
+                args.push(tag.children[i]);
+            } else {
+                args.push(hydrate(components, tag.children[i]));
+            }
         }
         return React.createElement.apply(null, args);
     }

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,14 @@ window.reactR = (function () {`
`11`	`11`	`&& !components.hasOwnProperty(tag.name)) {`
`12`	`12`	`throw new Error("Unknown component: " + tag.name);`
`13`	`13`	`}`
`14`		`- var args = [components[tag.name], tag.attribs];`
	`14`	`+ var elem = components.hasOwnProperty(tag.name) ? components[tag.name] : tag.name,`
	`15`	`+ args = [elem, tag.attribs];`
`15`	`16`	`for (var i = 0; i < tag.children.length; i++) {`
`16`		`- args.push(hydrate(components, tag.children[i]));`
	`17`	`+ if (typeof tag.children[i] === 'string') {`
	`18`	`+ args.push(tag.children[i]);`
	`19`	`+ } else {`
	`20`	`+ args.push(hydrate(components, tag.children[i]));`
	`21`	`+ }`
`17`	`22`	`}`
`18`	`23`	`return React.createElement.apply(null, args);`
`19`	`24`	`}`