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

Commit 402a76c

Browse files
satya164satya164
committed
chore: sync latest stack
1 parent 396c4bb commit 402a76c

5 files changed

Lines changed: 132 additions & 67 deletions

File tree

‎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.59",
53+
"@react-navigation/stack": "^5.0.0-alpha.62",
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: 49 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
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-09 03:40:24.000000000 +0100
3-
+++ src/vendor/index.tsx 2020-01-09 03:40:42.000000000 +0100
2+
--- node_modules/@react-navigation/stack/src/index.tsx 2020-01-23 12:34:48.000000000 +0100
3+
+++ src/vendor/index.tsx 2020-01-23 12:43:56.000000000 +0100
44
@@ -3,11 +3,6 @@
55
import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
66
import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -13,7 +13,7 @@ diff -Naur node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.t
1313
export const Assets = [
1414
// eslint-disable-next-line import/no-commonjs
1515
require('./views/assets/back-icon.png'),
16-
@@ -48,9 +43,10 @@
16+
@@ -49,9 +44,10 @@
1717
* Types
1818
*/
1919
export {
@@ -28,9 +28,9 @@ diff -Naur node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.t
2828
StackHeaderTitleProps,
2929
StackCardInterpolatedStyle,
3030
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-09 03:40:24.000000000 +0100
31+
--- node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx 2020-01-23 12:34:48.000000000 +0100
3232
+++ src/vendor/navigators/createStackNavigator.tsx 1970-01-01 01:00:00.000000000 +0100
33-
@@ -1,77 +0,0 @@
33+
@@ -1,81 +0,0 @@
3434
-import * as React from 'react';
3535
-import {
3636
- useNavigationBuilder,
@@ -75,13 +75,17 @@ diff -Naur node_modules/@react-navigation/stack/src/navigators/createStackNaviga
7575
- React.useEffect(
7676
- () =>
7777
- navigation.addListener &&
78-
- navigation.addListener('tabPress', (e: EventArg<'tabPress'>) => {
78+
- navigation.addListener('tabPress', e => {
7979
- const isFocused = navigation.isFocused();
8080
-
8181
- // Run the operation in the next frame so we're sure all listeners have been run
8282
- // This is necessary to know if preventDefault() has been called
8383
- requestAnimationFrame(() => {
84-
- if (state.index > 0 && isFocused && !e.defaultPrevented) {
84+
- if (
85+
- state.index > 0 &&
86+
- isFocused &&
87+
- !(e as EventArg<'tabPress', true>).defaultPrevented
88+
- ) {
8589
- // When user taps on already focused tab and we're inside the tab,
8690
- // reset the stack to replicate native behaviour
8791
- navigation.dispatch({
@@ -109,8 +113,8 @@ diff -Naur node_modules/@react-navigation/stack/src/navigators/createStackNaviga
109113
- typeof StackNavigator
110114
->(StackNavigator);
111115
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-09 03:40:24.000000000 +0100
113-
+++ src/vendor/types.tsx 2020-01-09 03:40:42.000000000 +0100
116+
--- node_modules/@react-navigation/stack/src/types.tsx 2020-01-23 12:34:48.000000000 +0100
117+
+++ src/vendor/types.tsx 2020-01-23 12:43:56.000000000 +0100
114118
@@ -8,13 +8,28 @@
115119
} from 'react-native';
116120
import { EdgeInsets } from 'react-native-safe-area-context';
@@ -147,7 +151,7 @@ diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.t
147151
export type StackNavigationEventMap = {
148152
/**
149153
@@ -27,42 +42,29 @@
150-
transitionEnd: { closing: boolean };
154+
transitionEnd: { data: { closing: boolean } };
151155
};
152156

153157
-export type StackNavigationHelpers = NavigationHelpers<
@@ -255,8 +259,8 @@ diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.t
255259

256260
export type StackNavigationConfig = {
257261
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-09 03:40:24.000000000 +0100
259-
+++ src/vendor/views/Header/Header.tsx 2020-01-09 03:40:42.000000000 +0100
262+
--- node_modules/@react-navigation/stack/src/views/Header/Header.tsx 2020-01-23 12:34:48.000000000 +0100
263+
+++ src/vendor/views/Header/Header.tsx 2020-01-23 12:43:56.000000000 +0100
260264
@@ -1,11 +1,13 @@
261265
import * as React from 'react';
262266
-import { StackActions } from '@react-navigation/routers';
@@ -325,8 +329,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/
325329
+
326330
+export default Header;
327331
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx src/vendor/views/Header/HeaderBackButton.tsx
328-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx 2020-01-09 03:40:24.000000000 +0100
329-
+++ src/vendor/views/Header/HeaderBackButton.tsx 2020-01-09 03:40:42.000000000 +0100
332+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx 2020-01-23 12:34:48.000000000 +0100
333+
+++ src/vendor/views/Header/HeaderBackButton.tsx 2020-01-23 12:43:56.000000000 +0100
330334
@@ -8,9 +8,9 @@
331335
StyleSheet,
332336
LayoutChangeEvent,
@@ -339,19 +343,19 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackButto
339343

340344
type Props = StackHeaderLeftButtonProps;
341345
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx src/vendor/views/Header/HeaderBackground.tsx
342-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx 2020-01-09 03:40:24.000000000 +0100
343-
+++ src/vendor/views/Header/HeaderBackground.tsx 2020-01-09 03:40:42.000000000 +0100
346+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx 2020-01-23 12:34:48.000000000 +0100
347+
+++ src/vendor/views/Header/HeaderBackground.tsx 2020-01-23 12:43:56.000000000 +0100
344348
@@ -1,6 +1,6 @@
345349
import * as React from 'react';
346350
import { Animated, StyleSheet, Platform, ViewProps } from 'react-native';
347351
-import { useTheme } from '@react-navigation/native';
348352
+import useTheme from '../../../utils/useTheme';
349353

350-
export default function HeaderBackground({ style, ...rest }: ViewProps) {
351-
const { colors } = useTheme();
354+
type Props = ViewProps & {
355+
children?: React.ReactNode;
352356
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx src/vendor/views/Header/HeaderContainer.tsx
353-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx 2020-01-09 03:40:24.000000000 +0100
354-
+++ src/vendor/views/Header/HeaderContainer.tsx 2020-01-09 03:42:01.000000000 +0100
357+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx 2020-01-23 12:34:48.000000000 +0100
358+
+++ src/vendor/views/Header/HeaderContainer.tsx 2020-01-23 12:43:56.000000000 +0100
355359
@@ -1,11 +1,7 @@
356360
import * as React from 'react';
357361
import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -366,15 +370,15 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer
366370
import { EdgeInsets } from 'react-native-safe-area-context';
367371

368372
import Header from './Header';
369-
@@ -14,6 +10,7 @@
370-
forNoAnimation,
373+
@@ -16,6 +12,7 @@
374+
forSlideRight,
371375
} from '../../TransitionConfigs/HeaderStyleInterpolators';
372376
import {
373377
+ Route,
374378
Layout,
375379
Scene,
376380
StackHeaderStyleInterpolator,
377-
@@ -94,9 +91,7 @@
381+
@@ -99,9 +96,7 @@
378382
insets,
379383
scene,
380384
previous,
@@ -386,8 +390,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer
386390
mode === 'float'
387391
? isHeaderStatic
388392
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx src/vendor/views/Header/HeaderSegment.tsx
389-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx 2020-01-09 03:40:24.000000000 +0100
390-
+++ src/vendor/views/Header/HeaderSegment.tsx 2020-01-09 03:40:42.000000000 +0100
393+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx 2020-01-23 12:34:48.000000000 +0100
394+
+++ src/vendor/views/Header/HeaderSegment.tsx 2020-01-23 12:43:56.000000000 +0100
391395
@@ -8,7 +8,7 @@
392396
ViewStyle,
393397
} from 'react-native';
@@ -407,8 +411,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.t
407411
};
408412

409413
diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx src/vendor/views/Header/HeaderTitle.tsx
410-
--- node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx 2020-01-09 03:40:24.000000000 +0100
411-
+++ src/vendor/views/Header/HeaderTitle.tsx 2020-01-09 03:40:42.000000000 +0100
414+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx 2020-01-23 12:34:48.000000000 +0100
415+
+++ src/vendor/views/Header/HeaderTitle.tsx 2020-01-23 12:43:56.000000000 +0100
412416
@@ -1,6 +1,6 @@
413417
import * as React from 'react';
414418
import { Animated, StyleSheet, Platform, TextProps } from 'react-native';
@@ -418,9 +422,9 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx
418422
type Props = TextProps & {
419423
tintColor?: string;
420424
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vendor/views/Stack/Card.tsx
421-
--- node_modules/@react-navigation/stack/src/views/Stack/Card.tsx 2020-01-09 03:40:24.000000000 +0100
422-
+++ src/vendor/views/Stack/Card.tsx 2020-01-09 03:40:42.000000000 +0100
423-
@@ -483,7 +483,7 @@
425+
--- node_modules/@react-navigation/stack/src/views/Stack/Card.tsx 2020-01-23 12:34:48.000000000 +0100
426+
+++ src/vendor/views/Stack/Card.tsx 2020-01-23 12:43:56.000000000 +0100
427+
@@ -485,7 +485,7 @@
424428
pointerEvents="none"
425429
/>
426430
) : null}
@@ -430,8 +434,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/ven
430434
<CardAnimationContext.Provider value={animationContext}>
431435
{children}
432436
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx src/vendor/views/Stack/CardContainer.tsx
433-
--- node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx 2020-01-09 03:40:24.000000000 +0100
434-
+++ src/vendor/views/Stack/CardContainer.tsx 2020-01-09 03:40:42.000000000 +0100
437+
--- node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx 2020-01-23 12:34:48.000000000 +0100
438+
+++ src/vendor/views/Stack/CardContainer.tsx 2020-01-23 12:43:56.000000000 +0100
435439
@@ -1,11 +1,17 @@
436440
import * as React from 'react';
437441
import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -463,8 +467,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardContainer.ts
463467
>
464468
<View style={styles.container}>
465469
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src/vendor/views/Stack/CardStack.tsx
466-
--- node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx 2020-01-09 03:40:24.000000000 +0100
467-
+++ src/vendor/views/Stack/CardStack.tsx 2020-01-09 03:40:42.000000000 +0100
470+
--- node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx 2020-01-23 12:34:48.000000000 +0100
471+
+++ src/vendor/views/Stack/CardStack.tsx 2020-01-23 12:44:26.000000000 +0100
468472
@@ -11,8 +11,7 @@
469473
import { EdgeInsets } from 'react-native-safe-area-context';
470474
// eslint-disable-next-line import/no-unresolved
@@ -483,9 +487,18 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx sr
483487
Layout,
484488
StackHeaderMode,
485489
StackCardMode,
490+
@@ -96,7 +96,7 @@
491+
<View
492+
collapsable={!enabled}
493+
removeClippedSubviews={Platform.OS !== 'ios' && enabled}
494+
- style={[style, { overflow: 'hidden' }]}
495+
+ style={[style, { overflow: 'hidden' }] as any}
496+
{...rest}
497+
/>
498+
);
486499
diff -Naur node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx src/vendor/views/Stack/StackView.tsx
487-
--- node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx 2020-01-09 03:40:24.000000000 +0100
488-
+++ src/vendor/views/Stack/StackView.tsx 2020-01-09 03:44:43.000000000 +0100
500+
--- node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx 2020-01-23 12:34:48.000000000 +0100
501+
+++ src/vendor/views/Stack/StackView.tsx 2020-01-23 12:43:56.000000000 +0100
489502
@@ -1,8 +1,11 @@
490503
import * as React from 'react';
491504
import { Platform } from 'react-native';

‎src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@
33
exports[`Nested navigators renders succesfully as direct child 1`] = `
44
Array [
55
<View
6+
collapsable={true}
67
onLayout={[Function]}
8+
removeClippedSubviews={false}
79
style={
8-
Object {
9-
"flex": 1,
10-
"overflow": "hidden",
11-
}
10+
Array [
11+
Object {
12+
"flex": 1,
13+
"overflow": "hidden",
14+
},
15+
Object {
16+
"overflow": "hidden",
17+
},
18+
]
1219
}
1320
>
1421
<View
@@ -17,9 +24,15 @@ Array [
1724
Object {
1825
"bottom": 0,
1926
"left": 0,
27+
"overflow": "hidden",
2028
"position": "absolute",
2129
"right": 0,
2230
"top": 0,
31+
"transform": Array [
32+
Object {
33+
"translateY": 0,
34+
},
35+
],
2336
}
2437
}
2538
>
@@ -157,12 +170,19 @@ Array [
157170
}
158171
>
159172
<View
173+
collapsable={true}
160174
onLayout={[Function]}
175+
removeClippedSubviews={false}
161176
style={
162-
Object {
163-
"flex": 1,
164-
"overflow": "hidden",
165-
}
177+
Array [
178+
Object {
179+
"flex": 1,
180+
"overflow": "hidden",
181+
},
182+
Object {
183+
"overflow": "hidden",
184+
},
185+
]
166186
}
167187
>
168188
<View
@@ -171,9 +191,15 @@ Array [
171191
Object {
172192
"bottom": 0,
173193
"left": 0,
194+
"overflow": "hidden",
174195
"position": "absolute",
175196
"right": 0,
176197
"top": 0,
198+
"transform": Array [
199+
Object {
200+
"translateY": 0,
201+
},
202+
],
177203
}
178204
}
179205
>

‎src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@
33
exports[`StackNavigator applies correct values when headerRight is present 1`] = `
44
Array [
55
<View
6+
collapsable={true}
67
onLayout={[Function]}
8+
removeClippedSubviews={false}
79
style={
8-
Object {
9-
"flex": 1,
10-
"overflow": "hidden",
11-
}
10+
Array [
11+
Object {
12+
"flex": 1,
13+
"overflow": "hidden",
14+
},
15+
Object {
16+
"overflow": "hidden",
17+
},
18+
]
1219
}
1320
>
1421
<View
@@ -17,9 +24,15 @@ Array [
1724
Object {
1825
"bottom": 0,
1926
"left": 0,
27+
"overflow": "hidden",
2028
"position": "absolute",
2129
"right": 0,
2230
"top": 0,
31+
"transform": Array [
32+
Object {
33+
"translateY": 0,
34+
},
35+
],
2336
}
2437
}
2538
>
@@ -300,12 +313,19 @@ Array [
300313
exports[`StackNavigator renders successfully 1`] = `
301314
Array [
302315
<View
316+
collapsable={true}
303317
onLayout={[Function]}
318+
removeClippedSubviews={false}
304319
style={
305-
Object {
306-
"flex": 1,
307-
"overflow": "hidden",
308-
}
320+
Array [
321+
Object {
322+
"flex": 1,
323+
"overflow": "hidden",
324+
},
325+
Object {
326+
"overflow": "hidden",
327+
},
328+
]
309329
}
310330
>
311331
<View
@@ -314,9 +334,15 @@ Array [
314334
Object {
315335
"bottom": 0,
316336
"left": 0,
337+
"overflow": "hidden",
317338
"position": "absolute",
318339
"right": 0,
319340
"top": 0,
341+
"transform": Array [
342+
Object {
343+
"translateY": 0,
344+
},
345+
],
320346
}
321347
}
322348
>

0 commit comments

Comments
 (0)