fix: 调整getStyle的参数style类型为CSSProperties

zhangfisher · Jun 7, 2024 · be23de6 · be23de6
1 parent 85d9d0d
commit be23de6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,11 @@
 # flexstyled
 
+## 2.1.1
+
+### Patch Changes
+
+- 776f359: 修改`getStyle`的`style`参数类型为`CSSProperties`
+
 ## 2.1.0
 
 ### Minor Changes

diff --git a/src/types.ts b/src/types.ts
@@ -21,17 +21,17 @@ export interface IStyledObject<Styles extends CSSRuleObject =  CSSRuleObject> {
     className     : string    
     vars          : CSSVars<Styles>
     computedStyles: ComputedStyles
-    getStyle      : (props?:any,style?:CSSRuleObject)=>CSSProperties
-    getProps      : (params?:{style?:CSSRuleObject,props?:any,className?:string})=>StyledResult;
+    getStyle      : (props?:any,style?:CSSProperties)=>CSSProperties
+    getProps      : (params?:{style?:CSSProperties,props?:any,className?:string})=>StyledResult;
 
 }
 
 export type StyledObject<Styles extends CSSRuleObject =  CSSRuleObject >= IStyledObject<Styles>
 
 // 传递给组件时，不需要额外传递props，并且getStyle的签名也需要做相应调整
 export type ComponentStyledObject = Omit<StyledObject,'props' | 'getStyle'> & {
-    getStyle : (props?:any,style?:CSSRuleObject)=>CSSProperties
-    getProps :(params?:{style?:CSSRuleObject,className?:string})=>StyledResult
+    getStyle : (props?:any,style?:CSSProperties)=>CSSProperties
+    getProps :(params?:{style?:CSSProperties,className?:string})=>StyledResult
 }