From f18b15241ab708f8c25a11937a875e361e9f1221 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 8 Nov 2023 12:34:10 -0600 Subject: Add modal state provider, replace usage except methods (#1833) * Add modal state provider, replace usage except methods * Replace easy spots * Fix sticky spots * Replace final usages * Memorize context objects * Add more warnings --- src/view/shell/index.web.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/view/shell/index.web.tsx') diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx index 1731ea247..10489489e 100644 --- a/src/view/shell/index.web.tsx +++ b/src/view/shell/index.web.tsx @@ -22,11 +22,13 @@ import { useSetDrawerOpen, useOnboardingState, } from '#/state/shell' +import {useModalControls} from '#/state/modals' const ShellInner = observer(function ShellInnerImpl() { const store = useStores() const isDrawerOpen = useIsDrawerOpen() const setDrawerOpen = useSetDrawerOpen() + const {closeModal} = useModalControls() const onboardingState = useOnboardingState() const {isDesktop, isMobile} = useWebMediaQueries() const navigator = useNavigation() @@ -35,9 +37,10 @@ const ShellInner = observer(function ShellInnerImpl() { useEffect(() => { navigator.addListener('state', () => { setDrawerOpen(false) + closeModal() store.shell.closeAnyActiveElement() }) - }, [navigator, store.shell, setDrawerOpen]) + }, [navigator, store.shell, setDrawerOpen, closeModal]) const showBottomBar = isMobile && !onboardingState.isActive const showSideNavs = -- cgit 1.4.1