@esfaenza/forms-and-validations 11.2.148 → 11.2.149-beta2

package/fesm2015/esfaenza-forms-and-validations.js

@@ -9,6 +9,7 @@ import { MatInputModule } from '@angular/material/input';
 import { MatChipsModule } from '@angular/material/chips';
 import { MatIconModule } from '@angular/material/icon';
 import { MatCheckboxModule } from '@angular/material/checkbox';
+import { InputTextModule } from 'primeng/inputtext';
 import { LocalizationService, LocalizationModule } from '@esfaenza/localizations';
 import { CurrencyMaskModule } from '@esfaenza/ngx-currency-mask';
 import { AngularMultiSelectModule } from 'angular2-multiselect-dropdown';
@@ -502,11 +503,11 @@ class ValidationSelectComponent extends BaseValidation {
         /**
          * valore del campo vuoto della select
          */
-        this.emptyFieldValue = "-2";
+        this.emptyFieldValue = "-2000";
         /**
          * Valore del placeholder
          */
-        this.placeHolderValue = "-1";
+        this.placeHolderValue = "-1000";
         /**
          * Per i componenti non obbligatori indica se fornire un "valore vuoto"
          */
@@ -1722,6 +1723,10 @@ class BaseFormControl {
         /** Cache delle proprietà scritte tipo --> {prop} */
         this.BindProperties = [];
         this.destroyed$ = new Subject();
+        /**
+         * Variabile per tenere in memoria il fatto che il componente è forzato a invalido o no
+         */
+        this._forceInvalid = false;
         if (ngControl == null) {
             if (!this.handleNullNgControl())
                 console.error("ngControl nullo per qualche motivo! Il 90% delle funzionalità di questo input saranno disabilitate");
@@ -1780,19 +1785,6 @@ class BaseFormControl {
         this.LabelColWidth = parseInt(ratio[0]);
         this.InputColWidth = parseInt(ratio[1]);
     }
-    /**
-     * Query sull'elemento 'validationControl' che funziona in ambiente statico
-     *
-     * @param {NgModel} comp Elemento HTML marcato con "#validationControl"
-     */
-    set _validationControl(comp) { this.registerValComp(comp); }
-    /**
-     * Query sull'elemento 'validationControl' che funziona in ambiente dinamico
-     *
-     * @param {NgModel} comp Elemento HTML marcato con "#validationControl"
-     */
-    set validationControl_static(comp) { this.registerValComp(comp); }
-    ;
     /**
      * Effettua il Bind/Parse delle varie **Source** unendo le informazioni specificate in **Display**
      *
@@ -1877,7 +1869,7 @@ class BaseFormControl {
     ngOnInit() {
         // A volte nell'ngOnInit non ci passa quindi lo metto sia qui sia nell'afterviewinit, penso che valga per i componenti di terze parti
         // che si collegano per i cazzi loro al form ecc, quindi la parte sopra non serve... BOH
-        this.checkRequiredValidator();
+        this.doCheckRequiredValidator();
         //Il nome non c'è se metto standalone : true (CHE NON é DA METTERE)
         //Dato che anche il controllo esterno viene considerato come componente del form, non posso basarmi solo sul nome ma devo aggiungere un tag. In questo caso "_internal"
         // ATTENZIONE: QUALSIASI SIA IL MOTIVO, SE STO COSO VIENE SPOSTATO DALL ngOnInit NON FUNZIONA PIU NULLA
@@ -1895,6 +1887,7 @@ class BaseFormControl {
             let origFunc = this.Form.onSubmit;
             var formOutsideRef = this.Form;
             this.Form.onSubmit = (ev) => {
+                this.submitted = true;
                 this.cdr.markForCheck();
                 return origFunc.apply(formOutsideRef);
             };
@@ -1902,11 +1895,14 @@ class BaseFormControl {
         if (this.SetValidationSubject) {
             this.SetValidationSubject.pipe(takeUntil(this.destroyed$)).subscribe(v => {
                 if (v.fieldName + "_internal" == this.GeneratedName) {
+                    // Bisogna farlo su entrambi i Control per portare il ".valid" nel punto giusto
+                    // e per avere gli stili sull'input
                     let control = this.Form.getControl(this.validationControl);
                     control.setErrors({ forcedtoinvalid: true });
                     control.markAsTouched();
                     this.ngControl.control.setErrors({ forcedtoinvalid: true });
                     this.ngControl.control.markAsTouched();
+                    this.cdr.markForCheck();
                 }
             });
         }
@@ -1922,17 +1918,17 @@ class BaseFormControl {
         this.destroyed$.complete();
     }
     /** Elabora i validatori iniettati e capisce se il valore è obbligatorio o meno */
-    checkRequiredValidator() {
-        // controllo se è settato un required per decidere in maniera condizionale se utilizzare il validatore required nel componente interno
+    doCheckRequiredValidator() {
+        // Controllo se è settato un required per decidere in maniera condizionale se utilizzare il validatore required nel componente interno
         // Lo faccio qui e non in un eventuale ngOnInit o costruttore perché ngOnInit non sempre viene chiamato e da costruttore il validatore non ha ancora il valore giusto
-        if (this._validators && this._validators.some(elem => elem instanceof RequiredValidator && elem.required))
+        if (this._validators && this.Validation && this._validators.some(elem => elem instanceof RequiredValidator && elem.required))
             this.Required = true;
     }
     /** @ignore */
     ngAfterViewInit() {
         if (!this.ngControl)
             return;
-        this.checkRequiredValidator();
+        this.doCheckRequiredValidator();
     }
     /** Helper che collega la funzione di reset del controllo form al controllo di validazione sottostante */
     bindResetFunction() {
@@ -1960,7 +1956,7 @@ class BaseFormControl {
         if (this.Model)
             this.onNotNullValueSet();
         // markForCheck non va bene in quanto arrivano possibilmente 2 update su un solo ciclo di stack
-        // setTime*ut che wrappa tutto non va bene sennò spamma delle change detection a suon di interval che rallentano tantissimo l'app
+        // setTimeout che wrappa tutto non va bene sennò spamma delle change detection a suon di interval che rallentano tantissimo l'app
         this.cdr.detectChanges();
     }
     /** @ignore */
@@ -1971,17 +1967,15 @@ class BaseFormControl {
     registerOnTouched(fn) {
         this.onTouched = fn;
     }
-    /**
-     * Registra internamente il componente di validazione, ne imposta i validatori e collega il Form, se presente
-     *
-     * @param {NgModel} comp Elemento HTML marcato con "#validationControl"
-     */
-    registerValComp(comp) {
-        if (comp) {
+    set baseInput(comp) { this.doRegisterBaseInput(comp); }
+    set baseInput_static(comp) { this.doRegisterBaseInput(comp); }
+    ;
+    doRegisterBaseInput(baseInput) {
+        if (baseInput) {
             // È arrivato un nuovo validationContorl (succede solo nel form-select quando cambia la source da 0 elementi / null ad N elementi, quindi al massimo una volta) 
             if (this.validationControl && this.Form)
                 this.Form.removeControl(this.validationControl);
-            this.validationControl = comp;
+            this.validationControl = baseInput;
             //Questa serve per passare avanti i validatori
             if (this.UseUserValidators)
                 this.validationControl.control.setValidators(this._validators);
@@ -1992,10 +1986,11 @@ class BaseFormControl {
             }
             if (this.ngControl)
                 this.bindResetFunction();
-            //I val-roba questo lo fanno automaticamente dentro... gli altri no (es. semplice input checkbox)
-            this.updateValidityForNativeInput();
+            // I val-roba questo lo fanno automaticamente dentro... gli altri no (es. semplice input checkbox)
+            this.doUpdateValidityForNativeInput();
         }
     }
+    //#endregion
     registerForm(ngForm) {
         this.Form = ngForm;
         this.Form.addControl(this.validationControl);
@@ -2006,9 +2001,8 @@ class BaseFormControl {
      *
      * @param {boolean} forcedValue Forza l'aggiornamento anche se non è un input nativo (input nativo = checkbox, ad esempio)
      */
-    updateValidityForNativeInput(forcedValue = false) {
-        if (forcedValue || this.nativeInput)
-            this.validationControl.control.updateValueAndValidity();
+    doUpdateValidityForNativeInput(forcedValue = false) {
+        this.validationControl.control.updateValueAndValidity();
     }
     /**
      * @ignore
@@ -2056,6 +2050,64 @@ class BaseFormControl {
         if (this.FAV_DEBUG_MODE)
             console.log("@forms-and-validations: " + message);
     }
+    /**
+     * Imposta il componente come "submitted" scatenandone le validazioni ed eventualmente la visualizzazione del tooltip di errore
+     *
+     * @param {boolean} val **true** se si vuole impostare questo controllo come submitted, **false** altrimenti
+     */
+    set submitted(val) {
+        this._submitted = val;
+        if (!this.validationControl)
+            return;
+        if (val) {
+            this.validationControl.control.markAsTouched();
+            this.validationControl.control.markAsDirty();
+        }
+        if (this.validationControl.control.status === "INVALID" && val) { /*this.showTooltipWithMessage();*/ }
+        else { /*this.tooltip.hide();*/ }
+    }
+    /**
+     * Imposta il componente come "invalid" a prescindere dai validatori
+     */
+    set forceInvalid(val) {
+        this._forceInvalid = val;
+        if (val)
+            setTimeout(() => {
+                this.validationControl.control.setErrors({ forcedtoinvalid: true });
+                this.validationControl.control.markAsTouched();
+                this.validationControl.control.markAsDirty();
+                this.cdr.detectChanges();
+            });
+        else
+            setTimeout(() => {
+                this.validationControl.control.setErrors({ forcedtoinvalid: null });
+                this.validationControl.control.updateValueAndValidity();
+            });
+    }
+    /**
+     * @ignore
+     */
+    setDisabledState(isDisabled) {
+        isDisabled ? this.validationControl.control.disable() : this.validationControl.control.enable();
+        this.Readonly = isDisabled;
+    }
+    /**
+     * Registra il Subject per ricevere le richieste di Focus dall'esterno
+     */
+    registerFocusRequest() {
+        if (!this.FocusSubject)
+            return;
+        this.observable = this.FocusSubject.subscribe(t => {
+            this.htmlInput.nativeElement.focus();
+        });
+    }
+    /**
+     * Deregistra il Subject delle richieste di focus
+     */
+    deregisterFocusRequest() {
+        if (this.observable)
+            this.observable.unsubscribe();
+    }
 }
 BaseFormControl.decorators = [
     { type: Directive }
@@ -2098,11 +2150,14 @@ BaseFormControl.propDecorators = {
     Display: [{ type: Input }],
     Readonly: [{ type: Input }],
     LabelInputRatio: [{ type: Input }],
-    _validationControl: [{ type: ViewChild, args: ["validationControl", { static: false },] }],
-    validationControl_static: [{ type: ViewChild, args: ["validationControl", { static: true },] }],
+    htmlInput: [{ type: ViewChild, args: ['htmlInput', { static: false },] }],
     inputChange: [{ type: Output }],
     inputFocus: [{ type: Output }],
-    inputFinalized: [{ type: Output }]
+    inputFinalized: [{ type: Output }],
+    baseInput: [{ type: ViewChild, args: ["baseInput", { static: false },] }],
+    baseInput_static: [{ type: ViewChild, args: ["baseInput", { static: true },] }],
+    submitted: [{ type: Input, args: ["submitted",] }],
+    forceInvalid: [{ type: Input }]
 };
 
 /**
@@ -2916,7 +2971,7 @@ FormDateComponent.propDecorators = {
 
 // Angular
 /** Semplice componente di Input testuale, con eventuale prefisso/suffisso */
-class FormInputComponent extends BaseFormControl {
+class FormInputComponentOLD extends BaseFormControl {
     /** @ignore Costruttore  */
     constructor(cdr, ngControl, _validators, ac, AppContext, ACO_CUSTOMKEY, FAV_DEBUG_MODE) {
         super(cdr, ngControl, _validators, ac, AppContext, ACO_CUSTOMKEY, FAV_DEBUG_MODE);
@@ -2930,6 +2985,7 @@ class FormInputComponent extends BaseFormControl {
         this.HasSuffix = false;
         /** Indica la presenza o meno di un prefisso, si basa sulla "truthiness" della proiezione **prefix** */
         this.HasPrefix = false;
+        this.ShowPassword = false;
     }
     /** @ignore */
     writeValue(obj) {
@@ -2943,15 +2999,37 @@ class FormInputComponent extends BaseFormControl {
     }
     /** @ignore */
     onNotNullValueSet() { }
+    onShowHidePassword(event) {
+        this.Password = !this.Password;
+        this.ShowPassword = !this.ShowPassword;
+        event.preventDefault();
+    }
+    /**
+    * @ignore
+    */
+    ngOnInit() {
+        super.ngOnInit();
+        this.registerFocusRequest();
+        // Controllo se è settato un required per decidere in maniera condizionale se utilizzare il validatore required nel componente interno
+        if (this._validators && this.Validation && this._validators.some(elem => elem instanceof RequiredValidator))
+            this.Required = true;
+    }
+    /**
+     * @ignore
+     */
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this.deregisterFocusRequest();
+    }
 }
-FormInputComponent.decorators = [
+FormInputComponentOLD.decorators = [
     { type: Component, args: [{
-                selector: "form-input",
-                template: "<!-- Uguale in tutti i componenti --------------------------------------------------------------------------->\r\n<ng-container *ngIf=\"!FormLayout && (!DisplayMode || (DisplayLayout != 'hidden' && DisplayCondition))\">\r\n    <ng-container *ngIf=\"DisplayMode && !DisplayModeTemplate\">\r\n        <ng-container *ngIf=\"DisplayLayout == 'form'\">{{ EvaluatedModel }}</ng-container>\r\n        <div *ngIf=\"DisplayLayout == 'inline'\" class=\"app-inline\">{{ EvaluatedModel }}</div>\r\n    </ng-container>\r\n    <ng-container *ngIf=\"DisplayMode && DisplayModeTemplate\"><ng-container *ngTemplateOutlet=\"DisplayModeTemplate, context: { $implicit: EvaluatedModel }\"></ng-container></ng-container>\r\n    <div [hidden]=\"DisplayMode\"><ng-container *ngTemplateOutlet=\"controlTemplate\"></ng-container></div>\r\n</ng-container>\r\n\r\n<div *ngIf=\"FormLayout && (!DisplayMode || (DisplayLayout != 'hidden' && DisplayCondition))\" class=\"{{FormGroupClass + (Last ? ' app-margin-bottom-0 app-margin-right-0 ' : '') + (DisplayLayout == 'inline' && DisplayMode ? (' app-inline-block ' + (!Last ? 'app-margin-right-10' : '')) : ' form-group row')}}\">\r\n\r\n    <label class=\"col-md-{{(DisplayMode && DisplayLayout == 'inline' ? 'none app-bold app-margin-bottom-0' : LabelColWidth) + (DisplayMode ? ' app-bold' : ' m-t-5') }}\">{{Label}}{{Required && !DisplayMode ? '*' : ''}}{{Label ? \":\" : \"\"}}</label>\r\n    <span *ngIf=\"DisplayMode && DisplayLayout == 'inline' && InlineSeparator != ''\">{{InlineSeparator}}</span>\r\n    <div class=\"col-md-{{DisplayMode && DisplayLayout == 'inline' ? 'none app-inline-block' : InputColWidth}}\">\r\n\r\n        <ng-container *ngIf=\"DisplayMode && !DisplayModeTemplate\">{{ EvaluatedModel }}</ng-container>\r\n        <ng-container *ngIf=\"DisplayMode && DisplayModeTemplate\"><ng-container *ngTemplateOutlet=\"DisplayModeTemplate, context: { $implicit: EvaluatedModel }\"></ng-container></ng-container>\r\n        <div [hidden]=\"DisplayMode\"><ng-container *ngTemplateOutlet=\"controlTemplate\"></ng-container></div>\r\n    </div>\r\n    <div class=\"clearfix\"></div>\r\n</div>\r\n<!----------------------------------------------------------------------------------------------------------->\r\n\r\n<ng-template #controlTemplate>\r\n    <val-input [FocusSubject]=\"FocusSubject\" [SetValidationSubject]=\"SetValidationSubject\" [FieldAppearence]=\"FieldAppearence\"\r\n               [noValidate]=\"!Validation\"\r\n               [Frozen]=\"Frozen\"\r\n               [submitted]=\"Form?.submitted\"\r\n               [readonly]=\"Readonly\"\r\n               [forceInvalid]=\"ForcedError\" \r\n               [FloatingLabel]=\"FloatingLabel\"\r\n               type=\"text\"\r\n               [(ngModel)]=\"Model\"\r\n               [id]=\"GeneratedName\"\r\n               name=\"{{GeneratedName}}\"\r\n               autocomplete=\"off\"\r\n               #validationControl=\"ngModel\"\r\n               (inputChange)=\"changed();\"\r\n               (inputFocus)=\"focused($event);\"\r\n               (inputFinalized)=\"finalized()\"\r\n               [placeholder]=\"Placeholder\"\r\n               [validationFailed]=\"FailedValidationMessage\"\r\n               [Password]=\"Password\">\r\n        <ng-container *ngIf=\"HasSuffix\">\r\n            <ng-template #suffix_internal>\r\n                <button type=\"button\" class=\"mat-button mat-icon-button mat-button-base mat-icon-button-override mat-icon-button-override-suffix\"\r\n                        matSuffix (click)=\"onSuffixAction.emit(); $event.stopPropagation(); $event.preventDefault();\">\r\n                    <ng-container *ngTemplateOutlet=\"suffix\"></ng-container>\r\n                </button>\r\n            </ng-template>\r\n        </ng-container>\r\n        <ng-container *ngIf=\"HasPrefix\">\r\n            <ng-template #prefix_internal>\r\n                <button type=\"button\" class=\"mat-button mat-icon-button mat-button-base mat-icon-button-override mat-icon-button-override-prefix\"\r\n                        matPrefix (click)=\"onPrefixAction.emit(); $event.stopPropagation(); $event.preventDefault();\">\r\n                    <ng-container *ngTemplateOutlet=\"prefix\"></ng-container>\r\n                </button>\r\n            </ng-template>\r\n        </ng-container>\r\n    </val-input>\r\n</ng-template>",
+                selector: "form-input-old",
+                template: "Uguale in tutti i componenti -------------------------------------------------------------------------\r\n<ng-container *ngIf=\"!FormLayout && (!DisplayMode || (DisplayLayout != 'hidden' && DisplayCondition))\">\r\n    <ng-container *ngIf=\"DisplayMode && !DisplayModeTemplate\">\r\n        <ng-container *ngIf=\"DisplayLayout == 'form'\">{{ EvaluatedModel }}</ng-container>\r\n        <div *ngIf=\"DisplayLayout == 'inline'\" class=\"app-inline\">{{ EvaluatedModel }}</div>\r\n    </ng-container>\r\n    <ng-container *ngIf=\"DisplayMode && DisplayModeTemplate\"><ng-container *ngTemplateOutlet=\"DisplayModeTemplate, context: { $implicit: EvaluatedModel }\"></ng-container></ng-container>\r\n    <div [hidden]=\"DisplayMode\"><ng-container *ngTemplateOutlet=\"controlTemplate\"></ng-container></div>\r\n</ng-container>\r\n\r\n<div *ngIf=\"FormLayout && (!DisplayMode || (DisplayLayout != 'hidden' && DisplayCondition))\" class=\"{{FormGroupClass + (Last ? ' app-margin-bottom-0 app-margin-right-0 ' : '') + (DisplayLayout == 'inline' && DisplayMode ? (' app-inline-block ' + (!Last ? 'app-margin-right-10' : '')) : ' form-group row')}}\">\r\n    <label class=\"col-md-{{(DisplayMode && DisplayLayout == 'inline' ? 'none app-bold app-margin-bottom-0' : LabelColWidth) + (DisplayMode ? ' app-bold' : ' m-t-5') }}\">{{Label}}{{Required && !DisplayMode ? '*' : ''}}{{Label ? \":\" : \"\"}}</label>\r\n    <span *ngIf=\"DisplayMode && DisplayLayout == 'inline' && InlineSeparator != ''\">{{InlineSeparator}}</span>\r\n    <div class=\"col-md-{{DisplayMode && DisplayLayout == 'inline' ? 'none app-inline-block' : InputColWidth}}\">\r\n        <ng-container *ngIf=\"DisplayMode && !DisplayModeTemplate\">{{ EvaluatedModel }}</ng-container>\r\n        <ng-container *ngIf=\"DisplayMode && DisplayModeTemplate\"><ng-container *ngTemplateOutlet=\"DisplayModeTemplate, context: { $implicit: EvaluatedModel }\"></ng-container></ng-container>\r\n        <div [hidden]=\"DisplayMode\"><ng-container *ngTemplateOutlet=\"controlTemplate\"></ng-container></div>\r\n    </div>\r\n    <div class=\"clearfix\"></div>\r\n</div>\r\n<!----------------------------------------------------------------------------------------------------------->\r\n\r\n<ng-template #controlTemplate>\r\n    <mat-form-field floatLabel=\"never\" appearance=\"{{FieldAppearence}}\" class=\"mat-full-width mat-no-border-top mat-height-fixed\">\r\n        <mat-label [class.app-margin-left-25]=\"HasPrefix\" *ngIf=\"Placeholder && FloatingLabel\">{{Placeholder}}</mat-label>\r\n        <!--Prefisso-->\r\n        <ng-container *ngIf=\"HasPrefix\">\r\n            <button type=\"button\"\r\n                class=\"mat-button mat-icon-button mat-button-base mat-icon-button-override mat-icon-button-override-prefix\"\r\n                matPrefix (click)=\"onPrefixAction.emit(); $event.stopPropagation(); $event.preventDefault();\">\r\n                <ng-container *ngTemplateOutlet=\"prefix\"></ng-container>\r\n            </button>\r\n        </ng-container>\r\n        <!--Input-->\r\n        <input matInput\r\n               #baseInput=\"ngModel\"\r\n               #htmlInput\r\n               [type]=\"Password ? 'password' : 'text'\"\r\n               triggers=\"\"\r\n               placement=\"top\"\r\n               autocomplete=\"off\"\r\n               name=\"base-input\"\r\n               class=\"form-control\"\r\n               id=\"{{GeneratedName}}\"\r\n               [class.app-margin-left-25]=\"HasPrefix\"\r\n               [class.mat-input-with-suffix]=\"HasSuffix || Password\"\r\n               [(ngModel)]=\"Model\"\r\n               [class.checking-field]=\"!Validation\"\r\n               [readonly]=\"Frozen\"\r\n               [disabled]=\"Readonly\"\r\n               [placeholder]=\"FloatingLabel ? undefined : Placeholder\"\r\n               (focus)=\"focused($event);\"\r\n               (ngModelChange)=\"changed()\"\r\n               (keyup)=\"($event.keyCode == 13 || $event.keyCode == 27) && finalized();\"\r\n               (blur)=\"finalized();\"\r\n               >\r\n        <ng-container *ngIf=\"HasSuffix || Password\">\r\n            <ng-container *ngIf=\"!Password\">\r\n                <button type=\"button\"\r\n                    class=\"mat-button mat-icon-button mat-button-base mat-icon-button-override mat-icon-button-override-suffix\"\r\n                    matSuffix (click)=\"onSuffixAction.emit(); $event.stopPropagation(); $event.preventDefault();\">\r\n                    <ng-container *ngTemplateOutlet=\"suffix\"></ng-container>\r\n                </button>\r\n            </ng-container>\r\n            <!--Password-->\r\n            <span class=\"form-input-suffix\" *ngIf=\"Password\">\r\n                <ng-container *ngIf=\"Password\" matSuffix>\r\n                    <a *ngIf=\"ShowPassword\" class=\"fa fa-eye-slash app-fs-16 app-pointer\" (click)=\"onShowHidePassword($event)\"></a>\r\n                    <a *ngIf=\"!ShowPassword\" class=\"fa fa-eye app-fs-16 app-pointer\" (click)=\"onShowHidePassword($event)\"></a>\r\n                </ng-container>\r\n            </span>\r\n        </ng-container>\r\n    </mat-form-field>\r\n</ng-template>",
                 changeDetection: ChangeDetectionStrategy.OnPush
             },] }
 ];
-FormInputComponent.ctorParameters = () => [
+FormInputComponentOLD.ctorParameters = () => [
     { type: ChangeDetectorRef },
     { type: NgControl, decorators: [{ type: Optional }, { type: Self }] },
     { type: Array, decorators: [{ type: Optional }, { type: Inject, args: [NG_VALIDATORS,] }] },
@@ -2960,7 +3038,7 @@ FormInputComponent.ctorParameters = () => [
     { type: String, decorators: [{ type: Optional }, { type: Inject, args: [ACO_CUSTOMKEY,] }] },
     { type: Boolean, decorators: [{ type: Optional }, { type: Inject, args: [FAV_DEBUG_MODE,] }] }
 ];
-FormInputComponent.propDecorators = {
+FormInputComponentOLD.propDecorators = {
     Password: [{ type: Input }],
     onSuffixAction: [{ type: Output }],
     onPrefixAction: [{ type: Output }],
@@ -3008,7 +3086,7 @@ class FormSelectComponent extends BaseFormControl {
          *
          * Si consiglia di mantenere il default
          */
-        this.EmptyFieldValue = '-2';
+        this.EmptyFieldValue = '-2000';
         /** Se **true** rimuove il simbolino di validazione (croce rossa o tick verde) */
         this.ShowValidationSymbol = true;
         /** Template per la visualizzazione delle opzioni */
@@ -3635,6 +3713,64 @@ FormTimeComponent.propDecorators = {
     InOutFormat: [{ type: Input }]
 };
 
+// Angular
+class FormInputComponent extends BaseFormControl {
+    constructor(cdr, ngControl, _validators, ac, AppContext, ACO_CUSTOMKEY, FAV_DEBUG_MODE) {
+        super(cdr, ngControl, _validators, ac, AppContext, ACO_CUSTOMKEY, FAV_DEBUG_MODE);
+        this.Password = false;
+        this.onSuffixAction = new EventEmitter();
+        this.onPrefixAction = new EventEmitter();
+        this.HasSuffix = false;
+        this.HasPrefix = false;
+    }
+    ngOnInit() {
+        super.ngOnInit();
+        this.registerFocusRequest();
+    }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this.deregisterFocusRequest();
+    }
+    writeValue(obj) {
+        this.EvaluatedModel = (obj === null || obj === void 0 ? void 0 : obj.toString()) || "";
+        super.writeValue(obj);
+    }
+    ngAfterContentInit() {
+        this.HasSuffix = !!this.suffix && !this.Password;
+        this.HasPrefix = !!this.prefix;
+    }
+    onNotNullValueSet() { }
+    onBlur() {
+        var _a, _b;
+        this.validationControl.control.markAsDirty();
+        this.inputFinalized.emit((_b = (_a = this.ngControl) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toString());
+    }
+}
+FormInputComponent.decorators = [
+    { type: Component, args: [{
+                selector: "form-input",
+                template: "<!-- Uguale in tutti i componenti --------------------------------------------------------------------------->\r\n<ng-container *ngIf=\"!FormLayout && (!DisplayMode || (DisplayLayout != 'hidden' && DisplayCondition))\">\r\n    <ng-container *ngIf=\"DisplayMode && !DisplayModeTemplate\">\r\n        <ng-container *ngIf=\"DisplayLayout == 'form'\">{{ EvaluatedModel }}</ng-container>\r\n        <div *ngIf=\"DisplayLayout == 'inline'\" class=\"app-inline\">{{ EvaluatedModel }}</div>\r\n    </ng-container>\r\n    <ng-container *ngIf=\"DisplayMode && DisplayModeTemplate\"><ng-container *ngTemplateOutlet=\"DisplayModeTemplate, context: { $implicit: EvaluatedModel }\"></ng-container></ng-container>\r\n    <div [hidden]=\"DisplayMode\"><ng-container *ngTemplateOutlet=\"controlTemplate\"></ng-container></div>\r\n</ng-container>\r\n\r\n<div *ngIf=\"FormLayout && (!DisplayMode || (DisplayLayout != 'hidden' && DisplayCondition))\" class=\"{{FormGroupClass + (Last ? ' app-margin-bottom-0 app-margin-right-0 ' : '') + (DisplayLayout == 'inline' && DisplayMode ? (' app-inline-block ' + (!Last ? 'app-margin-right-10' : '')) : ' form-group row')}}\">\r\n    <label class=\"col-md-{{(DisplayMode && DisplayLayout == 'inline' ? 'none app-bold app-margin-bottom-0' : LabelColWidth) + (DisplayMode ? ' app-bold' : ' m-t-5') }}\">{{Label}}{{Required && !DisplayMode ? '*' : ''}}{{Label ? \":\" : \"\"}}</label>\r\n    <span *ngIf=\"DisplayMode && DisplayLayout == 'inline' && InlineSeparator != ''\">{{InlineSeparator}}</span>\r\n    <div class=\"col-md-{{DisplayMode && DisplayLayout == 'inline' ? 'none app-inline-block' : InputColWidth}}\">\r\n        <ng-container *ngIf=\"DisplayMode && !DisplayModeTemplate\">{{ EvaluatedModel }}</ng-container>\r\n        <ng-container *ngIf=\"DisplayMode && DisplayModeTemplate\"><ng-container *ngTemplateOutlet=\"DisplayModeTemplate, context: { $implicit: EvaluatedModel }\"></ng-container></ng-container>\r\n        <div [hidden]=\"DisplayMode\"><ng-container *ngTemplateOutlet=\"controlTemplate\"></ng-container></div>\r\n    </div>\r\n    <div class=\"clearfix\"></div>\r\n</div>\r\n<!----------------------------------------------------------------------------------------------------------->\r\n\r\n<ng-template #controlTemplate>\r\n    <span [class.p-float-label]=\"FloatingLabel && (!HasPrefix && !HasSuffix)\" \r\n          [class.p-input-icon-right]=\"Password || HasSuffix\"\r\n          [class.p-input-icon-left]=\"HasPrefix\">\r\n        <!--Prefisso-->\r\n        <ng-container *ngIf=\"HasPrefix\">\r\n            <i (click)=\"onPrefixAction.emit(); $event.stopPropagation(); $event.preventDefault();\" style=\"cursor: pointer;\">\r\n                <ng-container *ngTemplateOutlet=\"prefix\"></ng-container>\r\n            </i>\r\n        </ng-container>\r\n        <!--Input-->\r\n        <input pInputText #baseInput=\"ngModel\" #htmlInput\r\n               name=\"{{GeneratedName}}\" id=\"{{GeneratedName}}\"\r\n               [type]=\"Password ? 'password' : 'text'\"\r\n               triggers=\"\"\r\n               placement=\"top\"\r\n               autocomplete=\"off\"\r\n               [class.app-margin-left-25]=\"HasPrefix\"\r\n               [(ngModel)]=\"Model\"\r\n               style=\"box-shadow: unset\"\r\n               [readonly]=\"Frozen\"\r\n               [disabled]=\"Readonly\"\r\n               [placeholder]=\"FloatingLabel ? '' : Placeholder\"\r\n               (focus)=\"focused($event);\"\r\n               (ngModelChange)=\"changed()\"\r\n               (keyup)=\"($event.keyCode == 13 || $event.keyCode == 27) && onBlur();\"\r\n               (blur)=\"onBlur();\"\r\n               >\r\n        <label *ngIf=\"Placeholder && FloatingLabel\" htmlFor=\"{{GeneratedName}}\">\r\n            {{Placeholder}}\r\n        </label>\r\n        <!--Password-->\r\n        <i *ngIf=\"Password && htmlInput.type == 'password'\" class=\"fa fas fa-eye\" style=\"cursor: pointer;\" (click)=\"htmlInput.type = 'text'\"></i>\r\n        <i *ngIf=\"Password && htmlInput.type == 'text'\" class=\"fa fas fa-eye-slash\" style=\"cursor: pointer;\" (click)=\"htmlInput.type = 'password'\"></i>\r\n        <!--Suffisso-->\r\n        <ng-container *ngIf=\"HasSuffix\">\r\n            <i (click)=\"onSuffixAction.emit(); $event.stopPropagation(); $event.preventDefault();\" style=\"cursor: pointer;\">\r\n                <ng-container *ngTemplateOutlet=\"suffix\"></ng-container>\r\n            </i>\r\n        </ng-container>\r\n    </span>\r\n</ng-template>",
+                changeDetection: ChangeDetectionStrategy.OnPush,
+                styles: [".p-inputtext{width:100%}.p-input-icon-left,.p-input-icon-right{display:block!important}"]
+            },] }
+];
+FormInputComponent.ctorParameters = () => [
+    { type: ChangeDetectorRef },
+    { type: NgControl, decorators: [{ type: Optional }, { type: Self }] },
+    { type: Array, decorators: [{ type: Optional }, { type: Inject, args: [NG_VALIDATORS,] }] },
+    { type: AccessControlService, decorators: [{ type: Optional }] },
+    { type: ComponentContext, decorators: [{ type: Optional }] },
+    { type: String, decorators: [{ type: Optional }, { type: Inject, args: [ACO_CUSTOMKEY,] }] },
+    { type: Boolean, decorators: [{ type: Optional }, { type: Inject, args: [FAV_DEBUG_MODE,] }] }
+];
+FormInputComponent.propDecorators = {
+    Password: [{ type: Input }],
+    onSuffixAction: [{ type: Output }],
+    onPrefixAction: [{ type: Output }],
+    suffix: [{ type: ContentChild, args: ["suffix", { static: false },] }],
+    prefix: [{ type: ContentChild, args: ["prefix", { static: false },] }]
+};
+
 // Angular
 /**
  * Formato in display (modalità lunga, con ore, minuti e secondi) delle date per tutti i componenti che utilizzino input data.
@@ -3663,6 +3799,7 @@ const COMPONENTS = [
     FormCheckboxComponent,
     FormDateComponent,
     FormEmptyComponent,
+    FormInputComponentOLD,
     FormInputComponent,
     FormSelectComponent,
     FormTextareaComponent,
@@ -3696,7 +3833,8 @@ const MODULES = [
     CurrencyMaskModule,
     MatAutocompleteModule,
     NgxMatDatetimePickerModule,
-    NgxMatTimepickerModule
+    NgxMatTimepickerModule,
+    InputTextModule
 ];
 /**
  * Moduli utilizzati dalla libreria e che devono essere esposti all'esterno
@@ -3735,5 +3873,5 @@ FormsAndValidationsModule.decorators = [
  * Generated bundle index. Do not edit.
  */
 
-export { ACO_CUSTOMKEY, AppFile, BaseFormControl, ChangeEvent, FAV_DEBUG_MODE, FAV_LOCALE, FAV_SLIDER_MODE, FormAdaptiveComponent, FormAutocompleteComponent, FormCheckboxComponent, FormDateComponent, FormDateTimeComponent, FormEmptyComponent, FormErrorComponent, FormFileComponent, FormInfoComponent, FormInputComponent, FormSelectComponent, FormTemplateComponent, FormTextareaComponent, FormTimeComponent, FormsAndValidationsModule, FormsAndValidationsModuleConfig, NgxExpandedDayJsDateAdapter, ValidationAutocompleteComponent, ValidationAutocompleteMultiComponent, ValidationCurrencyComponent, ValidationDateComponent, ValidationDateTimeComponent, ValidationInputComponent, ValidationSelectComponent, ValidationTextAreaComponent, BaseValidation as ɵa, BaseValidationLoc as ɵb, CustomRequiredDirective as ɵc, FormSelectComponentLoc as ɵd, FormAdaptiveComponentLoc as ɵe, FormMultiSelectComponent as ɵf, FormMultiSelectComponentLoc as ɵg, FormFileComponentLoc as ɵh, FormAutocompleteComponentLoc as ɵi };
+export { ACO_CUSTOMKEY, AppFile, BaseFormControl, ChangeEvent, FAV_DEBUG_MODE, FAV_LOCALE, FAV_SLIDER_MODE, FormAdaptiveComponent, FormAutocompleteComponent, FormCheckboxComponent, FormDateComponent, FormDateTimeComponent, FormEmptyComponent, FormErrorComponent, FormFileComponent, FormInfoComponent, FormInputComponentOLD, FormSelectComponent, FormTemplateComponent, FormTextareaComponent, FormTimeComponent, FormsAndValidationsModule, FormsAndValidationsModuleConfig, NgxExpandedDayJsDateAdapter, ValidationAutocompleteComponent, ValidationAutocompleteMultiComponent, ValidationCurrencyComponent, ValidationDateComponent, ValidationDateTimeComponent, ValidationInputComponent, ValidationSelectComponent, ValidationTextAreaComponent, BaseValidation as ɵa, BaseValidationLoc as ɵb, CustomRequiredDirective as ɵc, FormInputComponent as ɵd, FormSelectComponentLoc as ɵe, FormAdaptiveComponentLoc as ɵf, FormMultiSelectComponent as ɵg, FormMultiSelectComponentLoc as ɵh, FormFileComponentLoc as ɵi, FormAutocompleteComponentLoc as ɵj };
 //# sourceMappingURL=esfaenza-forms-and-validations.js.map