@almadar/ui 4.45.0 → 4.46.0

package/dist/runtime/index.js

@@ -6386,12 +6386,15 @@ function ControlButton({
         sizeMap3[size] ?? sizeMap3.md,
         shapeMap[shape] ?? shapeMap.circle,
         variantMap[variant] ?? variantMap.secondary,
-        actualPressed && "scale-95 brightness-110 border-white",
+        actualPressed && "scale-95 brightness-110 border-foreground",
         disabled && "opacity-50 cursor-not-allowed",
         className
       ),
       children: [
-        icon && /* @__PURE__ */ jsx("span", { className: "text-2xl", children: icon }),
+        icon && /* @__PURE__ */ jsx("span", { className: "text-2xl", children: typeof icon === "string" ? (() => {
+          const I = resolveIcon(icon);
+          return I ? /* @__PURE__ */ jsx(I, { className: "w-6 h-6" }) : null;
+        })() : icon }),
         label && !icon && /* @__PURE__ */ jsx("span", { children: label })
       ]
     }
@@ -6403,6 +6406,7 @@ var init_ControlButton = __esm({
     "use client";
     init_cn();
     init_useEventBus();
+    init_Icon();
     sizeMap3 = {
       sm: "w-10 h-10 text-sm",
       md: "w-14 h-14 text-base",
@@ -6415,9 +6419,9 @@ var init_ControlButton = __esm({
       square: "rounded-md"
     };
     variantMap = {
-      primary: "bg-blue-600 text-[var(--color-foreground)] border-blue-400 hover:bg-blue-500",
-      secondary: "bg-[var(--color-surface,#374151)] text-[var(--color-foreground)] border-gray-500 hover:bg-gray-600",
-      ghost: "bg-transparent text-[var(--color-foreground)] border-white/30 hover:bg-white/10"
+      primary: "bg-primary text-primary-foreground border-primary hover:bg-primary-hover",
+      secondary: "bg-secondary text-secondary-foreground border-border hover:bg-secondary-hover",
+      ghost: "bg-transparent text-foreground border-border hover:bg-muted"
     };
     ControlButton.displayName = "ControlButton";
   }
@@ -7145,8 +7149,8 @@ function ChoiceButton({
       className: cn(
         "w-full text-left px-4 py-2.5 rounded-md border transition-all duration-150",
         "flex items-center gap-2",
-        selected ? "bg-yellow-500/20 border-yellow-400 text-yellow-300" : "bg-white/5 border-white/10 text-[var(--color-foreground)] hover:bg-white/10 hover:border-white/30",
-        disabled && "opacity-40 cursor-not-allowed hover:bg-white/5 hover:border-white/10",
+        selected ? "bg-accent/15 border-accent text-foreground" : "bg-muted/40 border-border text-foreground hover:bg-muted hover:border-border",
+        disabled && "opacity-40 cursor-not-allowed hover:bg-muted/40 hover:border-border",
         className
       ),
       children: [
@@ -7155,7 +7159,7 @@ function ChoiceButton({
           {
             className: cn(
               "flex-shrink-0 font-mono font-bold text-sm",
-              selected ? "text-yellow-400" : "text-gray-500"
+              selected ? "text-accent" : "text-muted-foreground"
             ),
             children: [
               index,
@@ -7196,7 +7200,7 @@ function ActionButton({
       disabled: isDisabled,
       onClick,
       className: cn(
-        "relative inline-flex items-center gap-1.5 rounded-md border font-medium text-[var(--color-foreground)] overflow-hidden transition-colors duration-150",
+        "relative inline-flex items-center gap-1.5 rounded-md border font-medium overflow-hidden transition-colors duration-150",
         sizes.button,
         variantStyles8[variant],
         isDisabled && "opacity-60 cursor-not-allowed",
@@ -7206,7 +7210,7 @@ function ActionButton({
         onCooldown && /* @__PURE__ */ jsx(
           "div",
           {
-            className: "absolute inset-0 bg-black/60 pointer-events-none",
+            className: "absolute inset-0 bg-foreground/40 pointer-events-none",
             style: {
               clipPath: `conic-gradient(from 0deg, transparent ${360 - cooldownDeg}deg, black ${360 - cooldownDeg}deg)`,
               WebkitClipPath: `conic-gradient(from 0deg, transparent ${360 - cooldownDeg}deg, black ${360 - cooldownDeg}deg)`,
@@ -7214,13 +7218,16 @@ function ActionButton({
             }
           }
         ),
-        icon && /* @__PURE__ */ jsx("span", { className: cn("flex-shrink-0", sizes.icon), children: icon }),
+        icon && /* @__PURE__ */ jsx("span", { className: cn("flex-shrink-0", sizes.icon), children: typeof icon === "string" ? (() => {
+          const I = resolveIcon(icon);
+          return I ? /* @__PURE__ */ jsx(I, { className: "w-4 h-4" }) : null;
+        })() : icon }),
         /* @__PURE__ */ jsx("span", { className: "relative z-10", children: label }),
         hotkey && /* @__PURE__ */ jsx(
           "span",
           {
             className: cn(
-              "absolute top-0.5 right-0.5 bg-black/50 text-gray-300 rounded font-mono leading-tight",
+              "absolute top-0.5 right-0.5 bg-foreground/30 text-primary-foreground rounded font-mono leading-tight",
               sizes.hotkey
             ),
             children: hotkey
@@ -7234,15 +7241,16 @@ var sizeMap13, variantStyles8;
 var init_ActionButton = __esm({
   "components/atoms/game/ActionButton.tsx"() {
     init_cn();
+    init_Icon();
     sizeMap13 = {
       sm: { button: "px-3 py-1.5 text-xs", hotkey: "text-[9px] px-1", icon: "text-xs" },
       md: { button: "px-4 py-2 text-sm", hotkey: "text-[10px] px-1.5", icon: "text-sm" },
       lg: { button: "px-5 py-2.5 text-base", hotkey: "text-xs px-2", icon: "text-base" }
     };
     variantStyles8 = {
-      primary: "bg-blue-600 hover:bg-blue-500 border-blue-400/40",
-      secondary: "bg-gray-700 hover:bg-gray-600 border-gray-500/40",
-      danger: "bg-red-700 hover:bg-red-600 border-red-400/40"
+      primary: "bg-primary text-primary-foreground hover:bg-primary-hover border-primary",
+      secondary: "bg-secondary text-secondary-foreground hover:bg-secondary-hover border-border",
+      danger: "bg-error text-error-foreground hover:bg-error/90 border-error"
     };
     ActionButton.displayName = "ActionButton";
   }
@@ -21288,7 +21296,7 @@ function DataGrid({
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
                       "data-row-id": String(itemData.id),
-                      className: "text-error hover:bg-error/10 px-2",
+                      className: "text-error hover:text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs" }),
                         action.label
@@ -23817,7 +23825,7 @@ function StatBadge({
           const I = resolveIcon(icon);
           return I ? /* @__PURE__ */ jsx(I, { className: "w-4 h-4" }) : icon;
         })() : icon }),
-        /* @__PURE__ */ jsx("span", { className: "text-gray-400 font-medium", children: label }),
+        /* @__PURE__ */ jsx("span", { className: "text-muted-foreground font-medium", children: label }),
         format === "hearts" && max && /* @__PURE__ */ jsx(
           HealthBar,
           {
@@ -23844,7 +23852,7 @@ function StatBadge({
             animated: true
           }
         ),
-        format === "text" && /* @__PURE__ */ jsx("span", { className: "font-bold text-[var(--color-foreground)]", children: value })
+        format === "text" && /* @__PURE__ */ jsx("span", { className: "font-bold text-foreground", children: value })
       ]
     }
   );
@@ -23862,11 +23870,11 @@ var init_StatBadge = __esm({
       lg: "text-base px-4 py-2"
     };
     variantMap2 = {
-      default: "bg-[var(--color-card)]/80 border-gray-700",
-      primary: "bg-blue-900/80 border-blue-700",
-      success: "bg-green-900/80 border-green-700",
-      warning: "bg-yellow-900/80 border-yellow-700",
-      danger: "bg-red-900/80 border-red-700"
+      default: "bg-card/80 border-border text-foreground",
+      primary: "bg-primary/15 border-primary/40 text-foreground",
+      success: "bg-success/15 border-success/40 text-foreground",
+      warning: "bg-warning/15 border-warning/40 text-foreground",
+      danger: "bg-error/15 border-error/40 text-foreground"
     };
     StatBadge.displayName = "StatBadge";
   }
@@ -36301,9 +36309,45 @@ var init_List = __esm({
     List3.displayName = "List";
   }
 });
-var DefaultEmptyDetail, MasterDetail;
+function MasterDetail({
+  entity,
+  masterFields,
+  detailFields: _detailFields,
+  // Captured but not used here - detail handled separately
+  loading: externalLoading,
+  isLoading: externalIsLoading,
+  error: externalError,
+  className,
+  ...rest
+}) {
+  const loading = externalLoading ?? false;
+  const isLoading = externalIsLoading ?? false;
+  const error = externalError ?? null;
+  return /* @__PURE__ */ jsx(
+    DataTable,
+    {
+      fields: masterFields,
+      columns: masterFields,
+      entity,
+      isLoading: loading || isLoading,
+      error,
+      className,
+      emptyTitle: "No items found",
+      emptyDescription: "Create your first item to get started.",
+      ...rest
+    }
+  );
+}
 var init_MasterDetail = __esm({
-  "components/organisms/layout/MasterDetail.tsx"() {
+  "components/organisms/MasterDetail.tsx"() {
+    "use client";
+    init_DataTable();
+    MasterDetail.displayName = "MasterDetail";
+  }
+});
+var DefaultEmptyDetail, MasterDetailLayout;
+var init_MasterDetailLayout = __esm({
+  "components/organisms/layout/MasterDetailLayout.tsx"() {
     init_cn();
     init_Typography();
     DefaultEmptyDetail = () => /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center h-full border-2 border-dashed border-border", children: /* @__PURE__ */ jsx(
@@ -36314,7 +36358,7 @@ var init_MasterDetail = __esm({
         children: "Select an item to view details"
       }
     ) });
-    MasterDetail = ({
+    MasterDetailLayout = ({
       master,
       detail,
       emptyDetail,
@@ -36349,7 +36393,7 @@ var init_MasterDetail = __esm({
         }
       );
     };
-    MasterDetail.displayName = "MasterDetail";
+    MasterDetailLayout.displayName = "MasterDetailLayout";
   }
 });
 var COLUMN_CLASSES, ASPECT_CLASSES, MediaGallery;
@@ -43104,6 +43148,7 @@ var init_component_registry_generated = __esm({
     init_LoadingState();
     init_MarkdownContent();
     init_MasterDetail();
+    init_MasterDetailLayout();
     init_MatrixQuestion();
     init_MediaGallery();
     init_Meter();
@@ -43398,6 +43443,7 @@ var init_component_registry_generated = __esm({
       "MapViewPattern": MapViewPattern,
       "MarkdownContent": MarkdownContent,
       "MasterDetail": MasterDetail,
+      "MasterDetailLayout": MasterDetailLayout,
       "MatrixQuestion": MatrixQuestion,
       "MediaGallery": MediaGallery,
       "Menu": MenuPattern,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "4.45.0",
+  "version": "4.46.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [