isomorfeus-react 16.12.23 → 16.12.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b0036481e21b2135112831ebf7aee76c904bcd48b3974f1011ca602131f8cc8
-  data.tar.gz: fa116a1c8b7d2a24f81e4c112141c23350e6d0eb2bafe028e1e6f2e7f1edcca4
+  metadata.gz: 5860bb2392aa87bc2224fcd09490cf803c2463420a0dc7b81eeb2eb2281a9125
+  data.tar.gz: b9ce782e12c36506a6ae46740fe466049d9c34492185ffd5fd913a69fde7d367
 SHA512:
-  metadata.gz: efe98461b8ec364858ab1b96a09c5b1fc0425089dedf7de79739ff8794a5324c3af31f6adafb412dbe0302b01ac2d1c6f829ea5a6456453c79cb938f49492056
-  data.tar.gz: 8de49d95da87fd8e9038378e3f10497ac6cab5d02840ee1a14aa8d97ee97bef7530a56add6df06b4001f6287d464a49027ee4922037aa4b03f299670eee247f8
+  metadata.gz: 30e21a8dd53fc01f0bb573c355efa588e8a7b0acdf74b5cfe35dd2a82280064543fc734907ee0c8ad5102d7c68a96c39475b25974123238c920ca00163fef18c
+  data.tar.gz: 3daf8ba10d97f38b831da9a34526ae3b47ff3508457cdfc631c3ee01d3105aa0865eb32685e6faf6ab9af2b9f2e4199f41a31f180162b052fad008cb08971ada

data/lib/isomorfeus/react_view_helper.rb

@@ -43,7 +43,7 @@ module Isomorfeus
           begin
             asset = Net::HTTP.get(URI(asset_path))
           rescue Exception => e
-            Isomorfeus.raise_error(message: "Server Side Rendering: Failed loading asset #{asset_path} from webpack dev server. Error: #{e.message}")
+            Isomorfeus.raise_error(message: "Server Side Rendering: Failed loading asset #{asset_path} from webpack dev server. Error: #{e.message}", stack: e.backtrace )
           end
           if asset.strip.start_with?('<')
             Isomorfeus.raise_error(message: "Server Side Rendering: Failed loading asset #{asset_path} from webpack dev server, asset is not javascript. Did the webpack build succeed?")
@@ -51,7 +51,7 @@ module Isomorfeus
           begin
             Isomorfeus.ssr_contexts[thread_id_asset] = ExecJS.permissive_compile(asset)
           rescue Exception => e
-            Isomorfeus.raise_error(message: "Server Side Rendering: Failed creating context for #{asset_path}. Error: #{e.message}")
+            Isomorfeus.raise_error(message: "Server Side Rendering: Failed creating context for #{asset_path}. Error: #{e.message}", stack: e.backtrace)
           end
         else
           # initialize speednode context
@@ -201,6 +201,9 @@ module Isomorfeus
         end
         render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
       else
+        if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
+          render_result << " data-iso-usid=#{Oj.dump(Isomorfeus.current_user.to_sid, mode: :strict)}"
+        end
         render_result << " data-iso-nloc='#{props[:locale]}'>" unless static
       end
       render_result << '</div>'

data/lib/isomorfeus_react/lucid_app/api.rb

@@ -4,8 +4,8 @@ module LucidApp
       base.instance_exec do
         def theme(theme_hash = nil, &block)
           if block_given?
+            result = block.call(React::Component::Styles.new(`base.jss_theme`))
             %x{
-              let result = block.$call(Opal.Hash.$new(base.jss_theme));
               if (typeof result.$to_n === 'function') { base.jss_theme = result.$to_n(); }
               else { base.jss_theme = result; }
               return result;

data/lib/react/component/props.rb

@@ -19,6 +19,10 @@ module React
         @classes ||= React::Component::Styles.new(@native, 'classes')
       end
 
+      def children
+        @native.JS[:props].JS[:children]
+      end
+
       def theme
         @theme ||= React::Component::Styles.new(@native, 'theme')
       end

data/lib/react/component/styles.rb

@@ -1,29 +1,70 @@
 module React
   module Component
     class Styles
+
       def initialize(native, props_prop = false)
         @native = native
         @props_prop = props_prop
       end
 
+      def [](prop)
+        method_missing(prop)
+      end
+
+      def []=(prop, val)
+        method_missing(prop, val)
+      end
+
+      %x{
+        function isObject(obj) { return (obj && typeof obj === 'object'); }
+
+        function mergeDeep(one, two) {
+          return [one, two].reduce(function(pre, obj) {
+            Object.keys(obj).forEach(function(key){
+              let pVal = pre[key];
+              let oVal = obj[key];
+              if (Array.isArray(pVal) && Array.isArray(oVal)) {
+                pre[key] = pVal.concat.apply(this, oVal);
+              } else if (isObject(pVal) && isObject(oVal)) {
+                pre[key] = mergeDeep(pVal, oVal);
+              } else {
+                pre[key] = oVal;
+              }
+            });
+            return pre;
+          }, {});
+        }
+      }
+
+      def deep_merge(a_hash)
+        native_hash = a_hash.to_n
+        React::Component::Styles.new(`mergeDeep(#@native, native_hash)`)
+      end
+
+      def deep_merge!(a_hash)
+        native_hash = a_hash.to_n
+        `#@native = mergeDeep(#@native, native_hash)`
+        self
+      end
+
       def method_missing(prop, *args, &block)
         %x{
           let value;
           if (#@props_prop) {
             if (!#@native.props[#@props_prop] || typeof #@native.props[#@props_prop][prop] === 'undefined') {
-              console.warn("Style/Theme key " + prop + " returning nil!");
+              console.warn("Style/Theme key '" + prop + "' returning nil!");
               return #{nil};
             }
             value = #@native.props[#@props_prop][prop];
           } else {
             if (!#@native || typeof #@native[prop] === 'undefined') {
-              console.warn("Style/Theme key " + prop + " returning nil!");
+              console.warn("Style/Theme key '" + prop + "' returning nil!");
               return #{nil};
             }
             value = #@native[prop];
           }
           if (typeof value === 'string' || typeof value === 'number' || Array.isArray(value)) { return value; }
-          if (typeof value === 'function') { return #{Proc.new { `value()` }} }
+          if (typeof value === 'function') { return value.apply(#@native, args); }
           return Opal.React.Component.Styles.$new(value);
         }
       end

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.23'
+  VERSION = '16.12.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.23
+  version: 16.12.24
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby