Skip to content

Detach custom event listener #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 24, 2018
Merged

Detach custom event listener #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68fd5b5
Detach custom event listener
P0lip May 20, 2018
f14c6ca
Code review fixes
P0lip May 23, 2018
6d7b3fa
Add info about workaround
P0lip May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/decorators/customEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,27 @@ const setUntargetItems = function (currentTarget, targetArray) {
}
}

let customListener
const customListeners = {
id: '9b69f92e-d3fe-498b-b1b4-c5e63a51b0cf',
set (target, event, listener) {
if (this.id in target) {
const map = target[this.id]
map[event] = listener
} else {
// this is workaround for WeakMap, which is not supported in older browsers, such as IE
Object.defineProperty(target, this.id, {
configurable: true,
value: { [event]: listener }
})
}
},
get (target, event) {
const map = target[this.id]
if (map !== undefined) {
return map[event]
}
}
}

export default function (target) {
target.prototype.isCustomEvent = function (ele) {
Expand All @@ -48,8 +68,9 @@ export default function (target) {
const dataEventOff = ele.getAttribute('data-event-off') || eventOff

dataEvent.split(' ').forEach(event => {
ele.removeEventListener(event, customListener)
customListener = checkStatus.bind(this, dataEventOff)
ele.removeEventListener(event, customListeners.get(ele, event))
const customListener = checkStatus.bind(this, dataEventOff)
customListeners.set(ele, event, customListener)
ele.addEventListener(event, customListener, false)
})
if (dataEventOff) {
Expand All @@ -66,7 +87,7 @@ export default function (target) {
const dataEvent = event || ele.getAttribute('data-event')
const dataEventOff = eventOff || ele.getAttribute('data-event-off')

ele.removeEventListener(dataEvent, customListener)
ele.removeEventListener(dataEvent, customListeners.get(ele, event))
if (dataEventOff) ele.removeEventListener(dataEventOff, this.hideTooltip)
}
}
34 changes: 28 additions & 6 deletions standalone/react-tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,8 +1240,9 @@ exports.default = function (target) {
var dataEventOff = ele.getAttribute('data-event-off') || eventOff;

dataEvent.split(' ').forEach(function (event) {
ele.removeEventListener(event, customListener);
customListener = checkStatus.bind(_this, dataEventOff);
ele.removeEventListener(event, customListeners.get(ele, event));
var customListener = checkStatus.bind(_this, dataEventOff);
customListeners.set(ele, event, customListener);
ele.addEventListener(event, customListener, false);
});
if (dataEventOff) {
Expand All @@ -1261,11 +1262,13 @@ exports.default = function (target) {
var dataEvent = event || ele.getAttribute('data-event');
var dataEventOff = eventOff || ele.getAttribute('data-event-off');

ele.removeEventListener(dataEvent, customListener);
ele.removeEventListener(dataEvent, customListeners.get(ele, event));
if (dataEventOff) ele.removeEventListener(dataEventOff, this.hideTooltip);
};
};

function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

/**
* Custom events to control showing and hiding of tooltip
*
Expand Down Expand Up @@ -1302,7 +1305,26 @@ var setUntargetItems = function setUntargetItems(currentTarget, targetArray) {
}
};

var customListener = void 0;
var customListeners = {
id: '9b69f92e-d3fe-498b-b1b4-c5e63a51b0cf',
set: function set(target, event, listener) {
if (this.id in target) {
var map = target[this.id];
map[event] = listener;
} else {
Object.defineProperty(target, this.id, {
configurable: true,
value: _defineProperty({}, event, listener)
});
}
},
get: function get(target, event) {
var map = target[this.id];
if (map !== undefined) {
return map[event];
}
}
};

},{}],14:[function(require,module,exports){
'use strict';
Expand Down Expand Up @@ -1806,9 +1828,9 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
var content = void 0;
if (getContent) {
if (Array.isArray(getContent)) {
content = getContent[0] && getContent[0]();
content = getContent[0] && getContent[0](this.state.originTooltip);
} else {
content = getContent();
content = getContent(this.state.originTooltip);
}
}

Expand Down
Loading