fix #512

uNmAnNeR · Jul 19, 2023 · b09b2da · b09b2da · pytkin · Aug 16, 2023
1 parent 57c718c
commit b09b2da
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/packages/imask/example.html b/packages/imask/example.html
@@ -3,7 +3,7 @@
 
 <body>
   <h1>IMask Core Demo</h1>
-  <input type="text" id="input" value="123">
+  <input type="text" id="input" value="0000">
   <div>value: <span id="value"></span></div>
   <div>unmasked: <span id="unmasked"></span></div>
   <div contenteditable="true" id="ce"></div>
@@ -12,31 +12,36 @@ <h1>IMask Core Demo</h1>
   <!-- <script src="https://unpkg.com/imask"></script> -->
   <script type="text/javascript">
     const opts = {
-      mask: `d $`,
-      blocks: {
-        d: {
-          mask: Number,
-          scale: 2,
-          signed: false,
-          thousandsSeparator: " ",
-          padFractionalZeros: false,
-          normalizeZeros: false,
-          radix: ",",
-          mapToRadix: [".", "б", "^", "ю", "&"]
-        }
-      },
-      lazy: false
+      mask: /^.*$/
     };
 
+    const input = document.getElementById('input');
     var result = document.getElementById('value');
     var unmasked = document.getElementById('unmasked');
-    var imask = IMask(document.getElementById('input'), opts).on('accept', () => {
+    var imask = IMask(input, opts).on('accept', () => {
       console.log(imask.value, imask.unmaskedValue, imask.typedValue);
       result.innerHTML = imask.value;
       unmasked.innerHTML = imask.unmaskedValue;
     });
 
 
+    setTimeout(() => {
+      //HMR does pretty much this:
+      input.value = 1111
+      dispatchEvents(input)
+    }, 1000)
+
+    //straight from Angular's hmr-accept.js
+    function dispatchEvents() {
+      input.dispatchEvent(new Event('input', {
+          bubbles: true,
+          cancelable: true,
+      }));
+      input.blur();
+      input.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
+    }
+
+
     // document.getElementById('input').addEventListener('focus', () => {
     //   imask.updateOptions({
     //     mask: mask.map((m) => ({

diff --git a/packages/imask/src/controls/input.ts b/packages/imask/src/controls/input.ts
@@ -288,9 +288,6 @@ class InputMask<Opts extends FactoryArg> {
     this._inputEvent = e;
     this._abortUpdateCursor();
 
-    // fix strange IE behavior
-    if (!this._selection) return this.updateValue();
-
     const details = new ActionDetails({
       // new state
       value: this.el.value,

diff --git a/packages/imask/src/core/action-details.ts b/packages/imask/src/core/action-details.ts
@@ -28,6 +28,12 @@ class ActionDetails {
     while (this.value.slice(0, this.startChangePos) !== this.oldValue.slice(0, this.startChangePos)) {
       --this.oldSelection.start;
     }
+
+    // double check right part
+    while (this.value.slice(this.cursorPos) !== this.oldValue.slice(this.oldSelection.end)) {
+      if (this.value.length - this.cursorPos < this.oldValue.length - this.oldSelection.end) ++this.oldSelection.end;
+      else ++this.cursorPos;
+    }
   }
 
   /** Start changing position */