isomorfeus-react 16.13.6 → 16.13.11

data/lib/react.rb

@@ -1,5 +1,4 @@
 module React
-  # language=JS
   %x{
     self.render_buffer = [];
 
@@ -13,12 +12,47 @@ module React
       core.propTypes[prop_name] = core.prototype.validateProp;
     };
 
+    self.props_are_equal = function(this_props, next_props) {
+      let counter = 0;
+      for (var property in next_props) {
+        counter++;
+        if (next_props.hasOwnProperty(property)) {
+          if (!this_props.hasOwnProperty(property)) { return false; };
+          if (property === "children") { if (next_props.children !== this_props.children) { return false; }}
+          else if (typeof next_props[property] === "object" && next_props[property] !== null && typeof next_props[property]['$!='] === "function" &&
+                   typeof this_props[property] !== "undefined" && this_props[property] !== null ) {
+            if (#{ !! (`next_props[property]` != `this_props[property]`) }) { return false; }
+          } else if (next_props[property] !== this_props[property]) { return false; }
+        }
+      }
+      if (counter !== Object.keys(this_props).length) { return false; }
+      return true;
+    };
+
+    self.state_is_not_equal = function(this_state, next_state) {
+      let counter = 0;
+      for (var property in next_state) {
+        counter++;
+        if (next_state.hasOwnProperty(property)) {
+          if (!this_state.hasOwnProperty(property)) { return true; };
+          if (typeof next_state[property] === "object" && next_state[property] !== null && typeof next_state[property]['$!='] === "function" &&
+              typeof this_state[property] !== "undefined" && this_state[property] !== null) {
+            if (#{ !! (`next_state[property]` != `this_state[property]`) }) { return true }
+          } else if (next_state[property] !== this_state[property]) { return true }
+        }
+      }
+      if (counter !== Object.keys(this_state).length) { return true; }
+      return false;
+    };
+
     self.lower_camelize = function(snake_cased_word) {
+      if (self.prop_dictionary[snake_cased_word]) { return self.prop_dictionary[snake_cased_word]; }
       let parts = snake_cased_word.split('_');
       let res = parts[0];
       for (let i = 1; i < parts.length; i++) {
         res += parts[i][0].toUpperCase() + parts[i].slice(1);
       }
+      self.prop_dictionary[snake_cased_word] = res;
       return res;
     };
 
@@ -34,79 +68,6 @@ module React
        else { return Opal.Hash.$new(event); }
     };
 
-    self.to_native_react_props = function(ruby_style_props) {
-      let result = {};
-      let keys = ruby_style_props.$keys();
-      let keys_length = keys.length;
-      let key = '';
-      for (let i = 0; i < keys_length; i++) {
-        key = keys[i];
-        if (key[0] === 'o' && key[1] === 'n' && key[2] === '_') {
-          let handler = ruby_style_props['$[]'](key);
-          let type = typeof handler;
-          if (type === "function") {
-            let active_c = self.active_component();
-            result[self.lower_camelize(key)] = function(event, info) {
-              let ruby_event = self.native_to_ruby_event(event);
-              #{`active_c.__ruby_instance`.instance_exec(`ruby_event`, `info`, &`handler`)};
-            }
-          } else if (type === "object" && typeof handler.$call === "function" ) {
-            if (!handler.react_event_handler_function) {
-              handler.react_event_handler_function = function(event, info) {
-                let ruby_event = self.native_to_ruby_event(event);
-                handler.$call(ruby_event, info)
-              };
-            }
-            result[self.lower_camelize(key)] = handler.react_event_handler_function;
-          } else if (type === "string" ) {
-            let active_component = self.active_component();
-            let method_ref;
-            let method_name = '$' + handler;
-            if (typeof active_component[method_name] === "function") {
-              // got a ruby instance
-              if (active_component.native && active_component.native.method_refs && active_component.native.method_refs[handler]) { method_ref = active_component.native.method_refs[handler]; } // ruby instance with native
-              else if (active_component.method_refs && active_component.method_refs[handler]) { method_ref = active_component.method_refs[handler]; } // ruby function component
-              else { method_ref = active_component.$method_ref(handler); } // create the ref
-            } else if (typeof active_component.__ruby_instance[method_name] === "function") {
-              // got a native instance
-              if (active_component.method_refs && active_component.method_refs[handler]) { method_ref = active_component.method_refs[handler]; }
-              else { method_ref = active_component.__ruby_instance.$method_ref(handler); } // create ref for native
-            }
-            if (method_ref) {
-              if (!method_ref.react_event_handler_function) {
-                method_ref.react_event_handler_function = function(event, info) {
-                  let ruby_event = self.native_to_ruby_event(event);
-                  method_ref.$call(ruby_event, info)
-                };
-              }
-              result[self.lower_camelize(key)] = method_ref.react_event_handler_function;
-            } else {
-              let component_name;
-              if (active_component.__ruby_instance) { component_name = active_component.__ruby_instance.$to_s(); }
-              else { component_name = active_component.$to_s(); }
-              #{Isomorfeus.raise_error(message: "Is #{`handler`} a valid method of #{`component_name`}? If so then please use: #{`key`}: method_ref(:#{`handler`}) within component: #{`component_name`}")}
-            }
-          } else {
-            let active_component = self.active_component();
-            let component_name;
-            if (active_component.__ruby_instance) { component_name = active_component.__ruby_instance.$to_s(); }
-            else { component_name = active_component.$to_s(); }
-            #{Isomorfeus.raise_error(message: "Received invalid value for #{`key`} with #{`handler`} within component: #{`component_name`}")}
-            console.error( + key + " event handler:", handler, " within component:", self.active_component());
-          }
-        } else if (key[0] === 'a' && key.startsWith("aria_")) {
-          result[key.replace("_", "-")] = ruby_style_props['$[]'](key);
-        } else if (key === "style") {
-          let val = ruby_style_props['$[]'](key);
-          if (typeof val.$to_n === "function") { val = val.$to_n() }
-          result["style"] = val;
-        } else {
-          result[key.indexOf('_') > 0 ? self.lower_camelize(key) : key] = ruby_style_props['$[]'](key);
-        }
-      }
-      return result;
-    };
-
     self.internal_prepare_args_and_render = function(component, args, block) {
       const operain = self.internal_render;
       if (args.length > 0) {
@@ -118,26 +79,6 @@ module React
       } else { operain(component, null, null, block); }
     };
 
-    self.internal_render = function(component, props, string_child, block) {
-      const operabu = self.render_buffer;
-      let children;
-      let native_props = null;
-      if (string_child) {
-        children = [string_child];
-      } else if (block && block !== nil) {
-        operabu.push([]);
-        // console.log("internal_render 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)) {
-          operabu[operabu.length - 1].push(block_result);
-        }
-        // console.log("internal_render popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
-        children = operabu.pop();
-      }
-      if (props && props !== nil) { native_props = self.to_native_react_props(props); }
-      operabu[operabu.length - 1].push(Opal.global.React.createElement.apply(this, [component, native_props].concat(children)));
-    };
-
     self.active_components = [];
 
     self.active_component = function() {
@@ -153,8 +94,131 @@ module React
       if (length === 0) { return null; };
       return self.active_redux_components[length-1];
     };
