isomorfeus-react 16.13.10 → 16.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53c0609232408add3a50daefcd5b1a0cc8226a5320364378000ce4a2dce7b514
-  data.tar.gz: 8b59169b1677d0d43111bc058033f0f4e19a0fcde099d864b97ecc2ac5d66b34
+  metadata.gz: 02a760c7e31fcd4fc03396b90831133ff8bfc02bf7602bd337ebe554b3778150
+  data.tar.gz: a87209a7b20d8b88b5d9ea4f2a1306edcec75a090ecc38578ee697ad2e3139bf
 SHA512:
-  metadata.gz: 629628dadea198a9bf3257c9eeafe9408e7bc428d7557ba01eafe35dc3ffbebf36a72f2964d4b30b944f1edfafcfdf03f05b0ebbf4a1ede6c2c6552279fdf672
-  data.tar.gz: 6b2a9d8587857ee38d9691c62f2ce84556c33ff7fad4c3b111be986a952f7476f271ab7fa20577856a483c0d831683de0b2b6050e65e777bcd902ddfd7eda4a4
+  metadata.gz: c4fa758232d69952fffa9f6c0e586cb96ae537232d788018cc13c6e64f636945566fae50d9cfc4befb83a69d7d3adfd74c8ced3b452b256ad8f64d5e24285538
+  data.tar.gz: 836d76d4dd5522925cbae401283757d59969c512e71e7992602c98e4ed69918047addf7ebc6e661c5ac6153bcfae3747fc03b1533140f29244ea243bdfe61c55

data/README.md

@@ -3,21 +3,13 @@
 Develop React components for Opal Ruby along with very easy to use and advanced React-Redux Components.
 
 ## Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com) 
+At the [Isomorfeus Framework Project](http://isomorfeus.com)
 
 ## Versioning and Compatibility
 isomorfeus-react version follows the React version which features and API it implements.
 
 ### React
-Isomorfeus-react 16.12.x implements features and the API of React 16.12 and should be used with React 16.12
-
-### Preact
-isomorfeus-react works with preact version 10.1.x.
-
-### Nerv
-isomorfeus-react works in general with nervjs 1.5.x. with some issues:
- - Server Side Rendering does currently not work at all.
- - Some specs with respect to callbacks (component_will_unmount) and styles fail.
+Isomorfeus-react 16.13.x implements features and the API of React 16.13 and should be used with React 16.13
 
 ## Documentation
 

data/lib/isomorfeus-react-native.rb

@@ -0,0 +1,5 @@
+require 'react_native/react'
+require 'react_native/component/elements'
+require 'react_native/lucid_app/react_native_component_constructor'
+require 'react_native/lucid_component/react_native_component_constructor'
+require 'react_native/lucid_func/react_native_component_constructor'

data/lib/isomorfeus-react-paper.rb

@@ -0,0 +1,4 @@
+require 'isomorfeus-react'
+
+Isomorfeus.zeitwerk.push_dir('isomorfeus_react_paper')
+require_tree 'isomorfeus_react_paper', :autoload

data/lib/isomorfeus-react.rb

@@ -10,7 +10,7 @@ if RUBY_ENGINE == 'opal'
     require 'browser/element'
   end
 
-  require 'isomorfeus/react_config'
+  require 'isomorfeus/react/config'
 
   # allow mounting of components
   if on_browser?
@@ -83,7 +83,7 @@ else
   require 'isomorfeus-redux'
   require 'isomorfeus-speednode'
   require 'react/version'
-  require 'isomorfeus/react_config'
+  require 'isomorfeus/react/config'
 
   # props
   require 'isomorfeus/props/validate_hash_proxy'
@@ -99,8 +99,10 @@ else
 
   Isomorfeus.server_side_rendering = true
 
-  # cache
-  require 'isomorfeus/thread_local_component_cache'
+  # caches
+  require 'isomorfeus/react/thread_local_component_cache'
+  require 'isomorfeus/react/memcached_component_cache'
+  require 'isomorfeus/react/redis_component_cache'
   require 'isomorfeus/react_view_helper'
 
   Isomorfeus.component_cache_init do

data/lib/isomorfeus/props/validator.rb

@@ -139,7 +139,7 @@ module Isomorfeus
         Isomorfeus.raise_error(message: "#{@c}: #{@p} must be a String") unless @v.class == String
         case @o[:type]
         when :email
-          Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid email address") unless @v.match? /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+          Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid email address") unless @v.match?(/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/)
         when :uri
           if RUBY_ENGINE == 'opal'
             %x{
@@ -150,7 +150,7 @@ module Isomorfeus
               }
             }
           else
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri") unless @v.match? /\A#{URI.regexp}\z/
+            Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri") unless @v.match?(/\A#{URI.regexp}\z/)
           end
         end
       end

data/lib/isomorfeus/react/memcached_component_cache.rb

@@ -0,0 +1,19 @@
+module Isomorfeus
+  module Professional
+    class MemcachedComponentCache
+      def initialize(*args)
+        @dalli_client = Dalli::Client.new(*args)
+      end
+
+      def fetch(key)
+        json = @dalli_client.get(key)
+        Oj.load(json, mode: :strict)
+      end
+
+      def store(key, rendered_tree, response_status, styles)
+        json = Oj.dump([rendered_tree, response_status, styles], mode: :strict)
+        @dalli_client.set(key, json)
+      end
+    end
+  end
+end

data/lib/isomorfeus/react/redis_component_cache.rb

@@ -0,0 +1,19 @@
+module Isomorfeus
+  module Professional
+    class RedisComponentCache
+      def initialize(*args)
+        @redis_client = Redis.new(@args)
+      end
+
+      def fetch(key)
+        json = @redis_client.get(key)
+        Oj.load(json, mode: :strict)
+      end
+
+      def store(key, rendered_tree, response_status, styles)
+        json = Oj.dump([rendered_tree, response_status, styles], mode: :strict)
+        @redis_client.set(key, json)
+      end
+    end
+  end
+end

data/lib/isomorfeus_react/lucid_app/mixin.rb

@@ -14,6 +14,7 @@ module LucidApp
       base.include(::React::Component::Api)
       base.include(::React::Component::Callbacks)
       base.include(::LucidComponent::Api)
+      base.include(::LucidComponent::StylesApi)
       base.include(::LucidApp::Api)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)

data/lib/isomorfeus_react/lucid_app/native_component_constructor.rb

@@ -4,7 +4,6 @@ module LucidApp
     # to do so, we convert the props to ruby hashes and then compare
     # this makes sure, that for example rubys Nil object gets handled properly
     def self.extended(base)
