@react-navigation/drawer 7.0.0-rc.1 → 7.0.0-rc.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/commonjs/views/DrawerContentScrollView.js +5 -4
- package/lib/commonjs/views/DrawerContentScrollView.js.map +1 -1
- package/lib/commonjs/views/DrawerItem.js +1 -3
- package/lib/commonjs/views/DrawerItem.js.map +1 -1
- package/lib/module/views/DrawerContentScrollView.js +5 -4
- package/lib/module/views/DrawerContentScrollView.js.map +1 -1
- package/lib/module/views/DrawerItem.js +1 -3
- package/lib/module/views/DrawerItem.js.map +1 -1
- package/lib/typescript/src/views/DrawerContentScrollView.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/views/DrawerContentScrollView.tsx +6 -4
- package/src/views/DrawerItem.tsx +1 -3
|
@@ -12,6 +12,7 @@ var _DrawerPositionContext = require("../utils/DrawerPositionContext");
|
|
|
12
12
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
13
13
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
14
14
|
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
15
|
+
const SPACING = 12;
|
|
15
16
|
function DrawerContentScrollViewInner({
|
|
16
17
|
contentContainerStyle,
|
|
17
18
|
style,
|
|
@@ -27,10 +28,10 @@ function DrawerContentScrollViewInner({
|
|
|
27
28
|
return /*#__PURE__*/React.createElement(_reactNative.ScrollView, _extends({}, rest, {
|
|
28
29
|
ref: ref,
|
|
29
30
|
contentContainerStyle: [{
|
|
30
|
-
paddingTop: insets.top
|
|
31
|
-
paddingBottom: insets.bottom
|
|
32
|
-
paddingStart: !isRight ? insets.left : 0,
|
|
33
|
-
paddingEnd: isRight ? insets.right : 0
|
|
31
|
+
paddingTop: SPACING + insets.top,
|
|
32
|
+
paddingBottom: SPACING + insets.bottom,
|
|
33
|
+
paddingStart: SPACING + (!isRight ? insets.left : 0),
|
|
34
|
+
paddingEnd: SPACING + (isRight ? insets.right : 0)
|
|
34
35
|
}, contentContainerStyle],
|
|
35
36
|
style: [styles.container, style]
|
|
36
37
|
}), children);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_native","require","React","_interopRequireWildcard","_reactNative","_reactNativeSafeAreaContext","_DrawerPositionContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","DrawerContentScrollViewInner","contentContainerStyle","style","children","rest","ref","drawerPosition","useContext","DrawerPositionContext","insets","useSafeAreaInsets","direction","useLocale","isRight","createElement","ScrollView","paddingTop","top","paddingBottom","bottom","paddingStart","left","paddingEnd","right","styles","container","DrawerContentScrollView","exports","forwardRef","StyleSheet","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerContentScrollView.tsx"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,2BAAA,GAAAJ,OAAA;AAEA,IAAAK,sBAAA,GAAAL,OAAA;AAAuE,SAAAM,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAW,SAAA,WAAAA,QAAA,GAAAR,MAAA,CAAAS,MAAA,GAAAT,MAAA,CAAAS,MAAA,CAAAC,IAAA,eAAAb,CAAA,aAAAR,CAAA,MAAAA,CAAA,GAAAsB,SAAA,CAAAC,MAAA,EAAAvB,CAAA,UAAAG,CAAA,GAAAmB,SAAA,CAAAtB,CAAA,YAAAE,CAAA,IAAAC,CAAA,OAAAY,cAAA,CAAAC,IAAA,CAAAb,CAAA,EAAAD,CAAA,MAAAM,CAAA,CAAAN,CAAA,IAAAC,CAAA,CAAAD,CAAA,aAAAM,CAAA,KAAAW,QAAA,CAAAK,KAAA,OAAAF,SAAA;AAMvE,
|
|
1
|
+
{"version":3,"names":["_native","require","React","_interopRequireWildcard","_reactNative","_reactNativeSafeAreaContext","_DrawerPositionContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","SPACING","DrawerContentScrollViewInner","contentContainerStyle","style","children","rest","ref","drawerPosition","useContext","DrawerPositionContext","insets","useSafeAreaInsets","direction","useLocale","isRight","createElement","ScrollView","paddingTop","top","paddingBottom","bottom","paddingStart","left","paddingEnd","right","styles","container","DrawerContentScrollView","exports","forwardRef","StyleSheet","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerContentScrollView.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -89,14 +89,12 @@ function DrawerItem(props) {
|
|
|
89
89
|
}
|
|
90
90
|
const styles = _reactNative.StyleSheet.create({
|
|
91
91
|
container: {
|
|
92
|
-
marginHorizontal: 12,
|
|
93
|
-
marginVertical: 2,
|
|
94
92
|
overflow: 'hidden'
|
|
95
93
|
},
|
|
96
94
|
wrapper: {
|
|
97
95
|
flexDirection: 'row',
|
|
98
96
|
alignItems: 'center',
|
|
99
|
-
paddingVertical:
|
|
97
|
+
paddingVertical: 11,
|
|
100
98
|
paddingStart: 16,
|
|
101
99
|
paddingEnd: 24
|
|
102
100
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_elements","require","_native","_color","_interopRequireDefault","React","_interopRequireWildcard","_reactNative","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","DrawerItem","props","colors","fonts","useTheme","href","icon","label","labelStyle","focused","allowFontScaling","activeTintColor","primary","inactiveTintColor","Color","text","alpha","rgb","string","activeBackgroundColor","inactiveBackgroundColor","style","onPress","pressColor","pressOpacity","testID","accessibilityLabel","rest","borderRadius","StyleSheet","flatten","color","backgroundColor","iconNode","size","createElement","View","collapsable","styles","container","PlatformPressable","accessibilityRole","accessibilityState","selected","wrapper","marginStart","Text","numberOfLines","labelText","medium","create","
|
|
1
|
+
{"version":3,"names":["_elements","require","_native","_color","_interopRequireDefault","React","_interopRequireWildcard","_reactNative","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","DrawerItem","props","colors","fonts","useTheme","href","icon","label","labelStyle","focused","allowFontScaling","activeTintColor","primary","inactiveTintColor","Color","text","alpha","rgb","string","activeBackgroundColor","inactiveBackgroundColor","style","onPress","pressColor","pressOpacity","testID","accessibilityLabel","rest","borderRadius","StyleSheet","flatten","color","backgroundColor","iconNode","size","createElement","View","collapsable","styles","container","PlatformPressable","accessibilityRole","accessibilityState","selected","wrapper","marginStart","Text","numberOfLines","labelText","medium","create","overflow","flexDirection","alignItems","paddingVertical","paddingStart","paddingEnd","marginEnd","marginVertical","flex","lineHeight","textAlignVertical"],"sourceRoot":"../../../src","sources":["views/DrawerItem.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,6 +4,7 @@ import * as React from 'react';
|
|
|
4
4
|
import { ScrollView, StyleSheet } from 'react-native';
|
|
5
5
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
6
6
|
import { DrawerPositionContext } from '../utils/DrawerPositionContext';
|
|
7
|
+
const SPACING = 12;
|
|
7
8
|
function DrawerContentScrollViewInner({
|
|
8
9
|
contentContainerStyle,
|
|
9
10
|
style,
|
|
@@ -19,10 +20,10 @@ function DrawerContentScrollViewInner({
|
|
|
19
20
|
return /*#__PURE__*/React.createElement(ScrollView, _extends({}, rest, {
|
|
20
21
|
ref: ref,
|
|
21
22
|
contentContainerStyle: [{
|
|
22
|
-
paddingTop: insets.top
|
|
23
|
-
paddingBottom: insets.bottom
|
|
24
|
-
paddingStart: !isRight ? insets.left : 0,
|
|
25
|
-
paddingEnd: isRight ? insets.right : 0
|
|
23
|
+
paddingTop: SPACING + insets.top,
|
|
24
|
+
paddingBottom: SPACING + insets.bottom,
|
|
25
|
+
paddingStart: SPACING + (!isRight ? insets.left : 0),
|
|
26
|
+
paddingEnd: SPACING + (isRight ? insets.right : 0)
|
|
26
27
|
}, contentContainerStyle],
|
|
27
28
|
style: [styles.container, style]
|
|
28
29
|
}), children);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useLocale","React","ScrollView","StyleSheet","useSafeAreaInsets","DrawerPositionContext","DrawerContentScrollViewInner","contentContainerStyle","style","children","rest","ref","drawerPosition","useContext","insets","direction","isRight","createElement","_extends","paddingTop","top","paddingBottom","bottom","paddingStart","left","paddingEnd","right","styles","container","DrawerContentScrollView","forwardRef","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerContentScrollView.tsx"],"mappings":";AAAA,SAASA,SAAS,QAAQ,0BAA0B;AACpD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,EAAwBC,UAAU,QAAQ,cAAc;AAC3E,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,qBAAqB,QAAQ,gCAAgC;AAMtE,SAASC,4BAA4BA,CACnC;EAAEC,qBAAqB;EAAEC,KAAK;EAAEC,QAAQ;EAAE,GAAGC;AAAY,CAAC,EAC1DC,GAA2B,EAC3B;EACA,MAAMC,cAAc,
|
|
1
|
+
{"version":3,"names":["useLocale","React","ScrollView","StyleSheet","useSafeAreaInsets","DrawerPositionContext","SPACING","DrawerContentScrollViewInner","contentContainerStyle","style","children","rest","ref","drawerPosition","useContext","insets","direction","isRight","createElement","_extends","paddingTop","top","paddingBottom","bottom","paddingStart","left","paddingEnd","right","styles","container","DrawerContentScrollView","forwardRef","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerContentScrollView.tsx"],"mappings":";AAAA,SAASA,SAAS,QAAQ,0BAA0B;AACpD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,EAAwBC,UAAU,QAAQ,cAAc;AAC3E,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,qBAAqB,QAAQ,gCAAgC;AAMtE,MAAMC,OAAO,GAAG,EAAE;AAElB,SAASC,4BAA4BA,CACnC;EAAEC,qBAAqB;EAAEC,KAAK;EAAEC,QAAQ;EAAE,GAAGC;AAAY,CAAC,EAC1DC,GAA2B,EAC3B;EACA,MAAMC,cAAc,GAAGZ,KAAK,CAACa,UAAU,CAACT,qBAAqB,CAAC;EAC9D,MAAMU,MAAM,GAAGX,iBAAiB,CAAC,CAAC;EAClC,MAAM;IAAEY;EAAU,CAAC,GAAGhB,SAAS,CAAC,CAAC;EAEjC,MAAMiB,OAAO,GACXD,SAAS,KAAK,KAAK,GACfH,cAAc,KAAK,MAAM,GACzBA,cAAc,KAAK,OAAO;EAEhC,oBACEZ,KAAA,CAAAiB,aAAA,CAAChB,UAAU,EAAAiB,QAAA,KACLR,IAAI;IACRC,GAAG,EAAEA,GAAI;IACTJ,qBAAqB,EAAE,CACrB;MACEY,UAAU,EAAEd,OAAO,GAAGS,MAAM,CAACM,GAAG;MAChCC,aAAa,EAAEhB,OAAO,GAAGS,MAAM,CAACQ,MAAM;MACtCC,YAAY,EAAElB,OAAO,IAAI,CAACW,OAAO,GAAGF,MAAM,CAACU,IAAI,GAAG,CAAC,CAAC;MACpDC,UAAU,EAAEpB,OAAO,IAAIW,OAAO,GAAGF,MAAM,CAACY,KAAK,GAAG,CAAC;IACnD,CAAC,EACDnB,qBAAqB,CACrB;IACFC,KAAK,EAAE,CAACmB,MAAM,CAACC,SAAS,EAAEpB,KAAK;EAAE,IAEhCC,QACS,CAAC;AAEjB;AAEA,OAAO,MAAMoB,uBAAuB,gBAAG7B,KAAK,CAAC8B,UAAU,CACrDxB,4BACF,CAAC;AAED,MAAMqB,MAAM,GAAGzB,UAAU,CAAC6B,MAAM,CAAC;EAC/BH,SAAS,EAAE;IACTI,IAAI,EAAE;EACR;AACF,CAAC,CAAC","ignoreList":[]}
|
|
@@ -80,14 +80,12 @@ export function DrawerItem(props) {
|
|
|
80
80
|
}
|
|
81
81
|
const styles = StyleSheet.create({
|
|
82
82
|
container: {
|
|
83
|
-
marginHorizontal: 12,
|
|
84
|
-
marginVertical: 2,
|
|
85
83
|
overflow: 'hidden'
|
|
86
84
|
},
|
|
87
85
|
wrapper: {
|
|
88
86
|
flexDirection: 'row',
|
|
89
87
|
alignItems: 'center',
|
|
90
|
-
paddingVertical:
|
|
88
|
+
paddingVertical: 11,
|
|
91
89
|
paddingStart: 16,
|
|
92
90
|
paddingEnd: 24
|
|
93
91
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PlatformPressable","Text","useTheme","Color","React","StyleSheet","View","DrawerItem","props","colors","fonts","href","icon","label","labelStyle","focused","allowFontScaling","activeTintColor","primary","inactiveTintColor","text","alpha","rgb","string","activeBackgroundColor","inactiveBackgroundColor","style","onPress","pressColor","pressOpacity","testID","accessibilityLabel","rest","borderRadius","flatten","color","backgroundColor","iconNode","size","createElement","_extends","collapsable","styles","container","accessibilityRole","accessibilityState","selected","wrapper","marginStart","numberOfLines","labelText","medium","create","
|
|
1
|
+
{"version":3,"names":["PlatformPressable","Text","useTheme","Color","React","StyleSheet","View","DrawerItem","props","colors","fonts","href","icon","label","labelStyle","focused","allowFontScaling","activeTintColor","primary","inactiveTintColor","text","alpha","rgb","string","activeBackgroundColor","inactiveBackgroundColor","style","onPress","pressColor","pressOpacity","testID","accessibilityLabel","rest","borderRadius","flatten","color","backgroundColor","iconNode","size","createElement","_extends","collapsable","styles","container","accessibilityRole","accessibilityState","selected","wrapper","marginStart","numberOfLines","labelText","medium","create","overflow","flexDirection","alignItems","paddingVertical","paddingStart","paddingEnd","marginEnd","marginVertical","flex","lineHeight","textAlignVertical"],"sourceRoot":"../../../src","sources":["views/DrawerItem.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerContentScrollView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerContentScrollView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAc,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"DrawerContentScrollView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerContentScrollView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAc,MAAM,cAAc,CAAC;AA4C5E,eAAO,MAAM,uBAAuB;cAtCxB,KAAK,CAAC,SAAS;oCAwC1B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/drawer",
|
|
3
3
|
"description": "Integration for the drawer component from react-native-drawer-layout",
|
|
4
|
-
"version": "7.0.0-rc.
|
|
4
|
+
"version": "7.0.0-rc.3",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native-component",
|
|
7
7
|
"react-component",
|
|
@@ -41,13 +41,13 @@
|
|
|
41
41
|
"clean": "del lib"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@react-navigation/elements": "^2.0.0-rc.
|
|
44
|
+
"@react-navigation/elements": "^2.0.0-rc.2",
|
|
45
45
|
"color": "^4.2.3",
|
|
46
46
|
"react-native-drawer-layout": "^4.0.0-rc.0",
|
|
47
47
|
"use-latest-callback": "^0.1.9"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@react-navigation/native": "^7.0.0-rc.
|
|
50
|
+
"@react-navigation/native": "^7.0.0-rc.2",
|
|
51
51
|
"@testing-library/react-native": "^12.4.3",
|
|
52
52
|
"@types/react": "~18.2.79",
|
|
53
53
|
"del-cli": "^5.1.0",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"typescript": "^5.5.2"
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
64
|
-
"@react-navigation/native": "^7.0.0-rc.
|
|
64
|
+
"@react-navigation/native": "^7.0.0-rc.2",
|
|
65
65
|
"react": ">= 18.2.0",
|
|
66
66
|
"react-native": ">= 0.72.0",
|
|
67
67
|
"react-native-gesture-handler": ">= 2.0.0",
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
]
|
|
84
84
|
]
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "37a511bd5ede1785c5a5a3f23bd505fd549f2a2f"
|
|
87
87
|
}
|
|
@@ -9,6 +9,8 @@ type Props = ScrollViewProps & {
|
|
|
9
9
|
children: React.ReactNode;
|
|
10
10
|
};
|
|
11
11
|
|
|
12
|
+
const SPACING = 12;
|
|
13
|
+
|
|
12
14
|
function DrawerContentScrollViewInner(
|
|
13
15
|
{ contentContainerStyle, style, children, ...rest }: Props,
|
|
14
16
|
ref?: React.Ref<ScrollView>
|
|
@@ -28,10 +30,10 @@ function DrawerContentScrollViewInner(
|
|
|
28
30
|
ref={ref}
|
|
29
31
|
contentContainerStyle={[
|
|
30
32
|
{
|
|
31
|
-
paddingTop: insets.top
|
|
32
|
-
paddingBottom: insets.bottom
|
|
33
|
-
paddingStart: !isRight ? insets.left : 0,
|
|
34
|
-
paddingEnd: isRight ? insets.right : 0,
|
|
33
|
+
paddingTop: SPACING + insets.top,
|
|
34
|
+
paddingBottom: SPACING + insets.bottom,
|
|
35
|
+
paddingStart: SPACING + (!isRight ? insets.left : 0),
|
|
36
|
+
paddingEnd: SPACING + (isRight ? insets.right : 0),
|
|
35
37
|
},
|
|
36
38
|
contentContainerStyle,
|
|
37
39
|
]}
|
package/src/views/DrawerItem.tsx
CHANGED
|
@@ -167,14 +167,12 @@ export function DrawerItem(props: Props) {
|
|
|
167
167
|
|
|
168
168
|
const styles = StyleSheet.create({
|
|
169
169
|
container: {
|
|
170
|
-
marginHorizontal: 12,
|
|
171
|
-
marginVertical: 2,
|
|
172
170
|
overflow: 'hidden',
|
|
173
171
|
},
|
|
174
172
|
wrapper: {
|
|
175
173
|
flexDirection: 'row',
|
|
176
174
|
alignItems: 'center',
|
|
177
|
-
paddingVertical:
|
|
175
|
+
paddingVertical: 11,
|
|
178
176
|
paddingStart: 16,
|
|
179
177
|
paddingEnd: 24,
|
|
180
178
|
},
|