fix: fix showing type annotations for ts

callstack · Jun 25, 2019 · abb9875 · abb9875
1 parent cb88ce6
commit abb9875
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/templates/Documentation.js b/src/templates/Documentation.js
@@ -71,8 +71,7 @@ const ANNOTATION_OPTIONAL = '@optional';
 const ANNOTATION_INTERNAL = '@internal';
 const ANNOTATION_EXTENDS = '@extends';
 
-const getTypeName = (flowType: TypeAnnotation) =>
-  flowType.raw || flowType.name || '';
+const getTypeName = (type: TypeAnnotation) => type.raw || type.name || '';
 
 const hasAnnotation = (item: any, annotation: string) =>
   // eslint-disable-next-line no-nested-ternary
@@ -89,6 +88,7 @@ const PropTypeDoc = ({
   name,
   description,
   flowType,
+  tsType,
   type,
   required,
   defaultValue,
@@ -100,7 +100,7 @@ const PropTypeDoc = ({
 
   const typeName =
     // eslint-disable-next-line no-nested-ternary
-    flowType ? getTypeName(flowType) : type ? getTypeName(type) : null;
+    flowType || tsType || type ? getTypeName(flowType || tsType || type) : null;
 
   return (
     <PropInfo>

diff --git a/src/types.js b/src/types.js
@@ -50,6 +50,7 @@ export type Docs = {
         value: string | number,
       },
       flowType?: TypeAnnotation,
+      tsType?: TypeAnnotation,
       type?: TypeAnnotation,
     },
   },