Merge pull request #40 from matthops/master

Upgrade to expo 46
bberak · Sep 24, 2022 · d876792 · d876792
2 parents 796d7fd + 1be5345
commit d876792
Show file tree

Hide file tree

Showing 4 changed files with 4,279 additions and 4,020 deletions.
diff --git a/App.js b/App.js
@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { View, Modal } from "react-native";
 import CloseButton from "./app/table-of-contents/closeButton";
 import EStyleSheet from "react-native-extended-stylesheet";
+import { GestureHandlerRootView } from 'react-native-gesture-handler'
 
 import TableOfContents from "./app/table-of-contents";
 import TouchChapter from "./app/touch-events";
@@ -41,31 +42,33 @@ export default class App extends Component {
 
   render() {
     return (
-      <View style={{ flex: 1 }}>
-        <TableOfContents
-          sceneVisible={this.state.sceneVisible}
-          contents={{
-            heading: "Chapters",
-            items: [
-              TouchChapter(this.mountScene),
-              PhysicsChapter(this.mountScene),
-              ////SensorsChapter(this.mountScene),
-              OpenGLChapter(this.mountScene),
-              ExamplesChapter(this.mountScene)
-            ]
-          }}
-        />
-        <Modal
-          animationType={"slide"}
-          transparent={false}
-          visible={this.state.sceneVisible}
-          onRequestClose={_ => {}}
-        >
-          {this.state.scene}
+      <GestureHandlerRootView style={{ flex: 1 }}> 
+        <View style={{ flex: 1 }}>
+          <TableOfContents
+            sceneVisible={this.state.sceneVisible}
+            contents={{
+              heading: "Chapters",
+              items: [
+                TouchChapter(this.mountScene),
+                PhysicsChapter(this.mountScene),
+                ////SensorsChapter(this.mountScene),
+                OpenGLChapter(this.mountScene),
+                ExamplesChapter(this.mountScene)
+              ]
+            }}
+          />
+          <Modal
+            animationType={"slide"}
+            transparent={false}
+            visible={this.state.sceneVisible}
+            onRequestClose={_ => {}}
+          >
+            {this.state.scene}
 
-          <CloseButton onPress={this.unMountScene} />
-        </Modal>
-      </View>
+            <CloseButton onPress={this.unMountScene} />
+          </Modal>
+        </View>
+      </GestureHandlerRootView>
     );
   }
 }
diff --git a/babel.config.js b/babel.config.js
@@ -2,5 +2,6 @@ module.exports = function(api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
+    plugins: ['react-native-reanimated/plugin']
   };
 };