@pyreon/rocketstyle 0.11.4 → 0.11.5

package/lib/index.js

@@ -296,22 +296,24 @@ const rocketStyleHOC = ({ inversed, attrs, priorityAttrs }) => {
 	const Enhanced = (WrappedComponent) => {
 		const HOCComponent = (props) => {
 			const themeAttrs = useThemeAttrs({ inversed });
-			const callbackParams = [themeAttrs.theme, {
-				render,
-				mode: themeAttrs.mode,
-				isDark: themeAttrs.isDark,
-				isLight: themeAttrs.isLight
-			}];
 			const filteredProps = removeUndefinedProps(props);
-			const prioritizedAttrs = calculatePriorityAttrs([filteredProps, ...callbackParams]);
-			const finalAttrs = calculateAttrs([{
-				...prioritizedAttrs,
-				...filteredProps
-			}, ...callbackParams]);
-			return WrappedComponent({
-				...prioritizedAttrs,
-				...finalAttrs,
-				...filteredProps
+			return (() => {
+				const callbackParams = [themeAttrs.theme, {
+					render,
+					mode: themeAttrs.mode,
+					isDark: themeAttrs.isDark,
+					isLight: themeAttrs.isLight
+				}];
+				const prioritizedAttrs = calculatePriorityAttrs([filteredProps, ...callbackParams]);
+				const finalAttrs = calculateAttrs([{
+					...prioritizedAttrs,
+					...filteredProps
+				}, ...callbackParams]);
+				return WrappedComponent({
+					...prioritizedAttrs,
+					...finalAttrs,
+					...filteredProps
+				});
 			});
 		};
 		return HOCComponent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/rocketstyle",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/pyreon/pyreon",
@@ -44,13 +44,13 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@pyreon/core": "^0.11.4",
-    "@pyreon/reactivity": "^0.11.4",
-    "@pyreon/ui-core": "^0.11.4",
-    "@pyreon/styler": "^0.11.4"
+    "@pyreon/core": "^0.11.5",
+    "@pyreon/reactivity": "^0.11.5",
+    "@pyreon/ui-core": "^0.11.5",
+    "@pyreon/styler": "^0.11.5"
   },
   "devDependencies": {
     "@vitus-labs/tools-rolldown": "^1.15.3",
-    "@pyreon/typescript": "^0.11.4"
+    "@pyreon/typescript": "^0.11.5"
   }
 }

package/src/hoc/rocketstyleAttrsHoc.ts

@@ -32,31 +32,37 @@ const rocketStyleHOC: RocketStyleHOC = ({ inversed, attrs, priorityAttrs }) => {
       // Keep the object reference so properties re-evaluate lazily.
       const themeAttrs = useTheme({ inversed })
 
-      const callbackParams = [
-        themeAttrs.theme,
-        { render, mode: themeAttrs.mode, isDark: themeAttrs.isDark, isLight: themeAttrs.isLight },
-      ]
-
       // Remove undefined props not to override potential default props
       const filteredProps = removeUndefinedProps(props)
 
-      const prioritizedAttrs = calculatePriorityAttrs([filteredProps, ...callbackParams])
+      // Reactive accessor — re-evaluates when mode changes.
+      // Reading themeAttrs.mode inside the accessor creates a dependency
+      // tracked by the runtime's effect (via mountReactive).
+      // This ensures .attrs() callbacks see the current mode on mode switch.
+      return (() => {
+        const callbackParams = [
+          themeAttrs.theme,
+          { render, mode: themeAttrs.mode, isDark: themeAttrs.isDark, isLight: themeAttrs.isLight },
+        ]
+
+        const prioritizedAttrs = calculatePriorityAttrs([filteredProps, ...callbackParams])
 
-      const finalAttrs = calculateAttrs([
-        {
+        const finalAttrs = calculateAttrs([
+          {
+            ...prioritizedAttrs,
+            ...filteredProps,
+          },
+          ...callbackParams,
+        ])
+
+        const finalProps = {
           ...prioritizedAttrs,
+          ...finalAttrs,
           ...filteredProps,
-        },
-        ...callbackParams,
-      ])
-
-      const finalProps = {
-        ...prioritizedAttrs,
-        ...finalAttrs,
-        ...filteredProps,
-      }
+        }
 
-      return WrappedComponent(finalProps)
+        return WrappedComponent(finalProps)
+      }) as unknown as ReturnType<ComponentFn<any>>
     }
     return HOCComponent
   }