fix(#1000): cursor position after paste to input in mask with separator

JsDaddy · Apr 25, 2022 · a102e53 · a102e53
1 parent a22f7ef
commit a102e53
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="13.1.11"></a>
+
+# 13.1.11 (2022-04-25)
+
+### Fix
+
+- Fix ([#1000](https://github.com/JsDaddy/ngx-mask/issues/1000))
+
 <a name="13.1.10"></a>
 
 # 13.1.10 (2022-04-18)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-mask",
-  "version": "13.1.10",
+  "version": "13.1.11",
   "description": "awesome ngx mask",
   "license": "MIT",
   "engines": {

diff --git a/projects/ngx-mask-lib/package.json b/projects/ngx-mask-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-mask",
-  "version": "13.1.10",
+  "version": "13.1.11",
   "description": "awesome ngx mask",
   "keywords": [
     "ng2-mask",

diff --git a/projects/ngx-mask-lib/src/lib/mask-applier.service.ts b/projects/ngx-mask-lib/src/lib/mask-applier.service.ts
@@ -456,7 +456,12 @@ export class MaskApplierService {
 			newPosition++;
 		}
 
-		let actualShift: number = justPasted ? cursor : this._shift.has(position) ? shift : 0;
+		let actualShift: number =
+			justPasted && !maskExpression.startsWith('separator')
+				? cursor
+				: this._shift.has(position)
+				? shift
+				: 0;
 		if (stepBack) {
 			actualShift--;
 		}

diff --git a/projects/ngx-mask-lib/src/test/copy-paste.spec.ts b/projects/ngx-mask-lib/src/test/copy-paste.spec.ts
@@ -40,4 +40,26 @@ describe('Event: paste', () => {
 
 		expect(inputDebuggerElement.nativeElement.selectionStart).toBe(15);
 	});
+	it('After paste to control cursor should be on the end of input for mask with separator', () => {
+		component.mask = 'separator.0';
+		component.thousandSeparator = ',';
+		fixture.detectChanges();
+
+		const inputDebuggerElement = fixture.debugElement.query(By.css('#mask'));
+
+		const pasteData = new DataTransfer();
+		pasteData.setData('text', '1234567');
+		inputDebuggerElement.triggerEventHandler('paste', pasteData);
+
+		inputDebuggerElement.nativeElement.value = pasteData.getData('text/plain');
+		inputDebuggerElement.triggerEventHandler('input', {
+			target: inputDebuggerElement.nativeElement,
+		});
+
+		fixture.detectChanges();
+
+		expect(inputDebuggerElement.nativeElement.value).toBe('1,234,567');
+
+		expect(inputDebuggerElement.nativeElement.selectionStart).toBe(9);
+	});
 });