Merge branch 'issue-111' into edge

Author: catmando

ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb

@@ -18,6 +18,10 @@ module Component
       class ReactWrapper
         @@component_classes = {}
 
+        def self.stateless?(ncc)
+          `typeof #{ncc} === 'function' && !(#{ncc}.prototype && #{ncc}.prototype.isReactComponent)`
+        end
+
         def self.import_native_component(opal_class, native_class)
           opal_class.instance_variable_set("@native_import", true)
           @@component_classes[opal_class] = native_class
@@ -29,9 +33,8 @@ def self.eval_native_react_component(name)
           is_component_class = `#{component}.prototype !== undefined` &&
                                 (`!!#{component}.prototype.isReactComponent` ||
                                  `!!#{component}.prototype.render`)
-          is_functional_component = `typeof #{component} === "function"`
           has_render_method = `typeof #{component}.render === "function"`
-          unless is_component_class || is_functional_component || has_render_method
+          unless is_component_class || stateless?(component) || has_render_method
             raise 'does not appear to be a native react component'
           end
           component
@@ -179,7 +182,7 @@ def self.create_element(type, *args, &block)
 
           # Convert Passed in properties
           ele = nil # create nil var for the ref to use
-          ref = ->(ref) { ele._update_ref(ref) } unless `typeof ncc === 'function'`
+          ref = ->(ref) { ele._update_ref(ref) } unless stateless?(ncc)
           properties = convert_props(type, { ref: ref }, *args)
           params << properties.shallow_to_n
 
@@ -192,7 +195,10 @@ def self.create_element(type, *args, &block)
               }
             }
           end
-          ele = Hyperstack::Component::Element.new(`React.createElement.apply(null, #{params})`, type, properties, block)
+          # assign to ele so that the ref callback can use it
+          ele = Hyperstack::Component::Element.new(
+            `React.createElement.apply(null, #{params})`, type, properties, block
+          )
         end
 
         def self.clear_component_class_cache