@react-navigation/drawer 7.0.0-alpha.2 → 7.0.0-alpha.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 -1
- package/lib/commonjs/views/DrawerContentScrollView.js.map +1 -1
- package/lib/commonjs/views/DrawerView.js +14 -10
- package/lib/commonjs/views/DrawerView.js.map +1 -1
- package/lib/module/views/DrawerContentScrollView.js +6 -2
- package/lib/module/views/DrawerContentScrollView.js.map +1 -1
- package/lib/module/views/DrawerView.js +16 -12
- package/lib/module/views/DrawerView.js.map +1 -1
- package/lib/typescript/src/views/DrawerContentScrollView.d.ts.map +1 -1
- package/lib/typescript/src/views/DrawerView.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/views/DrawerContentScrollView.tsx +7 -9
- package/src/views/DrawerView.tsx +13 -11
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.DrawerContentScrollView = void 0;
|
|
7
|
+
var _native = require("@react-navigation/native");
|
|
7
8
|
var React = _interopRequireWildcard(require("react"));
|
|
8
9
|
var _reactNative = require("react-native");
|
|
9
10
|
var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
|
|
@@ -20,7 +21,10 @@ function DrawerContentScrollViewInner(_ref, ref) {
|
|
|
20
21
|
} = _ref;
|
|
21
22
|
const drawerPosition = React.useContext(_DrawerPositionContext.DrawerPositionContext);
|
|
22
23
|
const insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
|
|
23
|
-
const
|
|
24
|
+
const {
|
|
25
|
+
direction
|
|
26
|
+
} = (0, _native.useLocale)();
|
|
27
|
+
const isRight = direction === 'rtl' ? drawerPosition === 'left' : drawerPosition === 'right';
|
|
24
28
|
return /*#__PURE__*/React.createElement(_reactNative.ScrollView, _extends({}, rest, {
|
|
25
29
|
ref: ref,
|
|
26
30
|
contentContainerStyle: [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DrawerContentScrollViewInner","ref","contentContainerStyle","style","children","rest","drawerPosition","React","useContext","DrawerPositionContext","insets","useSafeAreaInsets","
|
|
1
|
+
{"version":3,"names":["DrawerContentScrollViewInner","ref","contentContainerStyle","style","children","rest","drawerPosition","React","useContext","DrawerPositionContext","insets","useSafeAreaInsets","direction","useLocale","isRight","paddingTop","top","paddingStart","left","paddingEnd","right","styles","container","DrawerContentScrollView","forwardRef","StyleSheet","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerContentScrollView.tsx"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AAEA;AAAuE;AAAA;AAAA;AAMvE,SAASA,4BAA4B,OAEnCC,GAA2B,EAC3B;EAAA,IAFA;IAAEC,qBAAqB;IAAEC,KAAK;IAAEC,QAAQ;IAAE,GAAGC;EAAY,CAAC;EAG1D,MAAMC,cAAc,GAAGC,KAAK,CAACC,UAAU,CAACC,4CAAqB,CAAC;EAC9D,MAAMC,MAAM,GAAG,IAAAC,6CAAiB,GAAE;EAClC,MAAM;IAAEC;EAAU,CAAC,GAAG,IAAAC,iBAAS,GAAE;EAEjC,MAAMC,OAAO,GACXF,SAAS,KAAK,KAAK,GACfN,cAAc,KAAK,MAAM,GACzBA,cAAc,KAAK,OAAO;EAEhC,oBACE,oBAAC,uBAAU,eACLD,IAAI;IACR,GAAG,EAAEJ,GAAI;IACT,qBAAqB,EAAE,CACrB;MACEc,UAAU,EAAEL,MAAM,CAACM,GAAG,GAAG,CAAC;MAC1BC,YAAY,EAAE,CAACH,OAAO,GAAGJ,MAAM,CAACQ,IAAI,GAAG,CAAC;MACxCC,UAAU,EAAEL,OAAO,GAAGJ,MAAM,CAACU,KAAK,GAAG;IACvC,CAAC,EACDlB,qBAAqB,CACrB;IACF,KAAK,EAAE,CAACmB,MAAM,CAACC,SAAS,EAAEnB,KAAK;EAAE,IAEhCC,QAAQ,CACE;AAEjB;AAEO,MAAMmB,uBAAuB,gBAAGhB,KAAK,CAACiB,UAAU,CACrDxB,4BAA4B,CAC7B;AAAC;AAEF,MAAMqB,MAAM,GAAGI,uBAAU,CAACC,MAAM,CAAC;EAC/BJ,SAAS,EAAE;IACTK,IAAI,EAAE;EACR;AACF,CAAC,CAAC"}
|
|
@@ -30,10 +30,13 @@ function DrawerViewBase(_ref) {
|
|
|
30
30
|
drawerContent = props => /*#__PURE__*/React.createElement(_DrawerContent.DrawerContent, props),
|
|
31
31
|
detachInactiveScreens = _reactNative.Platform.OS === 'web' || _reactNative.Platform.OS === 'android' || _reactNative.Platform.OS === 'ios'
|
|
32
32
|
} = _ref;
|
|
33
|
+
const {
|
|
34
|
+
direction
|
|
35
|
+
} = (0, _native.useLocale)();
|
|
33
36
|
const focusedRouteKey = state.routes[state.index].key;
|
|
34
37
|
const {
|
|
35
38
|
drawerHideStatusBarOnOpen,
|
|
36
|
-
drawerPosition =
|
|
39
|
+
drawerPosition = direction === 'rtl' ? 'right' : 'left',
|
|
37
40
|
drawerStatusBarAnimation,
|
|
38
41
|
drawerStyle,
|
|
39
42
|
drawerType,
|
|
@@ -124,21 +127,22 @@ function DrawerViewBase(_ref) {
|
|
|
124
127
|
handleHardwareBack();
|
|
125
128
|
}
|
|
126
129
|
};
|
|
130
|
+
if (_reactNative.Platform.OS === 'web') {
|
|
131
|
+
var _document, _document$body, _document$body$addEve;
|
|
132
|
+
(_document = document) === null || _document === void 0 ? void 0 : (_document$body = _document.body) === null || _document$body === void 0 ? void 0 : (_document$body$addEve = _document$body.addEventListener) === null || _document$body$addEve === void 0 ? void 0 : _document$body$addEve.call(_document$body, 'keyup', handleEscape);
|
|
133
|
+
return () => {
|
|
134
|
+
var _document2, _document2$body, _document2$body$remov;
|
|
135
|
+
(_document2 = document) === null || _document2 === void 0 ? void 0 : (_document2$body = _document2.body) === null || _document2$body === void 0 ? void 0 : (_document2$body$remov = _document2$body.removeEventListener) === null || _document2$body$remov === void 0 ? void 0 : _document2$body$remov.call(_document2$body, 'keyup', handleEscape);
|
|
136
|
+
};
|
|
137
|
+
}
|
|
127
138
|
|
|
128
139
|
// We only add the listeners when drawer opens
|
|
129
140
|
// This way we can make sure that the listener is added as late as possible
|
|
130
141
|
// This will make sure that our handler will run first when back button is pressed
|
|
131
142
|
const subscription = _reactNative.BackHandler.addEventListener('hardwareBackPress', handleHardwareBack);
|
|
132
|
-
if (_reactNative.Platform.OS === 'web') {
|
|
133
|
-
var _document, _document$body, _document$body$addEve;
|
|
134
|
-
(_document = document) === null || _document === void 0 ? void 0 : (_document$body = _document.body) === null || _document$body === void 0 ? void 0 : (_document$body$addEve = _document$body.addEventListener) === null || _document$body$addEve === void 0 ? void 0 : _document$body$addEve.call(_document$body, 'keyup', handleEscape);
|
|
135
|
-
}
|
|
136
143
|
return () => {
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
var _document2, _document2$body, _document2$body$remov;
|
|
140
|
-
(_document2 = document) === null || _document2 === void 0 ? void 0 : (_document2$body = _document2.body) === null || _document2$body === void 0 ? void 0 : (_document2$body$remov = _document2$body.removeEventListener) === null || _document2$body$remov === void 0 ? void 0 : _document2$body$remov.call(_document2$body, 'keyup', handleEscape);
|
|
141
|
-
}
|
|
144
|
+
var _subscription$remove;
|
|
145
|
+
subscription === null || subscription === void 0 ? void 0 : (_subscription$remove = subscription.remove) === null || _subscription$remove === void 0 ? void 0 : _subscription$remove.call(subscription);
|
|
142
146
|
};
|
|
143
147
|
}, [defaultStatus, drawerStatus, drawerType, handleDrawerClose, handleDrawerOpen, navigation]);
|
|
144
148
|
const renderDrawerContent = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","props","detachInactiveScreens","Platform","OS","focusedRouteKey","routes","index","key","drawerHideStatusBarOnOpen","drawerPosition","
|
|
1
|
+
{"version":3,"names":["DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","props","detachInactiveScreens","Platform","OS","direction","useLocale","focusedRouteKey","routes","index","key","drawerHideStatusBarOnOpen","drawerPosition","drawerStatusBarAnimation","drawerStyle","drawerType","gestureHandlerProps","keyboardDismissMode","overlayColor","swipeEdgeWidth","swipeEnabled","swipeMinDistance","overlayAccessibilityLabel","options","loaded","setLoaded","React","useState","includes","dimensions","useSafeAreaFrame","colors","useTheme","drawerStatus","getDrawerStatusFromState","handleDrawerOpen","useLatestCallback","dispatch","DrawerActions","openDrawer","target","handleDrawerClose","closeDrawer","handleGestureStart","emit","type","handleGestureEnd","handleGestureCancel","handleTransitionStart","closing","data","handleTransitionEnd","useEffect","handleHardwareBack","isFocused","handleEscape","e","document","body","addEventListener","removeEventListener","subscription","BackHandler","remove","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":["views/DrawerView.tsx"],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
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); }
|
|
2
|
+
import { useLocale } from '@react-navigation/native';
|
|
2
3
|
import * as React from 'react';
|
|
3
|
-
import {
|
|
4
|
+
import { ScrollView, StyleSheet } from 'react-native';
|
|
4
5
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
5
6
|
import { DrawerPositionContext } from '../utils/DrawerPositionContext';
|
|
6
7
|
function DrawerContentScrollViewInner(_ref, ref) {
|
|
@@ -12,7 +13,10 @@ function DrawerContentScrollViewInner(_ref, ref) {
|
|
|
12
13
|
} = _ref;
|
|
13
14
|
const drawerPosition = React.useContext(DrawerPositionContext);
|
|
14
15
|
const insets = useSafeAreaInsets();
|
|
15
|
-
const
|
|
16
|
+
const {
|
|
17
|
+
direction
|
|
18
|
+
} = useLocale();
|
|
19
|
+
const isRight = direction === 'rtl' ? drawerPosition === 'left' : drawerPosition === 'right';
|
|
16
20
|
return /*#__PURE__*/React.createElement(ScrollView, _extends({}, rest, {
|
|
17
21
|
ref: ref,
|
|
18
22
|
contentContainerStyle: [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["useLocale","React","ScrollView","StyleSheet","useSafeAreaInsets","DrawerPositionContext","DrawerContentScrollViewInner","ref","contentContainerStyle","style","children","rest","drawerPosition","useContext","insets","direction","isRight","paddingTop","top","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,EAAmBC,UAAU,QAAQ,cAAc;AACtE,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,qBAAqB,QAAQ,gCAAgC;AAMtE,SAASC,4BAA4B,OAEnCC,GAA2B,EAC3B;EAAA,IAFA;IAAEC,qBAAqB;IAAEC,KAAK;IAAEC,QAAQ;IAAE,GAAGC;EAAY,CAAC;EAG1D,MAAMC,cAAc,GAAGX,KAAK,CAACY,UAAU,CAACR,qBAAqB,CAAC;EAC9D,MAAMS,MAAM,GAAGV,iBAAiB,EAAE;EAClC,MAAM;IAAEW;EAAU,CAAC,GAAGf,SAAS,EAAE;EAEjC,MAAMgB,OAAO,GACXD,SAAS,KAAK,KAAK,GACfH,cAAc,KAAK,MAAM,GACzBA,cAAc,KAAK,OAAO;EAEhC,oBACE,oBAAC,UAAU,eACLD,IAAI;IACR,GAAG,EAAEJ,GAAI;IACT,qBAAqB,EAAE,CACrB;MACEU,UAAU,EAAEH,MAAM,CAACI,GAAG,GAAG,CAAC;MAC1BC,YAAY,EAAE,CAACH,OAAO,GAAGF,MAAM,CAACM,IAAI,GAAG,CAAC;MACxCC,UAAU,EAAEL,OAAO,GAAGF,MAAM,CAACQ,KAAK,GAAG;IACvC,CAAC,EACDd,qBAAqB,CACrB;IACF,KAAK,EAAE,CAACe,MAAM,CAACC,SAAS,EAAEf,KAAK;EAAE,IAEhCC,QAAQ,CACE;AAEjB;AAEA,OAAO,MAAMe,uBAAuB,gBAAGxB,KAAK,CAACyB,UAAU,CACrDpB,4BAA4B,CAC7B;AAED,MAAMiB,MAAM,GAAGpB,UAAU,CAACwB,MAAM,CAAC;EAC/BH,SAAS,EAAE;IACTI,IAAI,EAAE;EACR;AACF,CAAC,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
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); }
|
|
2
2
|
import { getHeaderTitle, Header, SafeAreaProviderCompat, Screen } from '@react-navigation/elements';
|
|
3
|
-
import { DrawerActions, useTheme } from '@react-navigation/native';
|
|
3
|
+
import { DrawerActions, useLocale, useTheme } from '@react-navigation/native';
|
|
4
4
|
import * as React from 'react';
|
|
5
|
-
import { BackHandler,
|
|
5
|
+
import { BackHandler, Platform, StyleSheet } from 'react-native';
|
|
6
6
|
import { Drawer } from 'react-native-drawer-layout';
|
|
7
7
|
import { useSafeAreaFrame } from 'react-native-safe-area-context';
|
|
8
8
|
import useLatestCallback from 'use-latest-callback';
|
|
@@ -21,10 +21,13 @@ function DrawerViewBase(_ref) {
|
|
|
21
21
|
drawerContent = props => /*#__PURE__*/React.createElement(DrawerContent, props),
|
|
22
22
|
detachInactiveScreens = Platform.OS === 'web' || Platform.OS === 'android' || Platform.OS === 'ios'
|
|
23
23
|
} = _ref;
|
|
24
|
+
const {
|
|
25
|
+
direction
|
|
26
|
+
} = useLocale();
|
|
24
27
|
const focusedRouteKey = state.routes[state.index].key;
|
|
25
28
|
const {
|
|
26
29
|
drawerHideStatusBarOnOpen,
|
|
27
|
-
drawerPosition =
|
|
30
|
+
drawerPosition = direction === 'rtl' ? 'right' : 'left',
|
|
28
31
|
drawerStatusBarAnimation,
|
|
29
32
|
drawerStyle,
|
|
30
33
|
drawerType,
|
|
@@ -115,21 +118,22 @@ function DrawerViewBase(_ref) {
|
|
|
115
118
|
handleHardwareBack();
|
|
116
119
|
}
|
|
117
120
|
};
|
|
121
|
+
if (Platform.OS === 'web') {
|
|
122
|
+
var _document, _document$body, _document$body$addEve;
|
|
123
|
+
(_document = document) === null || _document === void 0 ? void 0 : (_document$body = _document.body) === null || _document$body === void 0 ? void 0 : (_document$body$addEve = _document$body.addEventListener) === null || _document$body$addEve === void 0 ? void 0 : _document$body$addEve.call(_document$body, 'keyup', handleEscape);
|
|
124
|
+
return () => {
|
|
125
|
+
var _document2, _document2$body, _document2$body$remov;
|
|
126
|
+
(_document2 = document) === null || _document2 === void 0 ? void 0 : (_document2$body = _document2.body) === null || _document2$body === void 0 ? void 0 : (_document2$body$remov = _document2$body.removeEventListener) === null || _document2$body$remov === void 0 ? void 0 : _document2$body$remov.call(_document2$body, 'keyup', handleEscape);
|
|
127
|
+
};
|
|
128
|
+
}
|
|
118
129
|
|
|
119
130
|
// We only add the listeners when drawer opens
|
|
120
131
|
// This way we can make sure that the listener is added as late as possible
|
|
121
132
|
// This will make sure that our handler will run first when back button is pressed
|
|
122
133
|
const subscription = BackHandler.addEventListener('hardwareBackPress', handleHardwareBack);
|
|
123
|
-
if (Platform.OS === 'web') {
|
|
124
|
-
var _document, _document$body, _document$body$addEve;
|
|
125
|
-
(_document = document) === null || _document === void 0 ? void 0 : (_document$body = _document.body) === null || _document$body === void 0 ? void 0 : (_document$body$addEve = _document$body.addEventListener) === null || _document$body$addEve === void 0 ? void 0 : _document$body$addEve.call(_document$body, 'keyup', handleEscape);
|
|
126
|
-
}
|
|
127
134
|
return () => {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
var _document2, _document2$body, _document2$body$remov;
|
|
131
|
-
(_document2 = document) === null || _document2 === void 0 ? void 0 : (_document2$body = _document2.body) === null || _document2$body === void 0 ? void 0 : (_document2$body$remov = _document2$body.removeEventListener) === null || _document2$body$remov === void 0 ? void 0 : _document2$body$remov.call(_document2$body, 'keyup', handleEscape);
|
|
132
|
-
}
|
|
135
|
+
var _subscription$remove;
|
|
136
|
+
subscription === null || subscription === void 0 ? void 0 : (_subscription$remove = subscription.remove) === null || _subscription$remove === void 0 ? void 0 : _subscription$remove.call(subscription);
|
|
133
137
|
};
|
|
134
138
|
}, [defaultStatus, drawerStatus, drawerType, handleDrawerClose, handleDrawerOpen, navigation]);
|
|
135
139
|
const renderDrawerContent = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getHeaderTitle","Header","SafeAreaProviderCompat","Screen","DrawerActions","useTheme","React","BackHandler","
|
|
1
|
+
{"version":3,"names":["getHeaderTitle","Header","SafeAreaProviderCompat","Screen","DrawerActions","useLocale","useTheme","React","BackHandler","Platform","StyleSheet","Drawer","useSafeAreaFrame","useLatestCallback","DrawerPositionContext","DrawerStatusContext","getDrawerStatusFromState","DrawerContent","DrawerToggleButton","MaybeScreen","MaybeScreenContainer","DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","props","detachInactiveScreens","OS","direction","focusedRouteKey","routes","index","key","drawerHideStatusBarOnOpen","drawerPosition","drawerStatusBarAnimation","drawerStyle","drawerType","gestureHandlerProps","keyboardDismissMode","overlayColor","swipeEdgeWidth","swipeEnabled","swipeMinDistance","overlayAccessibilityLabel","options","loaded","setLoaded","useState","includes","dimensions","colors","drawerStatus","handleDrawerOpen","dispatch","openDrawer","target","handleDrawerClose","closeDrawer","handleGestureStart","emit","type","handleGestureEnd","handleGestureCancel","handleTransitionStart","closing","data","handleTransitionEnd","useEffect","handleHardwareBack","isFocused","handleEscape","e","document","body","addEventListener","removeEventListener","subscription","remove","renderDrawerContent","renderSceneContent","styles","content","map","route","descriptor","lazy","unmountOnBlur","freezeOnBlur","header","layout","name","headerLeft","headerShown","headerStatusBarHeight","headerTransparent","sceneContainerStyle","absoluteFill","zIndex","render","backgroundColor","card","borderRightColor","border","borderRightWidth","hairlineWidth","borderLeftColor","borderLeftWidth","DrawerView","rest","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerView.tsx"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerContentScrollView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerContentScrollView.tsx"],"names":[],"mappings":"
|
|
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,eAAe,EAAc,MAAM,cAAc,CAAC;AAyCvE,eAAO,MAAM,uBAAuB;cAnCxB,MAAM,SAAS;oCAqC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerView.tsx"],"names":[],"mappings":"AAMA,OAAO,EAEL,qBAAqB,EACrB,YAAY,EACZ,aAAa,
|
|
1
|
+
{"version":3,"file":"DrawerView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerView.tsx"],"names":[],"mappings":"AAMA,OAAO,EAEL,qBAAqB,EACrB,YAAY,EACZ,aAAa,EAGd,MAAM,0BAA0B,CAAC;AAOlC,OAAO,KAAK,EAEV,mBAAmB,EAEnB,sBAAsB,EACtB,uBAAuB,EAExB,MAAM,UAAU,CAAC;AAQlB,KAAK,KAAK,GAAG,sBAAsB,GAAG;IACpC,aAAa,EAAE,YAAY,CAAC;IAC5B,KAAK,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAC5C,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAyRF,wBAAgB,UAAU,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,KAAK,eAMxD"}
|
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-alpha.
|
|
4
|
+
"version": "7.0.0-alpha.3",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native-component",
|
|
7
7
|
"react-component",
|
|
@@ -41,20 +41,20 @@
|
|
|
41
41
|
"clean": "del lib"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@react-navigation/elements": "^
|
|
44
|
+
"@react-navigation/elements": "^2.0.0-alpha.0",
|
|
45
45
|
"color": "^4.2.3",
|
|
46
|
-
"react-native-drawer-layout": "^
|
|
46
|
+
"react-native-drawer-layout": "^4.0.0-alpha.0",
|
|
47
47
|
"use-latest-callback": "^0.1.5"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@react-navigation/native": "^7.0.0-alpha.
|
|
50
|
+
"@react-navigation/native": "^7.0.0-alpha.3",
|
|
51
51
|
"@testing-library/react-native": "^11.5.0",
|
|
52
52
|
"@types/react": "~18.0.27",
|
|
53
53
|
"@types/react-native": "~0.70.8",
|
|
54
54
|
"del-cli": "^5.0.0",
|
|
55
55
|
"react": "18.2.0",
|
|
56
56
|
"react-native": "0.71.8",
|
|
57
|
-
"react-native-builder-bob": "^0.
|
|
57
|
+
"react-native-builder-bob": "^0.21.0",
|
|
58
58
|
"react-native-gesture-handler": "~2.9.0",
|
|
59
59
|
"react-native-reanimated": "~2.14.4",
|
|
60
60
|
"react-native-safe-area-context": "4.5.0",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
]
|
|
85
85
|
]
|
|
86
86
|
},
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "ddc5705b979d62bb3a293f221ec954cbad3dfba4"
|
|
88
88
|
}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
+
import { useLocale } from '@react-navigation/native';
|
|
1
2
|
import * as React from 'react';
|
|
2
|
-
import {
|
|
3
|
-
I18nManager,
|
|
4
|
-
ScrollView,
|
|
5
|
-
ScrollViewProps,
|
|
6
|
-
StyleSheet,
|
|
7
|
-
} from 'react-native';
|
|
3
|
+
import { ScrollView, ScrollViewProps, StyleSheet } from 'react-native';
|
|
8
4
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
9
5
|
|
|
10
6
|
import { DrawerPositionContext } from '../utils/DrawerPositionContext';
|
|
@@ -19,10 +15,12 @@ function DrawerContentScrollViewInner(
|
|
|
19
15
|
) {
|
|
20
16
|
const drawerPosition = React.useContext(DrawerPositionContext);
|
|
21
17
|
const insets = useSafeAreaInsets();
|
|
18
|
+
const { direction } = useLocale();
|
|
22
19
|
|
|
23
|
-
const isRight =
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
const isRight =
|
|
21
|
+
direction === 'rtl'
|
|
22
|
+
? drawerPosition === 'left'
|
|
23
|
+
: drawerPosition === 'right';
|
|
26
24
|
|
|
27
25
|
return (
|
|
28
26
|
<ScrollView
|
package/src/views/DrawerView.tsx
CHANGED
|
@@ -9,10 +9,11 @@ import {
|
|
|
9
9
|
DrawerNavigationState,
|
|
10
10
|
DrawerStatus,
|
|
11
11
|
ParamListBase,
|
|
12
|
+
useLocale,
|
|
12
13
|
useTheme,
|
|
13
14
|
} from '@react-navigation/native';
|
|
14
15
|
import * as React from 'react';
|
|
15
|
-
import { BackHandler,
|
|
16
|
+
import { BackHandler, Platform, StyleSheet } from 'react-native';
|
|
16
17
|
import { Drawer } from 'react-native-drawer-layout';
|
|
17
18
|
import { useSafeAreaFrame } from 'react-native-safe-area-context';
|
|
18
19
|
import useLatestCallback from 'use-latest-callback';
|
|
@@ -51,10 +52,12 @@ function DrawerViewBase({
|
|
|
51
52
|
Platform.OS === 'android' ||
|
|
52
53
|
Platform.OS === 'ios',
|
|
53
54
|
}: Props) {
|
|
55
|
+
const { direction } = useLocale();
|
|
56
|
+
|
|
54
57
|
const focusedRouteKey = state.routes[state.index].key;
|
|
55
58
|
const {
|
|
56
59
|
drawerHideStatusBarOnOpen,
|
|
57
|
-
drawerPosition =
|
|
60
|
+
drawerPosition = direction === 'rtl' ? 'right' : 'left',
|
|
58
61
|
drawerStatusBarAnimation,
|
|
59
62
|
drawerStyle,
|
|
60
63
|
drawerType,
|
|
@@ -159,6 +162,13 @@ function DrawerViewBase({
|
|
|
159
162
|
}
|
|
160
163
|
};
|
|
161
164
|
|
|
165
|
+
if (Platform.OS === 'web') {
|
|
166
|
+
document?.body?.addEventListener?.('keyup', handleEscape);
|
|
167
|
+
return () => {
|
|
168
|
+
document?.body?.removeEventListener?.('keyup', handleEscape);
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
|
|
162
172
|
// We only add the listeners when drawer opens
|
|
163
173
|
// This way we can make sure that the listener is added as late as possible
|
|
164
174
|
// This will make sure that our handler will run first when back button is pressed
|
|
@@ -167,16 +177,8 @@ function DrawerViewBase({
|
|
|
167
177
|
handleHardwareBack
|
|
168
178
|
);
|
|
169
179
|
|
|
170
|
-
if (Platform.OS === 'web') {
|
|
171
|
-
document?.body?.addEventListener?.('keyup', handleEscape);
|
|
172
|
-
}
|
|
173
|
-
|
|
174
180
|
return () => {
|
|
175
|
-
subscription
|
|
176
|
-
|
|
177
|
-
if (Platform.OS === 'web') {
|
|
178
|
-
document?.body?.removeEventListener?.('keyup', handleEscape);
|
|
179
|
-
}
|
|
181
|
+
subscription?.remove?.();
|
|
180
182
|
};
|
|
181
183
|
}, [
|
|
182
184
|
defaultStatus,
|