Badge - merge fixes

Author: Inbal-Tish

src/components/badge/index.tsx

@@ -18,76 +18,9 @@ import TouchableOpacity from '../touchableOpacity';
 import Image from '../image';
 import View from '../view';
 
-
 const DEFAULT_SIZE = 16;
 const LABEL_FORMATTER_VALUES = [1, 2, 3, 4] as const;
-type LabelFormatterValues = typeof LABEL_FORMATTER_VALUES[number]
-
-export type BadgeProps = ViewProps & TouchableOpacityProps & {
-  /**
-   * Text to show inside the badge.
-   * Not passing a label (undefined) will present a pimple badge.
-   */
-  label?: string;
-  /**
-   * Color of the badge background
-   */
-  backgroundColor?: string;
-  /**
-   * the badge size
-   */
-  size: number;
-  /**
-   * Press handler
-   */
-  onPress?: (props: any) => void;
-  /**
-   * Defines how far a touch event can start away from the badge.
-   */
-  hitSlop?: ViewProps['hitSlop'];
-  /**
-   * width of border around the badge
-   */
-  borderWidth?: number;
-  /**
-   * radius of border around the badge
-   */
-  borderRadius?: number;
-  /**
-   * color of border around the badge
-   */
-  borderColor?: ImageStyle['borderColor'];
-  /**
-   * Additional styles for the top container
-   */
-  containerStyle?: StyleProp<ViewStyle>
-  /**
-   * Additional styles for the badge label
-   */
-  labelStyle?: TextStyle;
-  /**
-   * Receives a number from 1 to 4, representing the label's max digit length.
-   * Beyond the max number for that digit length, a "+" will show at the end.
-   * If set to a value not included in LABEL_FORMATTER_VALUES, no formatting will occur.
-   * Example: labelLengthFormatter={2}, label={124}, label will present "99+".
-   */
-  labelFormatterLimit?: LabelFormatterValues;
-  /**
-   * Renders an icon badge
-   */
-  icon?: ImageSourcePropType;
-  /**
-   * Additional styling to badge icon
-   */
-  iconStyle?: object;
-  /**
-   * Additional props passed to icon
-   */
-  iconProps?: object;
-}
-
 type LabelFormatterValues = typeof LABEL_FORMATTER_VALUES[number];
-export type BadgeSizes = keyof typeof BADGE_SIZES;
 
 export type BadgeProps = ViewProps &
   TouchableOpacityProps & {
@@ -103,7 +36,7 @@ export type BadgeProps = ViewProps &
     /**
      * the badge size (default, small)
      */
-    size: BadgeSizes | number;
+    size: number;
     /**
      * Press handler
      */
@@ -136,7 +69,7 @@ export type BadgeProps = ViewProps &
      * Receives a number from 1 to 4, representing the label's max digit length.
      * Beyond the max number for that digit length, a "+" will show at the end.
      * If set to a value not included in LABEL_FORMATTER_VALUES, no formatting will occur.
-     * Example: labelLengthFormater={2}, label={124}, label will present "99+".
+     * Example: labelLengthFormatter={2}, label={124}, label will present "99+".
      */
     labelFormatterLimit?: LabelFormatterValues;
     /**