Merge pull request #23 from habx/no-throw

Prevent error when clicking a link to an anchor that does not exist
some-react-components · Jan 9, 2018 · 0b24262 · 0b24262
2 parents 4315226 + f83f2a6
commit 0b24262
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/scrollchor.jsx b/src/scrollchor.jsx
@@ -40,8 +40,11 @@ export default class Scrollchor extends React.Component {
     this._beforeAnimate(event);
     event && event.preventDefault();
     const id = animateScroll(this._to, this._animate);
-    this._disableHistory || updateHistory(id);
-    this._afterAnimate(event);
+
+    if (id) {
+      this._disableHistory || updateHistory(id);
+      this._afterAnimate(event);
+    }
   }
 
   componentWillReceiveProps (props) {

diff --git a/src/utils.js b/src/utils.js
@@ -5,6 +5,10 @@ export function animateScroll (id, animate) {
   const element = id ? document.getElementById(id) : document.body;
   warning(element, `Cannot find element: #${id}`);
 
+  if (!element) {
+    return null;
+  }
+
   const { offset, duration, easing } = animate;
   const start = getScrollTop();
   const to = getOffsetTop(element) + offset;