isomorfeus-react 16.12.14 → 16.12.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b84a64ef60c6346a6f9210d8a34e9b3502d784678b7c2a119aba885bc378df
-  data.tar.gz: 8f35dc4832747b9399aa30919d5528e251ab3f8b6674f112189b78bddadfb7e2
+  metadata.gz: c52d4071118b2aaf2dda6e7822a3954f9ce3ef2b4bdd846bd98d79658d0b35b3
+  data.tar.gz: 5e5aa6e03f9bd9e749ff9c8b096160c599d1c6402ee7ddbcf7afa1ebb3983ade
 SHA512:
-  metadata.gz: de02555b8c9bb216b22750b10036a4805bd21f03aa031f34b426e3f03501f4151ff7413304db8bcff9817da16cd655890ee4dbaae590f38fd3b01d8ad97e3cf6
-  data.tar.gz: b9c010c71d50101e8451c1b467cfdc869593b497f8d025b59736039f6276c31a3dc1fab800cddd9923e690ba0d51c7cd0c42a1bc813987d6064c3f2a350861a1
+  metadata.gz: 2bb47191b1f7c54b62f87fdd57aee0bd5515587dccd3afd1253ace005abcf2cce17bc0072e37a32f71938c0c6e998cf765fb42dd0e2ec713dd2afd1ed68eb7ea
+  data.tar.gz: 9b2973a335e84430ef3e92063d92957fad546032037a0357d8cd6aa0cc9030de0504c022ac066f19fc5aac29959351c4c4f0f8a65c801e3c0da359e084e65736

data/lib/isomorfeus/react_view_helper.rb

@@ -1,13 +1,13 @@
 module Isomorfeus
   module ReactViewHelper
-    def cached_mount_component(component_name, props = {}, asset = 'application_ssr.js')
+    def cached_mount_component(component_name, props = {}, asset = 'application_ssr.js', static = false)
       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)
+        render_result = mount_component(component_name, props, asset, static)
         status = ssr_response_status
         if status >= 200 && status < 300
           component_cache[key] = { render_result: render_result, ssr_response_status: status, ssr_styles: ssr_styles }
@@ -16,7 +16,11 @@ module Isomorfeus
       render_result
     end
 
-    def mount_component(component_name, props = {}, asset = 'application_ssr.js')
+    def cached_mount_static_component(component_name, props = {}, asset = 'application_ssr.js')
+      cached_mount_component(component_name, props, asset, true)
+    end
+
+    def mount_component(component_name, props = {}, asset = 'application_ssr.js', static = false)
       @ssr_response_status = nil
       @ssr_styles = nil
       thread_id_asset = "#{Thread.current.object_id}#{asset}"
