@ptsecurity/mosaic 17.3.0 → 17.5.0

package/fesm2022/ptsecurity-mosaic-input.mjs

@@ -1,4 +1,3 @@
-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';
@@ -6,21 +5,21 @@ import { forwardRef, EventEmitter, Directive, Attribute, Optional, Inject, Input
 import * as i1 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, NG_VALIDATORS, Validators, FormsModule } from '@angular/forms';
 import * as i3 from '@ptsecurity/mosaic/core';
-import { MC_LOCALE_SERVICE, mixinErrorState, PopUpTriggers, McCommonModule } from '@ptsecurity/mosaic/core';
+import { ruRULocaleData, checkAndNormalizeLocalizedNumber, normalizeNumber, MC_LOCALE_SERVICE, 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 * as i1$1 from '@ptsecurity/mosaic/form-field';
 import { McFormFieldControl } from '@ptsecurity/mosaic/form-field';
-import { Subject, Subscription } from 'rxjs';
+import { Subject } from 'rxjs';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 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';
+import { McTooltipTrigger } from '@ptsecurity/mosaic/tooltip';
 
 function getMcInputUnsupportedTypeError(inputType) {
     return Error(`Input type "${inputType}" isn't supported by mcInput.`);
 }
 
+const MC_INPUT_NUMBER_DEFAULT_CONFIGURATION = ruRULocaleData['ru-RU'].input.number;
 const BIG_STEP = 10;
 const SMALL_STEP = 1;
 // TODO: подставлять локализованный сплиттер
@@ -103,20 +102,18 @@ class McNumberInput {
         this.withThousandSeparator = true;
         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.updateLocaleParams = (id) => {
-            this.numberLocaleConfig = this.localeService.locales[id].input.number;
+        this.updateLocaleParams = () => {
+            this.config = this.localeService.getParams('input').number;
             this.setViewValue(this.formatNumber(this.value));
         };
         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', {
@@ -127,14 +124,12 @@ class McNumberInput {
                 }
             });
         }
-        this.allNumberLocaleConfigs = this.localeService.locales.items
-            .map((localeItem) => {
-            return { id: localeItem.id, config: this.localeService.locales[localeItem.id].input.number };
-        });
-        this.localeSubscription = this.localeService.changes.subscribe(this.updateLocaleParams);
+        this.localeService?.changes.pipe(takeUntilDestroyed()).subscribe(this.updateLocaleParams);
+        if (!localeService) {
+            this.initDefaultParams();
+        }
     }
     ngOnDestroy() {
-        this.localeSubscription.unsubscribe();
         this.valueChange.complete();
         this.disabledChange.complete();
     }
@@ -174,8 +169,8 @@ 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 isPeriod = (e) => this.numberLocaleConfig.groupSeparator.includes(e.key)
-            || [this.numberLocaleConfig.fractionSeparator, '.'].includes(e.key);
+        const isPeriod = (e) => this.config.groupSeparator.includes(e.key)
+            || [this.config.fractionSeparator, '.'].includes(e.key);
         const minuses = [NUMPAD_MINUS, DASH, FF_MINUS];
         const serviceKeys = [DELETE, BACKSPACE, TAB, ESCAPE, ENTER];
         const arrows = [LEFT_ARROW, RIGHT_ARROW];
@@ -186,8 +181,8 @@ class McNumberInput {
             return;
         }
         if (isPeriod(event)) {
-            if (event.key === this.numberLocaleConfig.fractionSeparator &&
-                this.viewValue.indexOf(this.numberLocaleConfig.fractionSeparator) !== -1) {
+            if (event.key === this.config.fractionSeparator &&
+                this.viewValue.indexOf(this.config.fractionSeparator) !== -1) {
                 event.preventDefault();
                 return;
             }
@@ -243,7 +238,7 @@ class McNumberInput {
         });
     }
     onPaste(event) {
-        this.valueFromPaste = this.checkAndNormalizeLocalizedNumber(event.clipboardData?.getData('text'));
+        this.valueFromPaste = checkAndNormalizeLocalizedNumber(event.clipboardData?.getData('text'));
         if (this.valueFromPaste === null) {
             event.preventDefault();
         }
@@ -264,6 +259,9 @@ class McNumberInput {
         this.cvaOnChange(res);
         this.valueChange.emit(res);
     }
+    initDefaultParams() {
+        this.config = MC_INPUT_NUMBER_DEFAULT_CONFIGURATION;
+    }
     setViewValue(value, savePosition = false) {
         const cursorPosition = this.nativeElement.selectionStart;
         this.renderer.setProperty(this.nativeElement, 'value', value);
@@ -273,7 +271,7 @@ class McNumberInput {
         }
     }
     viewToModelUpdate(newValue) {
-        const normalizedValue = newValue === null ? null : +this.normalizeNumber(newValue);
+        const normalizedValue = newValue === null ? null : +normalizeNumber(newValue, this.config);
         if (normalizedValue !== this.value) {
             this._value = normalizedValue;
             this.cvaOnChange(normalizedValue);
@@ -282,15 +280,15 @@ class McNumberInput {
         this.ngControl?.updateValueAndValidity({ emitEvent: false });
     }
     formatViewValue() {
-        if (this.viewValue === null || this.viewValue === '' || Number.isNaN(+this.normalizeNumber(this.viewValue))) {
+        if (this.viewValue === null || this.viewValue === '' || Number.isNaN(+normalizeNumber(this.viewValue, this.config))) {
             return null;
         }
-        const separator = this.numberLocaleConfig.groupSeparator.includes(' ')
-            && this.numberLocaleConfig.fractionSeparator === ','
+        const separator = this.config.groupSeparator.includes(' ')
+            && this.config.fractionSeparator === ','
             ? /[,.]/
-            : this.numberLocaleConfig.fractionSeparator;
+            : this.config.fractionSeparator;
         const [intPart, fractionPart] = this.viewValue.split(separator)
-            .map((valuePart) => this.normalizeNumber(valuePart));
+            .map((valuePart) => normalizeNumber(valuePart, this.config));
         return this.createLocalizedNumberFromParts(+intPart, fractionPart);
     }
     formatNumber(value) {
@@ -305,55 +303,26 @@ class McNumberInput {
             useGrouping: this.withThousandSeparator,
             maximumFractionDigits: 20
         };
-        if (this.withThousandSeparator && this.numberLocaleConfig.startFormattingFrom) {
+        if (this.withThousandSeparator && this.config.startFormattingFrom) {
             formatOptions.useGrouping = intPart >= Math.pow(
             // tslint:disable-next-line:no-magic-numbers
-            10, this.numberLocaleConfig.startFormattingFrom);
+            10, this.config.startFormattingFrom);
         }
-        const localeId = this.localeService.id === 'es-LA' ? 'ru-RU' : this.localeService.id;
+        const localeId = !this.localeService || this.localeService?.id === 'es-LA' ? 'ru-RU' : this.localeService.id;
         const formatter = new Intl.NumberFormat(localeId, formatOptions);
         const formattedFractionPart = fractionPart?.split('')
             .map((numChar) => formatter.format(+numChar)).join('');
         return formattedFractionPart === undefined
             ? formatter.format(intPart)
-            : `${formatter.format(intPart)}${this.numberLocaleConfig.fractionSeparator}${formattedFractionPart}`;
-    }
-    /**
-     * Method that returns a string representation of a number without localized separators
-     */
-    normalizeNumber(value, customConfig) {
-        if (value === null || value === undefined) {
-            return '';
-        }
-        const { groupSeparator, fractionSeparator } = customConfig || this.numberLocaleConfig;
-        const groupSeparatorRegexp = new RegExp(`[${groupSeparator.join('')}]`, 'g');
-        const fractionSeparatorRegexp = new RegExp(`\\${fractionSeparator}`, 'g');
-        return value.toString()
-            .replace(groupSeparatorRegexp, '')
-            .replace(fractionSeparatorRegexp, '.');
-    }
-    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;
-        for (const { config } of this.allNumberLocaleConfigs) {
-            const normalized = +this.normalizeNumber(num, config);
-            if (!Number.isNaN(normalized)) {
-                numberOutput = normalized;
-                break;
-            }
-        }
-        return numberOutput;
+            : `${formatter.format(intPart)}${this.config.fractionSeparator}${formattedFractionPart}`;
     }
     /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.0", 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 }, { token: MC_LOCALE_SERVICE, optional: true }], target: i0.ɵɵFactoryTarget.Directive }); }
-    /** @nocollapse */ static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.2.0", type: McNumberInput, selector: "input[mcInput][type=\"number\"]", inputs: { bigStep: "bigStep", step: "step", min: "min", max: "max", withThousandSeparator: "withThousandSeparator", startFormattingFrom: "startFormattingFrom", 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 }); }
+    /** @nocollapse */ static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.2.0", type: McNumberInput, selector: "input[mcNumberInput]", inputs: { bigStep: "bigStep", step: "step", min: "min", max: "max", withThousandSeparator: "withThousandSeparator", startFormattingFrom: "startFormattingFrom", 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: "17.2.0", ngImport: i0, type: McNumberInput, decorators: [{
             type: Directive,
             args: [{
-                    selector: `input[mcInput][type="number"]`,
+                    selector: `input[mcNumberInput]`,
                     exportAs: 'mcNumericalInput',
                     providers: [MC_NUMBER_INPUT_VALUE_ACCESSOR],
                     host: {
@@ -613,14 +582,14 @@ class McInput extends McInputMixinBase {
         return validity?.badInput;
     }
     /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.0", ngImport: i0, type: McInput, deps: [{ token: i0.ElementRef }, { token: i1.NgControl, optional: true, self: true }, { token: McNumberInput, optional: true, self: true }, { token: i1.NgForm, optional: true }, { token: i1.FormGroupDirective, optional: true }, { token: i3.ErrorStateMatcher }, { token: MC_INPUT_VALUE_ACCESSOR, optional: true, self: true }], target: i0.ɵɵFactoryTarget.Directive }); }
-    /** @nocollapse */ static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.2.0", type: McInput, selector: "input[mcInput]", inputs: { errorStateMatcher: "errorStateMatcher", placeholder: "placeholder", disabled: "disabled", id: "id", required: "required", type: "type", value: "value" }, host: { listeners: { "blur": "onBlur()", "focus": "focusChanged(true)" }, properties: { "attr.id": "id", "attr.placeholder": "placeholder", "attr.disabled": "disabled || null", "required": "required" }, classAttribute: "mc-input" }, providers: [{
+    /** @nocollapse */ static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.2.0", type: McInput, selector: "input[mcInput],input[mcNumberInput]", inputs: { errorStateMatcher: "errorStateMatcher", placeholder: "placeholder", disabled: "disabled", id: "id", required: "required", type: "type", value: "value" }, host: { listeners: { "blur": "onBlur()", "focus": "focusChanged(true)" }, properties: { "attr.id": "id", "attr.placeholder": "placeholder", "attr.disabled": "disabled || null", "required": "required" }, classAttribute: "mc-input" }, providers: [{
                 provide: McFormFieldControl, useExisting: McInput
             }], exportAs: ["mcInput"], usesInheritance: true, usesOnChanges: true, ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.0", ngImport: i0, type: McInput, decorators: [{
             type: Directive,
             args: [{
-                    selector: `input[mcInput]`,
+                    selector: `input[mcInput],input[mcNumberInput]`,
                     exportAs: 'mcInput',
                     host: {
                         class: 'mc-input',
@@ -800,8 +769,8 @@ class McPasswordToggle extends McTooltipTrigger {
     get visibility() {
         return this.disabled && this.formField.control.empty ? 'hidden' : 'visible';
     }
-    constructor(overlay, elementRef, ngZone, scrollDispatcher, hostView, scrollStrategy, direction, focusMonitor, formField) {
-        super(overlay, elementRef, ngZone, scrollDispatcher, hostView, scrollStrategy, direction, focusMonitor);
+    constructor(formField) {
+        super();
         this.formField = formField;
         this._tabIndex = 0;
         this.trigger = `${PopUpTriggers.Hover}`;
@@ -833,7 +802,7 @@ class McPasswordToggle extends McTooltipTrigger {
     stopFocusMonitor() {
         this.focusMonitor.stopMonitoring(this.elementRef);
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.0", ngImport: i0, type: McPasswordToggle, deps: [{ token: i1$1.Overlay }, { token: i0.ElementRef }, { token: i0.NgZone }, { token: i1$1.ScrollDispatcher }, { token: i0.ViewContainerRef }, { token: MC_TOOLTIP_SCROLL_STRATEGY }, { token: i2.Directionality, optional: true }, { token: i3$1.FocusMonitor }, { token: i4.McFormField }], target: i0.ɵɵFactoryTarget.Component }); }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.0", ngImport: i0, type: McPasswordToggle, deps: [{ token: i1$1.McFormField }], target: i0.ɵɵFactoryTarget.Component }); }
     /** @nocollapse */ static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.2.0", type: McPasswordToggle, selector: "mc-password-toggle", inputs: { content: ["mcTooltipNotHidden", "content"], mcTooltipHidden: "mcTooltipHidden", disabled: "disabled", tabIndex: "tabIndex" }, host: { listeners: { "click": "toggle()", "keydown.ENTER": "toggle()", "keydown.SPACE": "toggle()" }, properties: { "class.mc-eye_16": "hidden", "class.mc-eye-crossed_16": "!hidden", "style.visibility": "visibility", "attr.tabindex": "disabled ? null : tabIndex", "attr.disabled": "disabled || null" }, classAttribute: "mc-password-toggle mc" }, exportAs: ["mcPasswordToggle"], usesInheritance: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.0", ngImport: i0, type: McPasswordToggle, decorators: [{
@@ -856,12 +825,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.0", ngImpor
                     changeDetection: ChangeDetectionStrategy.OnPush,
                     encapsulation: ViewEncapsulation.None
                 }]
-        }], ctorParameters: () => [{ type: i1$1.Overlay }, { type: i0.ElementRef }, { type: i0.NgZone }, { type: i1$1.ScrollDispatcher }, { type: i0.ViewContainerRef }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: [MC_TOOLTIP_SCROLL_STRATEGY]
-                }] }, { type: i2.Directionality, decorators: [{
-                    type: Optional
-                }] }, { type: i3$1.FocusMonitor }, { type: i4.McFormField }], propDecorators: { content: [{
+        }], ctorParameters: () => [{ type: i1$1.McFormField }], propDecorators: { content: [{
                 type: Input,
                 args: ['mcTooltipNotHidden']
             }], mcTooltipHidden: [{
@@ -1149,5 +1113,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.0", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-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 };
+export { BIG_STEP, MAX_VALIDATOR, MC_INPUT_NUMBER_DEFAULT_CONFIGURATION, 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