Merge branch 'master' into zach-starter

1 files changed, 3 insertions, 3 deletions

diff --git a/src/Utils.ts b/src/Utils.ts
index 38325a463..a64c7c8a7 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -653,13 +653,13 @@ export function smoothScroll(duration: number, element: HTMLElement | HTMLElemen
     const animateScroll = () => {
         const currentDate = new Date().getTime();
         const currentTime = currentDate - startDate;
-        elements.map((element, i) => (element.scrollTop = easeFunc(transition, currentTime, starts[i], to - starts[i], duration)));
-
+        const setScrollTop = (element: HTMLElement, value: number) => (element.scrollTop = value);
         if (!_stop) {
             if (currentTime < duration) {
+                elements.forEach((element, i) => currentTime && setScrollTop(element, easeFunc(transition, Math.min(currentTime, duration), starts[i], to - starts[i], duration)));
                 requestAnimationFrame(animateScroll);
             } else {
-                elements.forEach(element => (element.scrollTop = to));
+                elements.forEach(element => setScrollTop(element, to));
             }
         }
     };