+
+    function isObject(obj) { return (obj && typeof obj === 'object'); }
+
+    self.merge_deep = function(one, two) {
+      return [one, two].reduce(function(pre, obj) {
+        Object.keys(obj).forEach(function(key){
+          let pVal = pre[key];
+          let oVal = obj[key];
+          if (Array.isArray(pVal) && Array.isArray(oVal)) {
+            pre[key] = pVal.concat.apply(this, oVal);
+          } else if (isObject(pVal) && isObject(oVal)) {
+            pre[key] = self.merge_deep(pVal, oVal);
+          } else {
+            pre[key] = oVal;
+          }
+        });
+        return pre;
+      }, {});
+    };
   }
 
+  if on_browser? || on_ssr?
+    %x{
+      self.prop_dictionary = {};
+
+      self.to_native_react_props = function(ruby_style_props) {
+        let result = {};
+        let keys = ruby_style_props.$$keys;
+        let keys_length = keys.length;
+        let key = '';
+        for (let i = 0; i < keys_length; i++) {
+          key = keys[i];
+          let value = ruby_style_props.$$smap[key];
+          if (key[0] === 'o' && key[1] === 'n' && key[2] === '_') {
+            let type = typeof value;
+            if (type === "function") {
+              let active_c = self.active_component();
+              result[self.lower_camelize(key)] = function(event, info) {
+                let ruby_event = self.native_to_ruby_event(event);
+                #{`active_c.__ruby_instance`.instance_exec(`ruby_event`, `info`, &`value`)};
+              }
+            } else if (type === "object" && typeof value.m === "object" && typeof value.m.$call === "function" ) {
+              if (!value.react_event_handler_function) {
+                value.react_event_handler_function = function(event, info) {
+                  let ruby_event = self.native_to_ruby_event(event);
+                  if (value.a.length > 0) { value.m.$call.apply(value.m, [ruby_event, info].concat(value.a)); }
+                  else { value.m.$call(ruby_event, info); }
+                };
+              }
+              result[self.lower_camelize(key)] = value.react_event_handler_function;
+            } else if (type === "string" ) {
+              let active_component = self.active_component();
+              let method_ref;
+              let method_name = '$' + value;
+              if (typeof active_component[method_name] === "function") {
+                // got a ruby instance
+                if (active_component.native && active_component.native.method_refs && active_component.native.method_refs[value]) { method_ref = active_component.native.method_refs[value]; } // ruby instance with native
+                else if (active_component.method_refs && active_component.method_refs[value]) { method_ref = active_component.method_refs[value]; } // ruby function component
+                else { method_ref = active_component.$method_ref(value); } // create the ref
+              } else if (typeof active_component.__ruby_instance[method_name] === "function") {
+                // got a native instance
+                if (active_component.method_refs && active_component.method_refs[value]) { method_ref = active_component.method_refs[value]; }
+                else { method_ref = active_component.__ruby_instance.$method_ref(value); } // create ref for native
+              }
+              if (method_ref) {
+                if (!method_ref.react_event_handler_function) {
+                  method_ref.react_event_handler_function = function(event, info) {
+                    let ruby_event = self.native_to_ruby_event(event);
+                    method_ref.m.$call(ruby_event, info)
+                  };
+                }
+                result[self.lower_camelize(key)] = method_ref.react_event_handler_function;
+              } else {
+                let component_name;
+                if (active_component.__ruby_instance) { component_name = active_component.__ruby_instance.$to_s(); }
+                else { component_name = active_component.$to_s(); }
+                #{Isomorfeus.raise_error(message: "Is #{`value`} a valid method of #{`component_name`}? If so then please use: #{`key`}: method_ref(:#{`value`}) within component: #{`component_name`}")}
+              }
+            } else {
+              let active_component = self.active_component();
+              let component_name;
+              if (active_component.__ruby_instance) { component_name = active_component.__ruby_instance.$to_s(); }
+              else { component_name = active_component.$to_s(); }
+              #{Isomorfeus.raise_error(message: "Received invalid value for #{`key`} with #{`value`} within component: #{`component_name`}")}
+              console.error( + key + " event handler:", value, " within component:", self.active_component());
+            }
+          } else if (key[0] === 'a' && key.startsWith("aria_")) {
+            result[key.replace("_", "-")] = value;
+          } else if (key === "style" || key === "theme") {
+            if (typeof value.$to_n === "function") { value = value.$to_n() }
+            result[key] = value;
+          } else {
+            result[self.lower_camelize(key)] = value;
+          }
+        }
+        return result;
+      };
+
+      self.render_block_result = function(block_result) {
+        if (block_result.constructor === String || block_result.constructor === Number) {
+          Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
+        }
+      };
+
+      self.internal_render = function(component, props, string_child, block) {
+        const operabu = self.render_buffer;
+        let native_props;
+        if (props && props !== nil) { native_props = self.to_native_react_props(props); }
+        if (string_child) {
+          operabu[operabu.length - 1].push(Opal.global.React.createElement(component, native_props, string_child));
+        } else if (block && block !== nil) {
+          operabu.push([]);
+          // console.log("internal_render pushed", Opal.React.render_buffer, Opal.React.render_buffer.toString());
+          let block_result = block.$call();
+          if (block_result && block_result !== nil) { Opal.React.render_block_result(block_result); }
+          // console.log("internal_render popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
+          let children = operabu.pop();
+          operabu[operabu.length - 1].push(Opal.global.React.createElement.apply(this, [component, native_props].concat(children)));
+        } else {
+          operabu[operabu.length - 1].push(Opal.global.React.createElement(component, native_props));
+        }
+      };
+    }
+  end
+
   def self.clone_element(ruby_react_element, props = nil, children = nil, &block)
     block_result = `null`
     if block_given?
