isomorfeus-react 16.8.1 → 16.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1f51aa98f40271693104f25f9321a0b1ce04668666efe2f6b345958f2d4687
-  data.tar.gz: 0c823d4922443ab1b157b638438a908caff664906be19c7fbef4f0410cb3a36d
+  metadata.gz: 9e21d256eefe22328c08a12c7fe32ad6891c60d167f2ff44b4c24fea24ce018e
+  data.tar.gz: 3f142f8243283f8ef26892e96d8c10913d22b20ccf70d435f662148b0ea51f0c
 SHA512:
-  metadata.gz: d14aa94c3504a7cf2eee50db467e468045660f4fcdc1dbc8f2beb95f7f2ad45e6ceca07c8a53b8291a354859e42e8c1d6cc2f6245ef5e2c0ab0bc2ccf4865cda
-  data.tar.gz: 9b36d35c724f49776ec46bb4c4bf4530f7ccd3cb2b29d83ed2b8fbbb7c619dbf5c4c23a5c86c87ebd13eb8cccbe315f2f543a6bca5f7f2a102eae2c1051d4322
+  metadata.gz: 5da5eb77a5e0705a8f073b6841932cdfddba41bf05dd12cd417295cb5abfdfc07f2337b9197fe7d340740779311f8ed8f1c03238ae9d8eb59e4a2412f0d27d40
+  data.tar.gz: aff97f67736bd4901efd02936c16a236855b759c1b0b1f9c0d949700d5592a3540a3e39ddbead11b75bfb9d619f543813a8539c9471ba153acf7ad04a44dff67

data/lib/isomorfeus/config.rb

@@ -1,6 +1,7 @@
 module Isomorfeus
   if RUBY_ENGINE == 'opal'
     class << self
+      attr_accessor :initial_state_fetched
       attr_reader :initialized
       attr_reader :env
 

data/lib/isomorfeus/react_view_helper.rb

@@ -1,7 +1,7 @@
 module Isomorfeus
   module ReactViewHelper
     def mount_component(component_name, props = {}, asset = 'application_ssr.js')
-      render_result = "<div data-iso-env=\"#{Isomorfeus.env}\" data-iso-root=\"#{component_name}\" data-iso-props='#{Oj.dump(props, mode: :strict)}'>"
+      render_result = "<div data-iso-env=\"#{Isomorfeus.env}\" data-iso-root=\"#{component_name}\" data-iso-props='#{Oj.dump(props, mode: :strict)}'"
       if Isomorfeus.server_side_rendering
         unless Isomorfeus.ssr_contexts.key?(asset)
           asset_file_name = OpalWebpackLoader::Manifest.lookup_path_for(asset)
@@ -15,9 +15,15 @@ module Isomorfeus
           JAVASCRIPT
         end
         javascript << <<~JAVASCRIPT
-          return global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)})
+          var rendered_tree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)})
+          var application_state = global.Opal.Isomorfeus.store.native.getState();
+          return [rendered_tree, application_state]
         JAVASCRIPT
-        render_result << Isomorfeus.ssr_contexts[asset].exec(javascript)
+        rendered_tree, application_state = Isomorfeus.ssr_contexts[asset].exec(javascript)
+        render_result << "data-iso-state='#{Oj.dump(application_state, mode: :strict)}'>"
+        render_result << rendered_tree
+      else
+        render_result << '>'
       end
       render_result << '</div>'
       render_result

data/lib/isomorfeus/top_level_browser.rb

@@ -9,6 +9,13 @@ module Isomorfeus
         props_json = root_element.JS.getAttribute('data-iso-props')
         props = `Opal.Hash.$new(JSON.parse(props_json))`
         hydrated = root_element.JS.getAttribute('data-iso-hydrated')
