From 8cbfc540a3b666a17bda5022b65ebbd84d4be2a2 Mon Sep 17 00:00:00 2001
From: claudivanfilho <j.claudivan.filho@gmail.com>
Date: Wed, 23 Sep 2020 22:26:56 -0300
Subject: [PATCH] Fix dead key

---
 CHANGELOG.md |  6 +++++-
 package.json |  2 +-
 src/index.ts | 20 +++++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50f5680..732111f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
-# v1.0.21
+# v1.0.22
+
+- Fix dead key
+
+## v1.0.21
 
 - Fix dead key
 
diff --git a/package.json b/package.json
index 0c43fad..1d4c561 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "v-slim-mask",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "A input mask directtive compatible with Vue 3",
   "main": "dist/index.js",
   "scripts": {
diff --git a/src/index.ts b/src/index.ts
index f776685..7b325a6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,7 +9,7 @@ export const MASK_TOKEN_PATTERN: IMASK_TOKEN_PATTERN = {
   S: /[a-z]|[A-Z]/,
   A: /[0-9]|[a-z]|[A-Z]/,
   C: /[^ ]/,
-  X: /.*/
+  X: /.*/,
 }
 export type MASK_TOKEN = keyof typeof MASK_TOKEN_PATTERN
 interface InputEvent extends Event {
@@ -67,7 +67,7 @@ export function getCustomMaskDirective(
           }
         }
       )
-    }
+    },
   }
 }
 
@@ -77,7 +77,7 @@ class InputMaskDOMManiputalion {
   private maskService: MaskLogic
   private lastValue = ''
   constructor(
-    mapTokens = MASK_TOKEN_PATTERN,
+    private mapTokens = MASK_TOKEN_PATTERN,
     private inputElement: HTMLInputElement,
     private mask: string,
     private shouldUnmask: boolean,
@@ -132,13 +132,23 @@ class InputMaskDOMManiputalion {
   onInput = (event: any) => {
     const target: HTMLInputElement | null = event.target as HTMLInputElement
     const value = target.value
+    const start = target.selectionStart || 0
+    const isComposition = event.inputType === 'insertCompositionText'
     let finalValue = this.remask(value, event.inputType === 'insertFromPaste')
     if (event.inputType === 'deleteContentBackward') {
       if (finalValue === this.lastValue) {
         finalValue = this.popValue(finalValue)
       }
     }
-    if (!(event.inputType === 'insertCompositionText' && !this.isMobile())) {
+    const pattern = this.mapTokens[this.mask[start - 1]]
+    if (
+      finalValue !== value &&
+      isComposition &&
+      pattern &&
+      !value[start - 1].match(pattern)
+    ) {
+      this.refreshInput(finalValue)
+    } else if (!(isComposition && !this.isMobile())) {
       this.refreshInput(finalValue)
     }
     this.formatAndEmit(finalValue)
@@ -149,7 +159,7 @@ class InputMaskDOMManiputalion {
   initListeners() {
     this.inputElement.oninput = this.onInput
     this.inputElement.onclick = this.onClick
-    this.inputElement.onkeyup = e => {
+    this.inputElement.onkeyup = (e) => {
       if (e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
         this.onClick(e)
       }