fixes two regressions, one to go

Author: catmando

ruby/hyper-component/lib/hyperstack/component/element.rb

@@ -58,14 +58,14 @@ def on(*event_names, &block)
       # Used for elements that are not yet in DOM, i.e. they are provided as children
       # or they have been explicitly removed from the rendering context using the delete method.
 
-      def render(*props, &new_block)
+      def render(*props)
         if props.empty?
           Hyperstack::Internal::Component::RenderingContext.render(self)
         else
-          props = Hyperstack::Internal::Component::ReactWrapper.convert_props(*props)
+          props = Hyperstack::Internal::Component::ReactWrapper.convert_props(@type, @properties, *props)
           @_child_element = Hyperstack::Internal::Component::RenderingContext.render(
             Element.new(`React.cloneElement(#{@native}, #{props.shallow_to_n})`,
-                        type, @properties.merge(props), block)
+                        type, props, block)
           )
         end
       end

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

@@ -27,7 +27,9 @@ def method_missing(class_name, args = {}, &new_block)
           Hyperstack::Internal::Component::RenderingContext.replace(
             self,
             Hyperstack::Internal::Component::RenderingContext.build do
-              Hyperstack::Internal::Component::RenderingContext.render(type, build_new_properties(class_name, args), &new_block)
+              Hyperstack::Internal::Component::RenderingContext.render(
+                type, @properties, args, class: haml_class_name(class_name), &new_block
+              )
             end
           )
         end
@@ -39,17 +41,6 @@ def rendered?
         def haml_class_name(class_name)
           class_name.gsub(/__|_/, '__' => '_', '_' => '-')
         end
-
-        private
-
-        def build_new_properties(class_name, args)
-          class_name = haml_class_name(class_name)
-          new_props = @properties.dup
-          new_props[:className] = "\
-            #{class_name} #{new_props[:className]} #{args.delete(:class)} #{args.delete(:className)}\
-          ".split(' ').uniq.join(' ')
-          new_props.merge! args
-        end
       end
     end
   end

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

@@ -262,18 +262,22 @@ def self.convert_props(type, *args)
                       "If you want to capture the ref in an instance variable use the `set` method.\n"\
                       "For example `ref: set(:TheRef)` will capture assign the ref to `@TheRef`\n"
               end
-              props[key] = %x{
-                              function(dom_node){
-                                if (dom_node !== null && dom_node.__opalInstance !== undefined && dom_node.__opalInstance !== null) {
-                                  #{ Hyperstack::Internal::State::Mapper.ignore_mutations { value.call(`dom_node.__opalInstance`) } };
-                                } else if(dom_node !== null && ReactDOM.findDOMNode !== undefined && dom_node.nodeType === undefined) {
-                                  #{ Hyperstack::Internal::State::Mapper.ignore_mutations { value.call(`ReactDOM.findDOMNode(dom_node)`) } };
-                                } else if(dom_node !== null){
-                                  #{ Hyperstack::Internal::State::Mapper.ignore_mutations { value.call(`dom_node`) } };
-                                }
-                              }
+              unless `value.__hyperstack_component_ref_is_already_wrapped`
+                fn = value
+                value = %x{
+                          function(dom_node){
+                            if (dom_node !== null && dom_node.__opalInstance !== undefined && dom_node.__opalInstance !== null) {
+                              #{ Hyperstack::Internal::State::Mapper.ignore_mutations { fn.call(`dom_node.__opalInstance`) } };
+                            } else if(dom_node !== null && ReactDOM.findDOMNode !== undefined && dom_node.nodeType === undefined) {
+                              #{ Hyperstack::Internal::State::Mapper.ignore_mutations { fn.call(`ReactDOM.findDOMNode(dom_node)`) } };
+                            } else if(dom_node !== null){
+                              #{ Hyperstack::Internal::State::Mapper.ignore_mutations { fn.call(`dom_node`) } };
                             }
-
+                          }
+                        }
+                `value.__hyperstack_component_ref_is_already_wrapped = true`
+              end
+              props[key] = value
             elsif key == 'jq_ref'
               unless value.respond_to?(:call)
                 raise "The ref and dom params must be given a Proc.\n"\

ruby/hyper-component/spec/deprecated_features/haml_spec.rb

@@ -31,7 +31,7 @@ class Foo < Hyperloop::Component
         end
       end
     end
-    expect(page.body).to include('<div class="div-class"><span class="other-class the-class">a man walks into a bar</span></div>')
+    expect(page.body).to include('<div class="div-class"><span class="the-class other-class">a man walks into a bar</span></div>')
   end
 
   it 'redefines `p` to make method missing work' do