Merge branch 'master' of github.com:lyft/react-javascript-to-typescript-transform into propsOptional

Author: Mohsen Azimi

src/transforms/react-js-make-props-and-state-transform.ts

@@ -228,6 +228,11 @@ export function reactJSMakePropsAndStateInterfaceTransformFactoryFactory(typeChe
                             return result;
                         }
 
+                        // Ignore children, React types have it
+                        if (propertyAssignment.name.getText() === 'children') {
+                            return result;
+                        }
+
                         const typeValue = getTypeFromReactPropTypeExpression(propertyAssignment.initializer);
                         const isOptional = isPropTypeOptional(propertyAssignment.initializer);
                         const propertySignature = ts.createPropertySignature(

test/react-js-make-props-and-state-transform/static-proptypes-many-props/input.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 
 export default class MyComponent extends React.Component {
     static propTypes = {
+        children: React.PropTypes.node,
         any: React.PropTypes.any,
         array: React.PropTypes.array,
         bool: React.PropTypes.bool,
@@ -24,4 +25,4 @@ export default class MyComponent extends React.Component {
     render() {
         return <div />;
     }
-}
+}

test/react-js-make-props-and-state-transform/static-proptypes-many-props/output.tsx

@@ -21,6 +21,7 @@ export default class MyComponent extends React.Component<{
         elementRequired: JSX.Element;
     }, {}> {
     static propTypes = {
+        children: React.PropTypes.node,
         any: React.PropTypes.any,
         array: React.PropTypes.array,
         bool: React.PropTypes.bool,