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: Make all screens after presentation: 'modal' as modal unless specified #11860

Merged
merged 9 commits into from
Mar 8, 2024
Merged

fix: Make all screens after presentation: 'modal' as modal unless specified #11860

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
632519f
fix: make next screen modals after one with presentation modal
groot007 Feb 28, 2024
edfcc3e
fix: add modal presentation to all next screens through descriptor
groot007 Feb 28, 2024
df4e96e
fix: refactored to avoid option mutations
groot007 Feb 29, 2024
0ffb95e
fix: add modalRoutes array for defining the next screen as modal
groot007 Mar 4, 2024
716d351
fix: make all screen after transparentModal also modal
groot007 Mar 4, 2024
dcdf90d
fix: merge branch 'main' of packages/stack/src/views/Stack/CardStack.tsx
groot007 Mar 7, 2024
4f02bc8
refactor: don't create modalRouteKeys every time
satya164 Mar 8, 2024
7e3f161
Merge branch 'main' into fix/modal-presentation-for-next-screens
satya164 Mar 8, 2024
c0b5b9c
chore: add example for mixed modal and regular screens in native stack
satya164 Mar 8, 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
17 changes: 11 additions & 6 deletions packages/native-stack/src/views/NativeStackView.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,17 @@ const SceneView = ({
}: SceneViewProps) => {
const { route, navigation, options, render } = descriptor;

let {
animation,
animationMatchesGesture,
fullScreenGestureEnabled,
presentation = 'card',
} = options;
let { animation, animationMatchesGesture, fullScreenGestureEnabled } =
options;

if (
!options.presentation &&
previousDescriptor?.options.presentation === 'modal'
) {
options.presentation = 'modal';
satya164 marked this conversation as resolved.
Show resolved Hide resolved
}

let presentation = options.presentation ?? 'card';

const {
animationDuration,
Expand Down
7 changes: 7 additions & 0 deletions packages/stack/src/views/Stack/CardStack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,13 @@ export class CardStack extends React.Component<Props, State> {
? nextDescriptor.options
: descriptor.options;

if (
previousDescriptor?.options.presentation === 'modal' ||
descriptor?.options.presentation === 'modal'
) {
optionsForTransitionConfig.presentation = 'modal';
}

const defaultTransitionPreset =
optionsForTransitionConfig.presentation === 'modal'
? ModalTransition
Expand Down
Loading