Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix navigation breaks on opening search page after reloading the attachment #28486

Merged
merged 12 commits into from
Oct 9, 2023
Merged

Fix navigation breaks on opening search page after reloading the attachment #28486

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ea4f6f
fix: 28241
dukenv0307 Sep 27, 2023
360d596
Merge branch 'main' into fix/28241
dukenv0307 Sep 29, 2023
610b1ae
fix lint
dukenv0307 Sep 29, 2023
9e7498a
Update src/components/PopoverWithoutOverlay/index.js
dukenv0307 Oct 6, 2023
48dc3b6
add explaination comment
dukenv0307 Oct 7, 2023
4378d80
fix lint
dukenv0307 Oct 7, 2023
77fcb70
Merge branch 'main' into fix/28241
dukenv0307 Oct 7, 2023
859bccf
add first render ref
dukenv0307 Oct 8, 2023
865b027
update comment
dukenv0307 Oct 8, 2023
ff5cd42
Update src/components/PopoverWithoutOverlay/index.js
dukenv0307 Oct 8, 2023
8a18248
Update src/components/PopoverWithoutOverlay/index.js
dukenv0307 Oct 8, 2023
7d4892a
fix lint
dukenv0307 Oct 8, 2023
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
15 changes: 13 additions & 2 deletions src/components/PopoverWithoutOverlay/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, {useRef} from 'react';
import {View} from 'react-native';
import {SafeAreaInsetsContext} from 'react-native-safe-area-context';
import {PopoverContext} from '../PopoverProvider';
Expand All @@ -8,9 +8,11 @@ import styles from '../../styles/styles';
import * as StyleUtils from '../../styles/StyleUtils';
import getModalStyles from '../../styles/getModalStyles';
import withWindowDimensions from '../withWindowDimensions';
import usePrevious from '../../hooks/usePrevious';

function Popover(props) {
const {onOpen, close} = React.useContext(PopoverContext);
const firstRenderRef = useRef(true);
const {modalStyle, modalContainerStyle, shouldAddTopSafeAreaMargin, shouldAddBottomSafeAreaMargin, shouldAddTopSafeAreaPadding, shouldAddBottomSafeAreaPadding} = getModalStyles(
'popover',
{
Expand All @@ -23,6 +25,8 @@ function Popover(props) {
props.outerStyle,
);

const prevIsVisible = usePrevious(props.isVisible);

dukenv0307 marked this conversation as resolved.
Show resolved Hide resolved
React.useEffect(() => {
if (props.isVisible) {
props.onModalShow();
Expand All @@ -37,11 +41,18 @@ function Popover(props) {
Modal.onModalDidClose();
}
Modal.willAlertModalBecomeVisible(props.isVisible);

// We prevent setting closeModal function to null when the component is invisible the first time it is rendered
if (prevIsVisible === props.isVisible && (!firstRenderRef.current || !props.isVisible)) {
firstRenderRef.current = false;
return;
}
firstRenderRef.current = false;
Modal.setCloseModal(props.isVisible ? () => props.onClose(props.anchorRef) : null);

// We want this effect to run strictly ONLY when isVisible prop changes
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [props.isVisible]);
}, [props.isVisible, prevIsVisible]);

if (!props.isVisible) {
return null;
Expand Down
Loading