Merge branch 'elliotmendiola-backspace-separator'

nbfontana · Sep 10, 2018 · 32817ac · 32817ac
2 parents 2583f74 + 4b490e7
commit 32817ac
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -89,7 +89,7 @@
     "mocha": "3.3.0",
     "nyc": "^11.0.3",
     "rxjs": "5.0.1",
-    "sinon": "2.0.0",
+    "sinon": "^6.2.0",
     "sinon-chai": "2.8.0",
     "standard-version": "4.0.0",
     "ts-loader": "2.1.0",

diff --git a/src/input.service.ts b/src/input.service.ts
@@ -29,7 +29,7 @@ export class InputService {
         this.PER_AR_NUMBER.set("\u0669", "9");
     }
 
-    private inputManager: InputManager;
+    inputManager: InputManager;
 
     constructor(private htmlInputElement: any, private options: CurrencyMaskConfig) {
         this.inputManager = new InputManager(htmlInputElement);
@@ -81,7 +81,6 @@ export class InputService {
     }
 
     clearMask(rawValue: string): number {
-
         if (this.isNullable() && rawValue === "")
             return null;
 
@@ -126,11 +125,25 @@ export class InputService {
             selectionStart = this.rawValue.length - this.options.suffix.length;
         }
 
-        selectionEnd = keyCode == 46 || keyCode == 63272 ? selectionEnd + 1 : selectionEnd;
-        selectionStart = keyCode == 8 ? selectionStart - 1 : selectionStart;
-        this.rawValue = this.rawValue.substring(0, selectionStart) + this.rawValue.substring(selectionEnd, this.rawValue.length);
-        this.updateFieldValue(selectionStart);
-    }
+    let move = this.rawValue.substr(selectionStart - 1, 1).match(/\d/) ? 0 : -1;
+    if ((
+          keyCode == 8 &&
+          selectionStart - 1 === 0 &&
+          !(this.rawValue.substr(selectionStart, 1).match(/\d/))
+        ) ||
+        (
+          (keyCode == 46 || keyCode == 63272) &&
+          selectionStart === 0 &&
+          !(this.rawValue.substr(selectionStart + 1, 1).match(/\d/))
+        )
+    ) {
+      move = 1;
+    };
+    selectionEnd = keyCode == 46 || keyCode == 63272 ? selectionEnd + 1 : selectionEnd;
+    selectionStart = keyCode == 8 ? selectionStart - 1 : selectionStart;
+    this.rawValue = this.rawValue.substring(0, selectionStart) + this.rawValue.substring(selectionEnd, this.rawValue.length);
+    this.updateFieldValue(selectionStart + move);
+  }
 
     updateFieldValue(selectionStart?: number): void {
         let newRawValue = this.applyMask(false, this.rawValue || "");

diff --git a/test/input-service.spec.ts b/test/input-service.spec.ts
@@ -0,0 +1,58 @@
+import { InputService } from './../src/input.service';
+import { fakeAsync } from "@angular/core/testing";
+import { expect } from "chai";
+import { stub } from 'sinon';
+import {CurrencyMaskConfig} from "../src/currency-mask.config";
+
+describe('Testing InputService', () => {
+  var options: CurrencyMaskConfig = {
+    prefix: '',
+    suffix: '',
+    thousands: '.',
+    decimal: ',',
+    allowNegative: false,
+    nullable: false,
+    align: 'right',
+    allowZero: true,
+    precision: undefined,
+  };
+  var inputService: InputService;
+
+  describe('removeNumber', () => {
+    it('should call updateFieldValue with 1 when deleting the first number followed by a .', () => {
+      inputService = new InputService({
+        selectionStart: 0,
+        selectionEnd: 0,
+      }, options);
+
+      inputService.inputManager.rawValue = '1.234,50';
+      inputService.updateFieldValue = stub();
+      inputService.removeNumber(46);
+      expect(inputService.updateFieldValue).to.be.calledWith(1);
+    });
+
+    it('should call updateFieldValue with 1 when backspacing the first number followed by a .', () => {
+      inputService = new InputService({
+        selectionStart: 1,
+        selectionEnd: 1,
+      }, options);
+
+      inputService.inputManager.rawValue = '1.234,50';
+      inputService.updateFieldValue = stub();
+      inputService.removeNumber(8);
+      expect(inputService.updateFieldValue).to.be.calledWith(1);
+    });
+
+    it('should call updateFieldValue with 2 less than the current position when backspacing any non-number character', () => {
+      inputService = new InputService({
+        selectionStart: 6,
+        selectionEnd: 6,
+      }, options);
+
+      inputService.inputManager.rawValue = '1.234,50';
+      inputService.updateFieldValue = stub();
+      inputService.removeNumber(8);
+      expect(inputService.updateFieldValue).to.be.calledWith(4);
+    });
+  });
+});