@@ -185,9 +249,7 @@ module React
         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)) {
-          operabu[operabu.length - 1].push(block_result);
-        }
+        if (block_result && block_result !== nil) { Opal.React.render_block_result(block_result); }
         // console.log("create_element popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
         children = operabu.pop();
       } else if (children === nil) { children = []; }

data/lib/react/component/api.rb

@@ -98,12 +98,13 @@ module React
       end
       alias gre get_react_element
 
-      def method_ref(method_symbol)
+      def method_ref(method_symbol, *args)
+        method_key = "#{method_symbol}#{args}"
         %x{
-          if (#@native.method_refs && #@native.method_refs[#{method_symbol}]) { return #@native.method_refs[#{method_symbol}]; }
+          if (#@native.method_refs && #@native.method_refs[#{method_key}]) { return #@native.method_refs[#{method_key}]; }
           if (!#@native.method_refs) { #@native.method_refs = {}; }
-          #@native.method_refs[#{method_symbol}] = #{method(method_symbol)};
-          return #@native.method_refs[#{method_symbol}];
+          #@native.method_refs[#{method_key}] = { m: #{method(method_symbol)}, a: args };
+          return #@native.method_refs[#{method_key}];
         }
       end
       alias m_ref method_ref

data/lib/react/component/features.rb

@@ -21,9 +21,7 @@ module React
             let block_result = block.$call()
             let last_buffer_length = operabu[operabu.length - 1].length;
             let last_buffer_element = operabu[operabu.length - 1][last_buffer_length - 1];
-            if (block_result && (block_result.constructor === String || block_result.constructor === Number)) {
-              operabu[operabu.length - 1].push(block_result);
-            }
+            if (block_result && block_result !== nil) { Opal.React.render_block_result(block_result); }
           }
           // console.log("portal popping", operabu, operabu.toString());
           let result = operabu.pop();

data/lib/react/component/mixin.rb

@@ -5,7 +5,11 @@ module React
         base.include(::Native::Wrapper)
         base.extend(::React::Component::NativeComponentConstructor)
         base.extend(::LucidPropDeclaration::Mixin)
-        base.include(::React::Component::Elements)
+        if on_browser? || on_ssr?
+          base.include(::React::Component::Elements)
+        elsif on_mobile?
+          base.include(::ReactNative::Component::Elements)
+        end
         base.include(::React::Component::Api)
         base.include(::React::Component::Callbacks)
         base.include(::React::Component::Initializer)

data/lib/react/component/native_component_constructor.rb

@@ -43,42 +43,18 @@ module React
               // console.log("react component pushed", oper.render_buffer, oper.render_buffer.toString());
               oper.active_components.push(this);
               let block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)};
-              if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { oper.render_buffer[oper.render_buffer.length - 1].push(block_result); }
+              if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
               // console.log("react component popping", oper.render_buffer, oper.render_buffer.toString());
               oper.active_components.pop();
               let result = oper.render_buffer.pop();
-              if (result.length === 1) { return result[0]; }
-              return result;
+              return (result.length === 1) ? result[0] : result;
             }
             shouldComponentUpdate(next_props, next_state) {
               if (base.should_component_update_block) {
                 return #{!!`this.__ruby_instance`.instance_exec(React::Component::Props.new(`{props: next_props}`), React::Component::State.new(`{state: next_state }`), &`base.should_component_update_block`)};
               }
-              let counter = 0;
-              for (var property in next_props) {
-                counter++;
-                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" && next_props[property] !== null && typeof next_props[property]['$!='] === "function" &&
-                           typeof this.props[property] !== "undefined" && this.props[property] !== null ) {
-                    if (#{ !! (`next_props[property]` != `this.props[property]`) }) { return true; }
-                  } else if (next_props[property] !== this.props[property]) { return true; }
-                }
-              }
-              if (counter !== Object.keys(this.props).length) { return true; }
-              counter = 0;
-              for (var property in next_state) {
-                counter++;
-                if (next_state.hasOwnProperty(property)) {
-                  if (!this.state.hasOwnProperty(property)) { return true; };
-                  if (typeof next_state[property] !== "undefined" && next_state[property] !== null && typeof next_state[property]['$!='] === "function" &&
-                      typeof this.state[property] !== "undefined" && this.state[property] !== null) {
-                    if (#{ !! (`next_state[property]` != `this.state[property]`) }) { return true }
-                  } else if (next_state[property] !== this.state[property]) { return true }
-                }
-              }
-              if (counter !== Object.keys(this.state).length) { return true; }
+              if (!Opal.React.props_are_equal(this.props, next_props)) { return true; }
+              if (Opal.React.state_is_not_equal(this.state, next_state)) { return true; }
               return false;
             }
             validateProp(props, propName, componentName) {

data/lib/react/component/props.rb

@@ -7,11 +7,12 @@ module React
 
       def method_missing(prop, *args, &block)
         %x{
-          if (typeof #@native.props[prop] === 'undefined') {
+          const p = #@native.props;
+          if (typeof p[prop] === 'undefined') {
             prop = Opal.React.lower_camelize(prop);
-            if (typeof #@native.props[prop] === 'undefined') { return #{nil}; }
+            if (typeof p[prop] === 'undefined') { return nil; }
           }
-          return #@native.props[prop];
+          return p[prop];
         }
       end
 

data/lib/react/component/resolution.rb

@@ -3,13 +3,15 @@ module React
     module Resolution
       def self.included(base)
         base.instance_exec do
-          alias _react_component_class_resolution_original_const_missing const_missing
+          unless method_defined?(:_react_component_class_resolution_original_const_missing)
+            alias _react_component_class_resolution_original_const_missing const_missing
+          end
 
           def const_missing(const_name)
-            # language=JS
             %x{
               if (typeof Opal.global[const_name] !== "undefined" && (const_name[0] === const_name[0].toUpperCase())) {
                 var new_const = #{React::NativeConstantWrapper.new(`Opal.global[const_name]`, const_name)};
+                new_const.react_component = Opal.global[const_name];
                 #{Object.const_set(const_name, `new_const`)};
                 return new_const;
               } else {
@@ -20,7 +22,6 @@ module React
 
           # this is required for autoloading support, as the component may not be loaded and so its method is not registered.
           # must load it first, done by const_get, and next time the method will be there.
-
           unless method_defined?(:_react_component_class_resolution_original_method_missing)
             alias _react_component_class_resolution_original_method_missing method_missing
           end
@@ -28,36 +29,21 @@ module React
           def method_missing(component_name, *args, &block)
             # check for ruby component and render it
             # otherwise pass on method missing
-            # language=JS
             %x{
-              var modules = self.$to_s().split("::");
-              var modules_length = modules.length;
-              var module;
               var constant;
-              var component;
-              for (var i = modules_length; i > 0; i--) {
-                try {
-                  module = modules.slice(0, i).join('::');
-                  constant = self.$const_get(module).$const_get(component_name, false);
-                  if (typeof constant.react_component !== 'undefined') {
-                    component = constant.react_component;
-                    break;
-                  }
-                } catch(err) { component = null; }
-              }
-              if (!component) {
-                try {
-                  constant = Opal.Object.$const_get(component_name);
-                  if (typeof constant.react_component !== 'undefined') {
-                    component = constant.react_component;
-                  }
-                } catch(err) { component = null; }
-              }
-              if (component) {
-                return Opal.React.internal_prepare_args_and_render(component, args, block);
-              } else {
-                return #{_react_component_class_resolution_original_method_missing(component_name, *args, block)};
-              }
+              if (typeof self.iso_react_const_cache === 'undefined') { self.iso_react_const_cache = {}; }
+              try {
+                if (typeof self.iso_react_const_cache[component_name] !== 'undefined') {
+                  constant = self.iso_react_const_cache[component_name]
+                } else {
+                  constant = self.$const_get(component_name);
+                  self.iso_react_const_cache[component_name] = constant;
+                }
+                if (typeof constant.react_component !== 'undefined') {
+                  return Opal.React.internal_prepare_args_and_render(constant.react_component, args, block);
+                }
+              } catch(err) { }
+              return #{_react_component_class_resolution_original_method_missing(component_name, *args, block)};
             }
           end
         end
@@ -68,44 +54,42 @@ module React
       end
 
       def method_missing(component_name, *args, &block)
-        # html tags are defined as methods, so they will not end up here.
-        # first check for native component and render it, we want to be fast for native components
-        # second check for ruby component and render it, they are a bit slower anyway
-        # third pass on method missing
-        # language=JS
+        # Further on it must check for modules, because $const_get does not take
+        # the full nesting into account, as usually its called via $$ with the
+        # nesting provided by the compiler.
         %x{
-          var component = null;
-          if (typeof Opal.global[component_name] !== "undefined" && (component_name[0] === component_name[0].toUpperCase())) {
-            component = Opal.global[component_name];
+          var constant;
+          if (typeof self.iso_react_const_cache === 'undefined') { self.iso_react_const_cache = {}; }
+
+          if (typeof self.iso_react_const_cache[component_name] !== 'undefined') {
+            constant = self.iso_react_const_cache[component_name]
+          } else if (typeof self.$$is_a_module !== 'undefined') {
+            try {
+              constant = self.$const_get(component_name);
+              self.iso_react_const_cache[component_name] = constant;
+            } catch(err) { }
           } else {
-            var modules = self.$to_s().split("::");
-            var modules_length = modules.length;
-            var module;
-            var constant;
-            for (var i = modules_length; i > 0; i--) {
-              try {
-                module = modules.slice(0, i).join('::');
-                constant = self.$class().$const_get(module).$const_get(component_name, false);
-                if (typeof constant.react_component !== 'undefined') {
-                  component = constant.react_component;
+            let sc = self.$class();
+            try {
+              constant = sc.$const_get(component_name);
+              self.iso_react_const_cache[component_name] = constant;
+            } catch(err) {
+              var module_names = sc.$to_s().split("::");
+              var module_name;
+              for (var i = module_names.length - 1; i > 0; i--) {
+                module_name = module_names.slice(0, i).join('::');
+                try {
+                  constant = sc.$const_get(module_name).$const_get(component_name, false);
+                  self.iso_react_const_cache[component_name] = constant;
                   break;
-                }
-              } catch(err) { component = null; }
-            }
-            if (!component) {
-              try {
-                constant = Opal.Object.$const_get(component_name);
-                if (typeof constant.react_component !== 'undefined') {
-                  component = constant.react_component;
-                }
-              } catch(err) { component = null; }
+                } catch(err) { }
+              }
             }
           }
-          if (component) {
-            return Opal.React.internal_prepare_args_and_render(component, args, block);
-          } else {
-            return #{_react_component_resolution_original_method_missing(component_name, *args, block)};
+          if (constant && typeof constant.react_component !== 'undefined') {
+            return Opal.React.internal_prepare_args_and_render(constant.react_component, args, block);
           }
+          return #{_react_component_resolution_original_method_missing(component_name, *args, block)};
         }
       end
     end