From 305b0a28142414d559d2d08795a5963716dc4b0f Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Aug 2019 11:49:19 -0700
Subject: [PATCH] DrawerLayoutAndroid drawerPosition now expects a string,
 number is deprecated

Summary: The native change to support strings was made in D15912607 on June 21st. Migrating the JS callsites now to start passing strings instead of the constants.

Reviewed By: zackargyle, mdvacca

Differential Revision: D16703569

fbshipit-source-id: cb1d8698df55d2961cde1e2b1fbfcba086a03bb2
---
 .../AndroidDrawerLayoutNativeComponent.js        |  2 +-
 .../DrawerAndroid/DrawerLayoutAndroid.android.js | 16 +++++++++-------
 .../__tests__/DrawerAndroid-test.js              |  8 ++++----
 .../__snapshots__/DrawerAndroid-test.js.snap     |  8 ++++----
 RNTester/js/RNTesterApp.android.js               |  2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
index 55ef782ad9b..9507b691b58 100644
--- a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
+++ b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
@@ -60,7 +60,7 @@ type NativeProps = $ReadOnly<{|
   /**
    * Specifies the side of the screen from which the drawer will slide in.
    */
-  drawerPosition: ?Int32,
+  drawerPosition?: WithDefault<'left' | 'right', 'left'>,
 
   /**
    * Specifies the width of the drawer, more precisely the width of the view that be pulled in
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index f80846d25a0..5807013f55e 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -12,15 +12,11 @@
 
 const Platform = require('../../Utilities/Platform');
 const React = require('react');
-const ReactNative = require('../../Renderer/shims/ReactNative');
 const StatusBar = require('../StatusBar/StatusBar');
 const StyleSheet = require('../../StyleSheet/StyleSheet');
-const UIManager = require('../../ReactNative/UIManager');
 const View = require('../View/View');
 const nullthrows = require('nullthrows');
 
-const DrawerConsts = UIManager.getViewManagerConfig('AndroidDrawerLayout')
-  .Constants;
 const dismissKeyboard = require('../../Utilities/dismissKeyboard');
 import AndroidDrawerLayoutNativeComponent, {
   Commands,
@@ -67,7 +63,7 @@ type Props = $ReadOnly<{|
   /**
    * Specifies the side of the screen from which the drawer will slide in.
    */
-  drawerPosition: ?number,
+  drawerPosition: ?('left' | 'right'),
 
   /**
    * Specifies the width of the drawer, more precisely the width of the view that be pulled in
@@ -148,7 +144,7 @@ type State = {|
  *   return (
  *     <DrawerLayoutAndroid
  *       drawerWidth={300}
- *       drawerPosition={DrawerLayoutAndroid.positions.Left}
+ *       drawerPosition="left"
  *       renderNavigationView={() => navigationView}>
  *       <View style={{flex: 1, alignItems: 'center'}}>
  *         <Text style={{margin: 10, fontSize: 15, textAlign: 'right'}}>Hello</Text>
@@ -160,7 +156,13 @@ type State = {|
  * ```
  */
 class DrawerLayoutAndroid extends React.Component<Props, State> {
-  static positions = DrawerConsts.DrawerPosition;
+  static get positions(): mixed {
+    console.warn(
+      'Setting DrawerLayoutAndroid drawerPosition using `DrawerLayoutAndroid.positions` is deprecated. Instead pass the string value "left" or "right"',
+    );
+
+    return {Left: 'left', Right: 'right'};
+  }
   static defaultProps = {
     drawerBackgroundColor: 'white',
   };
diff --git a/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js b/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
index 514edf85cc4..91c800f59c3 100644
--- a/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
+++ b/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
@@ -25,7 +25,7 @@ describe('<DrawerLayoutAndroid />', () => {
     const instance = render.create(
       <DrawerLayoutAndroid
         drawerWidth={300}
-        drawerPosition={DrawerLayoutAndroid.positions.Left}
+        drawerPosition="left"
         renderNavigationView={() => <View />}
       />,
     );
@@ -36,7 +36,7 @@ describe('<DrawerLayoutAndroid />', () => {
     const output = render.shallow(
       <DrawerLayoutAndroid
         drawerWidth={300}
-        drawerPosition={DrawerLayoutAndroid.positions.Left}
+        drawerPosition="left"
         renderNavigationView={() => <View />}
       />,
     );
@@ -49,7 +49,7 @@ describe('<DrawerLayoutAndroid />', () => {
     const output = render.shallow(
       <DrawerLayoutAndroid
         drawerWidth={300}
-        drawerPosition={DrawerLayoutAndroid.positions.Left}
+        drawerPosition="left"
         renderNavigationView={() => <View />}
       />,
     );
@@ -62,7 +62,7 @@ describe('<DrawerLayoutAndroid />', () => {
     const instance = render.create(
       <DrawerLayoutAndroid
         drawerWidth={300}
-        drawerPosition={DrawerLayoutAndroid.positions.Left}
+        drawerPosition="left"
         renderNavigationView={() => <View />}
       />,
     );
diff --git a/Libraries/Components/DrawerAndroid/__tests__/__snapshots__/DrawerAndroid-test.js.snap b/Libraries/Components/DrawerAndroid/__tests__/__snapshots__/DrawerAndroid-test.js.snap
index f647438e3a1..88f8eeca171 100644
--- a/Libraries/Components/DrawerAndroid/__tests__/__snapshots__/DrawerAndroid-test.js.snap
+++ b/Libraries/Components/DrawerAndroid/__tests__/__snapshots__/DrawerAndroid-test.js.snap
@@ -3,7 +3,7 @@
 exports[`<DrawerLayoutAndroid /> should render as <DrawerLayoutAndroid> when mocked 1`] = `
 <AndroidDrawerLayout
   drawerBackgroundColor="white"
-  drawerPosition={10}
+  drawerPosition="left"
   drawerWidth={300}
   onDrawerClose={[Function]}
   onDrawerOpen={[Function]}
@@ -55,7 +55,7 @@ exports[`<DrawerLayoutAndroid /> should render as <DrawerLayoutAndroid> when moc
 exports[`<DrawerLayoutAndroid /> should render as <DrawerLayoutAndroid> when not mocked 1`] = `
 <AndroidDrawerLayout
   drawerBackgroundColor="white"
-  drawerPosition={10}
+  drawerPosition="left"
   drawerWidth={300}
   onDrawerClose={[Function]}
   onDrawerOpen={[Function]}
@@ -107,7 +107,7 @@ exports[`<DrawerLayoutAndroid /> should render as <DrawerLayoutAndroid> when not
 exports[`<DrawerLayoutAndroid /> should shallow render as <DrawerLayoutAndroid> when mocked 1`] = `
 <DrawerLayoutAndroid
   drawerBackgroundColor="white"
-  drawerPosition={10}
+  drawerPosition="left"
   drawerWidth={300}
   renderNavigationView={[Function]}
 />
@@ -116,7 +116,7 @@ exports[`<DrawerLayoutAndroid /> should shallow render as <DrawerLayoutAndroid>
 exports[`<DrawerLayoutAndroid /> should shallow render as <DrawerLayoutAndroid> when not mocked 1`] = `
 <DrawerLayoutAndroid
   drawerBackgroundColor="white"
-  drawerPosition={10}
+  drawerPosition="left"
   drawerWidth={300}
   renderNavigationView={[Function]}
 />
diff --git a/RNTester/js/RNTesterApp.android.js b/RNTester/js/RNTesterApp.android.js
index a7c79047de9..f23e5093a21 100644
--- a/RNTester/js/RNTesterApp.android.js
+++ b/RNTester/js/RNTesterApp.android.js
@@ -105,7 +105,7 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
     }
     return (
       <DrawerLayoutAndroid
-        drawerPosition={DrawerLayoutAndroid.positions.Left}
+        drawerPosition="left"
         drawerWidth={Dimensions.get('window').width - DRAWER_WIDTH_LEFT}
         keyboardDismissMode="on-drag"
         onDrawerOpen={() => {