Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Fix alerts not displaying by removing hidden attribute from AlertDropdown wrapper and making notification count reactive via MutationObserver. (#6888)

vicgonzalez2508bd3a5065e3
diff --git a/web/js/containers/alertDropdown.js b/web/js/containers/alertDropdown.js
index b2dec45f9..ce37e8797 100644
--- a/web/js/containers/alertDropdown.js
+++ b/web/js/containers/alertDropdown.js
@@ -1,19 +1,32 @@
-import { useState, useRef } from 'react';
-import { useSelector } from 'react-redux';
+import {
+ useState, useRef, useEffect, useCallback,
+} from 'react';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import Alerts from './alerts';
export default function AlertDropdown(isTourActive) {
const [dropdownOpen, setDropdownOpen] = useState(false);
+ const [notifications, setNotifications] = useState(0);
const containerRef = useRef(null);
- const notifications = containerRef?.current?.children.length;
+ const observerRef = useRef(null);
+
+ const updateNotifications = useCallback(() => {
+ setNotifications(containerRef.current?.children.length || 0);
+ }, []);
+
+ useEffect(() => {
+ const node = containerRef.current;
+ if (!node) return;
+ updateNotifications();
+ observerRef.current = new MutationObserver(updateNotifications);
+ observerRef.current.observe(node, { childList: true });
+ return () => observerRef.current?.disconnect();
+ }, []);
+
const toggle = () => setDropdownOpen((prevState) => !prevState);
- const { isTourActive: tourActive } = isTourActive;
- const isDistractionFreeModeActive = useSelector((state) => state.ui.isDistractionFreeModeActive);
- const isMobile = useSelector((state) => state.screenSize.isMobileDevice);
return (
- <div className="wv-alert-dropdown" hidden={isDistractionFreeModeActive || tourActive || isMobile}>
+ <div className="wv-alert-dropdown">
<button type="button" hidden={notifications <= 1} onClick={toggle}>
<FontAwesomeIcon
icon="exclamation-triangle"
diff --git a/web/js/containers/alertDropdown.test.js b/web/js/containers/alertDropdown.test.js
index 81d55c4ed..7e4e7a276 100644
--- a/web/js/containers/alertDropdown.test.js
+++ b/web/js/containers/alertDropdown.test.js
@@ -39,21 +39,21 @@ describe('AlertDropdown', () => {
expect(wrapper).not.toHaveAttribute('hidden');
});
- it('hides the wrapper when distraction free mode is active', () => {
+ it('does not hide the wrapper when distraction free mode is active', () => {
mockState = makeState({ ui: { isDistractionFreeModeActive: true } });
const { container } = render(<AlertDropdown isTourActive={false} />);
- expect(container.querySelector('.wv-alert-dropdown')).toHaveAttribute('hidden');
+ expect(container.querySelector('.wv-alert-dropdown')).not.toHaveAttribute('hidden');
});
- it('hides the wrapper when the tour is active', () => {
+ it('does not hide the wrapper when the tour is active', () => {
const { container } = render(<AlertDropdown isTourActive />);
- expect(container.querySelector('.wv-alert-dropdown')).toHaveAttribute('hidden');
+ expect(container.querySelector('.wv-alert-dropdown')).not.toHaveAttribute('hidden');
});
- it('hides the wrapper on mobile devices', () => {
+ it('does not hide the wrapper on mobile devices', () => {
mockState = makeState({ screenSize: { isMobileDevice: true } });
const { container } = render(<AlertDropdown isTourActive={false} />);
- expect(container.querySelector('.wv-alert-dropdown')).toHaveAttribute('hidden');
+ expect(container.querySelector('.wv-alert-dropdown')).not.toHaveAttribute('hidden');
});
it('renders Alerts inside the alert container', () => {