Interactive interface for browsing global, full-resolution satellite imagery
Correctly un-attach event listeners (#6829)
christof-wittreich6253b9356d70
diff --git a/web/js/mapUI/components/create-map/createMap.test.js b/web/js/mapUI/components/create-map/createMap.test.jsindex e8561c44f..4f4586f3a 100644--- a/web/js/mapUI/components/create-map/createMap.test.js+++ b/web/js/mapUI/components/create-map/createMap.test.js@@ -24,6 +24,7 @@ jest.mock('../../../util/util', () => ({events: {trigger: jest.fn(),on: jest.fn(),+ off: jest.fn(),},},}));diff --git a/web/js/mapUI/components/granule-hover/granuleHover.js b/web/js/mapUI/components/granule-hover/granuleHover.jsindex 32a7c37a4..d91c8b4d9 100644--- a/web/js/mapUI/components/granule-hover/granuleHover.js+++ b/web/js/mapUI/components/granule-hover/granuleHover.js@@ -1,4 +1,5 @@import PropTypes from 'prop-types';+import { useEffect } from 'react';import { connect } from 'react-redux';import { getActiveGranuleFootPrints } from '../../../modules/layers/selectors';import { GRANULE_HOVERED, GRANULE_HOVER_UPDATE } from '../../../util/constants';@@ -13,6 +14,16 @@ function GranuleHover(props) {ui,} = props;+ useEffect(() => {+ events.on(GRANULE_HOVERED, onGranuleHover);+ events.on(GRANULE_HOVER_UPDATE, onGranuleHoverUpdate);++ return () => {+ events.off(GRANULE_HOVERED, onGranuleHover);+ events.off(GRANULE_HOVER_UPDATE, onGranuleHoverUpdate);+ };+ }, []);+const onGranuleHover = (platform, date, update) => {const proj = ui.selected.getView().getProjection().getCode();@@ -36,9 +47,6 @@ function GranuleHover(props) {granuleFootprints[proj].updateFootprint(geometry, date);};- events.on(GRANULE_HOVERED, onGranuleHover);- events.on(GRANULE_HOVER_UPDATE, onGranuleHoverUpdate);-return null;}diff --git a/web/js/mapUI/components/granule-hover/granuleHover.test.js b/web/js/mapUI/components/granule-hover/granuleHover.test.jsindex 76c46c355..479421947 100644--- a/web/js/mapUI/components/granule-hover/granuleHover.test.js+++ b/web/js/mapUI/components/granule-hover/granuleHover.test.js@@ -10,6 +10,7 @@ jest.mock('../../../util/util', () => ({default: {events: {on: jest.fn(),+ off: jest.fn(),},},}));diff --git a/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.js b/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.jsindex 28f14ed96..442066f06 100644--- a/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.js+++ b/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.js@@ -48,11 +48,21 @@ function MouseMoveEvents(props) {throttledOnMouseMove(mouseMove);}, [mouseMove]);- events.on(MAP_MOUSE_MOVE, setMouseMove);- events.on(MAP_MOUSE_OUT, (e) => {- throttledOnMouseMove.cancel();- ui.runningdata.clearAll();- });+ useEffect(() => {+ events.on(MAP_MOUSE_MOVE, setMouseMove);+ events.on(MAP_MOUSE_OUT, (e) => {+ throttledOnMouseMove.cancel();+ ui.runningdata.clearAll();+ });++ return () => {+ events.off(MAP_MOUSE_MOVE, setMouseMove);+ events.off(MAP_MOUSE_OUT, (e) => {+ throttledOnMouseMove.cancel();+ ui.runningdata.clearAll();+ });+ };+ }, []);return null;}diff --git a/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.test.js b/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.test.jsindex 8de5c302a..183e65116 100644--- a/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.test.js+++ b/web/js/mapUI/components/mouse-move-events/mouseMoveEvents.test.js@@ -12,6 +12,7 @@ jest.mock('../../../util/util', () => ({default: {events: {on: jest.fn(),+ off: jest.fn(),},},}));