From eb0ee6ae1ceea0115e8940a9aa117306e3844694 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Thu, 21 Mar 2024 12:06:39 -0500
Subject: [PATCH] Fix dialogs state references, fixes Android back button
(#3314)
* Fix active/open dialogs state
* Improve close logic
---
src/state/dialogs/index.tsx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/state/dialogs/index.tsx b/src/state/dialogs/index.tsx
index 951105a5..26bb6792 100644
--- a/src/state/dialogs/index.tsx
+++ b/src/state/dialogs/index.tsx
@@ -1,5 +1,6 @@
import React from 'react'
import {SharedValue, useSharedValue} from 'react-native-reanimated'
+
import {DialogControlRefProps} from '#/components/Dialog'
import {Provider as GlobalDialogsProvider} from '#/components/dialogs/Context'
@@ -53,7 +54,10 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
>('auto')
const closeAllDialogs = React.useCallback(() => {
- activeDialogs.current.forEach(dialog => dialog.current.close())
+ openDialogs.current.forEach(id => {
+ const dialog = activeDialogs.current.get(id)
+ if (dialog) dialog.current.close()
+ })
return openDialogs.current.size > 0
}, [])
@@ -74,15 +78,11 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
const context = React.useMemo<IDialogContext>(
() => ({
- activeDialogs: {
- current: new Map(),
- },
- openDialogs: {
- current: new Set(),
- },
+ activeDialogs,
+ openDialogs,
importantForAccessibility,
}),
- [importantForAccessibility],
+ [importantForAccessibility, activeDialogs, openDialogs],
)
const controls = React.useMemo(
() => ({closeAllDialogs, setDialogIsOpen}),