From ad52f526247af6eebadd2ea436b86ff7eb874f27 Mon Sep 17 00:00:00 2001
From: Varun Gupta <varungupta303@gmail.com>
Date: Wed, 23 Jan 2019 04:04:14 -0800
Subject: [PATCH] Fix SwipeableActionButton styling. (#23113)

Summary:
Thank you for sending the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change:

Changelog:
----------

Help reviewers and the release process by writing your own changelog entry. See http://facebook.github.io/react-native/docs/contributing#changelog for an example.

[General] [Fixed] - Same style was applied twice to SwipeableQuickActionButton in a recent commit causing problems with the buttons layout.
Pull Request resolved: https://github.com/facebook/react-native/pull/23113

Differential Revision: D13781896

Pulled By: cpojer

fbshipit-source-id: 659ddaed32b6a1e90080344ea3b0b42088fd9783
---
 .../SwipeableRow/SwipeableQuickActionButton.js           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
index 82e1f7a0a..0ad96e4d2 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
@@ -37,6 +37,10 @@ class SwipeableQuickActionButton extends React.Component<{
    * found when Flow v0.82 was deployed. To see the error delete this comment
    * and run Flow. */
   style?: ?DeprecatedViewPropTypes.style,
+  /* $FlowFixMe(>=0.82.0 site=react_native_fb) This comment suppresses an error
+   * found when Flow v0.82 was deployed. To see the error delete this comment
+   * and run Flow. */
+  containerStyle?: ?DeprecatedViewPropTypes.style,
   testID?: string,
   text?: ?(string | Object | Array<string | Object>),
   /* $FlowFixMe(>=0.82.0 site=react_native_fb) This comment suppresses an error
@@ -64,8 +68,9 @@ class SwipeableQuickActionButton extends React.Component<{
       <TouchableHighlight
         onPress={this.props.onPress}
         testID={this.props.testID}
-        underlayColor="transparent">
-        <View style={this.props.style}>{mainView}</View>
+        underlayColor="transparent"
+        style={this.props.containerStyle}>
+        {mainView}
       </TouchableHighlight>
     );
   }