From f4a2e227e1a7224fbbe9c99d9aa033d176a9c4de Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 29 Jul 2018 21:58:39 +0200
Subject: Remove all in-package monorepo-scripts by adding doc gen/upload and
 aggregate release note publishing to publish script

---
 packages/react-docs/package.json                        | 6 ++----
 packages/react-docs/src/monorepo_scripts/postpublish.ts | 8 --------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 packages/react-docs/src/monorepo_scripts/postpublish.ts

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 1028f7fd6..e8db040be 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -9,10 +9,9 @@
     "types": "lib/index.d.ts",
     "scripts": {
         "lint": "tslint --project .",
-        "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
+        "build": "tsc",
         "watch_without_deps": "tsc -w",
-        "clean": "shx rm -rf lib scripts",
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
+        "clean": "shx rm -rf lib"
     },
     "author": "Fabio Berger",
     "license": "Apache-2.0",
@@ -26,7 +25,6 @@
     },
     "devDependencies": {
         "@0xproject/dev-utils": "^1.0.3",
-        "@0xproject/monorepo-scripts": "^1.0.4",
         "@0xproject/tslint-config": "^1.0.4",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^1.2.0",
diff --git a/packages/react-docs/src/monorepo_scripts/postpublish.ts b/packages/react-docs/src/monorepo_scripts/postpublish.ts
deleted file mode 100644
index dcb99d0f7..000000000
--- a/packages/react-docs/src/monorepo_scripts/postpublish.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
-- 
cgit v1.2.3


From 11869122b4fe00c834347f9911985d7b2572bc9b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 1 Aug 2018 17:33:28 +0200
Subject: Update React-scroll, getting rid of the need to manually set the url
 hash

---
 packages/react-docs/package.json                 | 4 ++--
 packages/react-docs/src/components/signature.tsx | 2 +-
 packages/react-docs/src/components/type.tsx      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index e8db040be..c95051bde 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -41,7 +41,7 @@
         "@types/node": "^8.0.53",
         "@types/react": "*",
         "@types/react-dom": "*",
-        "@types/react-scroll": "0.0.31",
+        "@types/react-scroll": "1.5.3",
         "basscss": "^8.0.3",
         "compare-versions": "^3.0.1",
         "lodash": "^4.17.4",
@@ -49,7 +49,7 @@
         "react": "15.6.1",
         "react-dom": "15.6.1",
         "react-markdown": "^3.2.2",
-        "react-scroll": "^1.5.2",
+        "react-scroll": "^1.7.10",
         "react-tooltip": "^3.2.7",
         "semver": "5.5.0"
     },
diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index 77e9cc909..5f28050d2 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -27,7 +27,7 @@ const defaultProps = {
 };
 
 export const Signature: React.SFC<SignatureProps> = (props: SignatureProps) => {
-    const sectionName = constants.TYPES_SECTION_NAME;
+    const sectionName = props.sectionName;
     const parameters = renderParameters(props.parameters, props.docsInfo, sectionName, props.typeDefinitionByName);
     const paramStringArray: any[] = [];
     // HACK: For now we don't put params on newlines if there are less then 2 of them.
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index e453349ef..04fcd9998 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -182,6 +182,7 @@ export function Type(props: TypeProps): any {
             <ScrollLink
                 to={typeDefinitionAnchorId}
                 offset={0}
+                hashSpy={true}
                 duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
                 containerId={sharedConstants.DOCS_CONTAINER_ID}
             >
-- 
cgit v1.2.3


From 3bdf6004ca74dd9eb380aa61cf9e69c47725116a Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 1 Aug 2018 17:36:37 +0200
Subject: Start refactoring docs to remove unnecessary configs given more
 concise TypeDoc JSON

---
 .../react-docs/src/components/documentation.tsx    |  44 +++----
 .../react-docs/src/components/property_block.tsx   |  70 +++++++++++
 packages/react-docs/src/components/type.tsx        |  29 ++---
 .../react-docs/src/components/type_definition.tsx  |   3 -
 packages/react-docs/src/docs_info.ts               |  56 +++------
 packages/react-docs/src/index.ts                   |  10 +-
 packages/react-docs/src/types.ts                   |  19 ++-
 packages/react-docs/src/utils/typedoc_utils.ts     | 135 +++++++++++----------
 8 files changed, 206 insertions(+), 160 deletions(-)
 create mode 100644 packages/react-docs/src/components/property_block.tsx

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index ff33220d2..4f776b237 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -1,7 +1,9 @@
 import {
+    AnchorTitle,
     colors,
     constants as sharedConstants,
     EtherscanLinkSuffixes,
+    HeaderSizes,
     MarkdownSection,
     NestedSidebarMenu,
     Networks,
@@ -32,8 +34,7 @@ import { Badge } from './badge';
 import { Comment } from './comment';
 import { EventDefinition } from './event_definition';
 import { SignatureBlock } from './signature_block';
-import { SourceLink } from './source_link';
-import { Type } from './type';
+import { PropertyBlock } from './property_block';
 import { TypeDefinition } from './type_definition';
 
 const networkNameToColor: { [network: string]: string } = {
@@ -129,7 +130,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                                         selectedVersion={this.props.selectedVersion}
                                         versions={this.props.availableVersions}
                                         sidebarHeader={this.props.sidebarHeader}
-                                        topLevelMenu={this.props.docsInfo.getMenu(this.props.selectedVersion)}
+                                        topLevelMenu={this.props.docsInfo.menu}
                                         menuSubsectionsBySection={menuSubsectionsBySection}
                                         onVersionSelected={this.props.onVersionSelected}
                                     />
@@ -172,7 +173,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
         );
     }
     private _renderDocumentation(): React.ReactNode {
-        const subMenus = _.values(this.props.docsInfo.getMenu());
+        const subMenus = _.values(this.props.docsInfo.menu);
         const orderedSectionNames = _.flatten(subMenus);
 
         const typeDefinitionByName = this.props.docsInfo.getTypeDefinitionsByName(this.props.docAgnosticFormat);
@@ -258,13 +259,12 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                     {this._renderNetworkBadgesIfExists(sectionName)}
                 </div>
                 {docSection.comment && <Comment comment={docSection.comment} />}
-                {!_.isEmpty(docSection.constructors) &&
-                    this.props.docsInfo.isVisibleConstructor(sectionName) && (
-                        <div>
-                            <h2 style={headerStyle}>Constructor</h2>
-                            {this._renderConstructors(docSection.constructors, sectionName, typeDefinitionByName)}
-                        </div>
-                    )}
+                {!_.isEmpty(docSection.constructors) && (
+                    <div>
+                        <h2 style={headerStyle}>Constructor</h2>
+                        {this._renderConstructors(docSection.constructors, sectionName, typeDefinitionByName)}
+                    </div>
+                )}
                 {!_.isEmpty(docSection.properties) && (
                     <div>
                         <h2 style={headerStyle}>Properties</h2>
@@ -345,20 +345,14 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
     }
     private _renderProperty(sectionName: string, property: Property): React.ReactNode {
         return (
-            <div key={`property-${property.name}-${property.type.name}`} className="pb3">
-                <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
-                    {property.name}:{' '}
-                    <Type type={property.type} sectionName={sectionName} docsInfo={this.props.docsInfo} />
-                </code>
-                {property.source && (
-                    <SourceLink
-                        version={this.props.selectedVersion}
-                        source={property.source}
-                        sourceUrl={this.props.sourceUrl}
-                    />
-                )}
-                {property.comment && <Comment comment={property.comment} className="py2" />}
-            </div>
+            <PropertyBlock
+                key={`property-${property.name}-${property.type.name}`}
+                property={property}
+                sectionName={sectionName}
+                docsInfo={this.props.docsInfo}
+                sourceUrl={this.props.sourceUrl}
+                selectedVersion={this.props.selectedVersion}
+            />
         );
     }
     private _renderSignatureBlocks(
diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
new file mode 100644
index 000000000..6e7f90c6c
--- /dev/null
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -0,0 +1,70 @@
+import { AnchorTitle, HeaderSizes } from '@0xproject/react-shared';
+import * as React from 'react';
+
+import { DocsInfo } from '../docs_info';
+import { Property } from '../types';
+import { constants } from '../utils/constants';
+
+import { Comment } from './comment';
+import { Type } from './type';
+import { SourceLink } from './source_link';
+
+export interface PropertyBlockProps {
+    property: Property;
+    sectionName: string;
+    docsInfo: DocsInfo;
+    sourceUrl: string;
+    selectedVersion: string;
+}
+
+export interface PropertyBlockState {
+    shouldShowAnchor: boolean;
+}
+
+export class PropertyBlock extends React.Component<PropertyBlockProps, PropertyBlockState> {
+    constructor(props: PropertyBlockProps) {
+        super(props);
+        this.state = {
+            shouldShowAnchor: false,
+        };
+    }
+    public render(): React.ReactNode {
+        const property = this.props.property;
+        const sectionName = this.props.sectionName;
+        return (
+            <div
+                id={`${this.props.sectionName}-${property.name}`}
+                className="pb4"
+                key={`property-${property.name}-${property.type.name}`}
+                onMouseOver={this._setAnchorVisibility.bind(this, true)}
+                onMouseOut={this._setAnchorVisibility.bind(this, false)}
+            >
+                <div className="pb2" style={{ lineHeight: 1.3 }}>
+                    <AnchorTitle
+                        headerSize={HeaderSizes.H3}
+                        title={property.name}
+                        id={`${sectionName}-${property.name}`}
+                        shouldShowAnchor={this.state.shouldShowAnchor}
+                    />
+                </div>
+                <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
+                    {property.name}:{' '}
+                    <Type type={property.type} sectionName={sectionName} docsInfo={this.props.docsInfo} />
+                </code>
+                {property.source && (
+                    <SourceLink
+                        version={this.props.selectedVersion}
+                        source={property.source}
+                        sourceUrl={this.props.sourceUrl}
+                    />
+                )}
+                {property.comment && <Comment comment={property.comment} className="py2" />}
+            </div>
+        );
+    }
+    private _setAnchorVisibility(shouldShowAnchor: boolean): void {
+        this.setState({
+            shouldShowAnchor,
+        });
+    }
+}
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 04fcd9998..3504be303 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -9,6 +9,7 @@ import { DocsInfo } from '../docs_info';
 import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '../types';
 
 import { Signature } from './signature';
+import { constants } from '../utils/constants';
 import { TypeDefinition } from './type_definition';
 
 export interface TypeProps {
@@ -43,7 +44,7 @@ export function Type(props: TypeProps): any {
                         <span>
                             <Type
                                 key={key}
-                                type={arg.elementType}
+                                type={arg}
                                 sectionName={props.sectionName}
                                 typeDefinitionByName={props.typeDefinitionByName}
                                 docsInfo={props.docsInfo}
@@ -142,7 +143,6 @@ export function Type(props: TypeProps): any {
 
     let typeNameUrlIfExists;
     let typePrefixIfExists;
-    let sectionNameIfExists;
     if (!_.isUndefined(props.docsInfo.typeConfigs)) {
         typeNameUrlIfExists = !_.isUndefined(props.docsInfo.typeConfigs.typeNameToExternalLink)
             ? props.docsInfo.typeConfigs.typeNameToExternalLink[typeName as string]
@@ -150,9 +150,6 @@ export function Type(props: TypeProps): any {
         typePrefixIfExists = !_.isUndefined(props.docsInfo.typeConfigs.typeNameToPrefix)
             ? props.docsInfo.typeConfigs.typeNameToPrefix[typeName as string]
             : undefined;
-        sectionNameIfExists = !_.isUndefined(props.docsInfo.typeConfigs.typeNameToDocSection)
-            ? props.docsInfo.typeConfigs.typeNameToDocSection[typeName as string]
-            : undefined;
     }
     if (!_.isUndefined(typeNameUrlIfExists)) {
         typeName = (
@@ -168,16 +165,12 @@ export function Type(props: TypeProps): any {
         );
     } else if (
         (isReference || isArray) &&
-        (props.docsInfo.isPublicType(typeName as string) || !_.isUndefined(sectionNameIfExists))
+        props.typeDefinitionByName &&
+        props.typeDefinitionByName[typeName as string]
     ) {
         const id = Math.random().toString();
-        const typeDefinitionAnchorId = _.isUndefined(sectionNameIfExists)
-            ? `${props.sectionName}-${typeName}`
-            : sectionNameIfExists;
-        let typeDefinition;
-        if (props.typeDefinitionByName) {
-            typeDefinition = props.typeDefinitionByName[typeName as string];
-        }
+        const typeDefinitionAnchorId = `${constants.TYPES_SECTION_NAME}-${typeName}`;
+        let typeDefinition = props.typeDefinitionByName[typeName as string];
         typeName = (
             <ScrollLink
                 to={typeDefinitionAnchorId}
@@ -186,18 +179,12 @@ export function Type(props: TypeProps): any {
                 duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
                 containerId={sharedConstants.DOCS_CONTAINER_ID}
             >
-                {_.isUndefined(typeDefinition) || sharedUtils.isUserOnMobile() ? (
-                    <span
-                        onClick={sharedUtils.setUrlHash.bind(null, typeDefinitionAnchorId)}
-                        style={{ color: colors.lightBlueA700, cursor: 'pointer' }}
-                    >
-                        {typeName}
-                    </span>
+                {sharedUtils.isUserOnMobile() ? (
+                    <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span>
                 ) : (
                     <span
                         data-tip={true}
                         data-for={id}
-                        onClick={sharedUtils.setUrlHash.bind(null, typeDefinitionAnchorId)}
                         style={{
                             color: colors.lightBlueA700,
                             cursor: 'pointer',
diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index c4bd7359a..a23f27181 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -37,9 +37,6 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
     }
     public render(): React.ReactNode {
         const customType = this.props.customType;
-        if (!this.props.docsInfo.isPublicType(customType.name)) {
-            return null; // no-op
-        }
 
         let typePrefix: string;
         let codeSnippet: React.ReactNode;
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index b37942da6..dd3cb9a96 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -13,7 +13,7 @@ import {
     SectionsMap,
     SupportedDocJson,
     TypeDefinitionByName,
-    TypeDocNode,
+    GeneratedDocJson,
 } from './types';
 import { doxityUtils } from './utils/doxity_utils';
 import { typeDocUtils } from './utils/typedoc_utils';
@@ -32,6 +32,7 @@ export class DocsInfo {
     constructor(config: DocsInfoConfig) {
         this.id = config.id;
         this.type = config.type;
+        this.menu = config.menu;
         this.displayName = config.displayName;
         this.packageUrl = config.packageUrl;
         this.sections = config.sections;
@@ -40,38 +41,8 @@ export class DocsInfo {
         this.typeConfigs = config.typeConfigs;
         this._docsInfo = config;
     }
-    public isPublicType(typeName: string): boolean {
-        if (_.isUndefined(this._docsInfo.typeConfigs.publicTypes)) {
-            return false;
-        }
-        const isPublic = _.includes(this._docsInfo.typeConfigs.publicTypes, typeName);
-        return isPublic;
-    }
-    public getModulePathsIfExists(sectionName: string): string[] {
-        const modulePathsIfExists = this._docsInfo.sectionNameToModulePath[sectionName];
-        return modulePathsIfExists;
-    }
     public getMenu(selectedVersion?: string): { [section: string]: string[] } {
-        if (_.isUndefined(selectedVersion) || _.isUndefined(this._docsInfo.menuSubsectionToVersionWhenIntroduced)) {
-            return this._docsInfo.menu;
-        }
-
-        const finalMenu = _.cloneDeep(this._docsInfo.menu);
-        if (_.isUndefined(finalMenu.contracts)) {
-            return finalMenu;
-        }
-
-        // TODO: refactor to include more sections then simply the `contracts` section
-        finalMenu.contracts = _.filter(finalMenu.contracts, (contractName: string) => {
-            const versionIntroducedIfExists = this._docsInfo.menuSubsectionToVersionWhenIntroduced[contractName];
-            if (!_.isUndefined(versionIntroducedIfExists)) {
-                const doesExistInSelectedVersion = compareVersions(selectedVersion, versionIntroducedIfExists) >= 0;
-                return doesExistInSelectedVersion;
-            } else {
-                return true;
-            }
-        });
-        return finalMenu;
+        return this._docsInfo.menu;
     }
     public getMenuSubsectionsBySection(docAgnosticFormat?: DocAgnosticFormat): MenuSubsectionsBySection {
         const menuSubsectionsBySection = {} as MenuSubsectionsBySection;
@@ -96,12 +67,18 @@ export class DocsInfo {
                     const sortedEventNames = _.sortBy(docSection.events, 'name');
                     eventNames = _.map(sortedEventNames, m => m.name);
                 }
-                const sortedMethodNames = _.sortBy(docSection.methods, 'name');
-                const methodNames = _.map(sortedMethodNames, m => m.name);
-                menuSubsectionsBySection[sectionName] = [...methodNames, ...eventNames];
+                const propertiesSortedByName = _.sortBy(docSection.properties, 'name');
+                const propertyNames = _.map(propertiesSortedByName, m => m.name);
+                const methodsSortedByName = _.sortBy(docSection.methods, 'name');
+                const methodNames = _.map(methodsSortedByName, m => m.name);
                 const sortedFunctionNames = _.sortBy(docSection.functions, 'name');
                 const functionNames = _.map(sortedFunctionNames, m => m.name);
-                menuSubsectionsBySection[sectionName] = [...eventNames, ...functionNames, ...methodNames];
+                menuSubsectionsBySection[sectionName] = [
+                    ...eventNames,
+                    ...propertyNames,
+                    ...functionNames,
+                    ...methodNames,
+                ];
             }
         });
         return menuSubsectionsBySection;
@@ -115,14 +92,11 @@ export class DocsInfo {
         const typeDefinitionByName = _.keyBy(typeDocSection.types, 'name') as any;
         return typeDefinitionByName;
     }
-    public isVisibleConstructor(sectionName: string): boolean {
-        return _.includes(this._docsInfo.visibleConstructors, sectionName);
-    }
-    public convertToDocAgnosticFormat(docObj: DoxityDocObj | TypeDocNode): DocAgnosticFormat {
+    public convertToDocAgnosticFormat(docObj: DoxityDocObj | GeneratedDocJson): DocAgnosticFormat {
         if (this.type === SupportedDocJson.Doxity) {
             return doxityUtils.convertToDocAgnosticFormat(docObj as DoxityDocObj);
         } else {
-            return typeDocUtils.convertToDocAgnosticFormat(docObj as TypeDocNode, this);
+            return typeDocUtils.convertToDocAgnosticFormat(docObj as GeneratedDocJson, this);
         }
     }
 }
diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts
index 30f5011b7..e4424f679 100644
--- a/packages/react-docs/src/index.ts
+++ b/packages/react-docs/src/index.ts
@@ -15,6 +15,14 @@ export { Type } from './components/type';
 
 export { DocsInfo } from './docs_info';
 
-export { DocsInfoConfig, DocAgnosticFormat, DoxityDocObj, DocsMenu, SupportedDocJson, TypeDocNode } from './types';
+export {
+    DocsInfoConfig,
+    DocAgnosticFormat,
+    DoxityDocObj,
+    DocsMenu,
+    SupportedDocJson,
+    TypeDocNode,
+    GeneratedDocJson,
+} from './types';
 
 export { constants } from './utils/constants';
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index cbc774c2e..83ad157d1 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -10,18 +10,13 @@ export interface DocsInfoConfig {
     menu: DocsMenu;
     sections: SectionsMap;
     sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
-    visibleConstructors: string[];
-    sectionNameToModulePath?: { [sectionName: string]: string[] };
-    menuSubsectionToVersionWhenIntroduced?: { [sectionName: string]: string };
     contractsByVersionByNetworkId?: ContractsByVersionByNetworkId;
     typeConfigs?: DocsInfoTypeConfigs;
 }
 
 export interface DocsInfoTypeConfigs {
     typeNameToExternalLink?: { [typeName: string]: string };
-    publicTypes?: string[];
     typeNameToPrefix?: { [typeName: string]: string };
-    typeNameToDocSection?: { [typeName: string]: string };
 }
 
 export interface DocsMenu {
@@ -292,3 +287,17 @@ export enum AbiTypes {
     Function = 'function',
     Event = 'event',
 }
+
+export interface ExportNameToTypedocName {
+    [exportName: string]: string;
+}
+
+export interface Metadata {
+    exportPathToTypedocName: ExportNameToTypedocName;
+    exportPathOrder: string[];
+}
+
+export interface GeneratedDocJson {
+    metadata: Metadata;
+    typedocJson: TypeDocNode;
+}
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index a6d938e94..1e7c29ce8 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -19,8 +19,11 @@ import {
     TypeParameter,
     TypescriptFunction,
     TypescriptMethod,
+    GeneratedDocJson,
 } from '../types';
 
+import { constants } from './constants';
+
 export const typeDocUtils = {
     isType(entity: TypeDocNode): boolean {
         return (
@@ -55,62 +58,68 @@ export const typeDocUtils = {
         });
         return moduleDefinitions;
     },
-    convertToDocAgnosticFormat(typeDocJson: TypeDocNode, docsInfo: DocsInfo): DocAgnosticFormat {
-        const subMenus = _.values(docsInfo.getMenu());
-        const orderedSectionNames = _.flatten(subMenus);
+    convertToDocAgnosticFormat(generatedDocJson: GeneratedDocJson, docsInfo: DocsInfo): DocAgnosticFormat {
+        const exportPathOrder = generatedDocJson.metadata.exportPathOrder;
+        const exportPathToTypedocName = generatedDocJson.metadata.exportPathToTypedocName;
+        const typeDocJson = generatedDocJson.typedocJson;
+
+        const typeDocNameOrder = _.map(exportPathOrder, exportPath => {
+            return exportPathToTypedocName[exportPath];
+        });
+
         const docAgnosticFormat: DocAgnosticFormat = {};
-        _.each(orderedSectionNames, sectionName => {
-            const modulePathsIfExists = docsInfo.getModulePathsIfExists(sectionName);
-            if (_.isUndefined(modulePathsIfExists)) {
-                return; // no-op
-            }
-            const packageDefinitions = typeDocUtils.getModuleDefinitionsBySectionName(typeDocJson, modulePathsIfExists);
-            let packageDefinitionWithMergedChildren;
-            if (_.isEmpty(packageDefinitions)) {
-                return; // no-op
-            } else if (packageDefinitions.length === 1) {
-                packageDefinitionWithMergedChildren = packageDefinitions[0];
-            } else {
-                // HACK: For now, if there are two modules to display in a single section,
-                // we simply concat the children. This works for our limited use-case where
-                // we want to display types stored in two files under a single section
-                packageDefinitionWithMergedChildren = packageDefinitions[0];
-                for (let i = 1; i < packageDefinitions.length; i++) {
-                    packageDefinitionWithMergedChildren.children = [
-                        ...packageDefinitionWithMergedChildren.children,
-                        ...packageDefinitions[i].children,
-                    ];
+        const typeEntities: TypeDocNode[] = [];
+        _.each(typeDocNameOrder, typeDocName => {
+            const fileChildIndex = _.findIndex(typeDocJson.children, child => child.name === typeDocName);
+            const fileChild = typeDocJson.children[fileChildIndex];
+            let sectionName: string;
+            _.each(fileChild.children, (child, j) => {
+                switch (child.kindString) {
+                    case KindString.Class:
+                    case KindString.ObjectLiteral: {
+                        sectionName = child.name;
+                        docsInfo.sections[sectionName] = sectionName;
+                        docsInfo.menu[sectionName] = [sectionName];
+                        const entities = child.children;
+                        const commentObj = child.comment;
+                        const sectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
+                        const docSection = typeDocUtils._convertEntitiesToDocSection(entities, docsInfo, sectionName);
+                        docSection.comment = sectionComment;
+                        docAgnosticFormat[sectionName] = docSection;
+                        break;
+                    }
+                    case KindString.Function: {
+                        sectionName = child.name;
+                        docsInfo.sections[sectionName] = sectionName;
+                        docsInfo.menu[sectionName] = [sectionName];
+                        const entities = [child];
+                        const commentObj = child.comment;
+                        const SectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
+                        const docSection = typeDocUtils._convertEntitiesToDocSection(entities, docsInfo, sectionName);
+                        docSection.comment = SectionComment;
+                        docAgnosticFormat[sectionName] = docSection;
+                        break;
+                    }
+                    case KindString.Interface:
+                    case KindString.Variable:
+                    case KindString.Enumeration:
+                    case KindString.TypeAlias:
+                        typeEntities.push(child);
+                        break;
+                    default:
+                        throw errorUtils.spawnSwitchErr('kindString', child.kindString);
                 }
-            }
-
-            let entities;
-            let packageComment = '';
-            // HACK: We assume 1 exported class per file
-            const classChildren = _.filter(packageDefinitionWithMergedChildren.children, (child: TypeDocNode) => {
-                return child.kindString === KindString.Class;
             });
-            if (classChildren.length > 1 && sectionName !== 'types') {
-                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;
-            }
-
-            const docSection = typeDocUtils._convertEntitiesToDocSection(entities, docsInfo, sectionName);
-            docSection.comment = packageComment;
-            docAgnosticFormat[sectionName] = docSection;
         });
+        docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
+        docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
+        const docSection = typeDocUtils._convertEntitiesToDocSection(
+            typeEntities,
+            docsInfo,
+            constants.TYPES_SECTION_NAME,
+        );
+        docAgnosticFormat[constants.TYPES_SECTION_NAME] = docSection;
+
         return docAgnosticFormat;
     },
     _convertEntitiesToDocSection(entities: TypeDocNode[], docsInfo: DocsInfo, sectionName: string): DocSection {
@@ -175,18 +184,16 @@ export const typeDocUtils = {
                 case KindString.Variable:
                 case KindString.Enumeration:
                 case KindString.TypeAlias:
-                    if (docsInfo.isPublicType(entity.name)) {
-                        const customType = typeDocUtils._convertCustomType(
-                            entity,
-                            docsInfo.sections,
-                            sectionName,
-                            docsInfo.id,
-                        );
-                        const seenTypeNames = _.map(docSection.types, t => t.name);
-                        const isUnseen = !_.includes(seenTypeNames, customType.name);
-                        if (isUnseen) {
-                            docSection.types.push(customType);
-                        }
+                    const customType = typeDocUtils._convertCustomType(
+                        entity,
+                        docsInfo.sections,
+                        sectionName,
+                        docsInfo.id,
+                    );
+                    const seenTypeNames = _.map(docSection.types, t => t.name);
+                    const isUnseen = !_.includes(seenTypeNames, customType.name);
+                    if (isUnseen) {
+                        docSection.types.push(customType);
                     }
                     break;
 
-- 
cgit v1.2.3


From 5e3bbbbb3c5be91be7c81f92f42e34edd02ea264 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 1 Aug 2018 18:56:31 +0200
Subject: Use our fork of react-scroll that fixes scrolling within an
 absolutely positioned div to work correctly.  See:
 https://github.com/fisshy/react-scroll/pull/330

---
 packages/react-docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index c95051bde..f6d829cdf 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -49,7 +49,7 @@
         "react": "15.6.1",
         "react-dom": "15.6.1",
         "react-markdown": "^3.2.2",
-        "react-scroll": "^1.7.10",
+        "react-scroll": "0xproject/react-scroll#similar-to-pr-330",
         "react-tooltip": "^3.2.7",
         "semver": "5.5.0"
     },
-- 
cgit v1.2.3


From 32e1c2ac970069f5251bd3cd7a31072f0547cf2c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 1 Aug 2018 19:02:20 +0200
Subject: Add padding above anchor titles so they show up nice when scrolled to

---
 packages/react-docs/src/components/property_block.tsx  | 2 +-
 packages/react-docs/src/components/type_definition.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
index 6e7f90c6c..466082a91 100644
--- a/packages/react-docs/src/components/property_block.tsx
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -34,7 +34,7 @@ export class PropertyBlock extends React.Component<PropertyBlockProps, PropertyB
         return (
             <div
                 id={`${this.props.sectionName}-${property.name}`}
-                className="pb4"
+                className="pb4 pt2"
                 key={`property-${property.name}-${property.type.name}`}
                 onMouseOver={this._setAnchorVisibility.bind(this, true)}
                 onMouseOut={this._setAnchorVisibility.bind(this, false)}
diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index a23f27181..26fbbf75c 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -100,7 +100,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
         return (
             <div
                 id={this.props.shouldAddId ? typeDefinitionAnchorId : ''}
-                className="pb2"
+                className="pb2 pt2"
                 style={{ overflow: 'hidden', width: '100%' }}
                 onMouseOver={this._setAnchorVisibility.bind(this, true)}
                 onMouseOut={this._setAnchorVisibility.bind(this, false)}
-- 
cgit v1.2.3


From e5b93d1f0292cb6cc38d3f92d623b27cba6ac233 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 1 Aug 2018 20:48:19 +0200
Subject: Add callpath to properties

---
 .../react-docs/src/components/property_block.tsx   |  2 +-
 packages/react-docs/src/types.ts                   |  1 +
 packages/react-docs/src/utils/typedoc_utils.ts     | 39 +++++++++++++---------
 3 files changed, 25 insertions(+), 17 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
index 466082a91..074c59c5f 100644
--- a/packages/react-docs/src/components/property_block.tsx
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -48,7 +48,7 @@ export class PropertyBlock extends React.Component<PropertyBlockProps, PropertyB
                     />
                 </div>
                 <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
-                    {property.name}:{' '}
+                    {(property as any).callPath}{property.name}:{' '}
                     <Type type={property.type} sectionName={sectionName} docsInfo={this.props.docsInfo} />
                 </code>
                 {property.source && (
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 83ad157d1..ca869df1c 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -202,6 +202,7 @@ export interface Property {
     type: Type;
     source?: Source;
     comment?: string;
+    callPath?: string;
 }
 
 export interface BaseMethod {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 1e7c29ce8..1c685f915 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -283,6 +283,9 @@ export const typeDocUtils = {
     _convertProperty(entity: TypeDocNode, sections: SectionsMap, sectionName: string, docId: string): Property {
         const source = entity.sources[0];
         const commentIfExists = !_.isUndefined(entity.comment) ? entity.comment.shortText : undefined;
+        const isConstructor = false;
+        const isStatic = _.isUndefined(entity.flags.isStatic) ? false : entity.flags.isStatic;
+        const callPath = typeDocUtils._getCallPath(sectionName, sections, isStatic, isConstructor, docId, entity.name);
         const property = {
             name: entity.name,
             type: typeDocUtils._convertType(entity.type, sections, sectionName, docId),
@@ -291,6 +294,7 @@ export const typeDocUtils = {
                 line: source.line,
             },
             comment: commentIfExists,
+            callPath,
         };
         return property;
     },
@@ -306,22 +310,6 @@ export const typeDocUtils = {
         const hasComment = !_.isUndefined(signature.comment);
         const isStatic = _.isUndefined(entity.flags.isStatic) ? false : entity.flags.isStatic;
 
-        // HACK: we use the fact that the sectionName is the same as the property name at the top-level
-        // of the public interface. In the future, we shouldn't use this hack but rather get it from the JSON.
-        let callPath;
-        if (isConstructor || entity.name === '__type') {
-            callPath = '';
-            // TODO: Get rid of this 0x-specific logic
-        } else if (docId === 'ZERO_EX_JS') {
-            const topLevelInterface = isStatic ? 'ZeroEx.' : 'zeroEx.';
-            callPath =
-                !_.isUndefined(sections.zeroEx) && sectionName !== sections.zeroEx
-                    ? `${topLevelInterface}${sectionName}.`
-                    : topLevelInterface;
-        } else {
-            callPath = `${sectionName}.`;
-        }
-
         const parameters = _.map(signature.parameters, param => {
             return typeDocUtils._convertParameter(param, sections, sectionName, docId);
         });
@@ -330,6 +318,7 @@ export const typeDocUtils = {
             ? undefined
             : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId);
 
+        const callPath = typeDocUtils._getCallPath(sectionName, sections, isStatic, isConstructor, docId, entity.name);
         const method = {
             isConstructor,
             isStatic,
@@ -347,6 +336,24 @@ export const typeDocUtils = {
         };
         return method;
     },
+    _getCallPath(sectionName: string, sections: SectionsMap, isStatic: boolean, isConstructor: boolean, docId: string, entityName: string) {
+        // HACK: we use the fact that the sectionName is the same as the property name at the top-level
+        // of the public interface. In the future, we shouldn't use this hack but rather get it from the JSON.
+        let callPath;
+        if (isConstructor || entityName === '__type') {
+            callPath = '';
+            // TODO: Get rid of this 0x-specific logic
+        } else if (docId === 'ZERO_EX_JS') {
+            const topLevelInterface = isStatic ? 'ZeroEx.' : 'zeroEx.';
+            callPath =
+                !_.isUndefined(sections.zeroEx) && sectionName !== sections.zeroEx
+                    ? `${topLevelInterface}${sectionName}.`
+                    : topLevelInterface;
+        } else {
+            callPath = `${sectionName}.`;
+        }
+        return callPath;
+    },
     _convertFunction(
         entity: TypeDocNode,
         sections: SectionsMap,
-- 
cgit v1.2.3


From 2494af99aad4dd58c0d4e647dedf72946cb3c20b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 1 Aug 2018 21:00:45 +0200
Subject: Prefix menu and sections with markdown as that is all the should now
 be defined

---
 packages/react-docs/src/docs_info.ts | 9 ++-------
 packages/react-docs/src/types.ts     | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index dd3cb9a96..0637f3e65 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -28,21 +28,16 @@ export class DocsInfo {
     public sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
     public contractsByVersionByNetworkId?: ContractsByVersionByNetworkId;
     public typeConfigs: DocsInfoTypeConfigs;
-    private readonly _docsInfo: DocsInfoConfig;
     constructor(config: DocsInfoConfig) {
         this.id = config.id;
         this.type = config.type;
-        this.menu = config.menu;
+        this.menu = config.markdownMenu;
         this.displayName = config.displayName;
         this.packageUrl = config.packageUrl;
-        this.sections = config.sections;
+        this.sections = config.markdownSections;
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
         this.contractsByVersionByNetworkId = config.contractsByVersionByNetworkId;
         this.typeConfigs = config.typeConfigs;
-        this._docsInfo = config;
-    }
-    public getMenu(selectedVersion?: string): { [section: string]: string[] } {
-        return this._docsInfo.menu;
     }
     public getMenuSubsectionsBySection(docAgnosticFormat?: DocAgnosticFormat): MenuSubsectionsBySection {
         const menuSubsectionsBySection = {} as MenuSubsectionsBySection;
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index ca869df1c..aebd823db 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -7,8 +7,8 @@ export interface DocsInfoConfig {
     type: SupportedDocJson;
     displayName: string;
     packageUrl: string;
-    menu: DocsMenu;
-    sections: SectionsMap;
+    markdownMenu: DocsMenu;
+    markdownSections: SectionsMap;
     sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
     contractsByVersionByNetworkId?: ContractsByVersionByNetworkId;
     typeConfigs?: DocsInfoTypeConfigs;
-- 
cgit v1.2.3


From b3473ff89f4d276fe74dd8e62680ab975fe24639 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 2 Aug 2018 17:27:10 +0200
Subject: Remove unused var

---
 packages/react-docs/src/utils/typedoc_utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 1c685f915..e2b259b13 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -73,7 +73,7 @@ export const typeDocUtils = {
             const fileChildIndex = _.findIndex(typeDocJson.children, child => child.name === typeDocName);
             const fileChild = typeDocJson.children[fileChildIndex];
             let sectionName: string;
-            _.each(fileChild.children, (child, j) => {
+            _.each(fileChild.children, child => {
                 switch (child.kindString) {
                     case KindString.Class:
                     case KindString.ObjectLiteral: {
-- 
cgit v1.2.3


From 9a3b630b1989abbe1d6784f121fd0a60169e3012 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 2 Aug 2018 17:27:29 +0200
Subject: prettier

---
 packages/react-docs/src/utils/typedoc_utils.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index e2b259b13..35d28627f 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -336,7 +336,14 @@ export const typeDocUtils = {
         };
         return method;
     },
-    _getCallPath(sectionName: string, sections: SectionsMap, isStatic: boolean, isConstructor: boolean, docId: string, entityName: string) {
+    _getCallPath(
+        sectionName: string,
+        sections: SectionsMap,
+        isStatic: boolean,
+        isConstructor: boolean,
+        docId: string,
+        entityName: string,
+    ) {
         // HACK: we use the fact that the sectionName is the same as the property name at the top-level
         // of the public interface. In the future, we shouldn't use this hack but rather get it from the JSON.
         let callPath;
-- 
cgit v1.2.3


From 90ead59d34bf5218cf4e1e5317a4ffeb497da8e1 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 2 Aug 2018 21:09:18 +0200
Subject: Add support for rendering nested IndexSignatures

---
 packages/react-docs/src/components/interface.tsx |  8 ++--
 packages/react-docs/src/components/signature.tsx |  1 -
 packages/react-docs/src/components/type.tsx      | 45 ++++++++++++++------
 packages/react-docs/src/types.ts                 |  4 +-
 packages/react-docs/src/utils/typedoc_utils.ts   | 53 ++++++++++++++----------
 5 files changed, 71 insertions(+), 40 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index a881c7fec..915b4bbc6 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { CustomType, TypeDocTypes } from '../types';
+import { CustomType } from '../types';
 
 import { Signature } from './signature';
 import { Type } from './type';
@@ -19,9 +19,7 @@ export const Interface = (props: InterfaceProps) => {
         return (
             <span key={`property-${property.name}-${property.type}-${type.name}`}>
                 {property.name}:{' '}
-                {property.type && property.type.typeDocType !== TypeDocTypes.Reflection ? (
-                    <Type type={property.type} sectionName={props.sectionName} docsInfo={props.docsInfo} />
-                ) : (
+                {property.type && !_.isUndefined(property.type.method) ? (
                     <Signature
                         name={property.type.method.name}
                         returnType={property.type.method.returnType}
@@ -32,6 +30,8 @@ export const Interface = (props: InterfaceProps) => {
                         shouldUseArrowSyntax={true}
                         docsInfo={props.docsInfo}
                     />
+                ) : (
+                    <Type type={property.type} sectionName={props.sectionName} docsInfo={props.docsInfo} />
                 )},
             </span>
         );
diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index 5f28050d2..d9567c9f6 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -3,7 +3,6 @@ import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
 import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '../types';
-import { constants } from '../utils/constants';
 
 import { Type } from './type';
 
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 3504be303..ea66c7b1e 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -93,19 +93,38 @@ export function Type(props: TypeProps): any {
             break;
 
         case TypeDocTypes.Reflection:
-            typeName = (
-                <Signature
-                    name={type.method.name}
-                    returnType={type.method.returnType}
-                    parameters={type.method.parameters}
-                    typeParameter={type.method.typeParameter}
-                    sectionName={props.sectionName}
-                    shouldHideMethodName={true}
-                    shouldUseArrowSyntax={true}
-                    docsInfo={props.docsInfo}
-                    typeDefinitionByName={props.typeDefinitionByName}
-                />
-            );
+            if (!_.isUndefined(type.method)) {
+                typeName = (
+                    <Signature
+                        name={type.method.name}
+                        returnType={type.method.returnType}
+                        parameters={type.method.parameters}
+                        typeParameter={type.method.typeParameter}
+                        sectionName={props.sectionName}
+                        shouldHideMethodName={true}
+                        shouldUseArrowSyntax={true}
+                        docsInfo={props.docsInfo}
+                        typeDefinitionByName={props.typeDefinitionByName}
+                    />
+                );
+            } else if (!_.isUndefined(type.indexSignature)) {
+                const is = type.indexSignature;
+                const param = (
+                    <span key={`indexSigParams-${is.keyName}-${is.keyType}-${type.name}`}>
+                        {is.keyName}:{' '}
+                        <Type type={is.keyType} sectionName={props.sectionName} docsInfo={props.docsInfo} />
+                    </span>
+                );
+                typeName = (
+                    <span key={`indexSignature-${type.name}-${is.keyType.name}`}>
+                        {'{'}[{param}]: {is.valueName}
+                        {'}'}
+                    </span>
+                );
+            } else {
+                throw new Error(`Unrecognized Reflection type that isn't a Method nor an Index Signature`);
+            }
+
             break;
 
         case TypeDocTypes.TypeParameter:
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index aebd823db..79dfe9f4f 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -35,6 +35,7 @@ export interface TypeDocType {
     typeArguments?: TypeDocType[];
     declaration: TypeDocNode;
     elementType?: TypeDocType;
+    indexSignature?: TypeDocNode;
 }
 
 export interface TypeDocFlags {
@@ -64,7 +65,7 @@ export interface TypeDocNode {
     returns?: string;
     declaration: TypeDocNode;
     flags?: TypeDocFlags;
-    indexSignature?: TypeDocNode | TypeDocNode[]; // TypeDocNode in TypeDoc <V0.9.0, TypeDocNode[] in >V0.9.0
+    indexSignature?: TypeDocNode;
     signatures?: TypeDocNode[];
     parameters?: TypeDocNode[];
     typeParameter?: TypeDocNode[];
@@ -156,6 +157,7 @@ export interface Type {
     elementType?: ElementType;
     types?: Type[];
     method?: TypescriptMethod;
+    indexSignature?: IndexSignature;
 }
 
 export interface ElementType {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 35d28627f..f1f42c36d 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -63,9 +63,12 @@ export const typeDocUtils = {
         const exportPathToTypedocName = generatedDocJson.metadata.exportPathToTypedocName;
         const typeDocJson = generatedDocJson.typedocJson;
 
-        const typeDocNameOrder = _.map(exportPathOrder, exportPath => {
-            return exportPathToTypedocName[exportPath];
-        });
+        // TODO: Extract the non typeDoc exports, and render them somehow
+        const typeDocNameOrder = _.compact(
+            _.map(exportPathOrder, exportPath => {
+                return exportPathToTypedocName[exportPath];
+            }),
+        );
 
         const docAgnosticFormat: DocAgnosticFormat = {};
         const typeEntities: TypeDocNode[] = [];
@@ -111,14 +114,16 @@ export const typeDocUtils = {
                 }
             });
         });
-        docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
-        docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
-        const docSection = typeDocUtils._convertEntitiesToDocSection(
-            typeEntities,
-            docsInfo,
-            constants.TYPES_SECTION_NAME,
-        );
-        docAgnosticFormat[constants.TYPES_SECTION_NAME] = docSection;
+        if (!_.isEmpty(typeEntities)) {
+            docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
+            docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
+            const docSection = typeDocUtils._convertEntitiesToDocSection(
+                typeEntities,
+                docsInfo,
+                constants.TYPES_SECTION_NAME,
+            );
+            docAgnosticFormat[constants.TYPES_SECTION_NAME] = docSection;
+        }
 
         return docAgnosticFormat;
     },
@@ -218,13 +223,7 @@ export const typeDocUtils = {
             ? typeDocUtils._convertMethod(entity.declaration, isConstructor, sections, sectionName, docId)
             : undefined;
         const doesIndexSignatureExist = !_.isUndefined(entity.indexSignature);
-        const isIndexSignatureArray = _.isArray(entity.indexSignature);
-        // HACK: TypeDoc Versions <0.9.0 indexSignature is of type TypeDocNode[]
-        // Versions >0.9.0 have it as type TypeDocNode
-        const indexSignature =
-            doesIndexSignatureExist && isIndexSignatureArray
-                ? (entity.indexSignature as TypeDocNode[])[0]
-                : (entity.indexSignature as TypeDocNode);
+        const indexSignature = entity.indexSignature as TypeDocNode;
         const indexSignatureIfExists = doesIndexSignatureExist
             ? typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId)
             : undefined;
@@ -305,6 +304,9 @@ export const typeDocUtils = {
         sectionName: string,
         docId: string,
     ): TypescriptMethod {
+        if (_.isUndefined(entity.signatures)) {
+            console.log(entity);
+        }
         const signature = entity.signatures[0];
         const source = entity.sources[0];
         const hasComment = !_.isUndefined(signature.comment);
@@ -436,9 +438,17 @@ export const typeDocUtils = {
         });
 
         const isConstructor = false;
-        const methodIfExists = !_.isUndefined(entity.declaration)
-            ? typeDocUtils._convertMethod(entity.declaration, isConstructor, sections, sectionName, docId)
-            : undefined;
+        const doesIndexSignatureExist =
+            !_.isUndefined(entity.declaration) && !_.isUndefined(entity.declaration.indexSignature);
+        let indexSignatureIfExists;
+        if (doesIndexSignatureExist) {
+            const indexSignature = entity.declaration.indexSignature as TypeDocNode;
+            indexSignatureIfExists = typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId);
+        }
+        const methodIfExists =
+            !_.isUndefined(entity.declaration) && !doesIndexSignatureExist
+                ? typeDocUtils._convertMethod(entity.declaration, isConstructor, sections, sectionName, docId)
+                : undefined;
 
         const elementTypeIfExists = !_.isUndefined(entity.elementType)
             ? {
@@ -455,6 +465,7 @@ export const typeDocUtils = {
             elementType: elementTypeIfExists,
             types,
             method: methodIfExists,
+            indexSignature: indexSignatureIfExists,
         };
         return type;
     },
-- 
cgit v1.2.3


From 4a2a22a43b5d904834cddae5768d9adf3efedf30 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 3 Aug 2018 11:44:50 +0200
Subject: Refactor logic for clarity

---
 packages/react-docs/src/utils/typedoc_utils.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index f1f42c36d..ad794c0fa 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -437,18 +437,23 @@ export const typeDocUtils = {
             return typeDocUtils._convertType(t, sections, sectionName, docId);
         });
 
-        const isConstructor = false;
+        let indexSignatureIfExists;
+        let methodIfExists;
         const doesIndexSignatureExist =
             !_.isUndefined(entity.declaration) && !_.isUndefined(entity.declaration.indexSignature);
-        let indexSignatureIfExists;
         if (doesIndexSignatureExist) {
             const indexSignature = entity.declaration.indexSignature as TypeDocNode;
             indexSignatureIfExists = typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId);
+        } else if (!_.isUndefined(entity.declaration)) {
+            const isConstructor = false;
+            methodIfExists = typeDocUtils._convertMethod(
+                entity.declaration,
+                isConstructor,
+                sections,
+                sectionName,
+                docId,
+            );
         }
-        const methodIfExists =
-            !_.isUndefined(entity.declaration) && !doesIndexSignatureExist
-                ? typeDocUtils._convertMethod(entity.declaration, isConstructor, sections, sectionName, docId)
-                : undefined;
 
         const elementTypeIfExists = !_.isUndefined(entity.elementType)
             ? {
-- 
cgit v1.2.3


From d136df7679b85eff054178ae8103ecd1f3b324f9 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 3 Aug 2018 13:02:14 +0200
Subject: Color-code basic type arrays orange aswell

---
 packages/react-docs/src/components/type.tsx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index ea66c7b1e..40564c0d6 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -12,6 +12,8 @@ import { Signature } from './signature';
 import { constants } from '../utils/constants';
 import { TypeDefinition } from './type_definition';
 
+const basicJsTypes = ['string', 'number', 'undefined', 'null', 'boolean'];
+
 export interface TypeProps {
     type: TypeDef;
     docsInfo: DocsInfo;
@@ -73,6 +75,9 @@ export function Type(props: TypeProps): any {
 
         case TypeDocTypes.Array:
             typeName = type.elementType.name;
+            if (_.includes(basicJsTypes, typeName)) {
+                typeNameColor = colors.orange;
+            }
             break;
 
         case TypeDocTypes.Union:
-- 
cgit v1.2.3


From b8c8258404fa7959b71dd9e87fba16d32b57a868 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 3 Aug 2018 17:13:38 +0200
Subject: Don't render object literal properties that start with underscore
 since are private

---
 packages/react-docs/src/components/property_block.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
index 074c59c5f..ea80ba7b7 100644
--- a/packages/react-docs/src/components/property_block.tsx
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -48,7 +48,8 @@ export class PropertyBlock extends React.Component<PropertyBlockProps, PropertyB
                     />
                 </div>
                 <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
-                    {(property as any).callPath}{property.name}:{' '}
+                    {(property as any).callPath}
+                    {property.name}:{' '}
                     <Type type={property.type} sectionName={sectionName} docsInfo={this.props.docsInfo} />
                 </code>
                 {property.source && (
-- 
cgit v1.2.3


From 0d3d9dad846d01e84be3b52d48bfabd9e1853b66 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 3 Aug 2018 17:14:14 +0200
Subject: Don't process functions beginning with underscores

---
 packages/react-docs/src/utils/typedoc_utils.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index ad794c0fa..b74b9562b 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -154,8 +154,17 @@ export const typeDocUtils = {
 
                 case KindString.Function:
                     if (entity.flags.isExported) {
-                        const func = typeDocUtils._convertFunction(entity, docsInfo.sections, sectionName, docsInfo.id);
-                        docSection.functions.push(func);
+                        const funcName = (entity as TypeDocNode).signatures[0].name;
+                        const isPublicFunc = !_.startsWith(funcName, '_');
+                        if (isPublicFunc) {
+                            const func = typeDocUtils._convertFunction(
+                                entity,
+                                docsInfo.sections,
+                                sectionName,
+                                docsInfo.id,
+                            );
+                            docSection.functions.push(func);
+                        }
                     }
                     break;
 
-- 
cgit v1.2.3


From 0e82be1bdad10fda083b360aecf548d9e948ed86 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 3 Aug 2018 17:18:18 +0200
Subject: Remove react-docs-example package and links to it

---
 packages/react-docs/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md
index c0efc4a0b..5d56207de 100644
--- a/packages/react-docs/README.md
+++ b/packages/react-docs/README.md
@@ -1,6 +1,8 @@
 ## @0xproject/react-docs
 
-A full-page React component for rendering beautiful documentation for Solidity and Typescript code generated with [TypeDoc](http://typedoc.org/) or [Doxity](https://github.com/0xproject/doxity). See a [live example](http://react-docs-example.s3-website-us-east-1.amazonaws.com/).
+#### WARNING: Alpha software. Expect things to break when trying to use.
+
+A full-page React component for rendering beautiful documentation for Solidity and Typescript code generated with [TypeDoc](http://typedoc.org/) or [Doxity](https://github.com/0xproject/doxity).
 
 <div style="text-align: center;">
 <img src="https://s3.eu-west-2.amazonaws.com/0x-wiki-images/screenshot.png" style="padding-bottom: 20px; padding-top: 20px;" width="80%" />
@@ -27,8 +29,6 @@ yarn add @0xproject/react-docs
 
 ## Usage
 
-View the [live example](http://react-docs-example.s3-website-us-east-1.amazonaws.com/) that renders the [@0xproject/web3-wrapper](https://github.com/0xProject/0x-monorepo/tree/development/packages/web3-wrapper) Typescript package. It's source code is in the [react-docs-example](https://github.com/0xProject/0x-monorepo/tree/development/packages/react-docs-example) 0x monorepo subpackage.
-
 This package exposes both a single `Documentation` react component that will render a docs page, as well as all of it's sub-components in case someone wants to build their own layout.
 
 Currently this package still has some external dependencies outside of the `Documentation` component, so please start your project off by copying the [react-docs-example](https://github.com/0xProject/0x-monorepo/tree/development/packages/react-docs-example) directory and modifying it there. If you need changes in the [react-docs](https://github.com/0xProject/0x-monorepo/tree/development/packages/react-docs) package, fork the 0x monorepo, make the required changes and submit a PR. Until we merge it, you can have your project depend on your own custom fork.
-- 
cgit v1.2.3


From c17d6c47c3253cf32c2dada8f7f871563f7209e9 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 3 Aug 2018 19:24:58 +0200
Subject: Properly render class/objectLiteral properties that are simple
 variables

---
 packages/react-docs/src/utils/typedoc_utils.ts | 42 ++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index b74b9562b..2eee2fa59 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -86,7 +86,13 @@ export const typeDocUtils = {
                         const entities = child.children;
                         const commentObj = child.comment;
                         const sectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
-                        const docSection = typeDocUtils._convertEntitiesToDocSection(entities, docsInfo, sectionName);
+                        const isClassOrObjectLiteral = true;
+                        const docSection = typeDocUtils._convertEntitiesToDocSection(
+                            entities,
+                            docsInfo,
+                            sectionName,
+                            isClassOrObjectLiteral,
+                        );
                         docSection.comment = sectionComment;
                         docAgnosticFormat[sectionName] = docSection;
                         break;
@@ -127,7 +133,12 @@ export const typeDocUtils = {
 
         return docAgnosticFormat;
     },
-    _convertEntitiesToDocSection(entities: TypeDocNode[], docsInfo: DocsInfo, sectionName: string): DocSection {
+    _convertEntitiesToDocSection(
+        entities: TypeDocNode[],
+        docsInfo: DocsInfo,
+        sectionName: string,
+        isClassOrObjectLiteral: boolean = false,
+    ): DocSection {
         const docSection: DocSection = {
             comment: '',
             constructors: [],
@@ -194,6 +205,32 @@ export const typeDocUtils = {
                     }
                     break;
 
+                case KindString.Variable:
+                    if (isClassOrObjectLiteral) {
+                        // Render as a property
+                        const property = typeDocUtils._convertProperty(
+                            entity,
+                            docsInfo.sections,
+                            sectionName,
+                            docsInfo.id,
+                        );
+                        docSection.properties.push(property);
+                    } else {
+                        // Otherwise, render as a type
+                        const customType = typeDocUtils._convertCustomType(
+                            entity,
+                            docsInfo.sections,
+                            sectionName,
+                            docsInfo.id,
+                        );
+                        const seenTypeNames = _.map(docSection.types, t => t.name);
+                        const isUnseen = !_.includes(seenTypeNames, customType.name);
+                        if (isUnseen) {
+                            docSection.types.push(customType);
+                        }
+                    }
+                    break;
+
                 case KindString.Interface:
                 case KindString.Variable:
                 case KindString.Enumeration:
@@ -221,6 +258,7 @@ export const typeDocUtils = {
                     throw errorUtils.spawnSwitchErr('kindString', entity.kindString);
             }
         });
+        console.log('docSection', docSection);
         return docSection;
     },
     _convertCustomType(entity: TypeDocNode, sections: SectionsMap, sectionName: string, docId: string): CustomType {
-- 
cgit v1.2.3


From d9f09b5e1e7ecc8dc56ac7184cfc0152b3c2ff32 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 3 Aug 2018 19:45:09 +0200
Subject: Make rendering of individually exported functions lighter-weight

---
 packages/react-docs/src/components/documentation.tsx | 10 +++++++++-
 packages/react-docs/src/docs_info.ts                 | 11 +++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 4f776b237..5393652d4 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -211,6 +211,14 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
             return null;
         }
 
+        const isExportedFunctionSection =
+            docSection.functions.length === 1 &&
+            _.isEmpty(docSection.types) &&
+            _.isEmpty(docSection.methods) &&
+            _.isEmpty(docSection.constructors) &&
+            _.isEmpty(docSection.properties) &&
+            _.isEmpty(docSection.events);
+
         const sortedTypes = _.sortBy(docSection.types, 'name');
         const typeDefs = _.map(sortedTypes, customType => {
             return (
@@ -279,7 +287,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                 )}
                 {!_.isEmpty(docSection.functions) && (
                     <div>
-                        <h2 style={headerStyle}>Functions</h2>
+                        {!isExportedFunctionSection && <h2 style={headerStyle}>Functions</h2>}
                         <div>{functionDefs}</div>
                     </div>
                 )}
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 0637f3e65..36a6a7301 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -52,10 +52,20 @@ export class DocsInfo {
                 return; // no-op
             }
 
+            const isExportedFunctionSection =
+                docSection.functions.length === 1 &&
+                _.isEmpty(docSection.types) &&
+                _.isEmpty(docSection.methods) &&
+                _.isEmpty(docSection.constructors) &&
+                _.isEmpty(docSection.properties) &&
+                _.isEmpty(docSection.events);
+
             if (!_.isUndefined(this.sections.types) && sectionName === this.sections.types) {
                 const sortedTypesNames = _.sortBy(docSection.types, 'name');
                 const typeNames = _.map(sortedTypesNames, t => t.name);
                 menuSubsectionsBySection[sectionName] = typeNames;
+            } else if (isExportedFunctionSection) {
+                // Noop so that we don't have the method listed underneath itself.
             } else {
                 let eventNames: string[] = [];
                 if (!_.isUndefined(docSection.events)) {
@@ -76,6 +86,7 @@ export class DocsInfo {
                 ];
             }
         });
+        console.log('menuSubsectionsBySection', menuSubsectionsBySection);
         return menuSubsectionsBySection;
     }
     public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
-- 
cgit v1.2.3


From 4527e9ce000d3eafcd55552df0809ea31271ba89 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sat, 4 Aug 2018 10:09:59 +0200
Subject: Remove prefix hack and add prefix for objectLiteral functions

---
 packages/react-docs/src/types.ts               |  1 +
 packages/react-docs/src/utils/typedoc_utils.ts | 31 ++++++++++++--------------
 2 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 79dfe9f4f..a34e06c94 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -124,6 +124,7 @@ export interface TypescriptMethod extends BaseMethod {
 export interface TypescriptFunction extends BaseFunction {
     source?: Source;
     typeParameter?: TypeParameter;
+    callPath: string;
 }
 
 export interface SolidityMethod extends BaseMethod {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 2eee2fa59..b1d9850ef 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -173,6 +173,7 @@ export const typeDocUtils = {
                                 docsInfo.sections,
                                 sectionName,
                                 docsInfo.id,
+                                isClassOrObjectLiteral,
                             );
                             docSection.functions.push(func);
                         }
@@ -331,7 +332,7 @@ export const typeDocUtils = {
         const commentIfExists = !_.isUndefined(entity.comment) ? entity.comment.shortText : undefined;
         const isConstructor = false;
         const isStatic = _.isUndefined(entity.flags.isStatic) ? false : entity.flags.isStatic;
-        const callPath = typeDocUtils._getCallPath(sectionName, sections, isStatic, isConstructor, docId, entity.name);
+        const callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
         const property = {
             name: entity.name,
             type: typeDocUtils._convertType(entity.type, sections, sectionName, docId),
@@ -367,7 +368,7 @@ export const typeDocUtils = {
             ? undefined
             : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId);
 
-        const callPath = typeDocUtils._getCallPath(sectionName, sections, isStatic, isConstructor, docId, entity.name);
+        const callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
         const method = {
             isConstructor,
             isStatic,
@@ -385,28 +386,16 @@ export const typeDocUtils = {
         };
         return method;
     },
-    _getCallPath(
-        sectionName: string,
-        sections: SectionsMap,
-        isStatic: boolean,
-        isConstructor: boolean,
-        docId: string,
-        entityName: string,
-    ) {
+    _getCallPath(sectionName: string, isStatic: boolean, isConstructor: boolean, entityName: string) {
         // HACK: we use the fact that the sectionName is the same as the property name at the top-level
         // of the public interface. In the future, we shouldn't use this hack but rather get it from the JSON.
         let callPath;
         if (isConstructor || entityName === '__type') {
             callPath = '';
             // TODO: Get rid of this 0x-specific logic
-        } else if (docId === 'ZERO_EX_JS') {
-            const topLevelInterface = isStatic ? 'ZeroEx.' : 'zeroEx.';
-            callPath =
-                !_.isUndefined(sections.zeroEx) && sectionName !== sections.zeroEx
-                    ? `${topLevelInterface}${sectionName}.`
-                    : topLevelInterface;
         } else {
-            callPath = `${sectionName}.`;
+            const prefix = isStatic ? sectionName : `${sectionName[0].toLowerCase()}${sectionName.slice(1)}`;
+            callPath = `${prefix}.`;
         }
         return callPath;
     },
@@ -415,6 +404,7 @@ export const typeDocUtils = {
         sections: SectionsMap,
         sectionName: string,
         docId: string,
+        isObjectLiteral: boolean,
     ): TypescriptFunction {
         const signature = entity.signatures[0];
         const source = entity.sources[0];
@@ -428,10 +418,17 @@ export const typeDocUtils = {
             ? undefined
             : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId);
 
+        let callPath = '';
+        if (isObjectLiteral) {
+            const isConstructor = false;
+            const isStatic = false;
+            callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
+        }
         const func = {
             name: signature.name,
             comment: hasComment ? signature.comment.shortText : undefined,
             returnComment: hasComment && signature.comment.returns ? signature.comment.returns : undefined,
+            callPath,
             source: {
                 fileName: source.fileName,
                 line: source.line,
-- 
cgit v1.2.3


From ff3c77f7c47475d77defecfeb894a8c86c003997 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 6 Aug 2018 10:48:18 -0400
Subject: Remove stray console.lgos

---
 packages/react-docs/src/docs_info.ts           | 1 -
 packages/react-docs/src/utils/typedoc_utils.ts | 4 ----
 2 files changed, 5 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 36a6a7301..4267d8a98 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -86,7 +86,6 @@ export class DocsInfo {
                 ];
             }
         });
-        console.log('menuSubsectionsBySection', menuSubsectionsBySection);
         return menuSubsectionsBySection;
     }
     public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index b1d9850ef..01385c982 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -259,7 +259,6 @@ export const typeDocUtils = {
                     throw errorUtils.spawnSwitchErr('kindString', entity.kindString);
             }
         });
-        console.log('docSection', docSection);
         return docSection;
     },
     _convertCustomType(entity: TypeDocNode, sections: SectionsMap, sectionName: string, docId: string): CustomType {
@@ -352,9 +351,6 @@ export const typeDocUtils = {
         sectionName: string,
         docId: string,
     ): TypescriptMethod {
-        if (_.isUndefined(entity.signatures)) {
-            console.log(entity);
-        }
         const signature = entity.signatures[0];
         const source = entity.sources[0];
         const hasComment = !_.isUndefined(signature.comment);
-- 
cgit v1.2.3


From ea5684e0546f25fa213dfb1a780941e4056a2128 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 6 Aug 2018 11:01:12 -0400
Subject: Remove unused imports

---
 packages/react-docs/src/components/documentation.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 5393652d4..d9a7dcd59 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -1,9 +1,7 @@
 import {
-    AnchorTitle,
     colors,
     constants as sharedConstants,
     EtherscanLinkSuffixes,
-    HeaderSizes,
     MarkdownSection,
     NestedSidebarMenu,
     Networks,
@@ -28,7 +26,6 @@ import {
     TypescriptFunction,
     TypescriptMethod,
 } from '../types';
-import { constants } from '../utils/constants';
 
 import { Badge } from './badge';
 import { Comment } from './comment';
@@ -186,6 +183,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
         const eligibleVersions = _.filter(markdownVersions, mdVersion => {
             return semver.lte(mdVersion, this.props.selectedVersion);
         });
+        console.log('this.props.selectedVersion', this.props.selectedVersion);
         if (_.isEmpty(eligibleVersions)) {
             throw new Error(
                 `No eligible markdown sections found for ${this.props.docsInfo.displayName} version ${
-- 
cgit v1.2.3


From fdcb42d8e17f4f5f324dd644077a07cbd4be65c7 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 6 Aug 2018 15:27:28 -0400
Subject: Fix bug where we only rendered one TypeDoc JSON key per export,
 instead of all of them

---
 packages/react-docs/src/utils/typedoc_utils.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 01385c982..9ee1de2b4 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -60,14 +60,16 @@ export const typeDocUtils = {
     },
     convertToDocAgnosticFormat(generatedDocJson: GeneratedDocJson, docsInfo: DocsInfo): DocAgnosticFormat {
         const exportPathOrder = generatedDocJson.metadata.exportPathOrder;
-        const exportPathToTypedocName = generatedDocJson.metadata.exportPathToTypedocName;
+        const exportPathToTypedocNames = generatedDocJson.metadata.exportPathToTypedocNames;
         const typeDocJson = generatedDocJson.typedocJson;
 
         // TODO: Extract the non typeDoc exports, and render them somehow
         const typeDocNameOrder = _.compact(
-            _.map(exportPathOrder, exportPath => {
-                return exportPathToTypedocName[exportPath];
-            }),
+            _.flatten(
+                _.map(exportPathOrder, exportPath => {
+                    return exportPathToTypedocNames[exportPath];
+                }),
+            ),
         );
 
         const docAgnosticFormat: DocAgnosticFormat = {};
@@ -121,6 +123,7 @@ export const typeDocUtils = {
             });
         });
         if (!_.isEmpty(typeEntities)) {
+            console.log('typeEntities', typeEntities);
             docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
             docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
             const docSection = typeDocUtils._convertEntitiesToDocSection(
-- 
cgit v1.2.3


From af90a777c6d6cdd59b4d398b6b0f5051047bc5d3 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 6 Aug 2018 15:27:39 -0400
Subject: Update types

---
 packages/react-docs/src/types.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index a34e06c94..18c386a2b 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -292,12 +292,12 @@ export enum AbiTypes {
     Event = 'event',
 }
 
-export interface ExportNameToTypedocName {
-    [exportName: string]: string;
+export interface ExportNameToTypedocNames {
+    [exportName: string]: string[];
 }
 
 export interface Metadata {
-    exportPathToTypedocName: ExportNameToTypedocName;
+    exportPathToTypedocNames: ExportNameToTypedocNames;
     exportPathOrder: string[];
 }
 
-- 
cgit v1.2.3


From 6182d2c7f60967a978f2b885e63fab067794b452 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 6 Aug 2018 15:28:21 -0400
Subject: Pass in typeDefinitionByName so that type declarations also link to
 inner-types and show the popover

---
 packages/react-docs/src/components/documentation.tsx  | 13 +++++++++++--
 packages/react-docs/src/components/interface.tsx      | 19 ++++++++++++++++---
 packages/react-docs/src/components/property_block.tsx | 10 ++++++++--
 packages/react-docs/src/components/type.tsx           |  8 +++++++-
 .../react-docs/src/components/type_definition.tsx     | 12 ++++++++++--
 5 files changed, 52 insertions(+), 10 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index d9a7dcd59..1c32b2e16 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -225,12 +225,16 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                     key={`type-${customType.name}`}
                     customType={customType}
                     docsInfo={this.props.docsInfo}
+                    typeDefinitionByName={typeDefinitionByName}
                 />
             );
         });
 
         const sortedProperties = _.sortBy(docSection.properties, 'name');
-        const propertyDefs = _.map(sortedProperties, this._renderProperty.bind(this, sectionName));
+        const propertyDefs = _.map(
+            sortedProperties,
+            this._renderProperty.bind(this, sectionName, typeDefinitionByName),
+        );
 
         const sortedMethods = _.sortBy(docSection.methods, 'name');
         const methodDefs = _.map(sortedMethods, method => {
@@ -349,7 +353,11 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
         });
         return <div>{constructorDefs}</div>;
     }
-    private _renderProperty(sectionName: string, property: Property): React.ReactNode {
+    private _renderProperty(
+        sectionName: string,
+        typeDefinitionByName: TypeDefinitionByName,
+        property: Property,
+    ): React.ReactNode {
         return (
             <PropertyBlock
                 key={`property-${property.name}-${property.type.name}`}
@@ -358,6 +366,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                 docsInfo={this.props.docsInfo}
                 sourceUrl={this.props.sourceUrl}
                 selectedVersion={this.props.selectedVersion}
+                typeDefinitionByName={typeDefinitionByName}
             />
         );
     }
diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index 915b4bbc6..eaf57ce93 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { CustomType } from '../types';
+import { CustomType, TypeDefinitionByName } from '../types';
 
 import { Signature } from './signature';
 import { Type } from './type';
@@ -11,6 +11,7 @@ export interface InterfaceProps {
     type: CustomType;
     sectionName: string;
     docsInfo: DocsInfo;
+    typeDefinitionByName: TypeDefinitionByName;
 }
 
 export const Interface = (props: InterfaceProps) => {
@@ -29,9 +30,15 @@ export const Interface = (props: InterfaceProps) => {
                         shouldHideMethodName={true}
                         shouldUseArrowSyntax={true}
                         docsInfo={props.docsInfo}
+                        typeDefinitionByName={props.typeDefinitionByName}
                     />
                 ) : (
-                    <Type type={property.type} sectionName={props.sectionName} docsInfo={props.docsInfo} />
+                    <Type
+                        type={property.type}
+                        sectionName={props.sectionName}
+                        docsInfo={props.docsInfo}
+                        typeDefinitionByName={props.typeDefinitionByName}
+                    />
                 )},
             </span>
         );
@@ -41,7 +48,13 @@ export const Interface = (props: InterfaceProps) => {
         const is = type.indexSignature;
         const param = (
             <span key={`indexSigParams-${is.keyName}-${is.keyType}-${type.name}`}>
-                {is.keyName}: <Type type={is.keyType} sectionName={props.sectionName} docsInfo={props.docsInfo} />
+                {is.keyName}:{' '}
+                <Type
+                    type={is.keyType}
+                    sectionName={props.sectionName}
+                    docsInfo={props.docsInfo}
+                    typeDefinitionByName={props.typeDefinitionByName}
+                />
             </span>
         );
         properties.push(
diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
index ea80ba7b7..6e5c451be 100644
--- a/packages/react-docs/src/components/property_block.tsx
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -2,7 +2,7 @@ import { AnchorTitle, HeaderSizes } from '@0xproject/react-shared';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { Property } from '../types';
+import { Property, TypeDefinitionByName } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
@@ -15,6 +15,7 @@ export interface PropertyBlockProps {
     docsInfo: DocsInfo;
     sourceUrl: string;
     selectedVersion: string;
+    typeDefinitionByName: TypeDefinitionByName;
 }
 
 export interface PropertyBlockState {
@@ -50,7 +51,12 @@ export class PropertyBlock extends React.Component<PropertyBlockProps, PropertyB
                 <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
                     {(property as any).callPath}
                     {property.name}:{' '}
-                    <Type type={property.type} sectionName={sectionName} docsInfo={this.props.docsInfo} />
+                    <Type
+                        type={property.type}
+                        sectionName={sectionName}
+                        docsInfo={this.props.docsInfo}
+                        typeDefinitionByName={this.props.typeDefinitionByName}
+                    />
                 </code>
                 {property.source && (
                     <SourceLink
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 40564c0d6..1c580caab 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -117,7 +117,12 @@ export function Type(props: TypeProps): any {
                 const param = (
                     <span key={`indexSigParams-${is.keyName}-${is.keyType}-${type.name}`}>
                         {is.keyName}:{' '}
-                        <Type type={is.keyType} sectionName={props.sectionName} docsInfo={props.docsInfo} />
+                        <Type
+                            type={is.keyType}
+                            sectionName={props.sectionName}
+                            docsInfo={props.docsInfo}
+                            typeDefinitionByName={props.typeDefinitionByName}
+                        />
                     </span>
                 );
                 typeName = (
@@ -222,6 +227,7 @@ export function Type(props: TypeProps): any {
                                 customType={typeDefinition}
                                 shouldAddId={false}
                                 docsInfo={props.docsInfo}
+                                typeDefinitionByName={props.typeDefinitionByName}
                             />
                         </ReactTooltip>
                     </span>
diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index 26fbbf75c..775d9890f 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -4,7 +4,7 @@ import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { CustomType, CustomTypeChild, KindString, TypeDocTypes } from '../types';
+import { CustomType, CustomTypeChild, KindString, TypeDocTypes, TypeDefinitionByName } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
@@ -19,6 +19,7 @@ export interface TypeDefinitionProps {
     customType: CustomType;
     shouldAddId?: boolean;
     docsInfo: DocsInfo;
+    typeDefinitionByName?: TypeDefinitionByName;
 }
 
 export interface TypeDefinitionState {
@@ -44,7 +45,12 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
             case KindString.Interface:
                 typePrefix = 'Interface';
                 codeSnippet = (
-                    <Interface type={customType} sectionName={this.props.sectionName} docsInfo={this.props.docsInfo} />
+                    <Interface
+                        type={customType}
+                        sectionName={this.props.sectionName}
+                        docsInfo={this.props.docsInfo}
+                        typeDefinitionByName={this.props.typeDefinitionByName}
+                    />
                 );
                 break;
 
@@ -74,6 +80,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                                 type={customType.type}
                                 sectionName={this.props.sectionName}
                                 docsInfo={this.props.docsInfo}
+                                typeDefinitionByName={this.props.typeDefinitionByName}
                             />
                         ) : (
                             <Signature
@@ -86,6 +93,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                                 shouldHideMethodName={true}
                                 shouldUseArrowSyntax={true}
                                 docsInfo={this.props.docsInfo}
+                                typeDefinitionByName={this.props.typeDefinitionByName}
                             />
                         )}
                     </span>
-- 
cgit v1.2.3


From b2b3c24fd231fd78b4af167ff0823d846e8859b4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 6 Aug 2018 15:39:11 -0400
Subject: Remove console.log

---
 packages/react-docs/src/components/documentation.tsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 1c32b2e16..f4f1d2aa9 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -183,7 +183,6 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
         const eligibleVersions = _.filter(markdownVersions, mdVersion => {
             return semver.lte(mdVersion, this.props.selectedVersion);
         });
-        console.log('this.props.selectedVersion', this.props.selectedVersion);
         if (_.isEmpty(eligibleVersions)) {
             throw new Error(
                 `No eligible markdown sections found for ${this.props.docsInfo.displayName} version ${
-- 
cgit v1.2.3


From 1a89905ab9602ccd81c5702bcc13246cd1f6960b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 6 Aug 2018 15:39:21 -0400
Subject: Remove hash spy for now

---
 packages/react-docs/src/components/type.tsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 1c580caab..7e96f75c3 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -204,7 +204,6 @@ export function Type(props: TypeProps): any {
             <ScrollLink
                 to={typeDefinitionAnchorId}
                 offset={0}
-                hashSpy={true}
                 duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
                 containerId={sharedConstants.DOCS_CONTAINER_ID}
             >
-- 
cgit v1.2.3


From ca67e7d36fb5eb91626a60156dbec4f67a7d52f7 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 8 Aug 2018 09:32:32 -0400
Subject: Remove console.log

---
 packages/react-docs/src/utils/typedoc_utils.ts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 9ee1de2b4..b45dc73a8 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -123,7 +123,6 @@ export const typeDocUtils = {
             });
         });
         if (!_.isEmpty(typeEntities)) {
-            console.log('typeEntities', typeEntities);
             docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
             docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
             const docSection = typeDocUtils._convertEntitiesToDocSection(
-- 
cgit v1.2.3


From 386b5bb122c189496e83da46cf53e8dfe83f0ee6 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 8 Aug 2018 09:33:20 -0400
Subject: Add back hashSpy

---
 packages/react-docs/src/components/type.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 7e96f75c3..1c580caab 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -204,6 +204,7 @@ export function Type(props: TypeProps): any {
             <ScrollLink
                 to={typeDefinitionAnchorId}
                 offset={0}
+                hashSpy={true}
                 duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
                 containerId={sharedConstants.DOCS_CONTAINER_ID}
             >
-- 
cgit v1.2.3


From cb5d8d75bf03910d1e763eb34907ada296ed3062 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 14 Aug 2018 17:24:48 -0700
Subject: Link class reference types exported in same package to their
 declaration

---
 .../react-docs/src/components/documentation.tsx    |   3 +-
 .../react-docs/src/components/event_definition.tsx |   7 +-
 packages/react-docs/src/components/interface.tsx   |  10 +-
 .../react-docs/src/components/property_block.tsx   |   3 +-
 packages/react-docs/src/components/signature.tsx   |  22 +++-
 .../react-docs/src/components/signature_block.tsx  |   1 +
 packages/react-docs/src/components/type.tsx        |  31 ++++--
 .../react-docs/src/components/type_definition.tsx  |   7 +-
 packages/react-docs/src/types.ts                   |   1 +
 packages/react-docs/src/utils/typedoc_utils.ts     | 122 ++++++++++++++++-----
 10 files changed, 163 insertions(+), 44 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index f4f1d2aa9..82e444018 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -30,8 +30,8 @@ import {
 import { Badge } from './badge';
 import { Comment } from './comment';
 import { EventDefinition } from './event_definition';
-import { SignatureBlock } from './signature_block';
 import { PropertyBlock } from './property_block';
+import { SignatureBlock } from './signature_block';
 import { TypeDefinition } from './type_definition';
 
 const networkNameToColor: { [network: string]: string } = {
@@ -225,6 +225,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                     customType={customType}
                     docsInfo={this.props.docsInfo}
                     typeDefinitionByName={typeDefinitionByName}
+                    isInPopover={false}
                 />
             );
         });
diff --git a/packages/react-docs/src/components/event_definition.tsx b/packages/react-docs/src/components/event_definition.tsx
index b4dc729a9..6cb80c6b0 100644
--- a/packages/react-docs/src/components/event_definition.tsx
+++ b/packages/react-docs/src/components/event_definition.tsx
@@ -53,7 +53,12 @@ export class EventDefinition extends React.Component<EventDefinitionProps, Event
         const indexed = <span style={{ color: colors.green }}> indexed</span>;
         const eventArgs = _.map(this.props.event.eventArgs, (eventArg: EventArg) => {
             const type = (
-                <Type type={eventArg.type} sectionName={this.props.sectionName} docsInfo={this.props.docsInfo} />
+                <Type
+                    type={eventArg.type}
+                    sectionName={this.props.sectionName}
+                    docsInfo={this.props.docsInfo}
+                    isInPopover={false}
+                />
             );
             return (
                 <span key={`eventArg-${eventArg.name}`}>
diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index eaf57ce93..93b10e96d 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -7,14 +7,17 @@ import { CustomType, TypeDefinitionByName } from '../types';
 import { Signature } from './signature';
 import { Type } from './type';
 
+const defaultProps = {};
+
 export interface InterfaceProps {
     type: CustomType;
     sectionName: string;
     docsInfo: DocsInfo;
     typeDefinitionByName: TypeDefinitionByName;
+    isInPopover: boolean;
 }
 
-export const Interface = (props: InterfaceProps) => {
+export const Interface: React.SFC<InterfaceProps> = (props: InterfaceProps): any => {
     const type = props.type;
     const properties = _.map(type.children, property => {
         return (
@@ -31,6 +34,7 @@ export const Interface = (props: InterfaceProps) => {
                         shouldUseArrowSyntax={true}
                         docsInfo={props.docsInfo}
                         typeDefinitionByName={props.typeDefinitionByName}
+                        isInPopover={props.isInPopover}
                     />
                 ) : (
                     <Type
@@ -38,6 +42,7 @@ export const Interface = (props: InterfaceProps) => {
                         sectionName={props.sectionName}
                         docsInfo={props.docsInfo}
                         typeDefinitionByName={props.typeDefinitionByName}
+                        isInPopover={props.isInPopover}
                     />
                 )},
             </span>
@@ -54,6 +59,7 @@ export const Interface = (props: InterfaceProps) => {
                     sectionName={props.sectionName}
                     docsInfo={props.docsInfo}
                     typeDefinitionByName={props.typeDefinitionByName}
+                    isInPopover={props.isInPopover}
                 />
             </span>
         );
@@ -77,3 +83,5 @@ export const Interface = (props: InterfaceProps) => {
         </span>
     );
 };
+
+Interface.defaultProps = defaultProps;
diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
index 6e5c451be..f181e21d2 100644
--- a/packages/react-docs/src/components/property_block.tsx
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -6,8 +6,8 @@ import { Property, TypeDefinitionByName } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
-import { Type } from './type';
 import { SourceLink } from './source_link';
+import { Type } from './type';
 
 export interface PropertyBlockProps {
     property: Property;
@@ -56,6 +56,7 @@ export class PropertyBlock extends React.Component<PropertyBlockProps, PropertyB
                         sectionName={sectionName}
                         docsInfo={this.props.docsInfo}
                         typeDefinitionByName={this.props.typeDefinitionByName}
+                        isInPopover={false}
                     />
                 </code>
                 {property.source && (
diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index d9567c9f6..bf9c8be24 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -17,6 +17,7 @@ export interface SignatureProps {
     typeParameter?: TypeParameter;
     callPath?: string;
     docsInfo: DocsInfo;
+    isInPopover: boolean;
 }
 
 const defaultProps = {
@@ -27,7 +28,13 @@ const defaultProps = {
 
 export const Signature: React.SFC<SignatureProps> = (props: SignatureProps) => {
     const sectionName = props.sectionName;
-    const parameters = renderParameters(props.parameters, props.docsInfo, sectionName, props.typeDefinitionByName);
+    const parameters = renderParameters(
+        props.parameters,
+        props.docsInfo,
+        sectionName,
+        props.isInPopover,
+        props.typeDefinitionByName,
+    );
     const paramStringArray: any[] = [];
     // HACK: For now we don't put params on newlines if there are less then 2 of them.
     // Ideally we would check the character length of the resulting method signature and
@@ -57,7 +64,13 @@ export const Signature: React.SFC<SignatureProps> = (props: SignatureProps) => {
     const methodName = props.shouldHideMethodName ? '' : props.name;
     const typeParameterIfExists = _.isUndefined(props.typeParameter)
         ? undefined
-        : renderTypeParameter(props.typeParameter, props.docsInfo, sectionName, props.typeDefinitionByName);
+        : renderTypeParameter(
+              props.typeParameter,
+              props.docsInfo,
+              sectionName,
+              props.isInPopover,
+              props.typeDefinitionByName,
+          );
     return (
         <span style={{ fontSize: 15 }}>
             {props.callPath}
@@ -72,6 +85,7 @@ export const Signature: React.SFC<SignatureProps> = (props: SignatureProps) => {
                         sectionName={sectionName}
                         typeDefinitionByName={props.typeDefinitionByName}
                         docsInfo={props.docsInfo}
+                        isInPopover={props.isInPopover}
                     />
                 </span>
             )}
@@ -85,6 +99,7 @@ function renderParameters(
     parameters: Parameter[],
     docsInfo: DocsInfo,
     sectionName: string,
+    isInPopover: boolean,
     typeDefinitionByName?: TypeDefinitionByName,
 ): React.ReactNode[] {
     const params = _.map(parameters, (p: Parameter) => {
@@ -96,6 +111,7 @@ function renderParameters(
                 sectionName={sectionName}
                 typeDefinitionByName={typeDefinitionByName}
                 docsInfo={docsInfo}
+                isInPopover={isInPopover}
             />
         );
         return (
@@ -113,6 +129,7 @@ function renderTypeParameter(
     typeParameter: TypeParameter,
     docsInfo: DocsInfo,
     sectionName: string,
+    isInPopover: boolean,
     typeDefinitionByName?: TypeDefinitionByName,
 ): React.ReactNode {
     const typeParam = (
@@ -123,6 +140,7 @@ function renderTypeParameter(
                 sectionName={sectionName}
                 typeDefinitionByName={typeDefinitionByName}
                 docsInfo={docsInfo}
+                isInPopover={isInPopover}
             />
             {`>`}
         </span>
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 9e5198e16..934232efe 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -81,6 +81,7 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
                         sectionName={this.props.sectionName}
                         typeDefinitionByName={this.props.typeDefinitionByName}
                         docsInfo={this.props.docsInfo}
+                        isInPopover={false}
                     />
                 </code>
                 {(method as TypescriptMethod).source && (
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 1c580caab..eae52e950 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -7,23 +7,26 @@ import * as ReactTooltip from 'react-tooltip';
 
 import { DocsInfo } from '../docs_info';
 import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '../types';
+import { constants } from '../utils/constants';
 
 import { Signature } from './signature';
-import { constants } from '../utils/constants';
 import { TypeDefinition } from './type_definition';
 
 const basicJsTypes = ['string', 'number', 'undefined', 'null', 'boolean'];
 
+const defaultProps = {};
+
 export interface TypeProps {
     type: TypeDef;
     docsInfo: DocsInfo;
     sectionName: string;
     typeDefinitionByName?: TypeDefinitionByName;
+    isInPopover: boolean;
 }
 
 // The return type needs to be `any` here so that we can recursively define <Type /> components within
 // <Type /> components (e.g when rendering the union type).
-export function Type(props: TypeProps): any {
+export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
     const type = props.type;
     const isReference = type.typeDocType === TypeDocTypes.Reference;
     const isArray = type.typeDocType === TypeDocTypes.Array;
@@ -50,6 +53,7 @@ export function Type(props: TypeProps): any {
                                 sectionName={props.sectionName}
                                 typeDefinitionByName={props.typeDefinitionByName}
                                 docsInfo={props.docsInfo}
+                                isInPopover={props.isInPopover}
                             />[]
                         </span>
                     );
@@ -61,6 +65,7 @@ export function Type(props: TypeProps): any {
                             sectionName={props.sectionName}
                             typeDefinitionByName={props.typeDefinitionByName}
                             docsInfo={props.docsInfo}
+                            isInPopover={props.isInPopover}
                         />
                     );
                     return subType;
@@ -89,6 +94,7 @@ export function Type(props: TypeProps): any {
                         sectionName={props.sectionName}
                         typeDefinitionByName={props.typeDefinitionByName}
                         docsInfo={props.docsInfo}
+                        isInPopover={props.isInPopover}
                     />
                 );
             });
@@ -110,6 +116,7 @@ export function Type(props: TypeProps): any {
                         shouldUseArrowSyntax={true}
                         docsInfo={props.docsInfo}
                         typeDefinitionByName={props.typeDefinitionByName}
+                        isInPopover={props.isInPopover}
                     />
                 );
             } else if (!_.isUndefined(type.indexSignature)) {
@@ -122,6 +129,7 @@ export function Type(props: TypeProps): any {
                             sectionName={props.sectionName}
                             docsInfo={props.docsInfo}
                             typeDefinitionByName={props.typeDefinitionByName}
+                            isInPopover={props.isInPopover}
                         />
                     </span>
                 );
@@ -150,6 +158,7 @@ export function Type(props: TypeProps): any {
                         sectionName={props.sectionName}
                         typeDefinitionByName={props.typeDefinitionByName}
                         docsInfo={props.docsInfo}
+                        isInPopover={props.isInPopover}
                     />
                 );
             });
@@ -180,6 +189,7 @@ export function Type(props: TypeProps): any {
             ? props.docsInfo.typeConfigs.typeNameToPrefix[typeName as string]
             : undefined;
     }
+    const isExportedClassReference = !!props.type.isExportedClassReference;
     if (!_.isUndefined(typeNameUrlIfExists)) {
         typeName = (
             <a
@@ -194,12 +204,12 @@ export function Type(props: TypeProps): any {
         );
     } else if (
         (isReference || isArray) &&
-        props.typeDefinitionByName &&
-        props.typeDefinitionByName[typeName as string]
+        ((props.typeDefinitionByName && props.typeDefinitionByName[typeName as string]) || isExportedClassReference)
     ) {
         const id = Math.random().toString();
-        const typeDefinitionAnchorId = `${constants.TYPES_SECTION_NAME}-${typeName}`;
-        let typeDefinition = props.typeDefinitionByName[typeName as string];
+        const typeDefinitionAnchorId = isExportedClassReference
+            ? props.type.name
+            : `${constants.TYPES_SECTION_NAME}-${typeName}`;
         typeName = (
             <ScrollLink
                 to={typeDefinitionAnchorId}
@@ -208,7 +218,7 @@ export function Type(props: TypeProps): any {
                 duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
                 containerId={sharedConstants.DOCS_CONTAINER_ID}
             >
-                {sharedUtils.isUserOnMobile() ? (
+                {sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? (
                     <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span>
                 ) : (
                     <span
@@ -224,10 +234,11 @@ export function Type(props: TypeProps): any {
                         <ReactTooltip type="light" effect="solid" id={id} className="typeTooltip">
                             <TypeDefinition
                                 sectionName={props.sectionName}
-                                customType={typeDefinition}
+                                customType={props.typeDefinitionByName[typeName as string]}
                                 shouldAddId={false}
                                 docsInfo={props.docsInfo}
                                 typeDefinitionByName={props.typeDefinitionByName}
+                                isInPopover={true}
                             />
                         </ReactTooltip>
                     </span>
@@ -248,4 +259,6 @@ export function Type(props: TypeProps): any {
             )}
         </span>
     );
-}
+};
+
+Type.defaultProps = defaultProps;
diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index 775d9890f..8d1f88490 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -4,7 +4,7 @@ import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { CustomType, CustomTypeChild, KindString, TypeDocTypes, TypeDefinitionByName } from '../types';
+import { CustomType, CustomTypeChild, KindString, TypeDefinitionByName, TypeDocTypes } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
@@ -20,6 +20,7 @@ export interface TypeDefinitionProps {
     shouldAddId?: boolean;
     docsInfo: DocsInfo;
     typeDefinitionByName?: TypeDefinitionByName;
+    isInPopover?: boolean;
 }
 
 export interface TypeDefinitionState {
@@ -29,6 +30,7 @@ export interface TypeDefinitionState {
 export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDefinitionState> {
     public static defaultProps: Partial<TypeDefinitionProps> = {
         shouldAddId: true,
+        isInPopover: false,
     };
     constructor(props: TypeDefinitionProps) {
         super(props);
@@ -50,6 +52,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                         sectionName={this.props.sectionName}
                         docsInfo={this.props.docsInfo}
                         typeDefinitionByName={this.props.typeDefinitionByName}
+                        isInPopover={this.props.isInPopover}
                     />
                 );
                 break;
@@ -81,6 +84,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                                 sectionName={this.props.sectionName}
                                 docsInfo={this.props.docsInfo}
                                 typeDefinitionByName={this.props.typeDefinitionByName}
+                                isInPopover={this.props.isInPopover}
                             />
                         ) : (
                             <Signature
@@ -94,6 +98,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                                 shouldUseArrowSyntax={true}
                                 docsInfo={this.props.docsInfo}
                                 typeDefinitionByName={this.props.typeDefinitionByName}
+                                isInPopover={this.props.isInPopover}
                             />
                         )}
                     </span>
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 18c386a2b..c39dfcba8 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -154,6 +154,7 @@ export interface Type {
     name: string;
     typeDocType: TypeDocTypes;
     value?: string;
+    isExportedClassReference?: boolean;
     typeArguments?: Type[];
     elementType?: ElementType;
     types?: Type[];
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index b45dc73a8..ab5408ec2 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -7,6 +7,7 @@ import {
     CustomTypeChild,
     DocAgnosticFormat,
     DocSection,
+    GeneratedDocJson,
     IndexSignature,
     KindString,
     Parameter,
@@ -19,7 +20,6 @@ import {
     TypeParameter,
     TypescriptFunction,
     TypescriptMethod,
-    GeneratedDocJson,
 } from '../types';
 
 import { constants } from './constants';
@@ -72,6 +72,15 @@ export const typeDocUtils = {
             ),
         );
 
+        const classNames: string[] = [];
+        _.each(typeDocJson.children, file => {
+            _.each(file.children, child => {
+                if (child.kindString === KindString.Class) {
+                    classNames.push(child.name);
+                }
+            });
+        });
+
         const docAgnosticFormat: DocAgnosticFormat = {};
         const typeEntities: TypeDocNode[] = [];
         _.each(typeDocNameOrder, typeDocName => {
@@ -93,6 +102,7 @@ export const typeDocUtils = {
                             entities,
                             docsInfo,
                             sectionName,
+                            classNames,
                             isClassOrObjectLiteral,
                         );
                         docSection.comment = sectionComment;
@@ -106,7 +116,12 @@ export const typeDocUtils = {
                         const entities = [child];
                         const commentObj = child.comment;
                         const SectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
-                        const docSection = typeDocUtils._convertEntitiesToDocSection(entities, docsInfo, sectionName);
+                        const docSection = typeDocUtils._convertEntitiesToDocSection(
+                            entities,
+                            docsInfo,
+                            sectionName,
+                            classNames,
+                        );
                         docSection.comment = SectionComment;
                         docAgnosticFormat[sectionName] = docSection;
                         break;
@@ -129,6 +144,7 @@ export const typeDocUtils = {
                 typeEntities,
                 docsInfo,
                 constants.TYPES_SECTION_NAME,
+                classNames,
             );
             docAgnosticFormat[constants.TYPES_SECTION_NAME] = docSection;
         }
@@ -139,6 +155,7 @@ export const typeDocUtils = {
         entities: TypeDocNode[],
         docsInfo: DocsInfo,
         sectionName: string,
+        classNames: string[],
         isClassOrObjectLiteral: boolean = false,
     ): DocSection {
         const docSection: DocSection = {
@@ -161,6 +178,7 @@ export const typeDocUtils = {
                         docsInfo.sections,
                         sectionName,
                         docsInfo.id,
+                        classNames,
                     );
                     docSection.constructors.push(constructor);
                     break;
@@ -176,6 +194,7 @@ export const typeDocUtils = {
                                 sectionName,
                                 docsInfo.id,
                                 isClassOrObjectLiteral,
+                                classNames,
                             );
                             docSection.functions.push(func);
                         }
@@ -191,6 +210,7 @@ export const typeDocUtils = {
                             docsInfo.sections,
                             sectionName,
                             docsInfo.id,
+                            classNames,
                         );
                         docSection.methods.push(method);
                     }
@@ -203,6 +223,7 @@ export const typeDocUtils = {
                             docsInfo.sections,
                             sectionName,
                             docsInfo.id,
+                            classNames,
                         );
                         docSection.properties.push(property);
                     }
@@ -216,6 +237,7 @@ export const typeDocUtils = {
                             docsInfo.sections,
                             sectionName,
                             docsInfo.id,
+                            classNames,
                         );
                         docSection.properties.push(property);
                     } else {
@@ -225,6 +247,7 @@ export const typeDocUtils = {
                             docsInfo.sections,
                             sectionName,
                             docsInfo.id,
+                            classNames,
                         );
                         const seenTypeNames = _.map(docSection.types, t => t.name);
                         const isUnseen = !_.includes(seenTypeNames, customType.name);
@@ -235,14 +258,14 @@ export const typeDocUtils = {
                     break;
 
                 case KindString.Interface:
-                case KindString.Variable:
                 case KindString.Enumeration:
-                case KindString.TypeAlias:
+                case KindString.TypeAlias: {
                     const customType = typeDocUtils._convertCustomType(
                         entity,
                         docsInfo.sections,
                         sectionName,
                         docsInfo.id,
+                        classNames,
                     );
                     const seenTypeNames = _.map(docSection.types, t => t.name);
                     const isUnseen = !_.includes(seenTypeNames, customType.name);
@@ -250,6 +273,7 @@ export const typeDocUtils = {
                         docSection.types.push(customType);
                     }
                     break;
+                }
 
                 case KindString.Class:
                     // We currently do not support more then a single class per file
@@ -263,18 +287,24 @@ export const typeDocUtils = {
         });
         return docSection;
     },
-    _convertCustomType(entity: TypeDocNode, sections: SectionsMap, sectionName: string, docId: string): CustomType {
+    _convertCustomType(
+        entity: TypeDocNode,
+        sections: SectionsMap,
+        sectionName: string,
+        docId: string,
+        classNames: string[],
+    ): CustomType {
         const typeIfExists = !_.isUndefined(entity.type)
-            ? typeDocUtils._convertType(entity.type, sections, sectionName, docId)
+            ? typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames)
             : undefined;
         const isConstructor = false;
         const methodIfExists = !_.isUndefined(entity.declaration)
-            ? typeDocUtils._convertMethod(entity.declaration, isConstructor, sections, sectionName, docId)
+            ? typeDocUtils._convertMethod(entity.declaration, isConstructor, sections, sectionName, docId, classNames)
             : undefined;
         const doesIndexSignatureExist = !_.isUndefined(entity.indexSignature);
         const indexSignature = entity.indexSignature as TypeDocNode;
         const indexSignatureIfExists = doesIndexSignatureExist
-            ? typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId)
+            ? typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId, classNames)
             : undefined;
         const commentIfExists =
             !_.isUndefined(entity.comment) && !_.isUndefined(entity.comment.shortText)
@@ -284,13 +314,20 @@ export const typeDocUtils = {
         const childrenIfExist = !_.isUndefined(entity.children)
             ? _.map(entity.children, (child: TypeDocNode) => {
                   let childTypeIfExists = !_.isUndefined(child.type)
-                      ? typeDocUtils._convertType(child.type, sections, sectionName, docId)
+                      ? typeDocUtils._convertType(child.type, sections, sectionName, docId, classNames)
                       : undefined;
                   if (child.kindString === KindString.Method) {
                       childTypeIfExists = {
                           name: child.name,
                           typeDocType: TypeDocTypes.Reflection,
-                          method: typeDocUtils._convertMethod(child, isConstructor, sections, sectionName, docId),
+                          method: typeDocUtils._convertMethod(
+                              child,
+                              isConstructor,
+                              sections,
+                              sectionName,
+                              docId,
+                              classNames,
+                          ),
                       };
                   }
                   const c: CustomTypeChild = {
@@ -319,16 +356,23 @@ export const typeDocUtils = {
         sections: SectionsMap,
         sectionName: string,
         docId: string,
+        classNames: string[],
     ): IndexSignature {
         const key = entity.parameters[0];
         const indexSignature = {
             keyName: key.name,
-            keyType: typeDocUtils._convertType(key.type, sections, sectionName, docId),
+            keyType: typeDocUtils._convertType(key.type, sections, sectionName, docId, classNames),
             valueName: entity.type.name,
         };
         return indexSignature;
     },
-    _convertProperty(entity: TypeDocNode, sections: SectionsMap, sectionName: string, docId: string): Property {
+    _convertProperty(
+        entity: TypeDocNode,
+        sections: SectionsMap,
+        sectionName: string,
+        docId: string,
+        classNames: string[],
+    ): Property {
         const source = entity.sources[0];
         const commentIfExists = !_.isUndefined(entity.comment) ? entity.comment.shortText : undefined;
         const isConstructor = false;
@@ -336,7 +380,7 @@ export const typeDocUtils = {
         const callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
         const property = {
             name: entity.name,
-            type: typeDocUtils._convertType(entity.type, sections, sectionName, docId),
+            type: typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames),
             source: {
                 fileName: source.fileName,
                 line: source.line,
@@ -352,6 +396,7 @@ export const typeDocUtils = {
         sections: SectionsMap,
         sectionName: string,
         docId: string,
+        classNames: string[],
     ): TypescriptMethod {
         const signature = entity.signatures[0];
         const source = entity.sources[0];
@@ -359,12 +404,12 @@ export const typeDocUtils = {
         const isStatic = _.isUndefined(entity.flags.isStatic) ? false : entity.flags.isStatic;
 
         const parameters = _.map(signature.parameters, param => {
-            return typeDocUtils._convertParameter(param, sections, sectionName, docId);
+            return typeDocUtils._convertParameter(param, sections, sectionName, docId, classNames);
         });
-        const returnType = typeDocUtils._convertType(signature.type, sections, sectionName, docId);
+        const returnType = typeDocUtils._convertType(signature.type, sections, sectionName, docId, classNames);
         const typeParameter = _.isUndefined(signature.typeParameter)
             ? undefined
-            : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId);
+            : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId, classNames);
 
         const callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
         const method = {
@@ -384,13 +429,12 @@ export const typeDocUtils = {
         };
         return method;
     },
-    _getCallPath(sectionName: string, isStatic: boolean, isConstructor: boolean, entityName: string) {
+    _getCallPath(sectionName: string, isStatic: boolean, isConstructor: boolean, entityName: string): string {
         // HACK: we use the fact that the sectionName is the same as the property name at the top-level
         // of the public interface. In the future, we shouldn't use this hack but rather get it from the JSON.
         let callPath;
         if (isConstructor || entityName === '__type') {
             callPath = '';
-            // TODO: Get rid of this 0x-specific logic
         } else {
             const prefix = isStatic ? sectionName : `${sectionName[0].toLowerCase()}${sectionName.slice(1)}`;
             callPath = `${prefix}.`;
@@ -403,18 +447,19 @@ export const typeDocUtils = {
         sectionName: string,
         docId: string,
         isObjectLiteral: boolean,
+        classNames: string[],
     ): TypescriptFunction {
         const signature = entity.signatures[0];
         const source = entity.sources[0];
         const hasComment = !_.isUndefined(signature.comment);
 
         const parameters = _.map(signature.parameters, param => {
-            return typeDocUtils._convertParameter(param, sections, sectionName, docId);
+            return typeDocUtils._convertParameter(param, sections, sectionName, docId, classNames);
         });
-        const returnType = typeDocUtils._convertType(signature.type, sections, sectionName, docId);
+        const returnType = typeDocUtils._convertType(signature.type, sections, sectionName, docId, classNames);
         const typeParameter = _.isUndefined(signature.typeParameter)
             ? undefined
-            : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId);
+            : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId, classNames);
 
         let callPath = '';
         if (isObjectLiteral) {
@@ -442,15 +487,22 @@ export const typeDocUtils = {
         sections: SectionsMap,
         sectionName: string,
         docId: string,
+        classNames: string[],
     ): TypeParameter {
-        const type = typeDocUtils._convertType(entity.type, sections, sectionName, docId);
+        const type = typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames);
         const parameter = {
             name: entity.name,
             type,
         };
         return parameter;
     },
-    _convertParameter(entity: TypeDocNode, sections: SectionsMap, sectionName: string, docId: string): Parameter {
+    _convertParameter(
+        entity: TypeDocNode,
+        sections: SectionsMap,
+        sectionName: string,
+        docId: string,
+        classNames: string[],
+    ): Parameter {
         let comment = '<No comment>';
         if (entity.comment && entity.comment.shortText) {
             comment = entity.comment.shortText;
@@ -460,7 +512,7 @@ export const typeDocUtils = {
 
         const isOptional = !_.isUndefined(entity.flags.isOptional) ? entity.flags.isOptional : false;
 
-        const type = typeDocUtils._convertType(entity.type, sections, sectionName, docId);
+        const type = typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames);
 
         const parameter = {
             name: entity.name,
@@ -471,12 +523,18 @@ export const typeDocUtils = {
         };
         return parameter;
     },
-    _convertType(entity: TypeDocType, sections: SectionsMap, sectionName: string, docId: string): Type {
+    _convertType(
+        entity: TypeDocType,
+        sections: SectionsMap,
+        sectionName: string,
+        docId: string,
+        classNames: string[],
+    ): Type {
         const typeArguments = _.map(entity.typeArguments, typeArgument => {
-            return typeDocUtils._convertType(typeArgument, sections, sectionName, docId);
+            return typeDocUtils._convertType(typeArgument, sections, sectionName, docId, classNames);
         });
         const types = _.map(entity.types, t => {
-            return typeDocUtils._convertType(t, sections, sectionName, docId);
+            return typeDocUtils._convertType(t, sections, sectionName, docId, classNames);
         });
 
         let indexSignatureIfExists;
@@ -485,7 +543,13 @@ export const typeDocUtils = {
             !_.isUndefined(entity.declaration) && !_.isUndefined(entity.declaration.indexSignature);
         if (doesIndexSignatureExist) {
             const indexSignature = entity.declaration.indexSignature as TypeDocNode;
-            indexSignatureIfExists = typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId);
+            indexSignatureIfExists = typeDocUtils._convertIndexSignature(
+                indexSignature,
+                sections,
+                sectionName,
+                docId,
+                classNames,
+            );
         } else if (!_.isUndefined(entity.declaration)) {
             const isConstructor = false;
             methodIfExists = typeDocUtils._convertMethod(
@@ -494,6 +558,7 @@ export const typeDocUtils = {
                 sections,
                 sectionName,
                 docId,
+                classNames,
             );
         }
 
@@ -507,6 +572,7 @@ export const typeDocUtils = {
         const type = {
             name: entity.name,
             value: entity.value,
+            isExportedClassReference: _.includes(classNames, entity.name),
             typeDocType: entity.type,
             typeArguments,
             elementType: elementTypeIfExists,
-- 
cgit v1.2.3


From 83e3bb899ed88c8ac32331d2f1b533e52d5ad8cd Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 14 Aug 2018 17:41:03 -0700
Subject: Move purging private underscored items to the doc json generation
 phase

---
 .../react-docs/src/components/signature_block.tsx   |  3 ---
 packages/react-docs/src/utils/typedoc_utils.ts      | 21 ++++++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 934232efe..2818d9c5f 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -44,9 +44,6 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
     }
     public render(): React.ReactNode {
         const method = this.props.method;
-        if (typeDocUtils.isPrivateOrProtectedProperty(method.name)) {
-            return null;
-        }
 
         return (
             <div
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index ab5408ec2..9843ec9fa 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -43,9 +43,6 @@ export const typeDocUtils = {
     isProperty(entity: TypeDocNode): boolean {
         return entity.kindString === KindString.Property;
     },
-    isPrivateOrProtectedProperty(propertyName: string): boolean {
-        return _.startsWith(propertyName, '_');
-    },
     getModuleDefinitionsBySectionName(versionDocObj: TypeDocNode, configModulePaths: string[]): TypeDocNode[] {
         const moduleDefinitions: TypeDocNode[] = [];
         const jsonModules = versionDocObj.children;
@@ -217,16 +214,14 @@ export const typeDocUtils = {
                     break;
 
                 case KindString.Property:
-                    if (!typeDocUtils.isPrivateOrProtectedProperty(entity.name)) {
-                        const property = typeDocUtils._convertProperty(
-                            entity,
-                            docsInfo.sections,
-                            sectionName,
-                            docsInfo.id,
-                            classNames,
-                        );
-                        docSection.properties.push(property);
-                    }
+                    const property = typeDocUtils._convertProperty(
+                        entity,
+                        docsInfo.sections,
+                        sectionName,
+                        docsInfo.id,
+                        classNames,
+                    );
+                    docSection.properties.push(property);
                     break;
 
                 case KindString.Variable:
-- 
cgit v1.2.3


From a8d44ccc48a7177e749f534a237afb7b9c0f2f2b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 15 Aug 2018 11:36:45 -0700
Subject: Move external types to link mapping to doc generation util and
 refactor typedocUtils to be a class to avoid excessive param passing

---
 .../react-docs/src/components/signature_block.tsx  |   1 -
 packages/react-docs/src/components/type.tsx        |  12 +-
 packages/react-docs/src/docs_info.ts               |  10 +-
 packages/react-docs/src/types.ts                   |  12 +-
 packages/react-docs/src/utils/typedoc_utils.ts     | 351 +++++++--------------
 5 files changed, 131 insertions(+), 255 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 2818d9c5f..05145dc23 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -5,7 +5,6 @@ import * as React from 'react';
 import { DocsInfo } from '../docs_info';
 import { Parameter, SolidityMethod, TypeDefinitionByName, TypescriptFunction, TypescriptMethod } from '../types';
 import { constants } from '../utils/constants';
-import { typeDocUtils } from '../utils/typedoc_utils';
 
 import { Comment } from './comment';
 import { Signature } from './signature';
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index eae52e950..145c797a3 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -179,17 +179,8 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
         return [prev, ', ', curr];
     });
 
-    let typeNameUrlIfExists;
-    let typePrefixIfExists;
-    if (!_.isUndefined(props.docsInfo.typeConfigs)) {
-        typeNameUrlIfExists = !_.isUndefined(props.docsInfo.typeConfigs.typeNameToExternalLink)
-            ? props.docsInfo.typeConfigs.typeNameToExternalLink[typeName as string]
-            : undefined;
-        typePrefixIfExists = !_.isUndefined(props.docsInfo.typeConfigs.typeNameToPrefix)
-            ? props.docsInfo.typeConfigs.typeNameToPrefix[typeName as string]
-            : undefined;
-    }
     const isExportedClassReference = !!props.type.isExportedClassReference;
+    const typeNameUrlIfExists = !_.isUndefined(props.type.externalLink) ? props.type.externalLink : undefined;
     if (!_.isUndefined(typeNameUrlIfExists)) {
         typeName = (
             <a
@@ -198,7 +189,6 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
                 className="text-decoration-none"
                 style={{ color: colors.lightBlueA700 }}
             >
-                {!_.isUndefined(typePrefixIfExists) ? `${typePrefixIfExists}.` : ''}
                 {typeName}
             </a>
         );
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 4267d8a98..9e990ffc5 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -6,17 +6,16 @@ import {
     ContractsByVersionByNetworkId,
     DocAgnosticFormat,
     DocsInfoConfig,
-    DocsInfoTypeConfigs,
     DocsMenu,
     DoxityDocObj,
+    GeneratedDocJson,
     SectionNameToMarkdownByVersion,
     SectionsMap,
     SupportedDocJson,
     TypeDefinitionByName,
-    GeneratedDocJson,
 } from './types';
 import { doxityUtils } from './utils/doxity_utils';
-import { typeDocUtils } from './utils/typedoc_utils';
+import { TypeDocUtils } from './utils/typedoc_utils';
 
 export class DocsInfo {
     public id: string;
@@ -27,7 +26,6 @@ export class DocsInfo {
     public sections: SectionsMap;
     public sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
     public contractsByVersionByNetworkId?: ContractsByVersionByNetworkId;
-    public typeConfigs: DocsInfoTypeConfigs;
     constructor(config: DocsInfoConfig) {
         this.id = config.id;
         this.type = config.type;
@@ -37,7 +35,6 @@ export class DocsInfo {
         this.sections = config.markdownSections;
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
         this.contractsByVersionByNetworkId = config.contractsByVersionByNetworkId;
-        this.typeConfigs = config.typeConfigs;
     }
     public getMenuSubsectionsBySection(docAgnosticFormat?: DocAgnosticFormat): MenuSubsectionsBySection {
         const menuSubsectionsBySection = {} as MenuSubsectionsBySection;
@@ -101,7 +98,8 @@ export class DocsInfo {
         if (this.type === SupportedDocJson.Doxity) {
             return doxityUtils.convertToDocAgnosticFormat(docObj as DoxityDocObj);
         } else {
-            return typeDocUtils.convertToDocAgnosticFormat(docObj as GeneratedDocJson, this);
+            const typeDocUtils = new TypeDocUtils(docObj as GeneratedDocJson, this);
+            return typeDocUtils.convertToDocAgnosticFormat();
         }
     }
 }
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index c39dfcba8..0155685e0 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -11,12 +11,6 @@ export interface DocsInfoConfig {
     markdownSections: SectionsMap;
     sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
     contractsByVersionByNetworkId?: ContractsByVersionByNetworkId;
-    typeConfigs?: DocsInfoTypeConfigs;
-}
-
-export interface DocsInfoTypeConfigs {
-    typeNameToExternalLink?: { [typeName: string]: string };
-    typeNameToPrefix?: { [typeName: string]: string };
 }
 
 export interface DocsMenu {
@@ -160,6 +154,7 @@ export interface Type {
     types?: Type[];
     method?: TypescriptMethod;
     indexSignature?: IndexSignature;
+    externalLink?: string;
 }
 
 export interface ElementType {
@@ -297,9 +292,14 @@ export interface ExportNameToTypedocNames {
     [exportName: string]: string[];
 }
 
+export interface ExternalTypeToLink {
+    [externalTypeName: string]: string;
+}
+
 export interface Metadata {
     exportPathToTypedocNames: ExportNameToTypedocNames;
     exportPathOrder: string[];
+    externalTypeToLink: ExternalTypeToLink;
 }
 
 export interface GeneratedDocJson {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 9843ec9fa..db6063464 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -7,6 +7,7 @@ import {
     CustomTypeChild,
     DocAgnosticFormat,
     DocSection,
+    ExternalTypeToLink,
     GeneratedDocJson,
     IndexSignature,
     KindString,
@@ -24,8 +25,39 @@ import {
 
 import { constants } from './constants';
 
-export const typeDocUtils = {
-    isType(entity: TypeDocNode): boolean {
+export class TypeDocUtils {
+    private _typeDocNameOrder: string[];
+    private _externalTypeToLink: ExternalTypeToLink;
+    private _docsInfo: DocsInfo;
+    private _typeDocJson: TypeDocNode;
+    private _classNames: string[];
+    constructor(generatedDocJson: GeneratedDocJson, docsInfo: DocsInfo) {
+        this._docsInfo = docsInfo;
+        console.log('generatedDocJson.metadata', generatedDocJson.metadata);
+        const exportPathOrder = generatedDocJson.metadata.exportPathOrder;
+        const exportPathToTypedocNames = generatedDocJson.metadata.exportPathToTypedocNames;
+        this._externalTypeToLink = generatedDocJson.metadata.externalTypeToLink;
+        this._typeDocJson = generatedDocJson.typedocJson;
+
+        // TODO: Extract the non typeDoc exports, and render them somehow
+        this._typeDocNameOrder = _.compact(
+            _.flatten(
+                _.map(exportPathOrder, exportPath => {
+                    return exportPathToTypedocNames[exportPath];
+                }),
+            ),
+        );
+
+        this._classNames = [];
+        _.each(this._typeDocJson.children, file => {
+            _.each(file.children, child => {
+                if (child.kindString === KindString.Class) {
+                    this._classNames.push(child.name);
+                }
+            });
+        });
+    }
+    public isType(entity: TypeDocNode): boolean {
         return (
             entity.kindString === KindString.Interface ||
             entity.kindString === KindString.Function ||
@@ -33,17 +65,17 @@ export const typeDocUtils = {
             entity.kindString === KindString.Variable ||
             entity.kindString === KindString.Enumeration
         );
-    },
-    isMethod(entity: TypeDocNode): boolean {
+    }
+    public isMethod(entity: TypeDocNode): boolean {
         return entity.kindString === KindString.Method;
-    },
-    isConstructor(entity: TypeDocNode): boolean {
+    }
+    public isConstructor(entity: TypeDocNode): boolean {
         return entity.kindString === KindString.Constructor;
-    },
-    isProperty(entity: TypeDocNode): boolean {
+    }
+    public isProperty(entity: TypeDocNode): boolean {
         return entity.kindString === KindString.Property;
-    },
-    getModuleDefinitionsBySectionName(versionDocObj: TypeDocNode, configModulePaths: string[]): TypeDocNode[] {
+    }
+    public getModuleDefinitionsBySectionName(versionDocObj: TypeDocNode, configModulePaths: string[]): TypeDocNode[] {
         const moduleDefinitions: TypeDocNode[] = [];
         const jsonModules = versionDocObj.children;
         _.each(jsonModules, jsonMod => {
@@ -54,52 +86,28 @@ export const typeDocUtils = {
             });
         });
         return moduleDefinitions;
-    },
-    convertToDocAgnosticFormat(generatedDocJson: GeneratedDocJson, docsInfo: DocsInfo): DocAgnosticFormat {
-        const exportPathOrder = generatedDocJson.metadata.exportPathOrder;
-        const exportPathToTypedocNames = generatedDocJson.metadata.exportPathToTypedocNames;
-        const typeDocJson = generatedDocJson.typedocJson;
-
-        // TODO: Extract the non typeDoc exports, and render them somehow
-        const typeDocNameOrder = _.compact(
-            _.flatten(
-                _.map(exportPathOrder, exportPath => {
-                    return exportPathToTypedocNames[exportPath];
-                }),
-            ),
-        );
-
-        const classNames: string[] = [];
-        _.each(typeDocJson.children, file => {
-            _.each(file.children, child => {
-                if (child.kindString === KindString.Class) {
-                    classNames.push(child.name);
-                }
-            });
-        });
-
+    }
+    public convertToDocAgnosticFormat(): DocAgnosticFormat {
         const docAgnosticFormat: DocAgnosticFormat = {};
         const typeEntities: TypeDocNode[] = [];
-        _.each(typeDocNameOrder, typeDocName => {
-            const fileChildIndex = _.findIndex(typeDocJson.children, child => child.name === typeDocName);
-            const fileChild = typeDocJson.children[fileChildIndex];
+        _.each(this._typeDocNameOrder, typeDocName => {
+            const fileChildIndex = _.findIndex(this._typeDocJson.children, child => child.name === typeDocName);
+            const fileChild = this._typeDocJson.children[fileChildIndex];
             let sectionName: string;
             _.each(fileChild.children, child => {
                 switch (child.kindString) {
                     case KindString.Class:
                     case KindString.ObjectLiteral: {
                         sectionName = child.name;
-                        docsInfo.sections[sectionName] = sectionName;
-                        docsInfo.menu[sectionName] = [sectionName];
+                        this._docsInfo.sections[sectionName] = sectionName;
+                        this._docsInfo.menu[sectionName] = [sectionName];
                         const entities = child.children;
                         const commentObj = child.comment;
                         const sectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
                         const isClassOrObjectLiteral = true;
-                        const docSection = typeDocUtils._convertEntitiesToDocSection(
+                        const docSection = this._convertEntitiesToDocSection(
                             entities,
-                            docsInfo,
                             sectionName,
-                            classNames,
                             isClassOrObjectLiteral,
                         );
                         docSection.comment = sectionComment;
@@ -108,17 +116,12 @@ export const typeDocUtils = {
                     }
                     case KindString.Function: {
                         sectionName = child.name;
-                        docsInfo.sections[sectionName] = sectionName;
-                        docsInfo.menu[sectionName] = [sectionName];
+                        this._docsInfo.sections[sectionName] = sectionName;
+                        this._docsInfo.menu[sectionName] = [sectionName];
                         const entities = [child];
                         const commentObj = child.comment;
                         const SectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
-                        const docSection = typeDocUtils._convertEntitiesToDocSection(
-                            entities,
-                            docsInfo,
-                            sectionName,
-                            classNames,
-                        );
+                        const docSection = this._convertEntitiesToDocSection(entities, sectionName);
                         docSection.comment = SectionComment;
                         docAgnosticFormat[sectionName] = docSection;
                         break;
@@ -135,24 +138,17 @@ export const typeDocUtils = {
             });
         });
         if (!_.isEmpty(typeEntities)) {
-            docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
-            docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
-            const docSection = typeDocUtils._convertEntitiesToDocSection(
-                typeEntities,
-                docsInfo,
-                constants.TYPES_SECTION_NAME,
-                classNames,
-            );
+            this._docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
+            this._docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
+            const docSection = this._convertEntitiesToDocSection(typeEntities, constants.TYPES_SECTION_NAME);
             docAgnosticFormat[constants.TYPES_SECTION_NAME] = docSection;
         }
 
         return docAgnosticFormat;
-    },
-    _convertEntitiesToDocSection(
+    }
+    private _convertEntitiesToDocSection(
         entities: TypeDocNode[],
-        docsInfo: DocsInfo,
         sectionName: string,
-        classNames: string[],
         isClassOrObjectLiteral: boolean = false,
     ): DocSection {
         const docSection: DocSection = {
@@ -169,14 +165,7 @@ export const typeDocUtils = {
             switch (entity.kindString) {
                 case KindString.Constructor:
                     isConstructor = true;
-                    const constructor = typeDocUtils._convertMethod(
-                        entity,
-                        isConstructor,
-                        docsInfo.sections,
-                        sectionName,
-                        docsInfo.id,
-                        classNames,
-                    );
+                    const constructor = this._convertMethod(entity, isConstructor, sectionName);
                     docSection.constructors.push(constructor);
                     break;
 
@@ -185,14 +174,7 @@ export const typeDocUtils = {
                         const funcName = (entity as TypeDocNode).signatures[0].name;
                         const isPublicFunc = !_.startsWith(funcName, '_');
                         if (isPublicFunc) {
-                            const func = typeDocUtils._convertFunction(
-                                entity,
-                                docsInfo.sections,
-                                sectionName,
-                                docsInfo.id,
-                                isClassOrObjectLiteral,
-                                classNames,
-                            );
+                            const func = this._convertFunction(entity, sectionName, isClassOrObjectLiteral);
                             docSection.functions.push(func);
                         }
                     }
@@ -201,49 +183,25 @@ export const typeDocUtils = {
                 case KindString.Method:
                     if (entity.flags.isPublic) {
                         isConstructor = false;
-                        const method = typeDocUtils._convertMethod(
-                            entity,
-                            isConstructor,
-                            docsInfo.sections,
-                            sectionName,
-                            docsInfo.id,
-                            classNames,
-                        );
+                        const method = this._convertMethod(entity, isConstructor, sectionName);
                         docSection.methods.push(method);
                     }
                     break;
 
-                case KindString.Property:
-                    const property = typeDocUtils._convertProperty(
-                        entity,
-                        docsInfo.sections,
-                        sectionName,
-                        docsInfo.id,
-                        classNames,
-                    );
+                case KindString.Property: {
+                    const property = this._convertProperty(entity, sectionName);
                     docSection.properties.push(property);
                     break;
+                }
 
                 case KindString.Variable:
                     if (isClassOrObjectLiteral) {
                         // Render as a property
-                        const property = typeDocUtils._convertProperty(
-                            entity,
-                            docsInfo.sections,
-                            sectionName,
-                            docsInfo.id,
-                            classNames,
-                        );
+                        const property = this._convertProperty(entity, sectionName);
                         docSection.properties.push(property);
                     } else {
                         // Otherwise, render as a type
-                        const customType = typeDocUtils._convertCustomType(
-                            entity,
-                            docsInfo.sections,
-                            sectionName,
-                            docsInfo.id,
-                            classNames,
-                        );
+                        const customType = this._convertCustomType(entity, sectionName);
                         const seenTypeNames = _.map(docSection.types, t => t.name);
                         const isUnseen = !_.includes(seenTypeNames, customType.name);
                         if (isUnseen) {
@@ -255,13 +213,7 @@ export const typeDocUtils = {
                 case KindString.Interface:
                 case KindString.Enumeration:
                 case KindString.TypeAlias: {
-                    const customType = typeDocUtils._convertCustomType(
-                        entity,
-                        docsInfo.sections,
-                        sectionName,
-                        docsInfo.id,
-                        classNames,
-                    );
+                    const customType = this._convertCustomType(entity, sectionName);
                     const seenTypeNames = _.map(docSection.types, t => t.name);
                     const isUnseen = !_.includes(seenTypeNames, customType.name);
                     if (isUnseen) {
@@ -281,25 +233,17 @@ export const typeDocUtils = {
             }
         });
         return docSection;
-    },
-    _convertCustomType(
-        entity: TypeDocNode,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        classNames: string[],
-    ): CustomType {
-        const typeIfExists = !_.isUndefined(entity.type)
-            ? typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames)
-            : undefined;
+    }
+    private _convertCustomType(entity: TypeDocNode, sectionName: string): CustomType {
+        const typeIfExists = !_.isUndefined(entity.type) ? this._convertType(entity.type, sectionName) : undefined;
         const isConstructor = false;
         const methodIfExists = !_.isUndefined(entity.declaration)
-            ? typeDocUtils._convertMethod(entity.declaration, isConstructor, sections, sectionName, docId, classNames)
+            ? this._convertMethod(entity.declaration, isConstructor, sectionName)
             : undefined;
         const doesIndexSignatureExist = !_.isUndefined(entity.indexSignature);
         const indexSignature = entity.indexSignature as TypeDocNode;
         const indexSignatureIfExists = doesIndexSignatureExist
-            ? typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId, classNames)
+            ? this._convertIndexSignature(indexSignature, sectionName)
             : undefined;
         const commentIfExists =
             !_.isUndefined(entity.comment) && !_.isUndefined(entity.comment.shortText)
@@ -309,20 +253,13 @@ export const typeDocUtils = {
         const childrenIfExist = !_.isUndefined(entity.children)
             ? _.map(entity.children, (child: TypeDocNode) => {
                   let childTypeIfExists = !_.isUndefined(child.type)
-                      ? typeDocUtils._convertType(child.type, sections, sectionName, docId, classNames)
+                      ? this._convertType(child.type, sectionName)
                       : undefined;
                   if (child.kindString === KindString.Method) {
                       childTypeIfExists = {
                           name: child.name,
                           typeDocType: TypeDocTypes.Reflection,
-                          method: typeDocUtils._convertMethod(
-                              child,
-                              isConstructor,
-                              sections,
-                              sectionName,
-                              docId,
-                              classNames,
-                          ),
+                          method: this._convertMethod(child, isConstructor, sectionName),
                       };
                   }
                   const c: CustomTypeChild = {
@@ -345,37 +282,25 @@ export const typeDocUtils = {
             children: childrenIfExist,
         };
         return customType;
-    },
-    _convertIndexSignature(
-        entity: TypeDocNode,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        classNames: string[],
-    ): IndexSignature {
+    }
+    private _convertIndexSignature(entity: TypeDocNode, sectionName: string): IndexSignature {
         const key = entity.parameters[0];
         const indexSignature = {
             keyName: key.name,
-            keyType: typeDocUtils._convertType(key.type, sections, sectionName, docId, classNames),
+            keyType: this._convertType(key.type, sectionName),
             valueName: entity.type.name,
         };
         return indexSignature;
-    },
-    _convertProperty(
-        entity: TypeDocNode,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        classNames: string[],
-    ): Property {
+    }
+    private _convertProperty(entity: TypeDocNode, sectionName: string): Property {
         const source = entity.sources[0];
         const commentIfExists = !_.isUndefined(entity.comment) ? entity.comment.shortText : undefined;
         const isConstructor = false;
         const isStatic = _.isUndefined(entity.flags.isStatic) ? false : entity.flags.isStatic;
-        const callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
+        const callPath = this._getCallPath(sectionName, isStatic, isConstructor, entity.name);
         const property = {
             name: entity.name,
-            type: typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames),
+            type: this._convertType(entity.type, sectionName),
             source: {
                 fileName: source.fileName,
                 line: source.line,
@@ -384,29 +309,22 @@ export const typeDocUtils = {
             callPath,
         };
         return property;
-    },
-    _convertMethod(
-        entity: TypeDocNode,
-        isConstructor: boolean,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        classNames: string[],
-    ): TypescriptMethod {
+    }
+    private _convertMethod(entity: TypeDocNode, isConstructor: boolean, sectionName: string): TypescriptMethod {
         const signature = entity.signatures[0];
         const source = entity.sources[0];
         const hasComment = !_.isUndefined(signature.comment);
         const isStatic = _.isUndefined(entity.flags.isStatic) ? false : entity.flags.isStatic;
 
         const parameters = _.map(signature.parameters, param => {
-            return typeDocUtils._convertParameter(param, sections, sectionName, docId, classNames);
+            return this._convertParameter(param, sectionName);
         });
-        const returnType = typeDocUtils._convertType(signature.type, sections, sectionName, docId, classNames);
+        const returnType = this._convertType(signature.type, sectionName);
         const typeParameter = _.isUndefined(signature.typeParameter)
             ? undefined
-            : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId, classNames);
+            : this._convertTypeParameter(signature.typeParameter[0], sectionName);
 
-        const callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
+        const callPath = this._getCallPath(sectionName, isStatic, isConstructor, entity.name);
         const method = {
             isConstructor,
             isStatic,
@@ -416,6 +334,10 @@ export const typeDocUtils = {
             source: {
                 fileName: source.fileName,
                 line: source.line,
+                callPath,
+                parameters,
+                returnType,
+                typeParameter,
             },
             callPath,
             parameters,
@@ -423,8 +345,8 @@ export const typeDocUtils = {
             typeParameter,
         };
         return method;
-    },
-    _getCallPath(sectionName: string, isStatic: boolean, isConstructor: boolean, entityName: string): string {
+    }
+    private _getCallPath(sectionName: string, isStatic: boolean, isConstructor: boolean, entityName: string): string {
         // HACK: we use the fact that the sectionName is the same as the property name at the top-level
         // of the public interface. In the future, we shouldn't use this hack but rather get it from the JSON.
         let callPath;
@@ -435,32 +357,25 @@ export const typeDocUtils = {
             callPath = `${prefix}.`;
         }
         return callPath;
-    },
-    _convertFunction(
-        entity: TypeDocNode,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        isObjectLiteral: boolean,
-        classNames: string[],
-    ): TypescriptFunction {
+    }
+    private _convertFunction(entity: TypeDocNode, sectionName: string, isObjectLiteral: boolean): TypescriptFunction {
         const signature = entity.signatures[0];
         const source = entity.sources[0];
         const hasComment = !_.isUndefined(signature.comment);
 
         const parameters = _.map(signature.parameters, param => {
-            return typeDocUtils._convertParameter(param, sections, sectionName, docId, classNames);
+            return this._convertParameter(param, sectionName);
         });
-        const returnType = typeDocUtils._convertType(signature.type, sections, sectionName, docId, classNames);
+        const returnType = this._convertType(signature.type, sectionName);
         const typeParameter = _.isUndefined(signature.typeParameter)
             ? undefined
-            : typeDocUtils._convertTypeParameter(signature.typeParameter[0], sections, sectionName, docId, classNames);
+            : this._convertTypeParameter(signature.typeParameter[0], sectionName);
 
         let callPath = '';
         if (isObjectLiteral) {
             const isConstructor = false;
             const isStatic = false;
-            callPath = typeDocUtils._getCallPath(sectionName, isStatic, isConstructor, entity.name);
+            callPath = this._getCallPath(sectionName, isStatic, isConstructor, entity.name);
         }
         const func = {
             name: signature.name,
@@ -476,28 +391,16 @@ export const typeDocUtils = {
             typeParameter,
         };
         return func;
-    },
-    _convertTypeParameter(
-        entity: TypeDocNode,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        classNames: string[],
-    ): TypeParameter {
-        const type = typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames);
+    }
+    private _convertTypeParameter(entity: TypeDocNode, sectionName: string): TypeParameter {
+        const type = this._convertType(entity.type, sectionName);
         const parameter = {
             name: entity.name,
             type,
         };
         return parameter;
-    },
-    _convertParameter(
-        entity: TypeDocNode,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        classNames: string[],
-    ): Parameter {
+    }
+    private _convertParameter(entity: TypeDocNode, sectionName: string): Parameter {
         let comment = '<No comment>';
         if (entity.comment && entity.comment.shortText) {
             comment = entity.comment.shortText;
@@ -507,7 +410,7 @@ export const typeDocUtils = {
 
         const isOptional = !_.isUndefined(entity.flags.isOptional) ? entity.flags.isOptional : false;
 
-        const type = typeDocUtils._convertType(entity.type, sections, sectionName, docId, classNames);
+        const type = this._convertType(entity.type, sectionName);
 
         const parameter = {
             name: entity.name,
@@ -517,19 +420,13 @@ export const typeDocUtils = {
             type,
         };
         return parameter;
-    },
-    _convertType(
-        entity: TypeDocType,
-        sections: SectionsMap,
-        sectionName: string,
-        docId: string,
-        classNames: string[],
-    ): Type {
+    }
+    private _convertType(entity: TypeDocType, sectionName: string): Type {
         const typeArguments = _.map(entity.typeArguments, typeArgument => {
-            return typeDocUtils._convertType(typeArgument, sections, sectionName, docId, classNames);
+            return this._convertType(typeArgument, sectionName);
         });
         const types = _.map(entity.types, t => {
-            return typeDocUtils._convertType(t, sections, sectionName, docId, classNames);
+            return this._convertType(t, sectionName);
         });
 
         let indexSignatureIfExists;
@@ -538,23 +435,10 @@ export const typeDocUtils = {
             !_.isUndefined(entity.declaration) && !_.isUndefined(entity.declaration.indexSignature);
         if (doesIndexSignatureExist) {
             const indexSignature = entity.declaration.indexSignature as TypeDocNode;
-            indexSignatureIfExists = typeDocUtils._convertIndexSignature(
-                indexSignature,
-                sections,
-                sectionName,
-                docId,
-                classNames,
-            );
+            indexSignatureIfExists = this._convertIndexSignature(indexSignature, sectionName);
         } else if (!_.isUndefined(entity.declaration)) {
             const isConstructor = false;
-            methodIfExists = typeDocUtils._convertMethod(
-                entity.declaration,
-                isConstructor,
-                sections,
-                sectionName,
-                docId,
-                classNames,
-            );
+            methodIfExists = this._convertMethod(entity.declaration, isConstructor, sectionName);
         }
 
         const elementTypeIfExists = !_.isUndefined(entity.elementType)
@@ -564,10 +448,10 @@ export const typeDocUtils = {
               }
             : undefined;
 
-        const type = {
+        const type: Type = {
             name: entity.name,
             value: entity.value,
-            isExportedClassReference: _.includes(classNames, entity.name),
+            isExportedClassReference: _.includes(this._classNames, entity.name),
             typeDocType: entity.type,
             typeArguments,
             elementType: elementTypeIfExists,
@@ -575,6 +459,11 @@ export const typeDocUtils = {
             method: methodIfExists,
             indexSignature: indexSignatureIfExists,
         };
+        console.log('this._externalTypeToLink', this._externalTypeToLink);
+        const externalLinkIfExists = this._externalTypeToLink[entity.name];
+        if (!_.isUndefined(externalLinkIfExists)) {
+            type.externalLink = externalLinkIfExists;
+        }
         return type;
-    },
-};
+    }
+}
-- 
cgit v1.2.3


From bf9ee82d9f4a2fec392f0ee58342fc6b3be94dff Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 16 Aug 2018 13:59:50 -0700
Subject: Remove stray console log

---
 packages/react-docs/src/utils/typedoc_utils.ts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index db6063464..e10493673 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -33,7 +33,6 @@ export class TypeDocUtils {
     private _classNames: string[];
     constructor(generatedDocJson: GeneratedDocJson, docsInfo: DocsInfo) {
         this._docsInfo = docsInfo;
-        console.log('generatedDocJson.metadata', generatedDocJson.metadata);
         const exportPathOrder = generatedDocJson.metadata.exportPathOrder;
         const exportPathToTypedocNames = generatedDocJson.metadata.exportPathToTypedocNames;
         this._externalTypeToLink = generatedDocJson.metadata.externalTypeToLink;
-- 
cgit v1.2.3


From 8e3df2b5aeac9d6776640be1248863055c75cf4a Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 16 Aug 2018 14:57:45 -0700
Subject: Render external dep exports

---
 .../react-docs/src/components/documentation.tsx     | 20 ++++++++++++++++++++
 packages/react-docs/src/types.ts                    |  8 +++++++-
 packages/react-docs/src/utils/constants.ts          |  1 +
 packages/react-docs/src/utils/typedoc_utils.ts      | 21 +++++++++++++++++++--
 4 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 82e444018..43a1f746e 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -19,6 +19,7 @@ import {
     AddressByContractName,
     DocAgnosticFormat,
     Event,
+    ExternalExportToLink,
     Property,
     SolidityMethod,
     SupportedDocJson,
@@ -26,6 +27,7 @@ import {
     TypescriptFunction,
     TypescriptMethod,
 } from '../types';
+import { constants } from '../utils/constants';
 
 import { Badge } from './badge';
 import { Comment } from './comment';
@@ -300,6 +302,8 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                             <div>{eventDefs}</div>
                         </div>
                     )}
+                {!_.isUndefined(docSection.externalExportToLink) &&
+                    this._renderExternalExports(docSection.externalExportToLink)}
                 {!_.isUndefined(typeDefs) &&
                     typeDefs.length > 0 && (
                         <div>
@@ -309,6 +313,22 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
             </div>
         );
     }
+    private _renderExternalExports(externalExportToLink: ExternalExportToLink): React.ReactNode {
+        const externalExports = _.map(externalExportToLink, (link: string, exportName: string) => {
+            return (
+                <div className="pt2">
+                    <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
+                        {`import { `}
+                        <a href={link} target="_blank" style={{ color: colors.lightBlueA700, textDecoration: 'none' }}>
+                            {exportName}
+                        </a>
+                        {` } from '${this.props.docsInfo.displayName}'`}
+                    </code>
+                </div>
+            );
+        });
+        return <div>{externalExports}</div>;
+    }
     private _renderNetworkBadgesIfExists(sectionName: string): React.ReactNode {
         if (this.props.docsInfo.type !== SupportedDocJson.Doxity) {
             return null;
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 0155685e0..8352af876 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -105,8 +105,9 @@ export interface DocSection {
     methods: Array<TypescriptMethod | SolidityMethod>;
     properties: Property[];
     types: CustomType[];
-    functions?: TypescriptFunction[];
+    functions: TypescriptFunction[];
     events?: Event[];
+    externalExportToLink?: ExternalExportToLink;
 }
 
 export interface TypescriptMethod extends BaseMethod {
@@ -296,10 +297,15 @@ export interface ExternalTypeToLink {
     [externalTypeName: string]: string;
 }
 
+export interface ExternalExportToLink {
+    [externalExport: string]: string;
+}
+
 export interface Metadata {
     exportPathToTypedocNames: ExportNameToTypedocNames;
     exportPathOrder: string[];
     externalTypeToLink: ExternalTypeToLink;
+    externalExportToLink: ExternalExportToLink;
 }
 
 export interface GeneratedDocJson {
diff --git a/packages/react-docs/src/utils/constants.ts b/packages/react-docs/src/utils/constants.ts
index c3c74fd11..97bedf2db 100644
--- a/packages/react-docs/src/utils/constants.ts
+++ b/packages/react-docs/src/utils/constants.ts
@@ -2,6 +2,7 @@ import { SupportedDocJson } from '../types';
 
 export const constants = {
     TYPES_SECTION_NAME: 'types',
+    EXTERNAL_EXPORTS_SECTION_NAME: 'externalExports',
     TYPE_TO_SYNTAX: {
         [SupportedDocJson.Doxity]: 'solidity',
         [SupportedDocJson.TypeDoc]: 'typescript',
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index e10493673..989485dfc 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -7,13 +7,13 @@ import {
     CustomTypeChild,
     DocAgnosticFormat,
     DocSection,
+    ExternalExportToLink,
     ExternalTypeToLink,
     GeneratedDocJson,
     IndexSignature,
     KindString,
     Parameter,
     Property,
-    SectionsMap,
     Type,
     TypeDocNode,
     TypeDocType,
@@ -28,6 +28,7 @@ import { constants } from './constants';
 export class TypeDocUtils {
     private _typeDocNameOrder: string[];
     private _externalTypeToLink: ExternalTypeToLink;
+    private _externalExportToLink: ExternalExportToLink;
     private _docsInfo: DocsInfo;
     private _typeDocJson: TypeDocNode;
     private _classNames: string[];
@@ -36,6 +37,7 @@ export class TypeDocUtils {
         const exportPathOrder = generatedDocJson.metadata.exportPathOrder;
         const exportPathToTypedocNames = generatedDocJson.metadata.exportPathToTypedocNames;
         this._externalTypeToLink = generatedDocJson.metadata.externalTypeToLink;
+        this._externalExportToLink = generatedDocJson.metadata.externalExportToLink;
         this._typeDocJson = generatedDocJson.typedocJson;
 
         // TODO: Extract the non typeDoc exports, and render them somehow
@@ -88,6 +90,22 @@ export class TypeDocUtils {
     }
     public convertToDocAgnosticFormat(): DocAgnosticFormat {
         const docAgnosticFormat: DocAgnosticFormat = {};
+
+        if (!_.isEmpty(this._externalExportToLink)) {
+            this._docsInfo.sections[constants.EXTERNAL_EXPORTS_SECTION_NAME] = constants.EXTERNAL_EXPORTS_SECTION_NAME;
+            this._docsInfo.menu[constants.EXTERNAL_EXPORTS_SECTION_NAME] = [constants.EXTERNAL_EXPORTS_SECTION_NAME];
+            const docSection: DocSection = {
+                comment: 'This package also re-exports some third-party libraries for your convenience.',
+                constructors: [],
+                methods: [],
+                functions: [],
+                properties: [],
+                types: [],
+                externalExportToLink: this._externalExportToLink,
+            };
+            docAgnosticFormat[constants.EXTERNAL_EXPORTS_SECTION_NAME] = docSection;
+        }
+
         const typeEntities: TypeDocNode[] = [];
         _.each(this._typeDocNameOrder, typeDocName => {
             const fileChildIndex = _.findIndex(this._typeDocJson.children, child => child.name === typeDocName);
@@ -458,7 +476,6 @@ export class TypeDocUtils {
             method: methodIfExists,
             indexSignature: indexSignatureIfExists,
         };
-        console.log('this._externalTypeToLink', this._externalTypeToLink);
         const externalLinkIfExists = this._externalTypeToLink[entity.name];
         if (!_.isUndefined(externalLinkIfExists)) {
             type.externalLink = externalLinkIfExists;
-- 
cgit v1.2.3


From e47e9c5b34a2c189b6913c4c7082cb7ec256617f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 16 Aug 2018 15:01:52 -0700
Subject: Fix external exports section name

---
 packages/react-docs/src/utils/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/constants.ts b/packages/react-docs/src/utils/constants.ts
index 97bedf2db..0b08f2c3e 100644
--- a/packages/react-docs/src/utils/constants.ts
+++ b/packages/react-docs/src/utils/constants.ts
@@ -2,7 +2,7 @@ import { SupportedDocJson } from '../types';
 
 export const constants = {
     TYPES_SECTION_NAME: 'types',
-    EXTERNAL_EXPORTS_SECTION_NAME: 'externalExports',
+    EXTERNAL_EXPORTS_SECTION_NAME: 'external exports',
     TYPE_TO_SYNTAX: {
         [SupportedDocJson.Doxity]: 'solidity',
         [SupportedDocJson.TypeDoc]: 'typescript',
-- 
cgit v1.2.3


From fb637d92347917528e0955e291da5d07006f28e2 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 17 Aug 2018 16:09:04 -0700
Subject: Make sure we don't render protected properties

---
 packages/react-docs/src/utils/typedoc_utils.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 989485dfc..8ee76c98c 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -76,6 +76,9 @@ export class TypeDocUtils {
     public isProperty(entity: TypeDocNode): boolean {
         return entity.kindString === KindString.Property;
     }
+    public isUnderscorePrefixed(name: string): boolean {
+        return _.startsWith(name, '_');
+    }
     public getModuleDefinitionsBySectionName(versionDocObj: TypeDocNode, configModulePaths: string[]): TypeDocNode[] {
         const moduleDefinitions: TypeDocNode[] = [];
         const jsonModules = versionDocObj.children;
@@ -189,8 +192,7 @@ export class TypeDocUtils {
                 case KindString.Function:
                     if (entity.flags.isExported) {
                         const funcName = (entity as TypeDocNode).signatures[0].name;
-                        const isPublicFunc = !_.startsWith(funcName, '_');
-                        if (isPublicFunc) {
+                        if (!this.isUnderscorePrefixed(funcName)) {
                             const func = this._convertFunction(entity, sectionName, isClassOrObjectLiteral);
                             docSection.functions.push(func);
                         }
@@ -198,7 +200,7 @@ export class TypeDocUtils {
                     break;
 
                 case KindString.Method:
-                    if (entity.flags.isPublic) {
+                    if (entity.flags.isPublic && !this.isUnderscorePrefixed(entity.name)) {
                         isConstructor = false;
                         const method = this._convertMethod(entity, isConstructor, sectionName);
                         docSection.methods.push(method);
@@ -206,8 +208,10 @@ export class TypeDocUtils {
                     break;
 
                 case KindString.Property: {
-                    const property = this._convertProperty(entity, sectionName);
-                    docSection.properties.push(property);
+                    if (!this.isUnderscorePrefixed(entity.name)) {
+                        const property = this._convertProperty(entity, sectionName);
+                        docSection.properties.push(property);
+                    }
                     break;
                 }
 
-- 
cgit v1.2.3


From ab7d083aa53f69d98c59529cb708815bf013aa6c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 21 Aug 2018 15:39:39 +0100
Subject: Add missing key

---
 packages/react-docs/src/components/documentation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 43a1f746e..0adadb30b 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -316,7 +316,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
     private _renderExternalExports(externalExportToLink: ExternalExportToLink): React.ReactNode {
         const externalExports = _.map(externalExportToLink, (link: string, exportName: string) => {
             return (
-                <div className="pt2">
+                <div className="pt2" key={`external-export-${exportName}`}>
                     <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
                         {`import { `}
                         <a href={link} target="_blank" style={{ color: colors.lightBlueA700, textDecoration: 'none' }}>
-- 
cgit v1.2.3


From 809d301d582a01ff70958f380a7f8c4afe898366 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 21 Aug 2018 17:48:24 +0100
Subject: Fix lowercase names involving ERC acronym

---
 packages/react-docs/src/utils/typedoc_utils.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 8ee76c98c..0eaf5fd6e 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -374,11 +374,17 @@ export class TypeDocUtils {
         if (isConstructor || entityName === '__type') {
             callPath = '';
         } else {
-            const prefix = isStatic ? sectionName : `${sectionName[0].toLowerCase()}${sectionName.slice(1)}`;
+            const prefix = isStatic ? sectionName : this._getLowercaseSectionName(sectionName);
             callPath = `${prefix}.`;
         }
         return callPath;
     }
+    private _getLowercaseSectionName(sectionName: string) {
+        if (_.startsWith(sectionName, 'ERC')) {
+            return `${sectionName.slice(0, 3).toLowerCase()}${sectionName.slice(3)}`;
+        }
+        return `${sectionName[0].toLowerCase()}${sectionName.slice(1)}`;
+    }
     private _convertFunction(entity: TypeDocNode, sectionName: string, isObjectLiteral: boolean): TypescriptFunction {
         const signature = entity.signatures[0];
         const source = entity.sources[0];
-- 
cgit v1.2.3


From 7c29cadb1722b7ac6df7db8c947cc5eaad24edaf Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 22 Aug 2018 16:11:42 +0100
Subject: Use actual packageName for external example imports

---
 packages/react-docs/src/components/documentation.tsx | 2 +-
 packages/react-docs/src/docs_info.ts                 | 2 ++
 packages/react-docs/src/types.ts                     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 0adadb30b..9d9b5141a 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -322,7 +322,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                         <a href={link} target="_blank" style={{ color: colors.lightBlueA700, textDecoration: 'none' }}>
                             {exportName}
                         </a>
-                        {` } from '${this.props.docsInfo.displayName}'`}
+                        {` } from '${this.props.docsInfo.packageName}'`}
                     </code>
                 </div>
             );
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 9e990ffc5..f429a34cb 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -21,6 +21,7 @@ export class DocsInfo {
     public id: string;
     public type: SupportedDocJson;
     public displayName: string;
+    public packageName: string;
     public packageUrl: string;
     public menu: DocsMenu;
     public sections: SectionsMap;
@@ -31,6 +32,7 @@ export class DocsInfo {
         this.type = config.type;
         this.menu = config.markdownMenu;
         this.displayName = config.displayName;
+        this.packageName = config.packageName;
         this.packageUrl = config.packageUrl;
         this.sections = config.markdownSections;
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 8352af876..7fd785e32 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -4,6 +4,7 @@ export interface SectionNameToMarkdownByVersion {
 
 export interface DocsInfoConfig {
     id: string;
+    packageName: string;
     type: SupportedDocJson;
     displayName: string;
     packageUrl: string;
@@ -309,6 +310,7 @@ export interface Metadata {
 }
 
 export interface GeneratedDocJson {
+    version: string;
     metadata: Metadata;
     typedocJson: TypeDocNode;
 }
-- 
cgit v1.2.3


From b7c119b2aaaa2f3579ca4aeef198eca7f38f1216 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 22 Aug 2018 18:52:17 +0100
Subject: Fix many linter errors that showed up upon upgrading tsutil

---
 packages/react-docs/src/utils/typedoc_utils.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 0eaf5fd6e..76443ad81 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -26,12 +26,12 @@ import {
 import { constants } from './constants';
 
 export class TypeDocUtils {
-    private _typeDocNameOrder: string[];
-    private _externalTypeToLink: ExternalTypeToLink;
-    private _externalExportToLink: ExternalExportToLink;
-    private _docsInfo: DocsInfo;
-    private _typeDocJson: TypeDocNode;
-    private _classNames: string[];
+    private readonly _typeDocNameOrder: string[];
+    private readonly _externalTypeToLink: ExternalTypeToLink;
+    private readonly _externalExportToLink: ExternalExportToLink;
+    private readonly _docsInfo: DocsInfo;
+    private readonly _typeDocJson: TypeDocNode;
+    private readonly _classNames: string[];
     constructor(generatedDocJson: GeneratedDocJson, docsInfo: DocsInfo) {
         this._docsInfo = docsInfo;
         const exportPathOrder = generatedDocJson.metadata.exportPathOrder;
@@ -191,7 +191,7 @@ export class TypeDocUtils {
 
                 case KindString.Function:
                     if (entity.flags.isExported) {
-                        const funcName = (entity as TypeDocNode).signatures[0].name;
+                        const funcName = entity.signatures[0].name;
                         if (!this.isUnderscorePrefixed(funcName)) {
                             const func = this._convertFunction(entity, sectionName, isClassOrObjectLiteral);
                             docSection.functions.push(func);
@@ -262,7 +262,7 @@ export class TypeDocUtils {
             ? this._convertMethod(entity.declaration, isConstructor, sectionName)
             : undefined;
         const doesIndexSignatureExist = !_.isUndefined(entity.indexSignature);
-        const indexSignature = entity.indexSignature as TypeDocNode;
+        const indexSignature = entity.indexSignature;
         const indexSignatureIfExists = doesIndexSignatureExist
             ? this._convertIndexSignature(indexSignature, sectionName)
             : undefined;
@@ -379,7 +379,7 @@ export class TypeDocUtils {
         }
         return callPath;
     }
-    private _getLowercaseSectionName(sectionName: string) {
+    private _getLowercaseSectionName(sectionName: string): string {
         if (_.startsWith(sectionName, 'ERC')) {
             return `${sectionName.slice(0, 3).toLowerCase()}${sectionName.slice(3)}`;
         }
@@ -461,7 +461,7 @@ export class TypeDocUtils {
         const doesIndexSignatureExist =
             !_.isUndefined(entity.declaration) && !_.isUndefined(entity.declaration.indexSignature);
         if (doesIndexSignatureExist) {
-            const indexSignature = entity.declaration.indexSignature as TypeDocNode;
+            const indexSignature = entity.declaration.indexSignature;
             indexSignatureIfExists = this._convertIndexSignature(indexSignature, sectionName);
         } else if (!_.isUndefined(entity.declaration)) {
             const isConstructor = false;
-- 
cgit v1.2.3


From 610caef73faf735a9b9f38863acee007280151be Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 23 Aug 2018 15:08:02 +0100
Subject: Fix comments

---
 packages/react-docs/src/utils/typedoc_utils.ts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 76443ad81..b867b51b4 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -40,7 +40,6 @@ export class TypeDocUtils {
         this._externalExportToLink = generatedDocJson.metadata.externalExportToLink;
         this._typeDocJson = generatedDocJson.typedocJson;
 
-        // TODO: Extract the non typeDoc exports, and render them somehow
         this._typeDocNameOrder = _.compact(
             _.flatten(
                 _.map(exportPathOrder, exportPath => {
-- 
cgit v1.2.3


From 28f077b16f5fc5f08f95bb2ad00724e6ea89dd00 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 23 Aug 2018 16:55:41 +0100
Subject: Add support for rending the Tuple type

---
 packages/react-docs/src/components/type.tsx    | 22 ++++++++++++++++++++++
 packages/react-docs/src/types.ts               |  8 ++++++++
 packages/react-docs/src/utils/typedoc_utils.ts |  6 ++++++
 3 files changed, 36 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 145c797a3..5f7601ce1 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -167,6 +167,28 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
             });
             break;
 
+        case TypeDocTypes.Tuple:
+            const tupleTypes = _.map(type.tupleElements, t => {
+                return (
+                    <Type
+                        key={`type-tuple-${t.name}-${t.typeDocType}`}
+                        type={t}
+                        sectionName={props.sectionName}
+                        typeDefinitionByName={props.typeDefinitionByName}
+                        docsInfo={props.docsInfo}
+                        isInPopover={props.isInPopover}
+                    />
+                );
+            });
+            typeName = (
+                <div>
+                    [{_.reduce(tupleTypes, (prev: React.ReactNode, curr: React.ReactNode) => {
+                        return [prev, ', ', curr];
+                    })}]
+                </div>
+            );
+            break;
+
         default:
             throw errorUtils.spawnSwitchErr('type.typeDocType', type.typeDocType);
     }
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 7fd785e32..f9cb5e26a 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -31,6 +31,12 @@ export interface TypeDocType {
     declaration: TypeDocNode;
     elementType?: TypeDocType;
     indexSignature?: TypeDocNode;
+    elements?: TupleElement[];
+}
+
+export interface TupleElement {
+    type: string;
+    name: string;
 }
 
 export interface TypeDocFlags {
@@ -78,6 +84,7 @@ export enum TypeDocTypes {
     Union = 'union',
     TypeParameter = 'typeParameter',
     Intersection = 'intersection',
+    Tuple = 'tuple',
     Unknown = 'unknown',
 }
 
@@ -157,6 +164,7 @@ export interface Type {
     method?: TypescriptMethod;
     indexSignature?: IndexSignature;
     externalLink?: string;
+    tupleElements?: Type[];
 }
 
 export interface ElementType {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index b867b51b4..67e37e82d 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -457,6 +457,7 @@ export class TypeDocUtils {
 
         let indexSignatureIfExists;
         let methodIfExists;
+        let tupleElementsIfExists;
         const doesIndexSignatureExist =
             !_.isUndefined(entity.declaration) && !_.isUndefined(entity.declaration.indexSignature);
         if (doesIndexSignatureExist) {
@@ -465,6 +466,10 @@ export class TypeDocUtils {
         } else if (!_.isUndefined(entity.declaration)) {
             const isConstructor = false;
             methodIfExists = this._convertMethod(entity.declaration, isConstructor, sectionName);
+        } else if (entity.type === TypeDocTypes.Tuple) {
+            tupleElementsIfExists = _.map(entity.elements, el => {
+                return { name: el.name, typeDocType: el.type as TypeDocTypes };
+            });
         }
 
         const elementTypeIfExists = !_.isUndefined(entity.elementType)
@@ -484,6 +489,7 @@ export class TypeDocUtils {
             types,
             method: methodIfExists,
             indexSignature: indexSignatureIfExists,
+            tupleElements: tupleElementsIfExists,
         };
         const externalLinkIfExists = this._externalTypeToLink[entity.name];
         if (!_.isUndefined(externalLinkIfExists)) {
-- 
cgit v1.2.3


From 0ca64e394b8070fde892f61a65a640c7443d5108 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 23 Aug 2018 17:37:40 +0100
Subject: Fix linter

---
 packages/react-docs/src/utils/typedoc_utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 67e37e82d..f44945369 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -497,4 +497,4 @@ export class TypeDocUtils {
         }
         return type;
     }
-}
+} // tslint:disable:max-file-line-count
-- 
cgit v1.2.3


From b38ef579fb75c777fac2eef3d4bcda2c97014f0b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 24 Aug 2018 19:11:10 +0100
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json |  9 +++++++++
 packages/react-docs/CHANGELOG.md   | 12 ++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 2b83b7fae..5ca4f4d05 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1535133899,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1534210131,
         "version": "1.0.5",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 38d2451dd..09d666d75 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.6 - _August 24, 2018_
+
+    * Dependencies updated
+
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
@@ -25,7 +29,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 19, 2018_
+## v1.0.0 - _July 20, 2018_
 
     * Dependencies updated
 
@@ -45,7 +49,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.0.13 - _May 31, 2018_
+## v0.0.13 - _June 1, 2018_
 
     * Incorrect publish that was unpublished
 
@@ -53,7 +57,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.0.11 - _May 4, 2018_
+## v0.0.11 - _May 5, 2018_
 
     * Dependencies updated
 
-- 
cgit v1.2.3


From 7f585a15f526e0a61fd822cdefb7087fc6bb8934 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 24 Aug 2018 19:11:27 +0100
Subject: Publish

 - 0x.js@1.0.1-rc.4
 - @0xproject/abi-gen@1.0.6
 - @0xproject/assert@1.0.6
 - @0xproject/base-contract@2.0.0
 - @0xproject/connect@2.0.0-rc.1
 - @0xproject/contract-wrappers@1.0.1-rc.4
 - contracts@2.1.41
 - @0xproject/dev-utils@1.0.5
 - ethereum-types@1.0.5
 - @0xproject/fill-scenarios@1.0.1-rc.4
 - @0xproject/forwarder-helper@1.0.1-rc.1
 - @0xproject/json-schemas@1.0.1-rc.5
 - @0xproject/metacoin@0.0.16
 - @0xproject/migrations@1.0.5
 - @0xproject/monorepo-scripts@1.0.6
 - @0xproject/order-utils@1.0.1-rc.4
 - @0xproject/order-watcher@1.0.1-rc.4
 - @0xproject/react-docs@1.0.6
 - @0xproject/react-shared@1.0.7
 - @0xproject/sol-compiler@1.1.0
 - @0xproject/sol-cov@2.1.0
 - @0xproject/sol-resolver@1.0.6
 - @0xproject/sra-api@1.0.1-rc.5
 - @0xproject/sra-report@1.0.6
 - @0xproject/subproviders@2.0.0
 - @0xproject/testnet-faucets@1.0.42
 - @0xproject/tslint-config@1.0.6
 - @0xproject/types@1.0.1-rc.5
 - @0xproject/typescript-typings@1.0.5
 - @0xproject/utils@1.0.6
 - @0xproject/web3-wrapper@2.0.0
 - @0xproject/website@0.0.45
---
 packages/react-docs/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index aeface8d7..47b266e8e 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,8 +24,8 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.5",
+        "@0xproject/dev-utils": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.6",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
@@ -34,8 +34,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.6",
-        "@0xproject/utils": "^1.0.5",
+        "@0xproject/react-shared": "^1.0.7",
+        "@0xproject/utils": "^1.0.6",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
-- 
cgit v1.2.3


From 374ee2db329aee32e59d487152b2a3b66e25144d Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 24 Aug 2018 15:05:46 -0700
Subject: Upgrade react in react-docs

---
 packages/react-docs/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 47b266e8e..ecd3d955d 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -46,8 +46,8 @@
         "compare-versions": "^3.0.1",
         "lodash": "^4.17.5",
         "material-ui": "^0.17.1",
-        "react": "15.6.1",
-        "react-dom": "15.6.1",
+        "react": "^16.4.2",
+        "react-dom": "^16.4.2",
         "react-markdown": "^3.2.2",
         "react-scroll": "0xproject/react-scroll#similar-to-pr-330",
         "react-tooltip": "^3.2.7",
-- 
cgit v1.2.3


From 4475fefd07cac0ca166d31526edf4738cca1f16c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 27 Aug 2018 14:47:56 +0100
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 5ca4f4d05..0e41576b6 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1535377027,
+        "version": "1.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1535133899,
         "version": "1.0.6",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 09d666d75..a06e0f442 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.7 - _August 27, 2018_
+
+    * Dependencies updated
+
 ## v1.0.6 - _August 24, 2018_
 
     * Dependencies updated
-- 
cgit v1.2.3


From 00a4fa5f7c1da8deae703b36b6bbed024cf9e111 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 27 Aug 2018 14:48:24 +0100
Subject: Publish

 - 0x.js@1.0.1-rc.6
 - @0xproject/abi-gen@1.0.7
 - @0xproject/assert@1.0.7
 - @0xproject/base-contract@2.0.1
 - @0xproject/connect@2.0.0-rc.2
 - @0xproject/contract-wrappers@1.0.1-rc.5
 - contracts@2.1.42
 - @0xproject/dev-utils@1.0.6
 - @0xproject/fill-scenarios@1.0.1-rc.5
 - @0xproject/forwarder-helper@1.0.1-rc.2
 - @0xproject/json-schemas@1.0.1-rc.6
 - @0xproject/metacoin@0.0.17
 - @0xproject/migrations@1.0.6
 - @0xproject/monorepo-scripts@1.0.7
 - @0xproject/order-utils@1.0.1-rc.6
 - @0xproject/order-watcher@1.0.1-rc.5
 - @0xproject/react-docs@1.0.7
 - @0xproject/react-shared@1.0.8
 - @0xproject/sol-compiler@1.1.1
 - @0xproject/sol-cov@2.1.1
 - @0xproject/sol-resolver@1.0.7
 - @0xproject/sra-report@1.0.7
 - @0xproject/sra-spec@1.0.1-rc.6
 - @0xproject/subproviders@2.0.1
 - @0xproject/testnet-faucets@1.0.43
 - @0xproject/types@1.0.1-rc.6
 - @0xproject/utils@1.0.7
 - @0xproject/web3-wrapper@2.0.1
 - @0xproject/website@0.0.46
---
 packages/react-docs/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 47b266e8e..9e95e69d0 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,7 +24,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.5",
+        "@0xproject/dev-utils": "^1.0.6",
         "@0xproject/tslint-config": "^1.0.6",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
@@ -34,8 +34,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.7",
-        "@0xproject/utils": "^1.0.6",
+        "@0xproject/react-shared": "^1.0.8",
+        "@0xproject/utils": "^1.0.7",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
-- 
cgit v1.2.3


From ac135d55d369e456fbec754707842d5c81795aa3 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Tue, 28 Aug 2018 15:32:15 -0700
Subject: Upgrade material ui in react-docs

---
 packages/react-docs/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index ad35b8e13..4ad0b0c19 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -37,7 +37,7 @@
         "@0xproject/react-shared": "^1.0.8",
         "@0xproject/utils": "^1.0.7",
         "@types/lodash": "4.14.104",
-        "@types/material-ui": "0.18.0",
+        "@types/material-ui": "^0.20.0",
         "@types/node": "^8.0.53",
         "@types/react": "*",
         "@types/react-dom": "*",
@@ -45,7 +45,7 @@
         "basscss": "^8.0.3",
         "compare-versions": "^3.0.1",
         "lodash": "^4.17.5",
-        "material-ui": "^0.17.1",
+        "material-ui": "^0.20.0",
         "react": "^16.4.2",
         "react-dom": "^16.4.2",
         "react-markdown": "^3.2.2",
-- 
cgit v1.2.3


From 775d1efd4607a4097704fe3c4f7ae1156b2c1a6f Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Thu, 23 Aug 2018 14:00:34 -0400
Subject: add package sol-doc

---
 packages/react-docs/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts
index e4424f679..8b3a146db 100644
--- a/packages/react-docs/src/index.ts
+++ b/packages/react-docs/src/index.ts
@@ -18,6 +18,7 @@ export { DocsInfo } from './docs_info';
 export {
     DocsInfoConfig,
     DocAgnosticFormat,
+    DocSection,
     DoxityDocObj,
     DocsMenu,
     SupportedDocJson,
-- 
cgit v1.2.3


From e7d5ceb9c5487a5851dbfc1f8bdbe0182fedaef2 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Wed, 29 Aug 2018 11:15:30 -0700
Subject: feat: Add support for TypeScript project references (#991)

* Update all package.json and tsconfig.json

* fix(contracts): Make test/utils/web3_wrapper.ts compatible with project refs

* Fix webpack config for 0x.js

* Fix linter errors by adding rootDir to tsconfig.json as needed

* Add build:ts and watch:ts commands to package.json

* Update sra-spec to work with project references

* Update tsconfig.json with latest new/removed packages

* Add TypeScript as devDependency at root

* Add missing rootDir to forwarder-helper package

* Use a separate tsconfig file for typedoc

* Fix linter errors

* Apply PR feedback (add comments)

* Fix 0x.js tsconfig
---
 packages/react-docs/package.json  | 3 +--
 packages/react-docs/tsconfig.json | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 9e95e69d0..edd55a9b5 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -9,8 +9,7 @@
     "types": "lib/index.d.ts",
     "scripts": {
         "lint": "tslint --project .",
-        "build": "tsc",
-        "watch_without_deps": "tsc -w",
+        "build": "tsc -b",
         "clean": "shx rm -rf lib"
     },
     "author": "Fabio Berger",
diff --git a/packages/react-docs/tsconfig.json b/packages/react-docs/tsconfig.json
index 82f44a62c..76e2cd027 100644
--- a/packages/react-docs/tsconfig.json
+++ b/packages/react-docs/tsconfig.json
@@ -1,9 +1,10 @@
 {
     "extends": "../../tsconfig",
     "compilerOptions": {
-        "outDir": "./lib/",
+        "outDir": "lib",
+        "rootDir": "src",
         "jsx": "react",
-        "baseUrl": "./",
+        "baseUrl": ".",
         "strictNullChecks": false,
         "paths": {
             "*": ["node_modules/@types/*", "*"]
-- 
cgit v1.2.3


From f429032eef007bafaed108171631f4b3d3233f6b Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Thu, 30 Aug 2018 08:22:44 -0400
Subject: move shared doc types from react-docs to @0x/types

---
 packages/react-docs/package.json                   |   1 +
 packages/react-docs/src/components/custom_enum.tsx |   2 +-
 .../react-docs/src/components/documentation.tsx    |  17 +-
 .../react-docs/src/components/event_definition.tsx |   2 +-
 packages/react-docs/src/components/interface.tsx   |   3 +-
 .../react-docs/src/components/property_block.tsx   |   2 +-
 packages/react-docs/src/components/signature.tsx   |   3 +-
 .../react-docs/src/components/signature_block.tsx  |   8 +-
 packages/react-docs/src/components/source_link.tsx |   3 +-
 packages/react-docs/src/components/type.tsx        |   2 +-
 .../react-docs/src/components/type_definition.tsx  |   3 +-
 packages/react-docs/src/docs_info.ts               |   4 +-
 packages/react-docs/src/index.ts                   |  13 +-
 packages/react-docs/src/types.ts                   | 224 ---------------------
 packages/react-docs/src/utils/doxity_utils.ts      |   9 +-
 packages/react-docs/src/utils/typedoc_utils.ts     |  12 +-
 16 files changed, 40 insertions(+), 268 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 9e95e69d0..adc06a501 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -35,6 +35,7 @@
     },
     "dependencies": {
         "@0xproject/react-shared": "^1.0.8",
+        "@0xproject/types": "^1.0.1-rc.6",
         "@0xproject/utils": "^1.0.7",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
diff --git a/packages/react-docs/src/components/custom_enum.tsx b/packages/react-docs/src/components/custom_enum.tsx
index c4252d9e2..fa7c43146 100644
--- a/packages/react-docs/src/components/custom_enum.tsx
+++ b/packages/react-docs/src/components/custom_enum.tsx
@@ -2,7 +2,7 @@ import { logUtils } from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 
-import { CustomType } from '../types';
+import { CustomType } from '@0xproject/types';
 
 const STRING_ENUM_CODE_PREFIX = ' strEnum(';
 
diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 9d9b5141a..16a99713c 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -9,24 +9,23 @@ import {
     Styles,
     utils as sharedUtils,
 } from '@0xproject/react-shared';
-import * as _ from 'lodash';
-import CircularProgress from 'material-ui/CircularProgress';
-import * as React from 'react';
-import * as semver from 'semver';
-
-import { DocsInfo } from '../docs_info';
 import {
-    AddressByContractName,
     DocAgnosticFormat,
     Event,
     ExternalExportToLink,
     Property,
     SolidityMethod,
-    SupportedDocJson,
     TypeDefinitionByName,
     TypescriptFunction,
     TypescriptMethod,
-} from '../types';
+} from '@0xproject/types';
+import * as _ from 'lodash';
+import CircularProgress from 'material-ui/CircularProgress';
+import * as React from 'react';
+import * as semver from 'semver';
+
+import { DocsInfo } from '../docs_info';
+import { AddressByContractName, SupportedDocJson } from '../types';
 import { constants } from '../utils/constants';
 
 import { Badge } from './badge';
diff --git a/packages/react-docs/src/components/event_definition.tsx b/packages/react-docs/src/components/event_definition.tsx
index 6cb80c6b0..37236275b 100644
--- a/packages/react-docs/src/components/event_definition.tsx
+++ b/packages/react-docs/src/components/event_definition.tsx
@@ -1,9 +1,9 @@
 import { AnchorTitle, colors, HeaderSizes } from '@0xproject/react-shared';
+import { Event, EventArg } from '@0xproject/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { Event, EventArg } from '../types';
 
 import { Type } from './type';
 
diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index 93b10e96d..9f0800d71 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -1,8 +1,9 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 
+import { CustomType, TypeDefinitionByName } from '@0xproject/types';
+
 import { DocsInfo } from '../docs_info';
-import { CustomType, TypeDefinitionByName } from '../types';
 
 import { Signature } from './signature';
 import { Type } from './type';
diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
index f181e21d2..8434e8682 100644
--- a/packages/react-docs/src/components/property_block.tsx
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -1,8 +1,8 @@
 import { AnchorTitle, HeaderSizes } from '@0xproject/react-shared';
+import { Property, TypeDefinitionByName } from '@0xproject/types';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { Property, TypeDefinitionByName } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index bf9c8be24..9eb8a7d86 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -1,8 +1,9 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 
+import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '@0xproject/types';
+
 import { DocsInfo } from '../docs_info';
-import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '../types';
 
 import { Type } from './type';
 
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 05145dc23..1ea0ea28c 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -1,9 +1,15 @@
 import { AnchorTitle, colors, HeaderSizes, Styles } from '@0xproject/react-shared';
+import {
+    Parameter,
+    SolidityMethod,
+    TypeDefinitionByName,
+    TypescriptFunction,
+    TypescriptMethod,
+} from '@0xproject/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { Parameter, SolidityMethod, TypeDefinitionByName, TypescriptFunction, TypescriptMethod } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
diff --git a/packages/react-docs/src/components/source_link.tsx b/packages/react-docs/src/components/source_link.tsx
index c60435ea6..3096ad8d5 100644
--- a/packages/react-docs/src/components/source_link.tsx
+++ b/packages/react-docs/src/components/source_link.tsx
@@ -1,8 +1,7 @@
 import { colors } from '@0xproject/react-shared';
+import { Source } from '@0xproject/types';
 import * as React from 'react';
 
-import { Source } from '../types';
-
 export interface SourceLinkProps {
     source: Source;
     sourceUrl: string;
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 5f7601ce1..156a3496d 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -1,4 +1,5 @@
 import { colors, constants as sharedConstants, utils as sharedUtils } from '@0xproject/react-shared';
+import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '@0xproject/types';
 import { errorUtils } from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
@@ -6,7 +7,6 @@ import { Link as ScrollLink } from 'react-scroll';
 import * as ReactTooltip from 'react-tooltip';
 
 import { DocsInfo } from '../docs_info';
-import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '../types';
 import { constants } from '../utils/constants';
 
 import { Signature } from './signature';
diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index 8d1f88490..09cb3ff74 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -1,10 +1,11 @@
 import { AnchorTitle, colors, HeaderSizes } from '@0xproject/react-shared';
+import { CustomType, CustomTypeChild, TypeDefinitionByName, TypeDocTypes } from '@0xproject/types';
 import { errorUtils } from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { CustomType, CustomTypeChild, KindString, TypeDefinitionByName, TypeDocTypes } from '../types';
+import { KindString } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index f429a34cb..f9137d69d 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,18 +1,16 @@
 import { MenuSubsectionsBySection } from '@0xproject/react-shared';
+import { DocAgnosticFormat, GeneratedDocJson, TypeDefinitionByName } from '@0xproject/types';
 import compareVersions = require('compare-versions');
 import * as _ from 'lodash';
 
 import {
     ContractsByVersionByNetworkId,
-    DocAgnosticFormat,
     DocsInfoConfig,
     DocsMenu,
     DoxityDocObj,
-    GeneratedDocJson,
     SectionNameToMarkdownByVersion,
     SectionsMap,
     SupportedDocJson,
-    TypeDefinitionByName,
 } from './types';
 import { doxityUtils } from './utils/doxity_utils';
 import { TypeDocUtils } from './utils/typedoc_utils';
diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts
index 8b3a146db..8a2c215b8 100644
--- a/packages/react-docs/src/index.ts
+++ b/packages/react-docs/src/index.ts
@@ -1,3 +1,5 @@
+export { DocAgnosticFormat, GeneratedDocJson } from '@0xproject/types';
+
 // Exported to give users of this library added flexibility if they want to build
 // a docs page from scratch using the individual components.
 export { Badge } from './components/badge';
@@ -15,15 +17,6 @@ export { Type } from './components/type';
 
 export { DocsInfo } from './docs_info';
 
-export {
-    DocsInfoConfig,
-    DocAgnosticFormat,
-    DocSection,
-    DoxityDocObj,
-    DocsMenu,
-    SupportedDocJson,
-    TypeDocNode,
-    GeneratedDocJson,
-} from './types';
+export { DocsInfoConfig, DoxityDocObj, DocsMenu, SupportedDocJson } from './types';
 
 export { constants } from './utils/constants';
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index f9cb5e26a..454190342 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -22,72 +22,6 @@ export interface SectionsMap {
     [sectionName: string]: string;
 }
 
-export interface TypeDocType {
-    type: TypeDocTypes;
-    value: string;
-    name: string;
-    types: TypeDocType[];
-    typeArguments?: TypeDocType[];
-    declaration: TypeDocNode;
-    elementType?: TypeDocType;
-    indexSignature?: TypeDocNode;
-    elements?: TupleElement[];
-}
-
-export interface TupleElement {
-    type: string;
-    name: string;
-}
-
-export interface TypeDocFlags {
-    isStatic?: boolean;
-    isOptional?: boolean;
-    isPublic?: boolean;
-    isExported?: boolean;
-}
-
-export interface TypeDocGroup {
-    title: string;
-    children: number[];
-}
-
-export interface TypeDocNode {
-    id?: number;
-    name?: string;
-    kind?: string;
-    defaultValue?: string;
-    kindString?: string;
-    type?: TypeDocType;
-    fileName?: string;
-    line?: number;
-    comment?: TypeDocNode;
-    text?: string;
-    shortText?: string;
-    returns?: string;
-    declaration: TypeDocNode;
-    flags?: TypeDocFlags;
-    indexSignature?: TypeDocNode;
-    signatures?: TypeDocNode[];
-    parameters?: TypeDocNode[];
-    typeParameter?: TypeDocNode[];
-    sources?: TypeDocNode[];
-    children?: TypeDocNode[];
-    groups?: TypeDocGroup[];
-}
-
-export enum TypeDocTypes {
-    Intrinsic = 'intrinsic',
-    Reference = 'reference',
-    Array = 'array',
-    StringLiteral = 'stringLiteral',
-    Reflection = 'reflection',
-    Union = 'union',
-    TypeParameter = 'typeParameter',
-    Intersection = 'intersection',
-    Tuple = 'tuple',
-    Unknown = 'unknown',
-}
-
 // Exception: We don't make the values uppercase because these KindString's need to
 // match up those returned by TypeDoc
 export enum KindString {
@@ -103,139 +37,6 @@ export enum KindString {
     Class = 'Class',
 }
 
-export interface DocAgnosticFormat {
-    [sectionName: string]: DocSection;
-}
-
-export interface DocSection {
-    comment: string;
-    constructors: Array<TypescriptMethod | SolidityMethod>;
-    methods: Array<TypescriptMethod | SolidityMethod>;
-    properties: Property[];
-    types: CustomType[];
-    functions: TypescriptFunction[];
-    events?: Event[];
-    externalExportToLink?: ExternalExportToLink;
-}
-
-export interface TypescriptMethod extends BaseMethod {
-    source?: Source;
-    isStatic?: boolean;
-    typeParameter?: TypeParameter;
-}
-
-export interface TypescriptFunction extends BaseFunction {
-    source?: Source;
-    typeParameter?: TypeParameter;
-    callPath: string;
-}
-
-export interface SolidityMethod extends BaseMethod {
-    isConstant?: boolean;
-    isPayable?: boolean;
-}
-
-export interface Source {
-    fileName: string;
-    line: number;
-}
-
-export interface Parameter {
-    name: string;
-    comment: string;
-    isOptional: boolean;
-    type: Type;
-    defaultValue?: string;
-}
-
-export interface TypeParameter {
-    name: string;
-    type: Type;
-}
-
-export interface Type {
-    name: string;
-    typeDocType: TypeDocTypes;
-    value?: string;
-    isExportedClassReference?: boolean;
-    typeArguments?: Type[];
-    elementType?: ElementType;
-    types?: Type[];
-    method?: TypescriptMethod;
-    indexSignature?: IndexSignature;
-    externalLink?: string;
-    tupleElements?: Type[];
-}
-
-export interface ElementType {
-    name: string;
-    typeDocType: TypeDocTypes;
-}
-
-export interface IndexSignature {
-    keyName: string;
-    keyType: Type;
-    valueName: string;
-}
-
-export interface CustomType {
-    name: string;
-    kindString: string;
-    type?: Type;
-    method?: TypescriptMethod;
-    indexSignature?: IndexSignature;
-    defaultValue?: string;
-    comment?: string;
-    children?: CustomTypeChild[];
-}
-
-export interface CustomTypeChild {
-    name: string;
-    type?: Type;
-    defaultValue?: string;
-}
-
-export interface Event {
-    name: string;
-    eventArgs: EventArg[];
-}
-
-export interface EventArg {
-    isIndexed: boolean;
-    name: string;
-    type: Type;
-}
-
-export interface Property {
-    name: string;
-    type: Type;
-    source?: Source;
-    comment?: string;
-    callPath?: string;
-}
-
-export interface BaseMethod {
-    isConstructor: boolean;
-    name: string;
-    returnComment?: string | undefined;
-    callPath: string;
-    parameters: Parameter[];
-    returnType: Type;
-    comment?: string;
-}
-
-export interface BaseFunction {
-    name: string;
-    returnComment?: string | undefined;
-    parameters: Parameter[];
-    returnType: Type;
-    comment?: string;
-}
-
-export interface TypeDefinitionByName {
-    [typeName: string]: CustomType;
-}
-
 export enum SupportedDocJson {
     Doxity = 'DOXITY',
     TypeDoc = 'TYPEDOC',
@@ -297,28 +98,3 @@ export enum AbiTypes {
     Function = 'function',
     Event = 'event',
 }
-
-export interface ExportNameToTypedocNames {
-    [exportName: string]: string[];
-}
-
-export interface ExternalTypeToLink {
-    [externalTypeName: string]: string;
-}
-
-export interface ExternalExportToLink {
-    [externalExport: string]: string;
-}
-
-export interface Metadata {
-    exportPathToTypedocNames: ExportNameToTypedocNames;
-    exportPathOrder: string[];
-    externalTypeToLink: ExternalTypeToLink;
-    externalExportToLink: ExternalExportToLink;
-}
-
-export interface GeneratedDocJson {
-    version: string;
-    metadata: Metadata;
-    typedocJson: TypeDocNode;
-}
diff --git a/packages/react-docs/src/utils/doxity_utils.ts b/packages/react-docs/src/utils/doxity_utils.ts
index 6815daa0c..85794d4ba 100644
--- a/packages/react-docs/src/utils/doxity_utils.ts
+++ b/packages/react-docs/src/utils/doxity_utils.ts
@@ -1,20 +1,17 @@
 import * as _ from 'lodash';
 
 import {
-    AbiTypes,
     DocAgnosticFormat,
     DocSection,
-    DoxityAbiDoc,
-    DoxityContractObj,
-    DoxityDocObj,
-    DoxityInput,
     EventArg,
     Parameter,
     Property,
     SolidityMethod,
     Type,
     TypeDocTypes,
-} from '../types';
+} from '@0xproject/types';
+
+import { AbiTypes, DoxityAbiDoc, DoxityContractObj, DoxityDocObj, DoxityInput } from '../types';
 
 export const doxityUtils = {
     convertToDocAgnosticFormat(doxityDocObj: DoxityDocObj): DocAgnosticFormat {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index f44945369..a24e63045 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -1,7 +1,3 @@
-import { errorUtils } from '@0xproject/utils';
-import * as _ from 'lodash';
-
-import { DocsInfo } from '../docs_info';
 import {
     CustomType,
     CustomTypeChild,
@@ -11,7 +7,6 @@ import {
     ExternalTypeToLink,
     GeneratedDocJson,
     IndexSignature,
-    KindString,
     Parameter,
     Property,
     Type,
@@ -21,7 +16,12 @@ import {
     TypeParameter,
     TypescriptFunction,
     TypescriptMethod,
-} from '../types';
+} from '@0xproject/types';
+import { errorUtils } from '@0xproject/utils';
+import * as _ from 'lodash';
+
+import { DocsInfo } from '../docs_info';
+import { KindString } from '../types';
 
 import { constants } from './constants';
 
-- 
cgit v1.2.3


From 1d5ef4d0ca4d0c65b6b73c56eb18550840bbc936 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 30 Aug 2018 13:24:17 -0700
Subject: Fix unused vars for react-shared and website

---
 packages/react-docs/src/docs_info.ts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index f429a34cb..dec44458d 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,5 +1,4 @@
 import { MenuSubsectionsBySection } from '@0xproject/react-shared';
-import compareVersions = require('compare-versions');
 import * as _ from 'lodash';
 
 import {
-- 
cgit v1.2.3


From 327b4ba5546907f3c2b6fddd2a4d3d767d1f6767 Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Fri, 31 Aug 2018 10:04:03 -0400
Subject: satisfy linter

---
 packages/react-docs/src/utils/typedoc_utils.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index a24e63045..d235b4406 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -468,6 +468,7 @@ export class TypeDocUtils {
             methodIfExists = this._convertMethod(entity.declaration, isConstructor, sectionName);
         } else if (entity.type === TypeDocTypes.Tuple) {
             tupleElementsIfExists = _.map(entity.elements, el => {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 return { name: el.name, typeDocType: el.type as TypeDocTypes };
             });
         }
-- 
cgit v1.2.3


From 481a752e70f6d9b558fb0aaadd4de87899fd9b1a Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 5 Sep 2018 11:16:34 +0100
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 0e41576b6..d1e846bb1 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1536142250,
+        "version": "1.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1535377027,
         "version": "1.0.7",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index a06e0f442..679f00097 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.8 - _September 5, 2018_
+
+    * Dependencies updated
+
 ## v1.0.7 - _August 27, 2018_
 
     * Dependencies updated
-- 
cgit v1.2.3


From 174b36059368631eeaec3ec7c0a3847350b55d73 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 5 Sep 2018 11:16:45 +0100
Subject: Publish

 - 0x.js@1.0.1
 - @0xproject/abi-gen@1.0.8
 - @0xproject/assert@1.0.8
 - @0xproject/base-contract@2.0.2
 - @0xproject/connect@2.0.0
 - @0xproject/contract-wrappers@1.0.1
 - contracts@2.1.43
 - @0xproject/dev-utils@1.0.7
 - ethereum-types@1.0.6
 - @0xproject/fill-scenarios@1.0.1
 - @0xproject/forwarder-helper@1.0.1
 - @0xproject/json-schemas@1.0.1
 - @0xproject/metacoin@0.0.18
 - @0xproject/migrations@1.0.7
 - @0xproject/monorepo-scripts@1.0.8
 - @0xproject/order-utils@1.0.1
 - @0xproject/order-watcher@1.0.1
 - @0xproject/react-docs@1.0.8
 - @0xproject/react-shared@1.0.9
 - @0xproject/sol-compiler@1.1.2
 - @0xproject/sol-cov@2.1.2
 - @0xproject/sol-resolver@1.0.8
 - @0xproject/sra-report@1.0.8
 - @0xproject/sra-spec@1.0.1
 - @0xproject/subproviders@2.0.2
 - @0xproject/testnet-faucets@1.0.44
 - @0xproject/tslint-config@1.0.7
 - @0xproject/types@1.0.1
 - @0xproject/typescript-typings@2.0.0
 - @0xproject/utils@1.0.8
 - @0xproject/web3-wrapper@2.0.2
 - @0xproject/website@0.0.47
---
 packages/react-docs/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index f58156cf4..345522074 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,8 +23,8 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.6",
-        "@0xproject/tslint-config": "^1.0.6",
+        "@0xproject/dev-utils": "^1.0.7",
+        "@0xproject/tslint-config": "^1.0.7",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
@@ -33,8 +33,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.8",
-        "@0xproject/utils": "^1.0.7",
+        "@0xproject/react-shared": "^1.0.9",
+        "@0xproject/utils": "^1.0.8",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "^8.0.53",
-- 
cgit v1.2.3


From 7dd28d6fab1d47a287422a0f51d63ba69d1c4dbc Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 21 Sep 2018 16:37:20 +0200
Subject: Don't depend on a specific version of node types

---
 packages/react-docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 345522074..ca3e98ce2 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -37,7 +37,7 @@
         "@0xproject/utils": "^1.0.8",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
-        "@types/node": "^8.0.53",
+        "@types/node": "*",
         "@types/react": "*",
         "@types/react-dom": "*",
         "@types/react-scroll": "1.5.3",
-- 
cgit v1.2.3


From 5446de630886422f1795e06d638a200ab62763ef Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 21 Sep 2018 16:59:16 +0200
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index d1e846bb1..c8a44aa9e 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537541580,
+        "version": "1.0.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1536142250,
         "version": "1.0.8",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 679f00097..595b0cf98 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.9 - _September 21, 2018_
+
+    * Dependencies updated
+
 ## v1.0.8 - _September 5, 2018_
 
     * Dependencies updated
-- 
cgit v1.2.3


From 29f6adc2ed57720d2c2aab7b760a4bcfec5d7b37 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 21 Sep 2018 16:59:27 +0200
Subject: Publish

 - 0x.js@1.0.4
 - @0xproject/abi-gen@1.0.9
 - @0xproject/assert@1.0.9
 - @0xproject/base-contract@2.0.3
 - @0xproject/connect@2.0.2
 - @0xproject/contract-wrappers@1.0.4
 - contracts@2.1.45
 - @0xproject/dev-utils@1.0.8
 - ethereum-types@1.0.7
 - @0xproject/fill-scenarios@1.0.3
 - @0xproject/forwarder-helper@1.0.4
 - @0xproject/json-schemas@1.0.2
 - @0xproject/metacoin@0.0.19
 - @0xproject/migrations@1.0.10
 - @0xproject/monorepo-scripts@1.0.9
 - @0xproject/order-utils@1.0.3
 - @0xproject/order-watcher@1.0.4
 - @0xproject/react-docs@1.0.9
 - @0xproject/react-shared@1.0.10
 - @0xproject/sol-compiler@1.1.3
 - @0xproject/sol-cov@2.1.3
 - @0xproject/sol-resolver@1.0.9
 - @0xproject/sra-report@1.0.9
 - @0xproject/sra-spec@1.0.2
 - @0xproject/subproviders@2.0.3
 - @0xproject/testnet-faucets@1.0.47
 - @0xproject/types@1.0.2
 - @0xproject/typescript-typings@2.0.1
 - @0xproject/utils@1.0.9
 - @0xproject/web3-wrapper@2.0.3
 - @0xproject/website@0.0.50
---
 packages/react-docs/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index ca3e98ce2..0efe7dbc9 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.7",
+        "@0xproject/dev-utils": "^1.0.8",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
@@ -33,8 +33,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.9",
-        "@0xproject/utils": "^1.0.8",
+        "@0xproject/react-shared": "^1.0.10",
+        "@0xproject/utils": "^1.0.9",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
-- 
cgit v1.2.3


From 98d06d6d252ed379d60bcef915caf38a5ec7a5af Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Sat, 22 Sep 2018 11:06:48 -0400
Subject: BREAKING CHANGE: document contracts from sol-doc

Change website to accept smart contract documentation in the format
generated by sol-doc rather than that generated by Doxity.
---
 packages/react-docs/README.md                      |   4 +-
 packages/react-docs/package.json                   |   2 +-
 .../react-docs/src/components/documentation.tsx    |   2 +-
 packages/react-docs/src/docs_info.ts               |  13 +-
 packages/react-docs/src/index.ts                   |   3 +-
 packages/react-docs/src/types.ts                   |  36 +----
 packages/react-docs/src/utils/constants.ts         |   2 +-
 packages/react-docs/src/utils/doxity_utils.ts      | 173 ---------------------
 8 files changed, 9 insertions(+), 226 deletions(-)
 delete mode 100644 packages/react-docs/src/utils/doxity_utils.ts

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md
index 5d56207de..51e949967 100644
--- a/packages/react-docs/README.md
+++ b/packages/react-docs/README.md
@@ -2,7 +2,7 @@
 
 #### WARNING: Alpha software. Expect things to break when trying to use.
 
-A full-page React component for rendering beautiful documentation for Solidity and Typescript code generated with [TypeDoc](http://typedoc.org/) or [Doxity](https://github.com/0xproject/doxity).
+A full-page React component for rendering beautiful documentation for Solidity and Typescript code generated with [TypeDoc](http://typedoc.org/) or [sol-doc](https://github.com/0xProject/0x-monorepo/tree/development/packages/sol-doc).
 
 <div style="text-align: center;">
 <img src="https://s3.eu-west-2.amazonaws.com/0x-wiki-images/screenshot.png" style="padding-bottom: 20px; padding-top: 20px;" width="80%" />
@@ -47,7 +47,7 @@ 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 Doxity).
+*   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 53c5fbb3f..a3e368355 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -4,7 +4,7 @@
     "engines": {
         "node": ">=6.12"
     },
-    "description": "React documentation component for rendering TypeDoc & Doxity generated JSON",
+    "description": "React documentation component for rendering TypeDoc & sol-doc generated JSON",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 16a99713c..0974297bc 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -329,7 +329,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
         return <div>{externalExports}</div>;
     }
     private _renderNetworkBadgesIfExists(sectionName: string): React.ReactNode {
-        if (this.props.docsInfo.type !== SupportedDocJson.Doxity) {
+        if (this.props.docsInfo.type !== SupportedDocJson.Solidity) {
             return null;
         }
 
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index fa5aa0da3..6355a2f88 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,18 +1,15 @@
 import { MenuSubsectionsBySection } from '@0xproject/react-shared';
-import { DocAgnosticFormat, GeneratedDocJson, TypeDefinitionByName } from '@0xproject/types';
+import { DocAgnosticFormat, TypeDefinitionByName } from '@0xproject/types';
 import * as _ from 'lodash';
 
 import {
     ContractsByVersionByNetworkId,
     DocsInfoConfig,
     DocsMenu,
-    DoxityDocObj,
     SectionNameToMarkdownByVersion,
     SectionsMap,
     SupportedDocJson,
 } from './types';
-import { doxityUtils } from './utils/doxity_utils';
-import { TypeDocUtils } from './utils/typedoc_utils';
 
 export class DocsInfo {
     public id: string;
@@ -93,12 +90,4 @@ export class DocsInfo {
         const typeDefinitionByName = _.keyBy(typeDocSection.types, 'name') as any;
         return typeDefinitionByName;
     }
-    public convertToDocAgnosticFormat(docObj: DoxityDocObj | GeneratedDocJson): DocAgnosticFormat {
-        if (this.type === SupportedDocJson.Doxity) {
-            return doxityUtils.convertToDocAgnosticFormat(docObj as DoxityDocObj);
-        } else {
-            const typeDocUtils = new TypeDocUtils(docObj as GeneratedDocJson, this);
-            return typeDocUtils.convertToDocAgnosticFormat();
-        }
-    }
 }
diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts
index 8a2c215b8..f9382940c 100644
--- a/packages/react-docs/src/index.ts
+++ b/packages/react-docs/src/index.ts
@@ -14,9 +14,10 @@ export { Signature } from './components/signature';
 export { SourceLink } from './components/source_link';
 export { TypeDefinition } from './components/type_definition';
 export { Type } from './components/type';
+export { TypeDocUtils } from './utils/typedoc_utils';
 
 export { DocsInfo } from './docs_info';
 
-export { DocsInfoConfig, DoxityDocObj, DocsMenu, SupportedDocJson } from './types';
+export { DocsInfoConfig, DocsMenu, SupportedDocJson } from './types';
 
 export { constants } from './utils/constants';
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index 454190342..f475c2756 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -38,7 +38,7 @@ export enum KindString {
 }
 
 export enum SupportedDocJson {
-    Doxity = 'DOXITY',
+    Solidity = 'SOLIDITY',
     TypeDoc = 'TYPEDOC',
 }
 
@@ -50,40 +50,6 @@ export interface ContractsByVersionByNetworkId {
     };
 }
 
-export interface DoxityDocObj {
-    [contractName: string]: DoxityContractObj;
-}
-
-export interface DoxityContractObj {
-    title: string;
-    fileName: string;
-    name: string;
-    abiDocs: DoxityAbiDoc[];
-}
-
-export interface DoxityAbiDoc {
-    constant: boolean;
-    inputs: DoxityInput[];
-    name: string;
-    outputs: DoxityOutput[];
-    payable: boolean;
-    type: string;
-    details?: string;
-    return?: string;
-}
-
-export interface DoxityOutput {
-    name: string;
-    type: string;
-}
-
-export interface DoxityInput {
-    name: string;
-    type: string;
-    description: string;
-    indexed?: boolean;
-}
-
 export interface AddressByContractName {
     [contractName: string]: string;
 }
diff --git a/packages/react-docs/src/utils/constants.ts b/packages/react-docs/src/utils/constants.ts
index 0b08f2c3e..35a939c51 100644
--- a/packages/react-docs/src/utils/constants.ts
+++ b/packages/react-docs/src/utils/constants.ts
@@ -4,7 +4,7 @@ export const constants = {
     TYPES_SECTION_NAME: 'types',
     EXTERNAL_EXPORTS_SECTION_NAME: 'external exports',
     TYPE_TO_SYNTAX: {
-        [SupportedDocJson.Doxity]: 'solidity',
+        [SupportedDocJson.Solidity]: 'solidity',
         [SupportedDocJson.TypeDoc]: 'typescript',
     } as { [supportedDocType: string]: string },
 };
diff --git a/packages/react-docs/src/utils/doxity_utils.ts b/packages/react-docs/src/utils/doxity_utils.ts
deleted file mode 100644
index 85794d4ba..000000000
--- a/packages/react-docs/src/utils/doxity_utils.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import * as _ from 'lodash';
-
-import {
-    DocAgnosticFormat,
-    DocSection,
-    EventArg,
-    Parameter,
-    Property,
-    SolidityMethod,
-    Type,
-    TypeDocTypes,
-} from '@0xproject/types';
-
-import { AbiTypes, DoxityAbiDoc, DoxityContractObj, DoxityDocObj, DoxityInput } from '../types';
-
-export const doxityUtils = {
-    convertToDocAgnosticFormat(doxityDocObj: DoxityDocObj): DocAgnosticFormat {
-        const docAgnosticFormat: DocAgnosticFormat = {};
-        _.each(doxityDocObj, (doxityContractObj: DoxityContractObj, contractName: string) => {
-            const doxityConstructor = _.find(doxityContractObj.abiDocs, (abiDoc: DoxityAbiDoc) => {
-                return abiDoc.type === AbiTypes.Constructor;
-            });
-            const constructors = [];
-            if (!_.isUndefined(doxityConstructor)) {
-                const constructor = {
-                    isConstructor: true,
-                    name: doxityContractObj.name,
-                    comment: doxityConstructor.details,
-                    returnComment: doxityConstructor.return,
-                    callPath: '',
-                    parameters: doxityUtils._convertParameters(doxityConstructor.inputs),
-                    returnType: doxityUtils._convertType(doxityContractObj.name),
-                };
-                constructors.push(constructor);
-            }
-
-            const doxityMethods: DoxityAbiDoc[] = _.filter<DoxityAbiDoc>(
-                doxityContractObj.abiDocs,
-                (abiDoc: DoxityAbiDoc) => {
-                    return doxityUtils._isMethod(abiDoc);
-                },
-            );
-            const methods: SolidityMethod[] = _.map<DoxityAbiDoc, SolidityMethod>(
-                doxityMethods,
-                (doxityMethod: DoxityAbiDoc) => {
-                    const outputs = !_.isUndefined(doxityMethod.outputs) ? doxityMethod.outputs : [];
-                    let returnTypeIfExists: Type;
-                    if (outputs.length === 0) {
-                        // no-op. It's already undefined
-                    } else if (outputs.length === 1) {
-                        const outputsType = outputs[0].type;
-                        returnTypeIfExists = doxityUtils._convertType(outputsType);
-                    } else {
-                        const outputsType = `[${_.map(outputs, output => output.type).join(', ')}]`;
-                        returnTypeIfExists = doxityUtils._convertType(outputsType);
-                    }
-                    // For ZRXToken, we want to convert it to zrxToken, rather then simply zRXToken
-                    const callPath =
-                        contractName !== 'ZRXToken'
-                            ? `${contractName[0].toLowerCase()}${contractName.slice(1)}.`
-                            : `${contractName.slice(0, 3).toLowerCase()}${contractName.slice(3)}.`;
-                    const method = {
-                        isConstructor: false,
-                        isConstant: doxityMethod.constant,
-                        isPayable: doxityMethod.payable,
-                        name: doxityMethod.name,
-                        comment: doxityMethod.details,
-                        returnComment: doxityMethod.return,
-                        callPath,
-                        parameters: doxityUtils._convertParameters(doxityMethod.inputs),
-                        returnType: returnTypeIfExists,
-                    };
-                    return method;
-                },
-            );
-
-            const doxityProperties: DoxityAbiDoc[] = _.filter<DoxityAbiDoc>(
-                doxityContractObj.abiDocs,
-                (abiDoc: DoxityAbiDoc) => {
-                    return doxityUtils._isProperty(abiDoc);
-                },
-            );
-            const properties = _.map<DoxityAbiDoc, Property>(doxityProperties, (doxityProperty: DoxityAbiDoc) => {
-                // We assume that none of our functions return more then a single return value
-                let typeName = doxityProperty.outputs[0].type;
-                if (!_.isEmpty(doxityProperty.inputs)) {
-                    // Properties never have more then a single input
-                    typeName = `(${doxityProperty.inputs[0].type} => ${typeName})`;
-                }
-                const property = {
-                    name: doxityProperty.name,
-                    type: doxityUtils._convertType(typeName),
-                    comment: doxityProperty.details,
-                };
-                return property;
-            });
-
-            const doxityEvents = _.filter(
-                doxityContractObj.abiDocs,
-                (abiDoc: DoxityAbiDoc) => abiDoc.type === AbiTypes.Event,
-            );
-            const events = _.map(doxityEvents, doxityEvent => {
-                const event = {
-                    name: doxityEvent.name,
-                    eventArgs: doxityUtils._convertEventArgs(doxityEvent.inputs),
-                };
-                return event;
-            });
-
-            const docSection: DocSection = {
-                comment: doxityContractObj.title,
-                constructors,
-                methods,
-                properties,
-                types: [],
-                functions: [],
-                events,
-            };
-            docAgnosticFormat[contractName] = docSection;
-        });
-        return docAgnosticFormat;
-    },
-    _convertParameters(inputs: DoxityInput[]): Parameter[] {
-        const parameters = _.map(inputs, input => {
-            const parameter = {
-                name: input.name,
-                comment: input.description,
-                isOptional: false,
-                type: doxityUtils._convertType(input.type),
-            };
-            return parameter;
-        });
-        return parameters;
-    },
-    _convertType(typeName: string): Type {
-        const type = {
-            name: typeName,
-            typeDocType: TypeDocTypes.Intrinsic,
-        };
-        return type;
-    },
-    _isMethod(abiDoc: DoxityAbiDoc): boolean {
-        if (abiDoc.type !== AbiTypes.Function) {
-            return false;
-        }
-        const hasInputs = !_.isEmpty(abiDoc.inputs);
-        const hasNamedOutputIfExists = !hasInputs || !_.isEmpty(abiDoc.inputs[0].name);
-        const isNameAllCaps = abiDoc.name === abiDoc.name.toUpperCase();
-        const isMethod = hasNamedOutputIfExists && !isNameAllCaps;
-        return isMethod;
-    },
-    _isProperty(abiDoc: DoxityAbiDoc): boolean {
-        if (abiDoc.type !== AbiTypes.Function) {
-            return false;
-        }
-        const hasInputs = !_.isEmpty(abiDoc.inputs);
-        const hasNamedOutputIfExists = !hasInputs || !_.isEmpty(abiDoc.inputs[0].name);
-        const isNameAllCaps = abiDoc.name === abiDoc.name.toUpperCase();
-        const isProperty = !hasNamedOutputIfExists || isNameAllCaps;
-        return isProperty;
-    },
-    _convertEventArgs(inputs: DoxityInput[]): EventArg[] {
-        const eventArgs = _.map(inputs, input => {
-            const eventArg = {
-                isIndexed: input.indexed,
-                name: input.name,
-                type: doxityUtils._convertType(input.type),
-            };
-            return eventArg;
-        });
-        return eventArgs;
-    },
-};
-- 
cgit v1.2.3


From 411813d8d9f23d535f10dd3fdd9e824b244bf187 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 25 Sep 2018 13:48:44 +0200
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index c8a44aa9e..4e3dfed99 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537875740,
+        "version": "1.0.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537541580,
         "version": "1.0.9",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 595b0cf98..ca96d479d 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.10 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.9 - _September 21, 2018_
 
     * Dependencies updated
-- 
cgit v1.2.3


From 78ef98c27ce954f7e46b261b0809ff9d8d70519b Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 25 Sep 2018 13:48:55 +0200
Subject: Publish

 - 0x.js@1.0.5
 - @0xproject/abi-gen@1.0.10
 - @0xproject/assert@1.0.10
 - @0xproject/asset-buyer@1.0.0
 - @0xproject/base-contract@2.0.4
 - @0xproject/connect@2.0.3
 - @0xproject/contract-wrappers@1.0.5
 - contracts@2.1.46
 - @0xproject/dev-utils@1.0.9
 - @0xproject/fill-scenarios@1.0.4
 - @0xproject/json-schemas@1.0.3
 - @0xproject/metacoin@0.0.20
 - @0xproject/migrations@1.0.11
 - @0xproject/order-utils@1.0.4
 - @0xproject/order-watcher@1.0.5
 - @0xproject/react-docs@1.0.10
 - @0xproject/react-shared@1.0.11
 - @0xproject/sol-compiler@1.1.4
 - @0xproject/sol-cov@2.1.4
 - @0xproject/sol-resolver@1.0.10
 - @0xproject/sra-report@1.0.10
 - @0xproject/sra-spec@1.0.3
 - @0xproject/subproviders@2.0.4
 - @0xproject/testnet-faucets@1.0.48
 - @0xproject/types@1.1.0
 - @0xproject/utils@1.0.10
 - @0xproject/web3-wrapper@3.0.0
 - @0xproject/website@0.0.51
---
 packages/react-docs/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 0efe7dbc9..d933489b7 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.8",
+        "@0xproject/dev-utils": "^1.0.9",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
@@ -33,8 +33,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.10",
-        "@0xproject/utils": "^1.0.9",
+        "@0xproject/react-shared": "^1.0.11",
+        "@0xproject/utils": "^1.0.10",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
-- 
cgit v1.2.3


From b40861747b73bb9a0826853751b7caa5cbf085ae Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 25 Sep 2018 17:34:22 +0100
Subject: Properly render function generic types that don't extend another type

---
 packages/react-docs/src/components/signature.tsx | 21 +++++++++++++--------
 packages/react-docs/src/types.ts                 |  2 +-
 packages/react-docs/src/utils/typedoc_utils.ts   |  5 ++++-
 3 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index bf9c8be24..4f10f4665 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -134,14 +134,19 @@ function renderTypeParameter(
 ): React.ReactNode {
     const typeParam = (
         <span>
-            {`<${typeParameter.name} extends `}
-            <Type
-                type={typeParameter.type}
-                sectionName={sectionName}
-                typeDefinitionByName={typeDefinitionByName}
-                docsInfo={docsInfo}
-                isInPopover={isInPopover}
-            />
+            {`<${typeParameter.name}`}
+            {!_.isUndefined(typeParameter.type) && (
+                <span>
+                    {' extends '}
+                    <Type
+                        type={typeParameter.type}
+                        sectionName={sectionName}
+                        typeDefinitionByName={typeDefinitionByName}
+                        docsInfo={docsInfo}
+                        isInPopover={isInPopover}
+                    />
+                </span>
+            )}
             {`>`}
         </span>
     );
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index f9cb5e26a..29f5664f5 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -150,7 +150,7 @@ export interface Parameter {
 
 export interface TypeParameter {
     name: string;
-    type: Type;
+    type?: Type;
 }
 
 export interface Type {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index f44945369..e3e9c11fb 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -419,7 +419,10 @@ export class TypeDocUtils {
         return func;
     }
     private _convertTypeParameter(entity: TypeDocNode, sectionName: string): TypeParameter {
-        const type = this._convertType(entity.type, sectionName);
+        let type;
+        if (!_.isUndefined(entity.type)) {
+            type = this._convertType(entity.type, sectionName);
+        }
         const parameter = {
             name: entity.name,
             type,
-- 
cgit v1.2.3


From e8c8d3e722676a250428795f70143ed3e5289cbc Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <feuGeneA@users.noreply.github.com>
Date: Tue, 25 Sep 2018 14:35:18 -0400
Subject: fix: rename SupportedDocJson field to SolDoc

from Solidity

https://github.com/0xProject/0x-monorepo/pull/1004#discussion_r219976199
https://github.com/0xProject/0x-monorepo/pull/1004
---
 packages/react-docs/src/components/documentation.tsx | 2 +-
 packages/react-docs/src/types.ts                     | 2 +-
 packages/react-docs/src/utils/constants.ts           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 0974297bc..3cd14923c 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -329,7 +329,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
         return <div>{externalExports}</div>;
     }
     private _renderNetworkBadgesIfExists(sectionName: string): React.ReactNode {
-        if (this.props.docsInfo.type !== SupportedDocJson.Solidity) {
+        if (this.props.docsInfo.type !== SupportedDocJson.SolDoc) {
             return null;
         }
 
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index f475c2756..153448513 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -38,7 +38,7 @@ export enum KindString {
 }
 
 export enum SupportedDocJson {
-    Solidity = 'SOLIDITY',
+    SolDoc = 'SOL_DOC',
     TypeDoc = 'TYPEDOC',
 }
 
diff --git a/packages/react-docs/src/utils/constants.ts b/packages/react-docs/src/utils/constants.ts
index 35a939c51..b5b6cc00d 100644
--- a/packages/react-docs/src/utils/constants.ts
+++ b/packages/react-docs/src/utils/constants.ts
@@ -4,7 +4,7 @@ export const constants = {
     TYPES_SECTION_NAME: 'types',
     EXTERNAL_EXPORTS_SECTION_NAME: 'external exports',
     TYPE_TO_SYNTAX: {
-        [SupportedDocJson.Solidity]: 'solidity',
+        [SupportedDocJson.SolDoc]: 'solidity',
         [SupportedDocJson.TypeDoc]: 'typescript',
     } as { [supportedDocType: string]: string },
 };
-- 
cgit v1.2.3


From 6174267f6940dce57fde8933c6282814d070b892 Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <feuGeneA@users.noreply.github.com>
Date: Tue, 25 Sep 2018 15:22:40 -0400
Subject: fix: explain why tslint rule is disabled

https://github.com/0xProject/0x-monorepo/pull/1004#discussion_r219976511
https://github.com/0xProject/0x-monorepo/pull/1004
---
 packages/react-docs/src/utils/typedoc_utils.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index d235b4406..09f995672 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -468,6 +468,7 @@ export class TypeDocUtils {
             methodIfExists = this._convertMethod(entity.declaration, isConstructor, sectionName);
         } else if (entity.type === TypeDocTypes.Tuple) {
             tupleElementsIfExists = _.map(entity.elements, el => {
+                // the following line is required due to an open tslint issue, https://github.com/palantir/tslint/issues/3540
                 // tslint:disable-next-line:no-unnecessary-type-assertion
                 return { name: el.name, typeDocType: el.type as TypeDocTypes };
             });
-- 
cgit v1.2.3


From 900a8aee76237778398a5940e723ce30c4af1860 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 25 Sep 2018 21:33:55 +0100
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 4e3dfed99..82aaf4e32 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.10",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index ca96d479d..8f5cc0cfd 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.11 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.10 - _September 25, 2018_
 
     * Dependencies updated
-- 
cgit v1.2.3


From 1b35a6e3b5d050fa33097b35e1d739ca13c6806e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 25 Sep 2018 21:34:14 +0100
Subject: Publish

 - 0x.js@1.0.6
 - @0xproject/abi-gen@1.0.11
 - @0xproject/assert@1.0.11
 - @0xproject/asset-buyer@1.0.1
 - @0xproject/base-contract@2.0.5
 - @0xproject/connect@2.0.4
 - @0xproject/contract-wrappers@2.0.0
 - contracts@2.1.47
 - @0xproject/dev-utils@1.0.10
 - ethereum-types@1.0.8
 - @0xproject/fill-scenarios@1.0.5
 - @0xproject/json-schemas@1.0.4
 - @0xproject/metacoin@0.0.21
 - @0xproject/migrations@1.0.12
 - @0xproject/order-utils@1.0.5
 - @0xproject/order-watcher@2.0.0
 - @0xproject/react-docs@1.0.11
 - @0xproject/react-shared@1.0.12
 - @0xproject/sol-compiler@1.1.5
 - @0xproject/sol-cov@2.1.5
 - @0xproject/sol-resolver@1.0.11
 - @0xproject/sra-report@1.0.11
 - @0xproject/sra-spec@1.0.4
 - @0xproject/subproviders@2.0.5
 - @0xproject/testnet-faucets@1.0.49
 - @0xproject/types@1.1.1
 - @0xproject/typescript-typings@2.0.2
 - @0xproject/utils@1.0.11
 - @0xproject/web3-wrapper@3.0.1
 - @0xproject/website@0.0.52
---
 packages/react-docs/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index d933489b7..be80f8028 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
@@ -33,8 +33,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.11",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/react-shared": "^1.0.12",
+        "@0xproject/utils": "^1.0.11",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
-- 
cgit v1.2.3


From c0498944c38e827dc69f369dd1427df43b23c9a9 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 18:40:38 +0100
Subject: Add more robust key

---
 packages/react-docs/src/components/documentation.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 3cd14923c..55aa1587e 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -10,6 +10,7 @@ import {
     utils as sharedUtils,
 } from '@0xproject/react-shared';
 import {
+    CustomType,
     DocAgnosticFormat,
     Event,
     ExternalExportToLink,
@@ -218,11 +219,11 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
             _.isEmpty(docSection.events);
 
         const sortedTypes = _.sortBy(docSection.types, 'name');
-        const typeDefs = _.map(sortedTypes, customType => {
+        const typeDefs = _.map(sortedTypes, (customType: CustomType, i: number) => {
             return (
                 <TypeDefinition
                     sectionName={sectionName}
-                    key={`type-${customType.name}`}
+                    key={`type-${customType.name}-${i}`}
                     customType={customType}
                     docsInfo={this.props.docsInfo}
                     typeDefinitionByName={typeDefinitionByName}
-- 
cgit v1.2.3


From dddfe8ae50f315159143dfbd8e5dbfaf75de9210 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 18:51:30 +0100
Subject: Add typeSectionName to docsInfo so we don't use hard-coded "Types"

---
 packages/react-docs/src/components/documentation.tsx | 2 +-
 packages/react-docs/src/docs_info.ts                 | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 55aa1587e..f1cb32b68 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -266,7 +266,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
             <div key={`section-${sectionName}`} className="py2 pr3 md-pl2 sm-pl3">
                 <div className="flex pb2">
                     <div style={{ marginRight: 7 }}>
-                        <SectionHeader sectionName={sectionName} />
+                        <SectionHeader sectionName={this.props.docsInfo.typeSectionName} />
                     </div>
                     {this._renderNetworkBadgesIfExists(sectionName)}
                 </div>
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 6355a2f88..bf6aa07a7 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -18,6 +18,7 @@ export class DocsInfo {
     public packageName: string;
     public packageUrl: string;
     public menu: DocsMenu;
+    public typeSectionName: string;
     public sections: SectionsMap;
     public sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
     public contractsByVersionByNetworkId?: ContractsByVersionByNetworkId;
@@ -28,6 +29,7 @@ export class DocsInfo {
         this.displayName = config.displayName;
         this.packageName = config.packageName;
         this.packageUrl = config.packageUrl;
+        this.typeSectionName = config.type === SupportedDocJson.SolDoc ? 'structs' : 'types';
         this.sections = config.markdownSections;
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
         this.contractsByVersionByNetworkId = config.contractsByVersionByNetworkId;
@@ -53,7 +55,7 @@ export class DocsInfo {
                 _.isEmpty(docSection.properties) &&
                 _.isEmpty(docSection.events);
 
-            if (!_.isUndefined(this.sections.types) && sectionName === this.sections.types) {
+            if (sectionName === this.typeSectionName) {
                 const sortedTypesNames = _.sortBy(docSection.types, 'name');
                 const typeNames = _.map(sortedTypesNames, t => t.name);
                 menuSubsectionsBySection[sectionName] = typeNames;
@@ -86,8 +88,8 @@ export class DocsInfo {
             return {};
         }
 
-        const typeDocSection = docAgnosticFormat[this.sections.types];
-        const typeDefinitionByName = _.keyBy(typeDocSection.types, 'name') as any;
+        const section = docAgnosticFormat[this.sections.types];
+        const typeDefinitionByName = _.keyBy(section.types, 'name') as any;
         return typeDefinitionByName;
     }
 }
-- 
cgit v1.2.3


From 63ffdb3895caa641881eecf21563a667f6d8b605 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 18:52:51 +0100
Subject: Improve key

---
 packages/react-docs/src/components/interface.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index 9f0800d71..cad7d6c46 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -20,9 +20,9 @@ export interface InterfaceProps {
 
 export const Interface: React.SFC<InterfaceProps> = (props: InterfaceProps): any => {
     const type = props.type;
-    const properties = _.map(type.children, property => {
+    const properties = _.map(type.children, (property, i) => {
         return (
-            <span key={`property-${property.name}-${property.type}-${type.name}`}>
+            <span key={`property-${property.name}-${property.type}-${type.name}-${i}`}>
                 {property.name}:{' '}
                 {property.type && !_.isUndefined(property.type.method) ? (
                     <Signature
-- 
cgit v1.2.3


From 5347bf587fcdcfa5c08b016f3626462d67c43340 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 18:55:01 +0100
Subject: Render fallback functions better

---
 packages/react-docs/src/components/signature.tsx       | 4 +++-
 packages/react-docs/src/components/signature_block.tsx | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index a690a1f03..aa174042c 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -19,12 +19,14 @@ export interface SignatureProps {
     callPath?: string;
     docsInfo: DocsInfo;
     isInPopover: boolean;
+    isFallback?: boolean;
 }
 
 const defaultProps = {
     shouldHideMethodName: false,
     shouldUseArrowSyntax: false,
     callPath: '',
+    isFallback: false,
 };
 
 export const Signature: React.SFC<SignatureProps> = (props: SignatureProps) => {
@@ -75,7 +77,7 @@ export const Signature: React.SFC<SignatureProps> = (props: SignatureProps) => {
     return (
         <span style={{ fontSize: 15 }}>
             {props.callPath}
-            {methodName}
+            {props.isFallback ? '' : methodName}
             {typeParameterIfExists}({hasMoreThenTwoParams && <br />}
             {paramStringArray})
             {props.returnType && (
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 1ea0ea28c..fc4db10ad 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -50,6 +50,7 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
     public render(): React.ReactNode {
         const method = this.props.method;
 
+        const isFallback = (method as SolidityMethod).isFallback;
         return (
             <div
                 id={`${this.props.sectionName}-${method.name}`}
@@ -63,10 +64,11 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
                         {(method as TypescriptMethod).isStatic && this._renderChip('Static')}
                         {(method as SolidityMethod).isConstant && this._renderChip('Constant')}
                         {(method as SolidityMethod).isPayable && this._renderChip('Payable')}
+                        {isFallback && this._renderChip('Fallback', colors.lightGreenA700)}
                         <div style={{ lineHeight: 1.3 }}>
                             <AnchorTitle
                                 headerSize={HeaderSizes.H3}
-                                title={method.name}
+                                title={isFallback ? '' : method.name}
                                 id={`${this.props.sectionName}-${method.name}`}
                                 shouldShowAnchor={this.state.shouldShowAnchor}
                             />
@@ -84,6 +86,7 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
                         typeDefinitionByName={this.props.typeDefinitionByName}
                         docsInfo={this.props.docsInfo}
                         isInPopover={false}
+                        isFallback={isFallback}
                     />
                 </code>
                 {(method as TypescriptMethod).source && (
@@ -114,9 +117,9 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
             </div>
         );
     }
-    private _renderChip(text: string): React.ReactNode {
+    private _renderChip(text: string, backgroundColor: string = colors.lightBlueA700): React.ReactNode {
         return (
-            <div className="p1 mr1" style={styles.chip}>
+            <div className="p1 mr1" style={{ ...styles.chip, backgroundColor }}>
                 {text}
             </div>
         );
-- 
cgit v1.2.3


From a6672e0190573c65f2c36e303d49f0389f5a9a26 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 19:43:10 +0100
Subject: Don't render colon for auto-generated getters

---
 packages/react-docs/src/components/signature.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index aa174042c..266bfe3dd 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -118,9 +118,14 @@ function renderParameters(
             />
         );
         return (
-            <span key={`param-${p.type}-${p.name}`}>
+            <span key={`param-${JSON.stringify(p.type)}-${name}-${i}`}>
+                {!_.isEmpty(p.name) && (
+                    <span>
                 {p.name}
-                {isOptional && '?'}: {type}
+                        {isOptional && '?'}:{' '}
+                    </span>
+                )}
+                {type}
                 {hasDefaultValue && ` = ${p.defaultValue}`}
             </span>
         );
-- 
cgit v1.2.3


From cfddea931dedb77a88507517957e19350e9348b8 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 19:49:07 +0100
Subject: Make sure basic solidity types are colored orange

---
 packages/react-docs/src/components/type.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 156a3496d..b7a94483e 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -13,6 +13,7 @@ import { Signature } from './signature';
 import { TypeDefinition } from './type_definition';
 
 const basicJsTypes = ['string', 'number', 'undefined', 'null', 'boolean'];
+const basicSolidityTypes = ['bytes', 'bytes4', 'uint256', 'address'];
 
 const defaultProps = {};
 
@@ -80,7 +81,7 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
 
         case TypeDocTypes.Array:
             typeName = type.elementType.name;
-            if (_.includes(basicJsTypes, typeName)) {
+            if (_.includes(basicJsTypes, typeName) || _.includes(basicSolidityTypes, typeName)) {
                 typeNameColor = colors.orange;
             }
             break;
-- 
cgit v1.2.3


From ac04dbf7e4f04ae4e0a6e9cce5232339597493ed Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 19:50:02 +0100
Subject: Re-use interface component for rendering structs but label it
 differently

---
 packages/react-docs/src/components/type_definition.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index 09cb3ff74..9a3e50a1b 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -5,7 +5,7 @@ import * as _ from 'lodash';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
-import { KindString } from '../types';
+import { KindString, SupportedDocJson } from '../types';
 import { constants } from '../utils/constants';
 
 import { Comment } from './comment';
@@ -46,7 +46,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
         let codeSnippet: React.ReactNode;
         switch (customType.kindString) {
             case KindString.Interface:
-                typePrefix = 'Interface';
+                typePrefix = this.props.docsInfo.type === SupportedDocJson.SolDoc ? 'Struct' : 'Interface';
                 codeSnippet = (
                     <Interface
                         type={customType}
-- 
cgit v1.2.3


From ac878d8fdbace787c7ffbc0fe68dd404d72452e3 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 23:00:01 +0100
Subject: Improve keys

---
 packages/react-docs/src/components/signature.tsx       | 6 ++++--
 packages/react-docs/src/components/signature_block.tsx | 6 +++---
 packages/react-docs/src/components/type.tsx            | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index 266bfe3dd..1f3dd0ee8 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -36,6 +36,7 @@ export const Signature: React.SFC<SignatureProps> = (props: SignatureProps) => {
         props.docsInfo,
         sectionName,
         props.isInPopover,
+        props.name,
         props.typeDefinitionByName,
     );
     const paramStringArray: any[] = [];
@@ -103,9 +104,10 @@ function renderParameters(
     docsInfo: DocsInfo,
     sectionName: string,
     isInPopover: boolean,
+    name: string,
     typeDefinitionByName?: TypeDefinitionByName,
 ): React.ReactNode[] {
-    const params = _.map(parameters, (p: Parameter) => {
+    const params = _.map(parameters, (p: Parameter, i: number) => {
         const isOptional = p.isOptional;
         const hasDefaultValue = !_.isUndefined(p.defaultValue);
         const type = (
@@ -121,7 +123,7 @@ function renderParameters(
             <span key={`param-${JSON.stringify(p.type)}-${name}-${i}`}>
                 {!_.isEmpty(p.name) && (
                     <span>
-                {p.name}
+                        {p.name}
                         {isOptional && '?'}:{' '}
                     </span>
                 )}
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index fc4db10ad..1e3de3e58 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -124,12 +124,12 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
             </div>
         );
     }
-    private _renderParameterDescriptions(parameters: Parameter[]): React.ReactNode {
-        const descriptions = _.map(parameters, parameter => {
+    private _renderParameterDescriptions(parameters: Parameter[], name: string): React.ReactNode {
+        const descriptions = _.map(parameters, (parameter: Parameter, i: number) => {
             const isOptional = parameter.isOptional;
             return (
                 <div
-                    key={`param-description-${parameter.name}`}
+                    key={`param-description-${parameter.name}-${name}-${i}`}
                     className="flex pb1 mb2"
                     style={{ borderBottom: '1px solid #f0f4f7' }}
                 >
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index b7a94483e..8ff2fa3cc 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -169,10 +169,10 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
             break;
 
         case TypeDocTypes.Tuple:
-            const tupleTypes = _.map(type.tupleElements, t => {
+            const tupleTypes = _.map(type.tupleElements, (t, i) => {
                 return (
                     <Type
-                        key={`type-tuple-${t.name}-${t.typeDocType}`}
+                        key={`type-tuple-${t.name}-${t.typeDocType}-${i}`}
                         type={t}
                         sectionName={props.sectionName}
                         typeDefinitionByName={props.typeDefinitionByName}
@@ -222,7 +222,7 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
         const id = Math.random().toString();
         const typeDefinitionAnchorId = isExportedClassReference
             ? props.type.name
-            : `${constants.TYPES_SECTION_NAME}-${typeName}`;
+            : `${props.docsInfo.typeSectionName}-${typeName}`;
         typeName = (
             <ScrollLink
                 to={typeDefinitionAnchorId}
-- 
cgit v1.2.3


From 17d4b467d468d997867843361ed623b6edb0a768 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 23:00:25 +0100
Subject: Only show arguments if the params are named (i.e not generated
 getters)

---
 packages/react-docs/src/components/signature_block.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 1e3de3e58..cad72daf4 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -32,7 +32,6 @@ export interface SignatureBlockState {
 const styles: Styles = {
     chip: {
         fontSize: 13,
-        backgroundColor: colors.lightBlueA700,
         color: colors.white,
         height: 11,
         borderRadius: 14,
@@ -51,6 +50,7 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
         const method = this.props.method;
 
         const isFallback = (method as SolidityMethod).isFallback;
+        const onlyHasNamedParameters = !_.isUndefined(_.find(method.parameters, p => !_.isEmpty(p.name)));
         return (
             <div
                 id={`${this.props.sectionName}-${method.name}`}
@@ -98,12 +98,13 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
                 )}
                 {method.comment && <Comment comment={method.comment} className="py2" />}
                 {method.parameters &&
-                    !_.isEmpty(method.parameters) && (
+                    !_.isEmpty(method.parameters) &&
+                    onlyHasNamedParameters && (
                         <div>
                             <h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
                                 ARGUMENTS
                             </h4>
-                            {this._renderParameterDescriptions(method.parameters)}
+                            {this._renderParameterDescriptions(method.parameters, method.name)}
                         </div>
                     )}
                 {method.returnComment && (
-- 
cgit v1.2.3


From 37ab789e841013a556c88418ddd1d5ae38f2b521 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 23:14:34 +0100
Subject: Remove excessive type

---
 packages/react-docs/src/components/documentation.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index f1cb32b68..f7feb7717 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -10,7 +10,6 @@ import {
     utils as sharedUtils,
 } from '@0xproject/react-shared';
 import {
-    CustomType,
     DocAgnosticFormat,
     Event,
     ExternalExportToLink,
@@ -219,7 +218,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
             _.isEmpty(docSection.events);
 
         const sortedTypes = _.sortBy(docSection.types, 'name');
-        const typeDefs = _.map(sortedTypes, (customType: CustomType, i: number) => {
+        const typeDefs = _.map(sortedTypes, (customType, i) => {
             return (
                 <TypeDefinition
                     sectionName={sectionName}
-- 
cgit v1.2.3


From 092b184f4534a42d36d30d2d10b34b47255d2ee3 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 23:30:11 +0100
Subject: Fix linter

---
 packages/react-docs/src/components/signature_block.tsx | 4 ++--
 packages/react-docs/src/components/type.tsx            | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index cad72daf4..5ec82983a 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -50,7 +50,7 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
         const method = this.props.method;
 
         const isFallback = (method as SolidityMethod).isFallback;
-        const onlyHasNamedParameters = !_.isUndefined(_.find(method.parameters, p => !_.isEmpty(p.name)));
+        const hasExclusivelyNamedParams = !_.isUndefined(_.find(method.parameters, p => !_.isEmpty(p.name)));
         return (
             <div
                 id={`${this.props.sectionName}-${method.name}`}
@@ -99,7 +99,7 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
                 {method.comment && <Comment comment={method.comment} className="py2" />}
                 {method.parameters &&
                     !_.isEmpty(method.parameters) &&
-                    onlyHasNamedParameters && (
+                    hasExclusivelyNamedParams && (
                         <div>
                             <h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
                                 ARGUMENTS
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 8ff2fa3cc..028376ba9 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -7,7 +7,6 @@ import { Link as ScrollLink } from 'react-scroll';
 import * as ReactTooltip from 'react-tooltip';
 
 import { DocsInfo } from '../docs_info';
-import { constants } from '../utils/constants';
 
 import { Signature } from './signature';
 import { TypeDefinition } from './type_definition';
-- 
cgit v1.2.3


From 8531f52456169d6b2103757e8e511710c58a54d0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 27 Sep 2018 23:32:29 +0100
Subject: Switch over remaining usage of `sections.types` for `typeSectionName`

---
 packages/react-docs/src/docs_info.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index bf6aa07a7..092a8c266 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -84,11 +84,11 @@ export class DocsInfo {
         return menuSubsectionsBySection;
     }
     public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
-        if (_.isUndefined(this.sections.types)) {
+        if (_.isUndefined(docAgnosticFormat[this.typeSectionName])) {
             return {};
         }
 
-        const section = docAgnosticFormat[this.sections.types];
+        const section = docAgnosticFormat[this.typeSectionName];
         const typeDefinitionByName = _.keyBy(section.types, 'name') as any;
         return typeDefinitionByName;
     }
-- 
cgit v1.2.3


From 545472a38fabfd8a18cb03a23ae02f99917f0f4c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 28 Sep 2018 10:50:55 +0100
Subject: Fix section headers

---
 packages/react-docs/src/components/documentation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index f7feb7717..df727ad9c 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -265,7 +265,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
             <div key={`section-${sectionName}`} className="py2 pr3 md-pl2 sm-pl3">
                 <div className="flex pb2">
                     <div style={{ marginRight: 7 }}>
-                        <SectionHeader sectionName={this.props.docsInfo.typeSectionName} />
+                        <SectionHeader sectionName={sectionName} />
                     </div>
                     {this._renderNetworkBadgesIfExists(sectionName)}
                 </div>
-- 
cgit v1.2.3


From 398b2926366bfabc4decca48dd24c85c466c48ed Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 28 Sep 2018 11:04:51 +0100
Subject: Add more basic types

---
 packages/react-docs/src/components/type.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 028376ba9..5c018f5dd 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -12,7 +12,7 @@ import { Signature } from './signature';
 import { TypeDefinition } from './type_definition';
 
 const basicJsTypes = ['string', 'number', 'undefined', 'null', 'boolean'];
-const basicSolidityTypes = ['bytes', 'bytes4', 'uint256', 'address'];
+const basicSolidityTypes = ['bytes', 'bytes4', 'bytes32', 'uint8', 'uint256', 'address'];
 
 const defaultProps = {};
 
-- 
cgit v1.2.3


From 005a2e12bac3e0ca8762f627ec5e9df6d2991d6e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 28 Sep 2018 11:33:30 +0100
Subject: Fix badge alignment

---
 packages/react-docs/src/components/documentation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index df727ad9c..a23111297 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -353,7 +353,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                         key={`badge-${networkName}-${sectionName}`}
                         href={linkIfExists}
                         target="_blank"
-                        style={{ color: colors.white, textDecoration: 'none' }}
+                        style={{ color: colors.white, textDecoration: 'none', marginTop: 8 }}
                     >
                         <Badge title={networkName} backgroundColor={networkNameToColor[networkName]} />
                     </a>
-- 
cgit v1.2.3


From c354129b6f4a8b9373655ecb29ffb4ae87f19c56 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 28 Sep 2018 19:15:38 +0100
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 82aaf4e32..7f0b25c2c 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1538157789,
+        "version": "1.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537907159,
         "version": "1.0.11",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 8f5cc0cfd..ccf6ccc41 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.12 - _September 28, 2018_
+
+    * Dependencies updated
+
 ## v1.0.11 - _September 25, 2018_
 
     * Dependencies updated
-- 
cgit v1.2.3


From ac14dd2b29b42ef4d2a46db9b70d4d30cf9bd40f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 28 Sep 2018 19:16:07 +0100
Subject: Publish

 - 0x.js@1.0.7
 - @0xproject/abi-gen@1.0.12
 - @0xproject/assert@1.0.12
 - @0xproject/asset-buyer@1.0.2
 - @0xproject/base-contract@3.0.0
 - @0xproject/connect@3.0.0
 - @0xproject/contract-wrappers@2.0.1
 - contracts@2.1.48
 - @0xproject/dev-utils@1.0.11
 - ethereum-types@1.0.9
 - @0xproject/fill-scenarios@1.0.6
 - @0xproject/json-schemas@1.0.5
 - @0xproject/metacoin@0.0.22
 - @0xproject/migrations@1.0.13
 - @0xproject/monorepo-scripts@1.0.10
 - @0xproject/order-utils@1.0.6
 - @0xproject/order-watcher@2.1.0
 - @0xproject/react-docs@1.0.12
 - @0xproject/react-shared@1.0.13
 - @0xproject/sol-compiler@1.1.6
 - @0xproject/sol-cov@2.1.6
 - @0xproject/sol-doc@1.0.1
 - @0xproject/sol-resolver@1.0.12
 - @0xproject/sra-report@1.0.12
 - @0xproject/sra-spec@1.0.5
 - @0xproject/subproviders@2.0.6
 - @0xproject/testnet-faucets@1.0.50
 - @0xproject/types@1.1.2
 - @0xproject/typescript-typings@3.0.0
 - @0xproject/utils@2.0.0
 - @0xproject/web3-wrapper@3.0.2
 - @0xproject/website@0.0.53
---
 packages/react-docs/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index aea186f6a..48df0b3cc 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.10",
+        "@0xproject/dev-utils": "^1.0.11",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
@@ -33,9 +33,9 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.12",
-        "@0xproject/types": "^1.1.0",
-        "@0xproject/utils": "^1.0.11",
+        "@0xproject/react-shared": "^1.0.13",
+        "@0xproject/types": "^1.1.2",
+        "@0xproject/utils": "^2.0.0",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
-- 
cgit v1.2.3


From 8b7888b736b9a18f03166c9095a2dec65eca4d66 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 2 Oct 2018 12:37:34 +0200
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 7f0b25c2c..3fa89b0bc 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1538475601,
+        "version": "1.0.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1538157789,
         "version": "1.0.12",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index ccf6ccc41..48cd4d654 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.13 - _October 2, 2018_
+
+    * Dependencies updated
+
 ## v1.0.12 - _September 28, 2018_
 
     * Dependencies updated
-- 
cgit v1.2.3


From f4e4eef48e703afb923ba4f969fc77f32be81745 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 1 Oct 2018 16:37:35 +0200
Subject: Introduce a build:ci command that doesn't build webpack bundles

---
 packages/react-docs/package.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 48df0b3cc..0379e9e2f 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -10,6 +10,7 @@
     "scripts": {
         "lint": "tslint --project .",
         "build": "tsc -b",
+        "build:ci": "yarn build",
         "clean": "shx rm -rf lib"
     },
     "author": "Fabio Berger",
-- 
cgit v1.2.3


From 437612f8b8c28fb384698c5c2b331e173cee8767 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 16:37:59 +0100
Subject: Use same Link UI component for react-scroll links

---
 .../react-docs/src/components/documentation.tsx    |  9 ++--
 packages/react-docs/src/docs_info.ts               | 54 ++++++++++++++++------
 2 files changed, 47 insertions(+), 16 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 3cd14923c..1ed829b01 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -98,7 +98,10 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                 marginLeft: 20,
             },
         };
-        const menuSubsectionsBySection = this.props.docsInfo.getMenuSubsectionsBySection(this.props.docAgnosticFormat);
+        const sectionNameToLinks = this.props.docsInfo.getSectionNameToLinks();
+        console.log('sectionNameToLinks', sectionNameToLinks);
+        const subsectionNameToLinks = this.props.docsInfo.getSubsectionNameToLinks(this.props.docAgnosticFormat);
+        console.log('subsectionNameToLinks', subsectionNameToLinks);
         return (
             <div>
                 {_.isUndefined(this.props.docAgnosticFormat) ? (
@@ -128,8 +131,8 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                                         selectedVersion={this.props.selectedVersion}
                                         versions={this.props.availableVersions}
                                         sidebarHeader={this.props.sidebarHeader}
-                                        topLevelMenu={this.props.docsInfo.menu}
-                                        menuSubsectionsBySection={menuSubsectionsBySection}
+                                        sectionNameToLinks={sectionNameToLinks}
+                                        subsectionNameToLinks={subsectionNameToLinks}
                                         onVersionSelected={this.props.onVersionSelected}
                                     />
                                 </div>
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 6355a2f88..1c11e07de 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,5 +1,5 @@
-import { MenuSubsectionsBySection } from '@0xproject/react-shared';
-import { DocAgnosticFormat, TypeDefinitionByName } from '@0xproject/types';
+import { ALink, LinkType, MenuSubsectionsBySection, utils as sharedUtils } from '@0xproject/react-shared';
+import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0xproject/types';
 import * as _ from 'lodash';
 
 import {
@@ -32,10 +32,10 @@ export class DocsInfo {
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
         this.contractsByVersionByNetworkId = config.contractsByVersionByNetworkId;
     }
-    public getMenuSubsectionsBySection(docAgnosticFormat?: DocAgnosticFormat): MenuSubsectionsBySection {
-        const menuSubsectionsBySection = {} as MenuSubsectionsBySection;
+    public getSubsectionNameToLinks(docAgnosticFormat?: DocAgnosticFormat): ObjectMap<ALink[]> {
+        const subsectionNameToLinks: ObjectMap<ALink[]> = {};
         if (_.isUndefined(docAgnosticFormat)) {
-            return menuSubsectionsBySection;
+            return subsectionNameToLinks;
         }
 
         const docSections = _.keys(this.sections);
@@ -56,7 +56,14 @@ export class DocsInfo {
             if (!_.isUndefined(this.sections.types) && sectionName === this.sections.types) {
                 const sortedTypesNames = _.sortBy(docSection.types, 'name');
                 const typeNames = _.map(sortedTypesNames, t => t.name);
-                menuSubsectionsBySection[sectionName] = typeNames;
+                const typeLinks = _.map(typeNames, typeName => {
+                    return {
+                        to: `${sectionName}-${typeName}`,
+                        title: typeName,
+                        type: LinkType.ReactScroll,
+                    };
+                });
+                subsectionNameToLinks[sectionName] = typeLinks;
             } else if (isExportedFunctionSection) {
                 // Noop so that we don't have the method listed underneath itself.
             } else {
@@ -71,15 +78,20 @@ export class DocsInfo {
                 const methodNames = _.map(methodsSortedByName, m => m.name);
                 const sortedFunctionNames = _.sortBy(docSection.functions, 'name');
                 const functionNames = _.map(sortedFunctionNames, m => m.name);
-                menuSubsectionsBySection[sectionName] = [
-                    ...eventNames,
-                    ...propertyNames,
-                    ...functionNames,
-                    ...methodNames,
-                ];
+                const names = [...eventNames, ...propertyNames, ...functionNames, ...methodNames];
+
+                const links = _.map(names, name => {
+                    return {
+                        to: `${sectionName}-${name}`,
+                        title: name,
+                        type: LinkType.ReactScroll,
+                    };
+                });
+
+                subsectionNameToLinks[sectionName] = links;
             }
         });
-        return menuSubsectionsBySection;
+        return subsectionNameToLinks;
     }
     public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
         if (_.isUndefined(this.sections.types)) {
@@ -90,4 +102,20 @@ export class DocsInfo {
         const typeDefinitionByName = _.keyBy(typeDocSection.types, 'name') as any;
         return typeDefinitionByName;
     }
+    public getSectionNameToLinks(): ObjectMap<ALink[]> {
+        const sectionNameToLinks: ObjectMap<ALink[]> = {};
+        _.each(this.menu, (linkTitles, sectionName) => {
+            sectionNameToLinks[sectionName] = [];
+            _.each(linkTitles, linkTitle => {
+                const to = sharedUtils.getIdFromName(linkTitle);
+                const links = sectionNameToLinks[sectionName];
+                links.push({
+                    title: linkTitle,
+                    to,
+                    type: LinkType.ReactScroll,
+                });
+            });
+        });
+        return sectionNameToLinks;
+    }
 }
-- 
cgit v1.2.3


From 751e8eafe483efb8b416b88c7edca6676ae9d607 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 16:41:44 +0100
Subject: Remove stray console.log

---
 packages/react-docs/src/components/documentation.tsx | 2 --
 1 file changed, 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index 1ed829b01..aa6d27402 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -99,9 +99,7 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
             },
         };
         const sectionNameToLinks = this.props.docsInfo.getSectionNameToLinks();
-        console.log('sectionNameToLinks', sectionNameToLinks);
         const subsectionNameToLinks = this.props.docsInfo.getSubsectionNameToLinks(this.props.docAgnosticFormat);
-        console.log('subsectionNameToLinks', subsectionNameToLinks);
         return (
             <div>
                 {_.isUndefined(this.props.docAgnosticFormat) ? (
-- 
cgit v1.2.3


From 46764c2d3f491e7558eede0f501c767c6e57f568 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 3 Oct 2018 17:23:43 +0100
Subject: Fix linter

---
 packages/react-docs/src/docs_info.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 1c11e07de..12d571136 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,4 +1,4 @@
-import { ALink, LinkType, MenuSubsectionsBySection, utils as sharedUtils } from '@0xproject/react-shared';
+import { ALink, LinkType, utils as sharedUtils } from '@0xproject/react-shared';
 import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0xproject/types';
 import * as _ from 'lodash';
 
-- 
cgit v1.2.3


From 266440f7c3f922fc998e53e1fa08db97e1a479cb Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 4 Oct 2018 15:51:56 -0700
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json |  4 ++--
 packages/react-docs/CHANGELOG.md   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 3fa89b0bc..ac3f22716 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,12 +1,12 @@
 [
     {
-        "timestamp": 1538475601,
         "version": "1.0.13",
         "changes": [
             {
                 "note": "Dependencies updated"
             }
-        ]
+        ],
+        "timestamp": 1538693146
     },
     {
         "timestamp": 1538157789,
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 48cd4d654..485bf61a6 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.13 - _October 2, 2018_
+## v1.0.13 - _October 4, 2018_
 
     * Dependencies updated
 
@@ -37,7 +37,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
 
     * Dependencies updated
 
@@ -57,7 +57,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
 
     * Dependencies updated
 
@@ -77,7 +77,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.0.13 - _June 1, 2018_
+## v0.0.13 - _May 31, 2018_
 
     * Incorrect publish that was unpublished
 
@@ -85,7 +85,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.0.11 - _May 5, 2018_
+## v0.0.11 - _May 4, 2018_
 
     * Dependencies updated
 
-- 
cgit v1.2.3


From b5d88079d9876677ff983f02f55d8f98bc7ab439 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 4 Oct 2018 15:52:06 -0700
Subject: Publish

 - 0x.js@1.0.8
 - @0xproject/abi-gen@1.0.13
 - @0xproject/assert@1.0.13
 - @0xproject/asset-buyer@2.0.0
 - @0xproject/base-contract@3.0.1
 - @0xproject/connect@3.0.1
 - @0xproject/contract-wrappers@2.0.2
 - contracts@2.1.49
 - @0xproject/dev-utils@1.0.12
 - ethereum-types@1.0.11
 - @0xproject/fill-scenarios@1.0.7
 - @0xproject/instant@0.0.2
 - @0xproject/json-schemas@1.0.7
 - @0xproject/metacoin@0.0.23
 - @0xproject/migrations@1.0.14
 - @0xproject/monorepo-scripts@1.0.11
 - @0xproject/order-utils@1.0.7
 - @0xproject/order-watcher@2.1.1
 - @0xproject/react-docs@1.0.13
 - @0xproject/react-shared@1.0.15
 - @0xproject/sol-compiler@1.1.7
 - @0xproject/sol-cov@2.1.7
 - @0xproject/sol-doc@1.0.2
 - @0xproject/sol-resolver@1.0.14
 - @0xproject/sra-report@1.0.13
 - @0xproject/sra-spec@1.0.6
 - @0xproject/subproviders@2.0.7
 - @0xproject/testnet-faucets@1.0.51
 - @0xproject/tslint-config@1.0.8
 - @0xproject/types@1.1.4
 - @0xproject/typescript-typings@3.0.2
 - @0xproject/utils@2.0.2
 - @0xproject/web3-wrapper@3.0.3
 - @0xproject/website@0.0.54
---
 packages/react-docs/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 0379e9e2f..1f8b77e2c 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,8 +24,8 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.11",
-        "@0xproject/tslint-config": "^1.0.7",
+        "@0xproject/dev-utils": "^1.0.12",
+        "@0xproject/tslint-config": "^1.0.8",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
@@ -34,9 +34,9 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.13",
-        "@0xproject/types": "^1.1.2",
-        "@0xproject/utils": "^2.0.0",
+        "@0xproject/react-shared": "^1.0.15",
+        "@0xproject/types": "^1.1.4",
+        "@0xproject/utils": "^2.0.2",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
-- 
cgit v1.2.3


From e0355a2e395fc056fd1d5c5e1780784853546acd Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 5 Oct 2018 12:03:15 +0100
Subject: Rename scroll container

---
 packages/react-docs/src/components/type.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 5c018f5dd..2e0003198 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -228,7 +228,7 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
                 offset={0}
                 hashSpy={true}
                 duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
-                containerId={sharedConstants.DOCS_CONTAINER_ID}
+                containerId={sharedConstants.SCROLL_CONTAINER_ID}
             >
                 {sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? (
                     <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span>
-- 
cgit v1.2.3


From 5f2cd33da07a7acc65f2e05acb35755f74af75a4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 5 Oct 2018 13:54:37 +0100
Subject: Remove style prop from Link

---
 packages/react-docs/src/components/source_link.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/source_link.tsx b/packages/react-docs/src/components/source_link.tsx
index 3096ad8d5..c6dd09adb 100644
--- a/packages/react-docs/src/components/source_link.tsx
+++ b/packages/react-docs/src/components/source_link.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors, Link } from '@0xproject/react-shared';
 import { Source } from '@0xproject/types';
 import * as React from 'react';
 
@@ -13,9 +13,9 @@ export const SourceLink = (props: SourceLinkProps) => {
     const sourceCodeUrl = `${props.sourceUrl}/${src.fileName}#L${src.line}`;
     return (
         <div className="pt2" style={{ fontSize: 14 }}>
-            <a href={sourceCodeUrl} target="_blank" className="underline" style={{ color: colors.grey }}>
-                Source
-            </a>
+            <Link to={sourceCodeUrl} shouldOpenInNewTab={true} textDecoration="underline" fontColor={colors.grey}>
+                {'Source'}
+            </Link>
         </div>
     );
 };
-- 
cgit v1.2.3


From fa6bd348992674192d07fef3d60950980212ecbb Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 5 Oct 2018 14:55:28 +0100
Subject: Remove type prop and instead infer it from the value of to

---
 .../react-docs/src/components/documentation.tsx    | 23 ++++++++++++----------
 packages/react-docs/src/components/type.tsx        | 11 +++--------
 packages/react-docs/src/docs_info.ts               |  5 +----
 3 files changed, 17 insertions(+), 22 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
index de2ccca8b..6a08d50e0 100644
--- a/packages/react-docs/src/components/documentation.tsx
+++ b/packages/react-docs/src/components/documentation.tsx
@@ -2,6 +2,7 @@ import {
     colors,
     constants as sharedConstants,
     EtherscanLinkSuffixes,
+    Link,
     MarkdownSection,
     NestedSidebarMenu,
     Networks,
@@ -319,9 +320,9 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                 <div className="pt2" key={`external-export-${exportName}`}>
                     <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
                         {`import { `}
-                        <a href={link} target="_blank" style={{ color: colors.lightBlueA700, textDecoration: 'none' }}>
+                        <Link to={link} shouldOpenInNewTab={true} fontColor={colors.lightBlueA700}>
                             {exportName}
-                        </a>
+                        </Link>
                         {` } from '${this.props.docsInfo.packageName}'`}
                     </code>
                 </div>
@@ -350,14 +351,16 @@ export class Documentation extends React.Component<DocumentationProps, Documenta
                     EtherscanLinkSuffixes.Address,
                 );
                 return (
-                    <a
-                        key={`badge-${networkName}-${sectionName}`}
-                        href={linkIfExists}
-                        target="_blank"
-                        style={{ color: colors.white, textDecoration: 'none', marginTop: 8 }}
-                    >
-                        <Badge title={networkName} backgroundColor={networkNameToColor[networkName]} />
-                    </a>
+                    <div style={{ marginTop: 8 }}>
+                        <Link
+                            key={`badge-${networkName}-${sectionName}`}
+                            to={linkIfExists}
+                            shouldOpenInNewTab={true}
+                            fontColor={colors.white}
+                        >
+                            <Badge title={networkName} backgroundColor={networkNameToColor[networkName]} />
+                        </Link>
+                    </div>
                 );
             },
         );
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 2e0003198..1ae1324c6 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -1,4 +1,4 @@
-import { colors, constants as sharedConstants, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, constants as sharedConstants, Link, utils as sharedUtils } from '@0xproject/react-shared';
 import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '@0xproject/types';
 import { errorUtils } from '@0xproject/utils';
 import * as _ from 'lodash';
@@ -205,14 +205,9 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
     const typeNameUrlIfExists = !_.isUndefined(props.type.externalLink) ? props.type.externalLink : undefined;
     if (!_.isUndefined(typeNameUrlIfExists)) {
         typeName = (
-            <a
-                href={typeNameUrlIfExists}
-                target="_blank"
-                className="text-decoration-none"
-                style={{ color: colors.lightBlueA700 }}
-            >
+            <Link to={typeNameUrlIfExists} shouldOpenInNewTab={true} fontColor={colors.lightBlueA700}>
                 {typeName}
-            </a>
+            </Link>
         );
     } else if (
         (isReference || isArray) &&
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index f3bdf4964..549106c77 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,4 +1,4 @@
-import { ALink, LinkType, utils as sharedUtils } from '@0xproject/react-shared';
+import { ALink, utils as sharedUtils } from '@0xproject/react-shared';
 import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0xproject/types';
 import * as _ from 'lodash';
 
@@ -62,7 +62,6 @@ export class DocsInfo {
                     return {
                         to: `${sectionName}-${typeName}`,
                         title: typeName,
-                        type: LinkType.ReactScroll,
                     };
                 });
                 subsectionNameToLinks[sectionName] = typeLinks;
@@ -86,7 +85,6 @@ export class DocsInfo {
                     return {
                         to: `${sectionName}-${name}`,
                         title: name,
-                        type: LinkType.ReactScroll,
                     };
                 });
 
@@ -114,7 +112,6 @@ export class DocsInfo {
                 links.push({
                     title: linkTitle,
                     to,
-                    type: LinkType.ReactScroll,
                 });
             });
         });
-- 
cgit v1.2.3


From de20ef1a49966153f25236ee68b186cd49f8dc20 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 12 Oct 2018 15:54:44 +0200
Subject: Refactor Home so that Dev section chrome is reusable across pages

---
 .../react-docs/src/components/doc_reference.tsx    | 331 ++++++++++++++++
 .../react-docs/src/components/documentation.tsx    | 427 ---------------------
 packages/react-docs/src/docs_info.ts               |  59 ++-
 packages/react-docs/src/index.ts                   |   2 +-
 packages/react-docs/src/utils/typedoc_utils.ts     |  10 +-
 5 files changed, 366 insertions(+), 463 deletions(-)
 create mode 100644 packages/react-docs/src/components/doc_reference.tsx
 delete mode 100644 packages/react-docs/src/components/documentation.tsx

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
new file mode 100644
index 000000000..38ec818db
--- /dev/null
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -0,0 +1,331 @@
+import {
+    colors,
+    constants as sharedConstants,
+    EtherscanLinkSuffixes,
+    Link,
+    MarkdownSection,
+    Networks,
+    SectionHeader,
+    utils as sharedUtils,
+} from '@0xproject/react-shared';
+import {
+    DocAgnosticFormat,
+    Event,
+    ExternalExportToLink,
+    Property,
+    SolidityMethod,
+    TypeDefinitionByName,
+    TypescriptFunction,
+    TypescriptMethod,
+} from '@0xproject/types';
+import * as _ from 'lodash';
+import * as React from 'react';
+import * as semver from 'semver';
+
+import { DocsInfo } from '../docs_info';
+import { AddressByContractName, SupportedDocJson } from '../types';
+import { constants } from '../utils/constants';
+
+import { Badge } from './badge';
+import { Comment } from './comment';
+import { EventDefinition } from './event_definition';
+import { PropertyBlock } from './property_block';
+import { SignatureBlock } from './signature_block';
+import { TypeDefinition } from './type_definition';
+
+const networkNameToColor: { [network: string]: string } = {
+    [Networks.Kovan]: colors.purple,
+    [Networks.Ropsten]: colors.red,
+    [Networks.Mainnet]: colors.turquois,
+    [Networks.Rinkeby]: colors.darkYellow,
+};
+
+export interface DocReferenceProps {
+    selectedVersion: string;
+    availableVersions: string[];
+    docsInfo: DocsInfo;
+    sourceUrl: string;
+    docAgnosticFormat?: DocAgnosticFormat;
+}
+
+export interface DocReferenceState {
+    isHoveringSidebar: boolean;
+}
+
+export class DocReference extends React.Component<DocReferenceProps, DocReferenceState> {
+    constructor(props: DocReferenceProps) {
+        super(props);
+        this.state = {
+            isHoveringSidebar: false,
+        };
+    }
+    public componentDidMount(): void {
+        window.addEventListener('hashchange', this._onHashChanged.bind(this), false);
+    }
+    public componentWillUnmount(): void {
+        window.removeEventListener('hashchange', this._onHashChanged.bind(this), false);
+    }
+    public componentDidUpdate(prevProps: DocReferenceProps, _prevState: DocReferenceState): void {
+        if (!_.isEqual(prevProps.docAgnosticFormat, this.props.docAgnosticFormat)) {
+            const hash = window.location.hash.slice(1);
+            sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID);
+        }
+    }
+    public render(): React.ReactNode {
+        const subMenus = _.values(this.props.docsInfo.markdownMenu);
+        const orderedSectionNames = _.flatten(subMenus);
+
+        const typeDefinitionByName = this.props.docsInfo.getTypeDefinitionsByName(this.props.docAgnosticFormat);
+        const renderedSections = _.map(orderedSectionNames, this._renderSection.bind(this, typeDefinitionByName));
+
+        return (
+            <div>
+                <div id={sharedConstants.SCROLL_TOP_ID} />
+                {renderedSections}
+            </div>
+        );
+    }
+    private _renderSection(typeDefinitionByName: TypeDefinitionByName, sectionName: string): React.ReactNode {
+        const markdownVersions = _.keys(this.props.docsInfo.sectionNameToMarkdownByVersion);
+        const eligibleVersions = _.filter(markdownVersions, mdVersion => {
+            return semver.lte(mdVersion, this.props.selectedVersion);
+        });
+        if (_.isEmpty(eligibleVersions)) {
+            throw new Error(
+                `No eligible markdown sections found for ${this.props.docsInfo.displayName} version ${
+                    this.props.selectedVersion
+                }.`,
+            );
+        }
+        const sortedEligibleVersions = eligibleVersions.sort(semver.rcompare.bind(semver));
+        const closestVersion = sortedEligibleVersions[0];
+        const markdownFileIfExists = this.props.docsInfo.sectionNameToMarkdownByVersion[closestVersion][sectionName];
+        if (!_.isUndefined(markdownFileIfExists)) {
+            return (
+                <MarkdownSection
+                    key={`markdown-section-${sectionName}`}
+                    sectionName={sectionName}
+                    markdownContent={markdownFileIfExists}
+                />
+            );
+        }
+
+        const docSection = this.props.docAgnosticFormat[sectionName];
+        if (_.isUndefined(docSection)) {
+            return null;
+        }
+
+        const isExportedFunctionSection =
+            docSection.functions.length === 1 &&
+            _.isEmpty(docSection.types) &&
+            _.isEmpty(docSection.methods) &&
+            _.isEmpty(docSection.constructors) &&
+            _.isEmpty(docSection.properties) &&
+            _.isEmpty(docSection.events);
+
+        const sortedTypes = _.sortBy(docSection.types, 'name');
+        const typeDefs = _.map(sortedTypes, (customType, i) => {
+            return (
+                <TypeDefinition
+                    sectionName={sectionName}
+                    key={`type-${customType.name}-${i}`}
+                    customType={customType}
+                    docsInfo={this.props.docsInfo}
+                    typeDefinitionByName={typeDefinitionByName}
+                    isInPopover={false}
+                />
+            );
+        });
+
+        const sortedProperties = _.sortBy(docSection.properties, 'name');
+        const propertyDefs = _.map(
+            sortedProperties,
+            this._renderProperty.bind(this, sectionName, typeDefinitionByName),
+        );
+
+        const sortedMethods = _.sortBy(docSection.methods, 'name');
+        const methodDefs = _.map(sortedMethods, method => {
+            return this._renderSignatureBlocks(method, sectionName, typeDefinitionByName);
+        });
+
+        const sortedFunctions = _.sortBy(docSection.functions, 'name');
+        const functionDefs = _.map(sortedFunctions, func => {
+            return this._renderSignatureBlocks(func, sectionName, typeDefinitionByName);
+        });
+
+        const sortedEvents = _.sortBy(docSection.events, 'name');
+        const eventDefs = _.map(sortedEvents, (event: Event, i: number) => {
+            return (
+                <EventDefinition
+                    key={`event-${event.name}-${i}`}
+                    event={event}
+                    sectionName={sectionName}
+                    docsInfo={this.props.docsInfo}
+                />
+            );
+        });
+        const headerStyle: React.CSSProperties = {
+            fontWeight: 100,
+        };
+        return (
+            <div key={`section-${sectionName}`} className="py2 pr3 md-pl2 sm-pl3">
+                <div className="flex pb2">
+                    <div style={{ marginRight: 7 }}>
+                        <SectionHeader sectionName={sectionName} />
+                    </div>
+                    {this._renderNetworkBadgesIfExists(sectionName)}
+                </div>
+                {docSection.comment && <Comment comment={docSection.comment} />}
+                {!_.isEmpty(docSection.constructors) && (
+                    <div>
+                        <h2 style={headerStyle}>Constructor</h2>
+                        {this._renderConstructors(docSection.constructors, sectionName, typeDefinitionByName)}
+                    </div>
+                )}
+                {!_.isEmpty(docSection.properties) && (
+                    <div>
+                        <h2 style={headerStyle}>Properties</h2>
+                        <div>{propertyDefs}</div>
+                    </div>
+                )}
+                {!_.isEmpty(docSection.methods) && (
+                    <div>
+                        <h2 style={headerStyle}>Methods</h2>
+                        <div>{methodDefs}</div>
+                    </div>
+                )}
+                {!_.isEmpty(docSection.functions) && (
+                    <div>
+                        {!isExportedFunctionSection && <h2 style={headerStyle}>Functions</h2>}
+                        <div>{functionDefs}</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>
+                    )}
+            </div>
+        );
+    }
+    private _renderExternalExports(externalExportToLink: ExternalExportToLink): React.ReactNode {
+        const externalExports = _.map(externalExportToLink, (link: string, exportName: string) => {
+            return (
+                <div className="pt2" key={`external-export-${exportName}`}>
+                    <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
+                        {`import { `}
+                        <Link to={link} shouldOpenInNewTab={true} fontColor={colors.lightBlueA700}>
+                            {exportName}
+                        </Link>
+                        {` } from '${this.props.docsInfo.packageName}'`}
+                    </code>
+                </div>
+            );
+        });
+        return <div>{externalExports}</div>;
+    }
+    private _renderNetworkBadgesIfExists(sectionName: string): React.ReactNode {
+        if (this.props.docsInfo.type !== SupportedDocJson.SolDoc) {
+            return null;
+        }
+
+        const networkToAddressByContractName = this.props.docsInfo.contractsByVersionByNetworkId[
+            this.props.selectedVersion
+        ];
+        const badges = _.map(
+            networkToAddressByContractName,
+            (addressByContractName: AddressByContractName, networkName: string) => {
+                const contractAddress = addressByContractName[sectionName];
+                if (_.isUndefined(contractAddress)) {
+                    return null;
+                }
+                const linkIfExists = sharedUtils.getEtherScanLinkIfExists(
+                    contractAddress,
+                    sharedConstants.NETWORK_ID_BY_NAME[networkName],
+                    EtherscanLinkSuffixes.Address,
+                );
+                return (
+                    <div style={{ marginTop: 8 }}>
+                        <Link
+                            key={`badge-${networkName}-${sectionName}`}
+                            to={linkIfExists}
+                            shouldOpenInNewTab={true}
+                            fontColor={colors.white}
+                        >
+                            <Badge title={networkName} backgroundColor={networkNameToColor[networkName]} />
+                        </Link>
+                    </div>
+                );
+            },
+        );
+        return badges;
+    }
+    private _renderConstructors(
+        constructors: SolidityMethod[] | TypescriptMethod[],
+        sectionName: string,
+        typeDefinitionByName: TypeDefinitionByName,
+    ): React.ReactNode {
+        const constructorDefs = _.map(constructors, constructor => {
+            return this._renderSignatureBlocks(constructor, sectionName, typeDefinitionByName);
+        });
+        return <div>{constructorDefs}</div>;
+    }
+    private _renderProperty(
+        sectionName: string,
+        typeDefinitionByName: TypeDefinitionByName,
+        property: Property,
+    ): React.ReactNode {
+        return (
+            <PropertyBlock
+                key={`property-${property.name}-${property.type.name}`}
+                property={property}
+                sectionName={sectionName}
+                docsInfo={this.props.docsInfo}
+                sourceUrl={this.props.sourceUrl}
+                selectedVersion={this.props.selectedVersion}
+                typeDefinitionByName={typeDefinitionByName}
+            />
+        );
+    }
+    private _renderSignatureBlocks(
+        method: SolidityMethod | TypescriptFunction | TypescriptMethod,
+        sectionName: string,
+        typeDefinitionByName: TypeDefinitionByName,
+    ): React.ReactNode {
+        return (
+            <SignatureBlock
+                key={`method-${method.name}-${sectionName}`}
+                sectionName={sectionName}
+                method={method}
+                typeDefinitionByName={typeDefinitionByName}
+                libraryVersion={this.props.selectedVersion}
+                docsInfo={this.props.docsInfo}
+                sourceUrl={this.props.sourceUrl}
+            />
+        );
+    }
+    private _onSidebarHover(_event: React.FormEvent<HTMLInputElement>): void {
+        this.setState({
+            isHoveringSidebar: true,
+        });
+    }
+    private _onSidebarHoverOff(): void {
+        this.setState({
+            isHoveringSidebar: false,
+        });
+    }
+    private _onHashChanged(_event: any): void {
+        const hash = window.location.hash.slice(1);
+        sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID);
+    }
+}
diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx
deleted file mode 100644
index 6a08d50e0..000000000
--- a/packages/react-docs/src/components/documentation.tsx
+++ /dev/null
@@ -1,427 +0,0 @@
-import {
-    colors,
-    constants as sharedConstants,
-    EtherscanLinkSuffixes,
-    Link,
-    MarkdownSection,
-    NestedSidebarMenu,
-    Networks,
-    SectionHeader,
-    Styles,
-    utils as sharedUtils,
-} from '@0xproject/react-shared';
-import {
-    DocAgnosticFormat,
-    Event,
-    ExternalExportToLink,
-    Property,
-    SolidityMethod,
-    TypeDefinitionByName,
-    TypescriptFunction,
-    TypescriptMethod,
-} from '@0xproject/types';
-import * as _ from 'lodash';
-import CircularProgress from 'material-ui/CircularProgress';
-import * as React from 'react';
-import * as semver from 'semver';
-
-import { DocsInfo } from '../docs_info';
-import { AddressByContractName, SupportedDocJson } from '../types';
-import { constants } from '../utils/constants';
-
-import { Badge } from './badge';
-import { Comment } from './comment';
-import { EventDefinition } from './event_definition';
-import { PropertyBlock } from './property_block';
-import { SignatureBlock } from './signature_block';
-import { TypeDefinition } from './type_definition';
-
-const networkNameToColor: { [network: string]: string } = {
-    [Networks.Kovan]: colors.purple,
-    [Networks.Ropsten]: colors.red,
-    [Networks.Mainnet]: colors.turquois,
-    [Networks.Rinkeby]: colors.darkYellow,
-};
-
-export interface DocumentationProps {
-    selectedVersion: string;
-    availableVersions: string[];
-    docsInfo: DocsInfo;
-    sourceUrl: string;
-    onVersionSelected: (semver: string) => void;
-    docAgnosticFormat?: DocAgnosticFormat;
-    sidebarHeader?: React.ReactNode;
-    topBarHeight?: number;
-}
-
-export interface DocumentationState {
-    isHoveringSidebar: boolean;
-}
-
-export class Documentation extends React.Component<DocumentationProps, DocumentationState> {
-    public static defaultProps: Partial<DocumentationProps> = {
-        topBarHeight: 0,
-    };
-    constructor(props: DocumentationProps) {
-        super(props);
-        this.state = {
-            isHoveringSidebar: false,
-        };
-    }
-    public componentDidMount(): void {
-        window.addEventListener('hashchange', this._onHashChanged.bind(this), false);
-    }
-    public componentWillUnmount(): void {
-        window.removeEventListener('hashchange', this._onHashChanged.bind(this), false);
-    }
-    public componentDidUpdate(prevProps: DocumentationProps, _prevState: DocumentationState): void {
-        if (!_.isEqual(prevProps.docAgnosticFormat, this.props.docAgnosticFormat)) {
-            const hash = window.location.hash.slice(1);
-            sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID);
-        }
-    }
-    public render(): React.ReactNode {
-        const styles: Styles = {
-            mainContainers: {
-                position: 'absolute',
-                top: 1,
-                left: 0,
-                bottom: 0,
-                right: 0,
-                overflowX: 'hidden',
-                overflowY: 'scroll',
-                minHeight: `calc(100vh - ${this.props.topBarHeight}px)`,
-                WebkitOverflowScrolling: 'touch',
-            },
-            menuContainer: {
-                borderColor: colors.grey300,
-                maxWidth: 330,
-                marginLeft: 20,
-            },
-        };
-        const sectionNameToLinks = this.props.docsInfo.getSectionNameToLinks();
-        const subsectionNameToLinks = this.props.docsInfo.getSubsectionNameToLinks(this.props.docAgnosticFormat);
-        return (
-            <div>
-                {_.isUndefined(this.props.docAgnosticFormat) ? (
-                    this._renderLoading(styles.mainContainers)
-                ) : (
-                    <div style={{ width: '100%', height: '100%', backgroundColor: colors.gray40 }}>
-                        <div
-                            className="mx-auto max-width-4 flex"
-                            style={{ color: colors.grey800, height: `calc(100vh - ${this.props.topBarHeight}px)` }}
-                        >
-                            <div
-                                className="relative sm-hide xs-hide"
-                                style={{ width: '36%', height: `calc(100vh - ${this.props.topBarHeight}px)` }}
-                            >
-                                <div
-                                    className="border-right absolute"
-                                    style={{
-                                        ...styles.menuContainer,
-                                        ...styles.mainContainers,
-                                        height: `calc(100vh - ${this.props.topBarHeight}px)`,
-                                        overflow: this.state.isHoveringSidebar ? 'auto' : 'hidden',
-                                    }}
-                                    onMouseEnter={this._onSidebarHover.bind(this)}
-                                    onMouseLeave={this._onSidebarHoverOff.bind(this)}
-                                >
-                                    <NestedSidebarMenu
-                                        selectedVersion={this.props.selectedVersion}
-                                        versions={this.props.availableVersions}
-                                        sidebarHeader={this.props.sidebarHeader}
-                                        sectionNameToLinks={sectionNameToLinks}
-                                        subsectionNameToLinks={subsectionNameToLinks}
-                                        onVersionSelected={this.props.onVersionSelected}
-                                    />
-                                </div>
-                            </div>
-                            <div
-                                className="relative col lg-col-9 md-col-9 sm-col-12 col-12"
-                                style={{ backgroundColor: colors.white }}
-                            >
-                                <div
-                                    id={sharedConstants.SCROLL_CONTAINER_ID}
-                                    style={styles.mainContainers}
-                                    className="absolute px1"
-                                >
-                                    <div id={sharedConstants.SCROLL_TOP_ID} />
-                                    {this._renderDocumentation()}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                )}
-            </div>
-        );
-    }
-    private _renderLoading(mainContainersStyles: React.CSSProperties): React.ReactNode {
-        return (
-            <div className="col col-12" style={mainContainersStyles}>
-                <div
-                    className="relative sm-px2 sm-pt2 sm-m1"
-                    style={{ height: 122, top: '50%', transform: 'translateY(-50%)' }}
-                >
-                    <div className="center pb2">
-                        <CircularProgress size={40} thickness={5} />
-                    </div>
-                    <div className="center pt2" style={{ paddingBottom: 11 }}>
-                        Loading documentation...
-                    </div>
-                </div>
-            </div>
-        );
-    }
-    private _renderDocumentation(): React.ReactNode {
-        const subMenus = _.values(this.props.docsInfo.menu);
-        const orderedSectionNames = _.flatten(subMenus);
-
-        const typeDefinitionByName = this.props.docsInfo.getTypeDefinitionsByName(this.props.docAgnosticFormat);
-        const renderedSections = _.map(orderedSectionNames, this._renderSection.bind(this, typeDefinitionByName));
-
-        return renderedSections;
-    }
-    private _renderSection(typeDefinitionByName: TypeDefinitionByName, sectionName: string): React.ReactNode {
-        const markdownVersions = _.keys(this.props.docsInfo.sectionNameToMarkdownByVersion);
-        const eligibleVersions = _.filter(markdownVersions, mdVersion => {
-            return semver.lte(mdVersion, this.props.selectedVersion);
-        });
-        if (_.isEmpty(eligibleVersions)) {
-            throw new Error(
-                `No eligible markdown sections found for ${this.props.docsInfo.displayName} version ${
-                    this.props.selectedVersion
-                }.`,
-            );
-        }
-        const sortedEligibleVersions = eligibleVersions.sort(semver.rcompare.bind(semver));
-        const closestVersion = sortedEligibleVersions[0];
-        const markdownFileIfExists = this.props.docsInfo.sectionNameToMarkdownByVersion[closestVersion][sectionName];
-        if (!_.isUndefined(markdownFileIfExists)) {
-            return (
-                <MarkdownSection
-                    key={`markdown-section-${sectionName}`}
-                    sectionName={sectionName}
-                    markdownContent={markdownFileIfExists}
-                />
-            );
-        }
-
-        const docSection = this.props.docAgnosticFormat[sectionName];
-        if (_.isUndefined(docSection)) {
-            return null;
-        }
-
-        const isExportedFunctionSection =
-            docSection.functions.length === 1 &&
-            _.isEmpty(docSection.types) &&
-            _.isEmpty(docSection.methods) &&
-            _.isEmpty(docSection.constructors) &&
-            _.isEmpty(docSection.properties) &&
-            _.isEmpty(docSection.events);
-
-        const sortedTypes = _.sortBy(docSection.types, 'name');
-        const typeDefs = _.map(sortedTypes, (customType, i) => {
-            return (
-                <TypeDefinition
-                    sectionName={sectionName}
-                    key={`type-${customType.name}-${i}`}
-                    customType={customType}
-                    docsInfo={this.props.docsInfo}
-                    typeDefinitionByName={typeDefinitionByName}
-                    isInPopover={false}
-                />
-            );
-        });
-
-        const sortedProperties = _.sortBy(docSection.properties, 'name');
-        const propertyDefs = _.map(
-            sortedProperties,
-            this._renderProperty.bind(this, sectionName, typeDefinitionByName),
-        );
-
-        const sortedMethods = _.sortBy(docSection.methods, 'name');
-        const methodDefs = _.map(sortedMethods, method => {
-            return this._renderSignatureBlocks(method, sectionName, typeDefinitionByName);
-        });
-
-        const sortedFunctions = _.sortBy(docSection.functions, 'name');
-        const functionDefs = _.map(sortedFunctions, func => {
-            return this._renderSignatureBlocks(func, sectionName, typeDefinitionByName);
-        });
-
-        const sortedEvents = _.sortBy(docSection.events, 'name');
-        const eventDefs = _.map(sortedEvents, (event: Event, i: number) => {
-            return (
-                <EventDefinition
-                    key={`event-${event.name}-${i}`}
-                    event={event}
-                    sectionName={sectionName}
-                    docsInfo={this.props.docsInfo}
-                />
-            );
-        });
-        const headerStyle: React.CSSProperties = {
-            fontWeight: 100,
-        };
-        return (
-            <div key={`section-${sectionName}`} className="py2 pr3 md-pl2 sm-pl3">
-                <div className="flex pb2">
-                    <div style={{ marginRight: 7 }}>
-                        <SectionHeader sectionName={sectionName} />
-                    </div>
-                    {this._renderNetworkBadgesIfExists(sectionName)}
-                </div>
-                {docSection.comment && <Comment comment={docSection.comment} />}
-                {!_.isEmpty(docSection.constructors) && (
-                    <div>
-                        <h2 style={headerStyle}>Constructor</h2>
-                        {this._renderConstructors(docSection.constructors, sectionName, typeDefinitionByName)}
-                    </div>
-                )}
-                {!_.isEmpty(docSection.properties) && (
-                    <div>
-                        <h2 style={headerStyle}>Properties</h2>
-                        <div>{propertyDefs}</div>
-                    </div>
-                )}
-                {!_.isEmpty(docSection.methods) && (
-                    <div>
-                        <h2 style={headerStyle}>Methods</h2>
-                        <div>{methodDefs}</div>
-                    </div>
-                )}
-                {!_.isEmpty(docSection.functions) && (
-                    <div>
-                        {!isExportedFunctionSection && <h2 style={headerStyle}>Functions</h2>}
-                        <div>{functionDefs}</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>
-                    )}
-            </div>
-        );
-    }
-    private _renderExternalExports(externalExportToLink: ExternalExportToLink): React.ReactNode {
-        const externalExports = _.map(externalExportToLink, (link: string, exportName: string) => {
-            return (
-                <div className="pt2" key={`external-export-${exportName}`}>
-                    <code className={`hljs ${constants.TYPE_TO_SYNTAX[this.props.docsInfo.type]}`}>
-                        {`import { `}
-                        <Link to={link} shouldOpenInNewTab={true} fontColor={colors.lightBlueA700}>
-                            {exportName}
-                        </Link>
-                        {` } from '${this.props.docsInfo.packageName}'`}
-                    </code>
-                </div>
-            );
-        });
-        return <div>{externalExports}</div>;
-    }
-    private _renderNetworkBadgesIfExists(sectionName: string): React.ReactNode {
-        if (this.props.docsInfo.type !== SupportedDocJson.SolDoc) {
-            return null;
-        }
-
-        const networkToAddressByContractName = this.props.docsInfo.contractsByVersionByNetworkId[
-            this.props.selectedVersion
-        ];
-        const badges = _.map(
-            networkToAddressByContractName,
-            (addressByContractName: AddressByContractName, networkName: string) => {
-                const contractAddress = addressByContractName[sectionName];
-                if (_.isUndefined(contractAddress)) {
-                    return null;
-                }
-                const linkIfExists = sharedUtils.getEtherScanLinkIfExists(
-                    contractAddress,
-                    sharedConstants.NETWORK_ID_BY_NAME[networkName],
-                    EtherscanLinkSuffixes.Address,
-                );
-                return (
-                    <div style={{ marginTop: 8 }}>
-                        <Link
-                            key={`badge-${networkName}-${sectionName}`}
-                            to={linkIfExists}
-                            shouldOpenInNewTab={true}
-                            fontColor={colors.white}
-                        >
-                            <Badge title={networkName} backgroundColor={networkNameToColor[networkName]} />
-                        </Link>
-                    </div>
-                );
-            },
-        );
-        return badges;
-    }
-    private _renderConstructors(
-        constructors: SolidityMethod[] | TypescriptMethod[],
-        sectionName: string,
-        typeDefinitionByName: TypeDefinitionByName,
-    ): React.ReactNode {
-        const constructorDefs = _.map(constructors, constructor => {
-            return this._renderSignatureBlocks(constructor, sectionName, typeDefinitionByName);
-        });
-        return <div>{constructorDefs}</div>;
-    }
-    private _renderProperty(
-        sectionName: string,
-        typeDefinitionByName: TypeDefinitionByName,
-        property: Property,
-    ): React.ReactNode {
-        return (
-            <PropertyBlock
-                key={`property-${property.name}-${property.type.name}`}
-                property={property}
-                sectionName={sectionName}
-                docsInfo={this.props.docsInfo}
-                sourceUrl={this.props.sourceUrl}
-                selectedVersion={this.props.selectedVersion}
-                typeDefinitionByName={typeDefinitionByName}
-            />
-        );
-    }
-    private _renderSignatureBlocks(
-        method: SolidityMethod | TypescriptFunction | TypescriptMethod,
-        sectionName: string,
-        typeDefinitionByName: TypeDefinitionByName,
-    ): React.ReactNode {
-        return (
-            <SignatureBlock
-                key={`method-${method.name}-${sectionName}`}
-                sectionName={sectionName}
-                method={method}
-                typeDefinitionByName={typeDefinitionByName}
-                libraryVersion={this.props.selectedVersion}
-                docsInfo={this.props.docsInfo}
-                sourceUrl={this.props.sourceUrl}
-            />
-        );
-    }
-    private _onSidebarHover(_event: React.FormEvent<HTMLInputElement>): void {
-        this.setState({
-            isHoveringSidebar: true,
-        });
-    }
-    private _onSidebarHoverOff(): void {
-        this.setState({
-            isHoveringSidebar: false,
-        });
-    }
-    private _onHashChanged(_event: any): void {
-        const hash = window.location.hash.slice(1);
-        sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID);
-    }
-}
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 549106c77..d75a1676c 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -17,7 +17,7 @@ export class DocsInfo {
     public displayName: string;
     public packageName: string;
     public packageUrl: string;
-    public menu: DocsMenu;
+    public markdownMenu: DocsMenu;
     public typeSectionName: string;
     public sections: SectionsMap;
     public sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
@@ -25,7 +25,7 @@ export class DocsInfo {
     constructor(config: DocsInfoConfig) {
         this.id = config.id;
         this.type = config.type;
-        this.menu = config.markdownMenu;
+        this.markdownMenu = config.markdownMenu;
         this.displayName = config.displayName;
         this.packageName = config.packageName;
         this.packageUrl = config.packageUrl;
@@ -34,10 +34,31 @@ export class DocsInfo {
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
         this.contractsByVersionByNetworkId = config.contractsByVersionByNetworkId;
     }
-    public getSubsectionNameToLinks(docAgnosticFormat?: DocAgnosticFormat): ObjectMap<ALink[]> {
-        const subsectionNameToLinks: ObjectMap<ALink[]> = {};
+    public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
+        if (_.isUndefined(docAgnosticFormat[this.typeSectionName])) {
+            return {};
+        }
+
+        const section = docAgnosticFormat[this.typeSectionName];
+        const typeDefinitionByName = _.keyBy(section.types, 'name') as any;
+        return typeDefinitionByName;
+    }
+    public getSectionNameToLinks(docAgnosticFormat: DocAgnosticFormat): ObjectMap<ALink[]> {
+        const sectionNameToLinks: ObjectMap<ALink[]> = {};
+        _.each(this.markdownMenu, (linkTitles, sectionName) => {
+            sectionNameToLinks[sectionName] = [];
+            _.each(linkTitles, linkTitle => {
+                const to = sharedUtils.getIdFromName(linkTitle);
+                const links = sectionNameToLinks[sectionName];
+                links.push({
+                    title: linkTitle,
+                    to,
+                });
+            });
+        });
+
         if (_.isUndefined(docAgnosticFormat)) {
-            return subsectionNameToLinks;
+            return sectionNameToLinks;
         }
 
         const docSections = _.keys(this.sections);
@@ -64,7 +85,7 @@ export class DocsInfo {
                         title: typeName,
                     };
                 });
-                subsectionNameToLinks[sectionName] = typeLinks;
+                sectionNameToLinks[sectionName] = typeLinks;
             } else if (isExportedFunctionSection) {
                 // Noop so that we don't have the method listed underneath itself.
             } else {
@@ -88,33 +109,9 @@ export class DocsInfo {
                     };
                 });
 
-                subsectionNameToLinks[sectionName] = links;
+                sectionNameToLinks[sectionName] = links;
             }
         });
-        return subsectionNameToLinks;
-    }
-    public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
-        if (_.isUndefined(docAgnosticFormat[this.typeSectionName])) {
-            return {};
-        }
-
-        const section = docAgnosticFormat[this.typeSectionName];
-        const typeDefinitionByName = _.keyBy(section.types, 'name') as any;
-        return typeDefinitionByName;
-    }
-    public getSectionNameToLinks(): ObjectMap<ALink[]> {
-        const sectionNameToLinks: ObjectMap<ALink[]> = {};
-        _.each(this.menu, (linkTitles, sectionName) => {
-            sectionNameToLinks[sectionName] = [];
-            _.each(linkTitles, linkTitle => {
-                const to = sharedUtils.getIdFromName(linkTitle);
-                const links = sectionNameToLinks[sectionName];
-                links.push({
-                    title: linkTitle,
-                    to,
-                });
-            });
-        });
         return sectionNameToLinks;
     }
 }
diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts
index f9382940c..504091b34 100644
--- a/packages/react-docs/src/index.ts
+++ b/packages/react-docs/src/index.ts
@@ -5,7 +5,7 @@ export { DocAgnosticFormat, GeneratedDocJson } from '@0xproject/types';
 export { Badge } from './components/badge';
 export { Comment } from './components/comment';
 export { CustomEnum } from './components/custom_enum';
-export { Documentation } from './components/documentation';
+export { DocReference } from './components/doc_reference';
 export { Enum } from './components/enum';
 export { EventDefinition } from './components/event_definition';
 export { Interface } from './components/interface';
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 19605d497..05c9dae55 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -95,7 +95,9 @@ export class TypeDocUtils {
 
         if (!_.isEmpty(this._externalExportToLink)) {
             this._docsInfo.sections[constants.EXTERNAL_EXPORTS_SECTION_NAME] = constants.EXTERNAL_EXPORTS_SECTION_NAME;
-            this._docsInfo.menu[constants.EXTERNAL_EXPORTS_SECTION_NAME] = [constants.EXTERNAL_EXPORTS_SECTION_NAME];
+            this._docsInfo.markdownMenu[constants.EXTERNAL_EXPORTS_SECTION_NAME] = [
+                constants.EXTERNAL_EXPORTS_SECTION_NAME,
+            ];
             const docSection: DocSection = {
                 comment: 'This package also re-exports some third-party libraries for your convenience.',
                 constructors: [],
@@ -119,7 +121,7 @@ export class TypeDocUtils {
                     case KindString.ObjectLiteral: {
                         sectionName = child.name;
                         this._docsInfo.sections[sectionName] = sectionName;
-                        this._docsInfo.menu[sectionName] = [sectionName];
+                        this._docsInfo.markdownMenu[sectionName] = [sectionName];
                         const entities = child.children;
                         const commentObj = child.comment;
                         const sectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
@@ -136,7 +138,7 @@ export class TypeDocUtils {
                     case KindString.Function: {
                         sectionName = child.name;
                         this._docsInfo.sections[sectionName] = sectionName;
-                        this._docsInfo.menu[sectionName] = [sectionName];
+                        this._docsInfo.markdownMenu[sectionName] = [sectionName];
                         const entities = [child];
                         const commentObj = child.comment;
                         const SectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
@@ -158,7 +160,7 @@ export class TypeDocUtils {
         });
         if (!_.isEmpty(typeEntities)) {
             this._docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
-            this._docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
+            this._docsInfo.markdownMenu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
             const docSection = this._convertEntitiesToDocSection(typeEntities, constants.TYPES_SECTION_NAME);
             docAgnosticFormat[constants.TYPES_SECTION_NAME] = docSection;
         }
-- 
cgit v1.2.3


From eee0640b07bcddccbddf68618f2772b1de92a18d Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 15 Oct 2018 11:27:56 +0100
Subject: chore: many small stylistic changes

---
 packages/react-docs/src/components/doc_reference.tsx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index 38ec818db..c70b99b19 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -1,7 +1,9 @@
 import {
     colors,
     constants as sharedConstants,
+    Container,
     EtherscanLinkSuffixes,
+    HeaderSizes,
     Link,
     MarkdownSection,
     Networks,
@@ -101,11 +103,17 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
         const closestVersion = sortedEligibleVersions[0];
         const markdownFileIfExists = this.props.docsInfo.sectionNameToMarkdownByVersion[closestVersion][sectionName];
         if (!_.isUndefined(markdownFileIfExists)) {
+            // Special-case replace the `introduction` sectionName with the package name
+            const isIntroductionSection = sectionName === 'introduction';
+            const finalSectionName = isIntroductionSection ? this.props.docsInfo.displayName : sectionName;
+            const headerSize = isIntroductionSection ? HeaderSizes.H1 : HeaderSizes.H3;
             return (
                 <MarkdownSection
                     key={`markdown-section-${sectionName}`}
-                    sectionName={sectionName}
+                    sectionName={finalSectionName}
+                    headerSize={headerSize}
                     markdownContent={markdownFileIfExists}
+                    shouldReformatTitle={false}
                 />
             );
         }
@@ -215,6 +223,13 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
                             <div>{typeDefs}</div>
                         </div>
                     )}
+                <Container
+                    width={'100%'}
+                    height={'1px'}
+                    backgroundColor={colors.grey300}
+                    marginTop={'32px'}
+                    marginBottom={'12px'}
+                />
             </div>
         );
     }
-- 
cgit v1.2.3


From bf9af95654503df94b5b32af74a4cbc8bee7f2ec Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 15 Oct 2018 11:57:16 +0100
Subject: chore: improve colors

---
 packages/react-docs/src/components/comment.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/comment.tsx b/packages/react-docs/src/components/comment.tsx
index c3687c510..9c866e62c 100644
--- a/packages/react-docs/src/components/comment.tsx
+++ b/packages/react-docs/src/components/comment.tsx
@@ -1,4 +1,4 @@
-import { MarkdownCodeBlock } from '@0xproject/react-shared';
+import { colors, MarkdownCodeBlock } from '@0xproject/react-shared';
 import * as React from 'react';
 import * as ReactMarkdown from 'react-markdown';
 
@@ -13,7 +13,7 @@ const defaultProps = {
 
 export const Comment: React.SFC<CommentProps> = (props: CommentProps) => {
     return (
-        <div className={`${props.className} comment`}>
+        <div className={`${props.className} comment`} style={{ color: colors.greyTheme }}>
             <ReactMarkdown source={props.comment} renderers={{ code: MarkdownCodeBlock }} />
         </div>
     );
-- 
cgit v1.2.3


From b3a323efa1fc5d942c2f7052f585acc248394f44 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 15 Oct 2018 12:20:30 +0100
Subject: fix: Nested a tag warning in console by not rendering a tags within
 type definition popovers

---
 packages/react-docs/src/components/type.tsx        | 62 ++++++++++++----------
 .../react-docs/src/components/type_definition.tsx  |  1 +
 2 files changed, 34 insertions(+), 29 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 1ae1324c6..d579449f4 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -204,7 +204,9 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
     const isExportedClassReference = !!props.type.isExportedClassReference;
     const typeNameUrlIfExists = !_.isUndefined(props.type.externalLink) ? props.type.externalLink : undefined;
     if (!_.isUndefined(typeNameUrlIfExists)) {
-        typeName = (
+        typeName = props.isInPopover ? (
+            <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span>
+        ) : (
             <Link to={typeNameUrlIfExists} shouldOpenInNewTab={true} fontColor={colors.lightBlueA700}>
                 {typeName}
             </Link>
@@ -218,39 +220,41 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
             ? props.type.name
             : `${props.docsInfo.typeSectionName}-${typeName}`;
         typeName = (
-            <ScrollLink
-                to={typeDefinitionAnchorId}
-                offset={0}
-                hashSpy={true}
-                duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
-                containerId={sharedConstants.SCROLL_CONTAINER_ID}
-            >
+            <span>
                 {sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? (
                     <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span>
                 ) : (
-                    <span
-                        data-tip={true}
-                        data-for={id}
-                        style={{
-                            color: colors.lightBlueA700,
-                            cursor: 'pointer',
-                            display: 'inline-block',
-                        }}
+                    <ScrollLink
+                        to={typeDefinitionAnchorId}
+                        offset={0}
+                        hashSpy={true}
+                        duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
+                        containerId={sharedConstants.SCROLL_CONTAINER_ID}
                     >
-                        {typeName}
-                        <ReactTooltip type="light" effect="solid" id={id} className="typeTooltip">
-                            <TypeDefinition
-                                sectionName={props.sectionName}
-                                customType={props.typeDefinitionByName[typeName as string]}
-                                shouldAddId={false}
-                                docsInfo={props.docsInfo}
-                                typeDefinitionByName={props.typeDefinitionByName}
-                                isInPopover={true}
-                            />
-                        </ReactTooltip>
-                    </span>
+                        <span
+                            data-tip={true}
+                            data-for={id}
+                            style={{
+                                color: colors.lightBlueA700,
+                                cursor: 'pointer',
+                                display: 'inline-block',
+                            }}
+                        >
+                            {typeName}
+                            <ReactTooltip type="light" effect="solid" id={id} className="typeTooltip">
+                                <TypeDefinition
+                                    sectionName={props.sectionName}
+                                    customType={props.typeDefinitionByName[typeName as string]}
+                                    shouldAddId={false}
+                                    docsInfo={props.docsInfo}
+                                    typeDefinitionByName={props.typeDefinitionByName}
+                                    isInPopover={true}
+                                />
+                            </ReactTooltip>
+                        </span>
+                    </ScrollLink>
                 )}
-            </ScrollLink>
+            </span>
         );
     }
     return (
diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index 9a3e50a1b..e1c4f1f2b 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -124,6 +124,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                     title={`${typePrefix} ${customType.name}`}
                     id={this.props.shouldAddId ? typeDefinitionAnchorId : ''}
                     shouldShowAnchor={this.state.shouldShowAnchor}
+                    isDisabled={this.props.isInPopover ? true : false}
                 />
                 <div style={{ fontSize: 16 }}>
                     <pre>
-- 
cgit v1.2.3


From 96d145f54ff559fe6a46626e73c67e716d6927cd Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 15 Oct 2018 16:49:46 +0100
Subject: chore: Remove unused state

---
 packages/react-docs/src/components/doc_reference.tsx | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index c70b99b19..da05b04f8 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -50,17 +50,9 @@ export interface DocReferenceProps {
     docAgnosticFormat?: DocAgnosticFormat;
 }
 
-export interface DocReferenceState {
-    isHoveringSidebar: boolean;
-}
+export interface DocReferenceState {}
 
 export class DocReference extends React.Component<DocReferenceProps, DocReferenceState> {
-    constructor(props: DocReferenceProps) {
-        super(props);
-        this.state = {
-            isHoveringSidebar: false,
-        };
-    }
     public componentDidMount(): void {
         window.addEventListener('hashchange', this._onHashChanged.bind(this), false);
     }
@@ -329,16 +321,6 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
             />
         );
     }
-    private _onSidebarHover(_event: React.FormEvent<HTMLInputElement>): void {
-        this.setState({
-            isHoveringSidebar: true,
-        });
-    }
-    private _onSidebarHoverOff(): void {
-        this.setState({
-            isHoveringSidebar: false,
-        });
-    }
     private _onHashChanged(_event: any): void {
         const hash = window.location.hash.slice(1);
         sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID);
-- 
cgit v1.2.3


From ce151f630d10664353ff1c9172a7495557792abe Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 15 Oct 2018 17:35:40 +0100
Subject: feat: highlighted sidebar as you scroll on doc reference pages

---
 packages/react-docs/src/components/doc_reference.tsx   | 8 +++++---
 packages/react-docs/src/components/signature_block.tsx | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index da05b04f8..3a909db7e 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -97,15 +97,15 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
         if (!_.isUndefined(markdownFileIfExists)) {
             // Special-case replace the `introduction` sectionName with the package name
             const isIntroductionSection = sectionName === 'introduction';
-            const finalSectionName = isIntroductionSection ? this.props.docsInfo.displayName : sectionName;
             const headerSize = isIntroductionSection ? HeaderSizes.H1 : HeaderSizes.H3;
             return (
                 <MarkdownSection
                     key={`markdown-section-${sectionName}`}
-                    sectionName={finalSectionName}
+                    sectionName={sectionName}
                     headerSize={headerSize}
                     markdownContent={markdownFileIfExists}
                     shouldReformatTitle={false}
+                    alternativeSectionTitle={isIntroductionSection ? this.props.docsInfo.displayName : undefined}
                 />
             );
         }
@@ -196,7 +196,9 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
                 )}
                 {!_.isEmpty(docSection.functions) && (
                     <div>
-                        {!isExportedFunctionSection && <h2 style={headerStyle}>Functions</h2>}
+                        {!isExportedFunctionSection && (
+                            <div style={{ ...headerStyle, fontSize: '1.5em' }}>Functions</div>
+                        )}
                         <div>{functionDefs}</div>
                     </div>
                 )}
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 5ec82983a..819311953 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -55,7 +55,7 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
             <div
                 id={`${this.props.sectionName}-${method.name}`}
                 style={{ overflow: 'hidden', width: '100%' }}
-                className="pb4"
+                className="pb4 pt2"
                 onMouseOver={this._setAnchorVisibility.bind(this, true)}
                 onMouseOut={this._setAnchorVisibility.bind(this, false)}
             >
-- 
cgit v1.2.3


From 770cf529334543a1d23cdfa0fad1672879cda974 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Tue, 9 Oct 2018 14:21:56 -0700
Subject: Remove unused copyfiles dependencies

---
 packages/react-docs/package.json | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 1f8b77e2c..b1e80d1b6 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -27,7 +27,6 @@
         "@0xproject/dev-utils": "^1.0.12",
         "@0xproject/tslint-config": "^1.0.8",
         "@types/compare-versions": "^3.0.0",
-        "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "^5.9.1",
-- 
cgit v1.2.3


From bf51728466956837bbe669dfa0883c4d6611a628 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 16 Oct 2018 16:35:55 +0100
Subject: chore: simplify

---
 packages/react-docs/src/components/type_definition.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index e1c4f1f2b..3b64247f2 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -124,7 +124,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                     title={`${typePrefix} ${customType.name}`}
                     id={this.props.shouldAddId ? typeDefinitionAnchorId : ''}
                     shouldShowAnchor={this.state.shouldShowAnchor}
-                    isDisabled={this.props.isInPopover ? true : false}
+                    isDisabled={this.props.isInPopover}
                 />
                 <div style={{ fontSize: 16 }}>
                     <pre>
-- 
cgit v1.2.3


From 17fb4d5b5703df2a86be0c2f1210c1327debc033 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 16 Oct 2018 16:38:05 +0100
Subject: chore: Remove unused prop

---
 packages/react-docs/src/components/doc_reference.tsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index 3a909db7e..83cc00bab 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -104,7 +104,6 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
                     sectionName={sectionName}
                     headerSize={headerSize}
                     markdownContent={markdownFileIfExists}
-                    shouldReformatTitle={false}
                     alternativeSectionTitle={isIntroductionSection ? this.props.docsInfo.displayName : undefined}
                 />
             );
-- 
cgit v1.2.3


From 55a3bc8cb6772802672f60f22c5ed5c7e1b2dfdd Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 16 Oct 2018 16:43:43 +0100
Subject: chore: don't use Container in react-shared, react-docs yet

---
 packages/react-docs/src/components/doc_reference.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index 83cc00bab..5fdcdd2d9 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -1,7 +1,6 @@
 import {
     colors,
     constants as sharedConstants,
-    Container,
     EtherscanLinkSuffixes,
     HeaderSizes,
     Link,
@@ -216,12 +215,14 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
                             <div>{typeDefs}</div>
                         </div>
                     )}
-                <Container
-                    width={'100%'}
-                    height={'1px'}
-                    backgroundColor={colors.grey300}
-                    marginTop={'32px'}
-                    marginBottom={'12px'}
+                <div
+                    style={{
+                        width: '100%',
+                        height: 1,
+                        backgroundColor: colors.grey300,
+                        marginTop: 32,
+                        marginBottom: 12,
+                    }}
                 />
             </div>
         );
-- 
cgit v1.2.3


From 4ca89fc9f1c72fc1b8db270838965512a6e95982 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 17 Oct 2018 15:53:01 +0100
Subject: nit: use ObjectMap

---
 packages/react-docs/src/docs_info.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index d75a1676c..08e7703df 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -34,7 +34,7 @@ export class DocsInfo {
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
         this.contractsByVersionByNetworkId = config.contractsByVersionByNetworkId;
     }
-    public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
+    public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): ObjectMap<TypeDefinitionByName> {
         if (_.isUndefined(docAgnosticFormat[this.typeSectionName])) {
             return {};
         }
-- 
cgit v1.2.3


From e18f66e5b7a099101c8d9273391744eacd705f59 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 17 Oct 2018 15:53:28 +0100
Subject: nit: use styled-component instead of react-state for onHover

---
 packages/react-docs/package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index b1e80d1b6..ff23c7fe3 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -27,6 +27,7 @@
         "@0xproject/dev-utils": "^1.0.12",
         "@0xproject/tslint-config": "^1.0.8",
         "@types/compare-versions": "^3.0.0",
+        "@types/styled-components": "^4.0.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "^5.9.1",
@@ -51,7 +52,8 @@
         "react-markdown": "^3.2.2",
         "react-scroll": "0xproject/react-scroll#similar-to-pr-330",
         "react-tooltip": "^3.2.7",
-        "semver": "5.5.0"
+        "semver": "5.5.0",
+        "styled-components": "^3.3.0"
     },
     "publishConfig": {
         "access": "public"
-- 
cgit v1.2.3


From 6ab6a9aa2b3511df60c078398168a84faf3e2385 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Oct 2018 11:28:48 +0100
Subject: Update react-scroll hash to avoid collision with older, unfixed
 branch

---
 packages/react-docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index ff23c7fe3..6830a2101 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -50,7 +50,7 @@
         "react": "^16.4.2",
         "react-dom": "^16.4.2",
         "react-markdown": "^3.2.2",
-        "react-scroll": "0xproject/react-scroll#similar-to-pr-330",
+        "react-scroll": "0xproject/react-scroll#similar-to-pr-330-but-with-replace-state",
         "react-tooltip": "^3.2.7",
         "semver": "5.5.0",
         "styled-components": "^3.3.0"
-- 
cgit v1.2.3


From 9f924e459c43c023e35ab7222cd9824cc0e67411 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Thu, 18 Oct 2018 21:51:56 +1100
Subject: chore: change package org from 0xproject to 0x

---
 packages/react-docs/package.json               | 12 ++++++------
 packages/react-docs/src/docs_info.ts           |  4 ++--
 packages/react-docs/src/index.ts               |  2 +-
 packages/react-docs/src/utils/typedoc_utils.ts |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 6830a2101..aeb3fb9ae 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@0xproject/react-docs",
+    "name": "@0x/react-docs",
     "version": "1.0.13",
     "engines": {
         "node": ">=6.12"
@@ -24,8 +24,8 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.12",
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/dev-utils": "^1.0.12",
+        "@0x/tslint-config": "^1.0.8",
         "@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": {
-        "@0xproject/react-shared": "^1.0.15",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/utils": "^2.0.2",
+        "@0x/react-shared": "^1.0.15",
+        "@0x/types": "^1.1.4",
+        "@0x/utils": "^2.0.2",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 08e7703df..4f2225acb 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,5 +1,5 @@
-import { ALink, utils as sharedUtils } from '@0xproject/react-shared';
-import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0xproject/types';
+import { MenuSubsectionsBySection } from '@0x/react-shared';
+import { DocAgnosticFormat, TypeDefinitionByName } from '@0x/types';
 import * as _ from 'lodash';
 
 import {
diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts
index 504091b34..a5ed788b1 100644
--- a/packages/react-docs/src/index.ts
+++ b/packages/react-docs/src/index.ts
@@ -1,4 +1,4 @@
-export { DocAgnosticFormat, GeneratedDocJson } from '@0xproject/types';
+export { DocAgnosticFormat, GeneratedDocJson } from '@0x/types';
 
 // Exported to give users of this library added flexibility if they want to build
 // a docs page from scratch using the individual components.
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 05c9dae55..f74ec3e28 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -16,8 +16,8 @@ import {
     TypeParameter,
     TypescriptFunction,
     TypescriptMethod,
-} from '@0xproject/types';
-import { errorUtils } from '@0xproject/utils';
+} from '@0x/types';
+import { errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { DocsInfo } from '../docs_info';
-- 
cgit v1.2.3


From 88c929a408d17d8d1f4604187f8b1b04e94dab73 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Thu, 18 Oct 2018 22:01:04 +1100
Subject: chore: change tslint.json from 0xproject to 0x

---
 packages/react-docs/tslint.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/tslint.json b/packages/react-docs/tslint.json
index c78434416..c3f6d9cae 100644
--- a/packages/react-docs/tslint.json
+++ b/packages/react-docs/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": ["@0xproject/tslint-config"],
+    "extends": ["@0x/tslint-config"],
     "rules": {
         "no-object-literal-type-assertion": false,
         "completed-docs": false,
-- 
cgit v1.2.3


From 2735fb4fa6901dc528aea5f642512c161b842efd Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Thu, 18 Oct 2018 22:03:47 +1100
Subject: chore: change README.md from 0xproject to 0x

---
 packages/react-docs/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md
index 51e949967..19c092e4d 100644
--- a/packages/react-docs/README.md
+++ b/packages/react-docs/README.md
@@ -1,4 +1,4 @@
-## @0xproject/react-docs
+## @0x/react-docs
 
 #### WARNING: Alpha software. Expect things to break when trying to use.
 
@@ -24,7 +24,7 @@ A full-page React component for rendering beautiful documentation for Solidity a
 ## Installation
 
 ```bash
-yarn add @0xproject/react-docs
+yarn add @0x/react-docs
 ```
 
 ## Usage
@@ -37,7 +37,7 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
@@ -74,13 +74,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/react-docs yarn build
+PKG=@0x/react-docs yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/react-docs yarn watch
+PKG=@0x/react-docs yarn watch
 ```
 
 ### Clean
-- 
cgit v1.2.3


From 8c6de7f69dc1d2bc543456782c5e70e105026301 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Oct 2018 13:59:40 +0100
Subject: chore: replace @0xproject with @0x in .tsx files

---
 packages/react-docs/src/components/badge.tsx            | 2 +-
 packages/react-docs/src/components/custom_enum.tsx      | 4 ++--
 packages/react-docs/src/components/doc_reference.tsx    | 4 ++--
 packages/react-docs/src/components/event_definition.tsx | 4 ++--
 packages/react-docs/src/components/interface.tsx        | 2 +-
 packages/react-docs/src/components/property_block.tsx   | 4 ++--
 packages/react-docs/src/components/signature.tsx        | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/badge.tsx b/packages/react-docs/src/components/badge.tsx
index d34f8a0fc..e3d5be273 100644
--- a/packages/react-docs/src/components/badge.tsx
+++ b/packages/react-docs/src/components/badge.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as React from 'react';
 
 const styles: Styles = {
diff --git a/packages/react-docs/src/components/custom_enum.tsx b/packages/react-docs/src/components/custom_enum.tsx
index fa7c43146..e971a012a 100644
--- a/packages/react-docs/src/components/custom_enum.tsx
+++ b/packages/react-docs/src/components/custom_enum.tsx
@@ -1,8 +1,8 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 
-import { CustomType } from '@0xproject/types';
+import { CustomType } from '@0x/types';
 
 const STRING_ENUM_CODE_PREFIX = ' strEnum(';
 
diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index 5fdcdd2d9..00b1286a4 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -8,7 +8,7 @@ import {
     Networks,
     SectionHeader,
     utils as sharedUtils,
-} from '@0xproject/react-shared';
+} from '@0x/react-shared';
 import {
     DocAgnosticFormat,
     Event,
@@ -18,7 +18,7 @@ import {
     TypeDefinitionByName,
     TypescriptFunction,
     TypescriptMethod,
-} from '@0xproject/types';
+} from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as semver from 'semver';
diff --git a/packages/react-docs/src/components/event_definition.tsx b/packages/react-docs/src/components/event_definition.tsx
index 37236275b..b76769788 100644
--- a/packages/react-docs/src/components/event_definition.tsx
+++ b/packages/react-docs/src/components/event_definition.tsx
@@ -1,5 +1,5 @@
-import { AnchorTitle, colors, HeaderSizes } from '@0xproject/react-shared';
-import { Event, EventArg } from '@0xproject/types';
+import { AnchorTitle, colors, HeaderSizes } from '@0x/react-shared';
+import { Event, EventArg } from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index cad7d6c46..0df44ca1c 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -1,7 +1,7 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 
-import { CustomType, TypeDefinitionByName } from '@0xproject/types';
+import { CustomType, TypeDefinitionByName } from '@0x/types';
 
 import { DocsInfo } from '../docs_info';
 
diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx
index 8434e8682..d0bd84802 100644
--- a/packages/react-docs/src/components/property_block.tsx
+++ b/packages/react-docs/src/components/property_block.tsx
@@ -1,5 +1,5 @@
-import { AnchorTitle, HeaderSizes } from '@0xproject/react-shared';
-import { Property, TypeDefinitionByName } from '@0xproject/types';
+import { AnchorTitle, HeaderSizes } from '@0x/react-shared';
+import { Property, TypeDefinitionByName } from '@0x/types';
 import * as React from 'react';
 
 import { DocsInfo } from '../docs_info';
diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index 1f3dd0ee8..c229999b1 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -1,7 +1,7 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 
-import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '@0xproject/types';
+import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '@0x/types';
 
 import { DocsInfo } from '../docs_info';
 
-- 
cgit v1.2.3


From 683c6f22af9f2417fbd8288cc7607fb355a1798d Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Oct 2018 14:03:00 +0100
Subject: chore: add missing imports

---
 packages/react-docs/src/docs_info.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 4f2225acb..e84050ec9 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,5 +1,5 @@
-import { MenuSubsectionsBySection } from '@0x/react-shared';
-import { DocAgnosticFormat, TypeDefinitionByName } from '@0x/types';
+import { ALink } from '@0x/react-shared';
+import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0x/types';
 import * as _ from 'lodash';
 
 import {
-- 
cgit v1.2.3


From 0affc7682fa1a7484bb77cc460e9b9d10553980f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Oct 2018 14:06:12 +0100
Subject: chore: fix imports

---
 packages/react-docs/src/components/comment.tsx         | 2 +-
 packages/react-docs/src/components/signature_block.tsx | 4 ++--
 packages/react-docs/src/components/source_link.tsx     | 4 ++--
 packages/react-docs/src/components/type.tsx            | 6 +++---
 packages/react-docs/src/components/type_definition.tsx | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/comment.tsx b/packages/react-docs/src/components/comment.tsx
index 9c866e62c..4d34f711e 100644
--- a/packages/react-docs/src/components/comment.tsx
+++ b/packages/react-docs/src/components/comment.tsx
@@ -1,4 +1,4 @@
-import { colors, MarkdownCodeBlock } from '@0xproject/react-shared';
+import { colors, MarkdownCodeBlock } from '@0x/react-shared';
 import * as React from 'react';
 import * as ReactMarkdown from 'react-markdown';
 
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 819311953..0ce32467b 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -1,11 +1,11 @@
-import { AnchorTitle, colors, HeaderSizes, Styles } from '@0xproject/react-shared';
+import { AnchorTitle, colors, HeaderSizes, Styles } from '@0x/react-shared';
 import {
     Parameter,
     SolidityMethod,
     TypeDefinitionByName,
     TypescriptFunction,
     TypescriptMethod,
-} from '@0xproject/types';
+} from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/react-docs/src/components/source_link.tsx b/packages/react-docs/src/components/source_link.tsx
index c6dd09adb..6459824c2 100644
--- a/packages/react-docs/src/components/source_link.tsx
+++ b/packages/react-docs/src/components/source_link.tsx
@@ -1,5 +1,5 @@
-import { colors, Link } from '@0xproject/react-shared';
-import { Source } from '@0xproject/types';
+import { colors, Link } from '@0x/react-shared';
+import { Source } from '@0x/types';
 import * as React from 'react';
 
 export interface SourceLinkProps {
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index d579449f4..412b99b9d 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -1,6 +1,6 @@
-import { colors, constants as sharedConstants, Link, utils as sharedUtils } from '@0xproject/react-shared';
-import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '@0xproject/types';
-import { errorUtils } from '@0xproject/utils';
+import { colors, constants as sharedConstants, Link, utils as sharedUtils } from '@0x/react-shared';
+import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '@0x/types';
+import { errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Link as ScrollLink } from 'react-scroll';
diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx
index 3b64247f2..a1fde51da 100644
--- a/packages/react-docs/src/components/type_definition.tsx
+++ b/packages/react-docs/src/components/type_definition.tsx
@@ -1,6 +1,6 @@
-import { AnchorTitle, colors, HeaderSizes } from '@0xproject/react-shared';
-import { CustomType, CustomTypeChild, TypeDefinitionByName, TypeDocTypes } from '@0xproject/types';
-import { errorUtils } from '@0xproject/utils';
+import { AnchorTitle, colors, HeaderSizes } from '@0x/react-shared';
+import { CustomType, CustomTypeChild, TypeDefinitionByName, TypeDocTypes } from '@0x/types';
+import { errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 
-- 
cgit v1.2.3


From ac377490dc4e5c4e8bf4e9a25bfadaa270daed9b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Oct 2018 14:09:02 +0100
Subject: chore: add missing import

---
 packages/react-docs/src/docs_info.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index e84050ec9..54b59ef1f 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,4 +1,4 @@
-import { ALink } from '@0x/react-shared';
+import { ALink, utils as sharedUtils } from '@0x/react-shared';
 import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0x/types';
 import * as _ from 'lodash';
 
-- 
cgit v1.2.3


From ece76e58748f235c73a662b748ccb695ac20c1e0 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 18 Oct 2018 15:27:07 +0200
Subject: Fix prettier issues

---
 packages/react-docs/src/components/signature_block.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 0ce32467b..7cdf19bb0 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -1,11 +1,5 @@
 import { AnchorTitle, colors, HeaderSizes, Styles } from '@0x/react-shared';
-import {
-    Parameter,
-    SolidityMethod,
-    TypeDefinitionByName,
-    TypescriptFunction,
-    TypescriptMethod,
-} from '@0x/types';
+import { Parameter, SolidityMethod, TypeDefinitionByName, TypescriptFunction, TypescriptMethod } from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 
-- 
cgit v1.2.3


From 71d1e6b0ecb4bfb5cfa44cf35b924682383beba2 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 18 Oct 2018 16:02:49 +0200
Subject: Updated CHANGELOGS

---
 packages/react-docs/CHANGELOG.json | 9 +++++++++
 packages/react-docs/CHANGELOG.md   | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index ac3f22716..97485be96 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1539871071,
+        "version": "1.0.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "1.0.13",
         "changes": [
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 485bf61a6..096bd8460 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.14 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.0.13 - _October 4, 2018_
 
     * Dependencies updated
@@ -37,7 +41,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
-- 
cgit v1.2.3


From 8b62b350b1fed6a0d8827ca9ed5fcec3e78ae82f Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 18 Oct 2018 16:03:00 +0200
Subject: Publish

 - 0x.js@2.0.0
 - @0x/abi-gen@1.0.14
 - @0x/abi-gen-wrappers@1.0.1
 - @0x/assert@1.0.14
 - @0x/asset-buyer@2.1.0
 - @0x/base-contract@3.0.2
 - @0x/connect@3.0.2
 - @0x/contract-addresses@1.0.1
 - @0x/contract-artifacts@1.0.1
 - @0x/contract-wrappers@3.0.0
 - contracts@2.1.50
 - @0x/dev-tools-pages@0.0.2
 - @0x/dev-utils@1.0.13
 - ethereum-types@1.1.1
 - @0x/fill-scenarios@1.0.8
 - @0x/instant@0.0.3
 - @0x/json-schemas@2.0.0
 - @0x/metacoin@0.0.24
 - @0x/migrations@2.0.0
 - @0x/monorepo-scripts@1.0.12
 - @0x/order-utils@2.0.0
 - @0x/order-watcher@2.2.0
 - @0x/react-docs@1.0.14
 - @0x/react-shared@1.0.17
 - @0x/sol-compiler@1.1.8
 - @0x/sol-cov@2.1.8
 - @0x/sol-doc@1.0.3
 - @0x/sol-resolver@1.0.15
 - @0x/sra-spec@1.0.7
 - @0x/subproviders@2.1.0
 - @0x/testnet-faucets@1.0.52
 - @0x/tslint-config@1.0.9
 - @0x/types@1.2.0
 - @0x/typescript-typings@3.0.3
 - @0x/utils@2.0.3
 - @0x/web3-wrapper@3.1.0
 - @0x/website@0.0.55
---
 packages/react-docs/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index aeb3fb9ae..04e1387c6 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/react-docs",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,8 +24,8 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0x/dev-utils": "^1.0.12",
-        "@0x/tslint-config": "^1.0.8",
+        "@0x/dev-utils": "^1.0.13",
+        "@0x/tslint-config": "^1.0.9",
         "@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.0.15",
-        "@0x/types": "^1.1.4",
-        "@0x/utils": "^2.0.2",
+        "@0x/react-shared": "^1.0.17",
+        "@0x/types": "^1.2.0",
+        "@0x/utils": "^2.0.3",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",
-- 
cgit v1.2.3


From da0c5dd9d3e92b48a87585d4c08e2e9bd1279090 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 19 Oct 2018 10:35:34 +0100
Subject: chore: Fix scroll issue by bumping version and installing from new
 branch

---
 packages/react-docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 04e1387c6..d3ccfa8da 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -50,7 +50,7 @@
         "react": "^16.4.2",
         "react-dom": "^16.4.2",
         "react-markdown": "^3.2.2",
-        "react-scroll": "0xproject/react-scroll#similar-to-pr-330-but-with-replace-state",
+        "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
         "react-tooltip": "^3.2.7",
         "semver": "5.5.0",
         "styled-components": "^3.3.0"
-- 
cgit v1.2.3


From 90ba8e0e8df2ccd2907adfcb143ed954b9d0b4c5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 19 Oct 2018 17:09:13 +0100
Subject: Remove unused listeners

---
 packages/react-docs/src/components/doc_reference.tsx | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index 00b1286a4..85547576b 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -52,12 +52,6 @@ export interface DocReferenceProps {
 export interface DocReferenceState {}
 
 export class DocReference extends React.Component<DocReferenceProps, DocReferenceState> {
-    public componentDidMount(): void {
-        window.addEventListener('hashchange', this._onHashChanged.bind(this), false);
-    }
-    public componentWillUnmount(): void {
-        window.removeEventListener('hashchange', this._onHashChanged.bind(this), false);
-    }
     public componentDidUpdate(prevProps: DocReferenceProps, _prevState: DocReferenceState): void {
         if (!_.isEqual(prevProps.docAgnosticFormat, this.props.docAgnosticFormat)) {
             const hash = window.location.hash.slice(1);
@@ -323,8 +317,4 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
             />
         );
     }
-    private _onHashChanged(_event: any): void {
-        const hash = window.location.hash.slice(1);
-        sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID);
-    }
 }
-- 
cgit v1.2.3


From 2c04ee3f5e4438f9ae51944e7ea6bd6b501317a7 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Tue, 23 Oct 2018 18:30:11 -0700
Subject: chore: Add --format stylish to tslint

---
 packages/react-docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/react-docs')

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index d3ccfa8da..e234b0479 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -8,7 +8,7 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "lint": "tslint --project .",
+        "lint": "tslint --format stylish --project .",
         "build": "tsc -b",
         "build:ci": "yarn build",
         "clean": "shx rm -rf lib"
-- 
cgit v1.2.3