isomorfeus-react 16.6.6 → 16.6.7

data/lib/react/component/features.rb

@@ -7,9 +7,9 @@ module React
             var last_arg = args[args.length - 1];
             if (typeof last_arg === 'string' || last_arg instanceof String) {
               if (args.length === 1) { Opal.React.internal_render(React.Fragment, null, last_arg, null); }
-              else { Opal.React.internal_render(React.Fragment, args[0], last_arg, null); }
-            } else { Opal.React.internal_render(React.Fragment, args[0], null, block); }
-          } else { Opal.React.internal_render(React.Fragment, null, null, block); }
+              else { Opal.React.internal_render(Opal.global.React.Fragment, args[0], last_arg, null); }
+            } else { Opal.React.internal_render(Opal.global.React.Fragment, args[0], null, block); }
+          } else { Opal.React.internal_render(Opal.global.React.Fragment, null, null, block); }
         }
       end
 
@@ -27,7 +27,7 @@ module React
               Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
             }
           }
-          var react_element = React.createPortal(Opal.React.render_buffer.pop(), dom_node);
+          var react_element = Opal.global.React.createPortal(Opal.React.render_buffer.pop(), dom_node);
           Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(react_element);
           return null;
         }
@@ -38,10 +38,10 @@ 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(React.StrictMode, null, last_arg, null); }
-              else { Opal.React.internal_render(React.StrictMode, args[0], last_arg, null); }
-            } else { Opal.React.internal_render(React.StrictMode, args[0], null, block); }
-          } else { Opal.React.internal_render(React.StrictMode, null, null, block); }
+              if (args.length === 1) { Opal.React.internal_render(Opal.global.React.StrictMode, null, last_arg, null); }
+              else { Opal.React.internal_render(Opal.global.React.StrictMode, args[0], last_arg, null); }
+            } else { Opal.React.internal_render(Opal.global.React.StrictMode, args[0], null, block); }
+          } else { Opal.React.internal_render(Opal.global.React.StrictMode, null, null, block); }
         }
       end
 
@@ -50,10 +50,10 @@ 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(React.Suspense, null, last_arg, null); }
-              else { Opal.React.internal_render(React.Suspense, args[0], last_arg, null); }
-            } else { Opal.React.internal_render(React.Suspense, args[0], null, block); }
-          } else { Opal.React.internal_render(React.Suspense, null, null, block); }
+              if (args.length === 1) { Opal.React.internal_render(Opal.global.React.Suspense, null, last_arg, null); }
+              else { Opal.React.internal_render(Opal.global.React.Suspense, args[0], last_arg, null); }
+            } else { Opal.React.internal_render(Opal.global.React.Suspense, args[0], null, block); }
+          } else { Opal.React.internal_render(Opal.global.React.Suspense, null, null, block); }
         }
       end
     end

data/lib/react/component/native_component_constructor.rb

@@ -8,7 +8,7 @@ module React
         component_name = base.to_s
         # language=JS
         %x{
-          base.react_component = class extends React.Component {
+          base.react_component = class extends Opal.global.React.Component {
             constructor(props) {
               super(props);
               if (base.$default_state_defined()) {
@@ -29,7 +29,7 @@ module React
                   }
                   this[ref] = this[ref].bind(this);
                 } else {
-                  this[ref] = React.createRef();
+                  this[ref] = Opal.global.React.createRef();
                 }
               }
             }

data/lib/react/component/resolution.rb

@@ -6,8 +6,9 @@ module React
           alias _react_component_resolution_original_const_missing const_missing
 
           def const_missing(const_name)
+            # language=JS
             %x{
-              if (typeof Opal.global[const_name] == "object") {
+              if (typeof Opal.global[const_name] === "object") {
                 var new_const = #{React::NativeConstantWrapper.new(`Opal.global[const_name]`, const_name)};
                 #{Object.const_set(const_name, `new_const`)};
                 return new_const;
@@ -30,7 +31,8 @@ module React
         # language=JS
         %x{
           var component = null;
-          if (typeof Opal.global[component_name] == "function") {
+          var component_type = typeof Opal.global[component_name];
+          if (component_type === "function" || component_type === "object") {
             component = Opal.global[component_name];
           }
           else {
@@ -43,7 +45,8 @@ module React
               try {
                 module = modules.slice(0, i).join('::')
                 constant = self.$class().$const_get(module).$const_get(component_name, false);
-                if (typeof constant.react_component == "function") {
+                component_type = typeof constant.react_component;
+                if (component_type === "function" || component_type === "object") {
                   component = constant.react_component;
                   break;
                 }

data/lib/react/context_wrapper.rb

@@ -11,7 +11,7 @@ module React
 
         if (args.length > 0) { props = args[0]; }
 
-        var react_element = React.createElement(this.native.Consumer, props, function(value) {
+        var react_element = Opal.global.React.createElement(this.native.Consumer, props, function(value) {
           if (block !== nil) {
             Opal.React.render_buffer.push([]);
             block_result = block.$call();

data/lib/react/function_component/creator.rb

@@ -44,7 +44,7 @@ module React
 
       def self.memo_component(component_name, &block)
         %x{
-          var fun = React.memo(function(props) {
+          var fun = Opal.global.React.memo(function(props) {
             Opal.React.render_buffer.push([]);
             Opal.React.active_components.push(Opal.React.FunctionComponent.Runner.event_handlers);
             #{React::FunctionComponent::Runner.new(`props`).instance_exec(&block)};

data/lib/react/function_component/resolution.rb

@@ -6,8 +6,9 @@ module React
           alias _react_component_resolution_original_const_missing const_missing
 
           def const_missing(const_name)
+            # language=JS
             %x{
-              if (typeof Opal.global[const_name] == "object") {
+              if (typeof Opal.global[const_name] === "object") {
                 var new_const = #{React::NativeConstantWrapper.new(`Opal.global[const_name]`, const_name)};
                 #{Object.const_set(const_name, `new_const`)};
                 return new_const;
@@ -26,16 +27,18 @@ module React
         # 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
         %x{
           var component = null;
-          if (typeof Opal.global[component_name] == "function") {
+          var component_type = typeof Opal.global[component_name];
+          if (component_type === "function" || component_type === "object") {
             component = Opal.global[component_name];
           }
           else {
             try {
               var constant = self.$class().$const_get(component_name, true);
-              if (typeof constant.react_component == "function") {
+              component_type = typeof constant.react_component;
+              if (component_type === "function" || component_type === "object") {
                 component = constant.react_component;
               }
             }
@@ -44,7 +47,6 @@ module React
             }
           }
           if (component) {
-            var props = null;
             if (args.length > 0) {
               var last_arg = args[args.length - 1];
               if (typeof last_arg === 'string' || last_arg instanceof String) {

data/lib/react/native_constant_wrapper.rb

@@ -8,9 +8,11 @@ module React
     end
 
     def method_missing(name, *args, &block)
+      # language=JS
       %x{
         var component = null;
-        if (typeof #@native[name] === "function") {
+        var component_type = typeof #@native[name];
+        if (component_type === "function" || component_type === "object") {
           component = #@native[name];
         }
 

data/lib/react/redux_component/app_store_proxy.rb

@@ -10,13 +10,10 @@ module React
 
       def method_missing(key, *args, &block)
         @native_component_instance.JS.register_used_store_path(['application_state', key])
-
         if `args.length > 0`
           # set class state, simply a dispatch
-
           action = { type: 'APPLICATION_STATE', name: (`key.endsWith('=')` ? key.chop : key), value: args[0] }
           Isomorfeus.store.dispatch(action)
-
         else
           # check if we have a component local state value
           if `this.native_component_instance[this.access_key]["isomorfeus_store"]["application_state"].hasOwnProperty(key)`

data/lib/react/redux_component/class_store_proxy.rb

@@ -13,13 +13,10 @@ module React
         @native_component_instance.JS.register_used_store_path(['component_class_state', @component_name, key])
         if `args.length > 0`
           # set class state, simply a dispatch
-
           action = { type: 'COMPONENT_CLASS_STATE', class: @component_name, name: (`key.endsWith('=')` ? key.chop : key), value: args[0] }
           Isomorfeus.store.dispatch(action)
-
         else
           # get class state
-
           # check if we have a component local state value
           if @native_component_instance.JS[@access_key].JS[:isomorfeus_store].JS[:component_class_state].JS[@component_name] &&
             @native_component_instance.JS[@access_key].JS[:isomorfeus_store].JS[:component_class_state].JS[@component_name].JS.hasOwnProperty(key)
@@ -28,7 +25,6 @@ module React
             # check if a default value was given
             return @component_instance.class.class_store.to_h[key]
           end
-
           # otherwise return nil
           return nil
         end

data/lib/react/redux_component/native_component_constructor.rb

@@ -8,7 +8,7 @@ module React
         component_name = base.to_s
         # language=JS
         %x{
-          base.react_component = class extends React.Component {
+          base.react_component = class extends Opal.global.React.Component {
             constructor(props) {
               super(props);
               if (base.$default_state_defined()) {
@@ -41,7 +41,7 @@ module React
                   }
                   this[ref] = this[ref].bind(this);
                 } else {
-                  this[ref] = React.createRef();
+                  this[ref] = Opal.global.React.createRef();
                 }
               }
               this.listener = this.listener.bind(this);
@@ -84,10 +84,13 @@ module React
                   } else if (next_props[property] !== this.props[property]) { return true; };
                 }
               }
+              var used_store_result;
               for (var property in next_state) {
                 if (property === "isomorfeus_store") {
-                  return this.scu_for_used_store_paths(this, this.state.isomorfeus_store, next_state.isomorfeus_store);
-                  if (res) { return true; }
+                  used_store_result = this.scu_for_used_store_paths(this, this.state.isomorfeus_store, next_state.isomorfeus_store);
+                  if (used_store_result) {
+                    return true;
+                  }
                 } else if (next_state.hasOwnProperty(property)) {
                   if (!this.state.hasOwnProperty(property)) { return true; };
                   if (typeof next_state[property]['$!='] !== "undefined" && typeof this.state[property]['$!='] !== "undefined") {

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.6.6'
+  VERSION = '16.6.7'
 end

data/lib/react_dom.rb

@@ -1,31 +1,41 @@
 module ReactDOM
-  def create_portal
-
-  end
-
-  def find_dom_node
-
-  end
-
-  def hydrate
-
-  end
-
-  def self.render(native_element, container, &block)
-    `Opal.React.render_buffer.push([]);`
-
-    result = if block_given?
-               `ReactDOM.render(native_element, container, function() { block.$call() })`
-             else
-               `ReactDOM.render(native_element, container)`
-             end
-
-    `Opal.React.render_buffer.pop([])`
-
-    result
-  end
-
-  def unmount_component_at_node
-
+  class << self
+    def create_portal(child, container)
+      # container is a native DOM node
+      `Opal.global.ReactDOM.createPortal(child, container)`
+    end
+
+    def find_dom_node(native_react_component)
+      `Opal.global.ReactDOM.findDomNode(native_react_component)`
+    end
+
+    def hydrate(native_react_element, container, &block)
+      # container is a native DOM element
+      `Opal.React.render_buffer.push([]);`
+      result = if block_given?
+                 `Opal.global.ReactDOM.hydrate(native_react_element, container, function() { block.$call() })`
+               else
+                 `Opal.global.ReactDOM.hydrate(native_react_element, container)`
+               end
+      `Opal.React.render_buffer.pop()`
+      result
+    end
+
+    def render(native_react_element, container, &block)
+      # container is a native DOM element
+      `Opal.React.render_buffer.push([]);`
+      result = if block_given?
+                 `Opal.global.ReactDOM.render(native_react_element, container, function() { block.$call() })`
+               else
+                 `Opal.global.ReactDOM.render(native_react_element, container)`
+               end
+      `Opal.React.render_buffer.pop()`
+      result
+    end
+
+    def unmount_component_at_node(container)
+      # container is a native DOM element
+      `Opal.global.ReactDOM.unmountComponentAtNode(container)`
+    end
   end
 end

data/lib/react_dom_server.rb

@@ -1,17 +1,19 @@
 module ReactDOMServer
-  def render_to_string
+  class << self
+    def render_to_string(native_react_element)
+      `Opal.global.ReactDOMServer.renderToString(native_react_element)`
+    end
 
-  end
-
-  def render_to_static_markup
-
-  end
-
-  def render_to_node_stream
-
-  end
+    def render_to_static_markup(native_react_element)
+      `Opal.global.ReactDOMServer.renderToStaticMarkup(native_react_element)`
+    end
 
-  def render_to_static_node_stream
+    def render_to_node_stream(native_react_element)
+      `Opal.global.ReactDOMServer.renderToNodeStream(native_react_element)`
+    end
 
+    def render_to_static_node_stream(native_react_element)
+      `Opal.global.ReactDOMServer.renderToStaticNodeStream(native_react_element)`
+    end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.6.6
+  version: 16.6.7
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +66,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: opal-webpack-loader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 description: Write React Components in Ruby.
 email:
 - jan@kursator.com
@@ -87,10 +115,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/isomorfeus-react.rb
 - lib/isomorfeus/config.rb
-- lib/isomorfeus/top_level.rb
-- lib/isomorfeus/view_helpers.rb
+- lib/isomorfeus/execution_environment.rb
+- lib/isomorfeus/react_view_helper.rb
+- lib/isomorfeus/top_level_browser.rb
+- lib/isomorfeus/top_level_ssr.rb
 - lib/lucid_app/api.rb
 - lib/lucid_app/base.rb
 - lib/lucid_app/context.rb
@@ -102,6 +133,7 @@ files:
 - lib/lucid_component/initializer.rb
 - lib/lucid_component/mixin.rb
 - lib/lucid_component/native_component_constructor.rb
+- lib/lucid_router.rb
 - lib/react.rb
 - lib/react/active_support_support.rb
 - lib/react/component/api.rb
@@ -145,7 +177,6 @@ files:
 - lib/react/version.rb
 - lib/react_dom.rb
 - lib/react_dom_server.rb
-- readme.md
 homepage: http://isomorfeus.com
 licenses:
 - MIT