Merge branch 'development' into dev-tools-pages

4 files changed, 31 insertions, 17 deletions

diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index 4394eeb2e..cb8ae1bf0 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "timestamp": 1542208198,
+        "version": "1.0.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1542134075,
+        "version": "1.0.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1542028948,
         "version": "1.0.19",
         "changes": [
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md
index 4104628bc..0ecb66a27 100644
--- a/packages/react-shared/CHANGELOG.md
+++ b/packages/react-shared/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.21 - _November 14, 2018_
+
+    * Dependencies updated
+
+## v1.0.20 - _November 13, 2018_
+
+    * Dependencies updated
+
 ## v1.0.19 - _November 12, 2018_
 
     * Dependencies updated
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 1336ce2dd..d2a00ca9c 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/react-shared",
-    "version": "1.0.19",
+    "version": "1.0.21",
     "engines": {
         "node": ">=6.12"
     },
@@ -25,7 +25,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0x/dev-utils": "^1.0.15",
+        "@0x/dev-utils": "^1.0.17",
         "@0x/tslint-config": "^1.0.10",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
diff --git a/packages/react-shared/src/components/anchor_title.tsx b/packages/react-shared/src/components/anchor_title.tsx
index bd99edcab..a9105e132 100644
--- a/packages/react-shared/src/components/anchor_title.tsx
+++ b/packages/react-shared/src/components/anchor_title.tsx
@@ -1,15 +1,9 @@
 import * as React from 'react';
-import { Link as ScrollLink } from 'react-scroll';
 import styled from 'styled-components';
 
+import { Link } from '../components/link';
 import { HeaderSizes, Styles } from '../types';
 import { colors } from '../utils/colors';
-import { constants } from '../utils/constants';
-
-const headerSizeToScrollOffset: { [headerSize: string]: number } = {
-    h2: -20,
-    h3: 0,
-};
 
 export interface AnchorTitleProps {
     title: string | React.ReactNode;
@@ -73,15 +67,9 @@ export class AnchorTitle extends React.Component<AnchorTitleProps, AnchorTitleSt
                     {this.props.title}
                 </div>
                 {!this.props.isDisabled && (
-                    <ScrollLink
-                        to={this.props.id}
-                        hashSpy={true}
-                        offset={headerSizeToScrollOffset[this.props.headerSize]}
-                        duration={constants.DOCS_SCROLL_DURATION_MS}
-                        containerId={constants.SCROLL_CONTAINER_ID}
-                    >
+                    <Link to={this.props.id}>
                         <AnchorIcon className="zmdi zmdi-link" shouldShowAnchor={this.props.shouldShowAnchor} />
-                    </ScrollLink>
+                    </Link>
                 )}
             </div>
         );