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

Commit 8ea02d8

Browse files
satya164satya164
committed
fix: add deprecation for Header.HEIGHT
1 parent 379f044 commit 8ea02d8

File tree

1 file changed

+59
-31
lines changed

1 file changed

+59
-31
lines changed

‎scripts/stack.patch

Lines changed: 59 additions & 31 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-05 15:33:46.000000000 +0100
3-
+++ src/vendor/index.tsx 2020-01-05 15:37:12.000000000 +0100
2+
--- node_modules/@react-navigation/stack/src/index.tsx 2020-01-07 15:54:09.000000000 +0100
3+
+++ src/vendor/index.tsx 2020-01-07 16:06:06.000000000 +0100
44
@@ -3,11 +3,6 @@
55
import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
66
import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -28,7 +28,7 @@ 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-05 15:33:46.000000000 +0100
31+
--- node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx 2020-01-07 15:54:09.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';
@@ -109,8 +109,8 @@ diff -Naur node_modules/@react-navigation/stack/src/navigators/createStackNaviga
109109
- typeof StackNavigator
110110
->(StackNavigator);
111111
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
112+
--- node_modules/@react-navigation/stack/src/types.tsx 2020-01-07 15:54:09.000000000 +0100
113+
+++ src/vendor/types.tsx 2020-01-07 16:06:06.000000000 +0100
114114
@@ -8,13 +8,28 @@
115115
} from 'react-native';
116116
import { EdgeInsets } from 'react-native-safe-area-context';
@@ -255,16 +255,26 @@ diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.t
255255

256256
export type StackNavigationConfig = {
257257
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
260-
@@ -1,5 +1,5 @@
258+
--- node_modules/@react-navigation/stack/src/views/Header/Header.tsx 2020-01-07 15:54:09.000000000 +0100
259+
+++ src/vendor/views/Header/Header.tsx 2020-01-07 16:06:09.000000000 +0100
260+
@@ -1,11 +1,13 @@
261261
import * as React from 'react';
262262
-import { StackActions } from '@react-navigation/routers';
263+
+import { Dimensions } from 'react-native';
263264
+import { StackActions } from 'react-navigation';
265+
+import { getStatusBarHeight } from 'react-native-iphone-x-helper';
264266

265-
import HeaderSegment from './HeaderSegment';
267+
-import HeaderSegment from './HeaderSegment';
268+
+import HeaderSegment, { getDefaultHeaderHeight } from './HeaderSegment';
266269
import { StackHeaderProps, StackHeaderTitleProps } from '../../types';
267-
@@ -21,7 +21,7 @@
270+
import HeaderTitle from './HeaderTitle';
271+
272+
-export default React.memo(function Header(props: StackHeaderProps) {
273+
+const Header = React.memo(function Header(props: StackHeaderProps) {
274+
const {
275+
scene,
276+
previous,
277+
@@ -21,7 +23,7 @@
268278
? options.headerTitle
269279
: options.title !== undefined
270280
? options.title
@@ -273,7 +283,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/
273283

274284
let leftLabel;
275285

276-
@@ -37,7 +37,7 @@
286+
@@ -37,7 +39,7 @@
277287
? o.headerTitle
278288
: o.title !== undefined
279289
? o.title
@@ -282,7 +292,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/
282292
}
283293

284294
return (
285-
@@ -55,11 +55,8 @@
295+
@@ -55,14 +57,26 @@
286296
}
287297
onGoBack={
288298
previous
@@ -296,9 +306,27 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/
296306
: undefined
297307
}
298308
styleInterpolator={styleInterpolator}
309+
/>
310+
);
311+
});
312+
+
313+
+Object.defineProperty(Header, 'HEIGHT', {
314+
+ get() {
315+
+ console.warn(
316+
+ "Deprecation in 'createStackNavigator': 'Header.HEIGHT' will be removed in a future version. Use 'useHeaderHeight' or 'HeaderHeightContext' instead"
317+
+ );
318+
+
319+
+ return getDefaultHeaderHeight(
320+
+ Dimensions.get('window'),
321+
+ getStatusBarHeight(true)
322+
+ );
323+
+ },
324+
+});
325+
+
326+
+export default Header;
299327
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
328+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx 2020-01-07 15:54:09.000000000 +0100
329+
+++ src/vendor/views/Header/HeaderBackButton.tsx 2020-01-07 16:06:06.000000000 +0100
302330
@@ -8,9 +8,9 @@
303331
StyleSheet,
304332
LayoutChangeEvent,
@@ -311,8 +339,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackButto
311339

312340
type Props = StackHeaderLeftButtonProps;
313341
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
342+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx 2020-01-07 15:54:09.000000000 +0100
343+
+++ src/vendor/views/Header/HeaderBackground.tsx 2020-01-07 16:06:06.000000000 +0100
316344
@@ -1,6 +1,6 @@
317345
import * as React from 'react';
318346
import { Animated, StyleSheet, Platform, ViewProps } from 'react-native';
@@ -322,8 +350,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackgroun
322350
export default function HeaderBackground({ style, ...rest }: ViewProps) {
323351
const { colors } = useTheme();
324352
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
353+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx 2020-01-07 15:54:09.000000000 +0100
354+
+++ src/vendor/views/Header/HeaderContainer.tsx 2020-01-07 16:06:06.000000000 +0100
327355
@@ -1,16 +1,13 @@
328356
import * as React from 'react';
329357
import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -356,8 +384,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer
356384
};
357385

358386
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
387+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx 2020-01-07 15:54:09.000000000 +0100
388+
+++ src/vendor/views/Header/HeaderSegment.tsx 2020-01-07 16:06:06.000000000 +0100
361389
@@ -8,7 +8,7 @@
362390
ViewStyle,
363391
} from 'react-native';
@@ -377,8 +405,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.t
377405
};
378406