-      component_name = base.to_s + 'Wrapper'
       theme_component_name = base.to_s + 'ThemeWrapper'
       # language=JS
       %x{

data/lib/isomorfeus_react/lucid_component/api.rb

@@ -18,28 +18,6 @@ module LucidComponent
           end
         end
 
-        # styles
-        def styles(styles_hash = nil, &block)
-          if block_given?
-            %x{
-              base.jss_styles = function(theme) {
-                let wrapped_theme = Opal.React.Component.Styles.$new(theme);
-                var result = block.$call(wrapped_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
-        alias_method :styles=, :styles
-
         # preloading
         def preload(&block)
           `base.preload_block = block`
@@ -74,11 +52,6 @@ module LucidComponent
         SessionStore
       end
 
-      # styles
-      def styles
-        props.classes
-      end
-
       def theme
         props.theme
       end

data/lib/isomorfeus_react/lucid_component/mixin.rb

@@ -14,6 +14,7 @@ module LucidComponent
       base.include(::React::Component::Api)
       base.include(::React::Component::Callbacks)
       base.include(::LucidComponent::Api)
+      base.include(::LucidComponent::StylesApi)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)
     end

data/lib/isomorfeus_react/lucid_component/styles_api.rb

@@ -0,0 +1,34 @@
+module LucidComponent
+  module StylesApi
+    def self.included(base)
+      base.instance_exec do
+        # styles
+        def styles(styles_hash = nil, &block)
+          if block_given?
+            %x{
+              base.jss_styles = function(theme) {
+                let wrapped_theme = Opal.React.Component.Styles.$new(theme);
+                var result = block.$call(wrapped_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
+        alias_method :styles=, :styles
+      end
+
+      # styles
+      def styles
+        props.classes
+      end
+    end
+  end
+end

data/lib/isomorfeus_react/lucid_func/mixin.rb

@@ -12,6 +12,7 @@ module LucidFunc
         base.include(::ReactNative::Component::Elements)
       end
       base.include(::LucidComponent::Api)
+      base.include(::LucidComponent::StylesApi)
     end
   end
 end

data/lib/isomorfeus_react/react/function_component/api.rb

@@ -18,8 +18,8 @@ module React
         `Opal.global.React.useDebugValue(value)`
       end
 
-      def use_effect(&block)
-        `Opal.global.React.useEffect(function() { #{block.call} })`
+      def use_effect(*args, &block)
+        `Opal.global.React.useEffect(function() { #{block.call} }, args)`
       end
 
       def use_imperative_handle(ref, *deps, &block)
@@ -86,12 +86,13 @@ module React
       end
       alias rre render_react_element
 
-      def method_ref(method_symbol)
+      def method_ref(method_symbol, *args)
+        method_key = "#{method_symbol}#{args}"
         %x{
-          if (#{self}.method_refs && #{self}.method_refs[#{method_symbol}]) { return #{self}.method_refs[#{method_symbol}]; }
+          if (#{self}.method_refs && #{self}.method_refs[#{method_key}]) { return #{self}.method_refs[#{method_key}]; }
           if (!#{self}.method_refs) { #{self}.method_refs = {}; }
-          #{self}.method_refs[#{method_symbol}] = #{method(method_symbol)};
-          return #{self}.method_refs[#{method_symbol}];
+          #{self}.method_refs[#{method_key}] = { m: #{method(method_symbol)}, a: args };
+          return #{self}.method_refs[#{method_key}];
         }
       end
       alias m_ref method_ref

data/lib/isomorfeus_react_material/lucid_material/app/mixin.rb

@@ -10,6 +10,7 @@ module LucidMaterial
         base.include(::React::Component::Api)
         base.include(::React::Component::Callbacks)
         base.include(::LucidComponent::Api)
+        base.include(::LucidComponent::StylesApi)
         base.include(::LucidApp::Api)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)

data/lib/isomorfeus_react_material/lucid_material/app/native_component_constructor.rb

@@ -5,7 +5,6 @@ module LucidMaterial
       # to do so, we convert the props to ruby hashes and then compare
       # this makes sure, that for example rubys Nil object gets handled properly
       def self.extended(base)
-        component_name = base.to_s + 'Wrapper'
         theme_component_name = base.to_s + 'ThemeWrapper'
         # language=JS
         %x{

data/lib/isomorfeus_react_material/lucid_material/component/mixin.rb

@@ -10,6 +10,7 @@ module LucidMaterial
         base.include(::React::Component::Api)
         base.include(::React::Component::Callbacks)
         base.include(::LucidComponent::Api)
+        base.include(::LucidComponent::StylesApi)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)
       end

data/lib/isomorfeus_react_material/lucid_material/func/mixin.rb

@@ -8,6 +8,7 @@ module LucidMaterial
         base.include(::React::FunctionComponent::Api)
         base.extend(::LucidMaterial::Func::NativeComponentConstructor)
         base.include(::LucidComponent::Api)
+        base.include(::LucidComponent::StylesApi)
       end
     end
   end

data/lib/isomorfeus_react_paper/lucid_paper/app/base.rb

@@ -0,0 +1,9 @@
+module LucidPaper
+  module App
+    class Base
+      def self.inherited(base)
+        base.include(::LucidPaper::App::Mixin)
+      end
+    end
+  end
+end

data/lib/isomorfeus_react_paper/lucid_paper/app/mixin.rb

@@ -0,0 +1,19 @@
+module LucidPaper
+  module App
+    module Mixin
+      def self.included(base)
+        base.include(::Native::Wrapper)
+        base.extend(::LucidApp::NativeLucidComponentConstructor)
+        base.extend(::LucidPaper::App::NativeComponentConstructor)
+        base.extend(::LucidPropDeclaration::Mixin)
+        base.include(::React::Component::Elements)
+        base.include(::React::Component::Api)
+        base.include(::React::Component::Callbacks)
+        base.include(::LucidComponent::Api)
+        base.include(::LucidApp::Api)
+        base.include(::LucidComponent::Initializer)
+        base.include(::React::Component::Features)
+      end
+    end
+  end
+end

data/lib/isomorfeus_react_paper/lucid_paper/app/native_component_constructor.rb

@@ -0,0 +1,32 @@
+module LucidPaper
+  module App
+    module NativeComponentConstructor
+      # for should_component_update we apply ruby semantics for comparing props
+      # to do so, we convert the props to ruby hashes and then compare
+      # this makes sure, that for example rubys Nil object gets handled properly
+      def self.extended(base)
+        %x{
+          base.jss_theme = Opal.global.Paper.DefaultTheme;
+          base.themed_component = Opal.global.Paper.withTheme(base.lucid_react_component);
+          base.react_component = class extends Opal.global.React.Component {
+            constructor(props) {
+              super(props);
+              if (Opal.Isomorfeus.$top_component() == nil) { Opal.Isomorfeus['$top_component='](this); }
+            }
+            static get displayName() {
+              return "IsomorfeusTopLevelComponent";
+            }
+            static set displayName(new_name) {
+              // dont do anything here except returning the set value
+              return new_name;
+            }
+            render() {
+              let themed_component = Opal.global.React.createElement(base.themed_component, this.props);
+              return Opal.global.React.createElement(Opal.global.Paper.Provider, { theme: base.jss_theme }, themed_component);
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/isomorfeus_react_paper/lucid_paper/component/base.rb

@@ -0,0 +1,9 @@
+module LucidPaper
+  module Component
+    class Base
+      def self.inherited(base)
+        base.include(::LucidPaper::Component::Mixin)
+      end
+    end
+  end
+end

data/lib/isomorfeus_react_paper/lucid_paper/component/mixin.rb

@@ -0,0 +1,18 @@
+module LucidPaper
+  module Component
+    module Mixin
+      def self.included(base)
+        base.include(::Native::Wrapper)
+        base.extend(::LucidComponent::NativeLucidComponentConstructor)
+        base.extend(::LucidPaper::Component::NativeComponentConstructor)
+        base.extend(::LucidPropDeclaration::Mixin)
+        base.include(::React::Component::Elements)
+        base.include(::React::Component::Api)
+        base.include(::React::Component::Callbacks)
+        base.include(::LucidComponent::Api)
+        base.include(::LucidComponent::Initializer)
+        base.include(::React::Component::Features)
+      end
+    end
+  end
+end

data/lib/isomorfeus_react_paper/lucid_paper/component/native_component_constructor.rb

@@ -0,0 +1,25 @@
+module LucidPaper
+  module Component
+    module NativeComponentConstructor
+      # for should_component_update we apply ruby semantics for comparing props
+      # to do so, we convert the props to ruby hashes and then compare
+      # this makes sure, that for example rubys Nil object gets handled properly
+      def self.extended(base)
+        component_name = base.to_s + 'Wrapper'
+        # language=JS
+        %x{
+          base.react_component = Opal.global.React.memo(function(props) {
+            let classes = null;
+            let store;
+            if (base.store_updates) { store = Opal.global.React.useContext(Opal.global.LucidApplicationContext); }
+            let new_props = Object.assign({}, props)
+            new_props.store = store;
+            new_props.theme = Opal.global.Paper.useTheme();
+            return Opal.global.React.createElement(base.lucid_react_component, new_props);
+          }, Opal.React.props_are_equal);
+          base.react_component.displayName = #{component_name};
+        }
+      end
+    end
+  end
+end