From 0f18b9169087860803fd39d2ca47aa464cb42b2b Mon Sep 17 00:00:00 2001
From: Evan Bacon <baconbrix@gmail.com>
Date: Mon, 27 Jan 2020 11:10:06 -0800
Subject: [PATCH] refactor: split Overlay into a new component (#284)

* refactor: split Overlay into a new component

* Update packages/drawer/src/index.tsx

Co-Authored-By: Satyajit Sahoo <satyajit.happy@gmail.com>

Co-authored-by: Satyajit Sahoo <satyajit.happy@gmail.com>
---
 packages/drawer/src/views/Drawer.tsx  | 29 ++-------------
 packages/drawer/src/views/Overlay.tsx | 51 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100644 packages/drawer/src/views/Overlay.tsx

diff --git a/packages/drawer/src/views/Drawer.tsx b/packages/drawer/src/views/Drawer.tsx
index ce763995..00f20c5d 100644
--- a/packages/drawer/src/views/Drawer.tsx
+++ b/packages/drawer/src/views/Drawer.tsx
@@ -17,6 +17,7 @@ import {
   State,
 } from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
+import Overlay from './Overlay';
 
 const {
   Clock,
@@ -25,7 +26,6 @@ const {
   clockRunning,
   startClock,
   stopClock,
-  interpolate,
   spring,
   abs,
   add,
@@ -52,8 +52,6 @@ const FALSE = 0;
 const NOOP = 0;
 const UNSET = -1;
 
-const PROGRESS_EPSILON = 0.05;
-
 const DIRECTION_LEFT = 1;
 const DIRECTION_RIGHT = -1;
 
@@ -577,26 +575,7 @@ export default class DrawerView extends React.PureComponent<Props> {
               {renderSceneContent({ progress: this.progress })}
             </View>
             <TapGestureHandler onHandlerStateChange={this.handleTapStateChange}>
-              <Animated.View
-                style={[
-                  styles.overlay,
-                  {
-                    opacity: interpolate(this.progress, {
-                      inputRange: [PROGRESS_EPSILON, 1],
-                      outputRange: [0, 1],
-                    }),
-                    // We don't want the user to be able to press through the overlay when drawer is open
-                    // One approach is to adjust the pointerEvents based on the progress
-                    // But we can also send the overlay behind the screen, which works, and is much less code
-                    zIndex: cond(
-                      greaterThan(this.progress, PROGRESS_EPSILON),
-                      0,
-                      -1
-                    ),
-                  },
-                  overlayStyle,
-                ]}
-              />
+              <Overlay progress={this.progress} style={overlayStyle} />
             </TapGestureHandler>
           </Animated.View>
           <Animated.Code
@@ -641,10 +620,6 @@ const styles = StyleSheet.create({
     width: '80%',
     maxWidth: '100%',
   },
-  overlay: {
-    ...StyleSheet.absoluteFillObject,
-    backgroundColor: 'rgba(0, 0, 0, 0.5)',
-  },
   content: {
     flex: 1,
   },
diff --git a/packages/drawer/src/views/Overlay.tsx b/packages/drawer/src/views/Overlay.tsx
new file mode 100644
index 00000000..b007aebe
--- /dev/null
+++ b/packages/drawer/src/views/Overlay.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react';
+import { Platform, StyleSheet } from 'react-native';
+import Animated from 'react-native-reanimated';
+
+const { interpolate, cond, greaterThan } = Animated;
+
+const PROGRESS_EPSILON = 0.05;
+
+type Props = React.ComponentProps<typeof Animated.View> & {
+  progress: Animated.Node<number>;
+};
+
+const Overlay = React.forwardRef(function Overlay(
+  { progress, style, ...props }: Props,
+  ref: React.Ref<Animated.View>
+) {
+  const animatedStyle = {
+    opacity: interpolate(progress, {
+      inputRange: [PROGRESS_EPSILON, 1],
+      outputRange: [0, 1],
+    }),
+    // We don't want the user to be able to press through the overlay when drawer is open
+    // One approach is to adjust the pointerEvents based on the progress
+    // But we can also send the overlay behind the screen, which works, and is much less code
+    zIndex: cond(greaterThan(progress, PROGRESS_EPSILON), 0, -1),
+  };
+
+  return (
+    <Animated.View
+      {...props}
+      ref={ref}
+      style={[styles.overlay, animatedStyle, style]}
+    />
+  );
+});
+
+const styles = StyleSheet.create({
+  overlay: {
+    ...StyleSheet.absoluteFillObject,
+    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    ...Platform.select({
+      web: {
+        // Disable touch highlight on mobile Safari.
+        WebkitTapHighlightColor: 'transparent',
+      },
+      default: {},
+    }),
+  },
+});
+
+export default Overlay;