@react-navigation/elements 2.9.7 → 2.9.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/Screen.js +15 -17
- package/lib/module/Screen.js.map +1 -1
- package/lib/typescript/src/Screen.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/Screen.tsx +14 -20
package/lib/module/Screen.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { NavigationProvider } from '@react-navigation/native';
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import { StyleSheet, View } from 'react-native';
|
|
6
6
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
@@ -41,22 +41,20 @@ export function Screen(props) {
|
|
|
41
41
|
// that we won't render unnecessary views due to the view flattening.
|
|
42
42
|
,
|
|
43
43
|
collapsable: false,
|
|
44
|
-
children: [headerShown ? /*#__PURE__*/_jsx(
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
children: header
|
|
59
|
-
})
|
|
44
|
+
children: [headerShown ? /*#__PURE__*/_jsx(NavigationProvider, {
|
|
45
|
+
route: route,
|
|
46
|
+
navigation: navigation,
|
|
47
|
+
children: /*#__PURE__*/_jsx(View, {
|
|
48
|
+
ref: headerRef,
|
|
49
|
+
pointerEvents: "box-none",
|
|
50
|
+
onLayout: e => {
|
|
51
|
+
const {
|
|
52
|
+
height
|
|
53
|
+
} = e.nativeEvent.layout;
|
|
54
|
+
setHeaderHeight(height);
|
|
55
|
+
},
|
|
56
|
+
style: [styles.header, headerTransparent ? styles.absolute : null],
|
|
57
|
+
children: header
|
|
60
58
|
})
|
|
61
59
|
}) : null, /*#__PURE__*/_jsx(View, {
|
|
62
60
|
style: styles.content,
|
package/lib/module/Screen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["NavigationProvider","React","StyleSheet","View","useSafeAreaInsets","Background","getDefaultHeaderHeight","HeaderHeightContext","HeaderShownContext","useFrameSize","jsx","_jsx","jsxs","_jsxs","Screen","props","insets","isParentHeaderShown","useContext","parentHeaderHeight","focused","modal","header","headerShown","headerTransparent","headerStatusBarHeight","top","navigation","route","children","style","defaultHeaderHeight","size","headerRef","useRef","headerHeight","setHeaderHeight","useState","useLayoutEffect","current","measure","_x","_y","_width","height","name","styles","container","collapsable","ref","pointerEvents","onLayout","e","nativeEvent","layout","absolute","content","Provider","value","create","flex","zIndex","position","start","end"],"sourceRoot":"../../src","sources":["Screen.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../../src/Screen.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../../src/Screen.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EAEnB,KAAK,aAAa,EAClB,KAAK,SAAS,EACf,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,QAAQ,EACR,KAAK,SAAS,EAGd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAStB,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAC1C,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;IAChC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IACzD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF,wBAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,2CAsElC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/elements",
|
|
3
3
|
"description": "UI Components for React Navigation",
|
|
4
|
-
"version": "2.9.
|
|
4
|
+
"version": "2.9.9",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
7
7
|
"react-navigation",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@jest/globals": "^30.0.0",
|
|
51
51
|
"@react-native-masked-view/masked-view": "0.3.2",
|
|
52
|
-
"@react-navigation/native": "^7.1.
|
|
52
|
+
"@react-navigation/native": "^7.1.32",
|
|
53
53
|
"@testing-library/react-native": "^13.2.1",
|
|
54
54
|
"@types/react": "~19.0.10",
|
|
55
55
|
"@types/use-sync-external-store": "^1.5.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
64
64
|
"@react-native-masked-view/masked-view": ">= 0.2.0",
|
|
65
|
-
"@react-navigation/native": "^7.1.
|
|
65
|
+
"@react-navigation/native": "^7.1.32",
|
|
66
66
|
"react": ">= 18.2.0",
|
|
67
67
|
"react-native": "*",
|
|
68
68
|
"react-native-safe-area-context": ">= 4.0.0"
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
]
|
|
91
91
|
]
|
|
92
92
|
},
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "4d198b78523718c603e4919d86901204b05f109c"
|
|
94
94
|
}
|
package/src/Screen.tsx
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
|
-
NavigationContext,
|
|
3
2
|
type NavigationProp,
|
|
4
|
-
|
|
3
|
+
NavigationProvider,
|
|
5
4
|
type ParamListBase,
|
|
6
5
|
type RouteProp,
|
|
7
6
|
} from '@react-navigation/native';
|
|
@@ -76,25 +75,20 @@ export function Screen(props: Props) {
|
|
|
76
75
|
collapsable={false}
|
|
77
76
|
>
|
|
78
77
|
{headerShown ? (
|
|
79
|
-
<
|
|
80
|
-
<
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
const { height } = e.nativeEvent.layout;
|
|
78
|
+
<NavigationProvider route={route} navigation={navigation}>
|
|
79
|
+
<View
|
|
80
|
+
ref={headerRef}
|
|
81
|
+
pointerEvents="box-none"
|
|
82
|
+
onLayout={(e) => {
|
|
83
|
+
const { height } = e.nativeEvent.layout;
|
|
86
84
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
{header}
|
|
95
|
-
</View>
|
|
96
|
-
</NavigationRouteContext.Provider>
|
|
97
|
-
</NavigationContext.Provider>
|
|
85
|
+
setHeaderHeight(height);
|
|
86
|
+
}}
|
|
87
|
+
style={[styles.header, headerTransparent ? styles.absolute : null]}
|
|
88
|
+
>
|
|
89
|
+
{header}
|
|
90
|
+
</View>
|
|
91
|
+
</NavigationProvider>
|
|
98
92
|
) : null}
|
|
99
93
|
<View style={styles.content}>
|
|
100
94
|
<HeaderShownContext.Provider
|