Merge pull request facebook#1536 from spicyj/facebookgh-1169

Attach empty onclick listener to each node

Author: yungsters

src/browser/eventPlugins/DefaultEventPluginOrder.js

@@ -38,8 +38,7 @@ var DefaultEventPluginOrder = [
  keyOf({SelectEventPlugin: null}),
  keyOf({CompositionEventPlugin: null}),
  keyOf({BeforeInputEventPlugin: null}),
- keyOf({AnalyticsEventPlugin: null}),
- keyOf({MobileSafariClickEventPlugin: null})
+ keyOf({AnalyticsEventPlugin: null})
 ];
 
 module.exports = DefaultEventPluginOrder;

src/browser/eventPlugins/MobileSafariClickEventPlugin.js

@@ -19,8 +19,10 @@
 "use strict";
 
 var EventConstants = require('EventConstants');
+var EventListener = require('EventListener');
 var EventPluginUtils = require('EventPluginUtils');
 var EventPropagators = require('EventPropagators');
+var ReactMount = require('ReactMount');
 var SyntheticClipboardEvent = require('SyntheticClipboardEvent');
 var SyntheticEvent = require('SyntheticEvent');
 var SyntheticFocusEvent = require('SyntheticFocusEvent');
@@ -31,6 +33,7 @@ var SyntheticTouchEvent = require('SyntheticTouchEvent');
 var SyntheticUIEvent = require('SyntheticUIEvent');
 var SyntheticWheelEvent = require('SyntheticWheelEvent');
 
+var emptyFunction = require('emptyFunction');
 var invariant = require('invariant');
 var keyOf = require('keyOf');
 
@@ -293,6 +296,9 @@ for (var topLevelType in topLevelEventsToDispatchConfig) {
  topLevelEventsToDispatchConfig[topLevelType].dependencies = [topLevelType];
 }
 
+var ON_CLICK_KEY = keyOf({onClick: null});
+var onClickListeners = {};
+
 var SimpleEventPlugin = {
 
  eventTypes: eventTypes,
@@ -412,6 +418,23 @@ var SimpleEventPlugin = {
  );
  EventPropagators.accumulateTwoPhaseDispatches(event);
  return event;
+ },
+
+ didPutListener: function(id, registrationName, listener) {
+ // Mobile Safari does not fire properly bubble click events on
+ // non-interactive elements, which means delegated click listeners do not
+ // fire. The workaround for this bug involves attaching an empty click
+ // listener on the target node.
+ if (registrationName === ON_CLICK_KEY) {
+ var node = ReactMount.getNode(id);
+ onClickListeners[id] = EventListener.listen(node, 'click', emptyFunction);
+ }
+ },
+
+ willDeleteListener: function(id, registrationName) {
+ if (registrationName === ON_CLICK_KEY) {
+ onClickListeners[id].remove();
+ }
  }
 
 };

src/browser/eventPlugins/SimpleEventPlugin.js

@@ -26,7 +26,6 @@ var DefaultEventPluginOrder = require('DefaultEventPluginOrder');
 var EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');
 var ExecutionEnvironment = require('ExecutionEnvironment');
 var HTMLDOMPropertyConfig = require('HTMLDOMPropertyConfig');
-var MobileSafariClickEventPlugin = require('MobileSafariClickEventPlugin');
 var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');
 var ReactComponentBrowserEnvironment =
  require('ReactComponentBrowserEnvironment');
@@ -71,7 +70,6 @@ function inject() {
  EnterLeaveEventPlugin: EnterLeaveEventPlugin,
  ChangeEventPlugin: ChangeEventPlugin,
  CompositionEventPlugin: CompositionEventPlugin,
- MobileSafariClickEventPlugin: MobileSafariClickEventPlugin,
  SelectEventPlugin: SelectEventPlugin,
  BeforeInputEventPlugin: BeforeInputEventPlugin
  });

src/browser/ui/ReactDefaultInjection.js

@@ -343,6 +343,26 @@ describe('ReactDOMComponent', function() {
  'properties to values, not a string.'
  );
  });
+
+ it("should execute custom event plugin listening behavior", function() {
+ var React = require('React');
+ var SimpleEventPlugin = require('SimpleEventPlugin');
+
+ SimpleEventPlugin.didPutListener = mocks.getMockFunction();
+ SimpleEventPlugin.willDeleteListener = mocks.getMockFunction();
+
+ var container = document.createElement('div');
+ React.renderComponent(
+ <div onClick={() => true} />,
+ container
+ );
+
+ expect(SimpleEventPlugin.didPutListener.mock.calls.length).toBe(1);
+
+ React.unmountComponentAtNode(container);
+
+ expect(SimpleEventPlugin.willDeleteListener.mock.calls.length).toBe(1);
+ });
  });
 
  describe('updateComponent', function() {

src/browser/ui/__tests__/ReactDOMComponent-test.js

@@ -171,6 +171,12 @@ var EventPluginHub = {
  var bankForRegistrationName =
  listenerBank[registrationName] || (listenerBank[registrationName] = {});
  bankForRegistrationName[id] = listener;
+
+ var PluginModule =
+ EventPluginRegistry.registrationNameModules[registrationName];
+ if (PluginModule && PluginModule.didPutListener) {
+ PluginModule.didPutListener(id, registrationName, listener);
+ }
  },
 
  /**
@@ -190,7 +196,14 @@ var EventPluginHub = {
  * @param {string} registrationName Name of listener (e.g. `onClick`).
  */
  deleteListener: function(id, registrationName) {
+ var PluginModule =
+ EventPluginRegistry.registrationNameModules[registrationName];
+ if (PluginModule && PluginModule.willDeleteListener) {
+ PluginModule.willDeleteListener(id, registrationName);
+ }
+
  var bankForRegistrationName = listenerBank[registrationName];
+ // TODO: This should never be null -- when is it?
  if (bankForRegistrationName) {
  delete bankForRegistrationName[id];
  }
@@ -203,6 +216,16 @@ var EventPluginHub = {
  */
  deleteAllListeners: function(id) {
  for (var registrationName in listenerBank) {
+ if (!listenerBank[registrationName][id]) {
+ continue;
+ }
+
+ var PluginModule =
+ EventPluginRegistry.registrationNameModules[registrationName];
+ if (PluginModule && PluginModule.willDeleteListener) {
+ PluginModule.willDeleteListener(id, registrationName);
+ }
+
  delete listenerBank[registrationName][id];
  }
  },