Merge branch 'master' into clean-up

src/number_format_base.tsx

@@ -116,7 +116,7 @@ export default function NumberFormatBase<BaseType = InputAttributes>(
     setCaretPosition(el, caretPos);
 
     timeout.current.setCaretTimeout = setTimeout(() => {
-      if (el.value === currentValue && el.selectionStart !== el.selectionEnd) {
+      if (el.value === currentValue && el.selectionStart !== caretPos) {
         setCaretPosition(el, caretPos);
       }
     }, 0);
@@ -369,6 +369,7 @@ export default function NumberFormatBase<BaseType = InputAttributes>(
     if (e.persist) e.persist();
 
     const el = e.target;
+    const currentTarget = e.currentTarget;
     focusedElm.current = el;
 
     timeout.current.focusTimeout = setTimeout(() => {
@@ -384,7 +385,7 @@ export default function NumberFormatBase<BaseType = InputAttributes>(
         setPatchedCaretPosition(el, caretPosition, value);
       }
 
-      onFocus(e);
+      onFocus({ ...e, currentTarget });
     }, 0);
   };
 

test/library/input.spec.js

@@ -528,6 +528,22 @@ describe('NumberFormat as input', () => {
     }, 0);
   });
 
+  it('should contain currentTarget on focus event', async () => {
+    let currentTarget;
+    const { input } = await render(
+      <NumericFormat
+        value="1234"
+        onFocus={(e) => {
+          currentTarget = e.currentTarget;
+        }}
+      />,
+    );
+    input.focus();
+
+    await wait(0);
+    expect(currentTarget).not.toBeNull();
+  });
+
   it('should not reset the selection when manually focused on mount', async () => {
     function Test() {
       const localInputRef = useRef();

test/library/keypress_and_caret.spec.js

@@ -3,6 +3,7 @@ import NumericFormat from '../../src/numeric_format';
 import PatternFormat from '../../src/pattern_format';
 import NumberFormatBase from '../../src/number_format_base';
 import { cleanup, fireEvent } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import {
   simulateFocusEvent,
@@ -182,6 +183,26 @@ describe('Test keypress and caret position changes', () => {
     expect(input.selectionStart).toEqual(2);
   });
 
+  it('should not reset caret position if caret is updated by browser after we set caret position #811', async () => {
+    // https://codesandbox.io/p/sandbox/recursing-poitras-rxtjkj?file=%2Fsrc%2Findex.test.js%3A15%2C5-15%2C44
+    const { input } = await render(
+      <NumericFormat
+        allowLeadingZeros={false}
+        allowNegative={false}
+        decimalSeparator="."
+        displayType="input"
+        placeholder="people"
+        suffix=" people"
+        valueIsNumericString={false}
+      />,
+    );
+
+
+    await userEvent.type(input, '91');
+
+    expect(input.value).toEqual('91 people');
+  });
+
   describe('Test character insertion', () => {
     it('should add any number properly when input is empty without format prop passed', async () => {
       const { input } = await render(<NumericFormat thousandSeparator={true} prefix={'$'} />);