isomorfeus-react 16.9.15 → 16.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a624f8280c1b483397dadc3361be73488bb6004dc263aaec62d0bab21cf065
-  data.tar.gz: 48003a6d556f82771e4cbe4b63f163bb4f376c9077162f43114e52d9f73fa832
+  metadata.gz: fedd5a6611c5c9231a56f9802567a284247618373ae46226a133e8d03e3f789b
+  data.tar.gz: c05a730ae10644277b7ba47d84ea5ee98b3a97e798ee545f7556ea0e7d81b8e6
 SHA512:
-  metadata.gz: bf81b8abb2289a745047e4820a1706aa61d88e351009c894c57c0145fb03fdac4b8250eab814cb55545930d28a057150bdbc5e69b35392ab0acc1b4a9b5d3783
-  data.tar.gz: eec392fecf656b27d0ec43ce02dbc0d412f5a4ce59dd7d76438810b7867aac2cf8bdfeb64935f435a7da1985d8f83ca50e48c7c33de73bc0f8ace9cef815e7d1
+  metadata.gz: f2c4754cad2588166596905a3b356f8661543e74a95a916425d41fec9a30453f12dfabcc778020e7a0afc99aed95091d62fd5b4fb4b357e1e39ba7bf4b932fb0
+  data.tar.gz: bfc8d7f044194d64b2ccec8fe550bfbdb1504e333ff8ee3361c59a00c08d8152abeb1315c206be220e728f9e8c8f313b300cd7990836bf092a288e97c992e823

data/lib/isomorfeus-react.rb

@@ -20,7 +20,7 @@ if RUBY_ENGINE == 'opal'
 
   # allow mounting of components
   if Isomorfeus.on_browser?
-    require 'isomorfeus/top_level_browser'
+    require 'isomorfeus/top_level'
   else
     require 'isomorfeus/top_level_ssr'
   end

data/lib/isomorfeus/{top_level_browser.rb → top_level.rb}

@@ -10,7 +10,7 @@ module Isomorfeus
           component = nil
           begin
             component = component_name.constantize
-          rescue LoadError
+          rescue Exception
             @timeout_start = Time.now unless @timeout_start
             if (Time.now - @timeout_start) < 10
               `setTimeout(Opal.Isomorfeus.TopLevel['$mount!'], 100)`
@@ -33,8 +33,8 @@ module Isomorfeus
               }
             end
             begin
-              mount_component(component, props, root_element, hydrated)
-            rescue LoadError
+              Isomorfeus::TopLevel.mount_component(component, props, root_element, hydrated)
+            rescue Exception
               @timeout_start = Time.now unless @timeout_start
               if (Time.now - @timeout_start) < 10
                 `setTimeout(Opal.Isomorfeus.TopLevel['$mount!'], 100)`
@@ -61,7 +61,7 @@ module Isomorfeus
         # init in case it hasn't been run yet
         Isomorfeus.init
         on_ready do
-          mount_component(component, props, element_query)
+          Isomorfeus::TopLevel.mount_component(component, props, element_query)
         end
       end
 

data/lib/react.rb

@@ -60,24 +60,25 @@ module React
       if (args.length > 0) {
         var last_arg = args[args.length - 1];
         if (typeof last_arg === 'string' || last_arg instanceof String) {
-          if (args.length === 1) { Opal.React.internal_render(component, null, last_arg, null); }
-          else { Opal.React.internal_render(component, args[0], last_arg, null); }
-        } else { Opal.React.internal_render(component, args[0], null, block); }
-      } else { Opal.React.internal_render(component, null, null, block); }
+          if (args.length === 1) { return Opal.React.internal_render(component, null, last_arg, null); }
+          else { return Opal.React.internal_render(component, args[0], last_arg, null); }
+        } else { return Opal.React.internal_render(component, args[0], null, block); }
+      } else { return Opal.React.internal_render(component, null, null, block); }
     };
 
     self.internal_render = function(component, props, string_child, block) {
-      var children;
-      var block_result;
-      var react_element;
-      var native_props = null;
+      let children;
+      let react_element;
+      let native_props = null;
 
       if (string_child) {
         children = string_child;
       } 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" ||
+        let block_result = block.$call();
+        let last_buffer_length = Opal.React.render_buffer[Opal.React.render_buffer.length - 1].length;
+        let last_buffer_element = Opal.React.render_buffer[Opal.React.render_buffer.length - 1][last_buffer_length - 1];
+        if (block_result && block_result !== last_buffer_element && (block_result !== nil && (typeof block_result === "string" || typeof block_result.$$typeof === "symbol" ||
           (typeof block_result.constructor !== "undefined" && block_result.constructor === Array && block_result[0] && typeof block_result[0].$$typeof === "symbol")
           ))) {
           Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
@@ -86,9 +87,10 @@ module React
         if (children.length == 1) { children = children[0]; }
         else if (children.length == 0) { children = null; }
       }
-      if (props) { native_props = Opal.React.to_native_react_props(props); }
+      if (props && props !== nil) { native_props = Opal.React.to_native_react_props(props); }
       react_element = Opal.global.React.createElement(component, native_props, children);
       Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(react_element);
+      return react_element;
     };
 
     self.active_components = [];
