Skip to content

[CP Staging] Refactor BottomDockedModal ESC and back button logic #59799

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

Merged
mollfpr merged 2 commits into from
Apr 8, 2025
Merged

[CP Staging] Refactor BottomDockedModal ESC and back button logic #59799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c24db03
Refactor BottomDockedModal to use isVisibleState for back button hand…
blazejkustra Apr 8, 2025
c332c6e
Remove unnecessary change
blazejkustra Apr 8, 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
14 changes: 8 additions & 6 deletions src/components/Modal/BottomDockedModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ function BottomDockedModal({
}, [deviceWidth, deviceWidthProp, deviceHeight, deviceHeightProp]);

const onBackButtonPressHandler = useCallback(() => {
if (isVisible) {
if (isVisibleState) {
onBackButtonPress();
return true;
}
return false;
}, [isVisible, onBackButtonPress]);
}, [isVisibleState, onBackButtonPress]);

const handleEscape = useCallback(
(e: KeyboardEvent) => {
Expand All @@ -79,7 +79,6 @@ function BottomDockedModal({
);

useEffect(() => {
const deviceEventListener = DeviceEventEmitter.addListener('didUpdateDimensions', handleDimensionsUpdate);
if (getPlatform() === CONST.PLATFORM.WEB) {
document.body.addEventListener('keyup', handleEscape, {capture: true});
} else {
Expand All @@ -92,10 +91,13 @@ function BottomDockedModal({
} else {
backHandlerListener.current?.remove();
}
deviceEventListener.remove();
};
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, []);
}, [handleEscape, onBackButtonPressHandler]);

useEffect(() => {
const deviceEventListener = DeviceEventEmitter.addListener('didUpdateDimensions', handleDimensionsUpdate);
return () => deviceEventListener.remove();
}, [handleDimensionsUpdate]);

useEffect(
() => () => {
Expand Down