Skip to content

Commit e176d84

Browse files
author
Robert Mosolgo
committed
Merge pull request #366 from axsuul/master
Support ReactDOM in react_ujs
2 parents 73a9627 + 575b694 commit e176d84

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lib/assets/javascripts/react_ujs.js.erb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@
5353
var propsJson = node.getAttribute(window.ReactRailsUJS.PROPS_ATTR);
5454
var props = propsJson && JSON.parse(propsJson);
5555

56-
React.render(React.createElement(constructor, props), node);
56+
// Prefer ReactDOM if defined (introduced in 0.14)
57+
var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
58+
59+
renderer.render(React.createElement(constructor, props), node);
5760
}
5861
},
5962

0 commit comments

Comments
 (0)