add passive event listener options to removeEventListener

Author: bdwain

dist/react-onclickoutside.js

@@ -127,6 +127,22 @@ var handlersMap = {};
 var enabledInstances = {};
 var touchEvents = ['touchstart', 'touchmove'];
 var IGNORE_CLASS_NAME = 'ignore-react-onclickoutside';
+/**
+ * Options for addEventHandler and removeEventHandler
+ */
+
+function getEventHandlerOptions(instance, eventName) {
+  var handlerOptions = null;
+  var isTouchEvent = touchEvents.indexOf(eventName) !== -1;
+
+  if (isTouchEvent && passiveEventSupport) {
+    handlerOptions = {
+      passive: !instance.props.preventDefault
+    };
+  }
+
+  return handlerOptions;
+}
 /**
  * This function generates the HOC function that you'll use
  * in order to impart onOutsideClick listening to an
@@ -135,6 +151,7 @@ var IGNORE_CLASS_NAME = 'ignore-react-onclickoutside';
  * onClickOutsideHOC function defined inside setupHOC().
  */
 
+
 function onClickOutsideHOC(WrappedComponent, config) {
   var _class, _temp;
 
@@ -209,16 +226,7 @@ function onClickOutsideHOC(WrappedComponent, config) {
         };
 
         events.forEach(function (eventName) {
-          var handlerOptions = null;
-          var isTouchEvent = touchEvents.indexOf(eventName) !== -1;
-
-          if (isTouchEvent && passiveEventSupport) {
-            handlerOptions = {
-              passive: !_this.props.preventDefault
-            };
-          }
-
-          document.addEventListener(eventName, handlersMap[_this._uid], handlerOptions);
+          document.addEventListener(eventName, handlersMap[_this._uid], getEventHandlerOptions(_this, eventName));
         });
       };
 
@@ -234,7 +242,7 @@ function onClickOutsideHOC(WrappedComponent, config) {
           }
 
           events.forEach(function (eventName) {
-            return document.removeEventListener(eventName, fn);
+            return document.removeEventListener(eventName, fn, getEventHandlerOptions(_this, eventName));
           });
           delete handlersMap[_this._uid];
         }

dist/react-onclickoutside.min.js

@@ -12,6 +12,19 @@ const enabledInstances = {};
 const touchEvents = ['touchstart', 'touchmove'];
 export const IGNORE_CLASS_NAME = 'ignore-react-onclickoutside';
 
+/**
+ * Options for addEventHandler and removeEventHandler
+ */
+function getEventHandlerOptions(instance, eventName) {
+  let handlerOptions = null;
+  const isTouchEvent = touchEvents.indexOf(eventName) !== -1;
+
+  if (isTouchEvent && passiveEventSupport) {
+    handlerOptions = { passive: !instance.props.preventDefault };
+  }
+  return handlerOptions;
+}
+
 /**
  * This function generates the HOC function that you'll use
  * in order to impart onOutsideClick listening to an
@@ -154,14 +167,7 @@ export default function onClickOutsideHOC(WrappedComponent, config) {
       };
 
       events.forEach(eventName => {
-        let handlerOptions = null;
-        const isTouchEvent = touchEvents.indexOf(eventName) !== -1;
-
-        if (isTouchEvent && passiveEventSupport) {
-          handlerOptions = { passive: !this.props.preventDefault };
-        }
-
-        document.addEventListener(eventName, handlersMap[this._uid], handlerOptions);
+        document.addEventListener(eventName, handlersMap[this._uid], getEventHandlerOptions(this, eventName));
       });
     };
 
@@ -178,7 +184,9 @@ export default function onClickOutsideHOC(WrappedComponent, config) {
         if (!events.forEach) {
           events = [events];
         }
-        events.forEach(eventName => document.removeEventListener(eventName, fn));
+        events.forEach(eventName =>
+          document.removeEventListener(eventName, fn, getEventHandlerOptions(this, eventName)),
+        );
         delete handlersMap[this._uid];
       }
     };