ngx-tethys 18.1.0-next.0 → 18.1.0

package/fesm2022/ngx-tethys-form.mjs

@@ -4,15 +4,14 @@ import { ThyInputModule } from 'ngx-tethys/input';
 import { ThyTooltipDirective, ThyTooltipModule } from 'ngx-tethys/tooltip';
 import { NgClass, NgTemplateOutlet, CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
-import { InjectionToken, Injectable, Optional, Inject, Directive, Input, HostBinding, ContentChildren, Component, ViewEncapsulation, ChangeDetectionStrategy, ContentChild, EventEmitter, Output, HostListener, forwardRef, NgModule } from '@angular/core';
-import * as i1 from '@angular/forms';
-import { NgForm, FormGroupDirective, NgControl, NG_ASYNC_VALIDATORS, Validators, NG_VALIDATORS, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { InjectionToken, Injectable, Optional, Inject, inject, ElementRef, Renderer2, NgZone, Directive, Input, HostBinding, ContentChildren, Component, ViewEncapsulation, ChangeDetectionStrategy, ContentChild, EventEmitter, Output, HostListener, forwardRef, NgModule } from '@angular/core';
+import { NgForm, FormGroupDirective, ControlContainer, NgControl, NG_ASYNC_VALIDATORS, Validators, NG_VALIDATORS, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { helpers, isUndefinedOrNull, keycodes, coerceBooleanProperty as coerceBooleanProperty$1 } from 'ngx-tethys/util';
 import { useHostRenderer } from '@tethys/cdk/dom';
-import { of, Subject } from 'rxjs';
+import { Subject, of } from 'rxjs';
 import { debounceTime, distinctUntilChanged, filter, switchMap, takeUntil, map, catchError } from 'rxjs/operators';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
-import * as i1$1 from 'ngx-tethys/core';
+import { ThyTranslate } from 'ngx-tethys/core';
 
 const THY_VALIDATOR_CONFIG = new InjectionToken('VALIDATION_CONFIG');
 const THY_FORM_CONFIG = new InjectionToken('THY_FORM_CONFIG');
@@ -153,6 +152,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
  * @private
  */
 class ThyFormValidatorService {
+    constructor() {
+        this.thyFormValidateLoader = inject(ThyFormValidatorLoader);
+        this.errors = [];
+        this._controls = [];
+        // 记录所有元素的验证信息
+        this.validations = {};
+        this._destroy$ = new Subject();
+    }
     _getElement(name) {
         const element = this._formElement.elements[name];
         if (element) {
@@ -278,14 +285,6 @@ class ThyFormValidatorService {
     _getValidateOn() {
         return (this._config && this._config.validateOn) || this.thyFormValidateLoader.validateOn;
     }
-    constructor(thyFormValidateLoader) {
-        this.thyFormValidateLoader = thyFormValidateLoader;
-        this.errors = [];
-        this._controls = [];
-        // 记录所有元素的验证信息
-        this.validations = {};
-        this._destroy$ = new Subject();
-    }
     initialize(ngForm, formElement) {
         this._ngForm = ngForm;
         this._formElement = formElement;
@@ -387,12 +386,12 @@ class ThyFormValidatorService {
     ngOnDestroy() {
         this._destroy$.next();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormValidatorService, deps: [{ token: ThyFormValidatorLoader }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormValidatorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormValidatorService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormValidatorService, decorators: [{
             type: Injectable
-        }], ctorParameters: () => [{ type: ThyFormValidatorLoader }] });
+        }] });
 
 // 1. submit 按 Enter 键提交, Textare或包含[contenteditable]属性的元素 除外，需要按 Ctrl | Command + Enter 提交
 // 2. alwaysSubmit 不管是哪个元素 按 Enter 键都提交
@@ -435,13 +434,13 @@ class ThyFormDirective {
     set thyFormValidatorConfig(config) {
         this.validator.setValidatorConfig(config);
     }
-    constructor(ngForm, elementRef, renderer, ngZone, validator, config) {
-        this.ngForm = ngForm;
-        this.elementRef = elementRef;
-        this.renderer = renderer;
-        this.ngZone = ngZone;
-        this.validator = validator;
-        this.config = config;
+    constructor() {
+        this.ngForm = inject(ControlContainer);
+        this.elementRef = inject(ElementRef);
+        this.renderer = inject(Renderer2);
+        this.ngZone = inject(NgZone);
+        this.validator = inject(ThyFormValidatorService);
+        this.config = inject(THY_FORM_CONFIG);
         this.initialized = false;
         this.hostRenderer = useHostRenderer();
         this.wasValidated = false;
@@ -514,7 +513,7 @@ class ThyFormDirective {
             this._unsubscribe = null;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormDirective, deps: [{ token: i1.ControlContainer }, { token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.NgZone }, { token: ThyFormValidatorService }, { token: THY_FORM_CONFIG }], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.0", type: ThyFormDirective, isStandalone: true, selector: "[thyForm],[thy-form]", inputs: { thyLayout: "thyLayout", thyEnterKeyMode: "thyEnterKeyMode", thyFormValidatorConfig: "thyFormValidatorConfig" }, host: { properties: { "class.was-validated": "this.wasValidated" }, classAttribute: "thy-form" }, providers: [ThyFormValidatorService], queries: [{ propertyName: "controls", predicate: NgControl, descendants: true }], exportAs: ["thyForm"], ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormDirective, decorators: [{
@@ -528,10 +527,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
                     },
                     standalone: true
                 }]
-        }], ctorParameters: () => [{ type: i1.ControlContainer }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.NgZone }, { type: ThyFormValidatorService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: [THY_FORM_CONFIG]
-                }] }], propDecorators: { thyLayout: [{
+        }], ctorParameters: () => [], propDecorators: { thyLayout: [{
                 type: Input
             }], thyEnterKeyMode: [{
                 type: Input
@@ -552,6 +548,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
  * @order 50
  */
 class ThyFormGroupError {
+    constructor() {
+        this.thyParentForm = inject(ThyFormDirective, { optional: true });
+        this.thyShowFirst = true;
+        this.isHorizontal = true;
+    }
     /**
      * @type string[]
      */
@@ -565,25 +566,18 @@ class ThyFormGroupError {
     get _isFormGroup() {
         return this.thyErrors && this.thyErrors.length > 0;
     }
-    constructor(thyParentForm) {
-        this.thyParentForm = thyParentForm;
-        this.thyShowFirst = true;
-        this.isHorizontal = true;
-    }
     ngOnInit() {
         if (this.thyParentForm) {
             this.isHorizontal = this.thyParentForm.isHorizontal;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupError, deps: [{ token: ThyFormDirective, optional: true }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupError, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.0", type: ThyFormGroupError, isStandalone: true, selector: "thy-form-group-error", inputs: { thyShowFirst: ["thyShowFirst", "thyShowFirst", coerceBooleanProperty$1], thyErrors: "thyErrors" }, host: { properties: { "class.form-group": "this._isFormGroup", "class.row": "this.isHorizontal" } }, ngImport: i0, template: "<div [ngClass]=\"{ 'col-sm-10 offset-sm-2 col-form-control': isHorizontal }\">\n  @for (error of thyErrors; track $index) {\n    <thy-alert thyType=\"danger\" [thyMessage]=\"error\"></thy-alert>\n  }\n</div>\n", dependencies: [{ kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "component", type: ThyAlert, selector: "thy-alert", inputs: ["thyType", "thyTheme", "thyMessage", "thyIcon", "thyCloseable"] }], encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupError, decorators: [{
             type: Component,
             args: [{ selector: 'thy-form-group-error', encapsulation: ViewEncapsulation.None, standalone: true, imports: [NgClass, ThyAlert], template: "<div [ngClass]=\"{ 'col-sm-10 offset-sm-2 col-form-control': isHorizontal }\">\n  @for (error of thyErrors; track $index) {\n    <thy-alert thyType=\"danger\" [thyMessage]=\"error\"></thy-alert>\n  }\n</div>\n" }]
-        }], ctorParameters: () => [{ type: ThyFormDirective, decorators: [{
-                    type: Optional
-                }] }], propDecorators: { thyShowFirst: [{
+        }], propDecorators: { thyShowFirst: [{
                 type: Input,
                 args: [{ transform: coerceBooleanProperty$1 }]
             }], thyErrors: [{
@@ -601,6 +595,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
  * @order 45
  */
 class ThyFormGroupLabelDirective {
+    constructor() {
+        this.thyTranslate = inject(ThyTranslate);
+        this.labelRequired = false;
+        this._isFormGroupLabel = true;
+    }
     set thyLabelText(value) {
         this.labelText = value;
     }
@@ -612,12 +611,7 @@ class ThyFormGroupLabelDirective {
     set thyLabelRequired(value) {
         this.labelRequired = value;
     }
-    constructor(thyTranslate) {
-        this.thyTranslate = thyTranslate;
-        this.labelRequired = false;
-        this._isFormGroupLabel = true;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupLabelDirective, deps: [{ token: i1$1.ThyTranslate }], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupLabelDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "16.1.0", version: "18.2.0", type: ThyFormGroupLabelDirective, isStandalone: true, selector: "[thyFormGroupLabel]", inputs: { thyLabelText: "thyLabelText", thyLabelTranslateKey: "thyLabelTranslateKey", thyLabelRequired: ["thyLabelRequired", "thyLabelRequired", coerceBooleanProperty$1] }, host: { properties: { "class.label-required": "this.labelRequired", "class.col-form-label": "this._isFormGroupLabel" } }, ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupLabelDirective, decorators: [{
@@ -626,7 +620,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
                     selector: '[thyFormGroupLabel]',
                     standalone: true
                 }]
-        }], ctorParameters: () => [{ type: i1$1.ThyTranslate }], propDecorators: { labelRequired: [{
+        }], propDecorators: { labelRequired: [{
                 type: HostBinding,
                 args: ['class.label-required']
             }], _isFormGroupLabel: [{
@@ -650,6 +644,17 @@ const internalIconMap = {
  * @order 40
  */
 class ThyFormGroup {
+    constructor() {
+        this.thyParentForm = inject(ThyFormDirective, { optional: true });
+        this.thyTranslate = inject(ThyTranslate);
+        this.labelRequired = false;
+        this.labelPaddingTopClear = false;
+        this.tipMode = 'default';
+        this._rowFill = false;
+        this._isFormGroup = true;
+        this.isHorizontal = true;
+        this.hasFeedback = false;
+    }
     /**
      * Label 文本
      */
@@ -717,29 +722,16 @@ class ThyFormGroup {
     set thyRowFill(value) {
         this._rowFill = value;
     }
-    constructor(thyParentForm, thyTranslate) {
-        this.thyParentForm = thyParentForm;
-        this.thyTranslate = thyTranslate;
-        this.labelRequired = false;
-        this.labelPaddingTopClear = false;
-        this.tipMode = 'default';
-        this._rowFill = false;
-        this._isFormGroup = true;
-        this.isHorizontal = true;
-        this.hasFeedback = false;
-    }
     ngOnInit() {
         this.isHorizontal = this.thyParentForm ? this.thyParentForm.isHorizontal : true;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroup, deps: [{ token: ThyFormDirective, optional: true }, { token: i1$1.ThyTranslate }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroup, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.0", type: ThyFormGroup, isStandalone: true, selector: "thy-form-group", inputs: { thyLabelText: "thyLabelText", thyLabelTextTranslateKey: "thyLabelTextTranslateKey", thyLabelRequired: ["thyLabelRequired", "thyLabelRequired", coerceBooleanProperty$1], thyLabelPaddingTopClear: ["thyLabelPaddingTopClear", "thyLabelPaddingTopClear", coerceBooleanProperty$1], thyFeedbackIcon: "thyFeedbackIcon", thyTipsMode: "thyTipsMode", thyTips: "thyTips", thyTipsTranslateKey: "thyTipsTranslateKey", thyRowFill: ["thyRowFill", "thyRowFill", coerceBooleanProperty$1] }, host: { properties: { "class.row-fill": "this._rowFill", "class.form-group": "this._isFormGroup", "class.row": "this.isHorizontal", "class.has-feedback": "this.hasFeedback" } }, queries: [{ propertyName: "contentTemplateRef", first: true, predicate: ["formGroup"], descendants: true }, { propertyName: "contentTemplate", first: true, predicate: ["content"], descendants: true }], ngImport: i0, template: "@if (contentTemplate || contentTemplateRef) {\n  <ng-container [ngTemplateOutlet]=\"contentTemplate || contentTemplateRef\"></ng-container>\n  @if (feedbackSvgIconName) {\n    <thy-icon class=\"form-control-feedback\" [thyIconName]=\"feedbackSvgIconName\"></thy-icon>\n  } @else {\n    @if (feedbackIcon) {\n      <span class=\"form-control-feedback {{ feedbackIcon }}\"></span>\n    }\n  }\n} @else {\n  @if (!(!isHorizontal && !labelText)) {\n    <label\n      class=\"form-label \"\n    [ngClass]=\"{\n      'col-sm-2 col-form-label': isHorizontal,\n      'pt-0': labelPaddingTopClear\n    }\"\n      >\n      <span\n      [ngClass]=\"{\n        'label-required': labelRequired\n      }\"\n        >{{ labelText }}</span\n        >\n        @if (tipMode === 'label' && tips) {\n          <thy-icon class=\"label-tips-icon\" thyIconName=\"question-circle\" [thyTooltip]=\"tips\"></thy-icon>\n        }\n      </label>\n    }\n    <div [ngClass]=\"{ 'col-sm-10 col-form-control': isHorizontal, 'position-relative': !isHorizontal }\">\n      <ng-content></ng-content>\n      @if (feedbackSvgIconName) {\n        <thy-icon class=\"form-control-feedback\" [thyIconName]=\"feedbackSvgIconName\"></thy-icon>\n      } @else {\n        @if (feedbackIcon) {\n          <span class=\"form-control-feedback {{ feedbackIcon }}\"></span>\n        }\n      }\n      @if (tipMode === 'default' && tips) {\n        <span class=\"form-text text-desc\">{{ tips }}</span>\n      }\n    </div>\n  }\n\n", dependencies: [{ kind: "directive", type: NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "component", type: ThyIcon, selector: "thy-icon, [thy-icon]", inputs: ["thyIconType", "thyTwotoneColor", "thyIconName", "thyIconRotate", "thyIconSet", "thyIconLegging", "thyIconLinearGradient"] }, { kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: ThyTooltipDirective, selector: "[thyTooltip],[thy-tooltip]", inputs: ["thyTooltip", "thyTooltipPlacement", "thyTooltipClass", "thyTooltipShowDelay", "thyTooltipHideDelay", "thyTooltipTrigger", "thyTooltipDisabled", "thyTooltipTemplateContext", "thyTooltipOffset", "thyTooltipPin"], exportAs: ["thyTooltip"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroup, decorators: [{
             type: Component,
             args: [{ selector: 'thy-form-group', encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [NgTemplateOutlet, ThyIcon, NgClass, ThyTooltipDirective], template: "@if (contentTemplate || contentTemplateRef) {\n  <ng-container [ngTemplateOutlet]=\"contentTemplate || contentTemplateRef\"></ng-container>\n  @if (feedbackSvgIconName) {\n    <thy-icon class=\"form-control-feedback\" [thyIconName]=\"feedbackSvgIconName\"></thy-icon>\n  } @else {\n    @if (feedbackIcon) {\n      <span class=\"form-control-feedback {{ feedbackIcon }}\"></span>\n    }\n  }\n} @else {\n  @if (!(!isHorizontal && !labelText)) {\n    <label\n      class=\"form-label \"\n    [ngClass]=\"{\n      'col-sm-2 col-form-label': isHorizontal,\n      'pt-0': labelPaddingTopClear\n    }\"\n      >\n      <span\n      [ngClass]=\"{\n        'label-required': labelRequired\n      }\"\n        >{{ labelText }}</span\n        >\n        @if (tipMode === 'label' && tips) {\n          <thy-icon class=\"label-tips-icon\" thyIconName=\"question-circle\" [thyTooltip]=\"tips\"></thy-icon>\n        }\n      </label>\n    }\n    <div [ngClass]=\"{ 'col-sm-10 col-form-control': isHorizontal, 'position-relative': !isHorizontal }\">\n      <ng-content></ng-content>\n      @if (feedbackSvgIconName) {\n        <thy-icon class=\"form-control-feedback\" [thyIconName]=\"feedbackSvgIconName\"></thy-icon>\n      } @else {\n        @if (feedbackIcon) {\n          <span class=\"form-control-feedback {{ feedbackIcon }}\"></span>\n        }\n      }\n      @if (tipMode === 'default' && tips) {\n        <span class=\"form-text text-desc\">{{ tips }}</span>\n      }\n    </div>\n  }\n\n" }]
-        }], ctorParameters: () => [{ type: ThyFormDirective, decorators: [{
-                    type: Optional
-                }] }, { type: i1$1.ThyTranslate }], propDecorators: { _rowFill: [{
+        }], propDecorators: { _rowFill: [{
                 type: HostBinding,
                 args: ['class.row-fill']
             }], _isFormGroup: [{
@@ -786,8 +778,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
  * @order 15
  */
 class ThyFormSubmitDirective {
-    constructor(thyFormDirective) {
-        this.thyFormDirective = thyFormDirective;
+    constructor() {
+        this.thyFormDirective = inject(ThyFormDirective);
         /**
          * Form 验证通过的提交函数
          */
@@ -801,7 +793,7 @@ class ThyFormSubmitDirective {
     onSubmit($event) {
         this.thyFormDirective.submit($event);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormSubmitDirective, deps: [{ token: ThyFormDirective }], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormSubmitDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.0", type: ThyFormSubmitDirective, isStandalone: true, selector: "[thyFormSubmit],[thy-form-submit]", outputs: { thyFormSubmit: "thyFormSubmit" }, host: { listeners: { "click": "onSubmit($event)" } }, ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormSubmitDirective, decorators: [{
@@ -810,7 +802,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
                     selector: '[thyFormSubmit],[thy-form-submit]',
                     standalone: true
                 }]
-        }], ctorParameters: () => [{ type: ThyFormDirective }], propDecorators: { thyFormSubmit: [{
+        }], propDecorators: { thyFormSubmit: [{
                 type: Output
             }], onSubmit: [{
                 type: HostListener,
@@ -823,16 +815,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
  * @order 55
  */
 class ThyFormGroupFooter {
-    get align() {
-        return !!this.thyAlign ? this.thyAlign : this.defaultConfig.footerAlign;
-    }
-    constructor(thyParentForm, defaultConfig) {
-        this.thyParentForm = thyParentForm;
-        this.defaultConfig = defaultConfig;
+    constructor() {
+        this.thyParentForm = inject(ThyFormDirective, { optional: true });
+        this.defaultConfig = inject(THY_FORM_CONFIG);
         this._isFormGroup = true;
         this.isHorizontal = true;
         this.footerClassMap = {};
     }
+    get align() {
+        return !!this.thyAlign ? this.thyAlign : this.defaultConfig.footerAlign;
+    }
     ngOnInit() {
         if (this.thyParentForm) {
             this.isHorizontal = this.thyParentForm.isHorizontal;
@@ -846,18 +838,13 @@ class ThyFormGroupFooter {
             [`form-group-footer-align-${this.align}`]: true
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupFooter, deps: [{ token: ThyFormDirective, optional: true }, { token: THY_FORM_CONFIG }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupFooter, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.0", type: ThyFormGroupFooter, isStandalone: true, selector: "thy-form-group-footer", inputs: { thyAlign: "thyAlign" }, host: { properties: { "class.form-group": "this._isFormGroup", "class.row": "this.isHorizontal" } }, queries: [{ propertyName: "description", first: true, predicate: ["description"], descendants: true }], ngImport: i0, template: "<div [ngClass]=\"footerClassMap\">\n  <div class=\"btn-pair form-footer-actions\">\n    <ng-content></ng-content>\n  </div>\n\n  @if (description) {\n    <div class=\"form-footer-description\">\n      <ng-container [ngTemplateOutlet]=\"description\"></ng-container>\n    </div>\n  }\n</div>\n", dependencies: [{ kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }], encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyFormGroupFooter, decorators: [{
             type: Component,
             args: [{ selector: 'thy-form-group-footer', encapsulation: ViewEncapsulation.None, standalone: true, imports: [NgClass, NgTemplateOutlet], template: "<div [ngClass]=\"footerClassMap\">\n  <div class=\"btn-pair form-footer-actions\">\n    <ng-content></ng-content>\n  </div>\n\n  @if (description) {\n    <div class=\"form-footer-description\">\n      <ng-container [ngTemplateOutlet]=\"description\"></ng-container>\n    </div>\n  }\n</div>\n" }]
-        }], ctorParameters: () => [{ type: ThyFormDirective, decorators: [{
-                    type: Optional
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: [THY_FORM_CONFIG]
-                }] }], propDecorators: { _isFormGroup: [{
+        }], propDecorators: { _isFormGroup: [{
                 type: HostBinding,
                 args: ['class.form-group']
             }], isHorizontal: [{
@@ -876,9 +863,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
  * @order 20
  */
 class ThyUniqueCheckValidator {
-    constructor(elementRef, thyForm) {
-        this.elementRef = elementRef;
-        this.thyForm = thyForm;
+    constructor() {
+        this.elementRef = inject(ElementRef);
+        this.thyForm = inject(ThyFormDirective, { optional: true });
     }
     validate(ctrl) {
         return this.thyUniqueCheck(ctrl.value).pipe(map((failed) => {
@@ -890,7 +877,7 @@ class ThyUniqueCheckValidator {
             return failed ? { thyUniqueCheck: failed } : null;
         }), catchError(() => of(null)));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyUniqueCheckValidator, deps: [{ token: i0.ElementRef }, { token: ThyFormDirective, optional: true }], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: ThyUniqueCheckValidator, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.0", type: ThyUniqueCheckValidator, isStandalone: true, selector: "[thyUniqueCheck]", inputs: { thyUniqueCheck: "thyUniqueCheck" }, providers: [
             {
                 provide: NG_ASYNC_VALIDATORS,
@@ -912,9 +899,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
                     ],
                     standalone: true
                 }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: ThyFormDirective, decorators: [{
-                    type: Optional
-                }] }], propDecorators: { thyUniqueCheck: [{
+        }], propDecorators: { thyUniqueCheck: [{
                 type: Input
             }] } });