test: use scope dispose more

formwerkjs · Aug 29, 2024 · 9ef223b · 9ef223b
1 parent 2fa78f6
commit 9ef223b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/packages/core/src/helpers/useButtonHold/useButtonHold.ts b/packages/core/src/helpers/useButtonHold/useButtonHold.ts
@@ -1,4 +1,5 @@
-import { MaybeRefOrGetter, onBeforeUnmount, toValue } from 'vue';
+import { MaybeRefOrGetter, toValue } from 'vue';
+import { tryOnScopeDispose } from '../../utils/common';
 
 export interface ButtonHoldOptions {
   onHoldTick: () => void;
@@ -55,7 +56,7 @@ export function useButtonHold(opts: ButtonHoldOptions) {
     onMousedown,
   };
 
-  onBeforeUnmount(() => {
+  tryOnScopeDispose(() => {
     document.removeEventListener('mouseup', onMouseup);
     clearAll();
   });

diff --git a/packages/core/src/useFormField/useFormField.ts b/packages/core/src/useFormField/useFormField.ts
@@ -1,19 +1,8 @@
-import {
-  computed,
-  inject,
-  MaybeRefOrGetter,
-  nextTick,
-  onBeforeUnmount,
-  readonly,
-  Ref,
-  shallowRef,
-  toValue,
-  watch,
-} from 'vue';
+import { computed, inject, MaybeRefOrGetter, nextTick, readonly, Ref, shallowRef, toValue, watch } from 'vue';
 import { FormContext, FormKey } from '../useForm/useForm';
 import { Arrayable, Getter, TypedSchema, ValidationResult } from '../types';
 import { useSyncModel } from '../reactivity/useModelSync';
-import { cloneDeep, isEqual, normalizeArrayable } from '../utils/common';
+import { cloneDeep, isEqual, normalizeArrayable, tryOnScopeDispose } from '../utils/common';
 import { FormGroupKey } from '../useFormGroup';
 
 interface FormFieldOptions<TValue = unknown> {
@@ -130,7 +119,7 @@ export function useFormField<TValue = unknown>(opts?: Partial<FormFieldOptions<T
     setTouched(true);
   });
 
-  onBeforeUnmount(() => {
+  tryOnScopeDispose(() => {
     const path = getPath();
     if (!path) {
       return null;

diff --git a/packages/core/src/utils/events.ts b/packages/core/src/utils/events.ts
@@ -1,5 +1,5 @@
 import { ComponentInternalInstance, nextTick, onBeforeUnmount } from 'vue';
-import { isSSR, useUniqId } from './common';
+import { isSSR, tryOnScopeDispose, useUniqId } from './common';
 import { NOOP } from '../constants';
 
 export function createEventDispatcher<TPayload>(eventName?: string) {
@@ -32,7 +32,7 @@ export function createEventDispatcher<TPayload>(eventName?: string) {
     return removeListener;
   }
 
-  onBeforeUnmount(() => {
+  tryOnScopeDispose(() => {
     controller.abort();
   });