Skip to content

Commit e646393

Browse files
committed
fix: consololidate allEvents 🧷
1 parent 44b19ec commit e646393

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/index.tsx

+4-10
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,14 @@ const ClickAwayListener: FunctionComponent<Props> = ({
118118
onClickAway(event);
119119
};
120120

121-
nodeDocument.addEventListener(mouseEvent, handleEvents);
122-
nodeDocument.addEventListener(touchEvent, handleEvents);
123-
nodeDocument.addEventListener(focusEvent, handleEvents);
124-
const customListeners = bodyEventsToCapture || [];
125-
customListeners.forEach((eventType) => {
121+
const defaultEvents = [mouseEvent, touchEvent, focusEvent];
122+
const allEvents = [...defaultEvents, ...(bodyEventsToCapture || [])];
123+
allEvents.forEach((eventType) => {
126124
nodeDocument.addEventListener(eventType, handleEvents);
127125
});
128126

129127
return () => {
130-
nodeDocument.removeEventListener(mouseEvent, handleEvents);
131-
nodeDocument.removeEventListener(touchEvent, handleEvents);
132-
nodeDocument.removeEventListener(focusEvent, handleEvents);
133-
134-
customListeners.forEach((eventType) => {
128+
allEvents.forEach((eventType) => {
135129
nodeDocument.removeEventListener(eventType, handleEvents);
136130
});
137131
};

0 commit comments

Comments
 (0)