@react-navigation/drawer 6.6.0 → 7.0.0-alpha.0

package/lib/commonjs/index.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "DrawerContentScrollView", {
 Object.defineProperty(exports, "DrawerGestureContext", {
   enumerable: true,
   get: function () {
-    return _DrawerGestureContext.default;
+    return _reactNativeDrawerLayout.DrawerGestureContext;
   }
 });
 Object.defineProperty(exports, "DrawerItem", {
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "DrawerItemList", {
 Object.defineProperty(exports, "DrawerProgressContext", {
   enumerable: true,
   get: function () {
-    return _DrawerProgressContext.default;
+    return _reactNativeDrawerLayout.DrawerProgressContext;
   }
 });
 Object.defineProperty(exports, "DrawerStatusContext", {
@@ -72,7 +72,7 @@ Object.defineProperty(exports, "getDrawerStatusFromState", {
 Object.defineProperty(exports, "useDrawerProgress", {
   enumerable: true,
   get: function () {
-    return _useDrawerProgress.default;
+    return _reactNativeDrawerLayout.useDrawerProgress;
   }
 });
 Object.defineProperty(exports, "useDrawerStatus", {
@@ -88,11 +88,9 @@ var _DrawerItem = _interopRequireDefault(require("./views/DrawerItem"));
 var _DrawerItemList = _interopRequireDefault(require("./views/DrawerItemList"));
 var _DrawerToggleButton = _interopRequireDefault(require("./views/DrawerToggleButton"));
 var _DrawerView = _interopRequireDefault(require("./views/DrawerView"));
-var _DrawerGestureContext = _interopRequireDefault(require("./utils/DrawerGestureContext"));
-var _DrawerProgressContext = _interopRequireDefault(require("./utils/DrawerProgressContext"));
 var _DrawerStatusContext = _interopRequireDefault(require("./utils/DrawerStatusContext"));
 var _getDrawerStatusFromState = _interopRequireDefault(require("./utils/getDrawerStatusFromState"));
-var _useDrawerProgress = _interopRequireDefault(require("./utils/useDrawerProgress"));
 var _useDrawerStatus = _interopRequireDefault(require("./utils/useDrawerStatus"));
+var _reactNativeDrawerLayout = require("react-native-drawer-layout");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA;AAKA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAAqE"}
+{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA;AAKA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AAIoC"}

package/lib/commonjs/navigators/createDrawerNavigator.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _native = require("@react-navigation/native");
 var React = _interopRequireWildcard(require("react"));
-var _warnOnce = _interopRequireDefault(require("warn-once"));
 var _DrawerView = _interopRequireDefault(require("../views/DrawerView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -16,51 +15,13 @@ function DrawerNavigator(_ref) {
   let {
     id,
     initialRouteName,
-    defaultStatus: customDefaultStatus,
+    defaultStatus = 'closed',
     backBehavior,
     children,
     screenListeners,
     screenOptions,
-    ...restWithDeprecated
-  } = _ref;
-  const {
-    // @ts-expect-error: openByDefault is deprecated
-    openByDefault,
-    // @ts-expect-error: lazy is deprecated
-    lazy,
-    // @ts-expect-error: drawerContentOptions is deprecated
-    drawerContentOptions,
     ...rest
-  } = restWithDeprecated;
-  let defaultScreenOptions = {};
-  if (drawerContentOptions) {
-    Object.assign(defaultScreenOptions, {
-      drawerPosition: drawerContentOptions.drawerPosition,
-      drawerType: drawerContentOptions.drawerType,
-      swipeEdgeWidth: drawerContentOptions.edgeWidth,
-      drawerHideStatusBarOnOpen: drawerContentOptions.hideStatusBar,
-      keyboardDismissMode: drawerContentOptions.keyboardDismissMode,
-      swipeMinDistance: drawerContentOptions.minSwipeDistance,
-      overlayColor: drawerContentOptions.overlayColor,
-      drawerStatusBarAnimation: drawerContentOptions.statusBarAnimation,
-      gestureHandlerProps: drawerContentOptions.gestureHandlerProps
-    });
-    Object.keys(defaultScreenOptions).forEach(key => {
-      if (defaultScreenOptions[key] === undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        delete defaultScreenOptions[key];
-      }
-    });
-    (0, _warnOnce.default)(drawerContentOptions, `Drawer Navigator: 'drawerContentOptions' is deprecated. Migrate the options to 'screenOptions' instead.\n\nPlace the following in 'screenOptions' in your code to keep current behavior:\n\n${JSON.stringify(defaultScreenOptions, null, 2)}\n\nSee https://reactnavigation.org/docs/drawer-navigator#options for more details.`);
-  }
-  if (typeof lazy === 'boolean') {
-    defaultScreenOptions.lazy = lazy;
-    (0, _warnOnce.default)(true, `Drawer Navigator: 'lazy' in props is deprecated. Move it to 'screenOptions' instead.\n\nSee https://reactnavigation.org/docs/drawer-navigator/#lazy for more details.`);
-  }
-  if (typeof openByDefault === 'boolean') {
-    (0, _warnOnce.default)(true, `Drawer Navigator: 'openByDefault' is deprecated. Use 'defaultStatus' and set it to 'open' or 'closed' instead.\n\nSee https://reactnavigation.org/docs/drawer-navigator/#defaultstatus for more details.`);
-  }
-  const defaultStatus = customDefaultStatus !== undefined ? customDefaultStatus : openByDefault ? 'open' : 'closed';
+  } = _ref;
   const {
     state,
     descriptors,
@@ -73,8 +34,7 @@ function DrawerNavigator(_ref) {
     backBehavior,
     children,
     screenListeners,
-    screenOptions,
-    defaultScreenOptions
+    screenOptions
   });
   return /*#__PURE__*/React.createElement(NavigationContent, null, /*#__PURE__*/React.createElement(_DrawerView.default, _extends({}, rest, {
     defaultStatus: defaultStatus,

package/lib/commonjs/navigators/createDrawerNavigator.js.map

@@ -1 +1 @@
-{"version":3,"names":["DrawerNavigator","id","initialRouteName","defaultStatus","customDefaultStatus","backBehavior","children","screenListeners","screenOptions","restWithDeprecated","openByDefault","lazy","drawerContentOptions","rest","defaultScreenOptions","Object","assign","drawerPosition","drawerType","swipeEdgeWidth","edgeWidth","drawerHideStatusBarOnOpen","hideStatusBar","keyboardDismissMode","swipeMinDistance","minSwipeDistance","overlayColor","drawerStatusBarAnimation","statusBarAnimation","gestureHandlerProps","keys","forEach","key","undefined","warnOnce","JSON","stringify","state","descriptors","navigation","NavigationContent","useNavigationBuilder","DrawerRouter","createNavigatorFactory"],"sourceRoot":"../../src","sources":["createDrawerNavigator.tsx"],"mappings":";;;;;;AAAA;AAWA;AACA;AAOA;AAA6C;AAAA;AAAA;AAAA;AAW7C,SAASA,eAAe,OASd;EAAA,IATe;IACvBC,EAAE;IACFC,gBAAgB;IAChBC,aAAa,EAAEC,mBAAmB;IAClCC,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC,aAAa;IACb,GAAGC;EACE,CAAC;EACN,MAAM;IACJ;IACAC,aAAa;IACb;IACAC,IAAI;IACJ;IACAC,oBAAoB;IACpB,GAAGC;EACL,CAAC,GAAGJ,kBAAkB;EAEtB,IAAIK,oBAA6C,GAAG,CAAC,CAAC;EAEtD,IAAIF,oBAAoB,EAAE;IACxBG,MAAM,CAACC,MAAM,CAACF,oBAAoB,EAAE;MAClCG,cAAc,EAAEL,oBAAoB,CAACK,cAAc;MACnDC,UAAU,EAAEN,oBAAoB,CAACM,UAAU;MAC3CC,cAAc,EAAEP,oBAAoB,CAACQ,SAAS;MAC9CC,yBAAyB,EAAET,oBAAoB,CAACU,aAAa;MAC7DC,mBAAmB,EAAEX,oBAAoB,CAACW,mBAAmB;MAC7DC,gBAAgB,EAAEZ,oBAAoB,CAACa,gBAAgB;MACvDC,YAAY,EAAEd,oBAAoB,CAACc,YAAY;MAC/CC,wBAAwB,EAAEf,oBAAoB,CAACgB,kBAAkB;MACjEC,mBAAmB,EAAEjB,oBAAoB,CAACiB;IAC5C,CAAC,CAAC;IAGAd,MAAM,CAACe,IAAI,CAAChB,oBAAoB,CAAC,CACjCiB,OAAO,CAAEC,GAAG,IAAK;MACjB,IAAIlB,oBAAoB,CAACkB,GAAG,CAAC,KAAKC,SAAS,EAAE;QAC3C;QACA,OAAOnB,oBAAoB,CAACkB,GAAG,CAAC;MAClC;IACF,CAAC,CAAC;IAEF,IAAAE,iBAAQ,EACNtB,oBAAoB,EACnB,+LAA8LuB,IAAI,CAACC,SAAS,CAC3MtB,oBAAoB,EACpB,IAAI,EACJ,CAAC,CACD,qFAAoF,CACvF;EACH;EAEA,IAAI,OAAOH,IAAI,KAAK,SAAS,EAAE;IAC7BG,oBAAoB,CAACH,IAAI,GAAGA,IAAI;IAEhC,IAAAuB,iBAAQ,EACN,IAAI,EACH,uKAAsK,CACxK;EACH;EAEA,IAAI,OAAOxB,aAAa,KAAK,SAAS,EAAE;IACtC,IAAAwB,iBAAQ,EACN,IAAI,EACH,0MAAyM,CAC3M;EACH;EAEA,MAAM/B,aAA2B,GAC/BC,mBAAmB,KAAK6B,SAAS,GAC7B7B,mBAAmB,GACnBM,aAAa,GACb,MAAM,GACN,QAAQ;EAEd,MAAM;IAAE2B,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GACzD,IAAAC,4BAAoB,EAMlBC,oBAAY,EAAE;IACdzC,EAAE;IACFC,gBAAgB;IAChBC,aAAa;IACbE,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC,aAAa;IACbM;EACF,CAAC,CAAC;EAEJ,oBACE,oBAAC,iBAAiB,qBAChB,oBAAC,mBAAU,eACLD,IAAI;IACR,aAAa,EAAEV,aAAc;IAC7B,KAAK,EAAEkC,KAAM;IACb,WAAW,EAAEC,WAAY;IACzB,UAAU,EAAEC;EAAW,GACvB,CACgB;AAExB;AAAC,eAEc,IAAAI,8BAAsB,EAKnC3C,eAAe,CAAC;AAAA"}
+{"version":3,"names":["DrawerNavigator","id","initialRouteName","defaultStatus","backBehavior","children","screenListeners","screenOptions","rest","state","descriptors","navigation","NavigationContent","useNavigationBuilder","DrawerRouter","createNavigatorFactory"],"sourceRoot":"../../src","sources":["createDrawerNavigator.tsx"],"mappings":";;;;;;AAAA;AAUA;AAOA;AAA6C;AAAA;AAAA;AAAA;AAW7C,SAASA,eAAe,OASd;EAAA,IATe;IACvBC,EAAE;IACFC,gBAAgB;IAChBC,aAAa,GAAG,QAAQ;IACxBC,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC,aAAa;IACb,GAAGC;EACE,CAAC;EACN,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GACzD,IAAAC,4BAAoB,EAMlBC,oBAAY,EAAE;IACdb,EAAE;IACFC,gBAAgB;IAChBC,aAAa;IACbC,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC;EACF,CAAC,CAAC;EAEJ,oBACE,oBAAC,iBAAiB,qBAChB,oBAAC,mBAAU,eACLC,IAAI;IACR,aAAa,EAAEL,aAAc;IAC7B,KAAK,EAAEM,KAAM;IACb,WAAW,EAAEC,WAAY;IACzB,UAAU,EAAEC;EAAW,GACvB,CACgB;AAExB;AAAC,eAEc,IAAAI,8BAAsB,EAKnCf,eAAe,CAAC;AAAA"}

package/lib/commonjs/views/DrawerItem.js

@@ -15,21 +15,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const LinkPressable = _ref => {
   let {
+    route,
+    href,
     children,
     style,
     onPress,
     onLongPress,
     onPressIn,
     onPressOut,
-    to,
     accessibilityRole,
     ...rest
   } = _ref;
-  if (_reactNative.Platform.OS === 'web' && to) {
+  if (_reactNative.Platform.OS === 'web') {
     // React Native Web doesn't forward `onClick` if we use `TouchableWithoutFeedback`.
     // We need to use `onClick` to be able to prevent default browser handling of links.
     return /*#__PURE__*/React.createElement(_native.Link, _extends({}, rest, {
-      to: to,
+      href: href,
+      action: _native.CommonActions.navigate(route.name, route.params),
       style: [styles.button, style],
       onPress: e => {
         if (!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) && (
@@ -65,10 +67,11 @@ function DrawerItem(props) {
     colors
   } = (0, _native.useTheme)();
   const {
+    route,
+    href,
     icon,
     label,
     labelStyle,
-    to,
     focused = false,
     allowFontScaling,
     activeTintColor = colors.primary,
@@ -113,7 +116,8 @@ function DrawerItem(props) {
     },
     pressColor: pressColor,
     pressOpacity: pressOpacity,
-    to: to
+    route: route,
+    href: href
   }, /*#__PURE__*/React.createElement(React.Fragment, null, iconNode, /*#__PURE__*/React.createElement(_reactNative.View, {
     style: [styles.label, {
       marginLeft: iconNode ? 32 : 0,

package/lib/commonjs/views/DrawerItem.js.map

@@ -1 +1 @@
-{"version":3,"names":["LinkPressable","children","style","onPress","onLongPress","onPressIn","onPressOut","to","accessibilityRole","rest","Platform","OS","styles","button","e","metaKey","altKey","ctrlKey","shiftKey","preventDefault","undefined","DrawerItem","props","colors","useTheme","icon","label","labelStyle","focused","allowFontScaling","activeTintColor","primary","inactiveTintColor","Color","text","alpha","rgb","string","activeBackgroundColor","inactiveBackgroundColor","pressColor","pressOpacity","testID","accessibilityLabel","borderRadius","StyleSheet","flatten","color","backgroundColor","iconNode","size","container","wrapper","selected","marginLeft","marginVertical","fontWeight","create","marginHorizontal","overflow","flexDirection","alignItems","padding","marginRight","flex","display"],"sourceRoot":"../../src","sources":["DrawerItem.tsx"],"mappings":"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"}
+{"version":3,"names":["LinkPressable","route","href","children","style","onPress","onLongPress","onPressIn","onPressOut","accessibilityRole","rest","Platform","OS","CommonActions","navigate","name","params","styles","button","e","metaKey","altKey","ctrlKey","shiftKey","preventDefault","undefined","DrawerItem","props","colors","useTheme","icon","label","labelStyle","focused","allowFontScaling","activeTintColor","primary","inactiveTintColor","Color","text","alpha","rgb","string","activeBackgroundColor","inactiveBackgroundColor","pressColor","pressOpacity","testID","accessibilityLabel","borderRadius","StyleSheet","flatten","color","backgroundColor","iconNode","size","container","wrapper","selected","marginLeft","marginVertical","fontWeight","create","marginHorizontal","overflow","flexDirection","alignItems","padding","marginRight","flex","display"],"sourceRoot":"../../src","sources":["DrawerItem.tsx"],"mappings":"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"}

package/lib/commonjs/views/DrawerItemList.js

@@ -19,7 +19,9 @@ function DrawerItemList(_ref) {
     navigation,
     descriptors
   } = _ref;
-  const buildLink = (0, _native.useLinkBuilder)();
+  const {
+    buildHref
+  } = (0, _native.useLinkTools)();
   const focusedRoute = state.routes[state.index];
   const focusedDescriptor = descriptors[focusedRoute.key];
   const focusedOptions = focusedDescriptor.options;
@@ -39,10 +41,7 @@ function DrawerItemList(_ref) {
       });
       if (!event.defaultPrevented) {
         navigation.dispatch({
-          ...(focused ? _native.DrawerActions.closeDrawer() : _native.CommonActions.navigate({
-            name: route.name,
-            merge: true
-          })),
+          ...(focused ? _native.DrawerActions.closeDrawer() : _native.CommonActions.navigate(route)),
           target: state.key
         });
       }
@@ -57,6 +56,8 @@ function DrawerItemList(_ref) {
     } = descriptors[route.key].options;
     return /*#__PURE__*/React.createElement(_DrawerItem.default, {
       key: route.key,
+      route: route,
+      href: buildHref(route.name, route.params),
       label: drawerLabel !== undefined ? drawerLabel : title !== undefined ? title : route.name,
       icon: drawerIcon,
       focused: focused,
@@ -67,7 +68,6 @@ function DrawerItemList(_ref) {
       allowFontScaling: drawerAllowFontScaling,
       labelStyle: drawerLabelStyle,
       style: drawerItemStyle,
-      to: buildLink(route.name, route.params),
       onPress: onPress
     });
   });

package/lib/commonjs/views/DrawerItemList.js.map

@@ -1 +1 @@
-{"version":3,"names":["DrawerItemList","state","navigation","descriptors","buildLink","useLinkBuilder","focusedRoute","routes","index","focusedDescriptor","key","focusedOptions","options","drawerActiveTintColor","drawerInactiveTintColor","drawerActiveBackgroundColor","drawerInactiveBackgroundColor","map","route","i","focused","onPress","event","emit","type","target","canPreventDefault","defaultPrevented","dispatch","DrawerActions","closeDrawer","CommonActions","navigate","name","merge","title","drawerLabel","drawerIcon","drawerLabelStyle","drawerItemStyle","drawerAllowFontScaling","undefined","params"],"sourceRoot":"../../src","sources":["DrawerItemList.tsx"],"mappings":";;;;;;AAAA;AAOA;AAGA;AAAsC;AAAA;AAAA;AAQtC;AACA;AACA;AACe,SAASA,cAAc,OAI5B;EAAA,IAJ6B;IACrCC,KAAK;IACLC,UAAU;IACVC;EACK,CAAC;EACN,MAAMC,SAAS,GAAG,IAAAC,sBAAc,GAAE;EAElC,MAAMC,YAAY,GAAGL,KAAK,CAACM,MAAM,CAACN,KAAK,CAACO,KAAK,CAAC;EAC9C,MAAMC,iBAAiB,GAAGN,WAAW,CAACG,YAAY,CAACI,GAAG,CAAC;EACvD,MAAMC,cAAc,GAAGF,iBAAiB,CAACG,OAAO;EAEhD,MAAM;IACJC,qBAAqB;IACrBC,uBAAuB;IACvBC,2BAA2B;IAC3BC;EACF,CAAC,GAAGL,cAAc;EAElB,OAAOV,KAAK,CAACM,MAAM,CAACU,GAAG,CAAC,CAACC,KAAK,EAAEC,CAAC,KAAK;IACpC,MAAMC,OAAO,GAAGD,CAAC,KAAKlB,KAAK,CAACO,KAAK;IAEjC,MAAMa,OAAO,GAAG,MAAM;MACpB,MAAMC,KAAK,GAAGpB,UAAU,CAACqB,IAAI,CAAC;QAC5BC,IAAI,EAAE,iBAAiB;QACvBC,MAAM,EAAEP,KAAK,CAACR,GAAG;QACjBgB,iBAAiB,EAAE;MACrB,CAAC,CAAC;MAEF,IAAI,CAACJ,KAAK,CAACK,gBAAgB,EAAE;QAC3BzB,UAAU,CAAC0B,QAAQ,CAAC;UAClB,IAAIR,OAAO,GACPS,qBAAa,CAACC,WAAW,EAAE,GAC3BC,qBAAa,CAACC,QAAQ,CAAC;YAAEC,IAAI,EAAEf,KAAK,CAACe,IAAI;YAAEC,KAAK,EAAE;UAAK,CAAC,CAAC,CAAC;UAC9DT,MAAM,EAAExB,KAAK,CAACS;QAChB,CAAC,CAAC;MACJ;IACF,CAAC;IAED,MAAM;MACJyB,KAAK;MACLC,WAAW;MACXC,UAAU;MACVC,gBAAgB;MAChBC,eAAe;MACfC;IACF,CAAC,GAAGrC,WAAW,CAACe,KAAK,CAACR,GAAG,CAAC,CAACE,OAAO;IAElC,oBACE,oBAAC,mBAAU;MACT,GAAG,EAAEM,KAAK,CAACR,GAAI;MACf,KAAK,EACH0B,WAAW,KAAKK,SAAS,GACrBL,WAAW,GACXD,KAAK,KAAKM,SAAS,GACnBN,KAAK,GACLjB,KAAK,CAACe,IACX;MACD,IAAI,EAAEI,UAAW;MACjB,OAAO,EAAEjB,OAAQ;MACjB,eAAe,EAAEP,qBAAsB;MACvC,iBAAiB,EAAEC,uBAAwB;MAC3C,qBAAqB,EAAEC,2BAA4B;MACnD,uBAAuB,EAAEC,6BAA8B;MACvD,gBAAgB,EAAEwB,sBAAuB;MACzC,UAAU,EAAEF,gBAAiB;MAC7B,KAAK,EAAEC,eAAgB;MACvB,EAAE,EAAEnC,SAAS,CAACc,KAAK,CAACe,IAAI,EAAEf,KAAK,CAACwB,MAAM,CAAE;MACxC,OAAO,EAAErB;IAAQ,EACjB;EAEN,CAAC,CAAC;AACJ"}
+{"version":3,"names":["DrawerItemList","state","navigation","descriptors","buildHref","useLinkTools","focusedRoute","routes","index","focusedDescriptor","key","focusedOptions","options","drawerActiveTintColor","drawerInactiveTintColor","drawerActiveBackgroundColor","drawerInactiveBackgroundColor","map","route","i","focused","onPress","event","emit","type","target","canPreventDefault","defaultPrevented","dispatch","DrawerActions","closeDrawer","CommonActions","navigate","title","drawerLabel","drawerIcon","drawerLabelStyle","drawerItemStyle","drawerAllowFontScaling","name","params","undefined"],"sourceRoot":"../../src","sources":["DrawerItemList.tsx"],"mappings":";;;;;;AAAA;AAOA;AAGA;AAAsC;AAAA;AAAA;AAQtC;AACA;AACA;AACe,SAASA,cAAc,OAI5B;EAAA,IAJ6B;IACrCC,KAAK;IACLC,UAAU;IACVC;EACK,CAAC;EACN,MAAM;IAAEC;EAAU,CAAC,GAAG,IAAAC,oBAAY,GAAE;EAEpC,MAAMC,YAAY,GAAGL,KAAK,CAACM,MAAM,CAACN,KAAK,CAACO,KAAK,CAAC;EAC9C,MAAMC,iBAAiB,GAAGN,WAAW,CAACG,YAAY,CAACI,GAAG,CAAC;EACvD,MAAMC,cAAc,GAAGF,iBAAiB,CAACG,OAAO;EAEhD,MAAM;IACJC,qBAAqB;IACrBC,uBAAuB;IACvBC,2BAA2B;IAC3BC;EACF,CAAC,GAAGL,cAAc;EAElB,OAAOV,KAAK,CAACM,MAAM,CAACU,GAAG,CAAC,CAACC,KAAK,EAAEC,CAAC,KAAK;IACpC,MAAMC,OAAO,GAAGD,CAAC,KAAKlB,KAAK,CAACO,KAAK;IAEjC,MAAMa,OAAO,GAAG,MAAM;MACpB,MAAMC,KAAK,GAAGpB,UAAU,CAACqB,IAAI,CAAC;QAC5BC,IAAI,EAAE,iBAAiB;QACvBC,MAAM,EAAEP,KAAK,CAACR,GAAG;QACjBgB,iBAAiB,EAAE;MACrB,CAAC,CAAC;MAEF,IAAI,CAACJ,KAAK,CAACK,gBAAgB,EAAE;QAC3BzB,UAAU,CAAC0B,QAAQ,CAAC;UAClB,IAAIR,OAAO,GACPS,qBAAa,CAACC,WAAW,EAAE,GAC3BC,qBAAa,CAACC,QAAQ,CAACd,KAAK,CAAC,CAAC;UAClCO,MAAM,EAAExB,KAAK,CAACS;QAChB,CAAC,CAAC;MACJ;IACF,CAAC;IAED,MAAM;MACJuB,KAAK;MACLC,WAAW;MACXC,UAAU;MACVC,gBAAgB;MAChBC,eAAe;MACfC;IACF,CAAC,GAAGnC,WAAW,CAACe,KAAK,CAACR,GAAG,CAAC,CAACE,OAAO;IAElC,oBACE,oBAAC,mBAAU;MACT,GAAG,EAAEM,KAAK,CAACR,GAAI;MACf,KAAK,EAAEQ,KAAM;MACb,IAAI,EAAEd,SAAS,CAACc,KAAK,CAACqB,IAAI,EAAErB,KAAK,CAACsB,MAAM,CAAE;MAC1C,KAAK,EACHN,WAAW,KAAKO,SAAS,GACrBP,WAAW,GACXD,KAAK,KAAKQ,SAAS,GACnBR,KAAK,GACLf,KAAK,CAACqB,IACX;MACD,IAAI,EAAEJ,UAAW;MACjB,OAAO,EAAEf,OAAQ;MACjB,eAAe,EAAEP,qBAAsB;MACvC,iBAAiB,EAAEC,uBAAwB;MAC3C,qBAAqB,EAAEC,2BAA4B;MACnD,uBAAuB,EAAEC,6BAA8B;MACvD,gBAAgB,EAAEsB,sBAAuB;MACzC,UAAU,EAAEF,gBAAiB;MAC7B,KAAK,EAAEC,eAAgB;MACvB,OAAO,EAAEhB;IAAQ,EACjB;EAEN,CAAC,CAAC;AACJ"}

package/lib/commonjs/views/DrawerView.js

@@ -8,72 +8,40 @@ var _elements = require("@react-navigation/elements");
 var _native = require("@react-navigation/native");
 var React = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
-var Reanimated = _interopRequireWildcard(require("react-native-reanimated"));
+var _reactNativeDrawerLayout = require("react-native-drawer-layout");
 var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
 var _DrawerPositionContext = _interopRequireDefault(require("../utils/DrawerPositionContext"));
 var _DrawerStatusContext = _interopRequireDefault(require("../utils/DrawerStatusContext"));
 var _getDrawerStatusFromState = _interopRequireDefault(require("../utils/getDrawerStatusFromState"));
 var _DrawerContent = _interopRequireDefault(require("./DrawerContent"));
 var _DrawerToggleButton = _interopRequireDefault(require("./DrawerToggleButton"));
-var _GestureHandler = require("./GestureHandler");
 var _ScreenFallback = require("./ScreenFallback");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-const getDefaultDrawerWidth = _ref => {
-  let {
-    height,
-    width
-  } = _ref;
-  /*
-   * Default drawer width is screen width - header height
-   * with a max width of 280 on mobile and 320 on tablet
-   * https://material.io/components/navigation-drawer
-   */
-  const smallerAxisSize = Math.min(height, width);
-  const isLandscape = width > height;
-  const isTablet = smallerAxisSize >= 600;
-  const appBarHeight = _reactNative.Platform.OS === 'ios' ? isLandscape ? 32 : 44 : 56;
-  const maxWidth = isTablet ? 320 : 280;
-  return Math.min(smallerAxisSize - appBarHeight, maxWidth);
-};
-const GestureHandlerWrapper = _GestureHandler.GestureHandlerRootView ?? _reactNative.View;
-function DrawerViewBase(_ref2) {
-  var _Reanimated$isConfigu;
+function DrawerViewBase(_ref) {
   let {
     state,
     navigation,
     descriptors,
     defaultStatus,
     drawerContent = props => /*#__PURE__*/React.createElement(_DrawerContent.default, props),
-    detachInactiveScreens = _reactNative.Platform.OS === 'web' || _reactNative.Platform.OS === 'android' || _reactNative.Platform.OS === 'ios',
-    // Reanimated 2 is not configured
-    // @ts-expect-error: the type definitions are incomplete
-    useLegacyImplementation = !((_Reanimated$isConfigu = Reanimated.isConfigured) !== null && _Reanimated$isConfigu !== void 0 && _Reanimated$isConfigu.call(Reanimated))
-  } = _ref2;
-  // Reanimated v3 dropped legacy v1 syntax
-  const legacyImplemenationNotAvailable = require('react-native-reanimated').abs === undefined;
-  if (useLegacyImplementation && legacyImplemenationNotAvailable) {
-    throw new Error('The `useLegacyImplementation` prop is not available with Reanimated 3 as it no longer includes support for Reanimated 1 legacy API. Remove the `useLegacyImplementation` prop from `Drawer.Navigator` to be able to use it.');
-  }
-  const Drawer = useLegacyImplementation ? require('./legacy/Drawer').default : require('./modern/Drawer').default;
+    detachInactiveScreens = _reactNative.Platform.OS === 'web' || _reactNative.Platform.OS === 'android' || _reactNative.Platform.OS === 'ios'
+  } = _ref;
   const focusedRouteKey = state.routes[state.index].key;
   const {
-    drawerHideStatusBarOnOpen = false,
+    drawerHideStatusBarOnOpen,
     drawerPosition = _reactNative.I18nManager.getConstants().isRTL ? 'right' : 'left',
-    drawerStatusBarAnimation = 'slide',
+    drawerStatusBarAnimation,
     drawerStyle,
-    drawerType = _reactNative.Platform.select({
-      ios: 'slide',
-      default: 'front'
-    }),
+    drawerType,
     gestureHandlerProps,
-    keyboardDismissMode = 'on-drag',
+    keyboardDismissMode,
     overlayColor = 'rgba(0, 0, 0, 0.5)',
-    swipeEdgeWidth = 32,
+    swipeEdgeWidth,
     swipeEnabled = _reactNative.Platform.OS !== 'web' && _reactNative.Platform.OS !== 'windows' && _reactNative.Platform.OS !== 'macos',
-    swipeMinDistance = 60,
+    swipeMinDistance,
     overlayAccessibilityLabel
   } = descriptors[focusedRouteKey].options;
   const [loaded, setLoaded] = React.useState([focusedRouteKey]);
@@ -166,11 +134,11 @@ function DrawerViewBase(_ref2) {
       }
       const {
         freezeOnBlur,
-        header = _ref3 => {
+        header = _ref2 => {
           let {
             layout,
             options
-          } = _ref3;
+          } = _ref2;
           return /*#__PURE__*/React.createElement(_elements.Header, _extends({}, options, {
             layout: layout,
             title: (0, _elements.getHeaderTitle)(options, route.name),
@@ -209,15 +177,15 @@ function DrawerViewBase(_ref2) {
   };
   return /*#__PURE__*/React.createElement(_DrawerStatusContext.default.Provider, {
     value: drawerStatus
-  }, /*#__PURE__*/React.createElement(Drawer, {
+  }, /*#__PURE__*/React.createElement(_reactNativeDrawerLayout.Drawer, {
     open: drawerStatus !== 'closed',
     onOpen: handleDrawerOpen,
     onClose: handleDrawerClose,
+    layout: dimensions,
     gestureHandlerProps: gestureHandlerProps,
     swipeEnabled: swipeEnabled,
     swipeEdgeWidth: swipeEdgeWidth,
-    swipeVelocityThreshold: 500,
-    swipeDistanceThreshold: swipeMinDistance,
+    swipeMinDistance: swipeMinDistance,
     hideStatusBarOnOpen: drawerHideStatusBarOnOpen,
     statusBarAnimation: drawerStatusBarAnimation,
     keyboardDismissMode: keyboardDismissMode,
@@ -225,7 +193,6 @@ function DrawerViewBase(_ref2) {
     overlayAccessibilityLabel: overlayAccessibilityLabel,
     drawerPosition: drawerPosition,
     drawerStyle: [{
-      width: getDefaultDrawerWidth(dimensions),
       backgroundColor: colors.card
     }, drawerType === 'permanent' && (drawerPosition === 'left' ? {
       borderRightColor: colors.border,
@@ -237,21 +204,17 @@ function DrawerViewBase(_ref2) {
     overlayStyle: {
       backgroundColor: overlayColor
     },
-    renderDrawerContent: renderDrawerContent,
-    renderSceneContent: renderSceneContent,
-    dimensions: dimensions
-  }));
+    renderDrawerContent: renderDrawerContent
+  }, renderSceneContent()));
 }
-function DrawerView(_ref4) {
+function DrawerView(_ref3) {
   let {
     navigation,
     ...rest
-  } = _ref4;
-  return /*#__PURE__*/React.createElement(_elements.SafeAreaProviderCompat, null, /*#__PURE__*/React.createElement(GestureHandlerWrapper, {
-    style: styles.content
-  }, /*#__PURE__*/React.createElement(DrawerViewBase, _extends({
+  } = _ref3;
+  return /*#__PURE__*/React.createElement(_elements.SafeAreaProviderCompat, null, /*#__PURE__*/React.createElement(DrawerViewBase, _extends({
     navigation: navigation
-  }, rest))));
+  }, rest)));
 }
 const styles = _reactNative.StyleSheet.create({
   content: {

package/lib/commonjs/views/DrawerView.js.map

@@ -1 +1 @@
-{"version":3,"names":["getDefaultDrawerWidth","height","width","smallerAxisSize","Math","min","isLandscape","isTablet","appBarHeight","Platform","OS","maxWidth","GestureHandlerWrapper","GestureHandlerRootView","View","DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","props","detachInactiveScreens","useLegacyImplementation","Reanimated","isConfigured","legacyImplemenationNotAvailable","require","abs","undefined","Error","Drawer","default","focusedRouteKey","routes","index","key","drawerHideStatusBarOnOpen","drawerPosition","I18nManager","getConstants","isRTL","drawerStatusBarAnimation","drawerStyle","drawerType","select","ios","gestureHandlerProps","keyboardDismissMode","overlayColor","swipeEdgeWidth","swipeEnabled","swipeMinDistance","overlayAccessibilityLabel","options","loaded","setLoaded","React","useState","includes","dimensions","useSafeAreaFrame","colors","useTheme","drawerStatus","getDrawerStatusFromState","handleDrawerOpen","useCallback","dispatch","DrawerActions","openDrawer","target","handleDrawerClose","closeDrawer","useEffect","handleHardwareBack","isFocused","handleEscape","e","subscription","BackHandler","addEventListener","document","body","remove","removeEventListener","renderDrawerContent","renderSceneContent","styles","content","map","route","descriptor","lazy","unmountOnBlur","freezeOnBlur","header","layout","getHeaderTitle","name","headerLeft","headerShown","headerStatusBarHeight","headerTransparent","sceneContainerStyle","StyleSheet","absoluteFill","zIndex","render","backgroundColor","card","borderRightColor","border","borderRightWidth","hairlineWidth","borderLeftColor","borderLeftWidth","DrawerView","rest","create","flex"],"sourceRoot":"../../src","sources":["DrawerView.tsx"],"mappings":";;;;;;AAAA;AAMA;AAOA;AACA;AAOA;AACA;AAWA;AACA;AACA;AACA;AACA;AACA;AACA;AAAqE;AAAA;AAAA;AAAA;AASrE,MAAMA,qBAAqB,GAAG,QAMxB;EAAA,IANyB;IAC7BC,MAAM;IACNC;EAIF,CAAC;EACC;AACF;AACA;AACA;AACA;EACE,MAAMC,eAAe,GAAGC,IAAI,CAACC,GAAG,CAACJ,MAAM,EAAEC,KAAK,CAAC;EAC/C,MAAMI,WAAW,GAAGJ,KAAK,GAAGD,MAAM;EAClC,MAAMM,QAAQ,GAAGJ,eAAe,IAAI,GAAG;EACvC,MAAMK,YAAY,GAAGC,qBAAQ,CAACC,EAAE,KAAK,KAAK,GAAIJ,WAAW,GAAG,EAAE,GAAG,EAAE,GAAI,EAAE;EACzE,MAAMK,QAAQ,GAAGJ,QAAQ,GAAG,GAAG,GAAG,GAAG;EAErC,OAAOH,IAAI,CAACC,GAAG,CAACF,eAAe,GAAGK,YAAY,EAAEG,QAAQ,CAAC;AAC3D,CAAC;AAED,MAAMC,qBAAqB,GAAGC,sCAAsB,IAAIC,iBAAI;AAE5D,SAASC,cAAc,QAcb;EAAA;EAAA,IAdc;IACtBC,KAAK;IACLC,UAAU;IACVC,WAAW;IACXC,aAAa;IACbC,aAAa,GAAIC,KAAkC,iBACjD,oBAAC,sBAAa,EAAKA,KAAK,CACzB;IACDC,qBAAqB,GAAGb,qBAAQ,CAACC,EAAE,KAAK,KAAK,IAC3CD,qBAAQ,CAACC,EAAE,KAAK,SAAS,IACzBD,qBAAQ,CAACC,EAAE,KAAK,KAAK;IACvB;IACA;IACAa,uBAAuB,GAAG,2BAACC,UAAU,CAACC,YAAY,kDAAvB,2BAAAD,UAAU,CAAiB;EACjD,CAAC;EACN;EACA,MAAME,+BAA+B,GACnCC,OAAO,CAAC,yBAAyB,CAAC,CAACC,GAAG,KAAKC,SAAS;EAEtD,IAAIN,uBAAuB,IAAIG,+BAA+B,EAAE;IAC9D,MAAM,IAAII,KAAK,CACb,6NAA6N,CAC9N;EACH;EAEA,MAAMC,MAAwC,GAAGR,uBAAuB,GACpEI,OAAO,CAAC,iBAAiB,CAAC,CAACK,OAAO,GAClCL,OAAO,CAAC,iBAAiB,CAAC,CAACK,OAAO;EAEtC,MAAMC,eAAe,GAAGjB,KAAK,CAACkB,MAAM,CAAClB,KAAK,CAACmB,KAAK,CAAC,CAACC,GAAG;EACrD,MAAM;IACJC,yBAAyB,GAAG,KAAK;IACjCC,cAAc,GAAGC,wBAAW,CAACC,YAAY,EAAE,CAACC,KAAK,GAAG,OAAO,GAAG,MAAM;IACpEC,wBAAwB,GAAG,OAAO;IAClCC,WAAW;IACXC,UAAU,GAAGnC,qBAAQ,CAACoC,MAAM,CAAC;MAAEC,GAAG,EAAE,OAAO;MAAEd,OAAO,EAAE;IAAQ,CAAC,CAAC;IAChEe,mBAAmB;IACnBC,mBAAmB,GAAG,SAAS;IAC/BC,YAAY,GAAG,oBAAoB;IACnCC,cAAc,GAAG,EAAE;IACnBC,YAAY,GAAG1C,qBAAQ,CAACC,EAAE,KAAK,KAAK,IAClCD,qBAAQ,CAACC,EAAE,KAAK,SAAS,IACzBD,qBAAQ,CAACC,EAAE,KAAK,OAAO;IACzB0C,gBAAgB,GAAG,EAAE;IACrBC;EACF,CAAC,GAAGnC,WAAW,CAACe,eAAe,CAAC,CAACqB,OAAO;EAExC,MAAM,CAACC,MAAM,EAAEC,SAAS,CAAC,GAAGC,KAAK,CAACC,QAAQ,CAAC,CAACzB,eAAe,CAAC,CAAC;EAE7D,IAAI,CAACsB,MAAM,CAACI,QAAQ,CAAC1B,eAAe,CAAC,EAAE;IACrCuB,SAAS,CAAC,CAAC,GAAGD,MAAM,EAAEtB,eAAe,CAAC,CAAC;EACzC;EAEA,MAAM2B,UAAU,GAAG,IAAAC,4CAAgB,GAAE;EAErC,MAAM;IAAEC;EAAO,CAAC,GAAG,IAAAC,gBAAQ,GAAE;EAE7B,MAAMC,YAAY,GAAG,IAAAC,iCAAwB,EAACjD,KAAK,CAAC;EAEpD,MAAMkD,gBAAgB,GAAGT,KAAK,CAACU,WAAW,CAAC,MAAM;IAC/ClD,UAAU,CAACmD,QAAQ,CAAC;MAClB,GAAGC,qBAAa,CAACC,UAAU,EAAE;MAC7BC,MAAM,EAAEvD,KAAK,CAACoB;IAChB,CAAC,CAAC;EACJ,CAAC,EAAE,CAACnB,UAAU,EAAED,KAAK,CAACoB,GAAG,CAAC,CAAC;EAE3B,MAAMoC,iBAAiB,GAAGf,KAAK,CAACU,WAAW,CAAC,MAAM;IAChDlD,UAAU,CAACmD,QAAQ,CAAC;MAClB,GAAGC,qBAAa,CAACI,WAAW,EAAE;MAC9BF,MAAM,EAAEvD,KAAK,CAACoB;IAChB,CAAC,CAAC;EACJ,CAAC,EAAE,CAACnB,UAAU,EAAED,KAAK,CAACoB,GAAG,CAAC,CAAC;EAE3BqB,KAAK,CAACiB,SAAS,CAAC,MAAM;IACpB,IAAIV,YAAY,KAAK7C,aAAa,IAAIyB,UAAU,KAAK,WAAW,EAAE;MAChE;IACF;IAEA,MAAM+B,kBAAkB,GAAG,MAAM;MAC/B;MACA;MACA,IAAI,CAAC1D,UAAU,CAAC2D,SAAS,EAAE,EAAE;QAC3B,OAAO,KAAK;MACd;MAEA,IAAIzD,aAAa,KAAK,MAAM,EAAE;QAC5B+C,gBAAgB,EAAE;MACpB,CAAC,MAAM;QACLM,iBAAiB,EAAE;MACrB;MAEA,OAAO,IAAI;IACb,CAAC;IAED,MAAMK,YAAY,GAAIC,CAAgB,IAAK;MACzC,IAAIA,CAAC,CAAC1C,GAAG,KAAK,QAAQ,EAAE;QACtBuC,kBAAkB,EAAE;MACtB;IACF,CAAC;;IAED;IACA;IACA;IACA,MAAMI,YAAY,GAAGC,wBAAW,CAACC,gBAAgB,CAC/C,mBAAmB,EACnBN,kBAAkB,CACnB;IAED,IAAIlE,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MAAA;MACzB,aAAAwE,QAAQ,gEAAR,UAAUC,IAAI,4EAAd,eAAgBF,gBAAgB,0DAAhC,2CAAmC,OAAO,EAAEJ,YAAY,CAAC;IAC3D;IAEA,OAAO,MAAM;MACXE,YAAY,CAACK,MAAM,EAAE;MAErB,IAAI3E,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;QAAA;QACzB,cAAAwE,QAAQ,kEAAR,WAAUC,IAAI,6EAAd,gBAAgBE,mBAAmB,0DAAnC,4CAAsC,OAAO,EAAER,YAAY,CAAC;MAC9D;IACF,CAAC;EACH,CAAC,EAAE,CACD1D,aAAa,EACb6C,YAAY,EACZpB,UAAU,EACV4B,iBAAiB,EACjBN,gBAAgB,EAChBjD,UAAU,CACX,CAAC;EAEF,MAAMqE,mBAAmB,GAAG,MAAM;IAChC,oBACE,oBAAC,8BAAqB,CAAC,QAAQ;MAAC,KAAK,EAAEhD;IAAe,GACnDlB,aAAa,CAAC;MACbJ,KAAK,EAAEA,KAAK;MACZC,UAAU,EAAEA,UAAU;MACtBC,WAAW,EAAEA;IACf,CAAC,CAAC,CAC6B;EAErC,CAAC;EAED,MAAMqE,kBAAkB,GAAG,MAAM;IAC/B,oBACE,oBAAC,oCAAoB;MACnB,OAAO,EAAEjE,qBAAsB;MAC/B,YAAY;MACZ,KAAK,EAAEkE,MAAM,CAACC;IAAQ,GAErBzE,KAAK,CAACkB,MAAM,CAACwD,GAAG,CAAC,CAACC,KAAK,EAAExD,KAAK,KAAK;MAClC,MAAMyD,UAAU,GAAG1E,WAAW,CAACyE,KAAK,CAACvD,GAAG,CAAC;MACzC,MAAM;QAAEyD,IAAI,GAAG,IAAI;QAAEC;MAAc,CAAC,GAAGF,UAAU,CAACtC,OAAO;MACzD,MAAMsB,SAAS,GAAG5D,KAAK,CAACmB,KAAK,KAAKA,KAAK;MAEvC,IAAI2D,aAAa,IAAI,CAAClB,SAAS,EAAE;QAC/B,OAAO,IAAI;MACb;MAEA,IAAIiB,IAAI,IAAI,CAACtC,MAAM,CAACI,QAAQ,CAACgC,KAAK,CAACvD,GAAG,CAAC,IAAI,CAACwC,SAAS,EAAE;QACrD;QACA,OAAO,IAAI;MACb;MAEA,MAAM;QACJmB,YAAY;QACZC,MAAM,GAAG;UAAA,IAAC;YAAEC,MAAM;YAAE3C;UAA2B,CAAC;UAAA,oBAC9C,oBAAC,gBAAM,eACDA,OAAO;YACX,MAAM,EAAE2C,MAAO;YACf,KAAK,EAAE,IAAAC,wBAAc,EAAC5C,OAAO,EAAEqC,KAAK,CAACQ,IAAI,CAAE;YAC3C,UAAU,EACR7C,OAAO,CAAC8C,UAAU,KAChB/E,KAAK,iBAAK,oBAAC,2BAAkB,EAAKA,KAAK,CAAI;UAC9C,GACD;QAAA,CACH;QACDgF,WAAW;QACXC,qBAAqB;QACrBC,iBAAiB;QACjBC;MACF,CAAC,GAAGZ,UAAU,CAACtC,OAAO;MAEtB,oBACE,oBAAC,2BAAW;QACV,GAAG,EAAEqC,KAAK,CAACvD,GAAI;QACf,KAAK,EAAE,CAACqE,uBAAU,CAACC,YAAY,EAAE;UAAEC,MAAM,EAAE/B,SAAS,GAAG,CAAC,GAAG,CAAC;QAAE,CAAC,CAAE;QACjE,OAAO,EAAEA,SAAU;QACnB,OAAO,EAAEtD,qBAAsB;QAC/B,YAAY,EAAEyE;MAAa,gBAE3B,oBAAC,gBAAM;QACL,OAAO,EAAEnB,SAAU;QACnB,KAAK,EAAEgB,UAAU,CAACD,KAAM;QACxB,UAAU,EAAEC,UAAU,CAAC3E,UAAW;QAClC,WAAW,EAAEoF,WAAY;QACzB,qBAAqB,EAAEC,qBAAsB;QAC7C,iBAAiB,EAAEC,iBAAkB;QACrC,MAAM,EAAEP,MAAM,CAAC;UACbC,MAAM,EAAErC,UAAU;UAClB+B,KAAK,EAAEC,UAAU,CAACD,KAAK;UACvB1E,UAAU,EACR2E,UAAU,CAAC3E,UAAiD;UAC9DqC,OAAO,EAAEsC,UAAU,CAACtC;QACtB,CAAC,CAAE;QACH,KAAK,EAAEkD;MAAoB,GAE1BZ,UAAU,CAACgB,MAAM,EAAE,CACb,CACG;IAElB,CAAC,CAAC,CACmB;EAE3B,CAAC;EAED,oBACE,oBAAC,4BAAmB,CAAC,QAAQ;IAAC,KAAK,EAAE5C;EAAa,gBAChD,oBAAC,MAAM;IACL,IAAI,EAAEA,YAAY,KAAK,QAAS;IAChC,MAAM,EAAEE,gBAAiB;IACzB,OAAO,EAAEM,iBAAkB;IAC3B,mBAAmB,EAAEzB,mBAAoB;IACzC,YAAY,EAAEI,YAAa;IAC3B,cAAc,EAAED,cAAe;IAC/B,sBAAsB,EAAE,GAAI;IAC5B,sBAAsB,EAAEE,gBAAiB;IACzC,mBAAmB,EAAEf,yBAA0B;IAC/C,kBAAkB,EAAEK,wBAAyB;IAC7C,mBAAmB,EAAEM,mBAAoB;IACzC,UAAU,EAAEJ,UAAW;IACvB,yBAAyB,EAAES,yBAA0B;IACrD,cAAc,EAAEf,cAAe;IAC/B,WAAW,EAAE,CACX;MACEpC,KAAK,EAAEF,qBAAqB,CAAC4D,UAAU,CAAC;MACxCiD,eAAe,EAAE/C,MAAM,CAACgD;IAC1B,CAAC,EACDlE,UAAU,KAAK,WAAW,KACvBN,cAAc,KAAK,MAAM,GACtB;MACEyE,gBAAgB,EAAEjD,MAAM,CAACkD,MAAM;MAC/BC,gBAAgB,EAAER,uBAAU,CAACS;IAC/B,CAAC,GACD;MACEC,eAAe,EAAErD,MAAM,CAACkD,MAAM;MAC9BI,eAAe,EAAEX,uBAAU,CAACS;IAC9B,CAAC,CAAC,EACRvE,WAAW,CACX;IACF,YAAY,EAAE;MAAEkE,eAAe,EAAE5D;IAAa,CAAE;IAChD,mBAAmB,EAAEqC,mBAAoB;IACzC,kBAAkB,EAAEC,kBAAmB;IACvC,UAAU,EAAE3B;EAAW,EACvB,CAC2B;AAEnC;AAEe,SAASyD,UAAU,QAAiC;EAAA,IAAhC;IAAEpG,UAAU;IAAE,GAAGqG;EAAY,CAAC;EAC/D,oBACE,oBAAC,gCAAsB,qBACrB,oBAAC,qBAAqB;IAAC,KAAK,EAAE9B,MAAM,CAACC;EAAQ,gBAC3C,oBAAC,cAAc;IAAC,UAAU,EAAExE;EAAW,GAAKqG,IAAI,EAAI,CAC9B,CACD;AAE7B;AAEA,MAAM9B,MAAM,GAAGiB,uBAAU,CAACc,MAAM,CAAC;EAC/B9B,OAAO,EAAE;IACP+B,IAAI,EAAE;EACR;AACF,CAAC,CAAC"}
+{"version":3,"names":["DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","props","detachInactiveScreens","Platform","OS","focusedRouteKey","routes","index","key","drawerHideStatusBarOnOpen","drawerPosition","I18nManager","getConstants","isRTL","drawerStatusBarAnimation","drawerStyle","drawerType","gestureHandlerProps","keyboardDismissMode","overlayColor","swipeEdgeWidth","swipeEnabled","swipeMinDistance","overlayAccessibilityLabel","options","loaded","setLoaded","React","useState","includes","dimensions","useSafeAreaFrame","colors","useTheme","drawerStatus","getDrawerStatusFromState","handleDrawerOpen","useCallback","dispatch","DrawerActions","openDrawer","target","handleDrawerClose","closeDrawer","useEffect","handleHardwareBack","isFocused","handleEscape","e","subscription","BackHandler","addEventListener","document","body","remove","removeEventListener","renderDrawerContent","renderSceneContent","styles","content","map","route","descriptor","lazy","unmountOnBlur","freezeOnBlur","header","layout","getHeaderTitle","name","headerLeft","headerShown","headerStatusBarHeight","headerTransparent","sceneContainerStyle","StyleSheet","absoluteFill","zIndex","render","backgroundColor","card","borderRightColor","border","borderRightWidth","hairlineWidth","borderLeftColor","borderLeftWidth","DrawerView","rest","create","flex"],"sourceRoot":"../../src","sources":["DrawerView.tsx"],"mappings":"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"}

package/lib/module/index.js

@@ -16,12 +16,10 @@ export { default as DrawerView } from './views/DrawerView';
 /**
  * Utilities
  */
-export { default as DrawerGestureContext } from './utils/DrawerGestureContext';
-export { default as DrawerProgressContext } from './utils/DrawerProgressContext';
 export { default as DrawerStatusContext } from './utils/DrawerStatusContext';
 export { default as getDrawerStatusFromState } from './utils/getDrawerStatusFromState';
-export { default as useDrawerProgress } from './utils/useDrawerProgress';
 export { default as useDrawerStatus } from './utils/useDrawerStatus';
+export { DrawerGestureContext, DrawerProgressContext, useDrawerProgress } from 'react-native-drawer-layout';
 
 /**
  * Types

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","createDrawerNavigator","DrawerContent","DrawerContentScrollView","DrawerItem","DrawerItemList","DrawerToggleButton","DrawerView","DrawerGestureContext","DrawerProgressContext","DrawerStatusContext","getDrawerStatusFromState","useDrawerProgress","useDrawerStatus"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,OAAO,IAAIC,qBAAqB,QAAQ,oCAAoC;;AAErF;AACA;AACA;AACA,SAASD,OAAO,IAAIE,aAAa,QAAQ,uBAAuB;AAChE,SAASF,OAAO,IAAIG,uBAAuB,QAAQ,iCAAiC;AACpF,SAASH,OAAO,IAAII,UAAU,QAAQ,oBAAoB;AAC1D,SAASJ,OAAO,IAAIK,cAAc,QAAQ,wBAAwB;AAClE,SAASL,OAAO,IAAIM,kBAAkB,QAAQ,4BAA4B;AAC1E,SAASN,OAAO,IAAIO,UAAU,QAAQ,oBAAoB;;AAE1D;AACA;AACA;AACA,SAASP,OAAO,IAAIQ,oBAAoB,QAAQ,8BAA8B;AAC9E,SAASR,OAAO,IAAIS,qBAAqB,QAAQ,+BAA+B;AAChF,SAAST,OAAO,IAAIU,mBAAmB,QAAQ,6BAA6B;AAC5E,SAASV,OAAO,IAAIW,wBAAwB,QAAQ,kCAAkC;AACtF,SAASX,OAAO,IAAIY,iBAAiB,QAAQ,2BAA2B;AACxE,SAASZ,OAAO,IAAIa,eAAe,QAAQ,yBAAyB;;AAEpE;AACA;AACA"}
+{"version":3,"names":["default","createDrawerNavigator","DrawerContent","DrawerContentScrollView","DrawerItem","DrawerItemList","DrawerToggleButton","DrawerView","DrawerStatusContext","getDrawerStatusFromState","useDrawerStatus","DrawerGestureContext","DrawerProgressContext","useDrawerProgress"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,OAAO,IAAIC,qBAAqB,QAAQ,oCAAoC;;AAErF;AACA;AACA;AACA,SAASD,OAAO,IAAIE,aAAa,QAAQ,uBAAuB;AAChE,SAASF,OAAO,IAAIG,uBAAuB,QAAQ,iCAAiC;AACpF,SAASH,OAAO,IAAII,UAAU,QAAQ,oBAAoB;AAC1D,SAASJ,OAAO,IAAIK,cAAc,QAAQ,wBAAwB;AAClE,SAASL,OAAO,IAAIM,kBAAkB,QAAQ,4BAA4B;AAC1E,SAASN,OAAO,IAAIO,UAAU,QAAQ,oBAAoB;;AAE1D;AACA;AACA;AACA,SAASP,OAAO,IAAIQ,mBAAmB,QAAQ,6BAA6B;AAC5E,SAASR,OAAO,IAAIS,wBAAwB,QAAQ,kCAAkC;AACtF,SAAST,OAAO,IAAIU,eAAe,QAAQ,yBAAyB;AACpE,SACEC,oBAAoB,EACpBC,qBAAqB,EACrBC,iBAAiB,QACZ,4BAA4B;;AAEnC;AACA;AACA"}

package/lib/module/navigators/createDrawerNavigator.js

@@ -1,57 +1,18 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import { createNavigatorFactory, DrawerRouter, useNavigationBuilder } from '@react-navigation/native';
 import * as React from 'react';
-import warnOnce from 'warn-once';
 import DrawerView from '../views/DrawerView';
 function DrawerNavigator(_ref) {
   let {
     id,
     initialRouteName,
-    defaultStatus: customDefaultStatus,
+    defaultStatus = 'closed',
     backBehavior,
     children,
     screenListeners,
     screenOptions,
-    ...restWithDeprecated
-  } = _ref;
-  const {
-    // @ts-expect-error: openByDefault is deprecated
-    openByDefault,
-    // @ts-expect-error: lazy is deprecated
-    lazy,
-    // @ts-expect-error: drawerContentOptions is deprecated
-    drawerContentOptions,
     ...rest
-  } = restWithDeprecated;
-  let defaultScreenOptions = {};
-  if (drawerContentOptions) {
-    Object.assign(defaultScreenOptions, {
-      drawerPosition: drawerContentOptions.drawerPosition,
-      drawerType: drawerContentOptions.drawerType,
-      swipeEdgeWidth: drawerContentOptions.edgeWidth,
-      drawerHideStatusBarOnOpen: drawerContentOptions.hideStatusBar,
-      keyboardDismissMode: drawerContentOptions.keyboardDismissMode,
-      swipeMinDistance: drawerContentOptions.minSwipeDistance,
-      overlayColor: drawerContentOptions.overlayColor,
-      drawerStatusBarAnimation: drawerContentOptions.statusBarAnimation,
-      gestureHandlerProps: drawerContentOptions.gestureHandlerProps
-    });
-    Object.keys(defaultScreenOptions).forEach(key => {
-      if (defaultScreenOptions[key] === undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        delete defaultScreenOptions[key];
-      }
-    });
-    warnOnce(drawerContentOptions, `Drawer Navigator: 'drawerContentOptions' is deprecated. Migrate the options to 'screenOptions' instead.\n\nPlace the following in 'screenOptions' in your code to keep current behavior:\n\n${JSON.stringify(defaultScreenOptions, null, 2)}\n\nSee https://reactnavigation.org/docs/drawer-navigator#options for more details.`);
-  }
-  if (typeof lazy === 'boolean') {
-    defaultScreenOptions.lazy = lazy;
-    warnOnce(true, `Drawer Navigator: 'lazy' in props is deprecated. Move it to 'screenOptions' instead.\n\nSee https://reactnavigation.org/docs/drawer-navigator/#lazy for more details.`);
-  }
-  if (typeof openByDefault === 'boolean') {
-    warnOnce(true, `Drawer Navigator: 'openByDefault' is deprecated. Use 'defaultStatus' and set it to 'open' or 'closed' instead.\n\nSee https://reactnavigation.org/docs/drawer-navigator/#defaultstatus for more details.`);
-  }
-  const defaultStatus = customDefaultStatus !== undefined ? customDefaultStatus : openByDefault ? 'open' : 'closed';
+  } = _ref;
   const {
     state,
     descriptors,
@@ -64,8 +25,7 @@ function DrawerNavigator(_ref) {
     backBehavior,
     children,
     screenListeners,
-    screenOptions,
-    defaultScreenOptions
+    screenOptions
   });
   return /*#__PURE__*/React.createElement(NavigationContent, null, /*#__PURE__*/React.createElement(DrawerView, _extends({}, rest, {
     defaultStatus: defaultStatus,

package/lib/module/navigators/createDrawerNavigator.js.map

@@ -1 +1 @@
-{"version":3,"names":["createNavigatorFactory","DrawerRouter","useNavigationBuilder","React","warnOnce","DrawerView","DrawerNavigator","id","initialRouteName","defaultStatus","customDefaultStatus","backBehavior","children","screenListeners","screenOptions","restWithDeprecated","openByDefault","lazy","drawerContentOptions","rest","defaultScreenOptions","Object","assign","drawerPosition","drawerType","swipeEdgeWidth","edgeWidth","drawerHideStatusBarOnOpen","hideStatusBar","keyboardDismissMode","swipeMinDistance","minSwipeDistance","overlayColor","drawerStatusBarAnimation","statusBarAnimation","gestureHandlerProps","keys","forEach","key","undefined","JSON","stringify","state","descriptors","navigation","NavigationContent"],"sourceRoot":"../../src","sources":["createDrawerNavigator.tsx"],"mappings":";AAAA,SACEA,sBAAsB,EAItBC,YAAY,EAIZC,oBAAoB,QACf,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,OAAOC,QAAQ,MAAM,WAAW;AAOhC,OAAOC,UAAU,MAAM,qBAAqB;AAW5C,SAASC,eAAe,OASd;EAAA,IATe;IACvBC,EAAE;IACFC,gBAAgB;IAChBC,aAAa,EAAEC,mBAAmB;IAClCC,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC,aAAa;IACb,GAAGC;EACE,CAAC;EACN,MAAM;IACJ;IACAC,aAAa;IACb;IACAC,IAAI;IACJ;IACAC,oBAAoB;IACpB,GAAGC;EACL,CAAC,GAAGJ,kBAAkB;EAEtB,IAAIK,oBAA6C,GAAG,CAAC,CAAC;EAEtD,IAAIF,oBAAoB,EAAE;IACxBG,MAAM,CAACC,MAAM,CAACF,oBAAoB,EAAE;MAClCG,cAAc,EAAEL,oBAAoB,CAACK,cAAc;MACnDC,UAAU,EAAEN,oBAAoB,CAACM,UAAU;MAC3CC,cAAc,EAAEP,oBAAoB,CAACQ,SAAS;MAC9CC,yBAAyB,EAAET,oBAAoB,CAACU,aAAa;MAC7DC,mBAAmB,EAAEX,oBAAoB,CAACW,mBAAmB;MAC7DC,gBAAgB,EAAEZ,oBAAoB,CAACa,gBAAgB;MACvDC,YAAY,EAAEd,oBAAoB,CAACc,YAAY;MAC/CC,wBAAwB,EAAEf,oBAAoB,CAACgB,kBAAkB;MACjEC,mBAAmB,EAAEjB,oBAAoB,CAACiB;IAC5C,CAAC,CAAC;IAGAd,MAAM,CAACe,IAAI,CAAChB,oBAAoB,CAAC,CACjCiB,OAAO,CAAEC,GAAG,IAAK;MACjB,IAAIlB,oBAAoB,CAACkB,GAAG,CAAC,KAAKC,SAAS,EAAE;QAC3C;QACA,OAAOnB,oBAAoB,CAACkB,GAAG,CAAC;MAClC;IACF,CAAC,CAAC;IAEFlC,QAAQ,CACNc,oBAAoB,EACnB,+LAA8LsB,IAAI,CAACC,SAAS,CAC3MrB,oBAAoB,EACpB,IAAI,EACJ,CAAC,CACD,qFAAoF,CACvF;EACH;EAEA,IAAI,OAAOH,IAAI,KAAK,SAAS,EAAE;IAC7BG,oBAAoB,CAACH,IAAI,GAAGA,IAAI;IAEhCb,QAAQ,CACN,IAAI,EACH,uKAAsK,CACxK;EACH;EAEA,IAAI,OAAOY,aAAa,KAAK,SAAS,EAAE;IACtCZ,QAAQ,CACN,IAAI,EACH,0MAAyM,CAC3M;EACH;EAEA,MAAMK,aAA2B,GAC/BC,mBAAmB,KAAK6B,SAAS,GAC7B7B,mBAAmB,GACnBM,aAAa,GACb,MAAM,GACN,QAAQ;EAEd,MAAM;IAAE0B,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GACzD3C,oBAAoB,CAMlBD,YAAY,EAAE;IACdM,EAAE;IACFC,gBAAgB;IAChBC,aAAa;IACbE,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC,aAAa;IACbM;EACF,CAAC,CAAC;EAEJ,oBACE,oBAAC,iBAAiB,qBAChB,oBAAC,UAAU,eACLD,IAAI;IACR,aAAa,EAAEV,aAAc;IAC7B,KAAK,EAAEiC,KAAM;IACb,WAAW,EAAEC,WAAY;IACzB,UAAU,EAAEC;EAAW,GACvB,CACgB;AAExB;AAEA,eAAe5C,sBAAsB,CAKnCM,eAAe,CAAC"}
+{"version":3,"names":["createNavigatorFactory","DrawerRouter","useNavigationBuilder","React","DrawerView","DrawerNavigator","id","initialRouteName","defaultStatus","backBehavior","children","screenListeners","screenOptions","rest","state","descriptors","navigation","NavigationContent"],"sourceRoot":"../../src","sources":["createDrawerNavigator.tsx"],"mappings":";AAAA,SACEA,sBAAsB,EAItBC,YAAY,EAGZC,oBAAoB,QACf,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAO9B,OAAOC,UAAU,MAAM,qBAAqB;AAW5C,SAASC,eAAe,OASd;EAAA,IATe;IACvBC,EAAE;IACFC,gBAAgB;IAChBC,aAAa,GAAG,QAAQ;IACxBC,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC,aAAa;IACb,GAAGC;EACE,CAAC;EACN,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GACzDf,oBAAoB,CAMlBD,YAAY,EAAE;IACdK,EAAE;IACFC,gBAAgB;IAChBC,aAAa;IACbC,YAAY;IACZC,QAAQ;IACRC,eAAe;IACfC;EACF,CAAC,CAAC;EAEJ,oBACE,oBAAC,iBAAiB,qBAChB,oBAAC,UAAU,eACLC,IAAI;IACR,aAAa,EAAEL,aAAc;IAC7B,KAAK,EAAEM,KAAM;IACb,WAAW,EAAEC,WAAY;IACzB,UAAU,EAAEC;EAAW,GACvB,CACgB;AAExB;AAEA,eAAehB,sBAAsB,CAKnCK,eAAe,CAAC"}

package/lib/module/views/DrawerItem.js

@@ -1,26 +1,28 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import { PlatformPressable } from '@react-navigation/elements';
-import { Link, useTheme } from '@react-navigation/native';
+import { CommonActions, Link, useTheme } from '@react-navigation/native';
 import Color from 'color';
 import * as React from 'react';
 import { Platform, StyleSheet, Text, View } from 'react-native';
 const LinkPressable = _ref => {
   let {
+    route,
+    href,
     children,
     style,
     onPress,
     onLongPress,
     onPressIn,
     onPressOut,
-    to,
     accessibilityRole,
     ...rest
   } = _ref;
-  if (Platform.OS === 'web' && to) {
+  if (Platform.OS === 'web') {
     // React Native Web doesn't forward `onClick` if we use `TouchableWithoutFeedback`.
     // We need to use `onClick` to be able to prevent default browser handling of links.
     return /*#__PURE__*/React.createElement(Link, _extends({}, rest, {
-      to: to,
+      href: href,
+      action: CommonActions.navigate(route.name, route.params),
       style: [styles.button, style],
       onPress: e => {
         if (!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) && (
@@ -56,10 +58,11 @@ export default function DrawerItem(props) {
     colors
   } = useTheme();
   const {
+    route,
+    href,
     icon,
     label,
     labelStyle,
-    to,
     focused = false,
     allowFontScaling,
     activeTintColor = colors.primary,
@@ -104,7 +107,8 @@ export default function DrawerItem(props) {
     },
     pressColor: pressColor,
     pressOpacity: pressOpacity,
-    to: to
+    route: route,
+    href: href
   }, /*#__PURE__*/React.createElement(React.Fragment, null, iconNode, /*#__PURE__*/React.createElement(View, {
     style: [styles.label, {
       marginLeft: iconNode ? 32 : 0,