@react-navigation/elements 1.3.19 → 1.3.21
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.
|
@@ -28,6 +28,10 @@ function Header(props) {
|
|
|
28
28
|
const insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
|
|
29
29
|
const frame = (0, _reactNativeSafeAreaContext.useSafeAreaFrame)();
|
|
30
30
|
const isParentHeaderShown = React.useContext(_HeaderShownContext.default);
|
|
31
|
+
|
|
32
|
+
// On models with Dynamic Island the status bar height is smaller than the safe area top inset.
|
|
33
|
+
const hasDynamicIsland = _reactNative.Platform.OS === 'ios' && insets.top > 50;
|
|
34
|
+
const statusBarHeight = hasDynamicIsland ? insets.top - 5 : insets.top;
|
|
31
35
|
const {
|
|
32
36
|
layout = frame,
|
|
33
37
|
modal = false,
|
|
@@ -53,7 +57,7 @@ function Header(props) {
|
|
|
53
57
|
headerShadowVisible,
|
|
54
58
|
headerPressColor,
|
|
55
59
|
headerPressOpacity,
|
|
56
|
-
headerStatusBarHeight = isParentHeaderShown ? 0 :
|
|
60
|
+
headerStatusBarHeight = isParentHeaderShown ? 0 : statusBarHeight
|
|
57
61
|
} = props;
|
|
58
62
|
const defaultHeight = (0, _getDefaultHeaderHeight.default)(layout, modal, headerStatusBarHeight);
|
|
59
63
|
const {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["warnIfHeaderStylesDefined","styles","Object","keys","forEach","styleProp","value","console","warn","undefined","Header","props","insets","useSafeAreaInsets","frame","useSafeAreaFrame","isParentHeaderShown","React","useContext","HeaderShownContext","layout","modal","title","headerTitle","customTitle","headerTitleAlign","
|
|
1
|
+
{"version":3,"names":["warnIfHeaderStylesDefined","styles","Object","keys","forEach","styleProp","value","console","warn","undefined","Header","props","insets","useSafeAreaInsets","frame","useSafeAreaFrame","isParentHeaderShown","React","useContext","HeaderShownContext","hasDynamicIsland","Platform","OS","top","statusBarHeight","layout","modal","title","headerTitle","customTitle","headerTitleAlign","select","ios","default","headerLeft","headerLeftLabelVisible","headerTransparent","headerTintColor","headerBackground","headerRight","headerTitleAllowFontScaling","titleAllowFontScaling","headerTitleStyle","titleStyle","headerLeftContainerStyle","leftContainerStyle","headerRightContainerStyle","rightContainerStyle","headerTitleContainerStyle","titleContainerStyle","headerBackgroundContainerStyle","backgroundContainerStyle","headerStyle","customHeaderStyle","headerShadowVisible","headerPressColor","headerPressOpacity","headerStatusBarHeight","defaultHeight","getDefaultHeaderHeight","height","minHeight","maxHeight","backgroundColor","borderBottomColor","borderBottomEndRadius","borderBottomLeftRadius","borderBottomRightRadius","borderBottomStartRadius","borderBottomWidth","borderColor","borderEndColor","borderEndWidth","borderLeftColor","borderLeftWidth","borderRadius","borderRightColor","borderRightWidth","borderStartColor","borderStartWidth","borderStyle","borderTopColor","borderTopEndRadius","borderTopLeftRadius","borderTopRightRadius","borderTopStartRadius","borderTopWidth","borderWidth","boxShadow","elevation","shadowColor","shadowOffset","shadowOpacity","shadowRadius","opacity","transform","unsafeStyles","StyleSheet","flatten","process","env","NODE_ENV","safeStyles","backgroundStyle","leftButton","tintColor","pressColor","pressOpacity","labelVisible","rightButton","absoluteFill","zIndex","style","content","left","expand","marginStart","maxWidth","width","Math","max","right","children","allowFontScaling","marginEnd","create","flex","flexDirection","alignItems","marginHorizontal","justifyContent","flexGrow","flexBasis"],"sourceRoot":"../../../src","sources":["Header/Header.tsx"],"mappings":"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"}
|
|
@@ -19,6 +19,10 @@ export default function Header(props) {
|
|
|
19
19
|
const insets = useSafeAreaInsets();
|
|
20
20
|
const frame = useSafeAreaFrame();
|
|
21
21
|
const isParentHeaderShown = React.useContext(HeaderShownContext);
|
|
22
|
+
|
|
23
|
+
// On models with Dynamic Island the status bar height is smaller than the safe area top inset.
|
|
24
|
+
const hasDynamicIsland = Platform.OS === 'ios' && insets.top > 50;
|
|
25
|
+
const statusBarHeight = hasDynamicIsland ? insets.top - 5 : insets.top;
|
|
22
26
|
const {
|
|
23
27
|
layout = frame,
|
|
24
28
|
modal = false,
|
|
@@ -44,7 +48,7 @@ export default function Header(props) {
|
|
|
44
48
|
headerShadowVisible,
|
|
45
49
|
headerPressColor,
|
|
46
50
|
headerPressOpacity,
|
|
47
|
-
headerStatusBarHeight = isParentHeaderShown ? 0 :
|
|
51
|
+
headerStatusBarHeight = isParentHeaderShown ? 0 : statusBarHeight
|
|
48
52
|
} = props;
|
|
49
53
|
const defaultHeight = getDefaultHeaderHeight(layout, modal, headerStatusBarHeight);
|
|
50
54
|
const {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","Animated","Platform","StyleSheet","View","useSafeAreaFrame","useSafeAreaInsets","getDefaultHeaderHeight","HeaderBackground","HeaderShownContext","HeaderTitle","warnIfHeaderStylesDefined","styles","Object","keys","forEach","styleProp","value","console","warn","undefined","Header","props","insets","frame","isParentHeaderShown","useContext","layout","modal","title","headerTitle","customTitle","headerTitleAlign","select","ios","default","headerLeft","headerLeftLabelVisible","headerTransparent","headerTintColor","headerBackground","headerRight","headerTitleAllowFontScaling","titleAllowFontScaling","headerTitleStyle","titleStyle","headerLeftContainerStyle","leftContainerStyle","headerRightContainerStyle","rightContainerStyle","headerTitleContainerStyle","titleContainerStyle","headerBackgroundContainerStyle","backgroundContainerStyle","headerStyle","customHeaderStyle","headerShadowVisible","headerPressColor","headerPressOpacity","headerStatusBarHeight","
|
|
1
|
+
{"version":3,"names":["React","Animated","Platform","StyleSheet","View","useSafeAreaFrame","useSafeAreaInsets","getDefaultHeaderHeight","HeaderBackground","HeaderShownContext","HeaderTitle","warnIfHeaderStylesDefined","styles","Object","keys","forEach","styleProp","value","console","warn","undefined","Header","props","insets","frame","isParentHeaderShown","useContext","hasDynamicIsland","OS","top","statusBarHeight","layout","modal","title","headerTitle","customTitle","headerTitleAlign","select","ios","default","headerLeft","headerLeftLabelVisible","headerTransparent","headerTintColor","headerBackground","headerRight","headerTitleAllowFontScaling","titleAllowFontScaling","headerTitleStyle","titleStyle","headerLeftContainerStyle","leftContainerStyle","headerRightContainerStyle","rightContainerStyle","headerTitleContainerStyle","titleContainerStyle","headerBackgroundContainerStyle","backgroundContainerStyle","headerStyle","customHeaderStyle","headerShadowVisible","headerPressColor","headerPressOpacity","headerStatusBarHeight","defaultHeight","height","minHeight","maxHeight","backgroundColor","borderBottomColor","borderBottomEndRadius","borderBottomLeftRadius","borderBottomRightRadius","borderBottomStartRadius","borderBottomWidth","borderColor","borderEndColor","borderEndWidth","borderLeftColor","borderLeftWidth","borderRadius","borderRightColor","borderRightWidth","borderStartColor","borderStartWidth","borderStyle","borderTopColor","borderTopEndRadius","borderTopLeftRadius","borderTopRightRadius","borderTopStartRadius","borderTopWidth","borderWidth","boxShadow","elevation","shadowColor","shadowOffset","shadowOpacity","shadowRadius","opacity","transform","unsafeStyles","flatten","process","env","NODE_ENV","safeStyles","backgroundStyle","leftButton","tintColor","pressColor","pressOpacity","labelVisible","rightButton","absoluteFill","zIndex","style","content","left","expand","marginStart","maxWidth","width","Math","max","right","children","allowFontScaling","marginEnd","create","flex","flexDirection","alignItems","marginHorizontal","justifyContent","flexGrow","flexBasis"],"sourceRoot":"../../../src","sources":["Header/Header.tsx"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.d.ts","sourceRoot":"","sources":["../../../../src/Header/Header.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMtD,KAAK,KAAK,GAAG,aAAa,GAAG;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAkBF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"Header.d.ts","sourceRoot":"","sources":["../../../../src/Header/Header.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMtD,KAAK,KAAK,GAAG,aAAa,GAAG;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAkBF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,KAAK,eA2P1C"}
|
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": "1.3.
|
|
4
|
+
"version": "1.3.21",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
7
7
|
"react-navigation",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@react-native-masked-view/masked-view": "0.2.9",
|
|
41
|
-
"@react-navigation/native": "^6.1.
|
|
41
|
+
"@react-navigation/native": "^6.1.9",
|
|
42
42
|
"@testing-library/react-native": "^11.5.0",
|
|
43
43
|
"@types/react": "~18.0.27",
|
|
44
44
|
"@types/react-native": "~0.71.3",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
]
|
|
69
69
|
]
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "4797acee6a4e0acf87d82840caaa134f5ca060a4"
|
|
72
72
|
}
|
package/src/Header/Header.tsx
CHANGED
|
@@ -48,6 +48,10 @@ export default function Header(props: Props) {
|
|
|
48
48
|
|
|
49
49
|
const isParentHeaderShown = React.useContext(HeaderShownContext);
|
|
50
50
|
|
|
51
|
+
// On models with Dynamic Island the status bar height is smaller than the safe area top inset.
|
|
52
|
+
const hasDynamicIsland = Platform.OS === 'ios' && insets.top > 50;
|
|
53
|
+
const statusBarHeight = hasDynamicIsland ? insets.top - 5 : insets.top;
|
|
54
|
+
|
|
51
55
|
const {
|
|
52
56
|
layout = frame,
|
|
53
57
|
modal = false,
|
|
@@ -73,7 +77,7 @@ export default function Header(props: Props) {
|
|
|
73
77
|
headerShadowVisible,
|
|
74
78
|
headerPressColor,
|
|
75
79
|
headerPressOpacity,
|
|
76
|
-
headerStatusBarHeight = isParentHeaderShown ? 0 :
|
|
80
|
+
headerStatusBarHeight = isParentHeaderShown ? 0 : statusBarHeight,
|
|
77
81
|
} = props;
|
|
78
82
|
|
|
79
83
|
const defaultHeight = getDefaultHeaderHeight(
|