@react-navigation/elements 2.8.2 → 2.8.4
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.
|
@@ -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":"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.4",
|
|
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.22",
|
|
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.22",
|
|
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": "5a9c8b779496bf2b6fef803e4132f4d12b53f583"
|
|
95
95
|
}
|
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
|
}
|