Merge https://github.com/0xProject/0x-monorepo into feature/instant/metamask-connect-flow

2 files changed, 5 insertions, 11 deletions

diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index 412b99b9d..fa3b658b4 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -1,9 +1,8 @@
-import { colors, constants as sharedConstants, Link, utils as sharedUtils } from '@0x/react-shared';
+import { colors, 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';
 import * as ReactTooltip from 'react-tooltip';
 
 import { DocsInfo } from '../docs_info';
@@ -224,13 +223,7 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
                 {sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? (
                     <span style={{ color: colors.lightBlueA700, cursor: 'pointer' }}>{typeName}</span>
                 ) : (
-                    <ScrollLink
-                        to={typeDefinitionAnchorId}
-                        offset={0}
-                        hashSpy={true}
-                        duration={sharedConstants.DOCS_SCROLL_DURATION_MS}
-                        containerId={sharedConstants.SCROLL_CONTAINER_ID}
-                    >
+                    <Link to={typeDefinitionAnchorId}>
                         <span
                             data-tip={true}
                             data-for={id}
@@ -252,7 +245,7 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
                                 />
                             </ReactTooltip>
                         </span>
-                    </ScrollLink>
+                    </Link>
                 )}
             </span>
         );
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 54b59ef1f..76f7784ba 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -10,6 +10,7 @@ import {
     SectionsMap,
     SupportedDocJson,
 } from './types';
+import { constants } from './utils/constants';
 
 export class DocsInfo {
     public id: string;
@@ -64,7 +65,7 @@ export class DocsInfo {
         const docSections = _.keys(this.sections);
         _.each(docSections, sectionName => {
             const docSection = docAgnosticFormat[sectionName];
-            if (_.isUndefined(docSection)) {
+            if (_.isUndefined(docSection) || sectionName === constants.EXTERNAL_EXPORTS_SECTION_NAME) {
                 return; // no-op
             }