@ptsecurity/mosaic 15.9.3 → 15.9.5

package/fesm2020/ptsecurity-mosaic-input.mjs

@@ -2,17 +2,17 @@ import * as i3$1 from '@angular/cdk/a11y';
 import { A11yModule } from '@angular/cdk/a11y';
 import { CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
-import { Directive, Optional, Self, Attribute, Input, InjectionToken, Inject, forwardRef, Component, ChangeDetectionStrategy, ViewEncapsulation, NgModule } from '@angular/core';
+import { forwardRef, EventEmitter, Directive, Attribute, Input, InjectionToken, Optional, Self, Inject, Component, ChangeDetectionStrategy, ViewEncapsulation, NgModule } from '@angular/core';
 import * as i1 from '@angular/forms';
-import { NG_VALIDATORS, Validators, FormsModule } from '@angular/forms';
+import { NG_VALUE_ACCESSOR, NG_VALIDATORS, Validators, FormsModule } from '@angular/forms';
 import * as i3 from '@ptsecurity/mosaic/core';
 import { mixinErrorState, PopUpTriggers, McCommonModule } from '@ptsecurity/mosaic/core';
 import { coerceBooleanProperty, coerceNumberProperty } from '@angular/cdk/coercion';
 import { getSupportedInputTypes } from '@angular/cdk/platform';
 import * as i4 from '@ptsecurity/mosaic/form-field';
 import { McFormFieldControl } from '@ptsecurity/mosaic/form-field';
-import { Subject } from 'rxjs';
-import { A, C, V, X, Z, F1, F12, ZERO, NINE, NUMPAD_ZERO, NUMPAD_NINE, NUMPAD_MINUS, DASH, FF_MINUS, DELETE, BACKSPACE, TAB, ESCAPE, ENTER, LEFT_ARROW, RIGHT_ARROW, HOME, END, UP_ARROW, DOWN_ARROW } from '@ptsecurity/cdk/keycodes';
+import { Subject, Subscription } from 'rxjs';
+import { A, C, V, X, Z, NUMPAD_MINUS, DASH, FF_MINUS, DELETE, BACKSPACE, TAB, ESCAPE, ENTER, LEFT_ARROW, RIGHT_ARROW, HOME, END, isFunctionKey, isNumberKey, isNumpadKey, UP_ARROW, DOWN_ARROW } from '@ptsecurity/cdk/keycodes';
 import * as i2 from '@angular/cdk/bidi';
 import * as i1$1 from '@angular/cdk/overlay';
 import { McTooltipTrigger, MC_TOOLTIP_SCROLL_STRATEGY } from '@ptsecurity/mosaic/tooltip';
@@ -23,6 +23,7 @@ function getMcInputUnsupportedTypeError(inputType) {
 
 const BIG_STEP = 10;
 const SMALL_STEP = 1;
+// TODO: подставлять локализованный сплиттер
 function normalizeSplitter(value) {
     return value ? value.replace(/,/g, '.') : value;
 }
@@ -46,16 +47,33 @@ function add(value1, value2) {
     const precision = Math.max(getPrecision(value1), getPrecision(value2));
     return (value1 * precision + value2 * precision) / precision;
 }
+const MC_NUMBER_INPUT_VALUE_ACCESSOR = {
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => McNumberInput),
+    multi: true
+};
 class McNumberInput {
-    constructor(elementRef, ngControl, step, bigStep, min, max) {
+    constructor(elementRef, renderer, step, bigStep, min, max) {
         this.elementRef = elementRef;
-        this.ngControl = ngControl;
-        this.focused = false;
+        this.renderer = renderer;
+        /** Emits when the value changes (either due to user input or programmatic change). */
+        this.valueChange = new EventEmitter();
+        /** Emits when the disabled state has changed */
+        this.disabledChange = new EventEmitter();
         this.stateChanges = new Subject();
+        this.controlType = 'input-number';
+        this._disabled = false;
+        this.focused = false;
+        this.localeSubscription = Subscription.EMPTY;
+        // tslint:disable-next-line:no-empty
+        this.onTouched = () => { };
+        // tslint:disable-next-line:no-empty
+        this.cvaOnChange = () => { };
         this.step = isDigit(step) ? parseFloat(step) : SMALL_STEP;
         this.bigStep = isDigit(bigStep) ? parseFloat(bigStep) : BIG_STEP;
         this.min = isDigit(min) ? parseFloat(min) : -Infinity;
         this.max = isDigit(max) ? parseFloat(max) : Infinity;
+        setTimeout(() => this.nativeElement.type = 'text', 0);
         if ('valueAsNumber' in this.nativeElement) {
             Object.defineProperty(Object.getPrototypeOf(this.nativeElement), 'valueAsNumber', {
                 // tslint:disable-next-line:no-reserved-keywords
@@ -66,9 +84,71 @@ class McNumberInput {
             });
         }
     }
+    get value() {
+        return this._value;
+    }
+    set value(value) {
+        const oldValue = this.value;
+        this._value = value;
+        if (oldValue !== value) {
+            this.setViewValue(this.formatNumber(value));
+            this.valueChange.emit(value);
+        }
+    }
+    get disabled() {
+        return this._disabled;
+    }
+    set disabled(value) {
+        const newValue = coerceBooleanProperty(value);
+        const element = this.nativeElement;
+        if (this._disabled !== newValue) {
+            this._disabled = newValue;
+            this.disabledChange.emit(newValue);
+        }
+        // We need to null check the `blur` method, because it's undefined during SSR.
+        if (newValue && element.blur) {
+            // Normally, native input elements automatically blur if they turn disabled. This behavior
+            // is problematic, because it would mean that it triggers another change detection cycle,
+            // which then causes a changed after checked error if the input element was focused before.
+            element.blur();
+        }
+    }
     get nativeElement() {
         return this.elementRef.nativeElement;
     }
+    get viewValue() {
+        return this.nativeElement.value;
+    }
+    get ngControl() {
+        return this.control;
+    }
+    ngOnDestroy() {
+        this.localeSubscription.unsubscribe();
+        this.valueChange.complete();
+        this.disabledChange.complete();
+    }
+    onContainerClick() {
+        this.focus();
+    }
+    focus() {
+        this.nativeElement.focus();
+    }
+    // Implemented as part of ControlValueAccessor.
+    writeValue(value) {
+        this.value = value;
+    }
+    // Implemented as part of ControlValueAccessor.
+    registerOnChange(fn) {
+        this.cvaOnChange = fn;
+    }
+    // Implemented as part of ControlValueAccessor.
+    registerOnTouched(fn) {
+        this.onTouched = fn;
+    }
+    // Implemented as part of ControlValueAccessor.
+    setDisabledState(isDisabled) {
+        this.disabled = isDisabled;
+    }
     focusChanged(isFocused) {
         if (isFocused !== this.focused) {
             this.focused = isFocused;
@@ -83,32 +163,31 @@ class McNumberInput {
         const isCtrlV = (e) => e.keyCode === V && (e.ctrlKey || e.metaKey);
         const isCtrlX = (e) => e.keyCode === X && (e.ctrlKey || e.metaKey);
         const isCtrlZ = (e) => e.keyCode === Z && (e.ctrlKey || e.metaKey);
-        const isFKey = (e) => e.keyCode >= F1 && e.keyCode <= F12;
-        const isNumber = (e) => (e.keyCode >= ZERO && e.keyCode <= NINE) ||
-            (e.keyCode >= NUMPAD_ZERO && e.keyCode <= NUMPAD_NINE);
         const isPeriod = (e) => e.key === '.' || e.key === ',';
         const minuses = [NUMPAD_MINUS, DASH, FF_MINUS];
         const serviceKeys = [DELETE, BACKSPACE, TAB, ESCAPE, ENTER];
         const arrows = [LEFT_ARROW, RIGHT_ARROW];
         const allowedKeys = [HOME, END].concat(arrows).concat(serviceKeys).concat(minuses);
         if (minuses.includes(keyCode) &&
-            (this.nativeElement.valueAsNumber || this.min >= 0 || this.nativeElement.validity?.badInput)) {
+            (this.viewValue.includes(event.key) || this.min >= 0)) {
             event.preventDefault();
             return;
         }
         if (allowedKeys.indexOf(keyCode) !== -1 ||
-            isCtrlA(event) ||
-            isCtrlC(event) ||
-            isCtrlV(event) ||
-            isCtrlX(event) ||
-            isCtrlZ(event) ||
-            isFKey(event) ||
-            isPeriod(event)) {
+            [
+                isCtrlA,
+                isCtrlC,
+                isCtrlV,
+                isCtrlX,
+                isCtrlZ,
+                isFunctionKey,
+                isPeriod
+            ].some((fn) => fn(event))) {
             // let it happen, don't do anything
             return;
         }
         // Ensure that it is not a number and stop the keypress
-        if (event.shiftKey || !isNumber(event)) {
+        if (event.shiftKey || !isNumberKey(event) && !isNumpadKey(event)) {
             event.preventDefault();
             // process steps
             const step = event.shiftKey ? this.bigStep : this.step;
@@ -120,48 +199,120 @@ class McNumberInput {
             }
         }
     }
+    onInput(event) {
+        const currentValueLength = this.formatNumber(this.value)?.length || 0;
+        setTimeout(() => {
+            const fromPaste = event.inputType === 'insertFromPaste';
+            let formattedValue;
+            if (fromPaste) {
+                formattedValue = this.formatNumber(this.valueFromPaste);
+            }
+            else {
+                /*this.viewValue is raw and should be reformatted to localized number */
+                formattedValue = this.formatViewValue();
+                const offsetWhenSeparatorAdded = 2;
+                Promise.resolve().then(() => {
+                    if (Math.abs(this.viewValue.length - currentValueLength) === offsetWhenSeparatorAdded) {
+                        const cursorPosition = Math.max(0, (this.nativeElement.selectionStart || 0) + Math.sign(this.viewValue.length - currentValueLength));
+                        this.renderer.setProperty(this.nativeElement, 'selectionStart', cursorPosition);
+                        this.renderer.setProperty(this.nativeElement, 'selectionEnd', cursorPosition);
+                    }
+                });
+            }
+            this.setViewValue(formattedValue, !fromPaste);
+            this.viewToModelUpdate(formattedValue);
+        });
+    }
     onPaste(event) {
-        if (!isDigit(normalizeSplitter(event.clipboardData.getData('text')))) {
+        this.valueFromPaste = this.checkAndNormalizeLocalizedNumber(event.clipboardData?.getData('text'));
+        if (this.valueFromPaste === null) {
             event.preventDefault();
         }
     }
     stepUp(step) {
-        this.elementRef.nativeElement.focus();
-        const res = Math.max(Math.min(add(this.nativeElement.valueAsNumber || 0, step), this.max), this.min);
-        this.nativeElement.value = res.toString();
-        this.viewToModelUpdate(this.nativeElement.valueAsNumber);
+        this.nativeElement.focus();
+        const res = Math.max(Math.min(add(this.value || 0, step), this.max), this.min);
+        this.setViewValue(this.formatNumber(res));
+        this._value = res;
+        this.cvaOnChange(res);
+        this.valueChange.emit(res);
     }
     stepDown(step) {
-        this.elementRef.nativeElement.focus();
-        const res = Math.min(Math.max(add(this.nativeElement.valueAsNumber || 0, -step), this.min), this.max);
-        this.nativeElement.value = res.toString();
-        this.viewToModelUpdate(this.nativeElement.valueAsNumber);
+        this.nativeElement.focus();
+        const res = Math.min(Math.max(add(this.value || 0, -step), this.min), this.max);
+        this.setViewValue(this.formatNumber(res));
+        this._value = res;
+        this.cvaOnChange(res);
+        this.valueChange.emit(res);
+    }
+    setViewValue(value, savePosition = false) {
+        const cursorPosition = this.nativeElement.selectionStart;
+        this.renderer.setProperty(this.nativeElement, 'value', value);
+        if (savePosition) {
+            this.renderer.setProperty(this.nativeElement, 'selectionStart', cursorPosition);
+            this.renderer.setProperty(this.nativeElement, 'selectionEnd', cursorPosition);
+        }
     }
-    viewToModelUpdate(value) {
-        if (this.ngControl) {
-            this.ngControl.control.setValue(value);
+    viewToModelUpdate(newValue) {
+        const normalizedValue = newValue === null ? null : +this.normalizeNumber(newValue);
+        if (normalizedValue !== this.value) {
+            this._value = normalizedValue;
+            this.cvaOnChange(normalizedValue);
+            this.valueChange.emit(normalizedValue);
+        }
+        this.ngControl?.updateValueAndValidity({ emitEvent: false });
+    }
+    formatViewValue() {
+        if (this.viewValue === null || this.viewValue === '' || Number.isNaN(+this.normalizeNumber(this.viewValue))) {
+            return null;
+        }
+        return this.viewValue;
+    }
+    formatNumber(value) {
+        if (value === null || value === undefined) {
+            return null;
+        }
+        return value.toString();
+    }
+    /**
+     * Method that returns a string representation of a number without localized separators
+     */
+    normalizeNumber(value, _) {
+        if (value === null || value === undefined) {
+            return '';
+        }
+        return value.toString();
+    }
+    checkAndNormalizeLocalizedNumber(num) {
+        if (num === null || num === undefined) {
+            return null;
+        }
+        /* if some locale input config satisfies pasted number, try to normalise with selected locale config */
+        let numberOutput = null;
+        const normalized = +this.normalizeNumber(num);
+        if (!Number.isNaN(normalized)) {
+            numberOutput = normalized;
         }
+        return numberOutput;
     }
 }
-/** @nocollapse */ McNumberInput.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: McNumberInput, deps: [{ token: i0.ElementRef }, { token: i1.NgControl, optional: true, self: true }, { token: 'step', attribute: true }, { token: 'big-step', attribute: true }, { token: 'min', attribute: true }, { token: 'max', attribute: true }], target: i0.ɵɵFactoryTarget.Directive });
-/** @nocollapse */ McNumberInput.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.9", type: McNumberInput, selector: "input[mcInput][type=\"number\"]", inputs: { bigStep: "bigStep", step: "step", min: "min", max: "max" }, host: { listeners: { "blur": "focusChanged(false)", "focus": "focusChanged(true)", "paste": "onPaste($event)", "keydown": "onKeyDown($event)" } }, exportAs: ["mcNumericalInput"], ngImport: i0 });
+/** @nocollapse */ McNumberInput.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: McNumberInput, deps: [{ token: i0.ElementRef }, { token: i0.Renderer2 }, { token: 'step', attribute: true }, { token: 'big-step', attribute: true }, { token: 'min', attribute: true }, { token: 'max', attribute: true }], target: i0.ɵɵFactoryTarget.Directive });
+/** @nocollapse */ McNumberInput.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.9", type: McNumberInput, selector: "input[mcInput][type=\"number\"]", inputs: { bigStep: "bigStep", step: "step", min: "min", max: "max", value: "value", disabled: "disabled" }, host: { listeners: { "blur": "focusChanged(false)", "focus": "focusChanged(true)", "paste": "onPaste($event)", "keydown": "onKeyDown($event)", "input": "onInput($event)" } }, providers: [MC_NUMBER_INPUT_VALUE_ACCESSOR], exportAs: ["mcNumericalInput"], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: McNumberInput, decorators: [{
             type: Directive,
             args: [{
                     selector: `input[mcInput][type="number"]`,
                     exportAs: 'mcNumericalInput',
+                    providers: [MC_NUMBER_INPUT_VALUE_ACCESSOR],
                     host: {
                         '(blur)': 'focusChanged(false)',
                         '(focus)': 'focusChanged(true)',
                         '(paste)': 'onPaste($event)',
-                        '(keydown)': 'onKeyDown($event)'
+                        '(keydown)': 'onKeyDown($event)',
+                        '(input)': 'onInput($event)'
                     }
                 }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i1.NgControl, decorators: [{
-                    type: Optional
-                }, {
-                    type: Self
-                }] }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.Renderer2 }, { type: undefined, decorators: [{
                     type: Attribute,
                     args: ['step']
                 }] }, { type: undefined, decorators: [{
@@ -181,6 +332,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 type: Input
             }], max: [{
                 type: Input
+            }], value: [{
+                type: Input
+            }], disabled: [{
+                type: Input
             }] } });
 
 const MC_INPUT_VALUE_ACCESSOR = new InjectionToken('MC_INPUT_VALUE_ACCESSOR');
@@ -934,5 +1089,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { BIG_STEP, MAX_VALIDATOR, MC_INPUT_VALUE_ACCESSOR, MIN_VALIDATOR, MaxValidator, McInput, McInputBase, McInputMixinBase, McInputModule, McInputMono, McInputPassword, McNumberInput, McPasswordToggle, MinValidator, SMALL_STEP, add, getPrecision, isDigit, isFloat, isInt, normalizeSplitter };
+export { BIG_STEP, MAX_VALIDATOR, MC_INPUT_VALUE_ACCESSOR, MC_NUMBER_INPUT_VALUE_ACCESSOR, MIN_VALIDATOR, MaxValidator, McInput, McInputBase, McInputMixinBase, McInputModule, McInputMono, McInputPassword, McNumberInput, McPasswordToggle, MinValidator, SMALL_STEP, add, getPrecision, isDigit, isFloat, isInt, normalizeSplitter };
 //# sourceMappingURL=ptsecurity-mosaic-input.mjs.map