From dc35e3c03e8a6013b09fc0b2ad0d18832604105e Mon Sep 17 00:00:00 2001 From: ammarahm-ed Date: Fri, 20 Nov 2020 16:43:24 +0500 Subject: [PATCH] refactor SideMenu --- .../src/components/{ => SideMenu}/SideMenu.js | 26 +++----- .../src/components/{ => SideMenu}/styles.js | 0 apps/mobile/src/navigation/Drawer.js | 61 ------------------- 3 files changed, 10 insertions(+), 77 deletions(-) rename apps/mobile/src/components/{ => SideMenu}/SideMenu.js (96%) rename apps/mobile/src/components/{ => SideMenu}/styles.js (100%) delete mode 100644 apps/mobile/src/navigation/Drawer.js diff --git a/apps/mobile/src/components/SideMenu.js b/apps/mobile/src/components/SideMenu/SideMenu.js similarity index 96% rename from apps/mobile/src/components/SideMenu.js rename to apps/mobile/src/components/SideMenu/SideMenu.js index f67bd34c5..21e19810a 100644 --- a/apps/mobile/src/components/SideMenu.js +++ b/apps/mobile/src/components/SideMenu/SideMenu.js @@ -1,5 +1,3 @@ -// @flow - import PropTypes from 'prop-types'; import React from 'react'; import { @@ -9,7 +7,6 @@ import { View, } from 'react-native'; import Animated, {Easing} from 'react-native-reanimated'; - import styles from './styles'; const deviceScreen = Dimensions.get('window'); @@ -19,6 +16,14 @@ function shouldOpenMenu(dx) { return dx > barrierForward; } +/** + * @typedef {SideMenu.propTypes} propTypes + */ + +/** + * @param {propTypes} props + * @extends {React.Component}} + */ export default class SideMenu extends React.Component { constructor(props) { super(props); @@ -60,12 +65,8 @@ export default class SideMenu extends React.Component { hiddenMenuOffset: deviceScreen.width * hiddenMenuOffsetPercentage, left, }; - - } - - onLayoutChange(e) { const {width, height} = e.nativeEvent.layout; const openMenuOffset = width * this.state.openOffsetMenuPercentage; @@ -85,8 +86,8 @@ export default class SideMenu extends React.Component { const style = [ styles.frontView, {width, height}, - this.props.animationStyle(this.state.left), - this.props.containerStyle + this.props.animationStyle(this.state.left), + this.props.containerStyle, ]; return ( @@ -240,13 +241,6 @@ export default class SideMenu extends React.Component { }); } - componentDidMount() { - //eSubscribeEvent(eSendSideMenuOverlayRef, this._getOverlayViewRef); - } - componentWillUnmount() { - //eUnSubscribeEvent(eSendSideMenuOverlayRef, this._getOverlayViewRef); - } - _getOverlayViewRef = (data) => { //this.overlayViewRef = data.ref; }; diff --git a/apps/mobile/src/components/styles.js b/apps/mobile/src/components/SideMenu/styles.js similarity index 100% rename from apps/mobile/src/components/styles.js rename to apps/mobile/src/components/SideMenu/styles.js diff --git a/apps/mobile/src/navigation/Drawer.js b/apps/mobile/src/navigation/Drawer.js deleted file mode 100644 index 43926134b..000000000 --- a/apps/mobile/src/navigation/Drawer.js +++ /dev/null @@ -1,61 +0,0 @@ -import {createDrawerNavigator} from '@react-navigation/drawer'; -import {NavigationContainer} from '@react-navigation/native'; -import * as React from 'react'; -import {Menu} from '../components/Menu'; -import {DDS} from '../services/DeviceDetection'; -import {eSubscribeEvent, eUnSubscribeEvent} from '../services/EventManager'; -import {eCloseSideMenu, eOpenSideMenu} from '../utils/Events'; -import {sideMenuRef} from '../utils/Refs'; -import {NavigatorStack} from './NavigatorStack'; - -const Drawer = createDrawerNavigator(); - -export const NavigationStack = ({component = NavigatorStack}) => { - const [locked, setLocked] = React.useState(false); - - const setGestureDisabled = () => { - setLocked(true); - }; - - const setGestureEnabled = () => { - setLocked(false); - }; - - React.useEffect(() => { - eSubscribeEvent(eOpenSideMenu, setGestureEnabled); - eSubscribeEvent(eCloseSideMenu, setGestureDisabled); - return () => { - eUnSubscribeEvent(eOpenSideMenu, setGestureEnabled); - eUnSubscribeEvent(eCloseSideMenu, setGestureDisabled); - }; - }, []); - - return ( - - - - - - ); -}; - -const DrawerComponent = () => { - return ; -};