Skip to content

Commit a86630b

Browse files
authored
Fix ESLint warnings (#2252)
1 parent d0861ac commit a86630b

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

client/components/tooltip/tooltip-base.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,16 @@ const useHideDelay = (
8181
onHideCallbackRef.current();
8282
};
8383

84-
document.addEventListener( 'click', handleDocumentClick );
84+
const { ownerDocument } = triggerRef.current;
85+
86+
ownerDocument.addEventListener( 'click', handleDocumentClick );
8587
rootElement.addEventListener(
8688
'wcstripe-tooltip-open',
8789
handleHideElement
8890
);
8991

9092
return () => {
91-
document.removeEventListener( 'click', handleDocumentClick );
93+
ownerDocument.removeEventListener( 'click', handleDocumentClick );
9294
rootElement.removeEventListener(
9395
'wcstripe-tooltip-open',
9496
handleHideElement
@@ -185,14 +187,22 @@ const TooltipBase = ( {
185187

186188
const debouncedCalculation = debounce( calculateTooltipPosition, 150 );
187189

188-
window.addEventListener( 'resize', debouncedCalculation );
189-
document.addEventListener( 'scroll', debouncedCalculation );
190+
const { ownerDocument } = wrapperRef.current;
191+
192+
ownerDocument.defaultView.addEventListener(
193+
'resize',
194+
debouncedCalculation
195+
);
196+
ownerDocument.addEventListener( 'scroll', debouncedCalculation );
190197

191198
return () => {
192-
window.removeEventListener( 'resize', debouncedCalculation );
193-
document.removeEventListener( 'scroll', debouncedCalculation );
199+
ownerDocument.defaultView.removeEventListener(
200+
'resize',
201+
debouncedCalculation
202+
);
203+
ownerDocument.removeEventListener( 'scroll', debouncedCalculation );
194204
};
195-
}, [ isTooltipVisible, maxWidth ] );
205+
}, [ isTooltipVisible, maxWidth, wrapperRef ] );
196206

197207
return (
198208
<>

client/utils/use-confirm-navigation.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@ const useConfirmNavigation = ( displayPrompt ) => {
2828
event.preventDefault();
2929
event.returnValue = '';
3030
};
31+
32+
// eslint-disable-next-line @wordpress/no-global-event-listener
3133
window.addEventListener( 'beforeunload', handler );
3234

3335
return () => {
36+
// eslint-disable-next-line @wordpress/no-global-event-listener
3437
window.removeEventListener( 'beforeunload', handler );
3538
};
3639
}, [] );

0 commit comments

Comments
 (0)