Merge development

8 files changed, 65 insertions, 56 deletions

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 13109e613..30893cfc8 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.0.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.23",
         "changes": [
@@ -337,18 +346,15 @@
         "version": "0.0.5",
         "changes": [
             {
-                "note":
-                    "Handle `reflection` type rendering so that anonymous function type declarations render properly",
+                "note": "Handle `reflection` type rendering so that anonymous function type declarations render properly",
                 "pr": 465
             },
             {
-                "note":
-                    "Rename `MethodSignature` to `Signature` and change it's props so that it can be used to render method and function signatures.",
+                "note": "Rename `MethodSignature` to `Signature` and change it's props so that it can be used to render method and function signatures.",
                 "pr": 465
             },
             {
-                "note":
-                    "Rename `MethodBlock` to `SignatureBlock` since it is not used to render method and function signature blocks.",
+                "note": "Rename `MethodBlock` to `SignatureBlock` since it is not used to render method and function signature blocks.",
                 "pr": 465
             },
             {
@@ -362,8 +368,7 @@
         "version": "0.0.3",
         "changes": [
             {
-                "note":
-                    "Move TS typings from devDependencies to dependencies since they are needed by the package user."
+                "note": "Move TS typings from devDependencies to dependencies since they are needed by the package user."
             }
         ],
         "timestamp": 1521298800
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 01f987645..51c56cf41 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.24 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.23 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md
index 19c092e4d..7b1f4f80a 100644
--- a/packages/react-docs/README.md
+++ b/packages/react-docs/README.md
@@ -11,15 +11,15 @@ A full-page React component for rendering beautiful documentation for Solidity a
 
 #### Features
 
-*   Mobile optimized
-*   Reads Javadoc-style comments in your code to generate class/method/argument/return/type comments.
-*   Syntax highlighting support for TypeScript & Solidity
-*   Type declaration linking
-*   Type declaration popovers to avoid clicking through to the definition
-*   Section/method/type anchors for easily pointing others to a specific part of your docs.
-*   Version picker
-*   Customizable sidebar header
-*   Supports custom markdown sections so you can easily add an intro or installation instructions.
+-   Mobile optimized
+-   Reads Javadoc-style comments in your code to generate class/method/argument/return/type comments.
+-   Syntax highlighting support for TypeScript & Solidity
+-   Type declaration linking
+-   Type declaration popovers to avoid clicking through to the definition
+-   Section/method/type anchors for easily pointing others to a specific part of your docs.
+-   Version picker
+-   Customizable sidebar header
+-   Supports custom markdown sections so you can easily add an intro or installation instructions.
 
 ## Installation
 
@@ -45,9 +45,9 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
 
 Feel free to contribute to these improvements!
 
-*   Allow user to pass in styling for all major elements similar to [Material-UI](http://www.material-ui.com/).
-*   Allow user to define an alternative font and have it change everywhere.
-*   Add source links to Solidity docs (currently unsupported by solc, which underlies sol-doc).
+-   Allow user to pass in styling for all major elements similar to [Material-UI](http://www.material-ui.com/).
+-   Allow user to define an alternative font and have it change everywhere.
+-   Add source links to Solidity docs (currently unsupported by solc, which underlies sol-doc).
 
 ## Contributing
 
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 7cd0ae55a..3df2cd4df 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/react-docs",
-    "version": "1.0.23",
+    "version": "1.0.24",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,8 +24,8 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/tslint-config": "^2.0.1",
         "@types/compare-versions": "^3.0.0",
         "@types/styled-components": "4.0.0",
         "make-promises-safe": "^1.1.0",
@@ -34,9 +34,9 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/react-shared": "^1.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/utils": "^2.1.1",
+        "@0x/react-shared": "^1.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/utils": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
@@ -47,13 +47,13 @@
         "compare-versions": "^3.0.1",
         "lodash": "^4.17.5",
         "material-ui": "^0.20.0",
-        "react": "^16.4.2",
-        "react-dom": "^16.4.2",
+        "react": "^16.5.2",
+        "react-dom": "^16.5.2",
         "react-markdown": "^3.2.2",
         "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
         "react-tooltip": "^3.2.7",
         "semver": "5.5.0",
-        "styled-components": "^3.3.0"
+        "styled-components": "^4.0.1"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index 85547576b..424fe9ecf 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -194,21 +194,19 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
                         <div>{functionDefs}</div>
                     </div>
                 )}
-                {!_.isUndefined(docSection.events) &&
-                    docSection.events.length > 0 && (
-                        <div>
-                            <h2 style={headerStyle}>Events</h2>
-                            <div>{eventDefs}</div>
-                        </div>
-                    )}
+                {!_.isUndefined(docSection.events) && docSection.events.length > 0 && (
+                    <div>
+                        <h2 style={headerStyle}>Events</h2>
+                        <div>{eventDefs}</div>
+                    </div>
+                )}
                 {!_.isUndefined(docSection.externalExportToLink) &&
                     this._renderExternalExports(docSection.externalExportToLink)}
-                {!_.isUndefined(typeDefs) &&
-                    typeDefs.length > 0 && (
-                        <div>
-                            <div>{typeDefs}</div>
-                        </div>
-                    )}
+                {!_.isUndefined(typeDefs) && typeDefs.length > 0 && (
+                    <div>
+                        <div>{typeDefs}</div>
+                    </div>
+                )}
                 <div
                     style={{
                         width: '100%',
diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index 0df44ca1c..06896159f 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -45,7 +45,8 @@ export const Interface: React.SFC<InterfaceProps> = (props: InterfaceProps): any
                         typeDefinitionByName={props.typeDefinitionByName}
                         isInPopover={props.isInPopover}
                     />
-                )},
+                )}
+                ,
             </span>
         );
     });
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 7cdf19bb0..3189d86cf 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -91,16 +91,14 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
                     />
                 )}
                 {method.comment && <Comment comment={method.comment} className="py2" />}
-                {method.parameters &&
-                    !_.isEmpty(method.parameters) &&
-                    hasExclusivelyNamedParams && (
-                        <div>
-                            <h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
-                                ARGUMENTS
-                            </h4>
-                            {this._renderParameterDescriptions(method.parameters, method.name)}
-                        </div>
-                    )}
+                {method.parameters && !_.isEmpty(method.parameters) && hasExclusivelyNamedParams && (
+                    <div>
+                        <h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
+                            ARGUMENTS
+                        </h4>
+                        {this._renderParameterDescriptions(method.parameters, method.name)}
+                    </div>
+                )}
                 {method.returnComment && (
                     <div className="pt1 comment">
                         <h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index fa3b658b4..894c3f560 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -53,7 +53,8 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
                                 typeDefinitionByName={props.typeDefinitionByName}
                                 docsInfo={props.docsInfo}
                                 isInPopover={props.isInPopover}
-                            />[]
+                            />
+                            []
                         </span>
                     );
                 } else {
@@ -181,9 +182,11 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
             });
             typeName = (
                 <div>
-                    [{_.reduce(tupleTypes, (prev: React.ReactNode, curr: React.ReactNode) => {
+                    [
+                    {_.reduce(tupleTypes, (prev: React.ReactNode, curr: React.ReactNode) => {
                         return [prev, ', ', curr];
-                    })}]
+                    })}
+                    ]
                 </div>
             );
             break;