Update React-scroll, getting rid of the need to manually set the url hash

7 files changed, 12 insertions, 22 deletions

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}
             >
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 6b4501e83..9f4cfd624 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -39,7 +39,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",
         "is-mobile": "^0.2.2",
         "lodash": "^4.17.4",
@@ -48,7 +48,7 @@
         "react-dom": "15.6.1",
         "react-highlight": "0xproject/react-highlight",
         "react-markdown": "^3.2.2",
-        "react-scroll": "^1.5.2",
+        "react-scroll": "^1.7.10",
         "react-tap-event-plugin": "^2.0.1"
     },
     "publishConfig": {
diff --git a/packages/react-shared/src/components/anchor_title.tsx b/packages/react-shared/src/components/anchor_title.tsx
index 473b994bf..451ba1729 100644
--- a/packages/react-shared/src/components/anchor_title.tsx
+++ b/packages/react-shared/src/components/anchor_title.tsx
@@ -69,13 +69,13 @@ export class AnchorTitle extends React.Component<AnchorTitleProps, AnchorTitleSt
                 </div>
                 <ScrollLink
                     to={this.props.id}
+                    hashSpy={true}
                     offset={headerSizeToScrollOffset[this.props.headerSize]}
                     duration={constants.DOCS_SCROLL_DURATION_MS}
                     containerId={constants.DOCS_CONTAINER_ID}
                 >
                     <i
                         className="zmdi zmdi-link"
-                        onClick={utils.setUrlHash.bind(utils, this.props.id)}
                         style={{ ...styles.anchor, opacity }}
                         onMouseOver={this._setHoverState.bind(this, true)}
                         onMouseOut={this._setHoverState.bind(this, false)}
diff --git a/packages/react-shared/src/components/nested_sidebar_menu.tsx b/packages/react-shared/src/components/nested_sidebar_menu.tsx
index aa00d5985..10bcb7d8c 100644
--- a/packages/react-shared/src/components/nested_sidebar_menu.tsx
+++ b/packages/react-shared/src/components/nested_sidebar_menu.tsx
@@ -94,14 +94,11 @@ export class NestedSidebarMenu extends React.Component<NestedSidebarMenuProps, N
                         key={`menuItem-${menuItemName}`}
                         to={id}
                         offset={-10}
+                        hashSpy={true}
                         duration={constants.DOCS_SCROLL_DURATION_MS}
                         containerId={constants.DOCS_CONTAINER_ID}
                     >
-                        <MenuItem
-                            onTouchTap={this._onMenuItemClick.bind(this, finalMenuItemName)}
-                            style={menuItemStyles}
-                            innerDivStyle={menuItemInnerDivStyles}
-                        >
+                        <MenuItem style={menuItemStyles} innerDivStyle={menuItemInnerDivStyles}>
                             <span style={{ textTransform: 'capitalize' }}>{finalMenuItemName}</span>
                         </MenuItem>
                     </ScrollLink>
@@ -128,12 +125,11 @@ export class NestedSidebarMenu extends React.Component<NestedSidebarMenuProps, N
                             <ScrollLink
                                 to={id}
                                 offset={0}
+                                hashSpy={true}
                                 duration={constants.DOCS_SCROLL_DURATION_MS}
                                 containerId={constants.DOCS_CONTAINER_ID}
-                                onTouchTap={this._onMenuItemClick.bind(this, name)}
                             >
                                 <MenuItem
-                                    onTouchTap={this._onMenuItemClick.bind(this, name)}
                                     style={{ minHeight: 35 }}
                                     innerDivStyle={{
                                         paddingLeft: 16,
@@ -150,11 +146,4 @@ export class NestedSidebarMenu extends React.Component<NestedSidebarMenuProps, N
             </ul>
         );
     }
-    private _onMenuItemClick(name: string): void {
-        const id = utils.getIdFromName(name);
-        utils.setUrlHash(id);
-        if (!_.isUndefined(this.props.onMenuItemClick)) {
-            this.props.onMenuItemClick();
-        }
-    }
 }
diff --git a/packages/website/package.json b/packages/website/package.json
index 12c729308..ef420ab07 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -49,7 +49,7 @@
         "react-popper": "^1.0.0-beta.6",
         "react-redux": "^5.0.3",
         "react-router-dom": "^4.1.1",
-        "react-scroll": "^1.5.2",
+        "react-scroll": "^1.7.10",
         "react-tap-event-plugin": "^2.0.1",
         "react-tooltip": "^3.2.7",
         "redux": "^3.6.0",
@@ -77,7 +77,7 @@
         "@types/react-dom": "^16.0.3",
         "@types/react-redux": "^4.4.37",
         "@types/react-router-dom": "^4.0.4",
-        "@types/react-scroll": "0.0.31",
+        "@types/react-scroll": "1.5.3",
         "@types/react-tap-event-plugin": "0.0.30",
         "@types/redux": "^3.6.0",
         "awesome-typescript-loader": "^3.1.3",