fix: delete ids from removed path states

Author: logaretm

packages/vee-validate/src/types/forms.ts

@@ -249,7 +249,7 @@ export interface PrivateFormContext<TValues extends GenericObject = GenericObjec
   ): PathState<PathValue<TValues, TPath>>;
   getPathState<TPath extends Path<TValues>>(path: TPath): PathState<PathValue<TValues, TPath>> | undefined;
   getAllPathStates(): PathState[];
-  removePathState<TPath extends Path<TValues>>(path: TPath): void;
+  removePathState<TPath extends Path<TValues>>(path: TPath, id: number): void;
   unsetPathValue<TPath extends Path<TValues>>(path: TPath): void;
   markForUnmount(path: string): void;
 }

packages/vee-validate/src/useField.ts

@@ -407,7 +407,7 @@ function _useField<TValue = unknown>(
     const shouldKeepValue = unref(field.keepValueOnUnmount) ?? unref(form.keepValuesOnUnmount);
     const path = unravel(name);
     if (shouldKeepValue || !form || flags.pendingUnmount[field.id]) {
-      form?.removePathState(path);
+      form?.removePathState(path, id);
 
       return;
     }
@@ -437,7 +437,7 @@ function _useField<TValue = unknown>(
       form.unsetPathValue(path);
     }
 
-    form.removePathState(path);
+    form.removePathState(path, id);
   });
 
   return field;

packages/vee-validate/src/useForm.ts

@@ -456,7 +456,7 @@ export function useForm<
   const handleSubmit: typeof handleSubmitImpl & { withControlled: typeof handleSubmitImpl } = handleSubmitImpl as any;
   handleSubmit.withControlled = makeSubmissionFactory(true);
 
-  function removePathState<TPath extends Path<TValues>>(path: TPath) {
+  function removePathState<TPath extends Path<TValues>>(path: TPath, id: number) {
     const idx = pathStates.value.findIndex(s => s.path === path);
     const pathState = pathStates.value[idx];
     if (idx === -1 || !pathState) {
@@ -467,6 +467,15 @@ export function useForm<
       pathState.fieldsCount--;
     }
 
+    if (Array.isArray(pathState.id)) {
+      const idIndex = pathState.id.indexOf(id);
+      if (idIndex >= 0) {
+        pathState.id.splice(idIndex, 1);
+      }
+
+      delete pathState.__flags.pendingUnmount[id];
+    }
+
     if (!pathState.multiple || pathState.fieldsCount <= 0) {
       pathStates.value.splice(idx, 1);
       unsetInitialValue(path);