fix: fix tryOnMounted in vue2 (#3658)

vueuse · Dec 27, 2023 · ce420c4 · ce420c4
1 parent dd82044
commit ce420c4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/packages/shared/tryOnBeforeMount/index.ts b/packages/shared/tryOnBeforeMount/index.ts
@@ -11,7 +11,7 @@ import { type Fn, getLifeCycleTarget } from '../utils'
 export function tryOnBeforeMount(fn: Fn, sync = true, target?: any) {
   const instance = getLifeCycleTarget(target)
   if (instance)
-    onBeforeMount(fn, instance)
+    onBeforeMount(fn, target)
   else if (sync)
     fn()
   else

diff --git a/packages/shared/tryOnBeforeUnmount/index.ts b/packages/shared/tryOnBeforeUnmount/index.ts
@@ -10,5 +10,5 @@ import { type Fn, getLifeCycleTarget } from '../utils'
 export function tryOnBeforeUnmount(fn: Fn, target?: any) {
   const instance = getLifeCycleTarget(target)
   if (instance)
-    onBeforeUnmount(fn, instance)
+    onBeforeUnmount(fn, target)
 }
diff --git a/packages/shared/tryOnMounted/index.ts b/packages/shared/tryOnMounted/index.ts
@@ -10,9 +10,9 @@ import { type Fn, getLifeCycleTarget } from '../utils'
  * @param target
  */
 export function tryOnMounted(fn: Fn, sync = true, target?: any) {
-  const instance = getLifeCycleTarget(target)
+  const instance = getLifeCycleTarget()
   if (instance)
-    onMounted(fn, instance)
+    onMounted(fn, target)
   else if (sync)
     fn()
   else

diff --git a/packages/shared/tryOnUnmounted/index.ts b/packages/shared/tryOnUnmounted/index.ts
@@ -11,5 +11,5 @@ import { type Fn, getLifeCycleTarget } from '../utils'
 export function tryOnUnmounted(fn: Fn, target?: any) {
   const instance = getLifeCycleTarget(target)
   if (instance)
-    onUnmounted(fn, instance)
+    onUnmounted(fn, target)
 }
diff --git a/packages/shared/utils/index.ts b/packages/shared/utils/index.ts
@@ -1,4 +1,4 @@
-import { getCurrentInstance, isVue3 } from 'vue-demi'
+import { getCurrentInstance } from 'vue-demi'
 
 export * from './is'
 export * from './filters'
@@ -117,7 +117,5 @@ export function objectEntries<T extends object>(obj: T) {
 }
 
 export function getLifeCycleTarget(target?: any) {
-  const instance = target || getCurrentInstance()
-
-  return isVue3 ? instance : instance?.proxy
+  return target || getCurrentInstance()
 }