379407
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
408+
--- node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx 2020-01-07 15:54:09.000000000 +0100
409+
+++ src/vendor/views/Header/HeaderTitle.tsx 2020-01-07 16:06:06.000000000 +0100
382410
@@ -1,6 +1,6 @@
383411
import * as React from 'react';
384412
import { Animated, StyleSheet, Platform, TextProps } from 'react-native';
@@ -388,9 +416,9 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx
388416
type Props = TextProps & {
389417
tintColor?: string;
390418
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
393-
@@ -452,7 +452,7 @@
419+
--- node_modules/@react-navigation/stack/src/views/Stack/Card.tsx 2020-01-07 15:54:09.000000000 +0100
420+
+++ src/vendor/views/Stack/Card.tsx 2020-01-07 16:06:06.000000000 +0100
421+
@@ -483,7 +483,7 @@
394422
pointerEvents="none"
395423
/>
396424
) : null}
@@ -400,8 +428,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/ven
400428
<CardAnimationContext.Provider value={animationContext}>
401429
{children}
402430
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
431+
--- node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx 2020-01-07 15:54:09.000000000 +0100
432+
+++ src/vendor/views/Stack/CardContainer.tsx 2020-01-07 16:06:06.000000000 +0100
405433
@@ -1,11 +1,17 @@
406434
import * as React from 'react';
407435
import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -433,8 +461,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardContainer.ts
433461
>
434462
<View style={styles.container}>
435463
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
464+
--- node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx 2020-01-07 15:54:09.000000000 +0100
465+
+++ src/vendor/views/Stack/CardStack.tsx 2020-01-07 16:06:06.000000000 +0100
438466
@@ -11,8 +11,7 @@
439467
import { EdgeInsets } from 'react-native-safe-area-context';
440468
// eslint-disable-next-line import/no-unresolved
@@ -454,8 +482,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx sr
454482
StackHeaderMode,
455483
StackCardMode,
456484
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
485+
--- node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx 2020-01-07 15:54:09.000000000 +0100
486+
+++ src/vendor/views/Stack/StackView.tsx 2020-01-07 16:06:06.000000000 +0100
459487
@@ -1,8 +1,11 @@
460488
import * as React from 'react';
461489
import { Platform } from 'react-native';

0 commit comments

Comments
 (0)