|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/index.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/index.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/index.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/index.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -3,11 +3,6 @@
|
|
|
|
@@ -3,11 +3,6 @@
|
|
|
|
import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
|
|
|
|
import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
|
|
|
|
import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
|
|
|
|
import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
|
|
|
|
@@ -28,7 +28,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/index.tsx src/vendor/i
|
|
|
|
StackHeaderLeftButtonProps,
|
|
|
|
StackHeaderLeftButtonProps,
|
|
|
|
StackHeaderTitleProps,
|
|
|
|
StackHeaderTitleProps,
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx src/vendor/navigators/createStackNavigator.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx src/vendor/navigators/createStackNavigator.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/navigators/createStackNavigator.tsx 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
+++ src/vendor/navigators/createStackNavigator.tsx 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
@@ -1,101 +0,0 @@
|
|
|
|
@@ -1,101 +0,0 @@
|
|
|
|
-import * as React from 'react';
|
|
|
|
-import * as React from 'react';
|
|
|
|
@@ -133,8 +133,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
|
|
|
|
- typeof StackNavigator
|
|
|
|
- typeof StackNavigator
|
|
|
|
->(StackNavigator);
|
|
|
|
->(StackNavigator);
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/types.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/types.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/types.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/types.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -8,15 +8,29 @@
|
|
|
|
@@ -8,15 +8,29 @@
|
|
|
|
} from 'react-native';
|
|
|
|
} from 'react-native';
|
|
|
|
import type { EdgeInsets } from 'react-native-safe-area-context';
|
|
|
|
import type { EdgeInsets } from 'react-native-safe-area-context';
|
|
|
|
@@ -269,8 +269,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
|
|
|
|
|
|
|
|
|
|
|
|
export type StackNavigationConfig = {
|
|
|
|
export type StackNavigationConfig = {
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneContext.tsx src/vendor/utils/PreviousSceneContext.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneContext.tsx src/vendor/utils/PreviousSceneContext.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneContext.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneContext.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/utils/PreviousSceneContext.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/utils/PreviousSceneContext.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -1,6 +1,5 @@
|
|
|
|
@@ -1,6 +1,5 @@
|
|
|
|
import * as React from 'react';
|
|
|
|
import * as React from 'react';
|
|
|
|
-import type { Route } from '@react-navigation/native';
|
|
|
|
-import type { Route } from '@react-navigation/native';
|
|
|
|
@@ -280,8 +280,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneCon
|
|
|
|
const PreviousSceneContext = React.createContext<
|
|
|
|
const PreviousSceneContext = React.createContext<
|
|
|
|
Scene<Route<string>> | undefined
|
|
|
|
Scene<Route<string>> | undefined
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/vendor/views/Header/Header.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/vendor/views/Header/Header.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/Header.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/Header.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -1,12 +1,15 @@
|
|
|
|
@@ -1,12 +1,15 @@
|
|
|
|
import * as React from 'react';
|
|
|
|
import * as React from 'react';
|
|
|
|
-import { StackActions } from '@react-navigation/native';
|
|
|
|
-import { StackActions } from '@react-navigation/native';
|
|
|
|
@@ -369,8 +369,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/Header.ts
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+export default Header;
|
|
|
|
+export default Header;
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx src/vendor/views/Header/HeaderBackButton.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx src/vendor/views/Header/HeaderBackButton.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderBackButton.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderBackButton.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -8,9 +8,9 @@
|
|
|
|
@@ -8,9 +8,9 @@
|
|
|
|
StyleSheet,
|
|
|
|
StyleSheet,
|
|
|
|
LayoutChangeEvent,
|
|
|
|
LayoutChangeEvent,
|
|
|
|
@@ -383,8 +383,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBac
|
|
|
|
|
|
|
|
|
|
|
|
type Props = StackHeaderLeftButtonProps;
|
|
|
|
type Props = StackHeaderLeftButtonProps;
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx src/vendor/views/Header/HeaderBackground.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx src/vendor/views/Header/HeaderBackground.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderBackground.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderBackground.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
StyleProp,
|
|
|
|
StyleProp,
|
|
|
|
ViewStyle,
|
|
|
|
ViewStyle,
|
|
|
|
@@ -395,8 +395,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBac
|
|
|
|
type Props = ViewProps & {
|
|
|
|
type Props = ViewProps & {
|
|
|
|
style?: Animated.WithAnimatedValue<StyleProp<ViewStyle>>;
|
|
|
|
style?: Animated.WithAnimatedValue<StyleProp<ViewStyle>>;
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx src/vendor/views/Header/HeaderContainer.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx src/vendor/views/Header/HeaderContainer.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderContainer.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderContainer.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -1,11 +1,6 @@
|
|
|
|
@@ -1,11 +1,6 @@
|
|
|
|
import * as React from 'react';
|
|
|
|
import * as React from 'react';
|
|
|
|
import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
|
|
|
|
import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
|
|
|
|
@@ -448,8 +448,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderCon
|
|
|
|
);
|
|
|
|
);
|
|
|
|
})}
|
|
|
|
})}
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx src/vendor/views/Header/HeaderSegment.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx src/vendor/views/Header/HeaderSegment.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderSegment.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderSegment.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
ViewStyle,
|
|
|
|
ViewStyle,
|
|
|
|
} from 'react-native';
|
|
|
|
} from 'react-native';
|
|
|
|
@@ -469,8 +469,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSeg
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx src/vendor/views/Header/HeaderTitle.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx src/vendor/views/Header/HeaderTitle.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderTitle.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Header/HeaderTitle.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
StyleProp,
|
|
|
|
StyleProp,
|
|
|
|
TextStyle,
|
|
|
|
TextStyle,
|
|
|
|
@@ -481,8 +481,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTit
|
|
|
|
type Props = Omit<TextProps, 'style'> & {
|
|
|
|
type Props = Omit<TextProps, 'style'> & {
|
|
|
|
tintColor?: string;
|
|
|
|
tintColor?: string;
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vendor/views/Stack/Card.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vendor/views/Stack/Card.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/Card.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/Card.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -162,7 +162,7 @@
|
|
|
|
@@ -162,7 +162,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
private interactionHandle: number | undefined;
|
|
|
|
private interactionHandle: number | undefined;
|
|
|
|
@@ -493,8 +493,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx s
|
|
|
|
private lastToValue: number | undefined;
|
|
|
|
private lastToValue: number | undefined;
|
|
|
|
|
|
|
|
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx src/vendor/views/Stack/CardContainer.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx src/vendor/views/Stack/CardContainer.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/CardContainer.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/CardContainer.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -1,12 +1,13 @@
|
|
|
|
@@ -1,12 +1,13 @@
|
|
|
|
import * as React from 'react';
|
|
|
|
import * as React from 'react';
|
|
|
|
import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
|
|
|
|
import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
|
|
|
|
@@ -511,10 +511,10 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContai
|
|
|
|
Layout,
|
|
|
|
Layout,
|
|
|
|
StackHeaderMode,
|
|
|
|
StackHeaderMode,
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src/vendor/views/Stack/CardStack.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src/vendor/views/Stack/CardStack.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/CardStack.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/CardStack.tsx 2021-02-21 16:43:22.000000000 +0100
|
|
|
|
@@ -6,11 +6,7 @@
|
|
|
|
@@ -7,11 +7,7 @@
|
|
|
|
Dimensions,
|
|
|
|
Platform,
|
|
|
|
} from 'react-native';
|
|
|
|
} from 'react-native';
|
|
|
|
import type { EdgeInsets } from 'react-native-safe-area-context';
|
|
|
|
import type { EdgeInsets } from 'react-native-safe-area-context';
|
|
|
|
-import type {
|
|
|
|
-import type {
|
|
|
|
@@ -526,7 +526,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
|
|
|
|
|
|
|
|
|
|
|
|
import {
|
|
|
|
import {
|
|
|
|
MaybeScreenContainer,
|
|
|
|
MaybeScreenContainer,
|
|
|
|
@@ -31,6 +27,7 @@
|
|
|
|
@@ -32,6 +28,7 @@
|
|
|
|
Layout,
|
|
|
|
Layout,
|
|
|
|
StackHeaderMode,
|
|
|
|
StackHeaderMode,
|
|
|
|
StackCardMode,
|
|
|
|
StackCardMode,
|
|
|
|
@@ -534,7 +534,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
|
|
|
|
Scene,
|
|
|
|
Scene,
|
|
|
|
StackDescriptorMap,
|
|
|
|
StackDescriptorMap,
|
|
|
|
StackNavigationOptions,
|
|
|
|
StackNavigationOptions,
|
|
|
|
@@ -44,7 +41,7 @@
|
|
|
|
@@ -45,7 +42,7 @@
|
|
|
|
type Props = {
|
|
|
|
type Props = {
|
|
|
|
mode: StackCardMode;
|
|
|
|
mode: StackCardMode;
|
|
|
|
insets: EdgeInsets;
|
|
|
|
insets: EdgeInsets;
|
|
|
|
@@ -544,8 +544,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
|
|
|
|
routes: Route<string>[];
|
|
|
|
routes: Route<string>[];
|
|
|
|
openingRouteKeys: string[];
|
|
|
|
openingRouteKeys: string[];
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx src/vendor/views/Stack/StackView.tsx
|
|
|
|
diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx src/vendor/views/Stack/StackView.tsx
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx 2020-11-10 21:02:55.000000000 +0100
|
|
|
|
--- ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx 2021-02-21 16:34:35.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/StackView.tsx 2020-11-10 21:04:07.000000000 +0100
|
|
|
|
+++ src/vendor/views/Stack/StackView.tsx 2021-03-01 12:10:44.000000000 +0100
|
|
|
|
@@ -2,12 +2,11 @@
|
|
|
|
@@ -2,12 +2,11 @@
|
|
|
|
import { View, Platform, StyleSheet } from 'react-native';
|
|
|
|
import { View, Platform, StyleSheet } from 'react-native';
|
|
|
|
import { SafeAreaConsumer, EdgeInsets } from 'react-native-safe-area-context';
|
|
|
|
import { SafeAreaConsumer, EdgeInsets } from 'react-native-safe-area-context';
|
|
|
|
@@ -716,7 +716,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
|
|
|
|
+ const descriptor =
|
|
|
|
+ const descriptor =
|
|
|
|
+ descriptors[route.key] || this.state.descriptors[route.key];
|
|
|
|
+ descriptors[route.key] || this.state.descriptors[route.key];
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ descriptor?.options.onTransitionStart?.({ closing });
|
|
|
|
+ descriptor?.options.onTransitionEnd?.({ closing });
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ private handleGestureStart = () => {
|
|
|
|
+ private handleGestureStart = () => {
|
|
|
|
|