isomorfeus-react 16.13.10 → 16.13.11

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

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

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

@@ -0,0 +1,14 @@
+module LucidPaper
+  module Func
+    module Mixin
+      def self.included(base)
+        base.include(::React::Component::Elements)
+        base.include(::React::Component::Features)
+        base.include(::LucidFunc::Initializer)
+        base.include(::React::FunctionComponent::Api)
+        base.extend(::LucidPaper::Func::NativeComponentConstructor)
+        base.include(::LucidComponent::Api)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+module LucidPaper
+  module Func
+    module NativeComponentConstructor
+      def self.extended(base)
+        component_name = "#{base.to_s}Wrapper"
+        %x{
+          base.store_updates = true;
+          base.equality_checker = null;
+          base.instance_init = function(initial) {
+            let ruby_state = { instance: #{base.new(`{}`)} };
+            ruby_state.instance.__ruby_instance = ruby_state.instance;
+            ruby_state.instance.data_access = function() { return this.props.store; }
+            ruby_state.instance.data_access.bind(ruby_state.instance);
+            return ruby_state;
+          }
+          base.instance_reducer = function(state, action) { return state; }
+          base.react_component = Opal.global.React.memo(function(props) {
+            const og = Opal.global;
+            const oper = Opal.React;
+            oper.render_buffer.push([]);
+            // console.log("function pushed", oper.render_buffer, oper.render_buffer.toString());
+            // Lucid functionality
+            let store;
+            if (base.store_updates) { store = og.React.useContext(og.LucidApplicationContext); }
+            // prepare Ruby instance
+            const [__ruby_state, __ruby_dispatch] = og.React.useReducer(base.instance_reducer, null, base.instance_init);
+            const __ruby_instance = __ruby_state.instance;
+            __ruby_instance.props = Object.assign({}, props);
+            __ruby_instance.props.store = store;
+            __ruby_instance.props.theme = Opal.global.Paper.useTheme();
+            oper.active_components.push(__ruby_instance);
+            oper.active_redux_components.push(__ruby_instance);
+            let block_result = #{`__ruby_instance`.instance_exec(&`base.render_block`)};
+            if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+            oper.active_redux_components.pop();
+            oper.active_components.pop();
+            // console.log("function popping", oper.render_buffer, oper.render_buffer.toString());
+            let result = oper.render_buffer.pop();
+            return (result.length === 1) ? result[0] : result;
+          }, base.equality_checker);
+          base.react_component.displayName = #{component_name};
+        }
+
+        base_module = base.to_s.deconstantize
+        if base_module != ''
+          base_module.constantize.define_singleton_method(base.to_s.demodulize) do |*args, &block|
+            `Opal.React.internal_prepare_args_and_render(#{base}.react_component, args, block)`
+          end
+        else
+          Object.define_method(base.to_s) do |*args, &block|
+            `Opal.React.internal_prepare_args_and_render(#{base}.react_component, args, block)`
+          end
+        end
+
+        def props_are_equal?(&block)
+          %x{
+              base.equality_checker = function (prev_props, next_props) {
+                var prev_ruby_props = Opal.React.Component.Props.$new({props: prev_props});
+                var next_ruby_props = Opal.React.Component.Props.$new({props: next_props});
+                return #{block.call(`prev_ruby_props`, `next_ruby_props`)};
+              }
+            }
+        end
+
+        def render(&block)
+          `base.render_block = #{block}`
+        end
+      end
+    end
+  end
+end

data/lib/react.rb

@@ -135,11 +135,12 @@ module React
                 let ruby_event = self.native_to_ruby_event(event);
                 #{`active_c.__ruby_instance`.instance_exec(`ruby_event`, `info`, &`value`)};
               }
-            } else if (type === "object" && typeof value.$call === "function" ) {
+            } else if (type === "object" && typeof value.m === "object" && typeof value.m.$call === "function" ) {
               if (!value.react_event_handler_function) {
                 value.react_event_handler_function = function(event, info) {
                   let ruby_event = self.native_to_ruby_event(event);
-                  value.$call(ruby_event, info)
+                  if (value.a.length > 0) { value.m.$call.apply(value.m, [ruby_event, info].concat(value.a)); }
+                  else { value.m.$call(ruby_event, info); }
                 };
               }
               result[self.lower_camelize(key)] = value.react_event_handler_function;
@@ -161,7 +162,7 @@ module React
                 if (!method_ref.react_event_handler_function) {
                   method_ref.react_event_handler_function = function(event, info) {
                     let ruby_event = self.native_to_ruby_event(event);
-                    method_ref.$call(ruby_event, info)
+                    method_ref.m.$call(ruby_event, info)
                   };
                 }
                 result[self.lower_camelize(key)] = method_ref.react_event_handler_function;
@@ -181,9 +182,9 @@ module React
             }
           } else if (key[0] === 'a' && key.startsWith("aria_")) {
             result[key.replace("_", "-")] = value;
-          } else if (key === "style") {
+          } else if (key === "style" || key === "theme") {
             if (typeof value.$to_n === "function") { value = value.$to_n() }
-            result["style"] = value;
+            result[key] = value;
           } else {
             result[self.lower_camelize(key)] = value;
           }

data/lib/react/component/api.rb

@@ -98,12 +98,13 @@ module React
       end
       alias gre get_react_element
 
-      def method_ref(method_symbol)
+      def method_ref(method_symbol, *args)
+        method_key = "#{method_symbol}#{args}"
         %x{
-          if (#@native.method_refs && #@native.method_refs[#{method_symbol}]) { return #@native.method_refs[#{method_symbol}]; }
+          if (#@native.method_refs && #@native.method_refs[#{method_key}]) { return #@native.method_refs[#{method_key}]; }
           if (!#@native.method_refs) { #@native.method_refs = {}; }
-          #@native.method_refs[#{method_symbol}] = #{method(method_symbol)};
-          return #@native.method_refs[#{method_symbol}];
+          #@native.method_refs[#{method_key}] = { m: #{method(method_symbol)}, a: args };
+          return #@native.method_refs[#{method_key}];
         }
       end
       alias m_ref method_ref

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.13.10'
+  VERSION = '16.13.11'
 end

data/lib/react_native/component/elements.rb

@@ -0,0 +1,203 @@
+module ReactNative
+  module Component
+    module Elements
+      # https://www.w3.org/TR/html52/fullindex.html#index-elements
+      # https://www.w3.org/TR/SVG11/eltindex.html
+      UNSUPPORTED_HTML_AND_SVG_ELEMENTS = %w[
+        a abbr address area article aside audio
+        base bdi bdo blockquote body br
+        canvas caption cite col colgroup
+        data datalist dd del details dfn dialog dl dt
+        em embed
+        fieldset figcaption figure footer form
+        head header hr html
+        iframe ins
+        kbd
+        label legend li link
+        main map mark meta meter
+        nav noscript
+        object ol optgroup option output
+        param picture progress
+        q
+        rp rt rtc ruby
+        s samp script section select small source span strong style sub summary sup
+        table tbody td template textarea tfoot th thead time title tr track
+        ul
+        var video
+        wbr
+
+        altGlyph altGlyphDef altGlyphItem animate animateColor animateMotion animateTransform
+        color-profile cursor
+        desc
+        feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting
+        feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur
+        feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting
+        feSpotLight feTile feTurbulence
+        filter font font-face font-face-format font-face-name font-face-src font-face-uri
+        glyph glyphRef
+        hkern
+        metadata missing-glyph mpath
+        script set style switch
+        tref
+        view vkern
+      ]
+
+      UNSUPPORTED_HTML_AND_SVG_ELEMENTS.each do |element|
+        define_method(element) do |*args, &block|
+          `console.warn("Element " + element + " is not yet supported, using a Text component as substitute!")`
+          `Opal.React.internal_prepare_args_and_render(Opal.global.Text, args, block)`
+        end
+        define_method(`element.toUpperCase()`) do |*args, &block|
+          `console.warn("Element " + element + " is not yet supported, using a Text component as substitute!")`
+          `Opal.React.internal_prepare_args_and_render(Opal.global.Text, args, block)`
+        end
+      end
+
+      # button
+      %x{
+        self['supported_button'] = function(props) {
+          let theme = Opal.global.React.useContext(Opal.global.ThemeContext);
+          let style = {};
+          if (theme && typeof theme['button'] !== 'undefined') { style = theme['button']; }
+          if (typeof props.style !== 'undefined') {
+            style = Opal.React.merge_deep(style, props.style);
+          }
+          let new_props = Object.assign({}, props, { style: style });
+          if (typeof props.title === 'undefined') {
+            try {
+              new_props.title = props.children.props.children;
+            } catch (e) {
+              console.error("BUTTON accepts only one string child!")
+            }
+          }
+          return Opal.global.React.createElement(Opal.global.Button, new_props);
+        }
+        self['supported_button'].displayName = 'BUTTON';
+      }
+      define_method('button') do |*args, &block|
+        `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements.supported_button, args, block)`
+      end
+      define_method('BUTTON') do |*args, &block|
+        `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements.supported_button, args, block)`
+      end
+
+      # img
+      define_method('img') do |*args, &block|
+        `Opal.React.internal_prepare_args_and_render(Opal.global.Image, args, block)`
+      end
+      define_method('IMG') do |*args, &block|
+        `Opal.React.internal_prepare_args_and_render(Opal.global.Image, args, block)`
+      end
+
+      # input
+      %x{
+        self.supported_input = function(props) {
+          Opal.React.render_buffer.push([]);
+          if (typeof props.type !== 'undefined') {
+            if (props.type === 'text') { return Opal.React.internal_prepare_args_and_render(Opal.global.TextInput, props); }
+            else if (props.type === 'checkbox') { return Opal.React.internal_prepare_args_and_render(Opal.global.InputSwitch, props); }
+            else {
+               console.warn("Input type " + props.type + " not supported. Using TextInput as substitute!");
+               return Opal.React.internal_prepare_args_and_render(Opal.global.TextInput, props);
+            }
+          }
+          Opal.React.internal_prepare_args_and_render(Opal.global.TextInput, props);
+          return Opal.React.render_buffer.pop();
+        }
+      }
+      define_method('input') do |*args, &block|
+        `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements.supported_input, args, block)`
+      end
+      define_method('INPUT') do |*args, &block|
+        `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements.supported_input, args, block)`
+      end
+
+      # elements that map to Text with style
+      SUPPORTED_TEXT_HTML_ELEMENTS = %w[
+        b
+        code
+        h1 h2 h3 h4 h5 h6
+        i
+        pre
+        span
+        u
+      ]
+
+      SUPPORTED_TEXT_HTML_ELEMENTS.each do |element|
+        fun_name = 'supported_' + element
+        %x{
+          self[fun_name] = function(props) {
+            let theme = Opal.global.React.useContext(Opal.global.ThemeContext);
+            let style = {};
+            if (theme && typeof theme[element] !== 'undefined') { style = theme[element]; }
+            if (typeof props.style !== 'undefined') {
+              style = Opal.React.merge_deep(style, props.style);
+            }
+            let new_props = Object.assign({}, props, { style: style });
+            return Opal.global.React.createElement(Opal.global.Text, new_props);
+          }
+          self[fun_name].displayName = element.toUpperCase();
+        }
+        define_method(`element.toLowerCase()`) do |*args, &block|
+          `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements[fun_name], args, block)`
+        end
+        define_method(`element.toUpperCase()`) do |*args, &block|
+          `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements[fun_name], args, block)`
+        end
+      end
+
+      SUPPORTED_VIEW_HTML_ELEMENTS = %w[
+        div
+        p
+      ]
+
+      SUPPORTED_VIEW_HTML_ELEMENTS.each do |element|
+        fun_name = 'supported_' + element
+        %x{
+          self[fun_name] = function(props) {
+            let theme = Opal.global.React.useContext(Opal.global.ThemeContext);
+            let style = {};
+            if (theme && typeof theme[element] !== 'undefined') { style = theme[element]; }
+            if (typeof props.style !== 'undefined') {
+              style = Opal.React.merge_deep(style, props.style);
+            }
+            let new_props = Object.assign({}, props, { style: style });
+            return Opal.global.React.createElement(Opal.global.View, new_props);
+          }
+          self[fun_name].displayName = element.toUpperCase();
+        }
+        define_method(`element.toLowerCase()`) do |*args, &block|
+          `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements[fun_name], args, block)`
+        end
+        define_method(`element.toUpperCase()`) do |*args, &block|
+          `Opal.React.internal_prepare_args_and_render(Opal.ReactNative.Component.Elements[fun_name], args, block)`
+        end
+      end
+      
+      SUPPORTED_SVG_ELEMENTS = %w[
+        Circle ClipPath
+        Defs
+        Ellipse
+        ForeignObject
+        G
+        Image
+        Line LinearGradient
+        Marker Mask
+        Path Pattern Polygon Polyline
+        RadialGradient Rect
+        Stop Svg Symbol
+        Text TextPath TSpan
+        Use
+      ]
+
+      SUPPORTED_SVG_ELEMENTS.each do |element|
+        define_method(`element.toLowerCase()`) do |*args, &block|
+          `Opal.React.internal_prepare_args_and_render(Opal.global.ReactNativeSvg[element], args, block)`
+        end
+        define_method(`element.toUpperCase()`) do |*args, &block|
+          `Opal.React.internal_prepare_args_and_render(Opal.global.ReactNativeSvg[element], args, block)`
+        end
+      end
+    end
+  end
+end

data/lib/react_native/lucid_app/react_native_component_constructor.rb

@@ -0,0 +1,51 @@
+module LucidApp
+  module ReactNativeComponentConstructor
+    # 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'
+      theme_component_name = base.to_s + 'ThemeWrapper'
+      # language=JS
+      %x{
+        base.jss_theme = {};
+        base.themed_react_component = function(props) {
+          const opag = Opal.global;
+          const theme = opag.React.useContext(opag.ThemeContext);
+          let classes;
+          if (base.jss_styles) {
+            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; }
+              base.use_styles = Opal.React.merge_deep(theme, opag.StyleSheet.create(styles));
+            }
+            classes = base.use_styles;
+          } else {
+            classes = theme;
+          }
+          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 = 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.ThemeContext.Provider, { value: Opal.global.DefaultTheme }, themed_component);
+          }
+        }
+      }
+    end
+  end
+end

data/lib/react_native/lucid_component/react_native_component_constructor.rb

@@ -0,0 +1,37 @@
+module LucidComponent
+  module ReactNativeComponentConstructor
+    # 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 opag = Opal.global;
+          let store;
+          if (base.store_updates) { store = opag.React.useContext(opag.LucidApplicationContext); }
+          const theme = opag.React.useContext(opag.ThemeContext);
+          let classes;
+          if (base.jss_styles) {
+            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; }
+              base.use_styles = Opal.React.merge_deep(theme, opag.StyleSheet.create(styles));
+            }
+            classes = base.use_styles;
+          } else {
+            classes = theme;
+          }
+          let new_props = Object.assign({}, props);
+          new_props.theme = theme;
+          new_props.classes = classes;
+          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
+  end
+end