fix(util): scrollTop set on proper scroll target (#10549)

Closes #10272 #10432
angular · Jul 18, 2017 · c1b715f · c1b715f
1 parent 0151b4b
commit c1b715f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/core/util/util.js b/src/core/util/util.js
@@ -285,6 +285,11 @@ function UtilFactory($document, $timeout, $compile, $rootScope, $$mdAnimate, $in
         var clientWidth = body.clientWidth;
         var hasVerticalScrollbar = body.scrollHeight > body.clientHeight + 1;
 
+        // Scroll may be set on <html> element (for example by overflow-y: scroll)
+        // but Chrome is reporting the scrollTop position always on <body>.
+        // scrollElement will allow to restore the scrollTop position to proper target.
+        var scrollElement = documentElement.scrollTop > 0 ? documentElement : body;
+
         if (hasVerticalScrollbar) {
           angular.element(body).css({
             position: 'fixed',
@@ -309,8 +314,8 @@ function UtilFactory($document, $timeout, $compile, $rootScope, $$mdAnimate, $in
           body.style.cssText = prevBodyStyle;
           documentElement.style.cssText = prevDocumentStyle;
 
-          // The body loses its scroll position while being fixed.
-          body.scrollTop = viewportTop;
+          // The scroll position while being fixed
+          scrollElement.scrollTop = viewportTop;
         };
       }