@react-navigation/elements 2.8.1 → 2.8.2
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
CHANGED
|
@@ -27,7 +27,13 @@ export function Screen(props) {
|
|
|
27
27
|
style
|
|
28
28
|
} = props;
|
|
29
29
|
const defaultHeaderHeight = useFrameSize(size => getDefaultHeaderHeight(size, modal, headerStatusBarHeight));
|
|
30
|
+
const headerRef = React.useRef(null);
|
|
30
31
|
const [headerHeight, setHeaderHeight] = React.useState(defaultHeaderHeight);
|
|
32
|
+
React.useLayoutEffect(() => {
|
|
33
|
+
headerRef.current?.measure((_x, _y, _width, height) => {
|
|
34
|
+
setHeaderHeight(height);
|
|
35
|
+
});
|
|
36
|
+
}, [route.name]);
|
|
31
37
|
return /*#__PURE__*/_jsxs(Background, {
|
|
32
38
|
"aria-hidden": !focused,
|
|
33
39
|
style: [styles.container, style]
|
|
@@ -40,6 +46,7 @@ export function Screen(props) {
|
|
|
40
46
|
children: /*#__PURE__*/_jsx(NavigationRouteContext.Provider, {
|
|
41
47
|
value: route,
|
|
42
48
|
children: /*#__PURE__*/_jsx(View, {
|
|
49
|
+
ref: headerRef,
|
|
43
50
|
pointerEvents: "box-none",
|
|
44
51
|
onLayout: e => {
|
|
45
52
|
const {
|
package/lib/module/Screen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NavigationContext","NavigationRouteContext","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","headerHeight","setHeaderHeight","useState","styles","container","collapsable","Provider","value","pointerEvents","onLayout","e","
|
|
1
|
+
{"version":3,"names":["NavigationContext","NavigationRouteContext","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","Provider","value","ref","pointerEvents","onLayout","e","nativeEvent","layout","absolute","content","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,EAEL,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,
|
|
1
|
+
{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../../src/Screen.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,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,2CA2ElC"}
|
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.8.
|
|
4
|
+
"version": "2.8.2",
|
|
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.20",
|
|
53
53
|
"@testing-library/react-native": "^13.2.0",
|
|
54
54
|
"@types/color": "^4.2.0",
|
|
55
55
|
"@types/react": "~19.0.10",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
},
|
|
64
64
|
"peerDependencies": {
|
|
65
65
|
"@react-native-masked-view/masked-view": ">= 0.2.0",
|
|
66
|
-
"@react-navigation/native": "^7.1.
|
|
66
|
+
"@react-navigation/native": "^7.1.20",
|
|
67
67
|
"react": ">= 18.2.0",
|
|
68
68
|
"react-native": "*",
|
|
69
69
|
"react-native-safe-area-context": ">= 4.0.0"
|
|
@@ -91,5 +91,5 @@
|
|
|
91
91
|
]
|
|
92
92
|
]
|
|
93
93
|
},
|
|
94
|
-
"gitHead": "
|
|
94
|
+
"gitHead": "2c9388b71c2b593b06ef7d42d3d2f37a9159f3e0"
|
|
95
95
|
}
|
package/src/Screen.tsx
CHANGED
|
@@ -57,8 +57,16 @@ export function Screen(props: Props) {
|
|
|
57
57
|
getDefaultHeaderHeight(size, modal, headerStatusBarHeight)
|
|
58
58
|
);
|
|
59
59
|
|
|
60
|
+
const headerRef = React.useRef<View>(null);
|
|
61
|
+
|
|
60
62
|
const [headerHeight, setHeaderHeight] = React.useState(defaultHeaderHeight);
|
|
61
63
|
|
|
64
|
+
React.useLayoutEffect(() => {
|
|
65
|
+
headerRef.current?.measure((_x, _y, _width, height) => {
|
|
66
|
+
setHeaderHeight(height);
|
|
67
|
+
});
|
|
68
|
+
}, [route.name]);
|
|
69
|
+
|
|
62
70
|
return (
|
|
63
71
|
<Background
|
|
64
72
|
aria-hidden={!focused}
|
|
@@ -71,6 +79,7 @@ export function Screen(props: Props) {
|
|
|
71
79
|
<NavigationContext.Provider value={navigation}>
|
|
72
80
|
<NavigationRouteContext.Provider value={route}>
|
|
73
81
|
<View
|
|
82
|
+
ref={headerRef}
|
|
74
83
|
pointerEvents="box-none"
|
|
75
84
|
onLayout={(e) => {
|
|
76
85
|
const { height } = e.nativeEvent.layout;
|