Skip to content

fix: prevent ExpandableOverlay onDismiss callback from being called twice #3916

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

Open
adids1221 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

fix: prevent ExpandableOverlay onDismiss callback from being called twice #3916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/react-native-ui-lib/src/components/picker/__tests__/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ describe('Picker', () => {
expect(driver.isOpen()).toBeTruthy();
driver.cancel();
expect(driver.isOpen()).toBeFalsy();
expect(onDismiss).toHaveBeenCalledTimes(2); // TODO: this should be 1
expect(onDismiss).toHaveBeenCalledTimes(1);
});

// TODO: this test is not passing yet
Expand Down
11 changes: 8 additions & 3 deletions packages/react-native-ui-lib/src/incubator/expandableOverlay/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,16 @@ const ExpandableOverlay = (props: ExpandableOverlayProps, ref: any) => {
onPress?.(props);
}, [onPress, customValue]);

const closeExpandable = useCallback(() => {
const dismissOverlay = useCallback(() => {
setExpandableVisible(false);
focusAccessibility();
}, [focusAccessibility]);

const closeExpandable = useCallback(() => {
dismissOverlay();
useDialog ? dialogProps?.onDismiss?.() : modalProps?.onDismiss?.();
}, [useDialog, dialogProps?.onDismiss, modalProps?.onDismiss, focusAccessibility]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [dismissOverlay, dialogProps?.onDismiss, modalProps?.onDismiss]);

const toggleExpandable = useCallback(() => (visible ? closeExpandable() : openExpandable()),
[visible, openExpandable, closeExpandable]);
Expand All @@ -105,7 +110,7 @@ const ExpandableOverlay = (props: ExpandableOverlayProps, ref: any) => {
overlayBackgroundColor={Colors.$backgroundDefault}
{...modalProps}
visible={visible}
onDismiss={closeExpandable}
onDismiss={dismissOverlay}
onRequestClose={closeExpandable}
onBackgroundPress={closeExpandable}
>
Expand Down
Loading