[No QA] use a better approach for useResponsiveLayout hook #34743
Conversation
This file contains 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
|
@getusha @roryabraham After encountering regressions caused by #33426, I am modifying the logic for the useResponsiveLayout hook. Instead of passing a parameter to screens in the modal stack navigator and checking for it in the hook, I am now obtaining the navigator name directly from the navigationRef in the hook without altering the navigation logic. What are your thoughts on this approach? |
roryabraham
previously approved these changes
Jan 18, 2024
|
@getusha bump |
getusha
reviewed
Jan 23, 2024
|
@rayane-djouah Just tested this on
|
|
@rayane-djouah this is the changes i made to the component, please let me know if i did something wrong. Diff
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index bd8d535e54..abf4c9c858 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -39,6 +39,7 @@ import SafeAreaConsumer from './SafeAreaConsumer';
import transactionPropTypes from './transactionPropTypes';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
+import useResponsiveLayout from "@hooks/useResponsiveLayout";
/**
* Modal render prop component that exposes modal launching triggers that can be used
@@ -136,6 +137,8 @@ function AttachmentModal(props) {
const [isDownloadButtonReadyToBeShown, setIsDownloadButtonReadyToBeShown] = React.useState(true);
const {windowWidth} = useWindowDimensions();
+ const {shouldUseNarrowLayout} = useResponsiveLayout();
+
const isOverlayModalVisible = (props.isReceiptAttachment && isDeleteReceiptConfirmModalVisible) || (!props.isReceiptAttachment && isAttachmentInvalid);
const [file, setFile] = useState(
@@ -445,14 +448,14 @@ function AttachmentModal(props) {
propagateSwipe
>
<GestureHandlerRootView style={styles.flex1}>
- {props.isSmallScreenWidth && <HeaderGap />}
+ {shouldUseNarrowLayout && <HeaderGap />}
<HeaderWithBackButton
title={headerTitle}
shouldShowBorderBottom
shouldShowDownloadButton={shouldShowDownloadButton}
onDownloadButtonPress={() => downloadAttachment(source)}
- shouldShowCloseButton={!props.isSmallScreenWidth}
- shouldShowBackButton={props.isSmallScreenWidth}
+ shouldShowCloseButton={!shouldUseNarrowLayout}
+ shouldShowBackButton={shouldUseNarrowLayout}
onBackButtonPress={closeModal}
onCloseButtonPress={closeModal}
shouldShowThreeDotsButton={shouldShowThreeDotsButton}
@@ -494,7 +497,7 @@ function AttachmentModal(props) {
<Animated.View style={[StyleUtils.fade(confirmButtonFadeAnimation), safeAreaPaddingBottomStyle]}>
<Button
success
- style={[styles.buttonConfirm, props.isSmallScreenWidth ? {} : styles.attachmentButtonBigScreen]}
+ style={[styles.buttonConfirm, shouldUseNarrowLayout ? {} : styles.attachmentButtonBigScreen]}
textStyles={[styles.buttonConfirmText]}
text={translate('common.send')}
onPress={submitAndClose} |
|
Good catch! @getusha
Consequently, I propose that the optimal solution involves returning both here is the diff for debugging @getusha : Diffdiff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index bd8d535e54..67fba81181 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -9,6 +9,7 @@ import {withOnyx} from 'react-native-onyx';
import _ from 'underscore';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
@@ -136,6 +137,8 @@ function AttachmentModal(props) {
const [isDownloadButtonReadyToBeShown, setIsDownloadButtonReadyToBeShown] = React.useState(true);
const {windowWidth} = useWindowDimensions();
+ const {isSmallScreenWidth, isInModal} = useResponsiveLayout();
+
const isOverlayModalVisible = (props.isReceiptAttachment && isDeleteReceiptConfirmModalVisible) || (!props.isReceiptAttachment && isAttachmentInvalid);
const [file, setFile] = useState(
@@ -149,6 +152,8 @@ function AttachmentModal(props) {
const {isOffline} = useNetwork();
useEffect(() => {
+ console.log('isInModal: ', isInModal);
+ console.log('isSmallScreenWidth: ', isSmallScreenWidth);
setFile(props.originalFileName ? {name: props.originalFileName} : undefined);
}, [props.originalFileName]);
@@ -445,14 +450,14 @@ function AttachmentModal(props) {
propagateSwipe
>
<GestureHandlerRootView style={styles.flex1}>
- {props.isSmallScreenWidth && <HeaderGap />}
+ {isSmallScreenWidth && <HeaderGap />}
<HeaderWithBackButton
title={headerTitle}
shouldShowBorderBottom
shouldShowDownloadButton={shouldShowDownloadButton}
onDownloadButtonPress={() => downloadAttachment(source)}
- shouldShowCloseButton={!props.isSmallScreenWidth}
- shouldShowBackButton={props.isSmallScreenWidth}
+ shouldShowCloseButton={!isSmallScreenWidth}
+ shouldShowBackButton={isSmallScreenWidth}
onBackButtonPress={closeModal}
onCloseButtonPress={closeModal}
shouldShowThreeDotsButton={shouldShowThreeDotsButton}
@@ -494,7 +499,7 @@ function AttachmentModal(props) {
<Animated.View style={[StyleUtils.fade(confirmButtonFadeAnimation), safeAreaPaddingBottomStyle]}>
<Button
success
- style={[styles.buttonConfirm, props.isSmallScreenWidth ? {} : styles.attachmentButtonBigScreen]}
+ style={[styles.buttonConfirm, isSmallScreenWidth ? {} : styles.attachmentButtonBigScreen]}
textStyles={[styles.buttonConfirmText]}
text={translate('common.send')}
onPress={submitAndClose}What do you think @getusha @roryabraham ? |
|
@rayane-djouah that seems like the new solution differs from what we're trying to achieve. |
getusha
suggested changes
Jan 25, 2024
roryabraham
approved these changes
Jan 26, 2024
Reviewer Checklist
Screenshots/VideosAndroid: NativeAndroid: mWeb ChromeiOS: NativeiOS: mWeb SafariMacOS: Chrome / SafariMacOS: Desktop |
getusha
approved these changes
Jan 26, 2024
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.33-0 🚀
|
|
🚀 Deployed to production by https://github.com/francoisl in version: 1.4.33-5 🚀
|
rayane-djouah
deleted the
use-a-better-approach-for-useResponsiveLayout-hook
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
#30528 (comment)
Fixed Issues
$ #30528
Tests
Offline tests
QA Steps
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)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel so the design team can review the changes.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
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop