Merge branch 'development' into v2-prototype

6 files changed, 58 insertions, 12 deletions

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index b7a4cb058..0cb767dfc 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,5 +1,32 @@
 [
     {
+        "timestamp": 1525477860,
+        "version": "0.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1525466747,
+        "version": "0.0.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1525428773,
+        "version": "0.0.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "0.0.8",
         "changes": [
             {
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index c79b6888d..8a0afbeed 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,13 +5,25 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.11 - _May 5, 2018_
+
+    * Dependencies updated
+
+## v0.0.10 - _May 4, 2018_
+
+    * Dependencies updated
+
+## v0.0.9 - _May 4, 2018_
+
+    * Dependencies updated
+
 ## v0.0.8 - _April 18, 2018_
 
     * Added support for rendering default param values (#519)
     * Added support for rendering nested function types within interface types (#519)
     * Improve type comment rendering (#535)
 
-## v0.0.7 - _April 12, 2018_
+## v0.0.7 - _April 11, 2018_
 
     * Dependencies updated
 
@@ -26,11 +38,11 @@ CHANGELOG
     * Rename `MethodBlock` to `SignatureBlock` since it is not used to render method and function signature blocks. (#465)
     * Add support for documenting exported functions. (#465)
 
-## v0.0.3 - _March 18, 2018_
+## v0.0.3 - _March 17, 2018_
 
     * Move TS typings from devDependencies to dependencies since they are needed by the package user.
 
-## v0.0.2 - _March 18, 2018_
+## v0.0.2 - _March 17, 2018_
 
     * Move example out into a separate sub-package
     * Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 6ea6535ac..ca9ae610e 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,11 +1,11 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "0.0.8",
+    "version": "0.0.11",
     "description": "React documentation component for rendering TypeDoc & Doxity generated JSON",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "lint": "tslint --project . 'src/**/*.ts' 'src/**/*.tsx'",
+        "lint": "tslint --project .",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "build:watch": "tsc -w",
         "clean": "shx rm -rf lib scripts",
@@ -22,21 +22,21 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.3.6",
-        "@0xproject/monorepo-scripts": "^0.1.18",
-        "@0xproject/tslint-config": "^0.4.16",
+        "@0xproject/dev-utils": "^0.4.1",
+        "@0xproject/monorepo-scripts": "^0.1.19",
+        "@0xproject/tslint-config": "^0.4.17",
         "copyfiles": "^1.2.0",
         "shx": "^0.2.2",
         "tslint": "^5.9.1",
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^0.1.3",
-        "@0xproject/utils": "^0.5.2",
+        "@0xproject/react-shared": "^0.1.6",
+        "@0xproject/utils": "^0.6.1",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
-        "@types/react": "16.0.41",
+        "@types/react": "16.3.13",
         "@types/react-dom": "^16.0.3",
         "@types/react-scroll": "0.0.31",
         "basscss": "^8.0.3",
diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 800892dc8..0a525f702 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -91,7 +91,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                 left: 0,
                 bottom: 0,
                 right: 0,
-                overflowZ: 'hidden',
+                overflowX: 'hidden',
                 overflowY: 'scroll',
                 minHeight: `calc(100vh - ${this.props.topBarHeight}px)`,
                 WebkitOverflowScrolling: 'touch',
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 3b4a57ad5..f4e61edc9 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -94,6 +94,7 @@ export enum KindString {
     Method = 'Method',
     Interface = 'Interface',
     TypeAlias = 'Type alias',
+    ObjectLiteral = 'Object literal',
     Variable = 'Variable',
     Function = 'Function',
     Enumeration = 'Enumeration',
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 9c89b135a..0c7803a04 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -93,10 +93,16 @@ export const typeDocUtils = {
                 throw new Error('`react-docs` only supports projects with 1 exported class per file');
             }
             const isClassExport = packageDefinitionWithMergedChildren.children[0].kindString === KindString.Class;
+            const isObjectLiteralExport =
+                packageDefinitionWithMergedChildren.children[0].kindString === KindString.ObjectLiteral;
             if (isClassExport) {
                 entities = packageDefinitionWithMergedChildren.children[0].children;
                 const commentObj = packageDefinitionWithMergedChildren.children[0].comment;
                 packageComment = !_.isUndefined(commentObj) ? commentObj.shortText : packageComment;
+            } else if (isObjectLiteralExport) {
+                entities = packageDefinitionWithMergedChildren.children[0].children;
+                const commentObj = packageDefinitionWithMergedChildren.children[0].comment;
+                packageComment = !_.isUndefined(commentObj) ? commentObj.shortText : packageComment;
             } else {
                 entities = packageDefinitionWithMergedChildren.children;
             }