@vitus-labs/rocketstyle 2.0.0 → 2.2.0

package/lib/index.d.ts

@@ -87,6 +87,7 @@ type ExtractProps<TComponentOrTProps> = TComponentOrTProps extends ComponentType
 interface StylesDefault {}
 type Styles<S = unknown> = StylesDefault;
 type Css = typeof config.css;
+type Style = ReturnType<Css>;
 /**
  * Props available inside `.styles()` interpolation functions.
  *
@@ -105,8 +106,12 @@ type RocketStyleInterpolationProps<CSS extends TObj = TObj> = {
  *
  * When used via `.styles()`, `CSS` is inferred from the chain's
  * accumulated `.theme()` calls, so both props are typed automatically.
+ *
+ * `Style` (= `ReturnType<typeof config.css>`) is included so that nested
+ * css results — e.g. `${styles({ ... })}` from unistyle — interpolate
+ * cleanly without casts.
  */
-type RocketCss<CSS extends TObj = TObj> = (strings: TemplateStringsArray, ...values: Array<string | number | boolean | null | undefined | ((props: RocketStyleInterpolationProps<CSS>) => any) | any[]>) => any;
+type RocketCss<CSS extends TObj = TObj> = (strings: TemplateStringsArray, ...values: Array<string | number | boolean | null | undefined | Style | ((props: RocketStyleInterpolationProps<CSS>) => any) | any[]>) => any;
 type StylesCb<CSS extends TObj = TObj> = (css: RocketCss<CSS>) => ReturnType<Css>;
 type StylesCbArray = StylesCb[];
 //#endregion

package/lib/index.js

@@ -530,23 +530,38 @@ const isShallowEqualRocketstate = (a, b) => {
 	}
 	return true;
 };
-/** Clones the current configuration and merges new options, returning a fresh rocketComponent. */
-const cloneAndEnhance = (defaultOpts, opts) => rocketComponent({
-	...defaultOpts,
-	attrs: chainOptions(opts.attrs, defaultOpts.attrs),
-	filterAttrs: [...defaultOpts.filterAttrs ?? [], ...opts.filterAttrs ?? []],
-	priorityAttrs: chainOptions(opts.priorityAttrs, defaultOpts.priorityAttrs),
-	statics: {
-		...defaultOpts.statics,
-		...opts.statics
-	},
-	compose: {
-		...defaultOpts.compose,
-		...opts.compose
-	},
-	...chainOrOptions(CONFIG_KEYS, opts, defaultOpts),
-	...chainReservedKeyOptions([...defaultOpts.dimensionKeys, ...STYLING_KEYS], opts, defaultOpts)
-});
+/**
+* Clones the current configuration and merges new options, returning a fresh
+* rocketComponent.
+*
+* Component-swap reset: when `opts.component` is set AND differs from the
+* current `defaultOpts.component`, the prior `attrs`, `priorityAttrs`, and
+* `compose` chains are dropped — they were tailored to the previous
+* component's prop shape, and applying them to a different component
+* silently leaks invalid props through to the DOM (e.g. `disabled` on an
+* `<a>`). Callers who want to preserve them must re-chain explicitly:
+*
+*   const NewBtn = Button.config({ component: 'a' }).attrs(sharedAttrs)
+*/
+const cloneAndEnhance = (defaultOpts, opts) => {
+	const componentChanged = opts.component != null && opts.component !== defaultOpts.component;
+	return rocketComponent({
+		...defaultOpts,
+		attrs: componentChanged ? chainOptions(opts.attrs, []) : chainOptions(opts.attrs, defaultOpts.attrs),
+		filterAttrs: componentChanged ? [...opts.filterAttrs ?? []] : [...defaultOpts.filterAttrs ?? [], ...opts.filterAttrs ?? []],
+		priorityAttrs: componentChanged ? chainOptions(opts.priorityAttrs, []) : chainOptions(opts.priorityAttrs, defaultOpts.priorityAttrs),
+		statics: {
+			...defaultOpts.statics,
+			...opts.statics
+		},
+		compose: componentChanged ? { ...opts.compose } : {
+			...defaultOpts.compose,
+			...opts.compose
+		},
+		...chainOrOptions(CONFIG_KEYS, opts, defaultOpts),
+		...chainReservedKeyOptions([...defaultOpts.dimensionKeys, ...STYLING_KEYS], opts, defaultOpts)
+	});
+};
 /**
 * Builds the final renderable React component with theme resolution,
 * dimension mapping, pseudo-state context, HOC composition, and
@@ -707,8 +722,8 @@ const rocketComponent = (options) => {
 			{
 				render,
 				mode,
-				isDark: mode === "light",
-				isLight: mode === "dark"
+				isDark: mode === "dark",
+				isLight: mode === "light"
 			}
 		])
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitus-labs/rocketstyle",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.cz>",
   "maintainers": [
@@ -61,19 +61,18 @@
     "test:coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "cover": "coveralls < .coverage/lcov.info",
-    "typecheck": "tsc --noEmit",
-    "version": "node ../../scripts/sync-peer-deps.mjs"
+    "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@vitus-labs/core": "2.0.0",
+    "@vitus-labs/core": "workspace:^",
     "react": ">= 19"
   },
   "devDependencies": {
     "@vitus-labs/core": "workspace:*",
     "@vitus-labs/elements": "workspace:*",
-    "@vitus-labs/tools-rolldown": "2.2.0",
-    "@vitus-labs/tools-storybook": "2.2.0",
-    "@vitus-labs/tools-typescript": "2.1.0",
+    "@vitus-labs/tools-rolldown": "2.3.0",
+    "@vitus-labs/tools-storybook": "2.3.0",
+    "@vitus-labs/tools-typescript": "2.3.0",
     "@vitus-labs/unistyle": "workspace:*"
   }
 }