+1 -1

package.json

reviewed

··· 171 171 "react-native": "0.76.3", 172 172 "react-native-compressor": "1.10.3", 173 173 "react-native-date-picker": "^5.0.7", 174 174 - "react-native-drawer-layout": "^4.0.4", 174 174 + "react-native-drawer-layout": "^4.1.1", 175 175 "react-native-gesture-handler": "2.20.2", 176 176 "react-native-get-random-values": "~1.11.0", 177 177 "react-native-image-crop-picker": "^0.41.6",

-876

patches/react-native-drawer-layout+4.0.4.patch

reviewed

··· 1 1 - diff --git a/node_modules/react-native-drawer-layout/lib/commonjs/index.js b/node_modules/react-native-drawer-layout/lib/commonjs/index.js 2 2 - index 3dce76e..6c4b3e5 100644 3 3 - --- a/node_modules/react-native-drawer-layout/lib/commonjs/index.js 4 4 - +++ b/node_modules/react-native-drawer-layout/lib/commonjs/index.js 5 5 - @@ -9,6 +9,12 @@ Object.defineProperty(exports, "Drawer", { 6 6 - return _Drawer.Drawer; 7 7 - } 8 8 - }); 9 9 - +Object.defineProperty(exports, "DrawerGestureContext", { 10 10 - + enumerable: true, 11 11 - + get: function () { 12 12 - + return _DrawerGestureContext.DrawerGestureContext; 13 13 - + } 14 14 - +}); 15 15 - Object.defineProperty(exports, "DrawerProgressContext", { 16 16 - enumerable: true, 17 17 - get: function () { 18 18 - @@ -21,6 +27,7 @@ Object.defineProperty(exports, "useDrawerProgress", { 19 19 - return _useDrawerProgress.useDrawerProgress; 20 20 - } 21 21 - }); 22 22 - +var _DrawerGestureContext = require("./utils/DrawerGestureContext.js"); 23 23 - var _DrawerProgressContext = require("./utils/DrawerProgressContext.js"); 24 24 - var _useDrawerProgress = require("./utils/useDrawerProgress.js"); 25 25 - var _Drawer = require("./views/Drawer"); 26 26 - diff --git a/node_modules/react-native-drawer-layout/lib/commonjs/utils/DrawerGestureContext.js b/node_modules/react-native-drawer-layout/lib/commonjs/utils/DrawerGestureContext.js 27 27 - new file mode 100644 28 28 - index 0000000..de6d793 29 29 - --- /dev/null 30 30 - +++ b/node_modules/react-native-drawer-layout/lib/commonjs/utils/DrawerGestureContext.js 31 31 - @@ -0,0 +1,11 @@ 32 32 - +"use strict"; 33 33 - + 34 34 - +Object.defineProperty(exports, "__esModule", { 35 35 - + value: true 36 36 - +}); 37 37 - +exports.DrawerGestureContext = void 0; 38 38 - +var React = _interopRequireWildcard(require("react")); 39 39 - +function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); } 40 40 - +function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } 41 41 - +const DrawerGestureContext = exports.DrawerGestureContext = /*#__PURE__*/React.createContext(undefined); 42 42 - +//# sourceMappingURL=DrawerGestureContext.js.map 43 43 - \ No newline at end of file 44 44 - diff --git a/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js b/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js 45 45 - index fd65ab8..86a9a6a 100644 46 46 - --- a/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js 47 47 - +++ b/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js 48 48 - @@ -8,6 +8,7 @@ var React = _interopRequireWildcard(require("react")); 49 49 - var _reactNative = require("react-native"); 50 50 - var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated")); 51 51 - var _useLatestCallback = _interopRequireDefault(require("use-latest-callback")); 52 52 - +var _DrawerGestureContext = require("../utils/DrawerGestureContext.js"); 53 53 - var _DrawerProgressContext = require("../utils/DrawerProgressContext.js"); 54 54 - var _getDrawerWidth = require("../utils/getDrawerWidth.js"); 55 55 - var _GestureHandler = require("./GestureHandler"); 56 56 - @@ -79,38 +80,38 @@ function Drawer({ 57 57 - return () => hideStatusBar(false); 58 58 - }, [isOpen, hideStatusBarOnOpen, statusBarAnimation, hideStatusBar]); 59 59 - const interactionHandleRef = React.useRef(null); 60 60 - - const startInteraction = () => { 61 61 - + const startInteraction = React.useCallback(() => { 62 62 - interactionHandleRef.current = _reactNative.InteractionManager.createInteractionHandle(); 63 63 - - }; 64 64 - - const endInteraction = () => { 65 65 - + }, []); 66 66 - + const endInteraction = React.useCallback(() => { 67 67 - if (interactionHandleRef.current != null) { 68 68 - _reactNative.InteractionManager.clearInteractionHandle(interactionHandleRef.current); 69 69 - interactionHandleRef.current = null; 70 70 - } 71 71 - - }; 72 72 - - const hideKeyboard = () => { 73 73 - + }, []); 74 74 - + const hideKeyboard = React.useCallback(() => { 75 75 - if (keyboardDismissMode === 'on-drag') { 76 76 - _reactNative.Keyboard.dismiss(); 77 77 - } 78 78 - - }; 79 79 - - const onGestureBegin = () => { 80 80 - + }, [keyboardDismissMode]); 81 81 - + const onGestureBegin = React.useCallback(() => { 82 82 - onGestureStart?.(); 83 83 - startInteraction(); 84 84 - hideKeyboard(); 85 85 - hideStatusBar(true); 86 86 - - }; 87 87 - - const onGestureFinish = () => { 88 88 - + }, [onGestureStart, startInteraction, hideKeyboard, hideStatusBar]); 89 89 - + const onGestureFinish = React.useCallback(() => { 90 90 - onGestureEnd?.(); 91 91 - endInteraction(); 92 92 - - }; 93 93 - - const onGestureAbort = () => { 94 94 - + }, [onGestureEnd, endInteraction]); 95 95 - + const onGestureAbort = React.useCallback(() => { 96 96 - onGestureCancel?.(); 97 97 - endInteraction(); 98 98 - - }; 99 99 - + }, [onGestureCancel, endInteraction]); 100 100 - 101 101 - // FIXME: Currently hitSlop is broken when on Android when drawer is on right 102 102 - // https://github.com/software-mansion/react-native-gesture-handler/issues/569 103 103 - - const hitSlop = isRight ? 104 104 - + const hitSlop = React.useMemo(() => isRight ? 105 105 - // Extend hitSlop to the side of the screen when drawer is closed 106 106 - // This lets the user drag the drawer from the side of the screen 107 107 - { 108 108 - @@ -119,7 +120,7 @@ function Drawer({ 109 109 - } : { 110 110 - left: 0, 111 111 - width: isOpen ? undefined : swipeEdgeWidth 112 112 - - }; 113 113 - + }, [isRight, isOpen, swipeEdgeWidth]); 114 114 - const touchStartX = (0, _reactNativeReanimated.useSharedValue)(0); 115 115 - const touchX = (0, _reactNativeReanimated.useSharedValue)(0); 116 116 - const translationX = (0, _reactNativeReanimated.useSharedValue)(getDrawerTranslationX(open)); 117 117 - @@ -158,40 +159,43 @@ function Drawer({ 118 118 - }, [getDrawerTranslationX, handleAnimationEnd, handleAnimationStart, onClose, onOpen, touchStartX, touchX, translationX]); 119 119 - React.useEffect(() => toggleDrawer(open), [open, toggleDrawer]); 120 120 - const startX = (0, _reactNativeReanimated.useSharedValue)(0); 121 121 - - let pan = _GestureHandler.Gesture?.Pan().onBegin(event => { 122 122 - - 'worklet'; 123 123 - + const pan = React.useMemo(() => { 124 124 - + let panGesture = _GestureHandler.Gesture?.Pan().onBegin(event => { 125 125 - + 'worklet'; 126 126 - 127 127 - - startX.value = translationX.value; 128 128 - - gestureState.value = event.state; 129 129 - - touchStartX.value = event.x; 130 130 - - }).onStart(() => { 131 131 - - 'worklet'; 132 132 - + startX.value = translationX.value; 133 133 - + gestureState.value = event.state; 134 134 - + touchStartX.value = event.x; 135 135 - + }).onStart(() => { 136 136 - + 'worklet'; 137 137 - 138 138 - - (0, _reactNativeReanimated.runOnJS)(onGestureBegin)(); 139 139 - - }).onChange(event => { 140 140 - - 'worklet'; 141 141 - + (0, _reactNativeReanimated.runOnJS)(onGestureBegin)(); 142 142 - + }).onChange(event => { 143 143 - + 'worklet'; 144 144 - 145 145 - - touchX.value = event.x; 146 146 - - translationX.value = startX.value + event.translationX; 147 147 - - gestureState.value = event.state; 148 148 - - }).onEnd((event, success) => { 149 149 - - 'worklet'; 150 150 - + touchX.value = event.x; 151 151 - + translationX.value = startX.value + event.translationX; 152 152 - + gestureState.value = event.state; 153 153 - + }).onEnd((event, success) => { 154 154 - + 'worklet'; 155 155 - 156 156 - - gestureState.value = event.state; 157 157 - - if (!success) { 158 158 - - (0, _reactNativeReanimated.runOnJS)(onGestureAbort)(); 159 159 - + gestureState.value = event.state; 160 160 - + if (!success) { 161 161 - + (0, _reactNativeReanimated.runOnJS)(onGestureAbort)(); 162 162 - + } 163 163 - + const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ? 164 164 - + // If swiped to right, open the drawer, otherwise close it 165 165 - + (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 : 166 166 - + // If swiped to left, open the drawer, otherwise close it 167 167 - + (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open; 168 168 - + toggleDrawer(nextOpen, event.velocityX); 169 169 - + (0, _reactNativeReanimated.runOnJS)(onGestureFinish)(); 170 170 - + }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled); 171 171 - + if (panGesture && configureGestureHandler) { 172 172 - + panGesture = configureGestureHandler(panGesture); 173 173 - } 174 174 - - const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ? 175 175 - - // If swiped to right, open the drawer, otherwise close it 176 176 - - (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 : 177 177 - - // If swiped to left, open the drawer, otherwise close it 178 178 - - (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open; 179 179 - - toggleDrawer(nextOpen, event.velocityX); 180 180 - - (0, _reactNativeReanimated.runOnJS)(onGestureFinish)(); 181 181 - - }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled); 182 182 - - if (pan && configureGestureHandler) { 183 183 - - pan = configureGestureHandler(pan); 184 184 - - } 185 185 - + return panGesture; 186 186 - + }, [configureGestureHandler, drawerPosition, drawerType, gestureState, hitSlop, onGestureBegin, onGestureAbort, onGestureFinish, open, startX, swipeEnabled, swipeMinDistance, swipeMinVelocity, toggleDrawer, touchStartX, touchX, translationX]); 187 187 - const translateX = (0, _reactNativeReanimated.useDerivedValue)(() => { 188 188 - // Comment stolen from react-native-gesture-handler/DrawerLayout 189 189 - // 190 190 - @@ -254,35 +258,38 @@ function Drawer({ 191 191 - style: [styles.container, style], 192 192 - children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DrawerProgressContext.DrawerProgressContext.Provider, { 193 193 - value: progress, 194 194 - - children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GestureHandler.GestureDetector, { 195 195 - - gesture: pan, 196 196 - - children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, { 197 197 - - style: [styles.main, { 198 198 - - flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row' 199 199 - - }], 200 200 - - children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, { 201 201 - - style: [styles.content, contentAnimatedStyle], 202 202 - - children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, { 203 203 - - accessibilityElementsHidden: isOpen && drawerType !== 'permanent', 204 204 - - importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto', 205 205 - - style: styles.content, 206 206 - - children: children 207 207 - - }), drawerType !== 'permanent' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Overlay.Overlay, { 208 208 - - open: open, 209 209 - - progress: progress, 210 210 - - onPress: () => toggleDrawer(false), 211 211 - - style: overlayStyle, 212 212 - - accessibilityLabel: overlayAccessibilityLabel 213 213 - - }) : null] 214 214 - - }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, { 215 215 - - removeClippedSubviews: _reactNative.Platform.OS !== 'ios', 216 216 - - style: [styles.drawer, { 217 217 - - width: drawerWidth, 218 218 - - position: drawerType === 'permanent' ? 'relative' : 'absolute', 219 219 - - zIndex: drawerType === 'back' ? -1 : 0 220 220 - - }, drawerAnimatedStyle, drawerStyle], 221 221 - - children: renderDrawerContent() 222 222 - - })] 223 223 - + children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DrawerGestureContext.DrawerGestureContext.Provider, { 224 224 - + value: pan, 225 225 - + children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GestureHandler.GestureDetector, { 226 226 - + gesture: pan, 227 227 - + children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, { 228 228 - + style: [styles.main, { 229 229 - + flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row' 230 230 - + }], 231 231 - + children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, { 232 232 - + style: [styles.content, contentAnimatedStyle], 233 233 - + children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, { 234 234 - + accessibilityElementsHidden: isOpen && drawerType !== 'permanent', 235 235 - + importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto', 236 236 - + style: styles.content, 237 237 - + children: children 238 238 - + }), drawerType !== 'permanent' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Overlay.Overlay, { 239 239 - + open: open, 240 240 - + progress: progress, 241 241 - + onPress: () => toggleDrawer(false), 242 242 - + style: overlayStyle, 243 243 - + accessibilityLabel: overlayAccessibilityLabel 244 244 - + }) : null] 245 245 - + }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, { 246 246 - + removeClippedSubviews: _reactNative.Platform.OS !== 'ios', 247 247 - + style: [styles.drawer, { 248 248 - + width: drawerWidth, 249 249 - + position: drawerType === 'permanent' ? 'relative' : 'absolute', 250 250 - + zIndex: drawerType === 'back' ? -1 : 0 251 251 - + }, drawerAnimatedStyle, drawerStyle], 252 252 - + children: renderDrawerContent() 253 253 - + })] 254 254 - + }) 255 255 - }) 256 256 - }) 257 257 - }) 258 258 - diff --git a/node_modules/react-native-drawer-layout/lib/module/index.js b/node_modules/react-native-drawer-layout/lib/module/index.js 259 259 - index a600e51..f08275c 100644 260 260 - --- a/node_modules/react-native-drawer-layout/lib/module/index.js 261 261 - +++ b/node_modules/react-native-drawer-layout/lib/module/index.js 262 262 - @@ -1,5 +1,6 @@ 263 263 - "use strict"; 264 264 - 265 265 - +export { DrawerGestureContext } from "./utils/DrawerGestureContext.js"; 266 266 - export { DrawerProgressContext } from "./utils/DrawerProgressContext.js"; 267 267 - export { useDrawerProgress } from "./utils/useDrawerProgress.js"; 268 268 - export { Drawer } from './views/Drawer'; 269 269 - diff --git a/node_modules/react-native-drawer-layout/lib/module/utils/DrawerGestureContext.js b/node_modules/react-native-drawer-layout/lib/module/utils/DrawerGestureContext.js 270 270 - new file mode 100644 271 271 - index 0000000..1adaa9c 272 272 - --- /dev/null 273 273 - +++ b/node_modules/react-native-drawer-layout/lib/module/utils/DrawerGestureContext.js 274 274 - @@ -0,0 +1,5 @@ 275 275 - +"use strict"; 276 276 - + 277 277 - +import * as React from 'react'; 278 278 - +export const DrawerGestureContext = /*#__PURE__*/React.createContext(undefined); 279 279 - +//# sourceMappingURL=DrawerGestureContext.js.map 280 280 - \ No newline at end of file 281 281 - diff --git a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js 282 282 - index 6d07126..981d9f8 100644 283 283 - --- a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js 284 284 - +++ b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js 285 285 - @@ -4,6 +4,7 @@ import * as React from 'react'; 286 286 - import { I18nManager, InteractionManager, Keyboard, Platform, StatusBar, StyleSheet, useWindowDimensions, View } from 'react-native'; 287 287 - import Animated, { interpolate, ReduceMotion, runOnJS, useAnimatedStyle, useDerivedValue, useSharedValue, withSpring } from 'react-native-reanimated'; 288 288 - import useLatestCallback from 'use-latest-callback'; 289 289 - +import { DrawerGestureContext } from "../utils/DrawerGestureContext.js"; 290 290 - import { DrawerProgressContext } from "../utils/DrawerProgressContext.js"; 291 291 - import { getDrawerWidth } from "../utils/getDrawerWidth.js"; 292 292 - import { Gesture, GestureDetector, GestureHandlerRootView, GestureState } from './GestureHandler'; 293 293 - @@ -72,38 +73,38 @@ export function Drawer({ 294 294 - return () => hideStatusBar(false); 295 295 - }, [isOpen, hideStatusBarOnOpen, statusBarAnimation, hideStatusBar]); 296 296 - const interactionHandleRef = React.useRef(null); 297 297 - - const startInteraction = () => { 298 298 - + const startInteraction = React.useCallback(() => { 299 299 - interactionHandleRef.current = InteractionManager.createInteractionHandle(); 300 300 - - }; 301 301 - - const endInteraction = () => { 302 302 - + }, []); 303 303 - + const endInteraction = React.useCallback(() => { 304 304 - if (interactionHandleRef.current != null) { 305 305 - InteractionManager.clearInteractionHandle(interactionHandleRef.current); 306 306 - interactionHandleRef.current = null; 307 307 - } 308 308 - - }; 309 309 - - const hideKeyboard = () => { 310 310 - + }, []); 311 311 - + const hideKeyboard = React.useCallback(() => { 312 312 - if (keyboardDismissMode === 'on-drag') { 313 313 - Keyboard.dismiss(); 314 314 - } 315 315 - - }; 316 316 - - const onGestureBegin = () => { 317 317 - + }, [keyboardDismissMode]); 318 318 - + const onGestureBegin = React.useCallback(() => { 319 319 - onGestureStart?.(); 320 320 - startInteraction(); 321 321 - hideKeyboard(); 322 322 - hideStatusBar(true); 323 323 - - }; 324 324 - - const onGestureFinish = () => { 325 325 - + }, [onGestureStart, startInteraction, hideKeyboard, hideStatusBar]); 326 326 - + const onGestureFinish = React.useCallback(() => { 327 327 - onGestureEnd?.(); 328 328 - endInteraction(); 329 329 - - }; 330 330 - - const onGestureAbort = () => { 331 331 - + }, [onGestureEnd, endInteraction]); 332 332 - + const onGestureAbort = React.useCallback(() => { 333 333 - onGestureCancel?.(); 334 334 - endInteraction(); 335 335 - - }; 336 336 - + }, [onGestureCancel, endInteraction]); 337 337 - 338 338 - // FIXME: Currently hitSlop is broken when on Android when drawer is on right 339 339 - // https://github.com/software-mansion/react-native-gesture-handler/issues/569 340 340 - - const hitSlop = isRight ? 341 341 - + const hitSlop = React.useMemo(() => isRight ? 342 342 - // Extend hitSlop to the side of the screen when drawer is closed 343 343 - // This lets the user drag the drawer from the side of the screen 344 344 - { 345 345 - @@ -112,7 +113,7 @@ export function Drawer({ 346 346 - } : { 347 347 - left: 0, 348 348 - width: isOpen ? undefined : swipeEdgeWidth 349 349 - - }; 350 350 - + }, [isRight, isOpen, swipeEdgeWidth]); 351 351 - const touchStartX = useSharedValue(0); 352 352 - const touchX = useSharedValue(0); 353 353 - const translationX = useSharedValue(getDrawerTranslationX(open)); 354 354 - @@ -151,40 +152,43 @@ export function Drawer({ 355 355 - }, [getDrawerTranslationX, handleAnimationEnd, handleAnimationStart, onClose, onOpen, touchStartX, touchX, translationX]); 356 356 - React.useEffect(() => toggleDrawer(open), [open, toggleDrawer]); 357 357 - const startX = useSharedValue(0); 358 358 - - let pan = Gesture?.Pan().onBegin(event => { 359 359 - - 'worklet'; 360 360 - + const pan = React.useMemo(() => { 361 361 - + let panGesture = Gesture?.Pan().onBegin(event => { 362 362 - + 'worklet'; 363 363 - 364 364 - - startX.value = translationX.value; 365 365 - - gestureState.value = event.state; 366 366 - - touchStartX.value = event.x; 367 367 - - }).onStart(() => { 368 368 - - 'worklet'; 369 369 - + startX.value = translationX.value; 370 370 - + gestureState.value = event.state; 371 371 - + touchStartX.value = event.x; 372 372 - + }).onStart(() => { 373 373 - + 'worklet'; 374 374 - 375 375 - - runOnJS(onGestureBegin)(); 376 376 - - }).onChange(event => { 377 377 - - 'worklet'; 378 378 - + runOnJS(onGestureBegin)(); 379 379 - + }).onChange(event => { 380 380 - + 'worklet'; 381 381 - 382 382 - - touchX.value = event.x; 383 383 - - translationX.value = startX.value + event.translationX; 384 384 - - gestureState.value = event.state; 385 385 - - }).onEnd((event, success) => { 386 386 - - 'worklet'; 387 387 - + touchX.value = event.x; 388 388 - + translationX.value = startX.value + event.translationX; 389 389 - + gestureState.value = event.state; 390 390 - + }).onEnd((event, success) => { 391 391 - + 'worklet'; 392 392 - 393 393 - - gestureState.value = event.state; 394 394 - - if (!success) { 395 395 - - runOnJS(onGestureAbort)(); 396 396 - + gestureState.value = event.state; 397 397 - + if (!success) { 398 398 - + runOnJS(onGestureAbort)(); 399 399 - + } 400 400 - + const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ? 401 401 - + // If swiped to right, open the drawer, otherwise close it 402 402 - + (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 : 403 403 - + // If swiped to left, open the drawer, otherwise close it 404 404 - + (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open; 405 405 - + toggleDrawer(nextOpen, event.velocityX); 406 406 - + runOnJS(onGestureFinish)(); 407 407 - + }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled); 408 408 - + if (panGesture && configureGestureHandler) { 409 409 - + panGesture = configureGestureHandler(panGesture); 410 410 - } 411 411 - - const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ? 412 412 - - // If swiped to right, open the drawer, otherwise close it 413 413 - - (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 : 414 414 - - // If swiped to left, open the drawer, otherwise close it 415 415 - - (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open; 416 416 - - toggleDrawer(nextOpen, event.velocityX); 417 417 - - runOnJS(onGestureFinish)(); 418 418 - - }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled); 419 419 - - if (pan && configureGestureHandler) { 420 420 - - pan = configureGestureHandler(pan); 421 421 - - } 422 422 - + return panGesture; 423 423 - + }, [configureGestureHandler, drawerPosition, drawerType, gestureState, hitSlop, onGestureBegin, onGestureAbort, onGestureFinish, open, startX, swipeEnabled, swipeMinDistance, swipeMinVelocity, toggleDrawer, touchStartX, touchX, translationX]); 424 424 - const translateX = useDerivedValue(() => { 425 425 - // Comment stolen from react-native-gesture-handler/DrawerLayout 426 426 - // 427 427 - @@ -247,35 +251,38 @@ export function Drawer({ 428 428 - style: [styles.container, style], 429 429 - children: /*#__PURE__*/_jsx(DrawerProgressContext.Provider, { 430 430 - value: progress, 431 431 - - children: /*#__PURE__*/_jsx(GestureDetector, { 432 432 - - gesture: pan, 433 433 - - children: /*#__PURE__*/_jsxs(Animated.View, { 434 434 - - style: [styles.main, { 435 435 - - flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row' 436 436 - - }], 437 437 - - children: [/*#__PURE__*/_jsxs(Animated.View, { 438 438 - - style: [styles.content, contentAnimatedStyle], 439 439 - - children: [/*#__PURE__*/_jsx(View, { 440 440 - - accessibilityElementsHidden: isOpen && drawerType !== 'permanent', 441 441 - - importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto', 442 442 - - style: styles.content, 443 443 - - children: children 444 444 - - }), drawerType !== 'permanent' ? /*#__PURE__*/_jsx(Overlay, { 445 445 - - open: open, 446 446 - - progress: progress, 447 447 - - onPress: () => toggleDrawer(false), 448 448 - - style: overlayStyle, 449 449 - - accessibilityLabel: overlayAccessibilityLabel 450 450 - - }) : null] 451 451 - - }), /*#__PURE__*/_jsx(Animated.View, { 452 452 - - removeClippedSubviews: Platform.OS !== 'ios', 453 453 - - style: [styles.drawer, { 454 454 - - width: drawerWidth, 455 455 - - position: drawerType === 'permanent' ? 'relative' : 'absolute', 456 456 - - zIndex: drawerType === 'back' ? -1 : 0 457 457 - - }, drawerAnimatedStyle, drawerStyle], 458 458 - - children: renderDrawerContent() 459 459 - - })] 460 460 - + children: /*#__PURE__*/_jsx(DrawerGestureContext.Provider, { 461 461 - + value: pan, 462 462 - + children: /*#__PURE__*/_jsx(GestureDetector, { 463 463 - + gesture: pan, 464 464 - + children: /*#__PURE__*/_jsxs(Animated.View, { 465 465 - + style: [styles.main, { 466 466 - + flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row' 467 467 - + }], 468 468 - + children: [/*#__PURE__*/_jsxs(Animated.View, { 469 469 - + style: [styles.content, contentAnimatedStyle], 470 470 - + children: [/*#__PURE__*/_jsx(View, { 471 471 - + accessibilityElementsHidden: isOpen && drawerType !== 'permanent', 472 472 - + importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto', 473 473 - + style: styles.content, 474 474 - + children: children 475 475 - + }), drawerType !== 'permanent' ? /*#__PURE__*/_jsx(Overlay, { 476 476 - + open: open, 477 477 - + progress: progress, 478 478 - + onPress: () => toggleDrawer(false), 479 479 - + style: overlayStyle, 480 480 - + accessibilityLabel: overlayAccessibilityLabel 481 481 - + }) : null] 482 482 - + }), /*#__PURE__*/_jsx(Animated.View, { 483 483 - + removeClippedSubviews: Platform.OS !== 'ios', 484 484 - + style: [styles.drawer, { 485 485 - + width: drawerWidth, 486 486 - + position: drawerType === 'permanent' ? 'relative' : 'absolute', 487 487 - + zIndex: drawerType === 'back' ? -1 : 0 488 488 - + }, drawerAnimatedStyle, drawerStyle], 489 489 - + children: renderDrawerContent() 490 490 - + })] 491 491 - + }) 492 492 - }) 493 493 - }) 494 494 - }) 495 495 - diff --git a/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts 496 496 - index 7e978f0..a8bce18 100644 497 497 - --- a/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts 498 498 - +++ b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts 499 499 - @@ -1,3 +1,4 @@ 500 500 - +export { DrawerGestureContext } from './utils/DrawerGestureContext'; 501 501 - export { DrawerProgressContext } from './utils/DrawerProgressContext'; 502 502 - export { useDrawerProgress } from './utils/useDrawerProgress'; 503 503 - export { Drawer } from './views/Drawer'; 504 504 - diff --git a/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/utils/DrawerGestureContext.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/utils/DrawerGestureContext.d.ts 505 505 - new file mode 100644 506 506 - index 0000000..33ffbeb 507 507 - --- /dev/null 508 508 - +++ b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/utils/DrawerGestureContext.d.ts 509 509 - @@ -0,0 +1,3 @@ 510 510 - +import * as React from 'react'; 511 511 - +export declare const DrawerGestureContext: React.Context<import("react-native-gesture-handler/lib/typescript/handlers/gestures/panGesture").PanGesture | undefined>; 512 512 - +//# sourceMappingURL=DrawerGestureContext.d.ts.map 513 513 - \ No newline at end of file 514 514 - diff --git a/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts 515 515 - index 7e978f0..a8bce18 100644 516 516 - --- a/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts 517 517 - +++ b/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts 518 518 - @@ -1,3 +1,4 @@ 519 519 - +export { DrawerGestureContext } from './utils/DrawerGestureContext'; 520 520 - export { DrawerProgressContext } from './utils/DrawerProgressContext'; 521 521 - export { useDrawerProgress } from './utils/useDrawerProgress'; 522 522 - export { Drawer } from './views/Drawer'; 523 523 - diff --git a/node_modules/react-native-drawer-layout/lib/typescript/module/src/utils/DrawerGestureContext.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/module/src/utils/DrawerGestureContext.d.ts 524 524 - new file mode 100644 525 525 - index 0000000..33ffbeb 526 526 - --- /dev/null 527 527 - +++ b/node_modules/react-native-drawer-layout/lib/typescript/module/src/utils/DrawerGestureContext.d.ts 528 528 - @@ -0,0 +1,3 @@ 529 529 - +import * as React from 'react'; 530 530 - +export declare const DrawerGestureContext: React.Context<import("react-native-gesture-handler/lib/typescript/handlers/gestures/panGesture").PanGesture | undefined>; 531 531 - +//# sourceMappingURL=DrawerGestureContext.d.ts.map 532 532 - \ No newline at end of file 533 533 - diff --git a/node_modules/react-native-drawer-layout/src/index.tsx b/node_modules/react-native-drawer-layout/src/index.tsx 534 534 - index 0aa6f53..61a37cf 100644 535 535 - --- a/node_modules/react-native-drawer-layout/src/index.tsx 536 536 - +++ b/node_modules/react-native-drawer-layout/src/index.tsx 537 537 - @@ -1,3 +1,4 @@ 538 538 - +export { DrawerGestureContext } from './utils/DrawerGestureContext'; 539 539 - export { DrawerProgressContext } from './utils/DrawerProgressContext'; 540 540 - export { useDrawerProgress } from './utils/useDrawerProgress'; 541 541 - export { Drawer } from './views/Drawer'; 542 542 - diff --git a/node_modules/react-native-drawer-layout/src/utils/DrawerGestureContext.tsx b/node_modules/react-native-drawer-layout/src/utils/DrawerGestureContext.tsx 543 543 - new file mode 100644 544 544 - index 0000000..3aac957 545 545 - --- /dev/null 546 546 - +++ b/node_modules/react-native-drawer-layout/src/utils/DrawerGestureContext.tsx 547 547 - @@ -0,0 +1,6 @@ 548 548 - +import * as React from 'react'; 549 549 - +import type { PanGesture } from 'react-native-gesture-handler'; 550 550 - + 551 551 - +export const DrawerGestureContext = React.createContext<PanGesture | undefined>( 552 552 - + undefined 553 553 - +); 554 554 - diff --git a/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx b/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx 555 555 - index 9c40f41..ee5d075 100644 556 556 - --- a/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx 557 557 - +++ b/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx 558 558 - @@ -21,6 +21,7 @@ import Animated, { 559 559 - import useLatestCallback from 'use-latest-callback'; 560 560 - 561 561 - import type { DrawerProps } from '../types'; 562 562 - +import { DrawerGestureContext } from '../utils/DrawerGestureContext'; 563 563 - import { DrawerProgressContext } from '../utils/DrawerProgressContext'; 564 564 - import { getDrawerWidth } from '../utils/getDrawerWidth'; 565 565 - import { 566 566 - @@ -110,47 +111,51 @@ export function Drawer({ 567 567 - 568 568 - const interactionHandleRef = React.useRef<number | null>(null); 569 569 - 570 570 - - const startInteraction = () => { 571 571 - + const startInteraction = React.useCallback(() => { 572 572 - interactionHandleRef.current = InteractionManager.createInteractionHandle(); 573 573 - - }; 574 574 - + }, []); 575 575 - 576 576 - - const endInteraction = () => { 577 577 - + const endInteraction = React.useCallback(() => { 578 578 - if (interactionHandleRef.current != null) { 579 579 - InteractionManager.clearInteractionHandle(interactionHandleRef.current); 580 580 - interactionHandleRef.current = null; 581 581 - } 582 582 - - }; 583 583 - + }, []); 584 584 - 585 585 - - const hideKeyboard = () => { 586 586 - + const hideKeyboard = React.useCallback(() => { 587 587 - if (keyboardDismissMode === 'on-drag') { 588 588 - Keyboard.dismiss(); 589 589 - } 590 590 - - }; 591 591 - + }, [keyboardDismissMode]); 592 592 - 593 593 - - const onGestureBegin = () => { 594 594 - + const onGestureBegin = React.useCallback(() => { 595 595 - onGestureStart?.(); 596 596 - startInteraction(); 597 597 - hideKeyboard(); 598 598 - hideStatusBar(true); 599 599 - - }; 600 600 - + }, [onGestureStart, startInteraction, hideKeyboard, hideStatusBar]); 601 601 - 602 602 - - const onGestureFinish = () => { 603 603 - + const onGestureFinish = React.useCallback(() => { 604 604 - onGestureEnd?.(); 605 605 - endInteraction(); 606 606 - - }; 607 607 - + }, [onGestureEnd, endInteraction]); 608 608 - 609 609 - - const onGestureAbort = () => { 610 610 - + const onGestureAbort = React.useCallback(() => { 611 611 - onGestureCancel?.(); 612 612 - endInteraction(); 613 613 - - }; 614 614 - + }, [onGestureCancel, endInteraction]); 615 615 - 616 616 - // FIXME: Currently hitSlop is broken when on Android when drawer is on right 617 617 - // https://github.com/software-mansion/react-native-gesture-handler/issues/569 618 618 - - const hitSlop = isRight 619 619 - - ? // Extend hitSlop to the side of the screen when drawer is closed 620 620 - - // This lets the user drag the drawer from the side of the screen 621 621 - - { right: 0, width: isOpen ? undefined : swipeEdgeWidth } 622 622 - - : { left: 0, width: isOpen ? undefined : swipeEdgeWidth }; 623 623 - + const hitSlop = React.useMemo( 624 624 - + () => 625 625 - + isRight 626 626 - + ? // Extend hitSlop to the side of the screen when drawer is closed 627 627 - + // This lets the user drag the drawer from the side of the screen 628 628 - + { right: 0, width: isOpen ? undefined : swipeEdgeWidth } 629 629 - + : { left: 0, width: isOpen ? undefined : swipeEdgeWidth }, 630 630 - + [isRight, isOpen, swipeEdgeWidth] 631 631 - + ); 632 632 - 633 633 - const touchStartX = useSharedValue(0); 634 634 - const touchX = useSharedValue(0); 635 635 - @@ -217,53 +222,76 @@ export function Drawer({ 636 636 - 637 637 - const startX = useSharedValue(0); 638 638 - 639 639 - - let pan = Gesture?.Pan() 640 640 - - .onBegin((event) => { 641 641 - - 'worklet'; 642 642 - - startX.value = translationX.value; 643 643 - - gestureState.value = event.state; 644 644 - - touchStartX.value = event.x; 645 645 - - }) 646 646 - - .onStart(() => { 647 647 - - 'worklet'; 648 648 - - runOnJS(onGestureBegin)(); 649 649 - - }) 650 650 - - .onChange((event) => { 651 651 - - 'worklet'; 652 652 - - touchX.value = event.x; 653 653 - - translationX.value = startX.value + event.translationX; 654 654 - - gestureState.value = event.state; 655 655 - - }) 656 656 - - .onEnd((event, success) => { 657 657 - - 'worklet'; 658 658 - - gestureState.value = event.state; 659 659 - - 660 660 - - if (!success) { 661 661 - - runOnJS(onGestureAbort)(); 662 662 - - } 663 663 - - 664 664 - - const nextOpen = 665 665 - - (Math.abs(event.translationX) > SWIPE_MIN_OFFSET && 666 666 - - Math.abs(event.translationX) > swipeMinVelocity) || 667 667 - - Math.abs(event.translationX) > swipeMinDistance 668 668 - - ? drawerPosition === 'left' 669 669 - - ? // If swiped to right, open the drawer, otherwise close it 670 670 - - (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 671 671 - - : // If swiped to left, open the drawer, otherwise close it 672 672 - - (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 673 673 - - : open; 674 674 - - 675 675 - - toggleDrawer(nextOpen, event.velocityX); 676 676 - - runOnJS(onGestureFinish)(); 677 677 - - }) 678 678 - - .activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]) 679 679 - - .failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]) 680 680 - - .hitSlop(hitSlop) 681 681 - - .enabled(drawerType !== 'permanent' && swipeEnabled); 682 682 - - 683 683 - - if (pan && configureGestureHandler) { 684 684 - - pan = configureGestureHandler(pan); 685 685 - - } 686 686 - + const pan = React.useMemo(() => { 687 687 - + let panGesture = Gesture?.Pan() 688 688 - + .onBegin((event) => { 689 689 - + 'worklet'; 690 690 - + startX.value = translationX.value; 691 691 - + gestureState.value = event.state; 692 692 - + touchStartX.value = event.x; 693 693 - + }) 694 694 - + .onStart(() => { 695 695 - + 'worklet'; 696 696 - + runOnJS(onGestureBegin)(); 697 697 - + }) 698 698 - + .onChange((event) => { 699 699 - + 'worklet'; 700 700 - + touchX.value = event.x; 701 701 - + translationX.value = startX.value + event.translationX; 702 702 - + gestureState.value = event.state; 703 703 - + }) 704 704 - + .onEnd((event, success) => { 705 705 - + 'worklet'; 706 706 - + gestureState.value = event.state; 707 707 - + 708 708 - + if (!success) { 709 709 - + runOnJS(onGestureAbort)(); 710 710 - + } 711 711 - + 712 712 - + const nextOpen = 713 713 - + (Math.abs(event.translationX) > SWIPE_MIN_OFFSET && 714 714 - + Math.abs(event.translationX) > swipeMinVelocity) || 715 715 - + Math.abs(event.translationX) > swipeMinDistance 716 716 - + ? drawerPosition === 'left' 717 717 - + ? // If swiped to right, open the drawer, otherwise close it 718 718 - + (event.velocityX === 0 ? event.translationX : event.velocityX) > 719 719 - + 0 720 720 - + : // If swiped to left, open the drawer, otherwise close it 721 721 - + (event.velocityX === 0 ? event.translationX : event.velocityX) < 722 722 - + 0 723 723 - + : open; 724 724 - + 725 725 - + toggleDrawer(nextOpen, event.velocityX); 726 726 - + runOnJS(onGestureFinish)(); 727 727 - + }) 728 728 - + .activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]) 729 729 - + .failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]) 730 730 - + .hitSlop(hitSlop) 731 731 - + .enabled(drawerType !== 'permanent' && swipeEnabled); 732 732 - + 733 733 - + if (panGesture && configureGestureHandler) { 734 734 - + panGesture = configureGestureHandler(panGesture); 735 735 - + } 736 736 - + return panGesture; 737 737 - + }, [ 738 738 - + configureGestureHandler, 739 739 - + drawerPosition, 740 740 - + drawerType, 741 741 - + gestureState, 742 742 - + hitSlop, 743 743 - + onGestureBegin, 744 744 - + onGestureAbort, 745 745 - + onGestureFinish, 746 746 - + open, 747 747 - + startX, 748 748 - + swipeEnabled, 749 749 - + swipeMinDistance, 750 750 - + swipeMinVelocity, 751 751 - + toggleDrawer, 752 752 - + touchStartX, 753 753 - + touchX, 754 754 - + translationX, 755 755 - + ]); 756 756 - 757 757 - const translateX = useDerivedValue(() => { 758 758 - // Comment stolen from react-native-gesture-handler/DrawerLayout 759 759 - @@ -376,64 +404,66 @@ export function Drawer({ 760 760 - return ( 761 761 - <GestureHandlerRootView style={[styles.container, style]}> 762 762 - <DrawerProgressContext.Provider value={progress}> 763 763 - - <GestureDetector gesture={pan}> 764 764 - - {/* Immediate child of gesture handler needs to be an Animated.View */} 765 765 - - <Animated.View 766 766 - - style={[ 767 767 - - styles.main, 768 768 - - { 769 769 - - flexDirection: 770 770 - - drawerType === 'permanent' 771 771 - - ? (isRight && direction === 'ltr') || 772 772 - - (!isRight && direction === 'rtl') 773 773 - - ? 'row' 774 774 - - : 'row-reverse' 775 775 - - : 'row', 776 776 - - }, 777 777 - - ]} 778 778 - - > 779 779 - - <Animated.View style={[styles.content, contentAnimatedStyle]}> 780 780 - - <View 781 781 - - accessibilityElementsHidden={ 782 782 - - isOpen && drawerType !== 'permanent' 783 783 - - } 784 784 - - importantForAccessibility={ 785 785 - - isOpen && drawerType !== 'permanent' 786 786 - - ? 'no-hide-descendants' 787 787 - - : 'auto' 788 788 - - } 789 789 - - style={styles.content} 790 790 - - > 791 791 - - {children} 792 792 - - </View> 793 793 - - {drawerType !== 'permanent' ? ( 794 794 - - <Overlay 795 795 - - open={open} 796 796 - - progress={progress} 797 797 - - onPress={() => toggleDrawer(false)} 798 798 - - style={overlayStyle} 799 799 - - accessibilityLabel={overlayAccessibilityLabel} 800 800 - - /> 801 801 - - ) : null} 802 802 - - </Animated.View> 803 803 - + <DrawerGestureContext.Provider value={pan}> 804 804 - + <GestureDetector gesture={pan}> 805 805 - + {/* Immediate child of gesture handler needs to be an Animated.View */} 806 806 - <Animated.View 807 807 - - removeClippedSubviews={Platform.OS !== 'ios'} 808 808 - style={[ 809 809 - - styles.drawer, 810 810 - + styles.main, 811 811 - { 812 812 - - width: drawerWidth, 813 813 - - position: 814 814 - - drawerType === 'permanent' ? 'relative' : 'absolute', 815 815 - - zIndex: drawerType === 'back' ? -1 : 0, 816 816 - + flexDirection: 817 817 - + drawerType === 'permanent' 818 818 - + ? (isRight && direction === 'ltr') || 819 819 - + (!isRight && direction === 'rtl') 820 820 - + ? 'row' 821 821 - + : 'row-reverse' 822 822 - + : 'row', 823 823 - }, 824 824 - - drawerAnimatedStyle, 825 825 - - drawerStyle, 826 826 - ]} 827 827 - > 828 828 - - {renderDrawerContent()} 829 829 - + <Animated.View style={[styles.content, contentAnimatedStyle]}> 830 830 - + <View 831 831 - + accessibilityElementsHidden={ 832 832 - + isOpen && drawerType !== 'permanent' 833 833 - + } 834 834 - + importantForAccessibility={ 835 835 - + isOpen && drawerType !== 'permanent' 836 836 - + ? 'no-hide-descendants' 837 837 - + : 'auto' 838 838 - + } 839 839 - + style={styles.content} 840 840 - + > 841 841 - + {children} 842 842 - + </View> 843 843 - + {drawerType !== 'permanent' ? ( 844 844 - + <Overlay 845 845 - + open={open} 846 846 - + progress={progress} 847 847 - + onPress={() => toggleDrawer(false)} 848 848 - + style={overlayStyle} 849 849 - + accessibilityLabel={overlayAccessibilityLabel} 850 850 - + /> 851 851 - + ) : null} 852 852 - + </Animated.View> 853 853 - + <Animated.View 854 854 - + removeClippedSubviews={Platform.OS !== 'ios'} 855 855 - + style={[ 856 856 - + styles.drawer, 857 857 - + { 858 858 - + width: drawerWidth, 859 859 - + position: 860 860 - + drawerType === 'permanent' ? 'relative' : 'absolute', 861 861 - + zIndex: drawerType === 'back' ? -1 : 0, 862 862 - + }, 863 863 - + drawerAnimatedStyle, 864 864 - + drawerStyle, 865 865 - + ]} 866 866 - + > 867 867 - + {renderDrawerContent()} 868 868 - + </Animated.View> 869 869 - </Animated.View> 870 870 - - </Animated.View> 871 871 - - </GestureDetector> 872 872 - + </GestureDetector> 873 873 - + </DrawerGestureContext.Provider> 874 874 - </DrawerProgressContext.Provider> 875 875 - </GestureHandlerRootView> 876 876 - );

+4 -4

yarn.lock

reviewed

··· 15959 15959 dependencies: 15960 15960 dotenv "^16.4.5" 15961 15961 15962 15962 - react-native-drawer-layout@^4.0.4: 15963 15963 - version "4.0.4" 15964 15964 - resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.0.4.tgz#b1b3f2dffd3653527def1d26f4a0cf3c98b9fb5e" 15965 15965 - integrity sha512-yskKj1Kxbf5w5gInNEW4YtDkTUcMsoQ0FGH0wjQ3nHPAJ3AAVnr/QgZ1Hr4LeAQR+7vgaG058DX4/32WbwvQzA== 15962 15962 + react-native-drawer-layout@^4.1.1: 15963 15963 + version "4.1.1" 15964 15964 + resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.1.1.tgz#7fce1b3d3ddd9fc5d781c73d13b814d022b90114" 15965 15965 + integrity sha512-ob6O3ph7PZ3A2FpdlsSxHuMpHDXREZPR8A6S3q0dSxV7i6d+8Z6CPCTbegfN2QZyizSow9NLrKyXP93tlqZ3dA== 15966 15966 dependencies: 15967 15967 use-latest-callback "^0.2.1" 15968 15968