Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/components/Modal/BaseModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ function BaseModal(
const safeAreaInsets = useSafeAreaInsets();

const isVisibleRef = useRef(isVisible);
const hideModalCallbackRef = useRef<(callHideCallback: boolean) => void>();

const wasVisible = usePrevious(isVisible);

const uniqueModalId = useMemo(() => modalId ?? ComposerFocusManager.getId(), [modalId]);
Expand Down Expand Up @@ -144,13 +146,17 @@ function BaseModal(
};
}, [isVisible, wasVisible, onClose, type]);

useEffect(() => {
hideModalCallbackRef.current = hideModal;
}, [hideModal]);

useEffect(
() => () => {
// Only trigger onClose and setModalVisibility if the modal is unmounting while visible.
if (!isVisibleRef.current) {
return;
}
hideModal(true);
hideModalCallbackRef.current?.(true);
},
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
[],
Expand Down