isomorfeus-react 16.9.7 → 16.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8597a16d99c067226f1832565d36bf5c9021a4f5b54a1ee2cd23c1c6da4309a
-  data.tar.gz: e712d0ebd4a43cf8e6311dfb1cf7b8dacdc1da3aed607f846f28fbd9a95c82dd
+  metadata.gz: dc03d863734914d6d34e16f357f6d5dfed20162c052e7c0725ad80c9b4582721
+  data.tar.gz: 7584c829f1e73a2cd274f6ff86076e682cfd945cc858a012c153a8a2eb2e78e0
 SHA512:
-  metadata.gz: 46507c9416c5c04f684e4ceea2e7667c8c90976ded05c8ddb0e268b7420fc97bb1a41a2a37a57f5aa39d2b0ad5699d4ae74e3e93582251b56aa726c7ff30e497
-  data.tar.gz: 5884fb376630de3ae0fe2100dd86dd59c38b9918f9beb79ce38339a43049aa897b353a3e3dfe2630575187786c5515efc94e02e0307e394934db69ee325ed225
+  metadata.gz: 1c1814d751e1c9b0df44c0ec13f870111b81d4b93664437f565b80c02dc845b839d9a897c751500235306c01d0bd5474d795fdd228d1751e606510ed2f87be01
+  data.tar.gz: 64a2b50d8e0db1dfd519e781be3173d25f706321b98a2d7b4b99ae8f271839ba0bfc80b762145d3e9384664833fbe778f10b6bd128b011cbb6b0cf94a28828b5

data/lib/isomorfeus/react_view_helper.rb

@@ -17,6 +17,9 @@ module Isomorfeus
         javascript = <<~JAVASCRIPT
           global.FirstPassFinished = false;
           global.Opal.Isomorfeus['$env=']('#{Isomorfeus.env}');
+          if (typeof global.Opal.Isomorfeus.$negotiated_locale === 'function') {
+            global.Opal.Isomorfeus["$negotiated_locale="]('#{props[:locale]}');
+          }
           global.Opal.Isomorfeus['$force_init!']();
           global.Opal.Isomorfeus['$ssr_response_status='](200);
           global.Opal.Isomorfeus.TopLevel['$ssr_route_path=']('#{props[:location]}');
@@ -81,10 +84,10 @@ module Isomorfeus
         rendered_tree, application_state, @ssr_response_status = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
 
         # build result
-        render_result << " 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 << rendered_tree
       else
-        render_result << '>'
+        render_result << " data-iso-nloc='#{props[:locale]}'>"
       end
       render_result << '</div>'
       render_result

data/lib/isomorfeus/top_level_browser.rb

@@ -1,67 +1,76 @@
 module Isomorfeus
   class TopLevel
-    def self.mount!
-      Isomorfeus.init
-      on_ready do
-        root_element = `document.querySelector('div[data-iso-root]')`
-        component_name = root_element.JS.getAttribute('data-iso-root')
-        Isomorfeus.env = root_element.JS.getAttribute('data-iso-env')
-        begin
-          component = component_name.constantize
-          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
-            %x{
-              var state = JSON.parse(state_json);
-              var keys = Object.keys(state);
-              for(var i=0; i < keys.length; i++) {
-                global.Opal.Isomorfeus.store.native.dispatch({ type: keys[i].toUpperCase(), set_state: state[keys[i]] });
+    class << self
+      def mount!
+        Isomorfeus.init
+        Isomorfeus::TopLevel.on_ready do
+          root_element = `document.querySelector('div[data-iso-root]')`
+          component_name = root_element.JS.getAttribute('data-iso-root')
+          Isomorfeus.env = root_element.JS.getAttribute('data-iso-env')
+          component = nil
+          begin
+            component = component_name.constantize
+          rescue
+            @timeout_start = Time.now unless @timeout_start
+            if (Time.now - @timeout_start) < 10
+              `setTimeout(Opal.Isomorfeus.TopLevel['$mount!'], 100)`
+            else
+              `console.error("Unable to mount '" + #{component_name} + "'!")`
+            end
+          end
+          if component
+            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
+              %x{
+                var state = JSON.parse(state_json);
+                var keys = Object.keys(state);
+                for(var i=0; i < keys.length; i++) {
+                  global.Opal.Isomorfeus.store.native.dispatch({ type: keys[i].toUpperCase(), set_state: state[keys[i]] });
+                }
               }
-            }
+            end
+            mount_component(component, props, root_element, hydrated)
           end
-          mount_component(component, props, root_element, hydrated)
-        rescue
-          @timeout_start = Time.now unless @timeout_start
-          `setTimeout(#{mount!}, 100)` if (Time.now - @timeout_start) < 10
         end
       end
-    end
 
-    def self.on_ready(&block)
-      # this looks a bit odd but works across _all_ browsers, and no event handler mess
-      %x{
-        function run() { block.$call() };
-        function ready_fun() {
-          /in/.test(document.readyState) ? setTimeout(ready_fun,5) : run();
+      def on_ready(&block)
+        # this looks a bit odd but works across _all_ browsers, and no event handler mess
+        %x{
+          function run() { block.$call() };
+          function ready_fun() {
+            /in/.test(document.readyState) ? setTimeout(ready_fun,5) : run();
+          }
+          ready_fun();
         }
-        ready_fun();
-      }
-    end
-
-    def self.on_ready_mount(component, props = nil, element_query = nil)
-      # init in case it hasn't been run yet
-      Isomorfeus.init
-      on_ready do
-        mount_component(component, props, element_query)
       end
-    end
 
-    def self.mount_component(component, props, element_or_query, hydrated = false)
-      if `(typeof element_or_query === 'string')` || (`(typeof element_or_query.$class === 'function')` && element_or_query.class == String)
-        element = `document.body.querySelector(element_or_query)`
-      elsif `(typeof element_or_query.$is_a === 'function')` && element_or_query.is_a?(Browser::Element)
-        element = element_or_query.to_n
-      else
-        element = element_or_query
+      def on_ready_mount(component, props = nil, element_query = nil)
+        # init in case it hasn't been run yet
+        Isomorfeus.init
+        on_ready do
+          mount_component(component, props, element_query)
+        end
       end
 
-      Isomorfeus.top_component = if hydrated
-                                   ReactDOM.hydrate(React.create_element(component, props), element)
-                                 else
-                                   ReactDOM.render(React.create_element(component, props), element)
-                                 end
+      def mount_component(component, props, element_or_query, hydrated = false)
+        if `(typeof element_or_query === 'string')` || (`(typeof element_or_query.$class === 'function')` && element_or_query.class == String)
+          element = `document.body.querySelector(element_or_query)`
+        elsif `(typeof element_or_query.$is_a === 'function')` && element_or_query.is_a?(Browser::Element)
+          element = element_or_query.to_n
+        else
+          element = element_or_query
+        end
+
+        Isomorfeus.top_component = if hydrated
+                                     ReactDOM.hydrate(React.create_element(component, props), element)
+                                   else
+                                     ReactDOM.render(React.create_element(component, props), element)
+                                   end
+      end
     end
   end
 end

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.9.7'
+  VERSION = '16.9.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.9.7
+  version: 16.9.8
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj