Address #187

zetachang · zetachang · commit ef892d25cf26 · 2016-11-26T22:14:40.000+08:00
diff --git a/lib/react/top_level.rb b/lib/react/top_level.rb
@@ -55,6 +55,12 @@ def self.create_element(type, properties = {}, &block)
   end
 
   def self.render(element, container)
+    %x{
+        console.error(
+          "Warning: Using deprecated behavior of `React.render`,",
+          "require \"react/top_level_render\" to get the correct behavior."
+        );
+    }
     container = `container.$$class ? container[0] : container`
     if !(`typeof ReactDOM === 'undefined'`)
       component = Native(`ReactDOM.render(#{element.to_n}, container, function(){#{yield if block_given?}})`) # v0.15+
diff --git a/lib/react/top_level_render.rb b/lib/react/top_level_render.rb
@@ -0,0 +1,20 @@
+module React
+  def self.render(element, container)
+    container = `container.$$class ? container[0] : container`
+    if !(`typeof ReactDOM === 'undefined'`)
+      native = `ReactDOM.render(#{element.to_n}, container, function(){#{yield if block_given?}})` # v0.15+
+    elsif !(`typeof React.renderToString === 'undefined'`)
+      native = `React.render(#{element.to_n}, container, function(){#{yield if block_given?}})`
+    else
+      raise "render is not defined.  In React >= v15 you must import it with ReactDOM"
+    end
+
+    if `#{native}._getOpalInstance !== undefined`
+      `#{native}._getOpalInstance()`
+    elsif `React.findDOMNode !== undefined && #{native}.nodeType == undefined`
+      `React.findDOMNode(#{native})`
+    else
+      native
+    end
+  end
+end
diff --git a/spec/react/react_spec.rb b/spec/react/react_spec.rb
@@ -181,19 +181,23 @@ def render
       React.render(React.create_element('span') { "lorem" }, div)
     end
 
-    it "should return a React::Component::API compatible object" do
-      div = `document.createElement("div")`
-      component = React.render(React.create_element('span') { "lorem" }, div)
-      React::Component::API.public_instance_methods(true).each do |method_name|
-        expect(component).to respond_to(method_name)
+    it "returns the actual ruby instance" do
+      stub_const 'Foo', Class.new
+      Foo.class_eval do
+        def render
+          React.create_element("div") { "lorem" }
+        end
       end
+
+      div = `document.createElement("div")`
+      instance = React.render(React.create_element(Foo), div)
+      expect(instance).to be_a(Foo)
     end
 
-    pending "should return nil to prevent abstraction leakage" do
+    it "returns the actual DOM node" do
       div = `document.createElement("div")`
-      expect {
-        React.render(React.create_element('span') { "lorem" }, div)
-      }.to be_nil
+      node = React.render(React.create_element('span') { "lorem" }, div)
+      expect(`#{node}.nodeType`).to eq(1)
     end
   end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -19,6 +19,7 @@ def ruby?
   require 'hyper-react'
   require 'react/test/rspec'
   require 'react/test/utils'
+  require 'react/top_level_render'
 
   require File.expand_path('../support/react/spec_helpers', __FILE__)
 