+        state_json = root_element.JS.getAttribute('data-iso-state')
+        if state_json
+          state = `JSON.parse(state_json)`
+          Isomorfeus.store.JS[:native].JS.dispatch(`{ type: 'APPLICATION_STATE', set_state: state.application_state }`)
+          Isomorfeus.store.JS[:native].JS.dispatch(`{ type: 'COMPONENT_STATE', set_state: state.component_state }`)
+          Isomorfeus.store.JS[:native].JS.dispatch(`{ type: 'COMPONENT_CLASS_STATE', set_state: state.component_class_state }`)
+        end
         mount_component(component, props, root_element, hydrated)
       end
     end

data/lib/isomorfeus/top_level_ssr.rb

@@ -10,6 +10,10 @@ module Isomorfeus
       def render_component_to_string(component_name, props_json)
         # for some reason props_json arrives already decoded
         component = component_name.constantize
+        unless Isomorfeus.initial_state_fetched
+          Isomorfeus.initial_state_fetched = true
+          Redux::Store.preloaded_state = Isomorfeus.store.get_state
+        end
         Isomorfeus.force_init!
         ReactDOMServer.render_to_string(React.create_element(component, `Opal.Hash.$new(props_json)`))
       end

data/lib/lucid_component/api.rb

@@ -2,25 +2,10 @@ module LucidComponent
   module API
     def self.included(base)
       base.instance_exec do
-        def app_store
-          @default_app_store_defined = true
-          @default_app_store ||= ::React::ReduxComponent::AppStoreDefaults.new(default_props, self.to_s)
-        end
-
-        def class_store
-          @default_class_store_defined = true
-          @default_class_store ||= ::React::ReduxComponent::ComponentClassStoreDefaults.new(default_props, self.to_s)
-        end
-
-        def store
-          @default_instance_store_defined = true
-          @default_class_store ||= ::React::ReduxComponent::ComponentInstanceStoreDefaults.new(default_props, self.to_s)
-        end
-
         def prop(name, options = `null`)
           name = `Opal.React.lower_camelize(name)`
           if options
-            if options.has_key?(:default)
+            if options.key?(:default)
               %x{
                 if (typeof self.lucid_react_component.defaultProps == "undefined") {
                   self.lucid_react_component.defaultProps = { isomorfeus_store: Opal.Hash.$new() };
@@ -28,7 +13,7 @@ module LucidComponent
                 self.lucid_react_component.defaultProps[name] = options.$fetch("default");
               }
             end
-            if options.has_key?(:class)
+            if options.key?(:class)
               %x{
                 if (typeof self.lucid_react_component.propTypes == "undefined") {
                   self.lucid_react_component.propTypes = {};
@@ -38,7 +23,7 @@ module LucidComponent
                 self.lucid_react_component.propTypes[name] = self.lucid_react_component.prototype.validateProp;
                 self.lucid_react_component.propValidations[name].ruby_class = options.$fetch("class");
               }
-            elsif options.has_key?(:is_a)
+            elsif options.key?(:is_a)
               %x{
                 if (typeof self.lucid_react_component.propTypes == "undefined") {
                   self.lucid_react_component.propTypes = {};
@@ -49,7 +34,7 @@ module LucidComponent
                 self.lucid_react_component.propValidations[name].is_a = options.$fetch("is_a");
               }
             end
-            if options.has_key?(:required)
+            if options.key?(:required)
               %x{
                 if (typeof self.lucid_react_component.propTypes == "undefined") {
                   self.lucid_react_component.propTypes = {};
@@ -59,7 +44,7 @@ module LucidComponent
                 self.lucid_react_component.propTypes[name] = self.lucid_react_component.prototype.validateProp;
                 self.lucid_react_component.propValidations[name].required = options.$fetch("required");
               }
-            elsif !options.has_key?(:default)
+            elsif !options.key?(:default)
               %x{
                 if (typeof self.lucid_react_component.propTypes == "undefined") {
                   self.lucid_react_component.propTypes = {};

data/lib/react/component/api.rb

@@ -47,7 +47,7 @@ module React
           def prop(name, options = `null`)
             name = `Opal.React.lower_camelize(name)`
             if options
-              if options.has_key?(:default)
+              if options.key?(:default)
                 %x{
                   if (typeof self.react_component.defaultProps == "undefined") {
                     self.react_component.defaultProps = {};
@@ -55,23 +55,23 @@ module React
                   self.react_component.defaultProps[name] = options.$fetch("default");
                 }
               end
-              if options.has_key?(:class)
+              if options.key?(:class)
                 %x{
                   Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].ruby_class = options.$fetch("class");
                 }
-              elsif options.has_key?(:is_a)
+              elsif options.key?(:is_a)
                 %x{
                   Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].is_a = options.$fetch("is_a");
                 }
               end
-              if options.has_key?(:required)
+              if options.key?(:required)
                 %x{
                   Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].required = options.$fetch("required");
                 }
-              elsif !options.has_key?(:default)
+              elsif !options.key?(:default)
                 %x{
                   Opal.React.set_validate_prop(self, name);
                   self.react_component.propValidations[name].required = true;

data/lib/react/redux_component/api.rb

@@ -31,7 +31,7 @@ module React
 
           def store
             @default_instance_store_defined = true
-            @default_class_store ||= ::React::ReduxComponent::ComponentInstanceStoreDefaults.new(state, self.to_s)
+            @default_instance_store ||= ::React::ReduxComponent::ComponentInstanceStoreDefaults.new(state, self.to_s)
           end
         end
       end

data/lib/react/redux_component/app_store_defaults.rb

@@ -16,14 +16,14 @@ module React
           key = key.chop if `key.endsWith('=')`
           @state.isomorfeus_store[:application_state][key] = args[0]
           current_state = Isomorfeus.store.get_state
-          if !(current_state[:application_state].has_key?(key))
+          if !(current_state[:application_state].key?(key))
             Isomorfeus.store.dispatch(type: 'APPLICATION_STATE', name: key, value: args[0])
           end
         else
           # get class state
 
           # check if we have a component local state value
-          if @state.isomorfeus_store[:application_state].has_key?(key)
+          if @state.isomorfeus_store[:application_state].key?(key)
             return @state.isomorfeus_store[:application_state][key]
           end
         end

data/lib/react/redux_component/app_store_proxy.rb

@@ -18,7 +18,7 @@ module React
           # check if we have a component local state value
           if `this.native_component_instance[this.access_key]["isomorfeus_store"]["application_state"].hasOwnProperty(key)`
             return @native_component_instance.JS[@access_key].JS[:isomorfeus_store].JS[:application_state].JS[key]
-          elsif @component_instance.class.default_app_store_defined && @component_instance.class.app_store.to_h.has_key?(key)
+          elsif @component_instance.class.default_app_store_defined && @component_instance.class.app_store.to_h.key?(key)
             # check if a default value was given
             return @component_instance.class.app_store.to_h[key]
           end

data/lib/react/redux_component/class_store_proxy.rb

@@ -21,7 +21,7 @@ module React
           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)
             return @native_component_instance.JS[@access_key].JS[:isomorfeus_store].JS[:component_class_state].JS[@component_name].JS[key]
-          elsif @component_instance.class.default_class_store_defined && @component_instance.class.class_store.to_h.has_key?(key)
+          elsif @component_instance.class.default_class_store_defined && @component_instance.class.class_store.to_h.key?(key)
             # check if a default value was given
             return @component_instance.class.class_store.to_h[key]
           end

data/lib/react/redux_component/component_class_store_defaults.rb

@@ -17,7 +17,7 @@ module React
           key = key.chop if `key.endsWith('=')`
           @state.isomorfeus_store[:component_class_state][@component_name][key] = args[0]
           current_state = Isomorfeus.store.get_state
-          if !(current_state[:component_class_state].has_key?(@component_name) && current_state[:component_class_state][@component_name].has_key?(key))
+          if !(current_state[:component_class_state].key?(@component_name) && current_state[:component_class_state][@component_name].key?(key))
             Isomorfeus.store.dispatch(type: 'COMPONENT_CLASS_STATE', class: @component_name, name: key, value: args[0])
           end
         else
@@ -25,7 +25,7 @@ module React
 
           # check if we have a component local state value
 
-          if @state.isomorfeus_store[:component_class_state][@component_name].has_key?(key)
+          if @state.isomorfeus_store[:component_class_state][@component_name].key?(key)
             return @state.isomorfeus_store[:component_class_state][@component_name][key]
           end
         end

data/lib/react/redux_component/component_instance_store_defaults.rb

@@ -12,9 +12,9 @@ module React
           key = key.chop if `key.endsWith('=')`
           @state[key] = args[0]
           current_state = Isomorfeus.store.get_state
-          if !(current_state[:component_class_state].has_key?(@component_name) &&
-            current_state[:component_class_state][@component_name].has_key?(:instance_defaults) &&
-            current_state[:component_class_state][@component_name][:instance_defaults].has_key?(key))
+          if !(current_state[:component_state].key?(@component_name) &&
+            current_state[:component_state][@component_name].key?(:instance_defaults) &&
+            current_state[:component_state][@component_name][:instance_defaults].key?(key))
             Isomorfeus.store.dispatch(type: 'COMPONENT_CLASS_STATE', class: @component_name, name: :instance_defaults, value: { key => args[0]})
           end
         else
@@ -22,7 +22,7 @@ module React
 
           # check if we have a component local state value
 
-          if @state.has_key?(key)
+          if @state.key?(key)
             return @state[key]
           end
         end
@@ -32,10 +32,6 @@ module React
       def to_h
         @state
       end
-
-      def to_n
-        @state.to_n
-      end
     end
   end
 end

data/lib/react/redux_component/instance_store_proxy.rb

@@ -24,7 +24,7 @@ module React
             @native_component_instance.JS[@access_key].JS[:isomorfeus_store].JS[:component_state].JS[@component_object_id].JS.hasOwnProperty(key)
             # check if we have a component local state value
             return @native_component_instance.JS[@access_key].JS[:isomorfeus_store].JS[:component_state].JS[@component_object_id].JS[key]
-          elsif @component_instance.class.default_instance_store_defined && @component_instance.class.store.to_h.has_key?(key)
+          elsif @component_instance.class.default_instance_store_defined && @component_instance.class.store.to_h.key?(key)
             # check if a default value was given
             return @component_instance.class.store.to_h[key]
           end

data/lib/react/redux_component/reducers.rb

@@ -10,10 +10,14 @@ module React
             component_reducer = Redux.create_reducer do |prev_state, action|
               case action[:type]
               when 'COMPONENT_STATE'
-                new_state = {}.merge!(prev_state) # make a copy of state
-                new_state[action[:object_id]] = {} unless new_state.has_key?(action[:object_id])
-                new_state[action[:object_id]].merge!(action[:name] => action[:value])
-                new_state
+                if action.key?(:set_state)
+                  action[:set_state]
+                else
+                  new_state = {}.merge!(prev_state) # make a copy of state
+                  new_state[action[:object_id]] = {} unless new_state.key?(action[:object_id])
+                  new_state[action[:object_id]].merge!(action[:name] => action[:value])
+                  new_state
+                end
               else
                 prev_state
               end
@@ -22,10 +26,14 @@ module React
             component_class_reducer = Redux.create_reducer do |prev_state, action|
               case action[:type]
               when 'COMPONENT_CLASS_STATE'
-                new_state = {}.merge!(prev_state) # make a copy of state
-                new_state[action[:class]] = {} unless new_state.has_key?(action[:class])
-                new_state[action[:class]].merge!(action[:name] => action[:value])
-                new_state
+                if action.key?(:set_state)
+                  action[:set_state]
+                else
+                  new_state = {}.merge!(prev_state) # make a copy of state
+                  new_state[action[:class]] = {} unless new_state.key?(action[:class])
+                  new_state[action[:class]].merge!(action[:name] => action[:value])
+                  new_state
+                end
               else
                 prev_state
               end

data/lib/react/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.8.1
+  version: 16.8.2
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-09 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.7
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement