Duck type fibers to check for disable prop

Author: sebmarkbage

scripts/fiber/tests-failing.txt

@@ -55,16 +55,6 @@ src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
 src/renderers/dom/shared/__tests__/ReactEventListener-test.js
 * should batch between handlers from different roots
 
-src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
-* should not forward clicks when it starts out disabled
-* should not forward clicks when it becomes disabled
-* should not forward clicks when it starts out disabled
-* should not forward clicks when it becomes disabled
-* should not forward clicks when it starts out disabled
-* should not forward clicks when it becomes disabled
-* should not forward clicks when it starts out disabled
-* should not forward clicks when it becomes disabled
-
 src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
 * should control a value in reentrant events
 

scripts/fiber/tests-passing.txt

@@ -706,16 +706,24 @@ src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
 * A non-interactive tags click when disabled
 * A non-interactive tags clicks bubble when disabled
 * should forward clicks when it starts out not disabled
+* should not forward clicks when it starts out disabled
 * should forward clicks when it becomes not disabled
+* should not forward clicks when it becomes disabled
 * should work correctly if the listener is changed
 * should forward clicks when it starts out not disabled
+* should not forward clicks when it starts out disabled
 * should forward clicks when it becomes not disabled
+* should not forward clicks when it becomes disabled
 * should work correctly if the listener is changed
 * should forward clicks when it starts out not disabled
+* should not forward clicks when it starts out disabled
 * should forward clicks when it becomes not disabled
+* should not forward clicks when it becomes disabled
 * should work correctly if the listener is changed
 * should forward clicks when it starts out not disabled
+* should not forward clicks when it starts out disabled
 * should forward clicks when it becomes not disabled
+* should not forward clicks when it becomes disabled
 * should work correctly if the listener is changed
 * does not add a local click to interactive elements
 * adds a local click listener to non-interactive elements

src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js

@@ -12,6 +12,8 @@
 
 'use strict';
 
+import type { Fiber } from 'ReactFiber';
+
 var EventPropagators = require('EventPropagators');
 var SyntheticAnimationEvent = require('SyntheticAnimationEvent');
 var SyntheticClipboardEvent = require('SyntheticClipboardEvent');
@@ -145,12 +147,23 @@ function isInteractive(tag) {
   );
 }
 
-function shouldPreventMouseEvent(inst) {
+function shouldPreventMouseEvent(inst : ReactInstance | Fiber) {
   if (inst) {
-    var disabled = inst._currentElement && inst._currentElement.props.disabled;
-
-    if (disabled) {
-      return isInteractive(inst._tag);
+    if (typeof inst.tag === 'number') {
+      // TODO: This is only safe if this is the current Fiber but TreeTraversal
+      // is not currently guaranteed to give us the current instance.
+      const fiber = (inst : any);
+      const disabled = fiber.memoizedProps.disabled;
+      if (disabled) {
+        return isInteractive(fiber.type);
+      }
+    } else {
+      const internalInstance : ReactInstance = (inst : any);
+      const disabled = internalInstance._currentElement &&
+                       internalInstance._currentElement.props.disabled;
+      if (disabled) {
+        return isInteractive(internalInstance._tag);
+      }
     }
   }
 
@@ -163,7 +176,7 @@ var SimpleEventPlugin: PluginModule<MouseEvent> = {
 
   extractEvents: function(
     topLevelType: TopLevelTypes,
-    targetInst: ReactInstance,
+    targetInst: ReactInstance | Fiber,
     nativeEvent: MouseEvent,
     nativeEventTarget: EventTarget,
   ): null | ReactSyntheticEvent {