isomorfeus-react 16.12.3 → 16.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b27da18f07ffa5532831f4eb7223e2811186de76a311b6b6c5382daa31e07b
-  data.tar.gz: 94216067a6cd36e0eda714fbe5c5d807432b478da1cdb0ae193312659f879a21
+  metadata.gz: 69771dea65edc7607119f666d42f3b94e9127086ad3e030c471856102309257e
+  data.tar.gz: 7c2c7490ada522852b4afb23031a82fa819f772d46e68f39829d5b35de22164b
 SHA512:
-  metadata.gz: 4b8414d7467dc8b04f3838db146e497556ac68d7a4016f38b4c1b445c5a035a3c157c6f9bc53d8937444677660596e6049da71865bb0681d77c5400b3c22bf75
-  data.tar.gz: cbf406f15a160204347a20cdb8f38293b431a0517537c80eaf742191849386fadb4bda6c56810b8b00b08c28712630a3b070915f0e50d6113f9970ed4a0c3df7
+  metadata.gz: 49e1c4ed99f44f8bb592da6cf0b0e9b20b24ccc435533b32dfff6239418528161387395056870fad6114f22ea9a36a3f88b9380b6900d477c59cd1289ec14153
+  data.tar.gz: 7b6b021c7a543befab9c9999e13938b4e02d401f357b556d1d4d40494b90c2fef26c7e8b58da9ea0300e6733070d8b8e2646ca1c146f94fb75f6a67af5ccf95d

data/lib/isomorfeus/config.rb

@@ -28,6 +28,10 @@ module Isomorfeus
         client_init_class_names << init_class_name
       end
 
+      def add_client_init_after_store_class_name(init_class_name)
+        client_init_after_store_class_names << init_class_name
+      end
+
       def add_client_option(key, value = nil)
         self.class.attr_accessor(key)
         self.send("#{key}=", value)
@@ -50,6 +54,12 @@ module Isomorfeus
         end
       end
 
+      def execute_init_after_store_classes
+        client_init_after_store_class_names.each do |constant|
+          constant.constantize.send(:init)
+        end
+      end
+
       def env=(env_string)
         @env = env_string ? env_string : 'development'
         @development = (@env == 'development') ? true : false
@@ -97,6 +107,7 @@ module Isomorfeus
     end
 
     self.add_client_option(:client_init_class_names, [])
+    self.add_client_option(:client_init_after_store_class_names, [])
   else
     class << self
       attr_accessor :server_side_rendering

data/lib/isomorfeus/react_view_helper.rb

@@ -1,5 +1,18 @@
 module Isomorfeus
   module ReactViewHelper
+    def cached_mount_component(component_name, props = {}, asset = 'application_ssr.js')
+      key = "#{component_name}#{props}#{asset}"
+      if Isomorfeus.production? && component_cache.key?(key)
+        render_result = component_cache[key][:render_result]
+        @ssr_response_status = component_cache[key][:ssr_response_status]
+        @sst_styles = component_cache[key][:ssr_styles]
+      else
+        render_result = mount_component(component_name, props, asset)
+        component_cache[key] = { render_result: render_result, ssr_response_status: ssr_response_status, ssr_styles: ssr_styles }
+      end
+      render_result
+    end
+
     def mount_component(component_name, props = {}, asset = 'application_ssr.js')
       @ssr_response_status = nil
       @ssr_styles = nil
@@ -51,7 +64,8 @@ module Isomorfeus
           global.Opal.Isomorfeus.TopLevel['$ssr_route_path=']('#{props[:location]}');
         JAVASCRIPT
 
-        # if location_host and scheme are given and if Transport is loaded, connect and then render, otherwise do not render
+        # if location_host and scheme are given and if Transport is loaded, connect and then render,
+        # otherwise do not render because only one pass is required
         ws_scheme = props[:location_scheme] == 'https:' ? 'wss:' : 'ws:'
         location_host = props[:location_host] ? props[:location_host] : 'localhost'
         api_ws_path = Isomorfeus.respond_to?(:api_websocket_path) ? Isomorfeus.api_websocket_path : ''
@@ -152,12 +166,16 @@ module Isomorfeus
 
         # build result
         render_result << " data-iso-hydrated='true'" if rendered_tree
-        render_result << " data-iso-nloc='#{props[:locale]}' data-iso-state='#{Oj.dump(application_state, mode: :strict)}'>"
+        # render_result << " data-iso-nloc='#{props[:locale]}' data-iso-state='#{Oj.dump(application_state, mode: :strict)}'>"
+        render_result << " data-iso-nloc='#{props[:locale]}'>"
         render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
       else
         render_result << " data-iso-nloc='#{props[:locale]}'>"
       end
       render_result << '</div>'
+      if Isomorfeus.server_side_rendering
+        render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
+      end
       render_result
     end
 
@@ -168,5 +186,11 @@ module Isomorfeus
     def ssr_styles
       @ssr_styles || ''
     end
+
+    private
+
+    def component_cache
+      Thread.current[:component_cache] ||= {}
+    end
   end
 end

data/lib/isomorfeus/top_level.rb

@@ -25,18 +25,21 @@ module Isomorfeus
             props = `Opal.Hash.$new(JSON.parse(props_json))`
             raw_hydrated = root_element.JS.getAttribute('data-iso-hydrated')
             hydrated = (raw_hydrated && raw_hydrated == "true")
