@syncfusion/ej2-calendars 31.2.15 → 31.2.16

package/dist/es6/ej2-calendars.es2015.js

@@ -15414,6 +15414,9 @@ class MaskedDateTime {
     }
     maskInputHandler() {
         let start = this.parent.inputElement.selectionStart;
+        if (Browser.isDevice && (Browser.isIos || Browser.isIos7)) {
+            start = this.normalizeTokenIndex(start);
+        }
         let formatText = '';
         if (this.validCharacters.indexOf(this.hiddenMask[start]) !== -1) {
             formatText = this.hiddenMask[start];
@@ -15433,10 +15436,18 @@ class MaskedDateTime {
                 break;
             }
         }
-        let scrollPositionY;
+        let scrollContext = null;
+        let savedScrollTop = 0;
         if (Browser.isDevice && (Browser.isIos || Browser.isIos7)) {
             const scrollableParent = this.findScrollableParent(this.parent.inputElement);
-            scrollPositionY = scrollableParent ? scrollableParent.getBoundingClientRect().top : window.scrollY;
+            if (scrollableParent) {
+                scrollContext = scrollableParent;
+                savedScrollTop = scrollableParent.scrollTop;
+            }
+            else {
+                scrollContext = window;
+                savedScrollTop = window.pageYOffset || document.documentElement.scrollTop || 0;
+            }
         }
         this.parent.inputElement.selectionStart = start;
         this.validCharacterCheck();
@@ -15446,7 +15457,12 @@ class MaskedDateTime {
             this.navigateSelection(isbackward);
             if (Browser.isDevice && (Browser.isIos || Browser.isIos7)) {
                 setTimeout(() => {
-                    window.scrollTo(0, scrollPositionY);
+                    if (scrollContext) {
+                        scrollContext.scrollTop = savedScrollTop;
+                    }
+                    else {
+                        window.scrollTo(0, savedScrollTop);
+                    }
                 }, 0);
             }
         }
@@ -15641,6 +15657,34 @@ class MaskedDateTime {
         this.dayTypeCount = 0;
         this.monthTypeCount = 0;
     }
+    isMaskToken(i) {
+        return i >= 0 && i < this.hiddenMask.length &&
+            this.validCharacters.indexOf(this.hiddenMask[i]) !== -1;
+    }
+    normalizeTokenIndex(index, preferPrev = false) {
+        if (this.isMaskToken(index)) {
+            return index;
+        }
+        const prev = index - 1;
+        const next = index + 1;
+        if (preferPrev) {
+            if (this.isMaskToken(prev)) {
+                return prev;
+            }
+            if (this.isMaskToken(next)) {
+                return next;
+            }
+        }
+        else {
+            if (this.isMaskToken(next)) {
+                return next;
+            }
+            if (this.isMaskToken(prev)) {
+                return prev;
+            }
+        }
+        return index;
+    }
     destroy() {
         this.removeEventListener();
     }