Skip to content
This repository was archived by the owner on Feb 25, 2020. It is now read-only.

Commit f0a69d6

Browse files
satya164satya164
committed
chore: sync latest stack
1 parent 35b5b9a commit f0a69d6

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@expo/vector-icons": "^10.0.6",
5151
"@react-native-community/bob": "^0.7.0",
5252
"@react-native-community/masked-view": "^0.1.5",
53-
"@react-navigation/stack": "^5.0.0-alpha.53",
53+
"@react-navigation/stack": "^5.0.0-alpha.54",
5454
"@release-it/conventional-changelog": "^1.1.0",
5555
"@types/color": "^3.0.1",
5656
"@types/jest": "^24.0.25",

‎scripts/stack.patch‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -ruN node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.tsx
2-
--- node_modules/@react-navigation/stack/src/index.tsx 2020-01-05 14:32:09.000000000 +0100
3-
+++ src/vendor/index.tsx 2020-01-05 14:37:29.000000000 +0100
1+
diff -Naur node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.tsx
2+
--- node_modules/@react-navigation/stack/src/index.tsx 2020-01-05 15:33:46.000000000 +0100
3+
+++ src/vendor/index.tsx 2020-01-05 15:37:12.000000000 +0100
44
@@ -3,11 +3,6 @@
55
import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
66
import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -27,8 +27,8 @@ diff -ruN node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.ts
2727
StackHeaderLeftButtonProps,
2828
StackHeaderTitleProps,
2929
StackCardInterpolatedStyle,
30-
diff -ruN node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx src/vendor/navigators/createStackNavigator.tsx
31-
--- node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx 2020-01-05 14:32:09.000000000 +0100
30+
diff -Naur node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx src/vendor/navigators/createStackNavigator.tsx
31+
--- node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx 2020-01-05 15:33:46.000000000 +0100
3232
+++ src/vendor/navigators/createStackNavigator.tsx 1970-01-01 01:00:00.000000000 +0100
3333
@@ -1,77 +0,0 @@
3434
-import * as React from 'react';
@@ -108,9 +108,9 @@ diff -ruN node_modules/@react-navigation/stack/src/navigators/createStackNavigat
108108
- StackNavigationOptions,
109109
- typeof StackNavigator
110110
->(StackNavigator);
111-
diff -ruN node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.tsx
112-
--- node_modules/@react-navigation/stack/src/types.tsx 2020-01-05 14:32:09.000000000 +0100
113-
+++ src/vendor/types.tsx 2020-01-05 14:33:03.000000000 +0100
111+
diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.tsx
112+
--- node_modules/@react-navigation/stack/src/types.tsx 2020-01-05 15:33:46.000000000 +0100
113+
+++ src/vendor/types.tsx 2020-01-05 15:37:12.000000000 +0100
114114
@@ -8,13 +8,28 @@
115115
} from 'react-native';
116116
import { EdgeInsets } from 'react-native-safe-area-context';
@@ -254,9 +254,9 @@ diff -ruN node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.ts
254254
};
255255

256256
export type StackNavigationConfig = {
257-
diff -ruN node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/vendor/views/Header/Header.tsx
258-
--- node_modules/@react-navigation/stack/src/views/Header/Header.tsx 2020-01-05 14:32:09.000000000 +0100
259-
+++ src/vendor/views/Header/Header.tsx 2020-01-05 14:33:03.000000000 +0100
257+
diff -Naur node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/vendor/views/Header/Header.tsx
258+
--- node_modules/@react-navigation/stack/src/views/Header/Header.tsx 2020-01-05 15:33:46.000000000 +0100
259+
+++ src/vendor/views/Header/Header.tsx 2020-01-05 15:37:12.000000000 +0100
260260
@@ -1,5 +1,5 @@
261261
import * as React from 'react';
262262
-import { StackActions } from '@react-navigation/routers';
@@ -296,9 +296,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/v
296296
: undefined
297297
}
298298
styleInterpolator={styleInterpolator}
299-
diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx src/vendor/views/Header/HeaderBackButton.tsx
300-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx 2020-01-05 14:32:09.000000000 +0100
301-
+++ src/vendor/views/Header/HeaderBackButton.tsx 2020-01-05 14:33:03.000000000 +0100
299+
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx src/vendor/views/Header/HeaderBackButton.tsx
300+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx 2020-01-05 15:33:46.000000000 +0100
301+
+++ src/vendor/views/Header/HeaderBackButton.tsx 2020-01-05 15:37:12.000000000 +0100
302302
@@ -8,9 +8,9 @@
303303
StyleSheet,
304304
LayoutChangeEvent,
@@ -310,9 +310,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton
310310
import { StackHeaderLeftButtonProps } from '../../types';
311311

312312
type Props = StackHeaderLeftButtonProps;
313-
diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx src/vendor/views/Header/HeaderBackground.tsx
314-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx 2020-01-05 14:32:09.000000000 +0100
315-
+++ src/vendor/views/Header/HeaderBackground.tsx 2020-01-05 14:33:03.000000000 +0100
313+
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx src/vendor/views/Header/HeaderBackground.tsx
314+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx 2020-01-05 15:33:46.000000000 +0100
315+
+++ src/vendor/views/Header/HeaderBackground.tsx 2020-01-05 15:37:12.000000000 +0100
316316
@@ -1,6 +1,6 @@
317317
import * as React from 'react';
318318
import { Animated, StyleSheet, Platform, ViewProps } from 'react-native';
@@ -321,9 +321,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderBackground
321321

322322
export default function HeaderBackground({ style, ...rest }: ViewProps) {
323323
const { colors } = useTheme();
324-
diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx src/vendor/views/Header/HeaderContainer.tsx
325-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx 2020-01-05 14:32:09.000000000 +0100
326-
+++ src/vendor/views/Header/HeaderContainer.tsx 2020-01-05 14:33:03.000000000 +0100
324+
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx src/vendor/views/Header/HeaderContainer.tsx
325+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx 2020-01-05 15:33:46.000000000 +0100
326+
+++ src/vendor/views/Header/HeaderContainer.tsx 2020-01-05 15:37:12.000000000 +0100
327327
@@ -1,16 +1,13 @@
328328
import * as React from 'react';
329329
import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -355,9 +355,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.
355355
styleInterpolator: isHeaderStatic ? forStatic : styleInterpolator,
356356
};
357357

358-
diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx src/vendor/views/Header/HeaderSegment.tsx
359-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx 2020-01-05 14:32:09.000000000 +0100
360-
+++ src/vendor/views/Header/HeaderSegment.tsx 2020-01-05 14:33:03.000000000 +0100
358+
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx src/vendor/views/Header/HeaderSegment.tsx
359+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx 2020-01-05 15:33:46.000000000 +0100
360+
+++ src/vendor/views/Header/HeaderSegment.tsx 2020-01-05 15:37:12.000000000 +0100
361361
@@ -8,7 +8,7 @@
362362
ViewStyle,
363363
} from 'react-native';
@@ -376,9 +376,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.ts
376376
styleInterpolator: StackHeaderStyleInterpolator;
377377
};
378378

379-
diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx src/vendor/views/Header/HeaderTitle.tsx
380-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx 2020-01-05 14:32:09.000000000 +0100
381-
+++ src/vendor/views/Header/HeaderTitle.tsx 2020-01-05 14:33:03.000000000 +0100
379+
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx src/vendor/views/Header/HeaderTitle.tsx
380+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx 2020-01-05 15:33:46.000000000 +0100
381+
+++ src/vendor/views/Header/HeaderTitle.tsx 2020-01-05 15:37:12.000000000 +0100
382382
@@ -1,6 +1,6 @@
383383
import * as React from 'react';
384384
import { Animated, StyleSheet, Platform, TextProps } from 'react-native';
@@ -387,9 +387,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx
387387

