react-rails 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47811f17053f671c8511622eee8e9df956613821
-  data.tar.gz: 763dfb23708e0ba58c1ce85b759b544afef20e0b
+  metadata.gz: 871c8935efe49325b78955b744dd749664078a23
+  data.tar.gz: 5c14ae74ab1c66edf2eafb95b7d7427a7c7f1b4e
 SHA512:
-  metadata.gz: 85bc51014a6313d578fb248cc1909b6cce1a0a67414711d4123529d8a5e7d475bb1790acf36bb14d0b95885128239f86dbfdd00697bd6055f8e7e607ab6e8909
-  data.tar.gz: 02fa508f9b56c73e974da5eb502ca2dec8cbff7e92a5e117fd60b384f51232c5c59364af598283c5d5e5a1bfb50d9a3fc7d2821d831ebf784d3a44334894a701
+  metadata.gz: 4928107a478a44c2afa03db3a71e3eb2fb0888d0835f047b254c93fc63e7236021f6ee1392041a1cd5632d8922bf30f1d10e25ff9d3a68bd9b8c83d4ce3201ff
+  data.tar.gz: 1a49da7b4ccfe06517e37bbf520233a51eb528351bca4ace5abbadead5e918c4ee2e6b18cf4c6d7f82d58f4f64d641bddfdf1e91abd4cce375b9382a6afdf100

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-rails
 
+#### Breaking Changes
+
+#### New Features
+
+#### Deprecation
+
+#### Bug Fixes
+
+## 2.4.3
+#### Bug Fixes
+- Call ReactDOM.render() when react_component :prerender option is falsy, instead of ReactDOM.hydrate() #844, #842
+
 ## 2.4.2
 #### Bug Fixes
 - ReactDOM.hydrate() may not be defined for everyone, it will now use hydrate if it is defined or fallback to render #832

data/lib/assets/javascripts/react_ujs.js

@@ -240,6 +240,9 @@ var ReactRailsUJS = {
   // example: `data-react-props="{\"item\": { \"id\": 1, \"name\": \"My Item\"} }"`
   PROPS_ATTR: 'data-react-props',
 
+  // This attribute holds which method to use between: ReactDOM.hydrate, ReactDOM.render
+  RENDER_ATTR: 'data-hydrate',
+
   // If jQuery is detected, save a reference to it for event handlers
   jQuery: (typeof window !== 'undefined') && (typeof window.jQuery !== 'undefined') && window.jQuery,
 
@@ -307,6 +310,7 @@ var ReactRailsUJS = {
       var constructor = ujs.getConstructor(className);
       var propsJson = node.getAttribute(ujs.PROPS_ATTR);
       var props = propsJson && JSON.parse(propsJson);
+      var hydrate = node.getAttribute(ujs.RENDER_ATTR);
 
       if (!constructor) {
         var message = "Cannot find component: '" + className + "'"
@@ -315,7 +319,7 @@ var ReactRailsUJS = {
         }
         throw new Error(message + ". Make sure your component is available to render.")
       } else {
-        if (typeof ReactDOM.hydrate === "function") {
+        if (hydrate && typeof ReactDOM.hydrate === "function") {
           ReactDOM.hydrate(React.createElement(constructor, props), node);
         } else {
           ReactDOM.render(React.createElement(constructor, props), node);

data/lib/react/rails/component_mount.rb

@@ -39,6 +39,7 @@ module React
           html_options[:data].tap do |data|
             data[:react_class] = name
             data[:react_props] = (props.is_a?(String) ? props : props.to_json)
+            data[:hydrate] = 't' if prerender_options
           end
         end
         html_tag = html_options[:tag] || :div

data/lib/react/rails/version.rb

@@ -2,6 +2,6 @@ module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
     # and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
-    VERSION = '2.4.2'
+    VERSION = '2.4.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Paul O’Shannessy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal