isomorfeus-react 16.12.4 → 16.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69771dea65edc7607119f666d42f3b94e9127086ad3e030c471856102309257e
-  data.tar.gz: 7c2c7490ada522852b4afb23031a82fa819f772d46e68f39829d5b35de22164b
+  metadata.gz: 02d3da5a8c0ad549bf3a6539a220e5d95479e9a21e99392a1a77b29139cb222d
+  data.tar.gz: aaa6f2e790085cb9bbd09b029e49d5394bcc7e5d12d27033d4bfdc7646617719
 SHA512:
-  metadata.gz: 49e1c4ed99f44f8bb592da6cf0b0e9b20b24ccc435533b32dfff6239418528161387395056870fad6114f22ea9a36a3f88b9380b6900d477c59cd1289ec14153
-  data.tar.gz: 7b6b021c7a543befab9c9999e13938b4e02d401f357b556d1d4d40494b90c2fef26c7e8b58da9ea0300e6733070d8b8e2646ca1c146f94fb75f6a67af5ccf95d
+  metadata.gz: 6181f6153a988daf46595e245f57c81e460543dc6b9696099870f1122fad7e27c3f973c3848888849dd24abf490720888ea162a062d92437c2031d42721e7a20
+  data.tar.gz: 2cd1c6f37bb100ef10f0bf51801c25951ca4e0797576b9e5f4db28d3054ace409ec440c2e47368e692026572506e3e40cced5f19cf5293c2e0f8299244de6646

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

@@ -1,15 +1,4 @@
 require 'isomorfeus-react'
 
-# LucidMaterial::Component
-require 'lucid_material/component/native_component_constructor'
-require 'lucid_material/component/mixin'
-require 'lucid_material/component/base'
-# LucidMaterial::App
-require 'lucid_material/app/native_component_constructor'
-require 'lucid_material/app/mixin'
-require 'lucid_material/app/base'
-# LucidMaterial::Func
-require 'lucid_material/func/initializer'
-require 'lucid_material/func/native_component_constructor'
-require 'lucid_material/func/mixin'
-require 'lucid_material/func/base'
+Isomorfeus.zeitwerk.push_dir('isomorfeus_react_material')
+require_tree 'isomorfeus_react_material', :autoload

data/lib/isomorfeus-react.rb

@@ -2,7 +2,7 @@ if RUBY_ENGINE == 'opal'
   # require 'opal'
   # require 'native'
   # require 'promise'
-  # rely on i-redux to have included above reqiorements
+  # rely on i-redux to have included above requirements
   require 'isomorfeus-redux'
   require 'active_support/core_ext/string'
   require 'zeitwerk'
@@ -50,21 +50,20 @@ if RUBY_ENGINE == 'opal'
   require 'react/native_constant_wrapper'
 
   # Function Component
-  require 'react/function_component/resolution'
-  require 'react/function_component/initializer'
-  require 'react/function_component/api'
-  require 'react/function_component/event_handler'
-  require 'react/function_component/native_component_constructor'
-  require 'react/function_component/mixin'
-  require 'react/function_component/base'
-  require 'react/memo_component/native_component_constructor'
-  require 'react/memo_component/mixin'
-  require 'react/memo_component/base'
+  #require 'react/function_component/resolution'
+  #require 'react/function_component/initializer'
+  #require 'react/function_component/api'
+  #require 'react/function_component/event_handler'
+  #require 'react/function_component/native_component_constructor'
+  #require 'react/function_component/mixin'
+  #require 'react/function_component/base'
+  #require 'react/memo_component/native_component_constructor'
+  #require 'react/memo_component/mixin'
+  #require 'react/memo_component/base'
 
   # React::Component
   require 'react/component/api'
   require 'react/component/callbacks'
-  # require 'react/component/unsafe_api'
   require 'react/component/initializer'
   require 'react/component/native_component_constructor'
   require 'react/component/state'
@@ -78,48 +77,55 @@ if RUBY_ENGINE == 'opal'
   require 'react/component/base'
 
   # init component reducers
-  require 'lucid_component/reducers'
-  LucidComponent::Reducers.add_component_reducers_to_store
+  require 'lucid_app/reducers'
+  LucidApp::Reducers.add_component_reducers_to_store
 
   # init LucidApplicationContext (Store Provider and Consumer)
   require 'lucid_app/context'
   LucidApp::Context.create_application_context
 
   # LucidFunc
-  require 'lucid_func/initializer'
-  require 'lucid_func/native_component_constructor'
-  require 'lucid_func/mixin'
-  require 'lucid_func/base'
+  #require 'lucid_func/initializer'
+  #require 'lucid_func/native_component_constructor'
+  #require 'lucid_func/mixin'
+  #require 'lucid_func/base'
 
   # LucidComponent
-  require 'lucid_component/environment_support'
-  require 'lucid_component/api'
-  require 'lucid_component/app_store_defaults'
-  require 'lucid_component/component_class_store_defaults'
-  require 'lucid_component/component_instance_store_defaults'
-  require 'lucid_component/app_store_proxy'
-  require 'lucid_component/class_store_proxy'
-  require 'lucid_component/instance_store_proxy'
-  require 'lucid_component/initializer'
-  require 'lucid_component/native_lucid_component_constructor'
-  require 'lucid_component/native_component_constructor'
-  require 'lucid_component/preloading_support'
-  require 'lucid_component/mixin'
-  require 'lucid_component/base'
+  #require 'lucid_component/environment_support'
+  #require 'lucid_component/api'
+  #require 'lucid_component/app_store_defaults'
+  #require 'lucid_component/component_class_store_defaults'
+  #require 'lucid_component/component_instance_store_defaults'
+  #require 'lucid_component/app_store_proxy'
+  #require 'lucid_component/class_store_proxy'
+  #require 'lucid_component/instance_store_proxy'
+  #require 'lucid_component/initializer'
+  #require 'lucid_component/native_lucid_component_constructor'
+  #require 'lucid_component/native_component_constructor'
+  #require 'lucid_component/mixin'
+  #require 'lucid_component/base'
 
   # LucidApp
-  require 'lucid_app/api'
-  require 'lucid_app/native_lucid_component_constructor'
-  require 'lucid_app/native_component_constructor'
-  require 'lucid_app/mixin'
-  require 'lucid_app/base'
+  #require 'lucid_app/api'
+  #require 'lucid_app/native_lucid_component_constructor'
+  #require 'lucid_app/native_component_constructor'
+  #require 'lucid_app/mixin'
+  #require 'lucid_app/base'
+
+  class Object
+    include React::Component::Resolution
+  end
 
-  require 'react/vivify_module'
+  # require 'isomorfeus/vivify_module'
 
   Isomorfeus.zeitwerk = Zeitwerk::Loader.new
+  # Isomorfeus.zeitwerk.vivify_mod_dir = 'components/'
+  # Isomorfeus.zeitwerk.vivify_mod_class = Isomorfeus::VivifyModule
+
+  Isomorfeus.zeitwerk.push_dir('isomorfeus_react')
+  require_tree 'isomorfeus_react', :autoload
+
   Isomorfeus.zeitwerk.push_dir('components')
-  Isomorfeus.zeitwerk.vivify_mod_dir = 'components/'
-  Isomorfeus.zeitwerk.vivify_mod_class = React::VivifyModule
 else
   require 'oj'
   require 'opal'

data/lib/{react → isomorfeus}/vivify_module.rb

@@ -1,4 +1,4 @@
-module React
+module Isomorfeus
   class VivifyModule < ::Module
     # this is required for autoloading support, as the component may not be loaded and so its method is not registered.
     # must load it first, done by const_get, and next time the method will be there.

data/lib/{lucid_app → isomorfeus_react/lucid_app}/api.rb

@@ -1,5 +1,5 @@
 module LucidApp
-  module API
+  module Api
     def self.included(base)
       base.instance_exec do
         def theme(theme_hash = nil, &block)

data/lib/{lucid_app → isomorfeus_react/lucid_app}/mixin.rb

@@ -9,10 +9,10 @@ module LucidApp
       base.extend(::LucidComponent::EnvironmentSupport)
       base.include(::LucidComponent::EnvironmentSupport)
       base.include(::React::Component::Elements)
-      base.include(::React::Component::API)
+      base.include(::React::Component::Api)
       base.include(::React::Component::Callbacks)
-      base.include(::LucidComponent::API)
-      base.include(::LucidApp::API)
+      base.include(::LucidComponent::Api)
+      base.include(::LucidApp::Api)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)
       base.include(::React::Component::Resolution)

data/lib/{lucid_app → isomorfeus_react/lucid_app}/native_component_constructor.rb

@@ -10,19 +10,20 @@ module LucidApp
       %x{
         base.jss_theme = {};
         base.themed_react_component = function(props) {
+          let opag = Opal.global;
           let classes = null;
-          let theme = Opal.global.ReactJSS.useTheme();
+          let theme = opag.ReactJSS.useTheme();
           if (base.jss_styles) {
             if (!base.use_styles || (Opal.Isomorfeus.development && Opal.Isomorfeus.development !== nil)) {
               let styles;
               if (typeof base.jss_styles === 'function') { styles = base.jss_styles(theme); }
               else { styles = base.jss_styles; }
-              base.use_styles = Opal.global.ReactJSS.createUseStyles(styles);
+              base.use_styles = opag.ReactJSS.createUseStyles(styles);
             }
             classes = base.use_styles();
           }
           let themed_classes_props = Object.assign({}, props, { classes: classes, theme: theme });
-          return Opal.global.React.createElement(base.lucid_react_component, themed_classes_props);
+          return opag.React.createElement(base.lucid_react_component, themed_classes_props);
         }
         base.themed_react_component.displayName = #{theme_component_name};
         base.react_component = function(props) {

data/lib/{lucid_component → isomorfeus_react/lucid_component}/api.rb

@@ -1,5 +1,5 @@
 module LucidComponent
-  module API
+  module Api
     def self.included(base)
       base.instance_exec do
         # store
@@ -62,8 +62,28 @@ module LucidComponent
           end
         end
         alias_method :styles=, :styles
+
+        # preloading
+        def preload(&block)
+          `base.preload_block = block`
+          component_did_mount do
+            @_preload_promise.then { self.state.preloaded = true } unless self.state.preloaded
+          end
+        end
+
+        def while_loading(option = nil, &block)
+          wl_block = proc do
+            if @_preload_promise.resolved?
+              instance_exec(&`base.render_block`)
+            else
+              instance_exec(&block)
+            end
+          end
+          `base.while_loading_block = wl_block`
+        end
       end
 
+      # styles
       def styles
         props.classes
       end
@@ -71,6 +91,16 @@ module LucidComponent
       def theme
         props.theme
       end
+
+      # preloading
+      def execute_preload_block
+        @_preload_promise = instance_exec(&self.class.JS[:preload_block])
+        @_preload_promise.resolved?
+      end
+
+      def preloaded?
+        !!state.preloaded
+      end
     end
   end
 end

data/lib/{lucid_component → isomorfeus_react/lucid_component}/initializer.rb

@@ -2,11 +2,11 @@ module LucidComponent
   module Initializer
     def initialize(native_component)
       @native = native_component
-      @app_store = `Opal.LucidComponent.AppStoreProxy.$new(#{self})`
-      @class_store = `Opal.LucidComponent.ClassStoreProxy.$new(#{self})`
+      @app_store = LucidComponent::AppStoreProxy.new(self)
+      @class_store = LucidComponent::ClassStoreProxy.new(self)
       @props = `Opal.React.Component.Props.$new(#@native)`
       @state = `Opal.React.Component.State.$new(#@native)`
-      @store = `Opal.LucidComponent.InstanceStoreProxy.$new(#{self})`
+      @store = LucidComponent::InstanceStoreProxy.new(self)
     end
   end
 end

data/lib/{lucid_component → isomorfeus_react/lucid_component}/mixin.rb

@@ -6,13 +6,12 @@ module LucidComponent
       base.extend(::LucidComponent::NativeComponentConstructor)
       base.extend(::LucidPropDeclaration::Mixin)
       base.extend(::React::Component::EventHandler)
-      base.include(::LucidComponent::PreloadingSupport)
       base.extend(::LucidComponent::EnvironmentSupport)
       base.include(::LucidComponent::EnvironmentSupport)
       base.include(::React::Component::Elements)
-      base.include(::React::Component::API)
+      base.include(::React::Component::Api)
       base.include(::React::Component::Callbacks)
-      base.include(::LucidComponent::API)
+      base.include(::LucidComponent::Api)
       base.include(::LucidComponent::Initializer)
       base.include(::React::Component::Features)
       base.include(::React::Component::Resolution)

data/lib/{lucid_component → isomorfeus_react/lucid_component}/native_component_constructor.rb

@@ -8,16 +8,17 @@ module LucidComponent
       # language=JS
       %x{
         base.react_component = function(props) {
+          let opag = Opal.global;
           let classes = null;
           let store;
-          if (base.store_updates) { store = Opal.global.React.useContext(Opal.global.LucidApplicationContext); }
-          let theme = Opal.global.ReactJSS.useTheme();
+          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)) {
               let styles;
               if (typeof base.jss_styles === 'function') { styles = base.jss_styles(theme); }
               else { styles = base.jss_styles; }
-              base.use_styles = Opal.global.ReactJSS.createUseStyles(styles);
+              base.use_styles = opag.ReactJSS.createUseStyles(styles);
             }
             classes = base.use_styles();
           }
@@ -25,7 +26,7 @@ module LucidComponent
           new_props.classes = classes;
           new_props.theme = theme;
           new_props.store = store;
-          return Opal.global.React.createElement(base.lucid_react_component, new_props);
+          return opag.React.createElement(base.lucid_react_component, new_props);
         }
         base.react_component.displayName = #{component_name};
       }

data/lib/{lucid_func → isomorfeus_react/lucid_func}/initializer.rb

@@ -3,9 +3,9 @@ module LucidFunc
     def initialize
       self.JS[:native_props] = `{ props: null }`
       @native_props = `Opal.React.Component.Props.$new(#{self})`
-      @app_store = `Opal.LucidComponent.AppStoreProxy.$new(#{self})`
-      @class_store = `Opal.LucidComponent.ClassStoreProxy.$new(#{self})`
-      @store = `Opal.LucidComponent.InstanceStoreProxy.$new(#{self})`
+      @app_store = LucidComponent::AppStoreProxy.new(self)
+      @class_store = LucidComponent::ClassStoreProxy.new(self)
+      @store = LucidComponent::InstanceStoreProxy.new(self)
       event_handlers = self.class.event_handlers
       event_handler_source = self.class
       %x{

data/lib/{lucid_func → isomorfeus_react/lucid_func}/mixin.rb

@@ -4,13 +4,13 @@ module LucidFunc
       base.include(::React::Component::Elements)
       base.include(::React::Component::Features)
       base.include(::LucidFunc::Initializer)
-      base.include(::React::FunctionComponent::API)
+      base.include(::React::FunctionComponent::Api)
       base.include(::React::FunctionComponent::Resolution)
       base.extend(::React::FunctionComponent::EventHandler)
       base.extend(::LucidComponent::EnvironmentSupport)
       base.include(::LucidComponent::EnvironmentSupport)
       base.extend(::LucidFunc::NativeComponentConstructor)
-      base.include(::LucidComponent::API)
+      base.include(::LucidComponent::Api)
     end
   end
 end

data/lib/{react → isomorfeus_react/react}/function_component/api.rb

@@ -1,6 +1,6 @@
 module React
   module FunctionComponent
-    module API
+    module Api
       def props
         @native_props
       end

data/lib/{react → isomorfeus_react/react}/function_component/mixin.rb

@@ -5,7 +5,7 @@ module React
         base.include(::React::Component::Elements)
         base.include(::React::Component::Features)
         base.include(::React::FunctionComponent::Initializer)
-        base.include(::React::FunctionComponent::API)
+        base.include(::React::FunctionComponent::Api)
         base.include(::React::FunctionComponent::Resolution)
         base.extend(::React::FunctionComponent::EventHandler)
         base.extend(::React::FunctionComponent::NativeComponentConstructor)

data/lib/{react → isomorfeus_react/react}/memo_component/mixin.rb

@@ -5,7 +5,7 @@ module React
         base.include(::React::Component::Elements)
         base.include(::React::Component::Features)
         base.include(::React::FunctionComponent::Initializer)
-        base.include(::React::FunctionComponent::API)
+        base.include(::React::FunctionComponent::Api)
         base.include(::React::FunctionComponent::Resolution)
         base.extend(::React::FunctionComponent::EventHandler)
         base.extend(::React::MemoComponent::NativeComponentConstructor)

data/lib/{lucid_material → isomorfeus_react_material/lucid_material}/app/mixin.rb

@@ -10,10 +10,10 @@ module LucidMaterial
         base.extend(::LucidComponent::EnvironmentSupport)
         base.include(::LucidComponent::EnvironmentSupport)
         base.include(::React::Component::Elements)
-        base.include(::React::Component::API)
+        base.include(::React::Component::Api)
         base.include(::React::Component::Callbacks)
-        base.include(::LucidComponent::API)
-        base.include(::LucidApp::API)
+        base.include(::LucidComponent::Api)
+        base.include(::LucidApp::Api)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)
         base.include(::React::Component::Resolution)

data/lib/{lucid_material → isomorfeus_react_material/lucid_material}/app/native_component_constructor.rb

@@ -11,19 +11,20 @@ module LucidMaterial
         %x{
           base.jss_theme = Opal.global.Mui.createMuiTheme();
           base.themed_react_component = function(props) {
+            let opag = Opal.global;
             let classes = null;
-            let theme = Opal.global.MuiStyles.useTheme();
+            let theme = opag.MuiStyles.useTheme();
             if (base.jss_styles) {
               if (!base.use_styles || (Opal.Isomorfeus.development && Opal.Isomorfeus.development !== nil)) {
                 let styles;
                 if (typeof base.jss_styles === 'function') { styles = base.jss_styles(theme); }
                 else { styles = base.jss_styles; }
-                base.use_styles = Opal.global.MuiStyles.makeStyles(styles);
+                base.use_styles = opag.MuiStyles.makeStyles(styles);
               }
               classes = base.use_styles();
             }
             let themed_classes_props = Object.assign({}, props, { classes: classes, theme: theme });
-            return Opal.global.React.createElement(base.lucid_react_component, themed_classes_props);
+            return opag.React.createElement(base.lucid_react_component, themed_classes_props);
           }
           base.themed_react_component.displayName = #{theme_component_name};
           base.react_component = function(props) {

data/lib/{lucid_material → isomorfeus_react_material/lucid_material}/component/mixin.rb

@@ -7,13 +7,12 @@ module LucidMaterial
         base.extend(::LucidMaterial::Component::NativeComponentConstructor)
         base.extend(::LucidPropDeclaration::Mixin)
         base.extend(::React::Component::EventHandler)
-        base.include(::LucidComponent::PreloadingSupport)
         base.extend(::LucidComponent::EnvironmentSupport)
         base.include(::LucidComponent::EnvironmentSupport)
         base.include(::React::Component::Elements)
-        base.include(::React::Component::API)
+        base.include(::React::Component::Api)
         base.include(::React::Component::Callbacks)
-        base.include(::LucidComponent::API)
+        base.include(::LucidComponent::Api)
         base.include(::LucidComponent::Initializer)
         base.include(::React::Component::Features)
         base.include(::React::Component::Resolution)

data/lib/{lucid_material → isomorfeus_react_material/lucid_material}/func/mixin.rb

@@ -5,13 +5,13 @@ module LucidMaterial
         base.include(::React::Component::Elements)
         base.include(::React::Component::Features)
         base.include(::LucidFunc::Initializer)
-        base.include(::React::FunctionComponent::API)
+        base.include(::React::FunctionComponent::Api)
         base.include(::React::FunctionComponent::Resolution)
         base.extend(::React::FunctionComponent::EventHandler)
         base.extend(::LucidComponent::EnvironmentSupport)
         base.include(::LucidComponent::EnvironmentSupport)
         base.extend(::LucidMaterial::Func::NativeComponentConstructor)
-        base.include(::LucidComponent::API)
+        base.include(::LucidComponent::Api)
       end
     end
   end

data/lib/{lucid_component → lucid_app}/reducers.rb

@@ -1,4 +1,4 @@
-module LucidComponent
+module LucidApp
   module Reducers
     class << self
       attr_reader :component_reducers_added

data/lib/react.rb

@@ -62,34 +62,36 @@ module React
     };
 
     self.internal_prepare_args_and_render = function(component, args, block) {
+      let operain = Opal.React.internal_render;
       if (args.length > 0) {
         let last_arg = args[args.length - 1];
         if (last_arg && last_arg.constructor === String) {
-          if (args.length === 1) { return Opal.React.internal_render(component, null, last_arg, null); }
-          else { Opal.React.internal_render(component, args[0], last_arg, null); }
-        } else { Opal.React.internal_render(component, args[0], null, block); }
-      } else { Opal.React.internal_render(component, null, null, block); }
+          if (args.length === 1) { return operain(component, null, last_arg, null); }
+          else { operain(component, args[0], last_arg, null); }
+        } else { operain(component, args[0], null, block); }
+      } else { operain(component, null, null, block); }
     };
 
     self.internal_render = function(component, props, string_child, block) {
+      let operabu = Opal.React.render_buffer;
       let children;
       let native_props = null;
       if (string_child) {
         children = string_child;
       } else if (block && block !== nil) {
-        Opal.React.render_buffer.push([]);
+        operabu.push([]);
         // console.log("internal_render pushed", Opal.React.render_buffer, Opal.React.render_buffer.toString());
         let block_result = block.$call();
         if (block_result && (block_result.constructor === String || block_result.constructor === Number)) {
-          Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
+          operabu[operabu.length - 1].push(block_result);
         }
         // console.log("internal_render popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
-        children = Opal.React.render_buffer.pop();
+        children = operabu.pop();
         if (children.length === 1) { children = children[0]; }
         else if (children.length === 0) { children = null; }
       }
       if (props && props !== nil) { native_props = Opal.React.to_native_react_props(props); }
-      Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(Opal.global.React.createElement(component, native_props, children));
+      operabu[operabu.length - 1].push(Opal.global.React.createElement(component, native_props, children));
     };
 
     self.active_components = [];

data/lib/react/component/api.rb

@@ -1,6 +1,6 @@
 module React
   module Component
-    module API
+    module Api
       def self.included(base)
         base.instance_exec do
           base_module = base.to_s.deconstantize

data/lib/react/component/features.rb

@@ -14,20 +14,21 @@ module React
           element = element_or_query
         end
         %x{
-          Opal.React.render_buffer.push([]);
-          // console.log("portal pushed", Opal.React.render_buffer, Opal.React.render_buffer.toString());
+          let operabu = Opal.React.render_buffer;
+          operabu.push([]);
+          // console.log("portal pushed", operabu, operabu.toString());
           if (block !== nil) {
             let block_result = block.$call()
-            let last_buffer_length = Opal.React.render_buffer[Opal.React.render_buffer.length - 1].length;
-            let last_buffer_element = Opal.React.render_buffer[Opal.React.render_buffer.length - 1][last_buffer_length - 1];
+            let last_buffer_length = operabu[operabu.length - 1].length;
+            let last_buffer_element = operabu[operabu.length - 1][last_buffer_length - 1];
             if (block_result && (block_result.constructor === String || block_result.constructor === Number)) {
-              Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
+              operabu[operabu.length - 1].push(block_result);
             }
           }
-          // console.log("portal popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
-          var react_element = Opal.global.React.createPortal(Opal.React.render_buffer.pop(), element);
-          Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(react_element);
-          // console.log("portal pushed", Opal.React.render_buffer, Opal.React.render_buffer.toString());
+          // console.log("portal popping", operabu, operabu.toString());
+          var react_element = Opal.global.React.createPortal(operabu.pop(), element);
+          operabu[operabu.length - 1].push(react_element);
+          // console.log("portal pushed", operabu, operabu.toString());
         }
       end
 

data/lib/react/component/mixin.rb

@@ -7,7 +7,7 @@ module React
         base.extend(::LucidPropDeclaration::Mixin)
         base.extend(::React::Component::EventHandler)
         base.include(::React::Component::Elements)
-        base.include(::React::Component::API)
+        base.include(::React::Component::Api)
         base.include(::React::Component::Callbacks)
         base.include(::React::Component::Initializer)
         base.include(::React::Component::Features)

data/lib/react/component/resolution.rb

@@ -75,8 +75,8 @@ module React
           if (component_type === "function" || component_type === "object") {
             component = Opal.global[component_name];
           } else {
-            var modules = self.$class().$to_s().split("::");
-            var modules_length = modules.length - 1;
+            var modules = self.$to_s().split("::");
+            var modules_length = modules.length;
             var module;
             var constant;
             for (var i = modules_length; i > 0; i--) {

data/lib/react/context_wrapper.rb

@@ -9,6 +9,7 @@ module React
     def Consumer(*args, &block)
       # why not use internal_prepare_args and render?
       %x{
+        let operabu = Opal.React.render_buffer;
         let props = null;
 
         if (args.length > 0) { props = Opal.React.to_native_react_props(args[0]); }
@@ -16,20 +17,20 @@ module React
         let react_element = Opal.global.React.createElement(this.native.Consumer, props, function(value) {
           let children = null;
           if (block !== nil) {
-            Opal.React.render_buffer.push([]);
-            // console.log("consumer pushed", Opal.React.render_buffer, Opal.React.render_buffer.toString());
+            operabu.push([]);
+            // console.log("consumer pushed", operabu, operabu.toString());
             let block_result = block.$call();
             if (block_result && (block_result.constructor === String || block_result.constructor === Number)) {
-              Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result);
+              operabu[operabu.length - 1].push(block_result);
             }
-            // console.log("consumer popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
-            children = Opal.React.render_buffer.pop();
+            // console.log("consumer popping", operabu, operabu.toString());
+            children = operabu.pop();
             if (children.length == 1) { children = children[0]; }
             else if (children.length == 0) { children = null; }
           }
           return children;
         });
-        Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(react_element);
+        operabu[operabu.length - 1].push(react_element);
       }
     end
 

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.4'
+  VERSION = '16.12.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.4
+  version: 16.12.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2019-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -202,44 +202,52 @@ files:
 - lib/isomorfeus/react_view_helper.rb
 - lib/isomorfeus/top_level.rb
 - lib/isomorfeus/top_level_ssr.rb
-- lib/lucid_app/api.rb
-- lib/lucid_app/base.rb
+- lib/isomorfeus/vivify_module.rb
+- lib/isomorfeus_react/lucid_app/api.rb
+- lib/isomorfeus_react/lucid_app/base.rb
+- lib/isomorfeus_react/lucid_app/mixin.rb
+- lib/isomorfeus_react/lucid_app/native_component_constructor.rb
+- lib/isomorfeus_react/lucid_app/native_lucid_component_constructor.rb
+- lib/isomorfeus_react/lucid_component/api.rb
+- lib/isomorfeus_react/lucid_component/app_store_defaults.rb
+- lib/isomorfeus_react/lucid_component/app_store_proxy.rb
+- lib/isomorfeus_react/lucid_component/base.rb
+- lib/isomorfeus_react/lucid_component/class_store_proxy.rb
+- lib/isomorfeus_react/lucid_component/component_class_store_defaults.rb
+- lib/isomorfeus_react/lucid_component/component_instance_store_defaults.rb
+- lib/isomorfeus_react/lucid_component/environment_support.rb
+- lib/isomorfeus_react/lucid_component/initializer.rb
+- lib/isomorfeus_react/lucid_component/instance_store_proxy.rb
+- lib/isomorfeus_react/lucid_component/mixin.rb
+- lib/isomorfeus_react/lucid_component/native_component_constructor.rb
+- lib/isomorfeus_react/lucid_component/native_lucid_component_constructor.rb
+- lib/isomorfeus_react/lucid_func/base.rb
+- lib/isomorfeus_react/lucid_func/initializer.rb
+- lib/isomorfeus_react/lucid_func/mixin.rb
+- lib/isomorfeus_react/lucid_func/native_component_constructor.rb
+- lib/isomorfeus_react/react/function_component/api.rb
+- lib/isomorfeus_react/react/function_component/base.rb
+- lib/isomorfeus_react/react/function_component/event_handler.rb
+- lib/isomorfeus_react/react/function_component/initializer.rb
+- lib/isomorfeus_react/react/function_component/mixin.rb
+- lib/isomorfeus_react/react/function_component/native_component_constructor.rb
+- lib/isomorfeus_react/react/function_component/resolution.rb
+- lib/isomorfeus_react/react/memo_component/base.rb
+- lib/isomorfeus_react/react/memo_component/mixin.rb
+- lib/isomorfeus_react/react/memo_component/native_component_constructor.rb
+- lib/isomorfeus_react_material/lucid_material/app/base.rb
+- lib/isomorfeus_react_material/lucid_material/app/mixin.rb
+- lib/isomorfeus_react_material/lucid_material/app/native_component_constructor.rb
+- lib/isomorfeus_react_material/lucid_material/component/base.rb
+- lib/isomorfeus_react_material/lucid_material/component/mixin.rb
+- lib/isomorfeus_react_material/lucid_material/component/native_component_constructor.rb
+- lib/isomorfeus_react_material/lucid_material/func/base.rb
+- lib/isomorfeus_react_material/lucid_material/func/mixin.rb
+- lib/isomorfeus_react_material/lucid_material/func/native_component_constructor.rb
 - lib/lucid_app/context.rb
-- lib/lucid_app/mixin.rb
-- lib/lucid_app/native_component_constructor.rb
-- lib/lucid_app/native_lucid_component_constructor.rb
-- lib/lucid_component/api.rb
-- lib/lucid_component/app_store_defaults.rb
-- lib/lucid_component/app_store_proxy.rb
-- lib/lucid_component/base.rb
-- lib/lucid_component/class_store_proxy.rb
-- lib/lucid_component/component_class_store_defaults.rb
-- lib/lucid_component/component_instance_store_defaults.rb
-- lib/lucid_component/environment_support.rb
-- lib/lucid_component/initializer.rb
-- lib/lucid_component/instance_store_proxy.rb
-- lib/lucid_component/mixin.rb
-- lib/lucid_component/native_component_constructor.rb
-- lib/lucid_component/native_lucid_component_constructor.rb
-- lib/lucid_component/preloading_support.rb
-- lib/lucid_component/reducers.rb
-- lib/lucid_func/base.rb
-- lib/lucid_func/initializer.rb
-- lib/lucid_func/mixin.rb
-- lib/lucid_func/native_component_constructor.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/base.rb
-- lib/lucid_material/component/mixin.rb
-- lib/lucid_material/component/native_component_constructor.rb
-- lib/lucid_material/func/base.rb
-- lib/lucid_material/func/initializer.rb
-- lib/lucid_material/func/mixin.rb
-- lib/lucid_material/func/native_component_constructor.rb
+- lib/lucid_app/reducers.rb
 - lib/lucid_prop_declaration/mixin.rb
 - lib/react.rb
-- lib/react/active_support_support.rb
 - lib/react/children.rb
 - lib/react/component/api.rb
 - lib/react/component/base.rb
@@ -257,23 +265,11 @@ files:
 - lib/react/component/resolution.rb
 - lib/react/component/state.rb
 - lib/react/component/styles.rb
-- lib/react/component/unsafe_api.rb
 - lib/react/context_wrapper.rb
-- lib/react/function_component/api.rb
-- lib/react/function_component/base.rb
-- lib/react/function_component/event_handler.rb
-- lib/react/function_component/initializer.rb
-- lib/react/function_component/mixin.rb
-- lib/react/function_component/native_component_constructor.rb
-- lib/react/function_component/resolution.rb
-- lib/react/memo_component/base.rb
-- lib/react/memo_component/mixin.rb
-- lib/react/memo_component/native_component_constructor.rb
 - lib/react/native_constant_wrapper.rb
 - lib/react/ref.rb
 - lib/react/synthetic_event.rb
 - lib/react/version.rb
-- lib/react/vivify_module.rb
 - lib/react_dom.rb
 - lib/react_dom_server.rb
 homepage: http://isomorfeus.com

data/lib/lucid_component/preloading_support.rb

@@ -1,34 +0,0 @@
-module LucidComponent
-  module PreloadingSupport
-    def self.included(base)
-      base.instance_exec do
-        def preload(&block)
-          `base.preload_block = block`
-          component_did_mount do
-            @_preload_promise.then { self.state.preloaded = true } unless self.state.preloaded
-          end
-        end
-
-        def while_loading(option = nil, &block)
-          wl_block = proc do
-            if @_preload_promise.resolved?
-              instance_exec(&`base.render_block`)
-            else
-              instance_exec(&block)
-            end
-          end
-          `base.while_loading_block = wl_block`
-        end
-      end
-
-      def execute_preload_block
-        @_preload_promise = instance_exec(&self.class.JS[:preload_block])
-        @_preload_promise.resolved?
-      end
-
-      def preloaded?
-        !!state.preloaded
-      end
-    end
-  end
-end

data/lib/lucid_material/func/initializer.rb

@@ -1,21 +0,0 @@
-module LucidMaterial
-  module Func
-    module Initializer
-      def initialize
-        self.JS[:native_props] = `{ props: null }`
-        @native_props = `Opal.React.Component.Props.$new(#{self})`
-        @app_store = `Opal.LucidComponent.AppStoreProxy.$new(#{self})`
-        @class_store = `Opal.LucidComponent.ClassStoreProxy.$new(#{self})`
-        @store = `Opal.LucidComponent.InstanceStoreProxy.$new(#{self})`
-        event_handlers = self.class.event_handlers
-        event_handler_source = self.class
-        %x{
-          for (var i = 0; i < event_handlers.length; i++) {
-            self[event_handlers[i]] = event_handler_source[event_handlers[i]];
-            self[event_handlers[i]] = self[event_handlers[i]].bind(self);
-          }
-        }
-      end
-    end
-  end
-end

data/lib/react/active_support_support.rb

@@ -1,13 +0,0 @@
-class String
-  def demodulize
-    if i = self.rindex("::")
-      self[(i + 2)..-1]
-    else
-      self
-    end
-  end
-
-  def deconstantize
-    self[0, self.rindex("::") || 0] # implementation based on the one in facets' Module#spacename
-  end
-end

data/lib/react/component/unsafe_api.rb

@@ -1,33 +0,0 @@
-module React
-  module Component
-    module UnsafeAPI
-      def self.included(base)
-        base.instance_exec do
-          def unsafe_component_will_mount(&block)
-            %x{
-              self.react_component.prototype.UNSAFE_componentWillMount = function() {
-                return #{`this.__ruby_instance`.instance_exec(&block)};
-              }
-            }
-          end
-
-          def unsafe_component_will_receive_props(&block)
-            %x{
-              self.react_component.prototype.UNSAFE_componentWillReceiveProps = function(next_props) {
-                return #{`this.__ruby_instance`.instance_exec(React::Component::Props.new(`{props: next_props}`), &block)};
-              }
-            }
-          end
-
-          def unsafe_component_will_update(&block)
-            %x{
-              self.react_component.prototype.UNSAFE_componentWillUpdate = function(next_props, next_state) {
-                return #{`this.__ruby_instance`.instance_exec(React::Component::Props.new(`{props: next_props}`), `Opal.Hash.$new(next_state)`, &block)};
-              }
-            }
-          end
-        end
-      end
-    end
-  end
-end