Fixed #217

s-yadav · Sep 2, 2018 · b5b81ab · b5b81ab
1 parent e4266af
commit b5b81ab
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/dist/react-number-format.js b/dist/react-number-format.js
@@ -1,5 +1,5 @@
 /*!
- * react-number-format - 3.5.1
+ * react-number-format - 3.5.2
  * Author : Sudhanshu Yadav
  * Copyright (c) 2016,2018 to Sudhanshu Yadav - ignitersworld.com , released under the MIT license.
  */
@@ -952,6 +952,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	          var _numAsString2 = this.removeFormatting(newValue);
 	          var valueObj = this.getValueObject(newValue, _numAsString2);
 
+	          //persist event before performing async task
+	          e.persist();
 	          this.setState({ value: newValue, numAsString: _numAsString2 }, function () {
 	            _this3.setPatchedCaretPosition(el, newCaretPosition, newValue);
 	            onValueChange(valueObj, e);

diff --git a/dist/react-number-format.min.js b/dist/react-number-format.min.js
diff --git a/lib/number_format.js b/lib/number_format.js
@@ -884,6 +884,8 @@ var NumberFormat = function (_React$Component) {
           var _numAsString2 = this.removeFormatting(newValue);
           var valueObj = this.getValueObject(newValue, _numAsString2);
 
+          //persist event before performing async task
+          e.persist();
           this.setState({ value: newValue, numAsString: _numAsString2 }, function () {
             _this3.setPatchedCaretPosition(el, newCaretPosition, newValue);
             onValueChange(valueObj, e);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-number-format",
   "description": "React component to format number in an input or as a text.",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "main": "lib/number_format.js",
   "author": "Sudhanshu Yadav",
   "license": "MIT",

diff --git a/src/number_format.js b/src/number_format.js
@@ -740,6 +740,8 @@ class NumberFormat extends React.Component {
         const numAsString = this.removeFormatting(newValue);
         const valueObj = this.getValueObject(newValue, numAsString);
 
+        //persist event before performing async task
+        e.persist();
         this.setState({value: newValue, numAsString}, () => {
           this.setPatchedCaretPosition(el, newCaretPosition, newValue);
           onValueChange(valueObj, e);

diff --git a/test/library/keypress_and_caret.spec.js b/test/library/keypress_and_caret.spec.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import NumberFormat from '../../src/number_format';
 
-import {simulateKeyInput, simulateMousUpEvent, simulateFocusEvent, shallow} from '../test_util';
+import {simulateKeyInput, simulateMousUpEvent, simulateFocusEvent, shallow, persist} from '../test_util';
 import {cardExpiry} from '../../custom_formatters/card_expiry';
 
 describe('Test character insertion', () => {
@@ -106,6 +106,7 @@ describe('Test delete/backspace with format pattern', () => {
 
   beforeEach(() => {
     caretPos = 0;
+    persist.calls.reset();
   })
 
   it('caret position should not change if its on starting of input area', () => {
@@ -148,6 +149,7 @@ describe('Test delete/backspace with numeric format', () => {
 
   beforeEach(() => {
     caretPos = 0;
+    persist.calls.reset();
   })
 
   it('should not remove prefix', () => {
@@ -220,6 +222,7 @@ describe('Test delete/backspace with numeric format', () => {
     expect(wrapper.state().value).toEqual('$1,000');
     expect(caretPos).toEqual(1);
     expect(spy).toHaveBeenCalled();
+    expect(persist).toHaveBeenCalledWith('keydown');
   });
 })
 
@@ -281,6 +284,7 @@ describe('Test click / focus on input', () => {
 
   beforeEach(() => {
     caretPos = 0;
+    persist.calls.reset();
   })
 
   it('should always keep caret on typable area when we click on the input', () => {

diff --git a/test/test_util.js b/test/test_util.js
@@ -5,10 +5,12 @@ Enzyme.configure({ adapter: new Adapter() });
 
 const noop = function(){};
 
+export const persist = jasmine.createSpy();
+
 export function getCustomEvent(value, selectionStart, selectionEnd) {
   let event =  new Event('custom');
   const el = document.createElement('input');
-  event = Object.assign({}, event, {target: el, persist: noop});
+  event = Object.assign({}, event, {target: el, persist});
   event.target = el;
   el.value = value;
   el.selectionStart = selectionStart;
@@ -49,7 +51,8 @@ export function simulateKeyInput(input, key, selectionStart, selectionEnd, setSe
       defaultPrevented = true;
     },
     key,
-    isUnitTestRun: true
+    isUnitTestRun: true,
+    persist: persist.bind(null, 'keydown')
   }, {
     value: currentValue,
     selectionStart,
@@ -85,7 +88,7 @@ export function simulateKeyInput(input, key, selectionStart, selectionEnd, setSe
     }
 
     const changeEvent = getEvent({
-      persist: noop,
+      persist: persist.bind(null, 'change'),
       key
     }, {
       value: newValue,
@@ -121,7 +124,7 @@ export function simulateFocusEvent(input, selectionStart, setSelectionRange) {
   const currentValue = input.prop('value');
 
   const focusEvent = getEvent({
-    persist: noop,
+    persist: persist.bind(null, 'focus')
   }, {
     value: currentValue,
     selectionStart,
@@ -138,7 +141,7 @@ export function simulateBlurEvent(input) {
   const currentValue = input.prop('value');
 
   const blurEvent = getEvent({
-    persist: noop
+    persist: persist.bind(null, 'blur')
   }, {
     value: currentValue,
   });