solved merge conflict

Author: micnil

ActionButton.js

@@ -195,6 +195,7 @@ export default class ActionButton extends Component {
       ]}
       >
         <Touchable
+          testID={this.props.testID}
           background={touchableBackground(
             this.props.nativeFeedbackRippleColor,
             this.props.fixNativeFeedbackRadius
@@ -365,7 +366,9 @@ ActionButton.propTypes = {
 
   useNativeFeedback: PropTypes.bool,
   fixNativeFeedbackRadius: PropTypes.bool,
-  nativeFeedbackRippleColor: PropTypes.string
+  nativeFeedbackRippleColor: PropTypes.string,
+
+  testID: PropTypes.string
 };
 
 ActionButton.defaultProps = {
@@ -393,7 +396,8 @@ ActionButton.defaultProps = {
   useNativeFeedback: true,
   activeOpacity: DEFAULT_ACTIVE_OPACITY,
   fixNativeFeedbackRadius: false,
-  nativeFeedbackRippleColor: "rgba(255,255,255,0.75)"
+  nativeFeedbackRippleColor: "rgba(255,255,255,0.75)",
+  testID: undefined
 };
 
 const styles = StyleSheet.create({

ActionButtonItem.js

@@ -8,7 +8,6 @@ import {
   TouchableNativeFeedback,
   TouchableWithoutFeedback,
   Dimensions,
-  Platform,
 } from "react-native";
 import {
   shadowStyle,
@@ -86,36 +85,29 @@ export default class ActionButtonItem extends Component {
     };
 
     if (position !== "center")
-      buttonStyle[position] = (this.props.parentSize - size) / 2;
+      animatedViewStyle[position] = (this.props.parentSize - size) / 2;
 
     const Touchable = getTouchableComponent(this.props.useNativeFeedback);
 
-    const parentStyle = isAndroid &&
-      this.props.fixNativeFeedbackRadius
-      ? {
-          paddingHorizontal: this.props.offsetX,
-          height: size + SHADOW_SPACE + spacing,
-          borderRadius: this.props.size / 2
+    const parentStyle = {
+          marginHorizontal: this.props.offsetX,
+          marginBottom: spacing + SHADOW_SPACE,
+          borderRadius: this.props.size / 2,
         }
-      : {
-          paddingHorizontal: this.props.offsetX,
-          height: size + SHADOW_SPACE + spacing
-        };
+
     return (
       <Animated.View
         pointerEvents="box-none"
-        style={[animatedViewStyle, parentStyle]}
+        style={[animatedViewStyle]}
       >
-        <View
-          style={[{
-            width: this.props.size,
-            height: this.props.size,
-            borderRadius: size / 2
-          },
-          !hideShadow && Platform.OS === "android" ? {...shadowStyle, ...this.props.shadowStyle} : null
-        ]}
-        >
+         <View
+          style={[
+            parentStyle,
+            !hideShadow && isAndroid ? {...shadowStyle, ...this.props.shadowStyle} : null
+          ]}
+        > 
           <Touchable
+            testID={this.props.testID}
             background={touchableBackground(
               this.props.nativeFeedbackRippleColor,
               this.props.fixNativeFeedbackRadius
@@ -125,7 +117,7 @@ export default class ActionButtonItem extends Component {
           >
             <View style={[
               buttonStyle,
-              !hideShadow && Platform.OS === "ios" ? {...shadowStyle, ...this.props.shadowStyle} : null
+              !hideShadow && !isAndroid ? {...shadowStyle, ...this.props.shadowStyle} : null
             ]}>
               {this.props.children}
             </View>

index.d.ts

@@ -0,0 +1,60 @@
+import * as React from 'react'
+import {
+  ViewStyle,
+  ViewProperties,
+  TextStyle
+} from 'react-native'
+
+
+export interface ActionButtonProperties extends ViewProperties {
+  resetToken?: any,
+  active?: boolean,
+
+  position?: string,
+  elevation?: number,
+  zIndex?: number,
+
+  hideShadow?: boolean,
+  shadowStyle?: {} | [any] | number,
+  bgColor?: string,
+  bgOpacity?: number,
+  buttonColor?: string,
+  buttonTextStyle?: TextStyle,
+  buttonText?: string,
+
+  offsetX?: number,
+  offsetY?: number,
+  spacing?: number,
+  size?: number,
+  autoInactive?: boolean,
+  onPress?: () => void,
+  backdrop?: boolean | object,
+  degrees?: number,
+  verticalOrientation?: 'up' | 'down',
+  backgroundTappable?: boolean,
+  activeOpacity?: number,
+
+  useNativeFeedback?: boolean,
+  fixNativeFeedbackRadius?: boolean,
+  nativeFeedbackRippleColor?: string
+}
+
+export interface ActionButtonItemProperties extends ViewProperties {
+  title?: string
+  onPress?:	() => void
+  buttonColor?:	string
+  textContainerStyle?: ViewStyle
+  textStyle?: TextStyle
+  spaceBetween?: number
+  activeOpacity?:	number
+  hideLabelShadow?:	boolean
+  shadowStyle?:	ViewStyle
+  useNativeFeedback?:	boolean
+  fixNativeFeedbackRadius?:	boolean
+  nativeFeedbackRippleColor?: string
+}
+
+export class ActionButtonItem extends React.Component <ActionButtonItemProperties> {}
+export default class ActionButton extends React.Component <ActionButtonProperties> {
+  static Item: typeof ActionButtonItem
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-action-button",
-  "version": "2.8.0",
+  "version": "2.8.3",
   "description": "customizable multi-action-button component for react-native",
   "main": "ActionButton.js",
   "scripts": {