Fix Typings for RadioGroup and RadioButton

Author: ethanshar

generatedTypes/components/radioButton/RadioButton.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
 import { TextStyle, ImageSourcePropType, ImageStyle, ViewProps } from 'react-native';
-import { BaseComponentInjectedProps, ForwardRefInjectedProps } from '../../commons/new';
 import { RadioGroupContextPropTypes } from './RadioGroupContext';
-export declare type RadioButtonPropTypes = RadioGroupContextPropTypes & BaseComponentInjectedProps & ForwardRefInjectedProps & ViewProps & {
+export declare type RadioButtonPropTypes = RadioGroupContextPropTypes & ViewProps & {
     /**
      * The identifier value of the radio button. must be different than other RadioButtons in the same group
      */

generatedTypes/components/radioButton/RadioGroup.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
-import { BaseComponentInjectedProps, ForwardRefInjectedProps } from '../../commons/new';
-export declare type RadioGroupPropTypes = BaseComponentInjectedProps & ForwardRefInjectedProps & {
+export declare type RadioGroupPropTypes = {
     /**
      * The initial value of the selected radio button
      */

src/components/radioButton/RadioButton.tsx

@@ -23,7 +23,7 @@ import {RadioGroupContextPropTypes} from './RadioGroupContext';
 const DEFAULT_SIZE = 24;
 const DEFAULT_COLOR = Colors.blue30;
 
-export type RadioButtonPropTypes = RadioGroupContextPropTypes & BaseComponentInjectedProps & ForwardRefInjectedProps & ViewProps & {
+export type RadioButtonPropTypes = RadioGroupContextPropTypes & ViewProps & {
   /**
    * The identifier value of the radio button. must be different than other RadioButtons in the same group
    */
@@ -79,10 +79,12 @@ interface RadioButtonState {
   scaleAnimationValue: Animated.Value;
 }
 
+type Props = RadioButtonPropTypes & BaseComponentInjectedProps & ForwardRefInjectedProps;
+
 /**
  * A Radio Button component, should be wrapped inside a RadioGroup
  */
-class RadioButton extends PureComponent<RadioButtonPropTypes, RadioButtonState> {
+class RadioButton extends PureComponent<Props, RadioButtonState> {
   static displayName = 'RadioButton';
 
   static defaultProps = {
@@ -95,7 +97,7 @@ class RadioButton extends PureComponent<RadioButtonPropTypes, RadioButtonState>
     image: StyleProp<ImageStyle>;
   };
 
-  constructor(props: RadioButtonPropTypes) {
+  constructor(props: Props) {
     super(props);
     this.styles = createStyles(props);
     this.state = {
@@ -108,7 +110,7 @@ class RadioButton extends PureComponent<RadioButtonPropTypes, RadioButtonState>
     this.animate();
   }
 
-  componentDidUpdate(prevProps: RadioButtonPropTypes) {
+  componentDidUpdate(prevProps: Props) {
     if (prevProps.selected !== this.props.selected) {
       this.animate();
     }

src/components/radioButton/RadioGroup.tsx

@@ -4,7 +4,7 @@ import {asBaseComponent, forwardRef, BaseComponentInjectedProps, ForwardRefInjec
 import View from '../view';
 import RadioGroupContext from './RadioGroupContext';
 
-export type RadioGroupPropTypes = BaseComponentInjectedProps & ForwardRefInjectedProps & {
+export type RadioGroupPropTypes = {
   /**
    * The initial value of the selected radio button
    */
@@ -19,21 +19,23 @@ interface RadioGroupState {
   value?: RadioGroupPropTypes['initialValue'];
 }
 
+type Props = RadioGroupPropTypes & BaseComponentInjectedProps & ForwardRefInjectedProps;
+
 /**
  * Wrap a group of Radio Buttons to automatically control their selection
  */
-class RadioGroup extends PureComponent<RadioGroupPropTypes, RadioGroupState> {
+class RadioGroup extends PureComponent<Props, RadioGroupState> {
   static displayName = 'RadioGroup';
 
-  constructor(props: RadioGroupPropTypes) {
+  constructor(props: Props) {
     super(props);
 
     this.state = {
       value: props.initialValue
     };
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps: RadioGroupPropTypes) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (this.props.initialValue !== nextProps.initialValue) {
       this.setState({value: nextProps.initialValue});
     }