Merge branch '1_0_0' into edge

Author: janbiedermann

Appraisals

@@ -26,6 +26,6 @@ appraise "opal-master-react-15" do
   ruby '>= 2.0.0'
   gem 'opal', git: 'https://github.com/opal/opal.git'
   gem "opal-sprockets", git: 'https://github.com/opal/opal-sprockets.git'
-  gem 'opal-rails', '~> 0.9.0'
+  gem 'opal-rails', '~> 0.9.4'
   gem 'react-rails', '~> 2.4.0', require: false
 end

Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
-gem "opal-rails", git: "https://github.com/opal/opal-rails.git", branch: "master"
 gemspec

gemfiles/opal_0_11_react-rails_2_4.gemfile

@@ -2,6 +2,5 @@ source "https://rubygems.org"
 source ENV['HYPER_DEV_GEM_SOURCE'] if ENV['HYPER_DEV_GEM_SOURCE']
 
 gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
-gem "opal-rails", git: "https://github.com/opal/opal-rails.git", branch: "master"
 
 gemspec :path => "../"

hyper-react.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mime-types'
   spec.add_development_dependency 'nokogiri'
   spec.add_development_dependency 'opal-jquery'
-  spec.add_development_dependency 'opal-rails', '~> 0.9.3'
+  spec.add_development_dependency 'opal-rails', '~> 0.9.4'
   spec.add_development_dependency 'opal-rspec'
   spec.add_development_dependency 'rails', '>= 4.0.0'
   spec.add_development_dependency 'rails-controller-testing'

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`) };

lib/react/event.rb

@@ -31,27 +31,27 @@ class Event
     # Focus
     alias_native :related_target, :relatedTarget
     # Mouse
-    alias_native :alt_key, :altKey
+    # aliased above: alias_native :alt_key, :altKey
     alias_native :button, :button
     alias_native :buttons, :buttons
     alias_native :client_x, :clientX
     alias_native :client_y, :clientY
-    alias_native :ctrl_key, :ctrlKey
+    # aliased above: alias_native :ctrl_key, :ctrlKey
     alias_native :get_modifier_state, :getModifierState
-    alias_native :meta_key, :metaKey
+    # aliased above: alias_native :meta_key, :metaKey
     alias_native :page_x, :pageX
     alias_native :page_y, :pageY
-    alias_native :related_target, :relatedTarget
+    # aliased above: alias_native :related_target, :relatedTarget
     alias_native :screen_x, :screen_x
     alias_native :screen_y, :screen_y
-    alias_native :shift_key, :shift_key
+    # aliased above: alias_native :shift_key, :shift_key
     # Touch
-    alias_native :alt_key, :altKey
+    # aliased above: alias_native :alt_key, :altKey
     alias_native :changed_touches, :changedTouches
-    alias_native :ctrl_key, :ctrlKey
-    alias_native :get_modifier_state, :getModifierState
-    alias_native :meta_key, :metaKey
-    alias_native :shift_key, :shiftKey
+    # aliased above: alias_native :ctrl_key, :ctrlKey
+    # aliased above: alias_native :get_modifier_state, :getModifierState
+    # aliased above: alias_native :meta_key, :metaKey
+    # aliased above: alias_native :shift_key, :shiftKey
     alias_native :target_touches, :targetTouches
     alias_native :touches, :touches
     # UI
@@ -64,10 +64,10 @@ class Event
     alias_native :delta_z, :deltaZ
 
     BUILT_IN_EVENTS = %w{onCopy onCut onPaste onKeyDown onKeyPress onKeyUp
-      onFocus onBlur onChange onInput onSubmit onClick onDoubleClick onDrag
+      onFocus onBlur onChange onInput onSubmit onClick onContextMenu onDoubleClick onDrag
       onDragEnd onDragEnter onDragExit onDragLeave onDragOver onDragStart onDrop
       onMouseDown onMouseEnter onMouseLeave onMouseMove onMouseOut onMouseOver
-      onMouseUp onTouchCancel onTouchEnd onTouchMove onTouchStart onScroll}
+      onMouseUp onSelect onTouchCancel onTouchEnd onTouchMove onTouchStart onScroll onWheel}
 
     def initialize(native_element)
       @native = native_element

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)

spec/react/refs_callback_spec.rb

@@ -59,7 +59,36 @@ def render
 
       element = React.create_element(Foo)
       React::Test::Utils.render_into_document(element)
-      "#{Foo.bar.JS['nodeType']}" # aboids json serialisation errors by using "#{}"
+      "#{Foo.bar.JS['nodeType']}" # avoids json serialisation errors by using "#{}"
     end.to eq("1")
   end
+
+  it "works, even when the component is unmounted" do
+    # was a bug, on unmount 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