From: Pick <chenyi.c137@bytedance.com>
Date: Wed, 28 Jul 2021 15:15:08 +0000 (+0800)
Subject: types(reactivity): simplify UnwrapNestedRefs (#4194)
X-Git-Tag: v3.2.0-beta.7~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da6c055b19decdcfabb149c407fddd5846eefb43;p=thirdparty%2Fvuejs%2Fcore.git

types(reactivity): simplify UnwrapNestedRefs (#4194)
---

diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts
index 148a583c06..2bcce11e71 100644
--- a/packages/reactivity/src/reactive.ts
+++ b/packages/reactivity/src/reactive.ts
@@ -11,7 +11,7 @@ import {
   shallowCollectionHandlers,
   shallowReadonlyCollectionHandlers
 } from './collectionHandlers'
-import { UnwrapRef, Ref } from './ref'
+import { UnwrapRefSimple, Ref } from './ref'
 
 export const enum ReactiveFlags {
   SKIP = '__v_skip',
@@ -60,7 +60,7 @@ function getTargetType(value: Target) {
 }
 
 // only unwrap nested ref
-export type UnwrapNestedRefs<T> = T extends Ref ? T : UnwrapRef<T>
+export type UnwrapNestedRefs<T> = T extends Ref ? T : UnwrapRefSimple<T>
 
 /**
  * Creates a reactive copy of the original object.
diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
index 9bdf76b4e5..fc2db5f8cd 100644
--- a/packages/reactivity/src/ref.ts
+++ b/packages/reactivity/src/ref.ts
@@ -264,7 +264,7 @@ export type UnwrapRef<T> = T extends Ref<infer V>
   ? UnwrapRefSimple<V>
   : UnwrapRefSimple<T>
 
-type UnwrapRefSimple<T> = T extends
+export type UnwrapRefSimple<T> = T extends
   | Function
   | CollectionTypes
   | BaseTypes