fix bug in ref callback, with spec

janbiedermann · janbiedermann · commit da5927f2323b · 2018-02-17T21:08:28.000+01:00
diff --git a/lib/react/api.rb b/lib/react/api.rb
@@ -174,9 +174,9 @@ def self.convert_props(properties)
         elsif key == 'ref' && value.is_a?(Proc)
           props[key] = %x{
                           function(dom_node){
-                            if (dom_node.__opalInstance !== undefined && dom_node.__opalInstance !== null) {
+                            if (dom_node !== null && dom_node.__opalInstance !== undefined && dom_node.__opalInstance !== null) {
                               #{ value.call(`dom_node.__opalInstance`) };
-                            } else if(ReactDOM.findDOMNode !== undefined && dom_node.nodeType === undefined) {
+                            } else if(dom_node !== null && ReactDOM.findDOMNode !== undefined && dom_node.nodeType === undefined) {
                               #{ value.call(`ReactDOM.findDOMNode(dom_node)`) };
                             } else {
                               #{ value.call(`dom_node`) };
diff --git a/lib/react/ref_callback.rb b/lib/react/ref_callback.rb
@@ -14,9 +14,9 @@ def self.convert_props(properties)
       props.map do |key, value|
         if key == "ref" && value.is_a?(Proc)
           new_proc = Proc.new do |native_inst|
-            if `#{native_inst}.__opalInstance !== undefined && #{native_inst}.__opalInstance !== null`
+            if `#{native_inst} !== null && #{native_inst}.__opalInstance !== undefined && #{native_inst}.__opalInstance !== null`
               value.call(`#{native_inst}.__opalInstance`)
-            elsif `ReactDOM.findDOMNode !== undefined && #{native_inst}.nodeType === undefined`
+            elsif `#{native_inst} !== null &&  ReactDOM.findDOMNode !== undefined && #{native_inst}.nodeType === undefined`
               value.call(`ReactDOM.findDOMNode(#{native_inst})`) # react >= v0.15.`)
             else
               value.call(native_inst)
diff --git a/spec/react/refs_callback_spec.rb b/spec/react/refs_callback_spec.rb
@@ -62,4 +62,33 @@ def render
       "#{Foo.bar.JS['nodeType']}" # aboids json serialisation errors by using "#{}"
     end.to eq("1")
   end
+
+  it "works, even when the component is unmounted" do
+    # was a bug, on umount react calls the ref method with null instead of a dom node
+    # callback failed then
+    # ref is called two times, once on mount with dom_node, once on unmount with null
+    mount "Foo" do
+      class Unmountable < Hyperloop::Component
+        render do
+          DIV { "This is a Component" }
+        end
+      end
+      Foo.class_eval do
+        def ref_rec(dom_node)
+          @@rec_cnt ||= 0
+          @@rec_cnt += 1
+        end
+        def self.rec_cnt
+          @@rec_cnt
+        end
+
+        after_mount { mutate.unmount true }
+
+        render do
+          Unmountable(ref: method(:ref_rec).to_proc) unless state.unmount 
+        end
+      end
+    end
+    expect_evaluate_ruby('Foo.rec_cnt').to eq(2)
+  end
 end
