Skip to content

Fix LHP animation on smaller screens #33218

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
mountiny merged 2 commits into from
Dec 18, 2023
Merged

Fix LHP animation on smaller screens #33218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc38b46
Fix LHP animation on smaller screens
WojtekBoman Dec 18, 2023
53e4fd6
Adjust overlay style to LHP borderRadius
WojtekBoman Dec 18, 2023
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
3 changes: 2 additions & 1 deletion src/libs/Navigation/AppNavigator/getRootNavigatorScreenOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ export default (isSmallScreenWidth: boolean, themeStyles: ThemeStyles): ScreenOp
// This is necessary to cover translated sidebar with overlay.
width: isSmallScreenWidth ? '100%' : '200%',

transform: [{translateX: isSmallScreenWidth ? 0 : -variables.sideBarWidth}],
// LHP should be displayed in place of the sidebar
left: isSmallScreenWidth ? 0 : -variables.sideBarWidth,
},
},
homeScreen: {
Expand Down
7 changes: 4 additions & 3 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,8 +1385,8 @@ const styles = (theme: ThemeColors) =>
position: 'absolute',
left: 0,
height: '100%',
borderTopRightRadius: isSmallScreenWidth ? 0 : 24,
borderBottomRightRadius: isSmallScreenWidth ? 0 : 24,
borderTopRightRadius: isSmallScreenWidth ? 0 : variables.lhpBorderRadius,
borderBottomRightRadius: isSmallScreenWidth ? 0 : variables.lhpBorderRadius,
overflow: 'hidden',
} satisfies ViewStyle),
RHPNavigatorContainer: (isSmallScreenWidth: boolean) =>
Expand Down Expand Up @@ -1614,7 +1614,8 @@ const styles = (theme: ThemeColors) =>
({
...positioning.pFixed,
// We need to stretch the overlay to cover the sidebar and the translate animation distance.
left: isModalOnTheLeft ? 0 : -2 * variables.sideBarWidth,
// The overlay must also cover borderRadius of the LHP component
left: isModalOnTheLeft ? -variables.lhpBorderRadius : -2 * variables.sideBarWidth,
top: 0,
bottom: 0,
right: isModalOnTheLeft ? -2 * variables.sideBarWidth : 0,
Expand Down
2 changes: 2 additions & 0 deletions src/styles/variables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,6 @@ export default {
cardPreviewHeight: 148,
cardPreviewWidth: 235,
cardNameWidth: 156,

lhpBorderRadius: 24,
} as const;