@@ -84,7 +88,8 @@ module Isomorfeus
             global.Opal.Isomorfeus.TopLevel["$transport_ws_url="]("#{transport_ws_url}");
             global.Opal.send(global.Opal.Isomorfeus.Transport.$promise_connect(), 'then', [], ($$1 = function(){
               try {
-                global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)});
+                if (#{static}) { global.Opal.Isomorfeus.TopLevel.$render_component_to_static_markup('#{component_name}', #{Oj.dump(props, mode: :strict)}); }
+                else { global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)}); }
                 global.FirstPassFinished = 'transport';
               } catch (e) {
                 global.Exception = e; 
@@ -142,7 +147,8 @@ module Isomorfeus
             try {
               let sheets = new global.Opal.global.MuiStyles.ServerStyleSheets();
               let app = global.Opal.React.$create_element(component, global.Opal.Hash.$new(#{Oj.dump(props, mode: :strict)}));
-              rendered_tree = global.Opal.global.ReactDOMServer.renderToString(sheets.collect(app));
+              if (#{static}) { rendered_tree = global.Opal.global.ReactDOMServer.renderToStaticMarkup(sheets.collect(app)); }
+              else { rendered_tree = global.Opal.global.ReactDOMServer.renderToString(sheets.collect(app)); }
               ssr_styles = sheets.toString();
             } catch (e) {
               global.Exception = e;
@@ -157,14 +163,16 @@ module Isomorfeus
               let generate_id = global.Opal.global.ReactJSS.createGenerateId();
               let app = global.Opal.React.$create_element(component, global.Opal.Hash.$new(#{Oj.dump(props, mode: :strict)}));
               let element = global.Opal.global.React.createElement(global.Opal.global.ReactJSS.JssProvider, { registry: sheets, generateId: generate_id }, app);
-              rendered_tree = global.Opal.global.ReactDOMServer.renderToString(element);
+              if (#{static}) { rendered_tree = global.Opal.global.ReactDOMServer.renderToStaticMarkup(element); }
+              else { rendered_tree = global.Opal.global.ReactDOMServer.renderToString(element); }
               ssr_styles = sheets.toString();
             } catch (e) {
               global.Exception = e;
             }
           } else {
             try {
-              rendered_tree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)});
+              if (#{static}) { rendered_tree = global.Opal.Isomorfeus.TopLevel.$render_component_to_static_markup('#{component_name}', #{Oj.dump(props, mode: :strict)}); } 
+              else { rendered_tree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)}); }
             } catch (e) {
               global.Exception = e;
             }
@@ -176,7 +184,7 @@ module Isomorfeus
 
         # execute second render pass
         rendered_tree, application_state, @ssr_styles, @ssr_response_status, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
-        Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
+        Isomorfeus.raise_error(message: exception['message'], stack: exception['stack']) if exception
 
         # build result
         render_result << " data-iso-hydrated='true'" if rendered_tree
@@ -192,6 +200,10 @@ module Isomorfeus
       render_result
     end
 
+    def mount_static_component(component_name, props = {}, asset = 'application_ssr.js')
+      mount_component(component_name, props, asset, true)
+    end
+
     def ssr_response_status
       @ssr_response_status || 200
     end

data/lib/isomorfeus/top_level_ssr.rb

@@ -8,7 +8,7 @@ module Isomorfeus
         # nothing, but keep it for compatibility with browser
       end
 
-      def render_component_to_string(component_name, props)
+      def render_component_to_static_markup(component_name, props)
         component = nil
         %x{
           if (typeof component_name === 'string' || component_name instanceof String) {
@@ -20,7 +20,21 @@ module Isomorfeus
           }
         }
         component = Isomorfeus.cached_component_class(component_name) unless component
+        ReactDOMServer.render_to_static_markup(React.create_element(component, `Opal.Hash.$new(props)`))
+      end
 
+      def render_component_to_string(component_name, props)
+        component = nil
+        %x{
+          if (typeof component_name === 'string' || component_name instanceof String) {
+            component = component_name.split(".").reduce(function(o, x) {
+              return (o !== null && typeof o[x] !== "undefined" && o[x] !== null) ? o[x] : null;
+            }, Opal.global)
+          } else {
+            component = component_name;
+          }
+        }
+        component = Isomorfeus.cached_component_class(component_name) unless component
         ReactDOMServer.render_to_string(React.create_element(component, `Opal.Hash.$new(props)`))
       end
     end

data/lib/react/component/state.rb

@@ -20,8 +20,8 @@ module React
 
       def set_state(updater, &block)
         new_state = `{}`
-        updater.keys.each do |key|
-          new_state.JS[key] = updater[key]
+        updater.each do |key, value|
+          new_state.JS[key] = value
         end
         if block_given?
           @native.JS.setState(new_state, `function() { block.$call(); }`)

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.14'
+  VERSION = '16.12.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.14
+  version: 16.12.15
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -277,7 +277,7 @@ metadata:
   github_repo: ssh://github.com/isomorfeus/gems
 post_install_message: |2+
 
-  isomorfeus-react 16.12.14:
+  isomorfeus-react 16.12.15:
    Breaking change:
      The event_handler DSL is gone. Instead use normal methods and method_ref, see:
      https://github.com/isomorfeus/isomorfeus-react/blob/master/ruby/docs/events.md