Fix default props with nested intersection types (#29)

* Add failing test when using default props with nested intersection prop types

* Update getProp to handle nested intersection types

Author: Blasz

__snapshots__/test.js.snap

@@ -2071,6 +2071,87 @@ Object {
 }
 `;
 
+exports[`nested intersection type with default props 1`] = `
+Object {
+  "classes": Array [
+    Object {
+      "kind": "intersection",
+      "name": Object {
+        "kind": "id",
+        "name": "Component",
+        "type": null,
+      },
+      "types": Array [
+        Object {
+          "kind": "generic",
+          "value": Object {
+            "kind": "intersection",
+            "types": Array [
+              Object {
+                "kind": "generic",
+                "value": Object {
+                  "kind": "object",
+                  "members": Array [
+                    Object {
+                      "default": Object {
+                        "kind": "string",
+                        "value": "baz",
+                      },
+                      "key": Object {
+                        "kind": "id",
+                        "name": "bar",
+                      },
+                      "kind": "property",
+                      "optional": false,
+                      "value": Object {
+                        "kind": "string",
+                      },
+                    },
+                  ],
+                },
+              },
+              Object {
+                "kind": "object",
+                "members": Array [
+                  Object {
+                    "key": Object {
+                      "kind": "id",
+                      "name": "foo",
+                    },
+                    "kind": "property",
+                    "optional": false,
+                    "value": Object {
+                      "kind": "string",
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        },
+        Object {
+          "kind": "object",
+          "members": Array [
+            Object {
+              "key": Object {
+                "kind": "id",
+                "name": "isDefaultChecked",
+              },
+              "kind": "property",
+              "optional": false,
+              "value": Object {
+                "kind": "boolean",
+              },
+            },
+          ],
+        },
+      ],
+    },
+  ],
+  "kind": "program",
+}
+`;
+
 exports[`new expression 1`] = `
 Object {
   "classes": Array [

index.js

@@ -58,16 +58,9 @@ const resolveFromGeneric = type => {
 
 const getProp = (props, property) => {
   let prop;
-
   if (props.kind === 'intersection') {
     props.types.forEach(pr => {
-      if (pr.kind === 'generic') {
-        if (pr.value.kind === 'object') {
-          prop = getPropFromObject(pr.value, property) || prop;
-        }
-      } else if (pr.kind === 'object') {
-        prop = getPropFromObject(pr, property) || prop;
-      }
+      prop = getProp(resolveFromGeneric(pr), property) || prop;
     });
   } else if (props.kind === 'object') {
     prop = getPropFromObject(props, property);

test.js

@@ -218,6 +218,22 @@ const TESTS = [
   }
   `
   },
+  {
+    name: 'nested intersection type with default props',
+    typeSystem: 'flow',
+    code: `
+  type BaseProps = { bar: string }
+  type Props = BaseProps & { foo: string }
+
+  class Component extends React.Component<Props & {
+    isDefaultChecked: boolean,
+  }> {
+    static defaultProps = {
+      bar: 'baz',
+    }
+  }
+  `
+  },
   {
     name: 'with spread in type annotation',
     typeSystem: 'flow',