isomorfeus-react 16.12.5 → 16.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02d3da5a8c0ad549bf3a6539a220e5d95479e9a21e99392a1a77b29139cb222d
-  data.tar.gz: aaa6f2e790085cb9bbd09b029e49d5394bcc7e5d12d27033d4bfdc7646617719
+  metadata.gz: 451e8c1b9c5b2271b16c96f0490b41c4657096577c05577153387057a979c959
+  data.tar.gz: 6190696c2c735f5eb64ab4aecf8047c3c96b0f512d79979c733d0d2fa3c7cf0d
 SHA512:
-  metadata.gz: 6181f6153a988daf46595e245f57c81e460543dc6b9696099870f1122fad7e27c3f973c3848888849dd24abf490720888ea162a062d92437c2031d42721e7a20
-  data.tar.gz: 2cd1c6f37bb100ef10f0bf51801c25951ca4e0797576b9e5f4db28d3054ace409ec440c2e47368e692026572506e3e40cced5f19cf5293c2e0f8299244de6646
+  metadata.gz: ed96b7c2325696283d75678b2ce4eb9f4c6a544b621a216a835e7b92ccf7284e6ec9c26ef7576fecf5f71687d2e1e6eec7ac67aa204437a23b088d1339d1f38c
+  data.tar.gz: 53c9ae932a4493352ea0733b7a66d010ad8658e1043d9ce4f4a44e1cd7b371f6b1584413b0abac641685685a365774071f42261dc81e5035250fe85f8c773061

data/lib/isomorfeus/config.rb

@@ -97,9 +97,10 @@ module Isomorfeus
               `Opal.global.deepForceUpdate(#{Isomorfeus.top_component})`
             end
           end
-        rescue
+        rescue Exception => e
           # TODO try mount first
           # if it fails
+          `console.error("force_render failed'! Error: " + #{e.message} + "! Reloading page.")`
           `location.reload()` if on_browser?
         end
         nil

data/lib/isomorfeus/top_level.rb

@@ -47,6 +47,7 @@ module Isomorfeus
             rescue Exception => e
               if  !@tried_another_time
                 @tried_another_time = true
+                `console.warn("Deferring mount: " + #{e.message})`
                 `setTimeout(Opal.Isomorfeus.TopLevel['$mount!'], 250)`
               else
                 `console.error("Unable to mount '" + #{component_name} + "'! Error: " + #{e.message} + "!")`

data/lib/isomorfeus_react/lucid_app/mixin.rb

@@ -15,7 +15,6 @@ module LucidApp
       base.include(::LucidApp::Api)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)
-      base.include(::React::Component::Resolution)
     end
   end
 end

data/lib/isomorfeus_react/lucid_app/native_lucid_component_constructor.rb

@@ -10,6 +10,7 @@ module LucidApp
         base.lucid_react_component = class extends Opal.global.React.Component {
           constructor(props) {
             super(props);
+            const oper = Opal.React;
             if (base.$default_state_defined()) {
               this.state = base.$state().$to_n();
             } else {
@@ -39,7 +40,7 @@ module LucidApp
             for (var ref in defined_refs) {
               if (defined_refs[ref] != null) {
                 this[ref] = function(element) {
-                  element = Opal.React.native_element_or_component_to_ruby(element);
+                  element = oper.native_element_or_component_to_ruby(element);
                   #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                 }
                 this[ref] = this[ref].bind(this);
@@ -47,7 +48,11 @@ module LucidApp
                 this[ref] = Opal.global.React.createRef();
               }
             }
-            if (base.preload_block) { this.state.preloaded = this.__ruby_instance.$execute_preload_block(); }
+            if (base.preload_block) {
+              oper.active_redux_components.push(this);
+              this.state.preloaded = this.__ruby_instance.$execute_preload_block();
+              oper.active_redux_components.pop();
+            }
             this.listener = this.listener.bind(this);
             this.unsubscriber = Opal.Isomorfeus.store.native.subscribe(this.listener);
           }
@@ -60,7 +65,6 @@ module LucidApp
           }
           render() {
             const oper = Opal.React;
-            this.context = this.state.isomorfeus_store_state;
             oper.render_buffer.push([]);
             // console.log("lucid app pushed", oper.render_buffer, oper.render_buffer.toString());
             oper.active_components.push(this);
@@ -75,7 +79,7 @@ module LucidApp
             return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, oper.render_buffer.pop());
           }
           data_access() {
-            return this.context;
+            this.state.isomorfeus_store_state;
           }
           listener() {
             let next_state = Opal.Isomorfeus.store.native.getState();

data/lib/isomorfeus_react/lucid_component/api.rb

@@ -67,7 +67,12 @@ module LucidComponent
         def preload(&block)
           `base.preload_block = block`
           component_did_mount do
-            @_preload_promise.then { self.state.preloaded = true } unless self.state.preloaded
+            unless self.state.preloaded
+              @_preload_promise.then { self.state.preloaded = true }.fail do |result|
+                err_text = "#{self.class.name}: preloading failed, last result: #{result.nil? ? 'nil' : result}!"
+                `console.error(err_text)`
+              end
+            end
           end
         end
 

data/lib/isomorfeus_react/lucid_component/mixin.rb

@@ -14,7 +14,6 @@ module LucidComponent
       base.include(::LucidComponent::Api)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)
-      base.include(::React::Component::Resolution)
     end
   end
 end

data/lib/isomorfeus_react/lucid_component/native_lucid_component_constructor.rb

@@ -10,6 +10,7 @@ module LucidComponent
         base.lucid_react_component = class extends Opal.global.React.Component {
           constructor(props) {
             super(props);
+            const oper = Opal.React;
             if (base.$default_state_defined()) {
               this.state = base.$state().$to_n();
             } else {
@@ -29,7 +30,7 @@ module LucidComponent
             for (var ref in defined_refs) {
               if (defined_refs[ref] != null) {
                 this[ref] = function(element) {
-                  element = Opal.React.native_element_or_component_to_ruby(element);
+                  element = oper.native_element_or_component_to_ruby(element);
                   #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[ref]`)}
                 }
                 this[ref] = this[ref].bind(this);
@@ -37,7 +38,11 @@ module LucidComponent
                 this[ref] = Opal.global.React.createRef();
               }
             }
-            if (base.preload_block) { this.state.preloaded = this.__ruby_instance.$execute_preload_block(); }
+            if (base.preload_block) {
+              oper.active_redux_components.push(this);
+              this.state.preloaded = this.__ruby_instance.$execute_preload_block();
+              oper.active_redux_components.pop();
+            }
           }
           static get displayName() {
             return #{component_name};

data/lib/isomorfeus_react/lucid_func/mixin.rb

@@ -5,7 +5,6 @@ module LucidFunc
       base.include(::React::Component::Features)
       base.include(::LucidFunc::Initializer)
       base.include(::React::FunctionComponent::Api)
-      base.include(::React::FunctionComponent::Resolution)
       base.extend(::React::FunctionComponent::EventHandler)
       base.extend(::LucidComponent::EnvironmentSupport)
       base.include(::LucidComponent::EnvironmentSupport)

data/lib/isomorfeus_react/react/function_component/mixin.rb

@@ -6,7 +6,6 @@ module React
         base.include(::React::Component::Features)
         base.include(::React::FunctionComponent::Initializer)
         base.include(::React::FunctionComponent::Api)
-        base.include(::React::FunctionComponent::Resolution)
         base.extend(::React::FunctionComponent::EventHandler)
         base.extend(::React::FunctionComponent::NativeComponentConstructor)
       end

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

@@ -6,7 +6,6 @@ module React
         base.include(::React::Component::Features)
         base.include(::React::FunctionComponent::Initializer)
         base.include(::React::FunctionComponent::Api)
-        base.include(::React::FunctionComponent::Resolution)
         base.extend(::React::FunctionComponent::EventHandler)
         base.extend(::React::MemoComponent::NativeComponentConstructor)
       end

data/lib/isomorfeus_react_material/lucid_material/app/mixin.rb

@@ -16,7 +16,6 @@ module LucidMaterial
         base.include(::LucidApp::Api)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)
-        base.include(::React::Component::Resolution)
       end
     end
   end

data/lib/isomorfeus_react_material/lucid_material/component/mixin.rb

@@ -15,7 +15,6 @@ module LucidMaterial
         base.include(::LucidComponent::Api)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)
-        base.include(::React::Component::Resolution)
       end
     end
   end

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

@@ -6,7 +6,6 @@ module LucidMaterial
         base.include(::React::Component::Features)
         base.include(::LucidFunc::Initializer)
         base.include(::React::FunctionComponent::Api)
-        base.include(::React::FunctionComponent::Resolution)
         base.extend(::React::FunctionComponent::EventHandler)
         base.extend(::LucidComponent::EnvironmentSupport)
         base.include(::LucidComponent::EnvironmentSupport)

data/lib/react/component/api.rb

@@ -67,6 +67,16 @@ module React
         end
       end
 
+      def component_fun(class_name, **ruby_props)
+        %x{
+          return function(props) {
+            let outer_props = Opal.React.to_native_react_props(#{ruby_props});
+            let new_props = Object.assign({}, props, outer_props);
+            return Opal.global.React.createElement(#{class_name.constantize}.react_component, new_props)
+          }
+        }
+      end
+
       def get_react_element(arg, &block)
         if block_given?
           # execute block, fetch last element from buffer

data/lib/react/component/history.rb

@@ -3,33 +3,62 @@ module React
     class History
       include ::Native::Wrapper
 
-      alias_native :block, :block
-      alias_native :create_href, :createHref
-      alias_native :go, :go
-      alias_native :go_back, :goBack
-      alias_native :go_forward, :goForward
-      alias_native :listen, :listen
-      alias_native :push, :push
-      alias_native :replace, :replace
+      def block(prompt)
+        @native.JS[:props].JS[:history].JS.block(prompt)
+      end
+
+      def create_href(location)
+        @native.JS[:props].JS[:history].JS.createHref(location)
+      end
+
+      def go(n)
+        @native.JS[:props].JS[:history].JS.go(n)
+      end
+
+      def go_back
+        @native.JS[:props].JS[:history].JS.goBack()
+      end
 
-      alias _react_component_hitory_original_method_missing method_missing
+      def go_forward
+        @native.JS[:props].JS[:history].JS.goForward()
+      end
+
+      def push(*args)
+        @native.JS[:props].JS[:history].JS.push(*args)
+      end
+
+      def replace(*args)
+        @native.JS[:props].JS[:history].JS.replace(*args)
+      end
 
       def method_missing(prop, *args, &block)
-        @native.JS[:params].JS[prop]
+        @native.JS[:props].JS[:history].JS[prop]
+      end
+
+      def listen(&block)
+        fun = nil
+        %x{
+          fun = function(location, action) {
+            let ruby_location = #{React::Component::Location.new(`{ props: { location: location }}`)}
+            block.$call(ruby_location, action);
+          }
+        }
+        unlisten = @native.JS[:props].JS[:history].JS.listen(fun)
+        -> { unlisten.JS.call() }
       end
 
       def location
         return @location if @location
-        return nil unless @native.JS[:props].JS[:location]
-        if @native.JS[:props].JS[:location].JS[:pathname]
-          @location = React::Component::Location.new(@native.JS[:props].JS[:location])
+        return nil unless @native.JS[:props].JS[:history].JS[:location]
+        if @native.JS[:props].JS[:history].JS[:location].JS[:pathname]
+          @location = React::Component::Location.new(@native)
         else
-          @native.JS[:props].JS[:location]
+          @native.JS[:props].JS[:history].JS[:location]
         end
       end
 
       def to_n
-        @native
+        @native.JS[:props].JS[:history]
       end
     end
   end

data/lib/react/component/location.rb

@@ -4,7 +4,7 @@ module React
       include ::Native::Wrapper
 
       def method_missing(prop, *args, &block)
-        @native.JS[:params].JS[prop]
+        @native.JS[:props].JS[:location].JS[prop]
       end
 
       def to_n
@@ -12,4 +12,4 @@ module React
       end
     end
   end
-end
+end

data/lib/react/component/match.rb

@@ -4,11 +4,11 @@ module React
       include ::Native::Wrapper
 
       def method_missing(prop, *args, &block)
-        @native.JS[:params].JS[prop]
+        @native.JS[:props].JS[:match].JS[:params].JS[prop]
       end
 
       def is_exact
-        @native.JS[:isExact]
+        @native.JS[:props].JS[:match].JS[:isExact]
       end
 
       def params
@@ -16,16 +16,16 @@ module React
       end
 
       def path
-        @native.JS[:path]
+        @native.JS[:props].JS[:match].JS[:path]
       end
 
       def url
-        @native.JS[:url]
+        @native.JS[:props].JS[:match].JS[:url]
       end
 
       def to_n
-        @native
+        @native.JS[:props].JS[:match]
       end
     end
   end
-end
+end

data/lib/react/component/mixin.rb

@@ -11,7 +11,6 @@ module React
         base.include(::React::Component::Callbacks)
         base.include(::React::Component::Initializer)
         base.include(::React::Component::Features)
-        base.include(::React::Component::Resolution)
       end
     end
   end

data/lib/react/component/props.rb

@@ -16,11 +16,11 @@ module React
       end
 
       def classes
-        @classes ||= `Opal.React.Component.Styles.$new(#@native, 'classes')`
+        @classes ||= React::Component::Styles.new(@native, 'classes')
       end
 
       def theme
-        @theme ||= `Opal.React.Component.Styles.$new(#@native, 'theme')`
+        @theme ||= React::Component::Styles.new(@native, 'theme')
       end
 
       def isomorfeus_store
@@ -29,27 +29,30 @@ module React
 
       # for router convenience
       def history
+        return @history if @history
         return nil if `typeof #@native.props.history === 'undefined'`
-        if `typeof #@native.props.history.pathname !== 'undefined'`
-          React::Component::History.new(@native.JS[:props].JS[:history])
+        if `typeof #@native.props.history.action !== 'undefined'`
+          @history = React::Component::History.new(@native)
         else
           @native.JS[:props].JS[:history]
         end
       end
 
       def location
+        return @location if @location
         return nil if `typeof #@native.props.location === 'undefined'`
         if `typeof #@native.props.location.pathname !== 'undefined'`
-          React::Component::Location.new(@native.JS[:props].JS[:location])
+          @location = React::Component::Location.new(@native)
         else
           @native.JS[:props].JS[:location]
         end
       end
 
       def match
+        return @match if @match
         return nil if `typeof #@native.props.match === 'undefined'`
         if `typeof #@native.props.match.path !== 'undefined'`
-          React::Component::Match.new(@native.JS[:props].JS[:match])
+          @match = React::Component::Match.new(@native)
         else
           @native.JS[:props].JS[:match]
         end

data/lib/react/component/resolution.rb

@@ -8,7 +8,7 @@ module React
           def const_missing(const_name)
             # language=JS
             %x{
-              if (typeof Opal.global[const_name] === "object") {
+              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)};
                 #{Object.const_set(const_name, `new_const`)};
                 return new_const;
@@ -20,7 +20,10 @@ 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.
-          alias _react_component_class_resolution_original_method_missing method_missing
+
+          unless method_defined?(:_react_component_class_resolution_original_method_missing)
+            alias _react_component_class_resolution_original_method_missing method_missing
+          end
 
           def method_missing(component_name, *args, &block)
             # check for ruby component and render it
@@ -60,8 +63,9 @@ module React
         end
       end
 
-
-      alias _react_component_resolution_original_method_missing method_missing
+      unless method_defined?(:_react_component_resolution_original_method_missing)
+        alias _react_component_resolution_original_method_missing method_missing
+      end
 
       def method_missing(component_name, *args, &block)
         # html tags are defined as methods, so they will not end up here.
@@ -71,8 +75,7 @@ module React
         # language=JS
         %x{
           var component = null;
-          var component_type = typeof Opal.global[component_name];
-          if (component_type === "function" || component_type === "object") {
+          if (typeof Opal.global[component_name] !== "undefined" && (component_name[0] === component_name[0].toUpperCase())) {
             component = Opal.global[component_name];
           } else {
             var modules = self.$to_s().split("::");

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.5'
+  VERSION = '16.12.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.5
+  version: 16.12.6
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,6 @@ files:
 - lib/isomorfeus_react/react/function_component/initializer.rb
 - lib/isomorfeus_react/react/function_component/mixin.rb
 - lib/isomorfeus_react/react/function_component/native_component_constructor.rb
-- lib/isomorfeus_react/react/function_component/resolution.rb
 - lib/isomorfeus_react/react/memo_component/base.rb
 - lib/isomorfeus_react/react/memo_component/mixin.rb
 - lib/isomorfeus_react/react/memo_component/native_component_constructor.rb

data/lib/isomorfeus_react/react/function_component/resolution.rb

@@ -1,62 +0,0 @@
-module React
-  module FunctionComponent
-    module Resolution
-      def self.included(base)
-        base.instance_exec do
-          alias _react_function_component_resolution_original_const_missing const_missing
-
-          def const_missing(const_name)
-            # language=JS
-            %x{
-              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;
-              } else {
-                return #{_react_function_component_resolution_original_const_missing(const_name)};
-              }
-            }
-          end
-        end
-      end
-
-      alias _react_function_component_resolution_original_method_missing method_missing
-
-      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
-        %x{
-          var component = null;
-          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 !== 'undefined') {
-                component = constant.react_component;
-              }
-            } 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_function_component_resolution_original_method_missing(component_name, *args, block)};
-          }
-        }
-      end
-    end
-  end
-end