Skip to content

Picker - ExpandableOverlay imperativeCloseExpandable #3536

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

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Picker - ExpandableOverlay imperativeCloseExpandable #3536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
140e4d4
implement dismiss state management for closeExpandable control
adids1221 Feb 26, 2025
1f2b3a7
add imperativeCloseExpandable for better dismiss handling
adids1221 Mar 20, 2025
c637aa6
remove dismiss state management old solution
adids1221 Mar 23, 2025
cf5425c
Merge branch 'master' into fix/Picker_onDismiss_called_twice
adids1221 Mar 30, 2025
2a26b3e
Merge branch 'master' into fix/Picker_onDismiss_called_twice
adids1221 May 8, 2025
faeeec0
Rename imperativeCloseExpandable to dismissModal for clarity
adids1221 May 8, 2025
7b71f30
Update dismissModal to include focusAccessibility for improved access…
adids1221 May 8, 2025
fa0540b
Merge branch 'master' into fix/Picker_onDismiss_called_twice
adids1221 May 8, 2025
c82b78a
closeExpandable using dismissModal
adids1221 May 19, 2025
f68bc74
Merge branch 'master' into fix/Picker_onDismiss_called_twice
M-i-k-e-l Jun 14, 2025
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 src/components/picker/__tests__/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,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
23 changes: 19 additions & 4 deletions src/incubator/expandableOverlay/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ import DialogOld from '../../components/dialog';
import DialogNew, {DialogMigrationProps} from '../dialog';
import {Colors} from 'style';

enum DismissState {
IDLE = 'idle',
DISMISSING = 'dismissing',
DISMISSED = 'dismissed'
}

export interface ExpandableOverlayMethods {
openExpandable: () => void;
closeExpandable: () => void;
Expand Down Expand Up @@ -69,6 +75,7 @@ const ExpandableOverlay = (props: ExpandableOverlayProps, ref: any) => {
} = props;
const [visible, setExpandableVisible] = useState(false);
const containerRef = useRef(null);
const [dismissState, setDismissState] = useState<DismissState>(DismissState.IDLE);

const focusAccessibility = useCallback(() => {
const reactTag = findNodeHandle(containerRef.current);
Expand All @@ -79,14 +86,22 @@ const ExpandableOverlay = (props: ExpandableOverlayProps, ref: any) => {

const openExpandable = useCallback(() => {
setExpandableVisible(true);
setDismissState(DismissState.IDLE);
onPress?.(props);
}, [onPress, customValue]);

const closeExpandable = useCallback(() => {
setExpandableVisible(false);
focusAccessibility();
useDialog ? dialogProps?.onDismiss?.() : modalProps?.onDismiss?.();
}, [useDialog, dialogProps?.onDismiss, modalProps?.onDismiss, focusAccessibility]);
if (dismissState === DismissState.IDLE) {
setDismissState(DismissState.DISMISSING);
setExpandableVisible(false);
focusAccessibility();
useDialog ? dialogProps?.onDismiss?.() : modalProps?.onDismiss?.();
setDismissState(DismissState.DISMISSED);
} else if (dismissState === DismissState.DISMISSING) {
setExpandableVisible(false);
focusAccessibility();
}
}, [dismissState, useDialog, dialogProps?.onDismiss, modalProps?.onDismiss, focusAccessibility]);

const toggleExpandable = useCallback(() => (visible ? closeExpandable() : openExpandable()),
[visible, openExpandable, closeExpandable]);
Expand Down