From d318382d70de3537b1c05fa8a1333c7e44be683b Mon Sep 17 00:00:00 2001
From: arvinxx <arvinx@foxmail.com>
Date: Tue, 10 Jan 2023 13:55:50 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20fix:=20=E4=BF=AE=E6=AD=A3=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AE=9A=E4=B9=89=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/functions/createStyish.ts | 10 ++++++++--
 src/functions/createStyles.ts |  9 +++++----
 src/types/genericUtils.ts     | 10 ++++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/functions/createStyish.ts b/src/functions/createStyish.ts
index 693d9080..d988d9d5 100644
--- a/src/functions/createStyish.ts
+++ b/src/functions/createStyish.ts
@@ -4,12 +4,18 @@ import { createStyles, StyleOrGetStyleFn } from './createStyles';
 /**
  * 业务应用中创建复合通用样式的进阶
  */
-export function createStylish<Props, Obj>(cssStyleOrGetCssStyleFn: StyleOrGetStyleFn<Props, Obj>) {
+export function createStylish<Props, Styles>(
+  cssStyleOrGetCssStyleFn: StyleOrGetStyleFn<Props, Styles>,
+) {
+  // FIXME :类型定义
+  // @ts-ignore
   const useStyles = createStyles(cssStyleOrGetCssStyleFn);
 
-  return (props?: Props): ReturnStyleToUse<Obj> => {
+  return (props?: Props): ReturnStyleToUse<Styles> => {
     const { styles } = useStyles(props);
 
+    // FIXME :类型定义
+    // @ts-ignore
     return styles;
   };
 }
diff --git a/src/functions/createStyles.ts b/src/functions/createStyles.ts
index f3b23356..2f73e7ac 100644
--- a/src/functions/createStyles.ts
+++ b/src/functions/createStyles.ts
@@ -29,17 +29,18 @@ export type StyleOrGetStyleFn<Input, P> = StyleDefinition<Input> | GetStyleFn<In
 // 获取样式
 export type GetStyleFn<Input, P> = (theme: CreateStylesTheme, props?: P) => StyleDefinition<Input>;
 
-export type UseStyleS<Input, P> = (props?: P) => ReturnStyles<Input>;
+export type UseStyleHook<Input, P> = (props?: P) => ReturnStyles<Input>;
 
 interface CreateStylesFn {
-  <Props, Input>(style: StyleDefinition<Input>): UseStyleS<Input, Props>;
-  <Props, Input>(getCssStyleFn: GetStyleFn<Input, Props>): UseStyleS<Input, Props>;
+  <Props, Input>(style: StyleDefinition<Input>): UseStyleHook<Input, Props>;
+  <Props, Input>(getCssStyleFn: GetStyleFn<Input, Props>): UseStyleHook<Input, Props>;
 }
+
 /**
  * 业务应用中创建样式基础写法
  */
 export const createStyles: CreateStylesFn =
-  <Input, P>(styleOrGetStyleFn: StyleOrGetStyleFn<Input, P>) =>
+  <P, Input>(styleOrGetStyleFn: StyleOrGetStyleFn<Input, P>) =>
   (props?: P): ReturnStyles<Input> => {
     const theme = useTheme();
 
diff --git a/src/types/genericUtils.ts b/src/types/genericUtils.ts
index 05710c9e..13b162d3 100644
--- a/src/types/genericUtils.ts
+++ b/src/types/genericUtils.ts
@@ -6,11 +6,17 @@ import { CSSObject } from '@emotion/css';
  */
 export type StyleDefinition<StyleObj> = StyleObj extends string
   ? string
-  : Record<keyof StyleObj, CSSObject | string>;
+  : {
+      [Key in keyof StyleObj]: CSSObject | string;
+    };
 
 /**
  * 根据用户返回的样式对象，返回一个可以给用户使用的
  * 譬如用户输入为 { a: css`color: red;`, b: { color: 'red' }
  * 输出的类型泛型为 { a:string; b:string }
  */
-export type ReturnStyleToUse<T> = T extends Record<infer R, any> ? Record<R, string> : string;
+export type ReturnStyleToUse<T> = T extends string
+  ? string
+  : {
+      [Key in keyof T]: string;
+    };