Merge pull request #6407 from KumJungMin/fix/issue-6276

fix: emit unmask value to update:modelValue when unmask mode
primefaces · Sep 25, 2024 · 4e451e7 · 4e451e7
2 parents fdf9c92 + a31c0f2
commit 4e451e7
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/packages/primevue/src/inputmask/InputMask.vue b/packages/primevue/src/inputmask/InputMask.vue
@@ -1,7 +1,7 @@
 <template>
     <InputText
         :id="id"
-        :value="modelValue"
+        :value="currentVal"
         :class="inputClass"
         :readonly="readonly"
         :disabled="disabled"
@@ -37,6 +37,11 @@ export default {
     inject: {
         $pcFluid: { default: null }
     },
+    data() {
+        return {
+            currentVal: ''
+        };
+    },
     watch: {
         mask(newMask, oldMask) {
             if (oldMask !== newMask) {
@@ -60,7 +65,7 @@ export default {
                 if (this.androidChrome) this.handleAndroidInput(event);
                 else this.handleInputChange(event);
 
-                this.$emit('update:modelValue', event.target.value);
+                this.updateModelValue(event.target.value);
             }
         },
         onFocus(event) {
@@ -96,7 +101,7 @@ export default {
         onBlur(event) {
             this.focus = false;
             this.checkVal();
-            this.updateModel(event);
+            this.updateModelValue(event.target.value);
 
             if (this.$el.value !== this.focusText) {
                 let e = document.createEvent('HTMLEvents');
@@ -133,18 +138,18 @@ export default {
 
                 this.clearBuffer(begin, end);
                 this.shiftL(begin, end - 1);
-                this.updateModel(event);
+                this.updateModelValue(event.target.value);
 
                 event.preventDefault();
             } else if (k === 'Enter') {
                 // enter
                 this.$el.blur();
-                this.updateModel(event);
+                this.updateModelValue(event.target.value);
             } else if (k === 'Escape') {
                 // escape
                 this.$el.value = this.focusText;
                 this.caret(0, this.checkVal());
-                this.updateModel(event);
+                this.updateModelValue(event.target.value);
                 event.preventDefault();
             }
 
@@ -203,7 +208,7 @@ export default {
                 event.preventDefault();
             }
 
-            this.updateModel(event);
+            this.updateModelValue(event.target.value);
 
             if (completed) {
                 this.$emit('complete', event);
@@ -420,7 +425,7 @@ export default {
             var pos = this.checkVal(true);
 
             this.caret(pos);
-            this.updateModel(event);
+            this.updateModelValue(event.target.value);
 
             if (this.isCompleted()) {
                 this.$emit('complete', event);
@@ -439,16 +444,19 @@ export default {
 
             return unmaskedBuffer.join('');
         },
-        updateModel(e) {
-            let val = this.unmask ? this.getUnmaskedValue() : e.target.value;
+
+        updateModelValue(value) {
+            const val = this.unmask ? this.getUnmaskedValue() : value;
+
+            this.currentVal = value;
 
             this.$emit('update:modelValue', this.defaultBuffer !== val ? val : '');
         },
         updateValue(updateModel = true) {
             if (this.$el) {
                 if (this.modelValue == null) {
                     this.$el.value = '';
-                    updateModel && this.$emit('update:modelValue', '');
+                    updateModel && this.updateModelValue('');
                 } else {
                     this.$el.value = this.modelValue;
                     this.checkVal();
@@ -458,11 +466,7 @@ export default {
                             this.writeBuffer();
                             this.checkVal();
 
-                            if (updateModel) {
-                                let val = this.unmask ? this.getUnmaskedValue() : this.$el.value;
-
-                                this.$emit('update:modelValue', this.defaultBuffer !== val ? val : '');
-                            }
+                            if (updateModel) this.updateModelValue(this.$el.value);
                         }
                     }, 10);
                 }