isomorfeus-react 16.12.7 → 16.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f96948bf037f1b78dab34b59fe4d6ff0f94a2cd13582f9645338c6c96e908d9
-  data.tar.gz: 0f2e08f924bc7f29d610eb5480cb3f8d539e41c46da71e8fac512a7849b937f0
+  metadata.gz: c5d90a7865eb93c6d4fe0355e0dbaf8e03cae4bb2ebaabf33f78adecd9203f26
+  data.tar.gz: bbd20f3e1025ae402846b5688677922ba23c54802d9ed87ea36b670282bb1244
 SHA512:
-  metadata.gz: 8f2cb2de9ef94c191b6458250f1c4f00389bf516963245afce072efb809951785a569e41fad5b1e8c30b0dd447fed4366fd72c96a8dbf0f357f4b75540a702ae
-  data.tar.gz: 82a37cee63c365ba0102eec88fb0667c8cfbf2b40a2d8430fbf7d137e349a9cb7330f32c414e1e177f37f20330752f9e2c36a62cc49f1491b224468b90fe763a
+  metadata.gz: 3a50131debc40514af9eb558afe63137679d4b16a1b0b08baefa303c27a20ac3d9cc2a669eca9ca5900d1125712eb10bd5d465d6fd716a687aefdf19c8e0e0d6
+  data.tar.gz: 0ad176660638690cecf5eb8d36152ea567dc3b61af5e193f3fe6f0538830b02cec831d352a3aa69d3fd05984867c06fbe935ec81b252ffb70b14828113d9d7e5

data/lib/isomorfeus-react.rb

@@ -154,10 +154,6 @@ else
 
   Opal.append_path(__dir__.untaint)
 
-  if Dir.exist?('isomorfeus')
-    Opal.append_path(File.expand_path('isomorfeus')) unless Opal.paths.include?(File.expand_path('isomorfeus'))
-  end
-
   require 'concurrent'
   require 'zeitwerk'
 

data/lib/isomorfeus_react/lucid_app/native_lucid_component_constructor.rb

@@ -75,8 +75,11 @@ module LucidApp
             if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { oper.render_buffer[oper.render_buffer.length - 1].push(block_result); }
             oper.active_redux_components.pop();
             oper.active_components.pop();
+            let children = oper.render_buffer.pop();
+            if (children.length === 1) { children = children[0]; }
+            else if (children.length === 0) { children = null; }
             // console.log("lucid app popping", oper.render_buffer, oper.render_buffer.toString());
-            return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, oper.render_buffer.pop());
+            return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, children);
           }
           data_access() {
             this.state.isomorfeus_store_state;

data/lib/isomorfeus_react/lucid_component/native_lucid_component_constructor.rb

@@ -64,7 +64,9 @@ module LucidComponent
             oper.active_redux_components.pop();
             oper.active_components.pop();
             // console.log("lucid component popping", oper.render_buffer, oper.render_buffer.toString());
-            return oper.render_buffer.pop();
+            let result = oper.render_buffer.pop();
+            if (result.length === 1) { return result[0]; }
+            return result;
           }
           data_access() {
             return this.props.store;

data/lib/isomorfeus_react/lucid_func/native_component_constructor.rb

@@ -46,7 +46,9 @@ module LucidFunc
           oper.active_redux_components.pop();
           oper.active_components.pop();
           // console.log("function popping", oper.render_buffer, oper.render_buffer.toString());
-          return oper.render_buffer.pop();
+          let result = oper.render_buffer.pop();
+          if (result.length === 1) { return result[0]; }
+          return result;
         }, base.equality_checker);
         base.react_component.displayName = #{component_name};
       }

data/lib/isomorfeus_react/react/memo_component/native_component_constructor.rb

@@ -23,7 +23,9 @@ module React
             if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { oper.render_buffer[oper.render_buffer.length - 1].push(block_result); }
             oper.active_components.pop();
             // console.log("memo popping", oper.render_buffer, oper.render_buffer.toString());
-            return oper.render_buffer.pop();
+            let result = oper.render_buffer.pop();
+            if (result.length === 1) { return result[0]; }
+            return result;
           }, base.equality_checker);
           base.react_component.displayName = #{component_name};
         }

data/lib/isomorfeus_react_material/lucid_material/func/native_component_constructor.rb

@@ -47,7 +47,9 @@ module LucidMaterial
             oper.active_redux_components.pop();
             oper.active_components.pop();
             // console.log("function popping", oper.render_buffer, oper.render_buffer.toString());
