From ce420c4f7cdf0cfcd4d1721dd16cbaf8a10c4fd7 Mon Sep 17 00:00:00 2001
From: Doctorwu <44631608+Doctor-wu@users.noreply.github.com>
Date: Wed, 27 Dec 2023 21:47:46 +0800
Subject: [PATCH] fix: fix `tryOnMounted` in vue2 (#3658)

---
 packages/shared/tryOnBeforeMount/index.ts   | 2 +-
 packages/shared/tryOnBeforeUnmount/index.ts | 2 +-
 packages/shared/tryOnMounted/index.ts       | 4 ++--
 packages/shared/tryOnUnmounted/index.ts     | 2 +-
 packages/shared/utils/index.ts              | 6 ++----
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/shared/tryOnBeforeMount/index.ts b/packages/shared/tryOnBeforeMount/index.ts
index 8ebf22f52e2..e79dd927a46 100644
--- 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
index ad561c74d3a..5eb442aebee 100644
--- 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
index 2161c507daf..a9341305229 100644
--- 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
index ff2d1a2923c..e6a88b27900 100644
--- 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
index e3cd62f98e0..d86f4abe67e 100644
--- 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()
 }