fix: use the custom injection fn for initial field values

logaretm · Nov 28, 2020 · 38cd32b · 38cd32b
1 parent 39cc4fc
commit 38cd32b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/packages/vee-validate/src/useField.ts b/packages/vee-validate/src/useField.ts
@@ -7,11 +7,8 @@ import {
   computed,
   onMounted,
   watchEffect,
-  inject,
   onBeforeUnmount,
-  getCurrentInstance,
   unref,
-  InjectionKey,
   WatchStopHandle,
 } from 'vue';
 import { validate as validateValue } from './validate';
@@ -24,6 +21,7 @@ import {
   getFromPath,
   setInPath,
   keysOf,
+  injectWithSelf,
 } from './utils';
 import { isCallable } from '../../shared';
 import { FormInitialValues, FormSymbol } from './symbols';
@@ -272,7 +270,7 @@ function useValidationState({
   valueProp: any;
 }) {
   const errors: Ref<string[]> = ref([]);
-  const formInitialValues = inject(FormInitialValues, undefined);
+  const formInitialValues = injectWithSelf(FormInitialValues, undefined);
   const initialValue = getFromPath(unref(formInitialValues), unref(name)) ?? initValue;
   const { resetMeta, meta } = useMeta(initialValue);
   const value = useFieldValue(initialValue, name, form);
@@ -407,11 +405,3 @@ function useFieldValue(initialValue: any, path: MaybeReactive<string>, form?: Fo
 
   return value;
 }
-
-// Uses same component provide as its own injections
-// Due to changes in https://github.com/vuejs/vue-next/pull/2424
-function injectWithSelf<T>(symbol: InjectionKey<T>, def: T | undefined = undefined): T | undefined {
-  const vm = getCurrentInstance() as any;
-
-  return inject(symbol, vm?.provides[symbol as any] || def);
-}
diff --git a/packages/vee-validate/src/utils/common.ts b/packages/vee-validate/src/utils/common.ts
@@ -1,3 +1,4 @@
+import { getCurrentInstance, inject, InjectionKey } from 'vue';
 import { isEmptyContainer, isIndex, isNotNestedPath } from './assertions';
 
 function cleanupNonNestedPath(path: string) {
@@ -119,3 +120,11 @@ export function unsetPath(object: Record<string, any>, path: string): void {
 export function keysOf<TRecord extends Record<string, any>>(record: TRecord): (keyof TRecord)[] {
   return Object.keys(record);
 }
+
+// Uses same component provide as its own injections
+// Due to changes in https://github.com/vuejs/vue-next/pull/2424
+export function injectWithSelf<T>(symbol: InjectionKey<T>, def: T | undefined = undefined): T | undefined {
+  const vm = getCurrentInstance() as any;
+
+  return inject(symbol, vm?.provides[symbol as any] || def);
+}