isomorfeus-react 16.13.6 → 16.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5f97bbd2f1542a8acddd67498fffd95bd2b1c9e08ca3da26010470af0b56f30
-  data.tar.gz: aa2125291618e7a529acef65ce56e6525a35129f8fec12d847333ac5aa3412a2
+  metadata.gz: 02a760c7e31fcd4fc03396b90831133ff8bfc02bf7602bd337ebe554b3778150
+  data.tar.gz: a87209a7b20d8b88b5d9ea4f2a1306edcec75a090ecc38578ee697ad2e3139bf
 SHA512:
-  metadata.gz: 805bbca266c1a7426d64a154a4c1c3ae01f776f2d09942974751b9124cb941839b857569e11ed3e9343f4708afcd05ff8ae3add262329cfdf44f18903f5adb7b
-  data.tar.gz: 601c4c263c4e50e284a54764b76debf59e35bd380d8f06082adff46a9e28411079d3bc409214e1b22c29fae6ae30f4cb6109cba46b71643948aee2ae4c5cbbaf
+  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

@@ -3,17 +3,17 @@ if RUBY_ENGINE == 'opal'
   require 'active_support/core_ext/string'
   require 'zeitwerk'
 
-  if Isomorfeus.on_browser?
+  if on_browser?
     require 'browser/event'
     require 'browser/event_target'
     require 'browser/delegate_native'
     require 'browser/element'
   end
 
-  require 'isomorfeus/react_config'
+  require 'isomorfeus/react/config'
 
   # allow mounting of components
-  if Isomorfeus.on_browser?
+  if on_browser?
     require 'isomorfeus/top_level'
   else
     require 'isomorfeus/top_level_ssr'
@@ -25,7 +25,7 @@ if RUBY_ENGINE == 'opal'
   require 'react/synthetic_event'
   require 'react/ref'
   require 'react/children'
-  if Isomorfeus.on_browser?
+  if on_browser?
     require 'react_dom'
   else
     require 'react_dom_server'
@@ -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_config.rb → react/config.rb}

@@ -88,7 +88,7 @@ module Isomorfeus
       def force_render
         begin
           if Isomorfeus.top_component
-            ReactDOM.find_dom_node(Isomorfeus.top_component) # if not mounted will raise
+            ReactDOM.find_dom_node(Isomorfeus.top_component) if on_browser? || on_desktop? # if not mounted will raise
             if `typeof Opal.global.deepForceUpdate === 'undefined'`
               Isomorfeus.top_component.JS.forceUpdate()
             else

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/top_level.rb

@@ -72,13 +72,6 @@ module Isomorfeus
           }
           ready_fun(run);
         }
-        # %x{
-        #   function run() { block.$call() };
-        #   function ready_fun() {
-        #     /in/.test(document.readyState) ? setTimeout(ready_fun,5) : run();
-        #   }
-        #   ready_fun();
-        # }
       end
 
       def on_ready_mount(component, props = nil, element_query = nil)

data/lib/isomorfeus_react/lucid_app/mixin.rb

@@ -3,12 +3,18 @@ module LucidApp
     def self.included(base)
       base.include(::Native::Wrapper)
       base.extend(::LucidApp::NativeLucidComponentConstructor)
-      base.extend(::LucidApp::NativeComponentConstructor)
+      if on_browser? || on_ssr?
+        base.extend(::LucidApp::NativeComponentConstructor)
+        base.include(::React::Component::Elements)
+      elsif on_mobile?
+        base.extend(::LucidApp::ReactNativeComponentConstructor)
+        base.include(::ReactNative::Component::Elements)
+      end
       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::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{
@@ -14,7 +13,7 @@ module LucidApp
           let classes = null;
           let theme = opag.ReactJSS.useTheme();
           if (base.jss_styles) {
-            if (!base.use_styles || (Opal.Isomorfeus.development && Opal.Isomorfeus.development !== nil)) {
+            if (!base.use_styles || (Opal.Isomorfeus.development === true)) {
               let styles;
               if (typeof base.jss_styles === 'function') { styles = base.jss_styles(theme); }
               else { styles = base.jss_styles; }
@@ -24,13 +23,25 @@ module LucidApp
           }
           let themed_classes_props = Object.assign({}, props, { classes: classes, theme: theme });
           return opag.React.createElement(base.lucid_react_component, themed_classes_props);
-        }
+        };
         base.themed_react_component.displayName = #{theme_component_name};
-        base.react_component = function(props) {
-          let themed_component = Opal.global.React.createElement(base.themed_react_component, props);
-          return Opal.global.React.createElement(Opal.global.ReactJSS.ThemeProvider, { theme: base.jss_theme }, themed_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_react_component, this.props);
+            return Opal.global.React.createElement(Opal.global.ReactJSS.ThemeProvider, { theme: base.jss_theme }, themed_component);
+          }
         }
-        base.react_component.displayName = #{component_name};
       }
     end
   end

data/lib/isomorfeus_react/lucid_app/native_lucid_component_constructor.rb

@@ -26,7 +26,6 @@ module LucidApp
               this.state.class_state[#{component_name}] = {};
             };
             this.__ruby_instance = base.$new(this);
-            if (Opal.Isomorfeus.$top_component() == nil) { Opal.Isomorfeus['$top_component='](this); }
             var defined_refs = #{base.defined_refs};
             for (var ref in defined_refs) {
               if (defined_refs[ref] != null) {
@@ -63,7 +62,7 @@ module LucidApp
             let block_result;
             if (base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
             else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
-            if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { oper.render_buffer[oper.render_buffer.length - 1].push(block_result); }
+            if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
             oper.active_redux_components.pop();
             oper.active_components.pop();
             let children = oper.render_buffer.pop();

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

@@ -3,12 +3,18 @@ module LucidComponent
     def self.included(base)
       base.include(::Native::Wrapper)
       base.extend(::LucidComponent::NativeLucidComponentConstructor)
-      base.extend(::LucidComponent::NativeComponentConstructor)
+      if on_browser? || on_ssr?
+        base.extend(::LucidComponent::NativeComponentConstructor)
+        base.include(::React::Component::Elements)
+      elsif on_mobile?
+        base.extend(::LucidComponent::ReactNativeComponentConstructor)
+        base.include(::ReactNative::Component::Elements)
+      end
       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::StylesApi)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)
     end

data/lib/isomorfeus_react/lucid_component/native_component_constructor.rb

@@ -7,14 +7,14 @@ module LucidComponent
       component_name = base.to_s + 'Wrapper'
       # language=JS
       %x{
-        base.react_component = function(props) {
+        base.react_component = Opal.global.React.memo(function(props) {
           let opag = Opal.global;
-          let classes = null;
+          let classes;
           let store;
           if (base.store_updates) { store = opag.React.useContext(opag.LucidApplicationContext); }
           let theme = opag.ReactJSS.useTheme();
           if (base.jss_styles) {
-            if (!base.use_styles || (Opal.Isomorfeus.development && Opal.Isomorfeus.development !== nil)) {
+            if (!base.use_styles || (Opal.Isomorfeus.development === true)) {
               let styles;
               if (typeof base.jss_styles === 'function') { styles = base.jss_styles(theme); }
               else { styles = base.jss_styles; }
@@ -27,7 +27,7 @@ module LucidComponent
           new_props.theme = theme;
           new_props.store = store;
           return opag.React.createElement(base.lucid_react_component, new_props);
-        }
+        }, Opal.React.props_are_equal);
         base.react_component.displayName = #{component_name};
       }
     end

data/lib/isomorfeus_react/lucid_component/native_lucid_component_constructor.rb

@@ -51,43 +51,19 @@ module LucidComponent
             let block_result;
             if (base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
             else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
-            if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { oper.render_buffer[oper.render_buffer.length - 1].push(block_result); }
+            if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
             oper.active_redux_components.pop();
             oper.active_components.pop();
             // console.log("lucid component popping", oper.render_buffer, oper.render_buffer.toString());
             let result = oper.render_buffer.pop();
-            if (result.length === 1) { return result[0]; }
-            return result;
+            return (result.length === 1) ? result[0] : result;
           }
           data_access() {
             return this.props.store;
           }
           shouldComponentUpdate(next_props, next_state) {
-            let counter = 0;
-            for (var property in next_props) {
-              counter++;
-              if (next_props.hasOwnProperty(property)) {
-                if (!this.props.hasOwnProperty(property)) { return true; };
-                if (property === "children") { if (next_props.children !== this.props.children) { return true; }}
-                else if (typeof next_props[property] !== "undefined" && next_props[property] !== null && typeof next_props[property]['$!='] === "function" &&
-                         typeof this.props[property] !== "undefined" && this.props[property] !== null ) {
-                  if (#{ !! (`next_props[property]` != `this.props[property]`) }) { return true; }
-                } else if (next_props[property] !== this.props[property]) { return true; }
-              }
-            }
-            if (counter !== Object.keys(this.props).length) { return true; }
-            counter = 0;
-            for (var property in next_state) {
-              counter++;
-              if (next_state.hasOwnProperty(property)) {
-                if (!this.state.hasOwnProperty(property)) { return true; };
-                if (typeof next_state[property] !== "undefined" && next_state[property] !== null && typeof next_state[property]['$!='] === "function" &&
-                    typeof this.state[property] !== "undefined" && this.state[property] !== null) {
-                  if (#{ !! (`next_state[property]` != `this.state[property]`) }) { return true }
-                } else if (next_state[property] !== this.state[property]) { return true }
-              }
-            }
-            if (counter !== Object.keys(this.state).length) { return true; }
+            if (!Opal.React.props_are_equal(this.props, next_props)) { return true; }
+            if (Opal.React.state_is_not_equal(this.state, next_state)) { return true; }
             return false;
           }
           validateProp(props, propName, componentName) {

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