Repository navigation
feat: use floating RHP style on web #101093
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
mountiny
merged 33 commits into
Expensify:main
from
callstack-internal:web-only-plan-issue-100811
Sep 29, 2026
Merged
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
517758e
Add web-only floating RHP style
BartekObudzinski 0519f3f
fix: round the corners of stacked RHP cards
BartekObudzinski 2d75c24
Merge remote-tracking branch 'upstream/main' into web-only-plan-issue…
BartekObudzinski 1da5a71
fix: compensate the floating RHP border and remove dead overlay styles
BartekObudzinski 2ffecd8
refactor: split the RHP frame style per platform and share the overla…
BartekObudzinski 1fb99ee
refactor: draw the RHP border and scrim on each stacked card instead …
BartekObudzinski d17c833
fix: clip the floating RHP card to its inset frame
BartekObudzinski f778c71
fix: slide-and-fade a skinny RHP pushed over a wide card
BartekObudzinski da4fe1e
fix: keep the floating RHP card shadow when a card is stacked on top
BartekObudzinski fa04497
fix: disable react-navigation's card overlay on the web RHP
BartekObudzinski 3c6b355
docs: tighten the keep-card-overflow-visible patch notes
BartekObudzinski f105e3a
test: repin super wide RHP width literals to the 360px left margin
BartekObudzinski d9eab7c
fix: clip inactive stack cards inside Card so the buried RHP shadow s…
BartekObudzinski e4abecc
docs: shorten the floating RHP comments
BartekObudzinski 2eeb57c
fix: keep one shadow under a right docked picker stacked on the RHP
BartekObudzinski cb436a1
docs(BaseOverlay): document maxOpacity/positionTop/positionBottom props
BartekObudzinski becf107
fix(MFA): float the two-factor security-code panel on web
BartekObudzinski e75bc81
docs: record where the inactive-card clip fix landed upstream
BartekObudzinski 41f078c
Merge remote-tracking branch 'upstream/main' into web-only-plan-issue…
BartekObudzinski feb0509
Make the dimmed RHP margin dismiss one level for every card width
BartekObudzinski a58dbc5
Merge remote-tracking branch 'upstream/main' into web-only-plan-issue…
BartekObudzinski 9e43178
fix: keep the super wide RHP wide enough for its panes
BartekObudzinski db4e0f4
Fix unused variable in the Side Panel shrink test
BartekObudzinski 1a3cf00
fix(RHP): keep the Side Panel shrink off native NaN
BartekObudzinski fd79f3b
Fix cspell unknown words in the RHP test comments
BartekObudzinski 490b59e
fix(RHP): drop two needless eslint-disable overrides
BartekObudzinski d964ca0
Merge remote-tracking branch 'upstream/main' into web-only-plan-issue…
BartekObudzinski 31c25b4
fix(RHP): match the 2FA scrim to the RHP dim
BartekObudzinski d49a0bc
fix(RHP): charge the floating card margin in the wide RHP width cap
BartekObudzinski 36b20cd
test(RHP): update super wide floor for the charged card margin
BartekObudzinski d6c50b8
fix(RHP): charge the card border in the receipt pane floor too
BartekObudzinski 42db57b
fix(RHP): dim right docked sheets like the RHP on wide web
BartekObudzinski 29ae543
Merge remote-tracking branch 'upstream/main' into web-only-plan-issue…
BartekObudzinski 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
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
...s/react-navigation/@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch
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,48 @@ | ||
| diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js | ||
| --- a/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js | ||
| +++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js | ||
| @@ -48,6 +48,7 @@ function Card({ | ||
| gestureVelocityImpact = GESTURE_VELOCITY_IMPACT, | ||
| overlay = defaultOverlay, | ||
| animated, | ||
| + active, | ||
| interpolationIndex, | ||
| opening, | ||
| closing, | ||
| @@ -375,7 +376,11 @@ function Card({ | ||
| children: /*#__PURE__*/_jsxs(Animated.View, { | ||
| pointerEvents: "box-none", | ||
| needsOffscreenAlphaCompositing: hasOpacityStyle(cardStyle), | ||
| - style: [styles.container, cardStyle], | ||
| + style: [styles.container, { | ||
| + // Avoid unfocused larger pages increasing scroll area | ||
| + // e.g. when a smaller screen is pushed over a larger one on web | ||
| + overflow: active ? undefined : 'hidden' | ||
| + }, cardStyle], | ||
| children: [shadowEnabled && shadowStyle && !isTransparent ? /*#__PURE__*/_jsx(Animated.View, { | ||
| pointerEvents: "none", | ||
| style: [styles.shadow, gestureDirection === 'horizontal' ? [styles.shadowHorizontal, styles.shadowStart] : gestureDirection === 'horizontal-inverted' ? [styles.shadowHorizontal, styles.shadowEnd] : gestureDirection === 'vertical' ? [styles.shadowVertical, styles.shadowTop] : [styles.shadowVertical, styles.shadowBottom], { | ||
| diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js | ||
| --- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js | ||
| +++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js | ||
| @@ -22,9 +22,6 @@ export const CardA11yWrapper = /*#__PURE__*/React.forwardRef(({ | ||
| "aria-hidden": !focused, | ||
| pointerEvents: (animated ? inert : !focused) ? 'none' : 'box-none', | ||
| style: [StyleSheet.absoluteFill, { | ||
| - // This is necessary to avoid unfocused larger pages increasing scroll area | ||
| - // The issue can be seen on the web when a smaller screen is pushed over a larger one | ||
| - overflow: active ? undefined : 'hidden', | ||
| // We use visibility on web | ||
| display: Platform.OS !== 'web' && isHidden ? 'none' : 'flex', | ||
| zIndex: Platform.OS === 'web' ? 'auto' : undefined, | ||
| diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js | ||
| --- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js | ||
| +++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js | ||
| @@ -198,6 +198,7 @@ function CardContainerInner({ | ||
| detachCurrentScreen: detachCurrentScreen, | ||
| children: /*#__PURE__*/_jsx(Card, { | ||
| animated: animated, | ||
| + active: active, | ||
| interpolationIndex: interpolationIndex, | ||
| gestureDirection: gestureDirection, | ||
| layout: layout, |
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This has been fixed in react-navigation directly react-navigation/react-navigation#13255 . Should be published in @react-navigation/stack@7.11.2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
followup issue #101715
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mountiny Could you advise on this case? I think we should use this patch so we don't need to wait for #101715 to be completed. We can include the @react-navigation/stack@7.11.2 upgrade as part of #101715.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right! I forget to mention we agreed with @mountiny to bump this as a part of #101715 and now ship it with the patch
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FIY @grgia
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah happy to use the patch and then update