rewrite BaseModal to a functional component#25672
Merged
marcaaron merged 8 commits intoExpensify:mainfrom Aug 25, 2023
Merged
Conversation
rezkiy37
reviewed
Aug 22, 2023
rezkiy37
reviewed
Aug 22, 2023
rezkiy37
reviewed
Aug 22, 2023
Contributor
rezkiy37
left a comment
rezkiy37
left a comment
There was a problem hiding this comment.
Left a few comments, besides LGTM.
gedu
reviewed
Aug 22, 2023
gedu
reviewed
Aug 22, 2023
gedu
reviewed
Aug 22, 2023
|
@ Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
1 task
Contributor
Author
Reviewer Checklist
Screenshots/VideosWebbasemodal_web-compressed.movMobile Web - ChromeMobile Web - SafariDesktopbasemodal_desktop-compressed.moviOSbasemodal_ios-compressed.mp4Androidbasemodal_android-compressed.webm |
marcaaron
requested review from
rushatgabhane
and removed request for
rushatgabhane
marcaaron
previously approved these changes
Aug 24, 2023
Contributor
marcaaron
left a comment
marcaaron
left a comment
There was a problem hiding this comment.
Changes LGTM - there is a conflict.
Contributor
|
Thanks for the quick work @JKobrynski 🙇 |
Contributor
Author
|
@marcaaron conflicts resolved 😄 |
marcaaron
approved these changes
Aug 25, 2023
|
Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks! |
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
6 tasks
Comment on lines
+78
to
+94
| useEffect(() => { | ||
| Modal.willAlertModalBecomeVisible(isVisible); | ||
|
|
||
| // To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu | ||
| Modal.setCloseModal(isVisible ? onClose : null); | ||
|
|
||
| return () => { | ||
| // Only trigger onClose and setModalVisibility if the modal is unmounting while visible. | ||
| if (isVisible) { | ||
| hideModal(true); | ||
| Modal.willAlertModalBecomeVisible(false); | ||
| } | ||
|
|
||
| // To prevent closing any modal already unmounted when this modal still remains as visible state | ||
| Modal.setCloseModal(null); | ||
| }; | ||
| }, [hideModal, isVisible, onClose]); |
Member
There was a problem hiding this comment.
Seems like we have a regression from this change, when onClose callback changes, it will also hide the modal due to the cleanup logic of this effect. #25998
59 tasks
Contributor
|
I suggest to revert this PR. Many bad regressions are being reported in slack. |
Contributor
Contributor
|
I tried to point out the RCA here in case it gets considered and makes sense. |
Contributor
|
Adding to @situchan's list, on iOS app while deleting the workspace, the confirmation modal never opens so we can't delete the workspace at all. |
Contributor
|
🚀 Deployed to staging by https://github.com/marcaaron in version: 1.3.58-0 🚀
|
6 tasks
Contributor
|
🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.58-5 🚀
|
Contributor
|
🚀 Deployed to staging by https://github.com/marcaaron in version: 1.3.59-0 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.59-5 🚀
|
s77rt
reviewed
Sep 7, 2023
Comment on lines
+85
to
+89
| // Only trigger onClose and setModalVisibility if the modal is unmounting while visible. | ||
| if (isVisible) { | ||
| hideModal(true); | ||
| Modal.willAlertModalBecomeVisible(false); | ||
| } |
Member
There was a problem hiding this comment.
This will cause a regression. We should not use the isVisible state here as this will be evaluated at the time of render and not when the component unmounts i.e. if you initially render the modal as visible (true) then on unmount this condition will always be true even if the state value change by then.
What we should do instead is to use a ref
const isVisibleRef = useRef(isVisible);
useEffect(() => {
isVisibleRef.current = isVisible;
}, [isVisible]);
This was referenced Sep 12, 2023
Merged
s77rt
reviewed
Sep 23, 2023
Comment on lines
+81
to
+82
| // To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu | ||
| Modal.setCloseModal(isVisible ? onClose : null); |
Member
There was a problem hiding this comment.
This caused a regression #27359. Previously on component mount Modal.setCloseModal was only called if the modal was rendered visible.
6 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.
Details
Fixed Issues
$ #16175
PROPOSAL:
Tests
Offline tests
Same as testing steps above
QA Steps
Same as testing steps above
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodWaiting for Copylabel for a copy review on the original GH to get the correct copy.STYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)/** comment above it */thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Web
basemodal_web-compressed.mov
Mobile Web - Chrome
Mobile Web - Safari
Desktop
basemodal_desktop-compressed.mov
iOS
basemodal_ios-compressed.mp4
Android
basemodal_android-compressed.webm