Skip to content
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

Jump to bottom

fix!: always set Zindex to undefined for InnerScreen #2351

Merged
merged 2 commits into from
Sep 26, 2024
Merged

fix!: always set Zindex to undefined for InnerScreen #2351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd33cdb
Always set zIndex to undefined for InnerScreen
adrianryt Sep 25, 2024
0c92390
Add code comment
adrianryt Sep 26, 2024
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
2 changes: 1 addition & 1 deletion apps/src/tests/Test2232.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const App = () => (
component={SettingsScreen}
options={{
headerTintColor: 'hotpink',
headerBackTitleVisible: false,
headerBackButtonDisplayMode: 'minimal',
headerTitle: () => (
<View style={{ gap: 16, flexDirection: 'row' }}>
<Square color="green" size={20} />
Expand Down
2 changes: 2 additions & 0 deletions src/components/Screen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export const InnerScreen = React.forwardRef<View, ScreenProps>(
isNativeStack,
gestureResponseDistance,
onGestureCancel,
style,
...props
} = rest;

Expand Down Expand Up @@ -125,6 +126,7 @@ export const InnerScreen = React.forwardRef<View, ScreenProps>(
<DelayedFreeze freeze={freezeOnBlur && activityState === 0}>
<AnimatedScreen
{...props}
style={[style, { zIndex: undefined }]}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a comment that we are handling the order of screens on the native side and changing it here causes issues, with the link to the issue.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

activityState={activityState}
sheetAllowedDetents={sheetAllowedDetents}
sheetLargestUndimmedDetent={sheetLargestUndimmedDetent}
Expand Down
Loading