@almadar/ui 5.65.0 → 5.67.0

package/dist/runtime/index.js

@@ -48,7 +48,7 @@ import { GLTFLoader as GLTFLoader$1 } from 'three/examples/jsm/loaders/GLTFLoade
 import { clone } from 'three/examples/jsm/utils/SkeletonUtils';
 import { Canvas, useLoader, useFrame, useThree } from '@react-three/fiber';
 import { Billboard, Grid as Grid$1, OrbitControls } from '@react-three/drei';
-import { getPatternDefinition, getComponentForPattern as getComponentForPattern$1 } from '@almadar/patterns';
+import { getPatternDefinition, getComponentForPattern } from '@almadar/patterns';
 import { StateMachineManager, collectDeclaredConfigDefaults, createServerEffectHandlers, EffectExecutor, createContextFromBindings, InMemoryPersistence } from '@almadar/runtime';
 import { OrbitalServerRuntime } from '@almadar/runtime/OrbitalServerRuntime';
 
@@ -8016,6 +8016,8 @@ var init_DialogueBubble = __esm({
 function ChoiceButton({
   text = "Charge forward into the fray",
   index,
+  assetUrl,
+  icon,
   disabled = false,
   selected = false,
   onClick,
@@ -8048,6 +8050,23 @@ function ChoiceButton({
             ]
           }
         ),
+        assetUrl ? /* @__PURE__ */ jsx(
+          "img",
+          {
+            src: assetUrl,
+            alt: "",
+            width: 16,
+            height: 16,
+            style: { imageRendering: "pixelated", objectFit: "contain" },
+            className: "flex-shrink-0"
+          }
+        ) : icon ? /* @__PURE__ */ jsx("span", { className: "flex-shrink-0 text-sm", children: typeof icon === "string" ? (() => {
+          const I = resolveIcon(icon);
+          return I ? /* @__PURE__ */ jsx(I, { className: "w-4 h-4" }) : null;
+        })() : /* @__PURE__ */ (() => {
+          const I = icon;
+          return /* @__PURE__ */ jsx(I, { className: "w-4 h-4" });
+        })() }) : null,
         /* @__PURE__ */ jsx("span", { className: "text-sm leading-snug", children: text })
       ]
     }
@@ -8056,6 +8075,7 @@ function ChoiceButton({
 var init_ChoiceButton = __esm({
   "components/game/atoms/ChoiceButton.tsx"() {
     init_cn();
+    init_Icon();
     ChoiceButton.displayName = "ChoiceButton";
   }
 });
@@ -11204,7 +11224,8 @@ function IsometricCanvas({
     const minX = Math.min(...allScreenPos.map((p2) => p2.x));
     const maxX = Math.max(...allScreenPos.map((p2) => p2.x + scaledTileWidth));
     const minY = Math.min(...allScreenPos.map((p2) => p2.y));
-    const maxY = Math.max(...allScreenPos.map((p2) => p2.y + scaledTileHeight));
+    const tileBottomExtent = tileLayout === "hex" ? scaledTileWidth : scaledTileHeight;
+    const maxY = Math.max(...allScreenPos.map((p2) => p2.y + tileBottomExtent));
     const worldW = maxX - minX;
     const worldH = maxY - minY;
     const scaleM = Math.min(mW / worldW, mH / worldH) * 0.9;
@@ -11296,7 +11317,7 @@ function IsometricCanvas({
           const drawW = scaledTileWidth;
           const drawH = scaledTileWidth * (img.naturalHeight / img.naturalWidth);
           const drawX = pos.x;
-          const drawY = pos.y + scaledTileHeight - drawH;
+          const drawY = tileLayout === "hex" ? pos.y : pos.y + scaledTileHeight - drawH;
           ctx.drawImage(img, drawX, drawY, drawW, drawH);
         }
       } else {
@@ -28048,6 +28069,7 @@ function PowerupSlots({
       /* @__PURE__ */ jsx(
         ItemSlot,
         {
+          assetUrl: powerup.assetUrl,
           icon: powerup.icon,
           label: powerup.label,
           rarity: "uncommon",
@@ -28297,13 +28319,26 @@ function HealthPanel({
             )
           }
         ),
-        effects && effects.length > 0 && /* @__PURE__ */ jsx(Box, { className: "flex items-center gap-1 flex-wrap", children: effects.map((effect, i) => /* @__PURE__ */ jsx(
+        effects && effects.length > 0 && /* @__PURE__ */ jsx(Box, { className: "flex items-center gap-1 flex-wrap", children: effects.map((effect, i) => /* @__PURE__ */ jsxs(
           Badge,
           {
             variant: effectVariantMap[effect.variant ?? "neutral"],
             size: "sm",
-            icon: effect.icon,
-            children: effect.label
+            icon: effect.assetUrl ? void 0 : effect.icon,
+            children: [
+              effect.assetUrl && /* @__PURE__ */ jsx(
+                "img",
+                {
+                  src: effect.assetUrl,
+                  alt: "",
+                  width: 12,
+                  height: 12,
+                  style: { imageRendering: "pixelated", objectFit: "contain" },
+                  className: "flex-shrink-0 inline-block"
+                }
+              ),
+              effect.label
+            ]
           },
           i
         )) })
@@ -28486,15 +28521,28 @@ function TurnPanel({
             activeTeam
           }
         ),
-        actions && actions.length > 0 && /* @__PURE__ */ jsx(Box, { className: "flex items-center gap-1.5 ml-auto", children: actions.map((action, i) => /* @__PURE__ */ jsx(
+        actions && actions.length > 0 && /* @__PURE__ */ jsx(Box, { className: "flex items-center gap-1.5 ml-auto", children: actions.map((action, i) => /* @__PURE__ */ jsxs(
           Button,
           {
             variant: "ghost",
             size: "sm",
             disabled: action.disabled,
-            leftIcon: action.icon,
+            leftIcon: action.assetUrl ? void 0 : action.icon,
             onClick: () => handleAction(action.event),
-            children: action.label
+            children: [
+              action.assetUrl && /* @__PURE__ */ jsx(
+                "img",
+                {
+                  src: action.assetUrl,
+                  alt: "",
+                  width: 14,
+                  height: 14,
+                  style: { imageRendering: "pixelated", objectFit: "contain" },
+                  className: "flex-shrink-0"
+                }
+              ),
+              action.label
+            ]
           },
           i
         )) })
@@ -43410,9 +43458,9 @@ var init_GameCanvas3D2 = __esm({
             const color = unit.faction === "player" ? 4491519 : unit.faction === "enemy" ? 16729156 : 16777028;
             const hasAtlas = unitAtlasUrl(unit) !== null;
             const initialFrame = hasAtlas ? resolveUnitFrame(unit.id) : null;
-            const modelScale = UNIT_BASE_MODEL_SCALE * unitScale;
-            const billboardHeight = UNIT_BASE_BILLBOARD_HEIGHT * unitScale;
-            const primitiveRadius = UNIT_BASE_PRIMITIVE_RADIUS * unitScale;
+            const modelScale = UNIT_BASE_MODEL_SCALE * unitScale * gridConfig.cellSize;
+            const billboardHeight = UNIT_BASE_BILLBOARD_HEIGHT * unitScale * gridConfig.cellSize;
+            const primitiveRadius = UNIT_BASE_PRIMITIVE_RADIUS * unitScale * gridConfig.cellSize;
             return /* @__PURE__ */ jsxs(
               "group",
               {
@@ -43459,7 +43507,7 @@ var init_GameCanvas3D2 = __esm({
                       /* @__PURE__ */ jsx("meshStandardMaterial", { color })
                     ] })
                   ] }),
-                  unit.health !== void 0 && unit.maxHealth !== void 0 && /* @__PURE__ */ jsxs("group", { position: [0, 1.2, 0], children: [
+                  unit.health !== void 0 && unit.maxHealth !== void 0 && /* @__PURE__ */ jsxs("group", { position: [0, billboardHeight, 0], children: [
                     /* @__PURE__ */ jsxs("mesh", { position: [-0.25, 0, 0], children: [
                       /* @__PURE__ */ jsx("planeGeometry", { args: [0.5, 0.05] }),
                       /* @__PURE__ */ jsx("meshBasicMaterial", { color: 3355443 })
@@ -43488,7 +43536,7 @@ var init_GameCanvas3D2 = __esm({
               }
             );
           },
-          [selectedUnitId, handleUnitClick, resolveUnitFrame, unitScale]
+          [selectedUnitId, handleUnitClick, resolveUnitFrame, unitScale, gridConfig]
         );
         const DefaultFeatureRenderer = useCallback(
           ({
@@ -43576,7 +43624,7 @@ var init_GameCanvas3D2 = __esm({
               {
                 ref: containerRef,
                 className: cn("game-canvas-3d relative w-full overflow-hidden", className),
-                style: { height: "85vh" },
+                style: { flex: "1 1 0", minHeight: "400px" },
                 "data-orientation": orientation,
                 "data-camera-mode": cameraMode,
                 "data-overlay": overlay,
@@ -43876,13 +43924,39 @@ var init_GameBoard3D = __esm({
     GameBoard3D.displayName = "GameBoard3D";
   }
 });
-var GameShell;
+function getSlotContentRenderer2() {
+  if (_scr) return _scr;
+  const mod = (init_UISlotRenderer(), __toCommonJS(UISlotRenderer_exports));
+  _scr = mod.SlotContentRenderer;
+  return _scr;
+}
+function resolveDescriptor(value, idPrefix) {
+  if (value === null || value === void 0) return value;
+  if (React84__default.isValidElement(value)) return value;
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
+  if (Array.isArray(value)) {
+    return value.map((item, i) => /* @__PURE__ */ jsx(React84__default.Fragment, { children: resolveDescriptor(item, `${idPrefix}-${i}`) }, i));
+  }
+  if (typeof value === "object") {
+    const rec = value;
+    if (typeof rec.type === "string" && getComponentForPattern(rec.type) !== null) {
+      const { type, props: nestedProps, _id, ...flatProps } = rec;
+      const resolvedProps = nestedProps !== void 0 ? nestedProps : flatProps;
+      const content = { id: _id ?? idPrefix, pattern: type, props: resolvedProps, priority: 0 };
+      const SCR = getSlotContentRenderer2();
+      return /* @__PURE__ */ jsx(SCR, { content, onDismiss: () => void 0 });
+    }
+  }
+  return null;
+}
+var _scr, GameShell;
 var init_GameShell = __esm({
   "components/game/templates/GameShell.tsx"() {
     init_cn();
     init_Box();
     init_Stack();
     init_Typography();
+    _scr = null;
     GameShell = ({
       appName = "Game",
       hud,
@@ -43931,7 +44005,7 @@ var init_GameShell = __esm({
                       children: appName
                     }
                   ),
-                  hud && /* @__PURE__ */ jsx(Box, { className: "game-shell__hud", children: hud })
+                  hud && /* @__PURE__ */ jsx(Box, { className: "game-shell__hud", children: resolveDescriptor(hud, "gs-hud") })
                 ]
               }
             ),
@@ -43944,7 +44018,7 @@ var init_GameShell = __esm({
                   overflow: "hidden",
                   position: "relative"
                 },
-                children
+                children: resolveDescriptor(children, "gs-children")
               }
             )
           ]
@@ -43954,7 +44028,32 @@ var init_GameShell = __esm({
     GameShell.displayName = "GameShell";
   }
 });
-var GameTemplate;
+function getSlotContentRenderer3() {
+  if (_scr2) return _scr2;
+  const mod = (init_UISlotRenderer(), __toCommonJS(UISlotRenderer_exports));
+  _scr2 = mod.SlotContentRenderer;
+  return _scr2;
+}
+function resolveDescriptor2(value, idPrefix) {
+  if (value === null || value === void 0) return value;
+  if (React84__default.isValidElement(value)) return value;
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
+  if (Array.isArray(value)) {
+    return value.map((item, i) => /* @__PURE__ */ jsx(React84__default.Fragment, { children: resolveDescriptor2(item, `${idPrefix}-${i}`) }, i));
+  }
+  if (typeof value === "object") {
+    const rec = value;
+    if (typeof rec.type === "string" && getComponentForPattern(rec.type) !== null) {
+      const { type, props: nestedProps, _id, ...flatProps } = rec;
+      const resolvedProps = nestedProps !== void 0 ? nestedProps : flatProps;
+      const content = { id: _id ?? idPrefix, pattern: type, props: resolvedProps, priority: 0 };
+      const SCR = getSlotContentRenderer3();
+      return /* @__PURE__ */ jsx(SCR, { content, onDismiss: () => void 0 });
+    }
+  }
+  return null;
+}
+var _scr2, GameTemplate;
 var init_GameTemplate = __esm({
   "components/game/templates/GameTemplate.tsx"() {
     init_cn();
@@ -43962,6 +44061,7 @@ var init_GameTemplate = __esm({
     init_Stack();
     init_Typography();
     init_Button();
+    _scr2 = null;
     GameTemplate = ({
       entity,
       title = "Game",
@@ -44029,13 +44129,13 @@ var init_GameTemplate = __esm({
                   fullWidth: true,
                   className: "flex-1 bg-muted",
                   children: [
-                    children,
+                    resolveDescriptor2(children, "gt-children"),
                     hud && /* @__PURE__ */ jsx(
                       Box,
                       {
                         position: "absolute",
                         className: "top-0 left-0 right-0 pointer-events-none",
-                        children: /* @__PURE__ */ jsx(Box, { padding: "md", className: "pointer-events-auto w-fit", children: hud })
+                        children: /* @__PURE__ */ jsx(Box, { padding: "md", className: "pointer-events-auto w-fit", children: resolveDescriptor2(hud, "gt-hud") })
                       }
                     )
                   ]
@@ -44060,7 +44160,7 @@ var init_GameTemplate = __esm({
                       children: /* @__PURE__ */ jsx(Typography, { variant: "h6", children: "Debug Panel" })
                     }
                   ),
-                  /* @__PURE__ */ jsx(Box, { padding: "md", children: debugPanel })
+                  /* @__PURE__ */ jsx(Box, { padding: "md", children: resolveDescriptor2(debugPanel, "gt-debug") })
                 ]
               }
             )
@@ -52639,8 +52739,8 @@ function getSlotFallback(slot, config) {
   const variant = SLOT_SKELETON_MAP[slot] ?? "text";
   return /* @__PURE__ */ jsx(Skeleton, { variant });
 }
-function getComponentForPattern(patternType) {
-  const mapping = getComponentForPattern$1(patternType);
+function getComponentForPattern3(patternType) {
+  const mapping = getComponentForPattern(patternType);
   if (!mapping) {
     return null;
   }
@@ -53162,7 +53262,7 @@ function isPatternConfig(value) {
   if (value instanceof Date) return false;
   if (typeof value === "function") return false;
   const record = value;
-  return "type" in record && typeof record.type === "string" && getComponentForPattern$1(record.type) !== null;
+  return "type" in record && typeof record.type === "string" && getComponentForPattern(record.type) !== null;
 }
 function isPlainConfigObject(value) {
   if (React84__default.isValidElement(value)) return false;
@@ -53270,7 +53370,8 @@ function SlotContentRenderer({
       entityDef = schemaCtx.entities.get(linkedEntity);
     }
   }
-  const PatternComponent = getComponentForPattern(content.pattern);
+  const orbitalName = schemaCtx && content.sourceTrait !== void 0 ? schemaCtx.orbitalsByTrait.get(content.sourceTrait) : void 0;
+  const PatternComponent = getComponentForPattern3(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const isSingleChild = typeof childrenConfig === "string" || typeof childrenConfig === "object" && childrenConfig !== null && !Array.isArray(childrenConfig) && "type" in childrenConfig;
@@ -53368,6 +53469,7 @@ function SlotContentRenderer({
         "data-orb-entity": content.entity,
         "data-orb-path": myPath,
         "data-orb-pattern": content.pattern,
+        "data-orb-orbital": orbitalName,
         children: renderedChildren !== void 0 ? /* @__PURE__ */ jsx(PatternComponent, { ...finalProps, children: renderedChildren }) : /* @__PURE__ */ jsx(PatternComponent, { ...finalProps })
       }
     );
@@ -53387,6 +53489,7 @@ function SlotContentRenderer({
       "data-orb-entity": content.entity,
       "data-orb-path": patternPath ?? "root",
       "data-orb-pattern": content.pattern,
+      "data-orb-orbital": orbitalName,
       children: content.props.children ?? /* @__PURE__ */ jsxs(Box, { className: "p-4 text-sm text-muted-foreground border border-dashed border-border rounded", children: [
         "Unknown pattern: ",
         content.pattern,
@@ -53636,7 +53739,7 @@ function resolveLambdaBindings(body, params, item, index) {
   return body;
 }
 var _slotContentRenderer2 = null;
-function getSlotContentRenderer2() {
+function getSlotContentRenderer4() {
   if (_slotContentRenderer2) return _slotContentRenderer2;
   const mod = (init_UISlotRenderer(), __toCommonJS(UISlotRenderer_exports));
   _slotContentRenderer2 = mod.SlotContentRenderer;
@@ -53652,7 +53755,7 @@ function makeLambdaFn(params, lambdaBody, callerKey) {
     if (typeof record.type !== "string") {
       return null;
     }
-    const SlotContentRenderer2 = getSlotContentRenderer2();
+    const SlotContentRenderer2 = getSlotContentRenderer4();
     const rawChildProps = {};
     for (const [k, v] of Object.entries(record)) {
       if (k !== "type") rawChildProps[k] = v;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "5.65.0",
+  "version": "5.67.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [
@@ -134,7 +134,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@almadar/core": "^10.5.0",
+    "@almadar/core": "^10.6.0",
     "@almadar/evaluator": ">=2.9.2",
     "@almadar/logger": "^1.3.0",
     "@almadar/patterns": ">=2.35.0",