isomorfeus-react 16.9.13 → 16.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 361db45417f5db77cc41e4e6c77bf2689865ade2d842426da780e3b0eb5e0e2e
-  data.tar.gz: 86232d87590c5b153e177188f6907d49d9393008296c5e5f84f969d721db813d
+  metadata.gz: 70053e0a26f29ea0ee7021a2842b5c87a90059663cd6632c6d0f09537fde5a14
+  data.tar.gz: d4e4392d9c50afce0a800afd847d5490ef915614fbe8a31944088e03ca38d3d9
 SHA512:
-  metadata.gz: 0d2aad7c2f64836276f924db57370a92d7f69022e4ae368beb227f7531a5ed32cad5cfdc054c0c2a996b6dc97a158bc796d23bc710705a48bbda073cee39a923
-  data.tar.gz: 69e09d3d348def640b0e0936b537e4fe1b0797f907cd398542c8fbf4c36db279d2c5a4e766e9aa387758171947cfb86068915347b2ecbe4511026c55d92892f8
+  metadata.gz: 94d4bf83a2dbcdcd8842b11bd8b1a2f5724d4862b1c4a27b07786542222a1b0aba390f8c01639e1680c7787d9183a93269fb6972418b20bbe243c62e925a69fb
+  data.tar.gz: bd391ac3e496bf54711ef02f0b2e113dac261b1f5e802dd36ba557660f8da1863e5e3ddbd450531a653d5a7f9aa84b09d2271924e916f1f8f24b19f7e34edd0b

data/lib/isomorfeus-react-material-ui.rb

@@ -1,7 +1,6 @@
 require 'isomorfeus-react'
 
 # LucidMaterial::Component
-require 'lucid_material/component/api'
 require 'lucid_material/component/native_component_constructor'
 require 'lucid_material/component/mixin'
 require 'lucid_material/component/base'

data/lib/isomorfeus-react.rb

@@ -92,6 +92,7 @@ if RUBY_ENGINE == 'opal'
   LucidApp::Context.create_application_context
 
   # LucidComponent
+  require 'lucid_component/styles_support'
   require 'lucid_component/store_api'
   require 'lucid_component/app_store_defaults'
   require 'lucid_component/component_class_store_defaults'

data/lib/lucid_app/mixin.rb

@@ -5,11 +5,12 @@ module LucidApp
       base.extend(::LucidApp::NativeComponentConstructor)
       base.extend(::LucidPropDeclaration::Mixin)
       base.extend(::React::Component::ShouldComponentUpdate)
-      base.extend(::React::Component::EventHandler)
+      base.extend(::LucidComponent::EventHandler)
       base.include(::React::Component::Elements)
       base.include(::React::Component::API)
       base.include(::React::Component::Callbacks)
       base.include(::LucidComponent::StoreAPI)
+      base.include(::LucidComponent::StylesSupport)
       base.include(::LucidApp::API)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)

data/lib/lucid_app/native_component_constructor.rb

@@ -7,7 +7,8 @@ module LucidApp
       component_name = base.to_s
       # language=JS
       %x{
-        base.react_component = class extends Opal.global.React.Component {
+        base.jss_styles = null;
+        base.lucid_react_component = class extends Opal.global.React.Component {
           constructor(props) {
             super(props);
             if (base.$default_state_defined()) {
@@ -80,6 +81,22 @@ module LucidApp
             return null;
           }
         }
+        base.use_styles = null;
+        base.react_component = function(props) {
+          let classes = null;
+          if (base.jss_styles) {
+            if (!base.use_styles || Opal.Isomorfeus["$development?"]()) {
+              base.use_styles = Opal.global.ReactJSS.createUseStyles(base.jss_styles);
+            }
+            classes = base.use_styles();
+          }
+          if (classes) {
+            let classes_props = Object.assign({}, props, { classes: classes });
+            return Opal.global.React.createElement(base.lucid_react_component, classes_props);
+          } else {
+            return Opal.global.React.createElement(base.lucid_react_component, props);
+          }
+        }
       }
     end
   end

data/lib/lucid_component/mixin.rb

@@ -9,6 +9,7 @@ module LucidComponent
       base.include(::React::Component::API)
       base.include(::React::Component::Callbacks)
       base.include(::LucidComponent::StoreAPI)
+      base.include(::LucidComponent::StylesSupport)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)
       base.include(::React::Component::Resolution)

data/lib/lucid_component/native_component_constructor.rb

@@ -7,12 +7,7 @@ module LucidComponent
       component_name = base.to_s
       # language=JS
       %x{
-        base.react_component = function(props) {
-          return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Consumer, null, function(store) {
-            var store_props = Object.assign({}, props, { isomorfeus_store: store });
-            return Opal.global.React.createElement(base.lucid_react_component, store_props);
-          });
-        }
+        base.jss_styles = null;
         base.lucid_react_component = class extends Opal.global.React.Component {
           constructor(props) {
             super(props);
@@ -129,6 +124,25 @@ module LucidComponent
           }
         }
         base.lucid_react_component.contextType = Opal.global.LucidApplicationContext;
+        base.use_styles = null;
+        base.react_component = function(props) {
+          let classes = null;
+          if (base.jss_styles) {
+            if (!base.use_styles || Opal.Isomorfeus["$development?"]()) {
+              base.use_styles = Opal.global.ReactJSS.createUseStyles(base.jss_styles);
+            }
+            classes = base.use_styles();
+          }
+          return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Consumer, null, function(store) {
+            let store_props = Object.assign({}, props, { isomorfeus_store: store });
+            if (classes) {
+              let store_classes_props = Object.assign({}, store_props, { classes: classes });
+              return Opal.global.React.createElement(base.lucid_react_component, store_classes_props);
+            } else {
+              return Opal.global.React.createElement(base.lucid_react_component, store_props);
+            }
+          });
+        }
       }
     end
   end

data/lib/lucid_component/styles_support.rb

@@ -0,0 +1,31 @@
+module LucidComponent
+  module StylesSupport
+    def self.included(base)
+      base.instance_exec do
+        def styles(styles_hash = nil, &block)
+          if block_given?
+            %x{
+              base.jss_styles = function(theme) {
+                var result = block.$call(Opal.Hash.$new(theme));
+                return result.$to_n();
+              }
+            }
+            nil
+          elsif styles_hash
+            `base.jss_styles = #{styles_hash.to_n}` if styles_hash
+            styles_hash
+          elsif `typeof base.jss_styles === 'object'`
+            `Opal.Hash.$new(base.jss_styles)`
+          else
+            nil
+          end
+        end
+      end
+
+      def classes
+        props.classes
+      end
+    end
+  end
+end
+

data/lib/lucid_material/app/mixin.rb

@@ -11,7 +11,7 @@ module LucidMaterial
         base.include(::React::Component::API)
         base.include(::React::Component::Callbacks)
         base.include(::LucidComponent::StoreAPI)
-        base.include(::LucidMaterial::Component::API)
+        base.include(::LucidComponent::StylesSupport)
         base.include(::LucidApp::API)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)

data/lib/lucid_material/app/native_component_constructor.rb

@@ -8,7 +8,7 @@ module LucidMaterial
         component_name = base.to_s
         # language=JS
         %x{
-          base.jss_styles = {};
+          base.jss_styles = null;
           base.lucid_react_component = class extends Opal.global.React.Component {
             constructor(props) {
               super(props);
@@ -89,12 +89,16 @@ module LucidMaterial
               return #{component_name} + 'Shell';
             }
             render() {
-              if (!base.lucid_material_component || Opal.Isomorfeus["$development?"]()) {
-                base.lucid_material_component = Opal.global.MuiStyles.withStyles(base.jss_styles)(function(props){
-                  return Opal.global.React.createElement(base.lucid_react_component, props);
-                });
+              if (base.jss_styles) {
+                if (!base.lucid_material_component || Opal.Isomorfeus["$development?"]()) {
+                  base.lucid_material_component = Opal.global.MuiStyles.withStyles(base.jss_styles)(function(props){
+                    return Opal.global.React.createElement(base.lucid_react_component, props);
+                  });
+                }
+                return Opal.global.React.createElement(base.lucid_material_component, this.props);
+              } else {
+                return Opal.global.React.createElement(base.lucid_react_component, this.props)
               }
-              return Opal.global.React.createElement(base.lucid_material_component, this.props);
             }
           }
         }

data/lib/lucid_material/component/mixin.rb

@@ -10,7 +10,7 @@ module LucidMaterial
         base.include(::React::Component::API)
         base.include(::React::Component::Callbacks)
         base.include(::LucidComponent::StoreAPI)
-        base.include(::LucidMaterial::Component::API)
+        base.include(::LucidComponent::StylesSupport)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)
         base.include(::React::Component::Resolution)