-            state_json = root_element.JS.getAttribute('data-iso-state')
-            if state_json
+            #state_json = root_element.JS.getAttribute('data-iso-state')
+            #if state_json
               %x{
-                var state = JSON.parse(state_json);
-                var keys = Object.keys(state);
-                for(var i=0; i < keys.length; i++) {
-                  if (Object.keys(state[keys[i]]).length > 0) {
-                    global.Opal.Isomorfeus.store.native.dispatch({ type: keys[i].toUpperCase(), set_state: state[keys[i]] });
+                if (global.ServerSideRenderingStateJSON) {
+                var state = global.ServerSideRenderingStateJSON;
+                  var keys = Object.keys(state);
+                  for(var i=0; i < keys.length; i++) {
+                    if (Object.keys(state[keys[i]]).length > 0) {
+                      global.Opal.Isomorfeus.store.native.dispatch({ type: keys[i].toUpperCase(), set_state: state[keys[i]] });
+                    }
                   }
                 }
               }
-            end
+            #end
+            Isomorfeus.execute_init_after_store_classes
             begin
               result = Isomorfeus::TopLevel.mount_component(component, props, root_element, hydrated)
               @tried_another_time = false

data/lib/lucid_app/native_lucid_component_constructor.rb

@@ -47,6 +47,7 @@ module LucidApp
                 this[ref] = Opal.global.React.createRef();
               }
             }
+            if (base.preload_block) { this.state.preloaded = this.__ruby_instance.$execute_preload_block(); }
             this.listener = this.listener.bind(this);
             this.unsubscriber = Opal.Isomorfeus.store.native.subscribe(this.listener);
           }
@@ -65,7 +66,7 @@ module LucidApp
             oper.active_components.push(this);
             oper.active_redux_components.push(this);
             let block_result;
-            if (base.preload_block && base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+            if (base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
             else { 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); }
             oper.active_redux_components.pop();

data/lib/lucid_component/native_lucid_component_constructor.rb

@@ -37,6 +37,7 @@ module LucidComponent
                 this[ref] = Opal.global.React.createRef();
               }
             }
+            if (base.preload_block) { this.state.preloaded = this.__ruby_instance.$execute_preload_block(); }
           }
           static get displayName() {
             return #{component_name};
@@ -52,16 +53,12 @@ module LucidComponent
             oper.active_components.push(this);
             oper.active_redux_components.push(this);
             let block_result;
-            if (base.preload_block && base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+            if (base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
             else { 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); }
             oper.active_redux_components.pop();
             oper.active_components.pop();
             // console.log("lucid component popping", oper.render_buffer, oper.render_buffer.toString());
-            if (base.except_ssr) {
-              if (typeof block_result === "object" && block_result.danger) { return Opal.global.React.createElement('div', {'data-ssrhelper': this.__ruby_instance.$class().$to_s(), dangerouslySetInnerHTML: { __html: block_result.html}});}
-              else { return Opal.global.React.createElement('div', {'data-ssrhelper': this.__ruby_instance.$class().$to_s()}, oper.render_buffer.pop()); }
-            }
             return oper.render_buffer.pop();
           }
           data_access() {

data/lib/lucid_component/preloading_support.rb

@@ -5,34 +5,27 @@ module LucidComponent
         def preload(&block)
           `base.preload_block = block`
           component_did_mount do
-            instance_exec(&self.class.JS[:preload_block]).then do
-              self.state.preloaded = true
-            end
+            @_preload_promise.then { self.state.preloaded = true } unless self.state.preloaded
           end
         end
 
         def while_loading(option = nil, &block)
-          if option == :except_ssr
-            `base.except_ssr = true;`
-            block = if on_ssr?
-                      proc { instance_exec(&`base.render_block`) }
-                    else
-                      given_block = block
-                      proc do
-                        %x{
-                          let query = "[data-ssrhelper='" + #{self.class.to_s} + "']";
-                          let el = document.querySelector(query);
-                          if (el) { return { danger: true, html: el.innerHTML }; }
-                          else { return #{instance_exec(&given_block)};
-                          }
-                        }
-                      end
-                    end
+          wl_block = proc do
+            if @_preload_promise.resolved?
+              instance_exec(&`base.render_block`)
+            else
+              instance_exec(&block)
+            end
           end
-          `base.while_loading_block = block`
+          `base.while_loading_block = wl_block`
         end
       end
 
+      def execute_preload_block
+        @_preload_promise = instance_exec(&self.class.JS[:preload_block])
+        @_preload_promise.resolved?
+      end
+
       def preloaded?
         !!state.preloaded
       end

data/lib/lucid_material/func/native_component_constructor.rb

@@ -7,11 +7,11 @@ module LucidMaterial
           base.store_updates = true;
           base.equality_checker = null;
           base.instance_init = function(initial) {
-          let ruby_state = { instance: #{base.new(`{}`)} };
-          ruby_state.instance.__ruby_instance = ruby_state.instance;
-          ruby_state.instance.data_access = function() { return this.props.store; }
-          ruby_state.instance.data_access.bind(ruby_state.instance);
-          return ruby_state;
+            let ruby_state = { instance: #{base.new(`{}`)} };
+            ruby_state.instance.__ruby_instance = ruby_state.instance;
+            ruby_state.instance.data_access = function() { return this.props.store; }
+            ruby_state.instance.data_access.bind(ruby_state.instance);
+            return ruby_state;
           }
           base.instance_reducer = function(state, action) { return state; }
           base.react_component = Opal.global.React.memo(function(props) {

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.3'
+  VERSION = '16.12.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.3
+  version: 16.12.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2019-12-19 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.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement