@vitus-labs/rocketstyle 2.3.0 → 2.5.0

package/lib/index.d.ts

@@ -246,7 +246,7 @@ type RocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T extends
  * @param DKP  Dimensions key props.
  * @param DFP  Calculated final component props
  */
-interface IRocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T extends TObj = {}, CSS extends TObj = {}, S extends TObj = {}, HOC extends TObj = {}, D extends Dimensions = Dimensions, UB extends boolean = boolean, DKP extends TDKP = TDKP, DFP = (OA extends infer O ? O & MergeTypes<[EA, DefaultProps, ExtractDimensionProps<D, DKP, UB>]> : never)> {
+interface IRocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T extends TObj = {}, CSS extends TObj = {}, S extends TObj = {}, HOC extends TObj = {}, D extends Dimensions = Dimensions, UB extends boolean = boolean, DKP extends TDKP = TDKP, DFP = (OA extends infer O ? Omit<O, keyof EA & keyof O> & Partial<Pick<O, keyof EA & keyof O>> & MergeTypes<[Partial<Omit<EA, keyof O>>, DefaultProps, ExtractDimensionProps<D, DKP, UB>]> : never)> {
   (props: DFP & {
     ref?: any;
   }): ReactNode;
@@ -345,17 +345,16 @@ interface IRocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T ex
    *  }))
    *  ```
    */
-  attrs: <P extends TObj | unknown = unknown>(param: P extends TObj ? Partial<MergeTypes<[DFP, P]>> | AttrsCb<MergeTypes<[DFP, P]>, Theme<T>> : Partial<DFP> | AttrsCb<DFP, Theme<T>>, config?: Partial<{
-    /**
-     * priority props will be resolved first and overwritten by normal `attrs`
-     * callbacks and `props` afterwards
-     */
-    priority: boolean;
-    /**
-     * filter props will be omitted when passing to final component
-     */
-    filter: P extends TObj ? Partial<keyof MergeTypes<[EA, P]>>[] : Partial<keyof EA>[];
-  }>) => P extends TObj ? RocketStyleComponent<OA, MergeTypes<[EA, P]>, T, CSS, S, HOC, D, UB, DKP> : RocketStyleComponent<OA, EA, T, CSS, S, HOC, D, UB, DKP>;
+  attrs: {
+    <P extends TObj = {}>(param: AttrsCb<DFP & P, Theme<T>>, config?: Partial<{
+      priority: boolean;
+      filter: (keyof MergeTypes<[EA, P]>)[];
+    }>): RocketStyleComponent<OA, MergeTypes<[EA, P]>, T, CSS, S, HOC, D, UB, DKP>;
+    <P extends TObj = {}>(param: P & Partial<NoInfer<DFP>>, config?: Partial<{
+      priority: boolean;
+      filter: (keyof MergeTypes<[EA, P]>)[];
+    }>): RocketStyleComponent<OA, MergeTypes<[EA, P]>, T, CSS, S, HOC, D, UB, DKP>;
+  };
   /**
    * A chaining method to define default component theme
    * @param param  Can be either _object_ or a _callback_

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitus-labs/rocketstyle",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.cz>",
   "maintainers": [
@@ -64,7 +64,7 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@vitus-labs/core": "^2.3.0",
+    "@vitus-labs/core": "^2.5.0",
     "react": ">= 19"
   },
   "devDependencies": {