-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Decompose DecisionModal inline state into useDecisionModal hook in MoneyReportHeader #86939
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.
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
rlinoz
merged 2 commits into
Expensify:main
from
callstack-internal:perf/decompose-decision-modal-moneyreportheader
Apr 2, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import React, {useState} from 'react'; | ||
| import type {DecisionModalProps} from '@components/DecisionModal'; | ||
| import DecisionModal from '@components/DecisionModal'; | ||
| import useResponsiveLayout from '@hooks/useResponsiveLayout'; | ||
| import {ModalActions} from './ModalContext'; | ||
| import type {ModalProps} from './ModalContext'; | ||
|
|
||
| type DecisionModalWrapperProps = ModalProps & Omit<DecisionModalProps, 'onClose' | 'onSecondOptionSubmit' | 'onFirstOptionSubmit' | 'isVisible' | 'isSmallScreenWidth'>; | ||
|
|
||
| function DecisionModalWrapper({closeModal, onModalHide, ...props}: DecisionModalWrapperProps) { | ||
| const [isVisible, setIsVisible] = useState(true); | ||
| const [closeAction, setCloseAction] = useState<typeof ModalActions.CONFIRM | typeof ModalActions.CLOSE>(ModalActions.CLOSE); | ||
| // We need to use isSmallScreenWidth here because the DecisionModal breaks in RHP with shouldUseNarrowLayout. | ||
| // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth | ||
| const {isSmallScreenWidth} = useResponsiveLayout(); | ||
|
|
||
| const handleFirstOption = () => { | ||
| setCloseAction(ModalActions.CONFIRM); | ||
| setIsVisible(false); | ||
| }; | ||
|
|
||
| const handleSecondOption = () => { | ||
| setCloseAction(ModalActions.CLOSE); | ||
| setIsVisible(false); | ||
| }; | ||
|
|
||
| const handleModalHide = () => { | ||
| if (isVisible) { | ||
| return; | ||
| } | ||
| closeModal({action: closeAction}); | ||
| onModalHide?.(); | ||
| }; | ||
|
|
||
| return ( | ||
| <DecisionModal | ||
| // Spreading is needed to forward all modal configuration props from the wrapper to the underlying DecisionModal. | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| {...props} | ||
| isVisible={isVisible} | ||
| isSmallScreenWidth={isSmallScreenWidth} | ||
| onFirstOptionSubmit={handleFirstOption} | ||
| onSecondOptionSubmit={handleSecondOption} | ||
| onClose={handleSecondOption} | ||
| onModalHide={handleModalHide} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| export default DecisionModalWrapper; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import DecisionModalWrapper from '@components/Modal/Global/DecisionModalWrapper'; | ||
| import type {ModalProps} from '@components/Modal/Global/ModalContext'; | ||
| import {useModal} from '@components/Modal/Global/ModalContext'; | ||
|
|
||
| type DecisionModalOptions = Omit<React.ComponentProps<typeof DecisionModalWrapper>, keyof ModalProps>; | ||
|
|
||
| const useDecisionModal = () => { | ||
| const context = useModal(); | ||
|
|
||
| const showDecisionModal = (options: DecisionModalOptions) => { | ||
| return context.showModal({ | ||
| component: DecisionModalWrapper, | ||
| props: { | ||
| shouldHandleNavigationBack: true, | ||
| ...options, | ||
| }, | ||
| }); | ||
| }; | ||
|
|
||
| return { | ||
| ...context, | ||
| closeModal: () => context.closeModal(), | ||
| showDecisionModal, | ||
| }; | ||
| }; | ||
|
|
||
| export default useDecisionModal; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.