isomorfeus-react 16.8.4 → 16.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628a938fb57502749eff1d8736a86caae34e64bc297ac010979734d23706756f
-  data.tar.gz: b8b7becfb6b8a18b39332120d7b26c83276f3758af83b2c0562551e03e2ef560
+  metadata.gz: d8a17f89bdbc05a905aca55121053827da7546aaef0d282426457d7c7a7cdc18
+  data.tar.gz: 42eb95d1c5573a6cf22093c95638698a82d31cc2eebfb57b71b528d35d8bd35b
 SHA512:
-  metadata.gz: 4d14d2ea8264daffdba51b4c751276ccdb9a0b9a7a3207256b5685ed59e6e23a20cf10d2f5f7998b4b36dc8e75b7dc0384978b4700b3fbbaa3425c401037fe14
-  data.tar.gz: '04869ca2a335a6ab7d227c13ba9b1b8451399e68f6ad3cc16c504485d9b38d0713ba9885727df6151080a8b4aa8e5ed36e6009508383f84d9be552b5ace77125'
+  metadata.gz: a68d65b5722fcca6fdb469bb19aade87fe603c1c6a46b62c3a5bfadc3e9a37e389be1ea77bb493e53faceb51de16cc09330223d7f3aaf26661c0be20990a1e3d
+  data.tar.gz: ca252549c6640b4830c32cd224a6b395d04ec764ccb0f2f9d94fcebae55c97090170a488ab6be61393691df55cddd51640a8013b70da42d9b2a42d1b7b0d56f6

data/lib/isomorfeus/config.rb

@@ -58,6 +58,7 @@ module Isomorfeus
 
       def force_render
         top_component.JS.forceUpdate()
+        nil
       end
     end
 

data/lib/lucid_component/api.rb

@@ -74,7 +74,7 @@ module LucidComponent
               self.lucid_react_component.defaultProps = { isomorfeus_store: Opal.Hash.$new() };
             }
           }
-          @default_props = React::Component::Props.new(`self.lucid_react_component.defaultProps`)
+          @default_props = React::Component::Props.new(`{props: self.lucid_react_component.defaultProps}`)
         end
       end
     end

data/lib/lucid_component/initializer.rb

@@ -4,7 +4,7 @@ module LucidComponent
       @native = native_component
       @app_store = `Opal.React.ReduxComponent.AppStoreProxy.$new(#{self}, 'props')`
       @class_store = `Opal.React.ReduxComponent.ClassStoreProxy.$new(#{self}, 'props')`
-      @props = `Opal.React.Component.Props.$new(#@native.props)`
+      @props = `Opal.React.Component.Props.$new(#@native)`
       @state = `Opal.React.Component.State.$new(#@native)`
       @store = `Opal.React.ReduxComponent.InstanceStoreProxy.$new(#{self}, 'props')`
     end

data/lib/lucid_component/native_component_constructor.rb