388388
type Props = TextProps & {
389389
tintColor?: string;
390-
diff -ruN node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vendor/views/Stack/Card.tsx
391-
--- node_modules/@react-navigation/stack/src/views/Stack/Card.tsx 2020-01-05 14:32:09.000000000 +0100
392-
+++ src/vendor/views/Stack/Card.tsx 2020-01-05 14:43:46.000000000 +0100
390+
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vendor/views/Stack/Card.tsx
391+
--- node_modules/@react-navigation/stack/src/views/Stack/Card.tsx 2020-01-05 15:33:46.000000000 +0100
392+
+++ src/vendor/views/Stack/Card.tsx 2020-01-05 15:37:12.000000000 +0100
393393
@@ -452,7 +452,7 @@
394394
pointerEvents="none"
395395
/>
@@ -399,9 +399,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vend
399399
<StackGestureRefContext.Provider value={this.gestureRef}>
400400
<CardAnimationContext.Provider value={animationContext}>
401401
{children}
402-
diff -ruN node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx src/vendor/views/Stack/CardContainer.tsx
403-
--- node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx 2020-01-05 14:32:09.000000000 +0100
404-
+++ src/vendor/views/Stack/CardContainer.tsx 2020-01-05 14:40:18.000000000 +0100
402+
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx src/vendor/views/Stack/CardContainer.tsx
403+
--- node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx 2020-01-05 15:33:46.000000000 +0100
404+
+++ src/vendor/views/Stack/CardContainer.tsx 2020-01-05 15:37:43.000000000 +0100
405405
@@ -1,11 +1,17 @@
406406
import * as React from 'react';
407407
import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -410,7 +410,7 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx
410410
+import { NavigationState as StackNavigationState } from 'react-navigation';
411411
import { Props as HeaderContainerProps } from '../Header/HeaderContainer';
412412
import Card from './Card';
413-
import FloatingHeaderHeightContext from '../../utils/FloatingHeaderHeightContext';
413+
import HeaderHeightContext from '../../utils/HeaderHeightContext';
414414
-import { Scene, Layout, StackHeaderMode, TransitionPreset } from '../../types';
415415
+import useTheme from '../../../utils/useTheme';
416416
+import {
@@ -423,18 +423,18 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx
423423

424424
type Props = TransitionPreset & {
425425
index: number;
426-
@@ -153,7 +159,7 @@
427-
? { marginTop: floatingHeaderHeight }
426+
@@ -158,7 +164,7 @@
427+
? { marginTop: headerHeight }
428428
: null
429429
}
430430
- contentStyle={[{ backgroundColor: colors.background }, cardStyle]}
431431
+ contentStyle={[{ backgroundColor: colors.background }, cardStyle] as any}
432432
style={StyleSheet.absoluteFill}
433433
>
434434
<View style={styles.container}>
435-
diff -ruN node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src/vendor/views/Stack/CardStack.tsx
436-
--- node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx 2020-01-05 14:32:09.000000000 +0100
437-
+++ src/vendor/views/Stack/CardStack.tsx 2020-01-05 14:33:03.000000000 +0100
435+
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src/vendor/views/Stack/CardStack.tsx
436+
--- node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx 2020-01-05 15:33:46.000000000 +0100
437+
+++ src/vendor/views/Stack/CardStack.tsx 2020-01-05 15:37:12.000000000 +0100
438438
@@ -11,8 +11,7 @@
439439
import { EdgeInsets } from 'react-native-safe-area-context';
440440
// eslint-disable-next-line import/no-unresolved
@@ -453,9 +453,9 @@ diff -ruN node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src
453453
Layout,
454454
StackHeaderMode,
455455
StackCardMode,
456-
diff -ruN node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx src/vendor/views/Stack/StackView.tsx
457-
--- node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx 2020-01-05 14:32:09.000000000 +0100
458-
+++ src/vendor/views/Stack/StackView.tsx 2020-01-05 14:33:03.000000000 +0100
456+
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx src/vendor/views/Stack/StackView.tsx
457+
--- node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx 2020-01-05 15:33:46.000000000 +0100
458+
+++ src/vendor/views/Stack/StackView.tsx 2020-01-05 15:37:12.000000000 +0100
459459
@@ -1,8 +1,11 @@
460460
import * as React from 'react';
461461
import { Platform } from 'react-native';

‎yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,10 +1396,10 @@
13961396
"@react-navigation/core" "^5.0.0-alpha.30"
13971397
shortid "^2.2.15"
13981398

1399-
"@react-navigation/stack@^5.0.0-alpha.53":
1400-
version "5.0.0-alpha.53"
1401-
resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.0.0-alpha.53.tgz#42de5abcdda44e16ee1265a7458ed54d6a3f1b18"
1402-
integrity sha512-Q1LnFta7/lbVnjib/1b11fGk4FuLe7sFf0LzHvNGnlSDceodloZMO8sh40GmWpwtq5bPuCHsVNZSnw1Y3u2jHA==
1399+
"@react-navigation/stack@^5.0.0-alpha.54":
1400+
version "5.0.0-alpha.54"
1401+
resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.0.0-alpha.54.tgz#21e4e612a02fe754a58cc9b8f305f83143634e3e"
1402+
integrity sha512-dkGUJh/h7HmwMmWVViCIpkImsmbzQt0bdH6Ax9kD0Ch+eHCFPUDzjme88kM8/Jgk/URpqIqKZU2dLwgobyeApQ==
14031403
dependencies:
14041404
"@react-navigation/routers" "^5.0.0-alpha.20"
14051405
color "^3.1.2"

0 commit comments

Comments
 (0)