@@ -129,9 +131,8 @@ module React
 
   def self.create_element(type, props = nil, children = nil, &block)
     %x{
-      var component = null;
-      var block_result = null;
-      var native_props = null;
+      let component = null;
+      let native_props = null;
       if (typeof type.react_component !== 'undefined') {
         component = type.react_component;
       } else {
@@ -139,12 +140,11 @@ module React
       }
 
       Opal.React.render_buffer.push([]);
-      #{
-        native_props = `Opal.React.to_native_react_props(props)` if props;
-      }
       if (block !== nil) {
-        block_result = block.$call()
-        if (block_result && (block_result !== nil && (typeof block_result === "string" || typeof block_result.$$typeof === "symbol" ||
+        let block_result = block.$call()
+        let last_buffer_length = Opal.React.render_buffer[Opal.React.render_buffer.length - 1].length;
+        let last_buffer_element = Opal.React.render_buffer[Opal.React.render_buffer.length - 1][last_buffer_length - 1];
+        if (block_result && block_result !== last_buffer_element && (block_result !== nil && (typeof block_result === "string" || typeof block_result.$$typeof === "symbol" ||
           (typeof block_result.constructor !== "undefined" && block_result.constructor === Array && block_result[0] && typeof block_result[0].$$typeof === "symbol")
           ))) {
           Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
@@ -153,6 +153,7 @@ module React
         if (children.length == 1) { children = children[0]; }
         else if (children.length == 0) { children = null; }
       }
+      if (props && props !== nil) { native_props = Opal.React.to_native_react_props(props); }
       return Opal.global.React.createElement(component, native_props, children);
     }
   end
@@ -162,7 +163,6 @@ module React
     proc { `native_function.call()` }
   end
 
-
   def self.create_ref
     React::Ref.new(`Opal.global.React.createRef()`)
   end

data/lib/react/component/features.rb

@@ -14,11 +14,12 @@ module React
           element = element_or_query
         end
         %x{
-          var block_result = null;
           Opal.React.render_buffer.push([]);
           if (block !== nil) {
-            block_result = block.$call()
-            if (block_result && (block_result !== nil && (typeof block_result === "string" || typeof block_result.$$typeof === "symbol" ||
+            let block_result = block.$call()
+            let last_buffer_length = Opal.React.render_buffer[Opal.React.render_buffer.length - 1].length;
+            let last_buffer_element = Opal.React.render_buffer[Opal.React.render_buffer.length - 1][last_buffer_length - 1];
+            if (block_result && block_result !== last_buffer_element && (block_result !== nil && (typeof block_result === "string" || typeof block_result.$$typeof === "symbol" ||
               (typeof block_result.constructor !== "undefined" && block_result.constructor === Array && block_result[0] && typeof block_result[0].$$typeof === "symbol")
               ))) {
               Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
@@ -26,7 +27,7 @@ module React
           }
           var react_element = Opal.global.React.createPortal(Opal.React.render_buffer.pop(), element);
           Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(react_element);
-          return null;
+          return react_element;
         }
       end
 

data/lib/react/component/resolution.rb

@@ -47,9 +47,7 @@ module React
                   component = constant.react_component;
                   break;
                 }
-              } catch(err) {
-                component = null;
-              }
+              } catch(err) { component = null; }
             }
             if (!component) {
               try {
@@ -57,13 +55,11 @@ module React
                 if (typeof constant.react_component !== 'undefined') {
                   component = constant.react_component;
                 }
-              } catch(err) {
-                component = null
-              }
+              } catch(err) { component = null; }
             }
           }
           if (component) {
-            Opal.React.internal_prepare_args_and_render(component, args, block);
+            return Opal.React.internal_prepare_args_and_render(component, args, block);
           } else {
             return #{_react_component_resolution_original_method_missing(component_name, *args, block)};
           }

data/lib/react/component/styles.rb

@@ -5,8 +5,6 @@ module React
         @native = native
       end
 
-      # TODO method chain access
-      # we have class.property
       def method_missing(prop, *args, &block)
         %x{
           if (!#@native || typeof #@native[prop] === 'undefined') { return #{nil}; }
@@ -17,6 +15,10 @@ module React
         }
       end
 
+      def to_h
+        `Opal.Hash.$new(#@native)`
+      end
+
       def to_n
         @native
       end

data/lib/react/context_wrapper.rb

@@ -8,18 +8,18 @@ module React
 
     def Consumer(*args, &block)
       %x{
-        var children = null;
-        var block_result = null;
-        var props = null;
-        var react_element;
+        let children = null;
+        let props = null;
 
-        if (args.length > 0) { props = args[0]; }
+        if (args.length > 0) { props = Opal.React.to_native_react_props(args[0]); }
 
-        var react_element = Opal.global.React.createElement(this.native.Consumer, props, function(value) {
+        let react_element = Opal.global.React.createElement(this.native.Consumer, props, function(value) {
           if (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" ||
+            let block_result = block.$call();
+            let last_buffer_length = Opal.React.render_buffer[Opal.React.render_buffer.length - 1].length;
+            let last_buffer_element = Opal.React.render_buffer[Opal.React.render_buffer.length - 1][last_buffer_length - 1];
+            if (block_result && block_result !== last_buffer_element && (block_result !== nil && (typeof block_result === "string" || typeof block_result.$$typeof === "symbol" ||
               (typeof block_result.constructor !== "undefined" && block_result.constructor === Array && block_result[0] && typeof block_result[0].$$typeof === "symbol")
               ))) {
               Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
@@ -38,7 +38,7 @@ module React
     def Provider(*args, &block)
       %x{
         var props = null;
-        if (args.length > 0) { props = args[0]; }
+        if (args.length > 0) { props = Opal.React.to_native_react_props(args[0]); }
         Opal.React.internal_render(this.native.Provider, props, null, block);
       }
     end

data/lib/react/function_component/resolution.rb

@@ -40,10 +40,7 @@ module React
               if (typeof constant.react_component !== 'undefined') {
                 component = constant.react_component;
               }
-            }
-            catch(err) {
-              component = null;
-            }
+            } catch(err) { component = null; }
           }
           if (!component) {
             try {
@@ -51,12 +48,10 @@ module React
               if (typeof constant.react_component !== 'undefined') {
                 component = constant.react_component;
               }
-            } catch(err) {
-              component = null
-            }
+            } catch(err) { component = null; }
           }
           if (component) {
-            Opal.React.internal_prepare_args_and_render(component, args, block);
+            return Opal.React.internal_prepare_args_and_render(component, args, block);
           } else {
             return #{_react_function_component_resolution_original_method_missing(component_name, *args, block)};
           }

data/lib/react/native_constant_wrapper.rb

@@ -16,7 +16,7 @@ module React
           component = #@native[name];
         }
         if (component) {
-          Opal.React.internal_prepare_args_and_render(component, args, block);
+          return Opal.React.internal_prepare_args_and_render(component, args, block);
         } else {
           #{raise NameError, "No such native Component #@const_name.#{name}"};
         }

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.9.15'
+  VERSION = '16.9.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.9.15
+  version: 16.9.16
 platform: ruby
 authors:
 - Jan Biedermann
@@ -173,7 +173,7 @@ files:
 - lib/isomorfeus/props/validate_hash_proxy.rb
 - lib/isomorfeus/props/validator.rb
 - lib/isomorfeus/react_view_helper.rb
-- lib/isomorfeus/top_level_browser.rb
+- lib/isomorfeus/top_level.rb
 - lib/isomorfeus/top_level_ssr.rb
 - lib/lucid_app/api.rb
 - lib/lucid_app/base.rb