@@ -82,7 +82,10 @@ module LucidComponent
               } else if (next_props.hasOwnProperty(property)) {
                 if (!this.props.hasOwnProperty(property)) { return true; };
                 if (property == "children") { if (next_props.children !== this.props.children) { return true; }}
-                else if (typeof next_props[property] !== "undefined" && typeof next_props[property]['$!='] !== "undefined" && typeof this.props[property] !== "undefined" && typeof this.props[property]['$!='] !== "undefined") {
+                else if (typeof next_props[property] !== "undefined" && next_props[property] !== null &&
+                         typeof next_props[property]['$!='] !== "undefined" &&
+                         typeof this.props[property] !== "undefined" && this.props[property] !== null &&
+                         typeof this.props[property]['$!='] !== "undefined") {
                   if (#{ !! (`next_props[property]` != `this.props[property]`) }) { return true; };
                 } else if (next_props[property] !== this.props[property]) { return true; };
               }
@@ -90,7 +93,8 @@ module LucidComponent
             for (var property in next_state) {
               if (next_state.hasOwnProperty(property)) {
                 if (!this.state.hasOwnProperty(property)) { return true; };
-                if (typeof next_state[property]['$!='] !== "undefined" && typeof this.state[property]['$!='] !== "undefined") {
+                if (next_state[property] !== null && typeof next_state[property]['$!='] !== "undefined" &&
+                    this.state[property] !== null && typeof this.state[property]['$!='] !== "undefined") {
                   if (#{ !! (`next_state[property]` != `this.state[property]`) }) { return true };
                 } else if (next_state[property] !== this.state[property]) { return true };
               }

data/lib/lucid_material/component/native_component_constructor.rb

@@ -78,7 +78,10 @@ module LucidMaterial
                 } else if (next_props.hasOwnProperty(property)) {
                   if (!this.props.hasOwnProperty(property)) { return true; };
                   if (property == "children") { if (next_props.children !== this.props.children) { return true; }}
-                  else if (typeof next_props[property] !== "undefined" && typeof next_props[property]['$!='] !== "undefined" && typeof this.props[property] !== "undefined" && typeof this.props[property]['$!='] !== "undefined") {
+                  else if (typeof next_props[property] !== "undefined" && next_props[property] !== null &&
+                           typeof next_props[property]['$!='] !== "undefined" &&
+                           typeof this.props[property] !== "undefined" && this.props[property] !== null &&
+                           typeof this.props[property]['$!='] !== "undefined") {
                     if (#{ !! (`next_props[property]` != `this.props[property]`) }) { return true; };
                   } else if (next_props[property] !== this.props[property]) { return true; };
                 }
@@ -86,7 +89,8 @@ module LucidMaterial
               for (var property in next_state) {
                 if (next_state.hasOwnProperty(property)) {
                   if (!this.state.hasOwnProperty(property)) { return true; };
-                  if (typeof next_state[property]['$!='] !== "undefined" && typeof this.state[property]['$!='] !== "undefined") {
+                  if (next_state[property] !== null && typeof next_state[property]['$!='] !== "undefined" &&
+                      this.state[property] !== null && typeof this.state[property]['$!='] !== "undefined") {
                     if (#{ !! (`next_state[property]` != `this.state[property]`) }) { return true };
                   } else if (next_state[property] !== this.state[property]) { return true };
                 }

data/lib/react.rb

@@ -46,6 +46,10 @@ module React
             }
           } else if (keys[i].startsWith("aria_")) {
             result[keys[i].replace("_", "-")] = ruby_style_props['$[]'](keys[i]);
+          } else if (keys[i] === "style") {
+            var val = ruby_style_props['$[]'](keys[i]);
+            if (typeof val.$$is_hash !== "undefined") { val = val.$to_n() }
+            result["style"] = val;
           } else {
             result[Opal.React.lower_camelize(keys[i])] = ruby_style_props['$[]'](keys[i]);
           }
@@ -71,7 +75,7 @@ module React
 
       if (string_child) {
         children = string_child;
-      } else if (block !== nil) {
+      } else if (block && block !== nil) {
         Opal.React.render_buffer.push([]);
         block_result = block.$call();
         if (block_result && (block_result !== nil && (typeof block_result === "string" || typeof block_result.$$typeof === "symbol" ||
@@ -181,7 +185,7 @@ module React
     if block_given?
       %x{
         var fun = function(prev_props, next_props) {
-          return #{block.call(::React::Component::Props.new(prev_props), ::React::Component::Props.new(next_props))};
+          return #{block.call(::React::Component::Props.new(`{props: prev_props}`), ::React::Component::Props.new(`{props: next_props}`))};
         }
         return Opal.global.React.memo(function_component, fun);
       }

data/lib/react/component/api.rb

@@ -92,7 +92,7 @@ module React
                 self.lucid_react_component.defaultProps = {};
               }
             }
-            @default_props = `Opal.React.Component.Props.$new(self.react_component.defaultProps)`
+            @default_props = `Opal.React.Component.Props.$new({props: self.react_component.defaultProps})`
           end
 
           def render(&block)

data/lib/react/component/callbacks.rb

@@ -32,7 +32,7 @@ module React
             %x{
               var fun = function(prev_props, prev_state, snapshot) {
                 Opal.React.active_redux_components.push(this.__ruby_instance);
-                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new(prev_props)`,
+                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new({props: prev_props})`,
                                                        `Opal.React.Component.State.$new({state: prev_state})`,
                                                        `snapshot`, &block)};
                 Opal.React.active_redux_components.pop();
@@ -73,7 +73,7 @@ module React
             %x{
               var fun = function(props, state) {
                 Opal.React.active_redux_components.push(this.__ruby_instance);
-                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new(props)`,
+                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new({props: props})`,
                                                        `Opal.React.Component.State.$new({state: state})`,
                                                        &block)};
                 Opal.React.active_redux_components.pop();
@@ -87,7 +87,7 @@ module React
             %x{
               var fun = function(prev_props, prev_state) {
                 Opal.React.active_redux_components.push(this.__ruby_instance);
-                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new(prev_props)`,
+                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new({props: prev_props})`,
                                                        `Opal.React.Component.State.$new({state: prev_state})`,
                                                        &block)};
                 Opal.React.active_redux_components.pop();

data/lib/react/component/features.rb

@@ -14,9 +14,7 @@ module React
           element = element_or_query
         end
         %x{
-          var children = null;
           var block_result = null;
-
           Opal.React.render_buffer.push([]);
           if (block !== nil) {
             block_result = block.$call()

data/lib/react/component/initializer.rb

@@ -3,7 +3,7 @@ module React
     module Initializer
       def initialize(native_component)
         @native = native_component
-        @props = `Opal.React.Component.Props.$new(#@native.props)`
+        @props = `Opal.React.Component.Props.$new(#@native)`
         @state = `Opal.React.Component.State.$new(#@native)`
       end
     end

data/lib/react/component/native_component_constructor.rb

@@ -60,7 +60,10 @@ module React
                   if (next_props.hasOwnProperty(property)) {
                     if (!this.props.hasOwnProperty(property)) { return true; };
                     if (property == "children") { if (next_props.children !== this.props.children) { return true; }}
-                    else if (typeof next_props[property] !== "undefined" && typeof next_props[property]['$!='] !== "undefined" && typeof this.props[property] !== "undefined" && typeof this.props[property]['$!='] !== "undefined") {
+                    else if (typeof next_props[property] !== "undefined" && next_props[property] !== null &&
+                             typeof next_props[property]['$!='] !== "undefined" &&
+                             typeof this.props[property] !== "undefined" && this.props[property] !== null &&
+                             typeof this.props[property]['$!='] !== "undefined") {
                       if (#{ !! (`next_props[property]` != `this.props[property]`) }) { return true; };
                     } else if (next_props[property] !== this.props[property]) { return true; };
                   }
@@ -68,7 +71,8 @@ module React
                 for (var property in next_state) {
                   if (next_state.hasOwnProperty(property)) {
                     if (!this.state.hasOwnProperty(property)) { return true; };
-                    if (typeof next_state[property]['$!='] !== "undefined" && typeof this.state[property]['$!='] !== "undefined") {
+                    if (next_state[property] !== null && typeof next_state[property]['$!='] !== "undefined" &&
+                        this.state[property] !== null && typeof this.state[property]['$!='] !== "undefined") {
                       if (#{ !! (`next_state[property]` != `this.state[property]`) }) { return true };
                     } else if (next_state[property] !== this.state[property]) { return true };
                   }

data/lib/react/component/props.rb

@@ -6,52 +6,52 @@ module React
       def method_missing(prop, *args, &block)
         %x{
           var prop_name = Opal.React.lower_camelize(prop);
-          if (typeof #@native[prop_name] === 'undefined') { return #{nil}; }
-          return #@native[prop_name];
+          if (typeof #@native.props[prop_name] === 'undefined') { return #{nil}; }
+          return #@native.props[prop_name];
         }
       end
 
       def classes
-        @classes ||= `Opal.React.Component.Styles.$new(#@native.classes)`
+        @classes ||= `Opal.React.Component.Styles.$new(#@native.props.classes)`
       end
 
       def isomorfeus_store
-        @native.JS[:isomorfeus_store]
+        @native.JS[:props].JS[:isomorfeus_store]
       end
 
       # for router convenience
       def history
         return @history if @history
-        return nil unless @native.JS[:history]
-        if @native.JS[:history].JS[:pathname]
-          @history = React::Component::History.new(@native.JS[:history])
+        return nil unless @native.JS[:props].JS[:history]
+        if @native.JS[:props].JS[:history].JS[:pathname]
+          @history = React::Component::History.new(@native.JS[:props].JS[:history])
         else
-          @native.JS[:history]
+          @native.JS[:props].JS[:history]
         end
       end
 
       def location
         return @location if @location
-        return nil unless @native.JS[:location]
-        if @native.JS[:location].JS[:pathname]
-          @location = React::Component::Location.new(@native.JS[:location])
+        return nil unless @native.JS[:props].JS[:location]
+        if @native.JS[:props].JS[:location].JS[:pathname]
+          @location = React::Component::Location.new(@native.JS[:props].JS[:location])
         else
-          @native.JS[:location]
+          @native.JS[:props].JS[:location]
         end
       end
 
       def match
         return @match if @match
-        return nil unless @native.JS[:match]
-        if @native.JS[:match].JS[:path]
-          @match = React::Component::Match.new(@native.JS[:match])
+        return nil unless @native.JS[:props].JS[:match]
+        if @native.JS[:props].JS[:match].JS[:path]
+          @match = React::Component::Match.new(@native.JS[:props].JS[:match])
         else
-          @native.JS[:match]
+          @native.JS[:props].JS[:match]
         end
       end
 
       def to_n
-        @native
+        @native.JS[:props]
       end
     end
   end

data/lib/react/component/unsafe_api.rb

@@ -14,7 +14,7 @@ module React
           def unsafe_component_will_receive_props(&block)
             %x{
               self.react_component.prototype.UNSAFE_componentWillReceiveProps = function(next_props) {
-                return #{`this.__ruby_instance`.instance_exec(React::Component::Props.new(`next_props`), &block)};
+                return #{`this.__ruby_instance`.instance_exec(React::Component::Props.new(`{props: next_props}`), &block)};
               }
             }
           end
@@ -22,7 +22,7 @@ module React
           def unsafe_component_will_update(&block)
             %x{
               self.react_component.prototype.UNSAFE_componentWillUpdate = function(next_props, next_state) {
-                return #{`this.__ruby_instance`.instance_exec(React::Component::Props.new(`next_props`), `Opal.Hash.$new(next_state)`, &block)};
+                return #{`this.__ruby_instance`.instance_exec(React::Component::Props.new(`{props: next_props}`), `Opal.Hash.$new(next_state)`, &block)};
               }
             }
           end

data/lib/react/function_component/api.rb

@@ -4,7 +4,7 @@ module React
       attr_accessor :props
 
       def initialize(props)
-        @props = ::React::Component::Props.new(props)
+        @props = ::React::Component::Props.new(`{props: props}`)
       end
 
       def use_callback(deps, &block)

data/lib/react/memo_component/creator.rb

@@ -16,8 +16,8 @@ module React
         def props_are_equal?(&block)
           %x{
             base.equality_checker = function (prev_props, next_props) {
-              var prev_ruby_props = Opal.React.Component.Props.$new(prev_props);
-              var next_ruby_props = Opal.React.Component.Props.$new(next_props);
+              var prev_ruby_props = Opal.React.Component.Props.$new({props: prev_props});
+              var next_ruby_props = Opal.React.Component.Props.$new({props: next_props});
               return #{base.new(`{}`).instance_exec(`prev_ruby_props`, `next_ruby_props`, &block)};
             }
           }

data/lib/react/redux_component/initializer.rb

@@ -5,7 +5,7 @@ module React
         @native = native_component
         @app_store = `Opal.React.ReduxComponent.AppStoreProxy.$new(#{self})`
         @class_store = `Opal.React.ReduxComponent.ClassStoreProxy.$new(#{self})`
-        @props = `Opal.React.Component.Props.$new(#@native.props)`
+        @props = `Opal.React.Component.Props.$new(#@native)`
         @state = `Opal.React.Component.State.$new(#@native)`
         @store = `Opal.React.ReduxComponent.InstanceStoreProxy.$new(#{self})`
       end

data/lib/react/redux_component/native_component_constructor.rb

@@ -90,7 +90,10 @@ module React
                 if (next_props.hasOwnProperty(property)) {
                   if (!this.props.hasOwnProperty(property)) { return true; };
                   if (property == "children") { if (next_props.children !== this.props.children) { return true; }}
-                  else if (typeof next_props[property] !== "undefined" && typeof next_props[property]['$!='] !== "undefined" && typeof this.props[property] !== "undefined" && typeof this.props[property]['$!='] !== "undefined") {
+                  else if (typeof next_props[property] !== "undefined" && next_props[property] !== null &&
+                           typeof next_props[property]['$!='] !== "undefined" &&
+                           typeof this.props[property] !== "undefined" && this.props[property] !== null &&
+                           typeof this.props[property]['$!='] !== "undefined") {
                     if (#{ !! (`next_props[property]` != `this.props[property]`) }) { return true; };
                   } else if (next_props[property] !== this.props[property]) { return true; };
                 }
@@ -104,7 +107,8 @@ module React
                   }
                 } else if (next_state.hasOwnProperty(property)) {
                   if (!this.state.hasOwnProperty(property)) { return true; };
-                  if (typeof next_state[property]['$!='] !== "undefined" && typeof this.state[property]['$!='] !== "undefined") {
+                  if (next_state[property] !== null && typeof next_state[property]['$!='] !== "undefined" &&
+                      this.state[property] !== null && typeof this.state[property]['$!='] !== "undefined") {
                     if (#{ !! (`next_state[property]` != `this.state[property]`) }) { return true };
                   } else if (next_state[property] !== this.state[property]) { return true };
                 }

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.8.4'
+  VERSION = '16.8.5'
 end

metadata

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