-            return oper.render_buffer.pop();
+            let result = oper.render_buffer.pop();
+            if (result.length === 1) { return result[0]; }
+            return result;
           }, base.equality_checker);
           base.react_component.displayName = #{component_name};
         }

data/lib/react.rb

@@ -4,12 +4,13 @@ module React
     self.render_buffer = [];
 
     self.set_validate_prop = function(component, prop_name) {
-      if (typeof component.react_component.propTypes == "undefined") {
-        component.react_component.propTypes = {};
-        component.react_component.propValidations = {};
-        component.react_component.propValidations[prop_name] = {};
+      let core = component.react_component;
+      if (typeof core.propTypes == "undefined") {
+        core.propTypes = {};
+        core.propValidations = {};
+        core.propValidations[prop_name] = {};
       }
-      component.react_component.propTypes[prop_name] = component.react_component.prototype.validateProp;
+      core.propTypes[prop_name] = core.prototype.validateProp;
     };
 
     self.lower_camelize = function(snake_cased_word) {
@@ -62,7 +63,7 @@ module React
     };
 
     self.internal_prepare_args_and_render = function(component, args, block) {
-      let operain = Opal.React.internal_render;
+      const operain = Opal.React.internal_render;
       if (args.length > 0) {
         let last_arg = args[args.length - 1];
         if (last_arg && last_arg.constructor === String) {
@@ -73,7 +74,7 @@ module React
     };
 
     self.internal_render = function(component, props, string_child, block) {
-      let operabu = Opal.React.render_buffer;
+      const operabu = Opal.React.render_buffer;
       let children;
       let native_props = null;
       if (string_child) {
@@ -132,19 +133,20 @@ module React
 
   def self.create_element(type, props = nil, children = nil, &block)
     %x{
+      const operabu = Opal.React.render_buffer;
       let component = null;
       let native_props = null;
       if (typeof type.react_component !== 'undefined') { component = type.react_component; }
       else { component = type; }
       if (block !== nil) {
-        Opal.React.render_buffer.push([]);
+        operabu.push([]);
         // console.log("create_element pushed", Opal.React.render_buffer, Opal.React.render_buffer.toString());
         let block_result = block.$call();
         if (block_result && (block_result.constructor === String || block_result.constructor === Number)) {
-          Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
+          operabu[operabu.length - 1].push(block_result);
         }
         // console.log("create_element popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
-        children = Opal.React.render_buffer.pop();
+        children = operabu.pop();
         if (children.length == 1) { children = children[0]; }
         else if (children.length == 0) { children = null; }
       } else if (children === nil) { children = null; }

data/lib/react/component/api.rb

@@ -98,6 +98,15 @@ module React
       end
       alias gre get_react_element
 
+      def method_ref(method_symbol)
+        %x{
+          if (#@native.method_refs && #@native.method_refs[#{method_symbol}]) { return #@native.method_refs[#{method_symbol}]; }
+          if (!#@native.method_refs) { #@native.method_refs = {}; }
+          #@native.method_refs[#{method_symbol}] = #{method(method_symbol)};
+          return #@native.method_refs[#{method_symbol}];
+        }
+      end
+
       def render_react_element(el)
         # push el to buffer
         `Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(el)`

data/lib/react/component/features.rb

@@ -26,7 +26,9 @@ module React
             }
           }
           // console.log("portal popping", operabu, operabu.toString());
-          var react_element = Opal.global.React.createPortal(operabu.pop(), element);
+          let result = operabu.pop();
+          if (result.length === 1) { result = result[0]; }
+          var react_element = Opal.global.React.createPortal(result, element);
           operabu[operabu.length - 1].push(react_element);
           // console.log("portal pushed", operabu, operabu.toString());
         }

data/lib/react/component/native_component_constructor.rb

@@ -50,7 +50,9 @@ module React
               if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { oper.render_buffer[oper.render_buffer.length - 1].push(block_result); }
               // console.log("react component popping", oper.render_buffer, oper.render_buffer.toString());
               oper.active_components.pop();
-              return oper.render_buffer.pop();
+              let result = oper.render_buffer.pop();
+              if (result.length === 1) { return result[0]; }
+              return result;
             }
             shouldComponentUpdate(next_props, next_state) {
               if (base.should_component_update_block) {

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.7'
+  VERSION = '16.12.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.7
+  version: 16.12.8
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement