isomorfeus-react 16.13.6 → 16.13.11

data/lib/react/component/state.rb

@@ -13,8 +13,10 @@ module React
             @native.JS.setState(new_state, `null`)
           end
         else
-          return nil if `typeof #@native.state[key] === "undefined"`
-          @native.JS[:state].JS[key]
+          %x{
+            if (typeof #@native.state[key] === 'undefined') { return nil; }
+            return #@native.state[key];
+          }
         end
       end
 

data/lib/react/component/styles.rb

@@ -15,35 +15,14 @@ module React
         method_missing(prop, val)
       end
 
-      %x{
-        function isObject(obj) { return (obj && typeof obj === 'object'); }
-
-        function mergeDeep(one, two) {
-          return [one, two].reduce(function(pre, obj) {
-            Object.keys(obj).forEach(function(key){
-              let pVal = pre[key];
-              let oVal = obj[key];
-              if (Array.isArray(pVal) && Array.isArray(oVal)) {
-                pre[key] = pVal.concat.apply(this, oVal);
-              } else if (isObject(pVal) && isObject(oVal)) {
-                pre[key] = mergeDeep(pVal, oVal);
-              } else {
-                pre[key] = oVal;
-              }
-            });
-            return pre;
-          }, {});
-        }
-      }
-
       def deep_merge(a_hash)
         native_hash = a_hash.to_n
-        React::Component::Styles.new(`mergeDeep(#@native, native_hash)`)
+        React::Component::Styles.new(`Opal.React.merge_deep(#@native, native_hash)`)
       end
 
       def deep_merge!(a_hash)
         native_hash = a_hash.to_n
-        `#@native = mergeDeep(#@native, native_hash)`
+        `#@native = Opal.React.merge_deep(#@native, native_hash)`
         self
       end
 

data/lib/react/context_wrapper.rb

@@ -20,13 +20,11 @@ module React
             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)) {
-              operabu[operabu.length - 1].push(block_result);
-            }
+            if (block_result && block_result !== nil) { Opal.React.render_block_result(block_result); }
             // console.log("consumer popping", operabu, operabu.toString());
             children = operabu.pop();
-            if (children.length == 1) { children = children[0]; }
-            else if (children.length == 0) { children = null; }
+            if (children.length === 1) { children = children[0]; }
+            else if (children.length === 0) { children = null; }
           }
           return children;
         });

data/lib/react/native_constant_wrapper.rb

@@ -8,7 +8,6 @@ module React
     end
 
     def method_missing(name, *args, &block)
-      # language=JS
       %x{
         if (name[0] === 'u' && name[1] === 's' && name[2] === 'e') {
           if (name.indexOf('_') > 0) { name = Opal.React.lower_camelize(name); }

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.13.6'
+  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

data/lib/react_native/lucid_func/react_native_component_constructor.rb

@@ -0,0 +1,82 @@
+module LucidFunc
+  module ReactNativeComponentConstructor
+    def self.extended(base)
+      component_name = base.to_s
+      %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 classes = null;
+          let store;
+          if (base.store_updates) { store = og.React.useContext(og.LucidApplicationContext); }
+          let theme = og.ReactJSS.useTheme();
+          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 = og.ReactJSS.createUseStyles(styles);
+            }
+            classes = base.use_styles();
+          }
+          // 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 = theme;
+          __ruby_instance.props.classes = classes;
+          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();
+          if (result.length === 1) { return result[0]; }
+          return 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