From fcee0382ee68170e7708346723b37f427e223397 Mon Sep 17 00:00:00 2001
From: ZHAO Jinxiang <xiaoxiangmoe@gmail.com>
Date: Wed, 18 May 2022 17:20:55 +0800
Subject: [PATCH] feat(types): fix props JSDoc loss (#935)

* feat(types): simplify `ExtractPropTypes` to avoid props JSDocs being removed

* feat(types): avoid props JSDocs loss due to `default` option
---
 src/component/componentProps.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/component/componentProps.ts b/src/component/componentProps.ts
index f66af446..7abf0d4b 100644
--- a/src/component/componentProps.ts
+++ b/src/component/componentProps.ts
@@ -69,11 +69,13 @@ type InferPropType<T> = T extends null
                     : ExtractCorrectPropType<V>
                   : T
 
-export type ExtractPropTypes<O> = O extends object
-  ? { [K in RequiredKeys<O>]: InferPropType<O[K]> } & {
-      [K in OptionalKeys<O>]?: InferPropType<O[K]>
-    }
-  : { [K in string]: any }
+export type ExtractPropTypes<O> = {
+  // use `keyof Pick<O, RequiredKeys<O>>` instead of `RequiredKeys<O>` to support IDE features
+  [K in keyof Pick<O, RequiredKeys<O>>]: InferPropType<O[K]>
+} & {
+  // use `keyof Pick<O, OptionalKeys<O>>` instead of `OptionalKeys<O>` to support IDE features
+  [K in keyof Pick<O, OptionalKeys<O>>]?: InferPropType<O[K]>
+}
 
 type DefaultKeys<T> = {
   [K in keyof T]: T[K] extends
@@ -93,5 +95,6 @@ type DefaultKeys<T> = {
 
 // extract props which defined with default from prop options
 export type ExtractDefaultPropTypes<O> = O extends object
-  ? { [K in DefaultKeys<O>]: InferPropType<O[K]> }
+  ? // use `keyof Pick<O, DefaultKeys<O>>` instead of `DefaultKeys<O>` to support IDE features
+    { [K in keyof Pick<O, DefaultKeys<O>>]: InferPropType<O[K]> }
   : {}