@react-navigation/drawer 8.0.0-alpha.40 → 8.0.0-alpha.41
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/views/DrawerItem.js +9 -34
- package/lib/module/views/DrawerItem.js.map +1 -1
- package/lib/module/views/DrawerItemList.js +5 -3
- package/lib/module/views/DrawerItemList.js.map +1 -1
- package/lib/module/views/DrawerToggleButton.js +5 -18
- package/lib/module/views/DrawerToggleButton.js.map +1 -1
- package/lib/typescript/src/views/DrawerItem.d.ts +1 -1
- package/lib/typescript/src/views/DrawerItem.d.ts.map +1 -1
- package/lib/typescript/src/views/DrawerItemList.d.ts.map +1 -1
- package/lib/typescript/src/views/DrawerToggleButton.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/views/DrawerItem.tsx +9 -39
- package/src/views/DrawerItemList.tsx +7 -5
- package/src/views/DrawerToggleButton.tsx +9 -27
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { PlatformPressable, Text } from '@react-navigation/elements';
|
|
3
|
+
import { PlatformIcon, PlatformPressable, Text } from '@react-navigation/elements';
|
|
4
4
|
import { Color } from '@react-navigation/elements/internal';
|
|
5
|
-
import {
|
|
6
|
-
import React from 'react';
|
|
7
|
-
import {
|
|
5
|
+
import { useTheme } from '@react-navigation/native';
|
|
6
|
+
import * as React from 'react';
|
|
7
|
+
import { Platform, StyleSheet, View } from 'react-native';
|
|
8
8
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
9
9
|
/**
|
|
10
10
|
* A component used to show an action item with an icon and a label in a navigation drawer.
|
|
@@ -52,36 +52,11 @@ export function DrawerItem(props) {
|
|
|
52
52
|
return iconValue;
|
|
53
53
|
}
|
|
54
54
|
if (typeof iconValue === 'object' && iconValue != null && 'type' in iconValue) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
width: size,
|
|
61
|
-
height: size,
|
|
62
|
-
tintColor: iconValue.tinted === false ? undefined : color
|
|
63
|
-
}
|
|
64
|
-
});
|
|
65
|
-
case 'sfSymbol':
|
|
66
|
-
return /*#__PURE__*/_jsx(SFSymbol, {
|
|
67
|
-
name: iconValue.name,
|
|
68
|
-
size: size,
|
|
69
|
-
color: color
|
|
70
|
-
});
|
|
71
|
-
case 'materialSymbol':
|
|
72
|
-
return /*#__PURE__*/_jsx(MaterialSymbol, {
|
|
73
|
-
name: iconValue.name,
|
|
74
|
-
variant: iconValue.variant,
|
|
75
|
-
weight: iconValue.weight,
|
|
76
|
-
size: size,
|
|
77
|
-
color: color
|
|
78
|
-
});
|
|
79
|
-
default:
|
|
80
|
-
{
|
|
81
|
-
const _exhaustiveCheck = iconValue;
|
|
82
|
-
return _exhaustiveCheck;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
55
|
+
return /*#__PURE__*/_jsx(PlatformIcon, {
|
|
56
|
+
icon: iconValue,
|
|
57
|
+
size: size,
|
|
58
|
+
color: color
|
|
59
|
+
});
|
|
85
60
|
}
|
|
86
61
|
return null;
|
|
87
62
|
}, [icon, focused, color]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PlatformPressable","Text","Color","
|
|
1
|
+
{"version":3,"names":["PlatformIcon","PlatformPressable","Text","Color","useTheme","React","Platform","StyleSheet","View","jsx","_jsx","jsxs","_jsxs","DrawerItem","props","colors","fonts","href","icon","label","labelStyle","focused","allowFontScaling","activeTintColor","primary","inactiveTintColor","activeBackgroundColor","inactiveBackgroundColor","style","onPress","pressColor","pressOpacity","testID","accessibilityLabel","rest","borderRadius","flatten","color","text","alpha","string","backgroundColor","iconNode","useMemo","size","iconValue","isValidElement","collapsable","styles","container","children","role","OS","undefined","hoverEffect","wrapper","marginStart","numberOfLines","labelText","medium","create","borderCurve","select","android","overflow","default","flexDirection","alignItems","paddingVertical","paddingStart","paddingEnd","marginEnd","marginVertical","flex","lineHeight","textAlignVertical"],"sourceRoot":"../../../src","sources":["views/DrawerItem.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -39,9 +39,11 @@ export function DrawerItemList({
|
|
|
39
39
|
canPreventDefault: true
|
|
40
40
|
});
|
|
41
41
|
if (!event.defaultPrevented) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
React.startTransition(() => {
|
|
43
|
+
navigation.dispatch({
|
|
44
|
+
...(focused ? DrawerActions.closeDrawer() : CommonActions.navigate(route.name, route.params)),
|
|
45
|
+
target: state.key
|
|
46
|
+
});
|
|
45
47
|
});
|
|
46
48
|
}
|
|
47
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CommonActions","DrawerActions","useLinkBuilder","React","DrawerItem","jsx","_jsx","DrawerItemList","state","navigation","descriptors","buildHref","focusedRoute","routes","index","Error","focusedOptions","key","options","drawerActiveTintColor","drawerInactiveTintColor","drawerActiveBackgroundColor","drawerInactiveBackgroundColor","map","route","i","descriptor","focused","onPress","event","emit","type","target","canPreventDefault","defaultPrevented","dispatch","closeDrawer","navigate","name","params","title","drawerLabel","drawerIcon","drawerLabelStyle","drawerItemStyle","drawerItemTestID","drawerAllowFontScaling","href","label","undefined","icon","activeTintColor","inactiveTintColor","activeBackgroundColor","inactiveBackgroundColor","allowFontScaling","labelStyle","style","testID"],"sourceRoot":"../../../src","sources":["views/DrawerItemList.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,aAAa,EAGbC,cAAc,QACT,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAG9B,SAASC,UAAU,QAAQ,iBAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ1C;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAC;EAAEC,KAAK;EAAEC,UAAU;EAAEC;AAAmB,CAAC,EAAE;EACxE,MAAM;IAAEC;EAAU,CAAC,GAAGT,cAAc,CAAC,CAAC;EAEtC,MAAMU,YAAY,GAAGJ,KAAK,CAACK,MAAM,CAACL,KAAK,CAACM,KAAK,CAAC;EAE9C,IAAIF,YAAY,IAAI,IAAI,EAAE;IACxB,MAAM,IAAIG,KAAK,CAAC,kCAAkCP,KAAK,CAACM,KAAK,GAAG,CAAC;EACnE;EAEA,MAAME,cAAc,GAAGN,WAAW,CAACE,YAAY,CAACK,GAAG,CAAC,EAAEC,OAAO,IAAI,CAAC,CAAC;EAEnE,MAAM;IACJC,qBAAqB;IACrBC,uBAAuB;IACvBC,2BAA2B;IAC3BC;EACF,CAAC,GAAGN,cAAc;EAElB,OAAOR,KAAK,CAACK,MAAM,CAACU,GAAG,CAAC,CAACC,KAAK,EAAEC,CAAC,KAAK;IACpC,MAAMC,UAAU,GAAGhB,WAAW,CAACc,KAAK,CAACP,GAAG,CAAC;IAEzC,IAAIS,UAAU,IAAI,IAAI,EAAE;MACtB,MAAM,IAAIX,KAAK,CAAC,yCAAyCS,KAAK,CAACP,GAAG,IAAI,CAAC;IACzE;IAEA,MAAMU,OAAO,GAAGF,CAAC,KAAKjB,KAAK,CAACM,KAAK;IAEjC,MAAMc,OAAO,GAAGA,CAAA,KAAM;MACpB,MAAMC,KAAK,GAAGpB,UAAU,CAACqB,IAAI,CAAC;QAC5BC,IAAI,EAAE,iBAAiB;QACvBC,MAAM,EAAER,KAAK,CAACP,GAAG;QACjBgB,iBAAiB,EAAE;MACrB,CAAC,CAAC;MAEF,IAAI,CAACJ,KAAK,CAACK,gBAAgB,EAAE;
|
|
1
|
+
{"version":3,"names":["CommonActions","DrawerActions","useLinkBuilder","React","DrawerItem","jsx","_jsx","DrawerItemList","state","navigation","descriptors","buildHref","focusedRoute","routes","index","Error","focusedOptions","key","options","drawerActiveTintColor","drawerInactiveTintColor","drawerActiveBackgroundColor","drawerInactiveBackgroundColor","map","route","i","descriptor","focused","onPress","event","emit","type","target","canPreventDefault","defaultPrevented","startTransition","dispatch","closeDrawer","navigate","name","params","title","drawerLabel","drawerIcon","drawerLabelStyle","drawerItemStyle","drawerItemTestID","drawerAllowFontScaling","href","label","undefined","icon","activeTintColor","inactiveTintColor","activeBackgroundColor","inactiveBackgroundColor","allowFontScaling","labelStyle","style","testID"],"sourceRoot":"../../../src","sources":["views/DrawerItemList.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,aAAa,EAGbC,cAAc,QACT,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAG9B,SAASC,UAAU,QAAQ,iBAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ1C;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAC;EAAEC,KAAK;EAAEC,UAAU;EAAEC;AAAmB,CAAC,EAAE;EACxE,MAAM;IAAEC;EAAU,CAAC,GAAGT,cAAc,CAAC,CAAC;EAEtC,MAAMU,YAAY,GAAGJ,KAAK,CAACK,MAAM,CAACL,KAAK,CAACM,KAAK,CAAC;EAE9C,IAAIF,YAAY,IAAI,IAAI,EAAE;IACxB,MAAM,IAAIG,KAAK,CAAC,kCAAkCP,KAAK,CAACM,KAAK,GAAG,CAAC;EACnE;EAEA,MAAME,cAAc,GAAGN,WAAW,CAACE,YAAY,CAACK,GAAG,CAAC,EAAEC,OAAO,IAAI,CAAC,CAAC;EAEnE,MAAM;IACJC,qBAAqB;IACrBC,uBAAuB;IACvBC,2BAA2B;IAC3BC;EACF,CAAC,GAAGN,cAAc;EAElB,OAAOR,KAAK,CAACK,MAAM,CAACU,GAAG,CAAC,CAACC,KAAK,EAAEC,CAAC,KAAK;IACpC,MAAMC,UAAU,GAAGhB,WAAW,CAACc,KAAK,CAACP,GAAG,CAAC;IAEzC,IAAIS,UAAU,IAAI,IAAI,EAAE;MACtB,MAAM,IAAIX,KAAK,CAAC,yCAAyCS,KAAK,CAACP,GAAG,IAAI,CAAC;IACzE;IAEA,MAAMU,OAAO,GAAGF,CAAC,KAAKjB,KAAK,CAACM,KAAK;IAEjC,MAAMc,OAAO,GAAGA,CAAA,KAAM;MACpB,MAAMC,KAAK,GAAGpB,UAAU,CAACqB,IAAI,CAAC;QAC5BC,IAAI,EAAE,iBAAiB;QACvBC,MAAM,EAAER,KAAK,CAACP,GAAG;QACjBgB,iBAAiB,EAAE;MACrB,CAAC,CAAC;MAEF,IAAI,CAACJ,KAAK,CAACK,gBAAgB,EAAE;QAC3B/B,KAAK,CAACgC,eAAe,CAAC,MAAM;UAC1B1B,UAAU,CAAC2B,QAAQ,CAAC;YAClB,IAAIT,OAAO,GACP1B,aAAa,CAACoC,WAAW,CAAC,CAAC,GAC3BrC,aAAa,CAACsC,QAAQ,CAACd,KAAK,CAACe,IAAI,EAAEf,KAAK,CAACgB,MAAM,CAAC,CAAC;YACrDR,MAAM,EAAExB,KAAK,CAACS;UAChB,CAAC,CAAC;QACJ,CAAC,CAAC;MACJ;IACF,CAAC;IAED,MAAM;MACJwB,KAAK;MACLC,WAAW;MACXC,UAAU;MACVC,gBAAgB;MAChBC,eAAe;MACfC,gBAAgB;MAChBC;IACF,CAAC,GAAGrB,UAAU,CAACR,OAAO;IAEtB,oBACEZ,IAAA,CAACF,UAAU;MAEToB,KAAK,EAAEA,KAAM;MACbwB,IAAI,EAAErC,SAAS,CAACa,KAAK,CAACe,IAAI,EAAEf,KAAK,CAACgB,MAAM,CAAE;MAC1CS,KAAK,EACHP,WAAW,KAAKQ,SAAS,GACrBR,WAAW,GACXD,KAAK,KAAKS,SAAS,GACjBT,KAAK,GACLjB,KAAK,CAACe,IACb;MACDY,IAAI,EAAER,UAAW;MACjBhB,OAAO,EAAEA,OAAQ;MACjByB,eAAe,EAAEjC,qBAAsB;MACvCkC,iBAAiB,EAAEjC,uBAAwB;MAC3CkC,qBAAqB,EAAEjC,2BAA4B;MACnDkC,uBAAuB,EAAEjC,6BAA8B;MACvDkC,gBAAgB,EAAET,sBAAuB;MACzCU,UAAU,EAAEb,gBAAiB;MAC7Bc,KAAK,EAAEb,eAAgB;MACvBjB,OAAO,EAAEA,OAAQ;MACjB+B,MAAM,EAAEb;IAAiB,GApBpBtB,KAAK,CAACP,GAqBZ,CAAC;EAEN,CAAC,CAAC;AACJ","ignoreList":[]}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { HeaderButton } from '@react-navigation/elements';
|
|
4
|
-
import { DrawerActions,
|
|
3
|
+
import { HeaderButton, PlatformIcon } from '@react-navigation/elements';
|
|
4
|
+
import { DrawerActions, useNavigation } from '@react-navigation/native';
|
|
5
5
|
import * as React from 'react';
|
|
6
|
-
import {
|
|
6
|
+
import { Platform, StyleSheet } from 'react-native';
|
|
7
7
|
import toggleDrawerIcon from './assets/toggle-drawer-icon.png';
|
|
8
8
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
9
9
|
export function DrawerToggleButton({
|
|
@@ -33,24 +33,11 @@ export function DrawerToggleButton({
|
|
|
33
33
|
onPress: () => navigation.dispatch(DrawerActions.toggleDrawer()),
|
|
34
34
|
children: typeof drawerIcon === 'function' ? drawerIcon({
|
|
35
35
|
tintColor
|
|
36
|
-
}) :
|
|
37
|
-
|
|
36
|
+
}) : /*#__PURE__*/_jsx(PlatformIcon, {
|
|
37
|
+
icon: drawerIcon,
|
|
38
38
|
size: ICON_SIZE,
|
|
39
39
|
color: tintColor,
|
|
40
40
|
style: styles.icon
|
|
41
|
-
}) : drawerIcon.type === 'materialSymbol' ? /*#__PURE__*/_jsx(MaterialSymbol, {
|
|
42
|
-
name: drawerIcon.name,
|
|
43
|
-
variant: drawerIcon.variant,
|
|
44
|
-
weight: drawerIcon.weight,
|
|
45
|
-
size: ICON_SIZE,
|
|
46
|
-
color: tintColor,
|
|
47
|
-
style: styles.icon
|
|
48
|
-
}) : /*#__PURE__*/_jsx(Image, {
|
|
49
|
-
resizeMode: "contain",
|
|
50
|
-
source: drawerIcon.source,
|
|
51
|
-
fadeDuration: 0,
|
|
52
|
-
tintColor: tintColor,
|
|
53
|
-
style: styles.icon
|
|
54
41
|
})
|
|
55
42
|
});
|
|
56
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["HeaderButton","
|
|
1
|
+
{"version":3,"names":["HeaderButton","PlatformIcon","DrawerActions","useNavigation","React","Platform","StyleSheet","toggleDrawerIcon","jsx","_jsx","DrawerToggleButton","icon","tintColor","accessibilityLabel","rest","navigation","drawerIcon","select","ios","type","name","android","default","source","onPress","dispatch","toggleDrawer","children","size","ICON_SIZE","color","style","styles","create","height","width","marginVertical","marginHorizontal"],"sourceRoot":"../../../src","sources":["views/DrawerToggleButton.tsx"],"mappings":";;AAAA,SACEA,YAAY,EAEZC,YAAY,QACP,4BAA4B;AACnC,SAASC,aAAa,EAAEC,aAAa,QAAQ,0BAA0B;AACvE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAA0BC,QAAQ,EAAEC,UAAU,QAAQ,cAAc;AAEpE,OAAOC,gBAAgB,MAAM,iCAAiC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAc/D,OAAO,SAASC,kBAAkBA,CAAC;EACjCC,IAAI;EACJC,SAAS;EACTC,kBAAkB,GAAG,sBAAsB;EAC3C,GAAGC;AACE,CAAC,EAAE;EACR,MAAMC,UAAU,GAAGZ,aAAa,CAAC,CAAC;EAElC,MAAMa,UAAU,GACdL,IAAI,IACJN,QAAQ,CAACY,MAAM,CAAO;IACpBC,GAAG,EAAE;MACHC,IAAI,EAAE,UAAU;MAChBC,IAAI,EAAE;IACR,CAAC;IACDC,OAAO,EAAE;MACPF,IAAI,EAAE,gBAAgB;MACtBC,IAAI,EAAE;IACR,CAAC;IACDE,OAAO,EAAE;MACPH,IAAI,EAAE,OAAO;MACbI,MAAM,EAAEhB;IACV;EACF,CAAC,CAAC;EAEJ,oBACEE,IAAA,CAACT,YAAY;IAAA,GACPc,IAAI;IACRD,kBAAkB,EAAEA,kBAAmB;IACvCW,OAAO,EAAEA,CAAA,KAAMT,UAAU,CAACU,QAAQ,CAACvB,aAAa,CAACwB,YAAY,CAAC,CAAC,CAAE;IAAAC,QAAA,EAEhE,OAAOX,UAAU,KAAK,UAAU,GAC/BA,UAAU,CAAC;MAAEJ;IAAU,CAAC,CAAC,gBAEzBH,IAAA,CAACR,YAAY;MACXU,IAAI,EAAEK,UAAW;MACjBY,IAAI,EAAEC,SAAU;MAChBC,KAAK,EAAElB,SAAU;MACjBmB,KAAK,EAAEC,MAAM,CAACrB;IAAK,CACpB;EACF,CACW,CAAC;AAEnB;AAEA,MAAMkB,SAAS,GAAG,EAAE;AAEpB,MAAMG,MAAM,GAAG1B,UAAU,CAAC2B,MAAM,CAAC;EAC/BtB,IAAI,EAAE;IACJuB,MAAM,EAAEL,SAAS;IACjBM,KAAK,EAAEN,SAAS;IAChBO,cAAc,EAAE,CAAC;IACjBC,gBAAgB,EAAE;EACpB;AACF,CAAC,CAAC","ignoreList":[]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Icon } from '@react-navigation/elements';
|
|
2
2
|
import { type Route } from '@react-navigation/native';
|
|
3
|
-
import React from 'react';
|
|
3
|
+
import * as React from 'react';
|
|
4
4
|
import { type ColorValue, type StyleProp, type TextStyle, type ViewStyle } from 'react-native';
|
|
5
5
|
type Props = {
|
|
6
6
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerItem.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerItem.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"DrawerItem.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerItem.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAIV,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,KAAK,KAAK,EAAY,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,SAAS,EAEd,KAAK,SAAS,EAEd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,KAAK,KAAK,GAAG;IACX;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAClC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B;;OAEG;IACH,KAAK,EACD,MAAM,GACN,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAE,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1E;;OAEG;IACH,IAAI,CAAC,EACD,IAAI,GACJ,CAAC,CAAC,KAAK,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,UAAU,CAAC;KACnB,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,GAC7B,SAAS,CAAC;IACd;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;OAEG;IACH,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB;;OAEG;IACH,eAAe,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACzC;;OAEG;IACH,iBAAiB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC3C;;OAEG;IACH,qBAAqB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/C;;OAEG;IACH,uBAAuB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACjD;;;;;OAKG;IACH,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACpC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC;;OAEG;IACH,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IAC9C;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACzC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAEvC;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,qBAoGtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerItemList.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerItemList.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,aAAU,CAAC;AAG7E,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAC5C,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"DrawerItemList.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerItemList.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,aAAU,CAAC;AAG7E,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAC5C,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,KAAK,GAiF7C,KAAK,CAAC,YAAY,CAC5C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerToggleButton.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerToggleButton.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"DrawerToggleButton.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerToggleButton.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,IAAI,EAEV,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,UAAU,EAAwB,MAAM,cAAc,CAAC;AAIrE,KAAK,KAAK,GAAG;IACX,IAAI,CAAC,EACD,IAAI,GACJ,CAAC,CAAC,KAAK,EAAE;QAAE,SAAS,EAAE,UAAU,GAAG,SAAS,CAAA;KAAE,KAAK,KAAK,CAAC,SAAS,CAAC,GACnE,SAAS,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,SAAS,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,SAAS,EACT,kBAA2C,EAC3C,GAAG,IAAI,EACR,EAAE,KAAK,qBAsCP"}
|
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": "8.0.0-alpha.
|
|
4
|
+
"version": "8.0.0-alpha.41",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native-component",
|
|
7
7
|
"react-component",
|
|
@@ -46,13 +46,13 @@
|
|
|
46
46
|
"clean": "del lib"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@react-navigation/elements": "^3.0.0-alpha.
|
|
50
|
-
"react-native-drawer-layout": "^5.0.0-alpha.
|
|
49
|
+
"@react-navigation/elements": "^3.0.0-alpha.38",
|
|
50
|
+
"react-native-drawer-layout": "^5.0.0-alpha.13",
|
|
51
51
|
"use-latest-callback": "^0.3.4"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@jest/globals": "^29.7.0",
|
|
55
|
-
"@react-navigation/native": "^8.0.0-alpha.
|
|
55
|
+
"@react-navigation/native": "^8.0.0-alpha.34",
|
|
56
56
|
"@testing-library/react-native": "^14.0.0",
|
|
57
57
|
"@types/react": "~19.2.17",
|
|
58
58
|
"del-cli": "^7.0.0",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"typescript": "^6.0.3"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|
|
71
|
-
"@react-navigation/native": "^8.0.0-alpha.
|
|
71
|
+
"@react-navigation/native": "^8.0.0-alpha.34",
|
|
72
72
|
"react": ">= 19.2.0",
|
|
73
73
|
"react-native": "*",
|
|
74
74
|
"react-native-gesture-handler": ">= 3.0.0",
|
|
@@ -95,5 +95,5 @@
|
|
|
95
95
|
]
|
|
96
96
|
]
|
|
97
97
|
},
|
|
98
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "7e0376c860594b1c33543a6fab508165919f15a7"
|
|
99
99
|
}
|
package/src/views/DrawerItem.tsx
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
|
-
import { type Icon, PlatformPressable, Text } from '@react-navigation/elements';
|
|
2
|
-
import { Color } from '@react-navigation/elements/internal';
|
|
3
1
|
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
} from '@react-navigation/
|
|
9
|
-
import
|
|
2
|
+
type Icon,
|
|
3
|
+
PlatformIcon,
|
|
4
|
+
PlatformPressable,
|
|
5
|
+
Text,
|
|
6
|
+
} from '@react-navigation/elements';
|
|
7
|
+
import { Color } from '@react-navigation/elements/internal';
|
|
8
|
+
import { type Route, useTheme } from '@react-navigation/native';
|
|
9
|
+
import * as React from 'react';
|
|
10
10
|
import {
|
|
11
11
|
type ColorValue,
|
|
12
|
-
Image,
|
|
13
12
|
Platform,
|
|
14
13
|
type StyleProp,
|
|
15
14
|
StyleSheet,
|
|
@@ -162,36 +161,7 @@ export function DrawerItem(props: Props) {
|
|
|
162
161
|
iconValue != null &&
|
|
163
162
|
'type' in iconValue
|
|
164
163
|
) {
|
|
165
|
-
|
|
166
|
-
case 'image':
|
|
167
|
-
return (
|
|
168
|
-
<Image
|
|
169
|
-
source={iconValue.source}
|
|
170
|
-
style={{
|
|
171
|
-
width: size,
|
|
172
|
-
height: size,
|
|
173
|
-
tintColor: iconValue.tinted === false ? undefined : color,
|
|
174
|
-
}}
|
|
175
|
-
/>
|
|
176
|
-
);
|
|
177
|
-
case 'sfSymbol':
|
|
178
|
-
return <SFSymbol name={iconValue.name} size={size} color={color} />;
|
|
179
|
-
case 'materialSymbol':
|
|
180
|
-
return (
|
|
181
|
-
<MaterialSymbol
|
|
182
|
-
name={iconValue.name}
|
|
183
|
-
variant={iconValue.variant}
|
|
184
|
-
weight={iconValue.weight}
|
|
185
|
-
size={size}
|
|
186
|
-
color={color}
|
|
187
|
-
/>
|
|
188
|
-
);
|
|
189
|
-
default: {
|
|
190
|
-
const _exhaustiveCheck: never = iconValue;
|
|
191
|
-
|
|
192
|
-
return _exhaustiveCheck;
|
|
193
|
-
}
|
|
194
|
-
}
|
|
164
|
+
return <PlatformIcon icon={iconValue} size={size} color={color} />;
|
|
195
165
|
}
|
|
196
166
|
|
|
197
167
|
return null;
|
|
@@ -54,11 +54,13 @@ export function DrawerItemList({ state, navigation, descriptors }: Props) {
|
|
|
54
54
|
});
|
|
55
55
|
|
|
56
56
|
if (!event.defaultPrevented) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
57
|
+
React.startTransition(() => {
|
|
58
|
+
navigation.dispatch({
|
|
59
|
+
...(focused
|
|
60
|
+
? DrawerActions.closeDrawer()
|
|
61
|
+
: CommonActions.navigate(route.name, route.params)),
|
|
62
|
+
target: state.key,
|
|
63
|
+
});
|
|
62
64
|
});
|
|
63
65
|
}
|
|
64
66
|
};
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { HeaderButton, type Icon } from '@react-navigation/elements';
|
|
2
1
|
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
} from '@react-navigation/native';
|
|
2
|
+
HeaderButton,
|
|
3
|
+
type Icon,
|
|
4
|
+
PlatformIcon,
|
|
5
|
+
} from '@react-navigation/elements';
|
|
6
|
+
import { DrawerActions, useNavigation } from '@react-navigation/native';
|
|
8
7
|
import * as React from 'react';
|
|
9
|
-
import { type ColorValue,
|
|
8
|
+
import { type ColorValue, Platform, StyleSheet } from 'react-native';
|
|
10
9
|
|
|
11
10
|
import toggleDrawerIcon from './assets/toggle-drawer-icon.png';
|
|
12
11
|
|
|
@@ -55,30 +54,13 @@ export function DrawerToggleButton({
|
|
|
55
54
|
>
|
|
56
55
|
{typeof drawerIcon === 'function' ? (
|
|
57
56
|
drawerIcon({ tintColor })
|
|
58
|
-
) :
|
|
59
|
-
<
|
|
60
|
-
|
|
61
|
-
size={ICON_SIZE}
|
|
62
|
-
color={tintColor}
|
|
63
|
-
style={styles.icon}
|
|
64
|
-
/>
|
|
65
|
-
) : drawerIcon.type === 'materialSymbol' ? (
|
|
66
|
-
<MaterialSymbol
|
|
67
|
-
name={drawerIcon.name}
|
|
68
|
-
variant={drawerIcon.variant}
|
|
69
|
-
weight={drawerIcon.weight}
|
|
57
|
+
) : (
|
|
58
|
+
<PlatformIcon
|
|
59
|
+
icon={drawerIcon}
|
|
70
60
|
size={ICON_SIZE}
|
|
71
61
|
color={tintColor}
|
|
72
62
|
style={styles.icon}
|
|
73
63
|
/>
|
|
74
|
-
) : (
|
|
75
|
-
<Image
|
|
76
|
-
resizeMode="contain"
|
|
77
|
-
source={drawerIcon.source}
|
|
78
|
-
fadeDuration={0}
|
|
79
|
-
tintColor={tintColor}
|
|
80
|
-
style={styles.icon}
|
|
81
|
-
/>
|
|
82
64
|
)}
|
|
83
65
|
</HeaderButton>
|
|
84
66
|
);
|