ngx-vest-forms 2.5.0 → 2.5.1

package/fesm2022/ngx-vest-forms.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, isDevMode, inject, ElementRef, DestroyRef, ChangeDetectorRef, signal, linkedSignal, computed, input, effect, untracked, Directive, contentChild, Injector, afterEveryRender, ChangeDetectionStrategy, Component, booleanAttribute, Optional } from '@angular/core';
-import { isFormArray, isFormGroup, NgForm, StatusChangeEvent, ValueChangeEvent, PristineChangeEvent, FormGroup, FormArray, NgModel, NgModelGroup, NG_ASYNC_VALIDATORS, ControlContainer, FormsModule } from '@angular/forms';
+import { isFormArray, isFormGroup, NgForm, StatusChangeEvent, ValueChangeEvent, PristineChangeEvent, FormGroup, FormArray, NgModel, NgModelGroup, FormSubmittedEvent, FormResetEvent, NG_ASYNC_VALIDATORS, ControlContainer, FormsModule } from '@angular/forms';
 import { toSignal, outputFromObservable, takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 import { startWith, merge, filter, map, switchMap, take, of, scan, distinctUntilChanged, timer, Observable, catchError, EMPTY, debounceTime, tap, race, from } from 'rxjs';
 
@@ -2178,11 +2178,6 @@ class FormErrorDisplayDirective {
     #formControlState;
     // Optionally inject NgForm for form submission tracking
     #ngForm;
-    /**
-     * Internal trigger signal that updates whenever form submit or status changes.
-     * Used to ensure reactive tracking for the formSubmitted computed signal.
-     */
-    #formEventTrigger;
     constructor() {
         this.#formControlState = inject(FormControlStateDirective);
         // Optionally inject NgForm for form submission tracking
@@ -2216,27 +2211,23 @@ class FormErrorDisplayDirective {
          * formSubmitted: true after the form is submitted (if NgForm is present)
          */
         this.updateOn = this.#formControlState.updateOn;
-        /**
-         * Internal trigger signal that updates whenever form submit or status changes.
-         * Used to ensure reactive tracking for the formSubmitted computed signal.
-         */
-        this.#formEventTrigger = this.#ngForm
-            ? toSignal(merge(this.#ngForm.ngSubmit, this.#ngForm.statusChanges ?? of()).pipe(startWith(null)), { initialValue: null })
-            : signal(null);
         /**
          * Signal that tracks NgForm.submitted state reactively.
          *
-         * Uses a trigger signal pattern for cleaner reactive tracking:
-         * - ngSubmit: fires when form is submitted (sets NgForm.submitted = true)
-         * - statusChanges: fires after resetForm() (which sets NgForm.submitted = false)
+         * Map form-level submit/reset events directly to boolean state.
          *
-         * This ensures proper sync with both submit and reset operations.
+         * This keeps programmatic `NgForm.onSubmit()` reactive in zoneless mode and
+         * avoids depending on `NgForm.submitted`, whose getter intentionally reads an
+         * internal signal with `untracked()`.
          */
-        this.formSubmitted = computed(() => {
-            // Trigger signal ensures this recomputes on submit/status changes
-            this.#formEventTrigger();
-            return this.#ngForm?.submitted ?? false;
-        }, ...(ngDevMode ? [{ debugName: "formSubmitted" }] : []));
+        this.formSubmitted = this.#ngForm
+            ? (() => {
+                const ngForm = this.#ngForm;
+                return toSignal(ngForm.form.events.pipe(filter((event) => event.source === ngForm.form &&
+                    (event instanceof FormSubmittedEvent ||
+                        event instanceof FormResetEvent)), map((event) => event instanceof FormSubmittedEvent), startWith(ngForm.submitted)), { initialValue: ngForm.submitted });
+            })()
+            : signal(false);
         /**
          * Determines if errors should be shown based on the specified display mode
          * and the control's state (touched/submitted/validated).