isomorfeus-react 16.9.6 → 16.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db41ef26a24fa9c7fc245c8b438898364fe03203c954a5aafe3c5d871626f88
-  data.tar.gz: 5967eab20528f06f4f273e1294dd82cd6f53ed66c3c6f212bfcfb7081b984a6b
+  metadata.gz: a8597a16d99c067226f1832565d36bf5c9021a4f5b54a1ee2cd23c1c6da4309a
+  data.tar.gz: e712d0ebd4a43cf8e6311dfb1cf7b8dacdc1da3aed607f846f28fbd9a95c82dd
 SHA512:
-  metadata.gz: 14153b0edb03c88fb5f17716ceee0fddd64a473fee15cde590b89abe012b16b0a765327b0d6a76d0020ac518b5bddd79a35211b71617a87ad682525043b39bbd
-  data.tar.gz: 9e4ce1d9545488c3873043d34b79f4add71b46e47b883e766af9e8337fdd91183c14d5c5525d2c56fad3d77ed8a697aac291425e8db9925536c35ceea037487f
+  metadata.gz: 46507c9416c5c04f684e4ceea2e7667c8c90976ded05c8ddb0e268b7420fc97bb1a41a2a37a57f5aa39d2b0ad5699d4ae74e3e93582251b56aa726c7ff30e497
+  data.tar.gz: 5884fb376630de3ae0fe2100dd86dd59c38b9918f9beb79ce38339a43049aa897b353a3e3dfe2630575187786c5515efc94e02e0307e394934db69ee325ed225

data/lib/isomorfeus/config.rb

@@ -73,7 +73,14 @@ module Isomorfeus
       end
 
       def force_render
-        top_component.JS.forceUpdate()
+        begin
+          if top_component
+            ReactDOM.find_dom_node(top_component) # if not mounted will raise
+            top_component.JS.forceUpdate()
+          end
+        rescue
+          `location.reload()` if on_browser?
+        end
         nil
       end
     end

data/lib/isomorfeus/top_level_browser.rb

@@ -6,21 +6,26 @@ module Isomorfeus
         root_element = `document.querySelector('div[data-iso-root]')`
         component_name = root_element.JS.getAttribute('data-iso-root')
         Isomorfeus.env = root_element.JS.getAttribute('data-iso-env')
-        component = component_name.constantize
-        props_json = root_element.JS.getAttribute('data-iso-props')
-        props = `Opal.Hash.$new(JSON.parse(props_json))`
-        hydrated = root_element.JS.getAttribute('data-iso-hydrated')
-        state_json = root_element.JS.getAttribute('data-iso-state')
-        if state_json
-          %x{
-            var state = JSON.parse(state_json);
-            var keys = Object.keys(state);
-            for(var i=0; i < keys.length; i++) {
-              global.Opal.Isomorfeus.store.native.dispatch({ type: keys[i].toUpperCase(), set_state: state[keys[i]] });
+        begin
+          component = component_name.constantize
+          props_json = root_element.JS.getAttribute('data-iso-props')
+          props = `Opal.Hash.$new(JSON.parse(props_json))`
+          hydrated = root_element.JS.getAttribute('data-iso-hydrated')
+          state_json = root_element.JS.getAttribute('data-iso-state')
+          if state_json
+            %x{
+              var state = JSON.parse(state_json);
+              var keys = Object.keys(state);
+              for(var i=0; i < keys.length; i++) {
+                global.Opal.Isomorfeus.store.native.dispatch({ type: keys[i].toUpperCase(), set_state: state[keys[i]] });
+              }
             }
-          }
+          end
+          mount_component(component, props, root_element, hydrated)
+        rescue
+          @timeout_start = Time.now unless @timeout_start
+          `setTimeout(#{mount!}, 100)` if (Time.now - @timeout_start) < 10
         end
-        mount_component(component, props, root_element, hydrated)
       end
     end
 

data/lib/lucid_material/component/api.rb

@@ -4,9 +4,22 @@ module LucidMaterial
       def self.included(base)
         base.instance_exec do
           def styles(styles_hash = nil, &block)
-            styles_hash = block.call if block_given?
-            `base.jss_styles = #{styles_hash.to_n}` if styles_hash
-            `Opal.Hash.$new(base.jss_styles)`
+            if block_given?
+              %x{
+                base.jss_styles = function(theme) {
+                  var result = block.$call(Opal.Hash.$new(theme));
+                  return result.$to_n();
+                }
+              }
+              nil
+            elsif styles_hash
+              `base.jss_styles = #{styles_hash.to_n}` if styles_hash
+              styles_hash
+            elsif `typeof base.jss_styles === 'object'`
+              `Opal.Hash.$new(base.jss_styles)`
+            else
+              nil
+            end
           end
         end
 

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.9.6'
+  VERSION = '16.9.7'
 end

data/lib/react_dom.rb

@@ -6,7 +6,7 @@ module ReactDOM
     end
 
     def find_dom_node(native_react_component)
-      `Opal.global.ReactDOM.findDomNode(native_react_component)`
+      `Opal.global.ReactDOM.findDOMNode(native_react_component)`
     end
 
     def hydrate(native_react_element, container, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.9.6
+  version: 16.9.7
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj