From 66793878e317f32f4759b3d01e27e3b9072eff67 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <logaretm1@gmail.com>
Date: Wed, 2 Jun 2021 23:31:18 +0200
Subject: [PATCH] fix: respect the Field bails option closes #3332

---
 packages/vee-validate/src/types.ts       |  1 +
 packages/vee-validate/src/useField.ts    | 13 ++-------
 packages/vee-validate/src/useForm.ts     | 16 +++++++++-
 packages/vee-validate/src/validate.ts    |  4 +--
 packages/vee-validate/tests/Form.spec.ts | 37 ++++++++++++++++++++++++
 5 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/packages/vee-validate/src/types.ts b/packages/vee-validate/src/types.ts
index 612a9a3e3..b65a4294d 100644
--- a/packages/vee-validate/src/types.ts
+++ b/packages/vee-validate/src/types.ts
@@ -48,6 +48,7 @@ export interface PrivateFieldComposite<TValue = unknown> {
   errorMessage: ComputedRef<string | undefined>;
   label?: MaybeRef<string | undefined>;
   type?: string;
+  bails?: boolean;
   checkedValue?: MaybeRef<TValue>;
   uncheckedValue?: MaybeRef<TValue>;
   checked?: ComputedRef<boolean>;
diff --git a/packages/vee-validate/src/useField.ts b/packages/vee-validate/src/useField.ts
index fb0efbba4..ead79c3b5 100644
--- a/packages/vee-validate/src/useField.ts
+++ b/packages/vee-validate/src/useField.ts
@@ -71,16 +71,8 @@ export function useField<TValue = unknown>(
   opts?: Partial<FieldOptions<TValue>>
 ): FieldComposable<TValue> {
   const fid = ID_COUNTER >= Number.MAX_SAFE_INTEGER ? 0 : ++ID_COUNTER;
-  const {
-    initialValue,
-    validateOnMount,
-    bails,
-    type,
-    checkedValue,
-    label,
-    validateOnValueUpdate,
-    uncheckedValue,
-  } = normalizeOptions(unref(name), opts);
+  const { initialValue, validateOnMount, bails, type, checkedValue, label, validateOnValueUpdate, uncheckedValue } =
+    normalizeOptions(unref(name), opts);
 
   const form = injectWithSelf(FormContextSymbol);
   const {
@@ -205,6 +197,7 @@ export function useField<TValue = unknown>(
     checkedValue,
     uncheckedValue,
     checked,
+    bails,
     resetField,
     handleReset: () => resetField(),
     validate: validateWithStateMutation,
diff --git a/packages/vee-validate/src/useForm.ts b/packages/vee-validate/src/useForm.ts
index aebdcbbcb..5d1b734d2 100644
--- a/packages/vee-validate/src/useForm.ts
+++ b/packages/vee-validate/src/useForm.ts
@@ -465,6 +465,17 @@ export function useForm<TValues extends Record<string, any> = Record<string, any
     }, {} as Record<string, string>);
   });
 
+  const fieldBailsMap = computed(() => {
+    return keysOf(fieldsById.value).reduce((map, path) => {
+      const field = normalizeField(fieldsById.value[path]);
+      if (field) {
+        map[path as string] = field.bails ?? true;
+      }
+
+      return map;
+    }, {} as Record<string, boolean>);
+  });
+
   async function validateSchema(mode: SchemaValidationMode): Promise<FormValidationResult<TValues>> {
     const schemaValue = unref(schema);
     if (!schemaValue) {
@@ -473,7 +484,10 @@ export function useForm<TValues extends Record<string, any> = Record<string, any
 
     const formResult = isYupValidator(schemaValue)
       ? await validateYupSchema(schemaValue, formValues)
-      : await validateObjectSchema(schemaValue as RawFormSchema<TValues>, formValues, { names: fieldNames.value });
+      : await validateObjectSchema(schemaValue as RawFormSchema<TValues>, formValues, {
+          names: fieldNames.value,
+          bailsMap: fieldBailsMap.value,
+        });
 
     // fields by id lookup
     const fieldsById = formCtx.fieldsById.value || {};
diff --git a/packages/vee-validate/src/validate.ts b/packages/vee-validate/src/validate.ts
index 1c6b3fce9..2fc234d80 100644
--- a/packages/vee-validate/src/validate.ts
+++ b/packages/vee-validate/src/validate.ts
@@ -236,14 +236,14 @@ export async function validateYupSchema<TValues>(
 export async function validateObjectSchema<TValues>(
   schema: RawFormSchema<TValues>,
   values: TValues,
-  opts?: Partial<{ names: Record<string, string>; bails: boolean }>
+  opts?: Partial<{ names: Record<string, string>; bailsMap: Record<string, boolean> }>
 ): Promise<FormValidationResult<TValues>> {
   const paths = keysOf(schema) as string[];
   const validations = paths.map(async path => {
     const fieldResult = await validate(getFromPath(values as any, path), schema[path as keyof TValues], {
       name: opts?.names?.[path] || path,
       values: values as any,
-      bails: opts?.bails ?? true,
+      bails: opts?.bailsMap?.[path] ?? true,
     });
 
     return {
diff --git a/packages/vee-validate/tests/Form.spec.ts b/packages/vee-validate/tests/Form.spec.ts
index f9bd18340..7429cdcfd 100644
--- a/packages/vee-validate/tests/Form.spec.ts
+++ b/packages/vee-validate/tests/Form.spec.ts
@@ -6,6 +6,7 @@ import { computed, onErrorCaptured, reactive, ref, Ref } from 'vue';
 
 describe('<Form />', () => {
   const REQUIRED_MESSAGE = `This field is required`;
+  const MIN_MESSAGE = `This field is short`;
   defineRule('required', (value: unknown) => {
     if (!value) {
       return REQUIRED_MESSAGE;
@@ -13,6 +14,13 @@ describe('<Form />', () => {
 
     return true;
   });
+  defineRule('min', (value: unknown, args: any[]) => {
+    if (!value || String(value).length <= args[0]) {
+      return MIN_MESSAGE;
+    }
+
+    return true;
+  });
 
   test('renders the as prop', () => {
     const wrapper = mountWithHoc({
@@ -2045,4 +2053,33 @@ describe('<Form />', () => {
       expect.anything()
     );
   });
+
+  // #3332
+  test('field bails prop should work with validation schema', async () => {
+    const wrapper = mountWithHoc({
+      setup() {
+        return {
+          schema: {
+            fname: 'required|min:3',
+          },
+        };
+      },
+      template: `
+      <VForm :validation-schema="schema">
+        <Field name="fname" :bails="false" v-slot="{ field, errors }">
+          <input type="text" v-bind="field" />
+          <div v-for="error in errors" :key="error" class="error">
+            {{ error }}
+          </div>
+        </Field>
+      </VForm>
+    `,
+    });
+
+    await flushPromises();
+    const input = wrapper.$el.querySelector('input');
+    setValue(input, '');
+    await flushPromises();
+    expect(document.querySelectorAll('.error')).toHaveLength(2);
+  });
 });