diff --git a/src/overflowMenu/vendor/Menu.js b/src/overflowMenu/vendor/Menu.js index 75fa76d..28ab707 100644 --- a/src/overflowMenu/vendor/Menu.js +++ b/src/overflowMenu/vendor/Menu.js @@ -240,15 +240,15 @@ export class Menu extends React.Component { }; attachListeners = () => { - BackHandler.addEventListener('hardwareBackPress', this.handleDismiss); - Dimensions.addEventListener('change', this.handleDismiss); + this.backPressListener = BackHandler.addEventListener('hardwareBackPress', this.handleDismiss); + this.dimensionChangeListener = Dimensions.addEventListener('change', this.handleDismiss); this.isBrowser() && document.addEventListener('keyup', this.handleKeypress); }; removeListeners = () => { - BackHandler.removeEventListener('hardwareBackPress', this.handleDismiss); - Dimensions.removeEventListener('change', this.handleDismiss); + this?.backPressListener?.remove(); + this?.dimensionChangeListener?.remove(); this.isBrowser() && document.removeEventListener('keyup', this.handleKeypress); };