Merge branch 'develop' of github.com:JsDaddy/ngx-mask into fix/1559

Author: lachesse

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 20.0.1(2025-07-31)
+
+### fix
+
+- Fix ([#1548](https://github.com/JsDaddy/ngx-mask/issues/1548))
+- Fix ([#1551](https://github.com/JsDaddy/ngx-mask/issues/1551))
+
+
 # 20.0.0(2025-07-22)
 
 ### Feature

projects/ngx-mask-lib/src/lib/ngx-mask-applier.service.ts

@@ -100,8 +100,14 @@ export class NgxMaskApplierService {
         let processedValue = inputValue;
         let processedPosition = position;
 
-        if (processedValue.slice(0, this.prefix.length) === this.prefix) {
-            processedValue = processedValue.slice(this.prefix.length, processedValue.length);
+        const startsWithPrefix = processedValue.slice(0, this.prefix.length) === this.prefix;
+        const pastedFullWithPrefix =
+            justPasted && processedValue.length === this.prefix.length + maskExpression.length;
+        const looksLikeFullPrefixPaste =
+            processedValue === this.prefix + processedValue.slice(this.prefix.length);
+
+        if (startsWithPrefix && (pastedFullWithPrefix || looksLikeFullPrefixPaste)) {
+            processedValue = processedValue.slice(this.prefix.length);
         }
         if (!!this.suffix && processedValue.length > 0) {
             processedValue = this.checkAndRemoveSuffix(processedValue);
@@ -387,7 +393,9 @@ export class NgxMaskApplierService {
                 result.indexOf(MaskExpression.COMMA) - processedValue.indexOf(MaskExpression.COMMA);
             const shiftStep: number = result.length - processedValue.length;
             const backspacedDecimalMarkerWithSeparatorLimit =
-                backspaced && result.length < inputValue.length && this.separatorLimit;
+                backspaced &&
+                result.length < inputValue.length - this.suffix.length &&
+                this.separatorLimit;
 
             if (
                 (result[processedPosition - 1] === this.thousandSeparator ||

projects/ngx-mask-lib/src/test/add-prefix.spec.ts

@@ -207,4 +207,18 @@ describe('Directive: Mask (Add prefix)', () => {
         equal('123', '+38 123', fixture);
         equal('1234', '+38 1234', fixture);
     });
+
+    it('should not remove prefix-like digits from pasted value if it is not a real prefix', () => {
+        component.mask.set('000/00000');
+        component.prefix.set('06');
+
+        equal('06774/41561', '06774/41561', fixture, false, Paste);
+    });
+
+    it('should remove prefix only if pasted value is real prefix', () => {
+        component.mask.set('000/00000');
+        component.prefix.set('06');
+
+        equal('06062/41561', '06062/41561', fixture, false, Paste);
+    });
 });

projects/ngx-mask-lib/src/test/delete.cy-spec.ts

@@ -362,4 +362,38 @@ describe('Directive: Mask (Delete)', () => {
             .type('{backspace}'.repeat(5))
             .should('have.value', '__:__');
     });
+
+    it('separator with suffix should replace cursor in right place with thousandSeparator ,', () => {
+        cy.mount(CypressTestMaskComponent, {
+            componentProperties: {
+                mask: signal('separator.2'),
+                suffix: signal(' EUR'),
+                thousandSeparator: signal(','),
+            },
+        });
+
+        cy.get('#masked')
+            .type('123000')
+            .should('have.value', '123,000 EUR')
+            .type('{leftArrow}'.repeat(3))
+            .type('{backspace}')
+            .should('have.prop', 'selectionStart', 3);
+    });
+
+    it('separator with suffix should replace cursor in right place with thousandSeparator .', () => {
+        cy.mount(CypressTestMaskComponent, {
+            componentProperties: {
+                mask: signal('separator.2'),
+                suffix: signal(' EUR'),
+                thousandSeparator: signal('.'),
+            },
+        });
+
+        cy.get('#masked')
+            .type('123000')
+            .should('have.value', '123.000 EUR')
+            .type('{leftArrow}'.repeat(3))
+            .type('{backspace}')
+            .should('have.prop', 'selectionStart', 3);
+    });
 });