isomorfeus-react 16.8.0 → 16.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572d49e689c48227eff72f1c354d6d09e342d110cfcb1e95f7a9a1a523fe345f
-  data.tar.gz: 4ffc0e63dde3adafc83f72a239e041186e4af492d60b02724c783b823ade4846
+  metadata.gz: 6e1f51aa98f40271693104f25f9321a0b1ce04668666efe2f6b345958f2d4687
+  data.tar.gz: 0c823d4922443ab1b157b638438a908caff664906be19c7fbef4f0410cb3a36d
 SHA512:
-  metadata.gz: 133cc190d7a975b12b1c70462aef1fe473cb819b172be6dfcfdebf7b331aba73fd9fa4c6264fe4aca942c18d2b5944c6dd321451e51f38a387fd098a4f1f7ba5
-  data.tar.gz: 9bc4d86826962e1b9c2bf5c9bb94c03166950a619a41312b0f74e2d59fb5bccc22c41af7f430e7246745d88584836755480cc71a3d26abf9f2f4518d75e1510c
+  metadata.gz: d14aa94c3504a7cf2eee50db467e468045660f4fcdc1dbc8f2beb95f7f2ad45e6ceca07c8a53b8291a354859e42e8c1d6cc2f6245ef5e2c0ab0bc2ccf4865cda
+  data.tar.gz: 9b36d35c724f49776ec46bb4c4bf4530f7ccd3cb2b29d83ed2b8fbbb7c619dbf5c4c23a5c86c87ebd13eb8cccbe315f2f543a6bca5f7f2a102eae2c1051d4322

data/lib/lucid_app/native_component_constructor.rb

@@ -38,7 +38,8 @@ module LucidApp
             for (var ref in defined_refs) {
               if (defined_refs[ref] != null) {
                 this[ref] = function(element) {
-                  #{`this.__ruby_instance`.instance_exec(React::Ref.new(`element`), `defined_refs[ref]`)}
+                  element = Opal.React.native_element_or_component_to_ruby(element);
+                  #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                 }
                 this[ref] = this[ref].bind(this);
               } else {

data/lib/lucid_component/native_component_constructor.rb

@@ -35,7 +35,8 @@ module LucidComponent
             for (var ref in defined_refs) {
               if (defined_refs[ref] != null) {
                 this[ref] = function(element) {
-                  #{`this.__ruby_instance`.instance_exec(React::Ref.new(`element`), `defined_refs[ref]`)}
+                  element = Opal.React.native_element_or_component_to_ruby(element);
+                  #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                 }
                 this[ref] = this[ref].bind(this);
               } else {

data/lib/lucid_material/app/native_component_constructor.rb

@@ -40,7 +40,8 @@ module LucidMaterial
               for (var ref in defined_refs) {
                 if (defined_refs[ref] != null) {
                   this[ref] = function(element) {
-                    #{`this.__ruby_instance`.instance_exec(React::Ref.new(`element`), `defined_refs[ref]`)}
+                    element = Opal.React.native_element_or_component_to_ruby(element);
+                    #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                   }
                   this[ref] = this[ref].bind(this);
                 } else {

data/lib/lucid_material/component/native_component_constructor.rb

@@ -31,7 +31,8 @@ module LucidMaterial
               for (var ref in defined_refs) {
                 if (defined_refs[ref] != null) {
                   this[ref] = function(element) {
-                    #{`this.__ruby_instance`.instance_exec(React::Ref.new(`element`), `defined_refs[ref]`)}
+                    element = Opal.React.native_element_or_component_to_ruby(element);
+                    #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                   }
                   this[ref] = this[ref].bind(this);
                 } else {

data/lib/react.rb

@@ -5,6 +5,15 @@ module React
   %x{
     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] = {};
+      }
+      component.react_component.propTypes[prop_name] = component.react_component.prototype.validateProp;
+    };
+
     self.lower_camelize = function(snake_cased_word) {
       var parts = snake_cased_word.split('_');
       var res = parts[0];
@@ -15,6 +24,13 @@ module React
       return res;
     };
 
+    self.native_element_or_component_to_ruby = function (element) {
+      if (typeof element.__ruby_instance !== 'undefined') { return element.__ruby_instance }
+      if (element instanceof Element) { return #{Browser::DOM::Element.new(`element`)} }
+      if (element instanceof Node) { return #{Browser::DOM::Node.new(`element`)} }
+      return element;
+    };
+
     self.to_native_react_props = function(ruby_style_props) {
         var result = {};
         var keys = ruby_style_props.$keys();

data/lib/react/component/api.rb

@@ -57,53 +57,29 @@ module React
               end
               if options.has_key?(:class)
                 %x{
-                  if (typeof self.react_component.propTypes == "undefined") {
-                    self.react_component.propTypes = {};
-                    self.react_component.propValidations = {};
-                    self.react_component.propValidations[name] = {};
-                  }
-                  self.react_component.propTypes[name] = self.react_component.prototype.validateProp;
+                  Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].ruby_class = options.$fetch("class");
                 }
               elsif options.has_key?(:is_a)
                 %x{
-                  if (typeof self.react_component.propTypes == "undefined") {
-                    self.react_component.propTypes = {};
-                    self.react_component.propValidations = {};
-                    self.react_component.propValidations[name] = {};
-                  }
-                  self.react_component.propTypes[name] = self.react_component.prototype.validateProp;
+                  Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].is_a = options.$fetch("is_a");
                 }
               end
               if options.has_key?(:required)
                 %x{
-                  if (typeof self.react_component.propTypes == "undefined") {
-                    self.react_component.propTypes = {};
-                    self.react_component.propValidations = {};
-                    self.react_component.propValidations[name] = {};
-                  }
-                  self.react_component.propTypes[name] = self.react_component.prototype.validateProp;
+                  Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].required = options.$fetch("required");
                 }
               elsif !options.has_key?(:default)
                 %x{
-                  if (typeof self.react_component.propTypes == "undefined") {
-                    self.react_component.propTypes = {};
-                    self.react_component.propValidations = {};
-                  }
-                  self.react_component.propTypes[name] = self.react_component.prototype.validateProp;
+                  Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].required = true;
                 }
               end
             else
               %x{
-                if (typeof self.react_component.propTypes == "undefined") {
-                  self.react_component.propTypes = {};
-                  self.react_component.propValidations = {};
-                  self.react_component.propValidations[name] = {};
-                }
-                self.react_component.propTypes[name] = self.react_component.prototype.validateProp;
+                Opal.React.set_validate_prop(self, name);
                 self.react_component.propValidations[name].required = options.$fetch("required");
               }
             end
@@ -134,6 +110,15 @@ module React
         end
       end
 
+      def ref(name)
+        `#@native[name]`
+      end
+
+      def ruby_ref(name)
+        return `#@native[name]` if `(typeof #@native[name] === 'function')`
+        React::Ref::new(`#@native[name]`)
+      end
+
       def set_state(updater, &callback)
         @state.set_state(updater, &callback)
       end

data/lib/react/component/native_component_constructor.rb

@@ -25,7 +25,8 @@ module React
               for (var ref in defined_refs) {
                 if (defined_refs[ref] != null) {
                   this[ref] = function(element) {
-                    #{`this.__ruby_instance`.instance_exec(React::Ref.new(`element`), `defined_refs[ref]`)}
+                    element = Opal.React.native_element_or_component_to_ruby(element);
+                    #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                   }
                   this[ref] = this[ref].bind(this);
                 } else {

data/lib/react/redux_component/native_component_constructor.rb

@@ -37,7 +37,8 @@ module React
               for (var ref in defined_refs) {
                 if (defined_refs[ref] != null) {
                   this[ref] = function(element) {
-                    #{`this.__ruby_instance`.instance_exec(React::Ref.new(`element`), `defined_refs[ref]`)}
+                    element = Opal.React.native_element_or_component_to_ruby(element);
+                    #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                   }
                   this[ref] = this[ref].bind(this);
                 } else {

data/lib/react/ref.rb

@@ -6,18 +6,8 @@ module React
       true
     end
 
-    def initialize(native_ref)
-      @native = native_ref
-    end
-
     def current
-      %x{
-        if (typeof #@native.current.__ruby_instance != undefined) {
-          return #@native.current.__ruby_instance;
-        } else {
-          #@native.current;
-        }
-      }
+      `Opal.React.native_element_or_component_to_ruby(#@native.current)`
     end
   end
 end

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.8.0'
+  VERSION = '16.8.1'
 end

metadata

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