data/lib/lucid_material/component/native_component_constructor.rb

@@ -8,7 +8,7 @@ module LucidMaterial
         component_name = base.to_s
         # language=JS
         %x{
-          base.jss_styles = {};
+          base.jss_styles = null;
           base.lucid_react_component = class extends Opal.global.React.Component {
             constructor(props) {
               super(props);
@@ -129,12 +129,16 @@ module LucidMaterial
           base.react_component = function(outer_props) {
             return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Consumer, null, function(store) {
               var store_props = Object.assign({}, outer_props, { isomorfeus_store: store });
-              if (!base.lucid_material_component || Opal.Isomorfeus["$development?"]()) {
-                base.lucid_material_component = Opal.global.MuiStyles.withStyles(base.jss_styles)(function(props){
-                  return Opal.global.React.createElement(base.lucid_react_component, props);
-                });
+              if (base.jss_styles) {
+                if (!base.lucid_material_component || Opal.Isomorfeus["$development?"]()) {
+                  base.lucid_material_component = Opal.global.MuiStyles.withStyles(base.jss_styles)(function(props) {
+                    return Opal.global.React.createElement(base.lucid_react_component, props);
+                  });
+                }
+                return Opal.global.React.createElement(base.lucid_material_component, store_props);
+              } else {
+                return Opal.global.React.createElement(base.lucid_react_component, store_props);
               }
-              return Opal.global.React.createElement(base.lucid_material_component, store_props);
             });
           }
         }

data/lib/react/component/styles.rb

@@ -7,7 +7,7 @@ module React
 
       def method_missing(prop, *args, &block)
         %x{
-          if (typeof #@native[prop] === 'undefined') { return #{nil}; }
+          if (!#@native || typeof #@native[prop] === 'undefined') { return #{nil}; }
           return #@native[prop];
         }
       end

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.9.13'
+  VERSION = '16.9.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.9.13
+  version: 16.9.14
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-25 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -193,10 +193,10 @@ files:
 - lib/lucid_component/native_component_constructor.rb
 - lib/lucid_component/reducers.rb
 - lib/lucid_component/store_api.rb
+- lib/lucid_component/styles_support.rb
 - lib/lucid_material/app/base.rb
 - lib/lucid_material/app/mixin.rb
 - lib/lucid_material/app/native_component_constructor.rb
-- lib/lucid_material/component/api.rb
 - lib/lucid_material/component/base.rb
 - lib/lucid_material/component/mixin.rb
 - lib/lucid_material/component/native_component_constructor.rb

data/lib/lucid_material/component/api.rb

@@ -1,32 +0,0 @@
-module LucidMaterial
-  module Component
-    module API
-      def self.included(base)
-        base.instance_exec do
-          def styles(styles_hash = nil, &block)
-            if block_given?
-              %x{
-                base.jss_styles = function(theme) {
-                  var result = block.$call(Opal.Hash.$new(theme));
-                  return result.$to_n();
-                }
-              }
-              nil
-            elsif styles_hash
-              `base.jss_styles = #{styles_hash.to_n}` if styles_hash
-              styles_hash
-            elsif `typeof base.jss_styles === 'object'`
-              `Opal.Hash.$new(base.jss_styles)`
-            else
-              nil
-            end
-          end
-        end
-
-        def classes
-          props.classes
-        end
-      end
-    end
-  end
-end