From 51eecf7efff1543bfa035f0be0562f3ab6705fdd Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Sat, 15 Sep 2018 17:04:56 +0200 Subject: [PATCH] Fix issue from rebase and introduce gesture interaction example --- packages/drawer/example/App.js | 16 +- packages/drawer/example/app.json | 2 +- packages/drawer/example/package.json | 16 +- .../drawer/example/src/GestureInteraction.js | 82 + packages/drawer/example/src/StyledDrawer.js | 2 +- packages/drawer/example/yarn.lock | 1768 ++++++++++------- packages/drawer/src/views/DrawerView.js | 2 - 7 files changed, 1164 insertions(+), 724 deletions(-) create mode 100644 packages/drawer/example/src/GestureInteraction.js diff --git a/packages/drawer/example/App.js b/packages/drawer/example/App.js index 119f45ab..5c7968aa 100644 --- a/packages/drawer/example/App.js +++ b/packages/drawer/example/App.js @@ -1,14 +1,19 @@ import * as React from 'react'; -import Expo from 'expo'; import { FlatList } from 'react-native'; import { createSwitchNavigator, createStackNavigator } from 'react-navigation'; -import { ListSection, Divider } from 'react-native-paper'; +import { List, Divider } from 'react-native-paper'; import SimpleDrawer from './src/SimpleDrawer'; import StyledDrawer from './src/StyledDrawer'; +import GestureInteraction from './src/GestureInteraction'; const data = [ { component: SimpleDrawer, title: 'Simple', routeName: 'SimpleDrawer' }, { component: StyledDrawer, title: 'Styled', routeName: 'StyledDrawer' }, + { + component: GestureInteraction, + title: 'Gesture Interaction', + routeName: 'GestureInteraction', + }, ]; class Home extends React.Component { @@ -17,8 +22,9 @@ class Home extends React.Component { }; _renderItem = ({ item }) => ( - this.props.navigation.navigate(item.routeName)} /> ); @@ -37,7 +43,7 @@ class Home extends React.Component { } } -const App = createSwitchNavigator({ +export default createSwitchNavigator({ Home: createStackNavigator({ Home }), ...data.reduce((acc, it) => { acc[it.routeName] = { @@ -50,5 +56,3 @@ const App = createSwitchNavigator({ return acc; }, {}), }); - -Expo.registerRootComponent(App); diff --git a/packages/drawer/example/app.json b/packages/drawer/example/app.json index 7101a3e3..2a4cb8d0 100644 --- a/packages/drawer/example/app.json +++ b/packages/drawer/example/app.json @@ -3,7 +3,7 @@ "name": "React Navigation Drawer Example", "description": "Demonstrates the various capabilities of react-navigation-drawer", "slug": "react-navigation-drawer-demo", - "sdkVersion": "27.0.0", + "sdkVersion": "30.0.0", "version": "1.0.0", "primaryColor": "#2196f3", "packagerOpts": { diff --git a/packages/drawer/example/package.json b/packages/drawer/example/package.json index 3f71b574..39edc140 100644 --- a/packages/drawer/example/package.json +++ b/packages/drawer/example/package.json @@ -2,19 +2,22 @@ "name": "drawerexample", "version": "0.0.1", "private": true, + "main": "node_modules/expo/AppEntry.js", "scripts": { - "start": "react-native-scripts start", - "android": "react-native-scripts android", - "ios": "react-native-scripts ios" + "start": "expo start", + "android": "expo start --android", + "ios": "expo start --ios", + "eject": "expo eject", + "test": "node ./node_modules/jest/bin/jest.js --watchAll" }, "dependencies": { - "expo": "~27.0.0", + "expo": "~30.0.0", "hoist-non-react-statics": "^2.5.0", "prop-types": "^15.6.0", "react": "16.3.1", "react-native": "~0.55.0", - "react-native-paper": "2.0.0-alpha.4", - "react-navigation": "^2.0.1" + "react-native-paper": "2.0.0", + "react-navigation": "^2.14.2" }, "devDependencies": { "babel-plugin-module-resolver": "^3.0.0", @@ -22,7 +25,6 @@ "glob-to-regexp": "^0.3.0", "react-native-scripts": "1.8.1" }, - "main": "App.js", "resolutions": { "**/prop-types": "15.6.0", "**/react-lifecycles-compat": "3.0.4", diff --git a/packages/drawer/example/src/GestureInteraction.js b/packages/drawer/example/src/GestureInteraction.js new file mode 100644 index 00000000..2ff8e145 --- /dev/null +++ b/packages/drawer/example/src/GestureInteraction.js @@ -0,0 +1,82 @@ +import React from 'react'; +import { Button, WebView, View } from 'react-native'; +import { MapView } from 'expo'; +import { withNavigation } from 'react-navigation'; +import { createDrawerNavigator } from 'react-navigation-drawer'; +import { NativeViewGestureHandler } from 'react-native-gesture-handler'; + +@withNavigation +class ContainerWithButtons extends React.Component { + render() { + return ( + + {this.props.children} + +