@react-navigation/elements 2.8.1 → 2.8.3
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 +7 -0
- package/lib/module/Screen.js.map +1 -1
- package/lib/module/useFrameSize.js +20 -10
- package/lib/module/useFrameSize.js.map +1 -1
- package/lib/typescript/src/Screen.d.ts.map +1 -1
- package/lib/typescript/src/useFrameSize.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/Screen.tsx +9 -0
- package/src/useFrameSize.tsx +17 -5
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,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import * as React from 'react';
|
|
4
|
-
import { Platform, StyleSheet } from 'react-native';
|
|
4
|
+
import { Platform, StyleSheet, View } from 'react-native';
|
|
5
5
|
import {
|
|
6
6
|
// eslint-disable-next-line no-restricted-imports
|
|
7
7
|
useSafeAreaFrame } from 'react-native-safe-area-context';
|
|
@@ -101,18 +101,28 @@ function FrameSizeProviderInner({
|
|
|
101
101
|
listeners.current.forEach(listener => listener());
|
|
102
102
|
});
|
|
103
103
|
return /*#__PURE__*/_jsxs(_Fragment, {
|
|
104
|
-
children: [
|
|
104
|
+
children: [/*#__PURE__*/_jsx(FrameContext.Provider, {
|
|
105
|
+
value: context,
|
|
106
|
+
children: children
|
|
107
|
+
}), Platform.OS === 'web' ? /*#__PURE__*/_jsx(FrameSizeListenerWeb, {
|
|
105
108
|
onChange: onChange
|
|
106
109
|
}) : typeof SafeAreaListener === 'undefined' ? /*#__PURE__*/_jsx(FrameSizeListenerNativeFallback, {
|
|
107
110
|
onChange: onChange
|
|
108
|
-
}) :
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
111
|
+
}) :
|
|
112
|
+
/*#__PURE__*/
|
|
113
|
+
/**
|
|
114
|
+
* Passing `pointerEvents="none"` to `SafeAreaListener` doesn't work
|
|
115
|
+
* So we wrap it in a `View` and disable pointer events on it
|
|
116
|
+
*/
|
|
117
|
+
_jsx(View, {
|
|
118
|
+
style: StyleSheet.absoluteFill,
|
|
119
|
+
pointerEvents: "none",
|
|
120
|
+
children: /*#__PURE__*/_jsx(SafeAreaListener, {
|
|
121
|
+
onChange: ({
|
|
122
|
+
frame
|
|
123
|
+
}) => onChange(frame),
|
|
124
|
+
style: StyleSheet.absoluteFill
|
|
125
|
+
})
|
|
116
126
|
})]
|
|
117
127
|
});
|
|
118
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","Platform","StyleSheet","useSafeAreaFrame","useLatestCallback","useSyncExternalStoreWithSelector","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","SafeAreaListener","require","FrameContext","createContext","undefined","useFrameSize","selector","throttle","context","useContext","Error","value","subscribeThrottled","subscribe","getCurrent","FrameSizeProvider","initialFrame","children","FrameSizeProviderInner","frameRef","useRef","width","height","listeners","Set","current","listener","add","delete","delay","timer","updated","waiting","throttledListener","clearTimeout","setTimeout","unsubscribe","useMemo","onChange","frame","forEach","OS","FrameSizeListenerWeb","FrameSizeListenerNativeFallback","style","absoluteFill","
|
|
1
|
+
{"version":3,"names":["React","Platform","StyleSheet","View","useSafeAreaFrame","useLatestCallback","useSyncExternalStoreWithSelector","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","SafeAreaListener","require","FrameContext","createContext","undefined","useFrameSize","selector","throttle","context","useContext","Error","value","subscribeThrottled","subscribe","getCurrent","FrameSizeProvider","initialFrame","children","FrameSizeProviderInner","frameRef","useRef","width","height","listeners","Set","current","listener","add","delete","delay","timer","updated","waiting","throttledListener","clearTimeout","setTimeout","unsubscribe","useMemo","onChange","frame","forEach","Provider","OS","FrameSizeListenerWeb","FrameSizeListenerNativeFallback","style","absoluteFill","pointerEvents","useLayoutEffect","elementRef","useEffect","rect","getBoundingClientRect","observer","ResizeObserver","entries","entry","contentRect","observe","disconnect","ref","position","left","right","top","bottom","visibility"],"sourceRoot":"../../src","sources":["useFrameSize.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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFrameSize.d.ts","sourceRoot":"","sources":["../../../src/useFrameSize.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAEL,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"useFrameSize.d.ts","sourceRoot":"","sources":["../../../src/useFrameSize.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAEL,KAAK,SAAS,EAGd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAetB,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAgBF,wBAAgB,YAAY,CAAC,CAAC,EAC5B,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,EAC7B,QAAQ,CAAC,EAAE,OAAO,GACjB,CAAC,CAeH;AAED,KAAK,sBAAsB,GAAG;IAC5B,YAAY,EAAE,KAAK,CAAC;IACpB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAChC,YAAY,EACZ,QAAQ,GACT,EAAE,sBAAsB,yTAaxB"}
|
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.3",
|
|
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.21",
|
|
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.21",
|
|
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": "c5c20929fa8370a72c40bf719e00a8118dff7a50"
|
|
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;
|
package/src/useFrameSize.tsx
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
Platform,
|
|
4
4
|
type StyleProp,
|
|
5
5
|
StyleSheet,
|
|
6
|
+
View,
|
|
6
7
|
type ViewStyle,
|
|
7
8
|
} from 'react-native';
|
|
8
9
|
import {
|
|
@@ -168,17 +169,28 @@ function FrameSizeProviderInner({
|
|
|
168
169
|
|
|
169
170
|
return (
|
|
170
171
|
<>
|
|
172
|
+
<FrameContext.Provider value={context}>{children}</FrameContext.Provider>
|
|
173
|
+
{/**
|
|
174
|
+
* The frame size listener must come after the content
|
|
175
|
+
* This makes sure that any nested navigator is in the first descendant chain
|
|
176
|
+
* This heuristic is used by react-native-screens to find nested navigators
|
|
177
|
+
*/}
|
|
171
178
|
{Platform.OS === 'web' ? (
|
|
172
179
|
<FrameSizeListenerWeb onChange={onChange} />
|
|
173
180
|
) : typeof SafeAreaListener === 'undefined' ? (
|
|
174
181
|
<FrameSizeListenerNativeFallback onChange={onChange} />
|
|
175
182
|
) : (
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
183
|
+
/**
|
|
184
|
+
* Passing `pointerEvents="none"` to `SafeAreaListener` doesn't work
|
|
185
|
+
* So we wrap it in a `View` and disable pointer events on it
|
|
186
|
+
*/
|
|
187
|
+
<View style={StyleSheet.absoluteFill} pointerEvents="none">
|
|
188
|
+
<SafeAreaListener
|
|
189
|
+
onChange={({ frame }) => onChange(frame)}
|
|
190
|
+
style={StyleSheet.absoluteFill}
|
|
191
|
+
/>
|
|
192
|
+
</View>
|
|
180
193
|
)}
|
|
181
|
-
<FrameContext.Provider value={context}>{children}</FrameContext.Provider>
|
|
182
194
|
</>
|
|
183
195
|
);
|
|
184
196
|
}
|