Adding remove listener to DarkMode HOC

WordPress · Aug 26, 2019 · 1380ab6 · 1380ab6
1 parent 8d6942f
commit 1380ab6
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/packages/components/src/mobile/dark-mode/index.native.js b/packages/components/src/mobile/dark-mode/index.native.js
@@ -29,10 +29,16 @@ export function withTheme( WrappedComponent ) {
 			};
 		}
 
+		onModeChanged( newMode ) {
+			this.setState( { mode: newMode } );
+		}
+
 		componentDidMount() {
-			eventEmitter.on( 'currentModeChanged', ( newMode ) => {
-				this.setState( { mode: newMode } );
-			} );
+			this.subscription = eventEmitter.on( 'currentModeChanged', this.onModeChanged );
+		}
+
+		componentWillUnmount() {
+			eventEmitter.removeListener( 'currentModeChanged', this.onModeChanged );
 		}
 
 		render() {