fix(keyboard): better scroll to. #4849 #4645

ionic-team · Dec 31, 2015 · 29a33d7 · 29a33d7
1 parent 9780c40
commit 29a33d7
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 9 deletions.
diff --git a/js/utils/dom.js b/js/utils/dom.js
@@ -112,6 +112,16 @@
       };
     },
 
+    getOffsetTop: function(el) {
+      var curtop = 0;
+      if (el.offsetParent) {
+        do {
+          curtop += el.offsetTop;
+        } while (el = el.offsetParent);
+        return curtop;
+      }
+    },
+
     /**
      * @ngdoc method
      * @name ionic.DomUtil#ready

diff --git a/js/views/scrollViewNative.js b/js/views/scrollViewNative.js
@@ -340,10 +340,17 @@
        * into view.
        */
       self.scrollChildIntoView = function(e) {
+        var rect = container.getBoundingClientRect();
+        if(!self.__originalContainerHeight) {
+          self.__originalContainerHeight = rect.height;
+        }
+
         // D
-        var scrollBottomOffsetToTop = container.getBoundingClientRect().bottom;
+        var scrollBottomOffsetToTop = rect.bottom;
         // D - A
-        scrollViewOffsetHeight = container.offsetHeight;
+        scrollViewOffsetHeight = self.__originalContainerHeight;
+        //console.log('Scroll view offset height', scrollViewOffsetHeight);
+        //console.dir(container);
         var alreadyShrunk = self.isShrunkForKeyboard;
 
         var isModal = container.parentNode.classList.contains('modal');
@@ -378,14 +385,25 @@
             var scrollBottomOffsetToBottom = e.detail.viewportHeight - scrollBottomOffsetToTop;
 
             // 0 or D - B if D > B           E - B                     E - D
-            var keyboardOffset = e.detail.keyboardHeight - scrollBottomOffsetToBottom;
+            //var keyboardOffset = e.detail.keyboardHeight - scrollBottomOffsetToBottom;
 
             ionic.requestAnimationFrame(function(){
               // D - A or B - A if D > B       D - A             max(0, D - B)
-              scrollViewOffsetHeight = keyboardOffset >= 0 ? scrollViewOffsetHeight + keyboardOffset : scrollViewOffsetHeight - keyboardOffset;
+              scrollViewOffsetHeight = Math.max(0, Math.min(self.__originalContainerHeight, self.__originalContainerHeight - (e.detail.keyboardHeight - 43)));//keyboardOffset >= 0 ? scrollViewOffsetHeight - keyboardOffset : scrollViewOffsetHeight + keyboardOffset;
+
+              //console.log('Old container height', self.__originalContainerHeight, 'New container height', scrollViewOffsetHeight, 'Keyboard height', e.detail.keyboardHeight);
 
               container.style.height = scrollViewOffsetHeight + "px";
 
+              /*
+              if (ionic.Platform.isIOS()) {
+                // Force redraw to avoid disappearing content
+                var disp = container.style.display;
+                container.style.display = 'none';
+                var trick = container.offsetHeight;
+                container.style.display = disp;
+              }
+              */
               container.classList.add('keyboard-up');
               //update scroll view
               self.resize();
@@ -413,26 +431,42 @@
         if (e.detail.isElementUnderKeyboard) {
 
           ionic.requestAnimationFrame(function(){
+            var pos = ionic.DomUtil.getOffsetTop(e.detail.target);
+            setTimeout(function() {
+              if (ionic.Platform.isIOS()) {
+                ionic.tap.cloneFocusedInput(container, self);
+              }
+              // Scroll the input into view, with a 100px buffer
+              self.scrollTo(0, pos - (rect.top + 100), true);
+              self.onScroll();
+            }, 32);
+
+            /*
             // update D if we shrunk
             if (self.isShrunkForKeyboard && !alreadyShrunk) {
               scrollBottomOffsetToTop = container.getBoundingClientRect().bottom;
+              console.log('Scroll bottom', scrollBottomOffsetToTop);
             }
 
             // middle of the scrollview, this is where we want to scroll to
             // (D - A) / 2
             var scrollMidpointOffset = scrollViewOffsetHeight * 0.5;
+            console.log('Midpoint', scrollMidpointOffset);
             //console.log("container.offsetHeight: " + scrollViewOffsetHeight);
 
             // middle of the input we want to scroll into view
             // C
             var inputMidpoint = ((e.detail.elementBottom + e.detail.elementTop) / 2);
+            console.log('Input midpoint');
 
             // distance from middle of input to the bottom of the scroll view
             // C - D                                C               D
             var inputMidpointOffsetToScrollBottom = inputMidpoint - scrollBottomOffsetToTop;
+            console.log('Input midpoint offset', inputMidpointOffsetToScrollBottom);
 
             //C - D + (D - A)/2          C - D                     (D - A)/ 2
             var scrollTop = inputMidpointOffsetToScrollBottom + scrollMidpointOffset;
+            console.log('Scroll top', scrollTop);
 
             if ( scrollTop > 0) {
               if (ionic.Platform.isIOS()) {
@@ -447,6 +481,7 @@
                 self.onScroll();
               }
             }
+            */
           });
         }
 
@@ -461,10 +496,23 @@
           self.isShrunkForKeyboard = false;
           container.style.height = "";
 
-          // Read after setting this to avoid rendering issues like white boxes.
-          ionic.requestAnimationFrame(function() {
-            container.classList.remove('keyboard-up');
-          });
+          /*
+          if (ionic.Platform.isIOS()) {
+            // Force redraw to avoid disappearing content
+            var disp = container.style.display;
+            container.style.display = 'none';
+            var trick = container.offsetHeight;
+            container.style.display = disp;
+          }
+          */
+
+          self.__originalContainerHeight = container.getBoundingClientRect().height;
+
+          if (ionic.Platform.isIOS()) {
+            ionic.requestAnimationFrame(function() {
+              container.classList.remove('keyboard-up');
+            });
+          }
 
         }
         self.resize();

diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss
@@ -210,7 +210,7 @@ ion-infinite-scroll {
     -webkit-transform: translate3d(0, 0, 0);   // fix iOS bug where relative children of scroller disapear while scrolling.  see: http://stackoverflow.com/questions/9807620/ipad-safari-scrolling-causes-html-elements-to-disappear-and-reappear-with-a-dela
   }
 
-  &.keyboard-up {
+  &.keyboard-up:not(.keyboard-up-confirm) {
     overflow: hidden;
   }
 }