@almadar/ui 5.134.0 → 5.135.0

package/dist/{cn-D3H9UzCW.d.cts → cn-B8GXqrtp.d.cts}

@@ -1,5 +1,5 @@
 import { OrbitalSchema, SExpr, Effect, OrbitalVerificationAPI, TraitStateSnapshot, EventPayload, BusEvent, VerificationCheck, BridgeHealth, VerificationSnapshot, VerificationSummary, TransitionTrace, ServerResponseTrace, CheckStatus, AssetLoadStatus } from '@almadar/core';
-import { D as DrawableNode } from './paintDispatch-BXJgISot.cjs';
+import { D as DrawableNode } from './paintDispatch-Bl2sfRFb.cjs';
 import { ClassValue } from 'clsx';
 
 /**

package/dist/{cn-Dm0VrLRG.d.ts → cn-CZq0uJLA.d.ts}

@@ -1,5 +1,5 @@
 import { OrbitalSchema, SExpr, Effect, OrbitalVerificationAPI, TraitStateSnapshot, EventPayload, BusEvent, VerificationCheck, BridgeHealth, VerificationSnapshot, VerificationSummary, TransitionTrace, ServerResponseTrace, CheckStatus, AssetLoadStatus } from '@almadar/core';
-import { D as DrawableNode } from './paintDispatch-BXJgISot.js';
+import { D as DrawableNode } from './paintDispatch-Bl2sfRFb.js';
 import { ClassValue } from 'clsx';
 
 /**

package/dist/components/index.cjs

@@ -4030,6 +4030,32 @@ function formatValue(value, format) {
       return String(value);
   }
 }
+function compareCellValues(a, b) {
+  const aEmpty = a === null || a === void 0 || a === "";
+  const bEmpty = b === null || b === void 0 || b === "";
+  if (aEmpty || bEmpty) return aEmpty && bEmpty ? 0 : aEmpty ? 1 : -1;
+  if (typeof a === "number" && typeof b === "number") return a - b;
+  if (typeof a === "boolean" && typeof b === "boolean") return Number(a) - Number(b);
+  const aNum = Number(a);
+  const bNum = Number(b);
+  if (Number.isFinite(aNum) && Number.isFinite(bNum)) return aNum - bNum;
+  const aTime = dateLikeTime(a);
+  const bTime = dateLikeTime(b);
+  if (aTime !== null && bTime !== null) return aTime - bTime;
+  return String(a).localeCompare(String(b));
+}
+function dateLikeTime(value) {
+  if (value instanceof Date) return value.getTime();
+  const text = String(value);
+  if (!/\d/.test(text) || !/[-/:T]/.test(text)) return null;
+  const time = Date.parse(text);
+  return Number.isNaN(time) ? null : time;
+}
+function sortRows(rows2, field, direction = "asc") {
+  if (!field) return rows2;
+  const dir = direction === "desc" ? -1 : 1;
+  return [...rows2].sort((a, b) => dir * compareCellValues(a?.[field], b?.[field]));
+}
 var init_format = __esm({
   "lib/format.ts"() {
   }
@@ -15655,6 +15681,15 @@ function createWebPainter(ctx, onAssetLoad) {
       ctx.lineWidth = lineWidth;
       ctx.stroke();
     },
+    fillPath(d, color) {
+      ctx.fillStyle = color;
+      ctx.fill(new Path2D(d));
+    },
+    strokePath(d, color, lineWidth = 1) {
+      ctx.strokeStyle = color;
+      ctx.lineWidth = lineWidth;
+      ctx.stroke(new Path2D(d));
+    },
     text(str2, x, y, style) {
       if (style.font) ctx.font = style.font;
       ctx.fillStyle = style.color;
@@ -15892,6 +15927,16 @@ var init_DrawShape = __esm({
           if (node.stroke) painter.strokePoly(pts, node.stroke, node.strokeWidth ?? 1, true);
           break;
         }
+        case "path": {
+          if (!node.d) break;
+          const base = dctx.projector.project(node.position);
+          const tw = dctx.projector.tileWidth;
+          painter.translate(base.x, base.y);
+          painter.scale(tw, tw);
+          if (node.fill) painter.fillPath(node.d, node.fill);
+          if (node.stroke) painter.strokePath(node.d, node.stroke, (node.strokeWidth ?? 1) / tw);
+          break;
+        }
       }
       painter.restore();
     };
@@ -15983,6 +16028,19 @@ function paintDrawable(painter, node, dctx) {
     case "draw-text":
       paintText(painter, node, dctx);
       break;
+    case "draw-group": {
+      if (!isValidScenePos(node.position)) break;
+      if (!Array.isArray(node.items)) break;
+      const p = dctx.projector.project(node.position);
+      painter.save();
+      painter.translate(p.x, p.y);
+      if (node.scale !== void 0) painter.scale(node.scale, node.scale);
+      if (node.rotate !== void 0) painter.rotate(node.rotate);
+      if (node.opacity !== void 0 && node.opacity !== 1) painter.setAlpha(node.opacity);
+      for (const item of node.items) paintDrawable(painter, item, dctx);
+      painter.restore();
+      break;
+    }
     case "draw-sprite-layer":
       paintSpriteLayer(painter, node, dctx);
       break;
@@ -15996,6 +16054,7 @@ function paintDrawable(painter, node, dctx) {
 }
 var init_paintDispatch = __esm({
   "lib/drawable/paintDispatch.ts"() {
+    init_contract();
     init_DrawSprite();
     init_DrawShape();
     init_DrawText();
@@ -16013,6 +16072,7 @@ function collectDrawnItems(nodes) {
       case "draw-sprite":
       case "draw-shape":
       case "draw-text":
+      case "draw-group":
         if (isValidScenePos(n.position)) out.push({ pos: n.position, id: n.id });
         break;
       case "draw-sprite-layer":
@@ -21228,6 +21288,8 @@ function DataList({
   hasMore,
   children,
   pageSize = 5,
+  sortBy,
+  sortDirection,
   renderItem: schemaRenderItem,
   dragGroup,
   accepts,
@@ -21256,7 +21318,11 @@ function DataList({
     dndItemIdField,
     dndRoot
   });
-  const allData = dnd.orderedItems;
+  const orderedData = dnd.orderedItems;
+  const allData = React74__namespace.default.useMemo(
+    () => sortRows(orderedData, sortBy, sortDirection),
+    [orderedData, sortBy, sortDirection]
+  );
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
   const hasRenderProp = typeof children === "function";
@@ -21293,7 +21359,7 @@ function DataList({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
-  const renderItemActions = (itemData) => {
+  const renderItemActions = (itemData, onPrimary = false) => {
     if (!itemActions || itemActions.length === 0) return null;
     const inline = maxInlineActions != null ? itemActions.slice(0, maxInlineActions) : itemActions;
     const overflow = maxInlineActions != null ? itemActions.slice(maxInlineActions) : [];
@@ -21306,7 +21372,12 @@ function DataList({
           onClick: handleActionClick(action, itemData),
           "data-testid": `action-${action.event}`,
           "data-row-id": String(itemData.id),
-          className: cn(action.variant === "danger" && "text-error hover:bg-error/10"),
+          className: cn(
+            action.variant === "danger" && "text-error hover:bg-error/10",
+            // Must sit on the Button itself: the variant's own text colour
+            // beats an inherited one from the row wrapper.
+            onPrimary && "!text-primary-foreground hover:bg-primary-foreground/15"
+          ),
           children: [
             action.icon && renderIconInput2(action.icon, { size: "xs", className: "mr-1" }),
             action.label
@@ -21425,7 +21496,7 @@ function DataList({
                           children: formatDate(timestamp)
                         }
                       ) : /* @__PURE__ */ jsxRuntime.jsx("span", {}),
-                      renderItemActions(itemData)
+                      renderItemActions(itemData, isSent)
                     ] })
                   ]
                 }
@@ -26193,210 +26264,6 @@ var init_DialogueBubble = __esm({
     DialogueBubble.displayName = "DialogueBubble";
   }
 });
-function SvgStage({
-  cols,
-  rows: rows2,
-  tileSize = 32,
-  background = "var(--color-background)",
-  tileClickEvent,
-  tileHoverEvent,
-  tileLeaveEvent,
-  keyMap,
-  keyUpMap,
-  className,
-  children
-}) {
-  const eventBus = useEventBus();
-  const svgRef = React74.useRef(null);
-  const pointerDownRef = React74.useRef(null);
-  const cellFromClient = React74.useCallback((clientX, clientY) => {
-    const svg = svgRef.current;
-    if (!svg) return null;
-    const rect = svg.getBoundingClientRect();
-    if (rect.width === 0 || rect.height === 0) return null;
-    const vbW = cols * tileSize;
-    const vbH = rows2 * tileSize;
-    const meet = Math.min(rect.width / vbW, rect.height / vbH);
-    const offsetX = (rect.width - vbW * meet) / 2;
-    const offsetY = (rect.height - vbH * meet) / 2;
-    const svgX = (clientX - rect.left - offsetX) / meet;
-    const svgY = (clientY - rect.top - offsetY) / meet;
-    return {
-      x: Math.min(Math.max(Math.floor(svgX / tileSize), 0), cols - 1),
-      y: Math.min(Math.max(Math.floor(svgY / tileSize), 0), rows2 - 1)
-    };
-  }, [cols, rows2, tileSize]);
-  const handlePointerDown = React74.useCallback((e) => {
-    pointerDownRef.current = { clientX: e.clientX, clientY: e.clientY };
-  }, []);
-  const handlePointerUp = React74.useCallback((e) => {
-    const down = pointerDownRef.current;
-    pointerDownRef.current = null;
-    if (!tileClickEvent) return;
-    if (down && Math.hypot(e.clientX - down.clientX, e.clientY - down.clientY) > 5) return;
-    const cell = cellFromClient(e.clientX, e.clientY);
-    if (cell) eventBus.emit(`UI:${tileClickEvent}`, cell);
-  }, [cellFromClient, tileClickEvent, eventBus]);
-  const handlePointerMove = React74.useCallback((e) => {
-    if (!tileHoverEvent) return;
-    const cell = cellFromClient(e.clientX, e.clientY);
-    if (cell) eventBus.emit(`UI:${tileHoverEvent}`, cell);
-  }, [cellFromClient, tileHoverEvent, eventBus]);
-  const handlePointerLeave = React74.useCallback(() => {
-    pointerDownRef.current = null;
-    if (tileLeaveEvent) eventBus.emit(`UI:${tileLeaveEvent}`, {});
-  }, [tileLeaveEvent, eventBus]);
-  React74.useEffect(() => {
-    if (!keyMap && !keyUpMap) return;
-    const onDown = (e) => {
-      const ev = keyMap?.[e.code];
-      if (ev) {
-        eventBus.emit(`UI:${ev}`, {});
-        e.preventDefault();
-      }
-    };
-    const onUp = (e) => {
-      const ev = keyUpMap?.[e.code];
-      if (ev) eventBus.emit(`UI:${ev}`, {});
-    };
-    window.addEventListener("keydown", onDown);
-    window.addEventListener("keyup", onUp);
-    return () => {
-      window.removeEventListener("keydown", onDown);
-      window.removeEventListener("keyup", onUp);
-    };
-  }, [keyMap, keyUpMap, eventBus]);
-  React74.useEffect(() => {
-    if (!keyMap && !keyUpMap) return;
-    svgRef.current?.focus();
-  }, [keyMap, keyUpMap]);
-  const stageContext = React74.useMemo(() => ({ tileSize }), [tileSize]);
-  return /* @__PURE__ */ jsxRuntime.jsxs(
-    "svg",
-    {
-      ref: svgRef,
-      "data-testid": "svg-stage",
-      viewBox: `0 0 ${cols * tileSize} ${rows2 * tileSize}`,
-      preserveAspectRatio: "xMidYMid meet",
-      className: cn("block h-full w-full", className),
-      tabIndex: keyMap || keyUpMap ? 0 : void 0,
-      onPointerDown: handlePointerDown,
-      onPointerMove: handlePointerMove,
-      onPointerUp: handlePointerUp,
-      onPointerLeave: handlePointerLeave,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx("rect", { width: cols * tileSize, height: rows2 * tileSize, fill: background }),
-        /* @__PURE__ */ jsxRuntime.jsx(exports.SvgStageContext.Provider, { value: stageContext, children })
-      ]
-    }
-  );
-}
-exports.SvgStageContext = void 0;
-var init_SvgStage = __esm({
-  "components/game/molecules/SvgStage.tsx"() {
-    "use client";
-    init_cn();
-    init_useEventBus();
-    exports.SvgStageContext = React74__namespace.createContext({ tileSize: 1 });
-    SvgStage.displayName = "SvgStage";
-  }
-});
-function SvgDrawShape({
-  shape,
-  x,
-  y,
-  width,
-  height,
-  radius,
-  radiusY,
-  points,
-  d,
-  x2,
-  y2,
-  fill,
-  stroke,
-  strokeWidth,
-  opacity,
-  className
-}) {
-  const { tileSize } = React74.useContext(exports.SvgStageContext);
-  const cell = (v) => v === void 0 ? void 0 : v * tileSize;
-  const paint = {
-    fill: fill ?? (stroke === void 0 ? "var(--color-primary)" : "none"),
-    stroke,
-    strokeWidth,
-    opacity,
-    className
-  };
-  return /* @__PURE__ */ jsxRuntime.jsxs("g", { transform: `translate(${x * tileSize} ${y * tileSize})`, children: [
-    shape === "rect" && /* @__PURE__ */ jsxRuntime.jsx("rect", { width: cell(width), height: cell(height), ...paint }),
-    shape === "circle" && /* @__PURE__ */ jsxRuntime.jsx("circle", { r: cell(radius), ...paint }),
-    shape === "ellipse" && /* @__PURE__ */ jsxRuntime.jsx("ellipse", { rx: cell(radius), ry: cell(radiusY ?? radius), ...paint }),
-    shape === "polygon" && /* @__PURE__ */ jsxRuntime.jsx("polygon", { points, ...paint }),
-    shape === "polyline" && /* @__PURE__ */ jsxRuntime.jsx("polyline", { points, ...paint }),
-    shape === "path" && /* @__PURE__ */ jsxRuntime.jsx("path", { d, ...paint }),
-    shape === "line" && /* @__PURE__ */ jsxRuntime.jsx("line", { x2: cell(x2), y2: cell(y2), ...paint })
-  ] });
-}
-var init_SvgDrawShape = __esm({
-  "components/game/atoms/SvgDrawShape.tsx"() {
-    "use client";
-    init_SvgStage();
-    SvgDrawShape.displayName = "SvgDrawShape";
-  }
-});
-function SvgDrawGroup({
-  x = 0,
-  y = 0,
-  scale,
-  rotate,
-  opacity,
-  className,
-  children
-}) {
-  const { tileSize } = React74.useContext(exports.SvgStageContext);
-  const transforms = [`translate(${x * tileSize} ${y * tileSize})`];
-  if (rotate !== void 0) transforms.push(`rotate(${rotate})`);
-  if (scale !== void 0) transforms.push(`scale(${scale})`);
-  return /* @__PURE__ */ jsxRuntime.jsx("g", { transform: transforms.join(" "), opacity, className, children });
-}
-var init_SvgDrawGroup = __esm({
-  "components/game/atoms/SvgDrawGroup.tsx"() {
-    "use client";
-    init_SvgStage();
-    SvgDrawGroup.displayName = "SvgDrawGroup";
-  }
-});
-function SvgDrawText({
-  x,
-  y,
-  text,
-  size = 12,
-  fill = "var(--color-foreground)",
-  anchor = "middle",
-  className
-}) {
-  const { tileSize } = React74.useContext(exports.SvgStageContext);
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    "text",
-    {
-      x: x * tileSize,
-      y: y * tileSize,
-      fontSize: size,
-      fill,
-      textAnchor: anchor,
-      className,
-      children: text
-    }
-  );
-}
-var init_SvgDrawText = __esm({
-  "components/game/atoms/SvgDrawText.tsx"() {
-    "use client";
-    init_SvgStage();
-    SvgDrawText.displayName = "SvgDrawText";
-  }
-});
 function StatBadge({
   assetUrl,
   iconUrl,
@@ -26887,32 +26754,6 @@ var init_StateGraph = __esm({
     init_TransitionArrow();
   }
 });
-function SvgDrawShapeLayer({
-  items,
-  fill,
-  stroke,
-  strokeWidth,
-  opacity
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsx("g", { children: items.map(({ id, ...shape }) => /* @__PURE__ */ jsxRuntime.jsx(
-    SvgDrawShape,
-    {
-      ...shape,
-      fill: shape.fill ?? fill,
-      stroke: shape.stroke ?? stroke,
-      strokeWidth: shape.strokeWidth ?? strokeWidth,
-      opacity: shape.opacity ?? opacity
-    },
-    id
-  )) });
-}
-var init_SvgDrawShapeLayer = __esm({
-  "components/game/molecules/SvgDrawShapeLayer.tsx"() {
-    "use client";
-    init_SvgDrawShape();
-    SvgDrawShapeLayer.displayName = "SvgDrawShapeLayer";
-  }
-});
 function unitAtlasUrl(unit) {
   return unit.spriteSheet?.url ?? null;
 }
@@ -28380,9 +28221,6 @@ var init_molecules = __esm({
     init_TimerDisplay();
     init_DialogueBubble();
     init_ChoiceButton();
-    init_SvgDrawShape();
-    init_SvgDrawGroup();
-    init_SvgDrawText();
     init_ControlGrid();
     init_StatBadge();
     init_GameHud();
@@ -28390,8 +28228,6 @@ var init_molecules = __esm({
     init_StateGraph();
     init_Canvas2D();
     init_Canvas();
-    init_SvgDrawShapeLayer();
-    init_SvgStage();
     init_useUnitSpriteAtlas();
     init_GameAudioToggle();
     init_useGameAudio();
@@ -29009,13 +28845,13 @@ var init_MapView = __esm({
         shadowSize: [41, 41]
       });
       L.Marker.prototype.options.icon = defaultIcon;
-      const { useEffect: useEffect66, useRef: useRef64, useCallback: useCallback107, useState: useState102 } = React74__namespace.default;
+      const { useEffect: useEffect65, useRef: useRef63, useCallback: useCallback106, useState: useState102 } = React74__namespace.default;
       const { Typography: Typography2 } = await Promise.resolve().then(() => (init_Typography(), Typography_exports));
       const { useEventBus: useEventBus2 } = await Promise.resolve().then(() => (init_useEventBus(), useEventBus_exports));
       function MapUpdater({ centerLat, centerLng, zoom }) {
         const map = useMap();
-        const prevRef = useRef64({ centerLat, centerLng, zoom });
-        useEffect66(() => {
+        const prevRef = useRef63({ centerLat, centerLng, zoom });
+        useEffect65(() => {
           const prev = prevRef.current;
           if (prev.centerLat !== centerLat || prev.centerLng !== centerLng || prev.zoom !== zoom) {
             map.setView([centerLat, centerLng], zoom);
@@ -29026,7 +28862,7 @@ var init_MapView = __esm({
       }
       function MapClickHandler({ onMapClick }) {
         const map = useMap();
-        useEffect66(() => {
+        useEffect65(() => {
           if (!onMapClick) return;
           const handler = (e) => {
             onMapClick(e.latlng.lat, e.latlng.lng);
@@ -29055,7 +28891,7 @@ var init_MapView = __esm({
       }) {
         const eventBus = useEventBus2();
         const [clickedPosition, setClickedPosition] = useState102(null);
-        const handleMapClick = useCallback107((lat, lng) => {
+        const handleMapClick = useCallback106((lat, lng) => {
           if (showClickedPin) {
             setClickedPosition({ lat, lng });
           }
@@ -29064,7 +28900,7 @@ var init_MapView = __esm({
             eventBus.emit(`UI:${mapClickEvent}`, { latitude: lat, longitude: lng });
           }
         }, [onMapClick, mapClickEvent, eventBus, showClickedPin]);
-        const handleMarkerClick = useCallback107((marker) => {
+        const handleMarkerClick = useCallback106((marker) => {
           onMarkerClick?.(marker);
           if (markerClickEvent) {
             eventBus.emit(`UI:${markerClickEvent}`, { ...marker });
@@ -39839,6 +39675,16 @@ var init_DetailPanel = __esm({
     exports.DetailPanel.displayName = "DetailPanel";
   }
 });
+
+// components/game/atoms/DrawGroup.tsx
+function DrawGroup(_props) {
+  return null;
+}
+var init_DrawGroup = __esm({
+  "components/game/atoms/DrawGroup.tsx"() {
+    "use client";
+  }
+});
 function extractTitle(children) {
   if (!React74__namespace.default.isValidElement(children)) return void 0;
   const props = children.props;
@@ -45542,6 +45388,7 @@ var init_component_registry_generated = __esm({
     init_DocSidebar();
     init_DocTOC();
     init_DocumentViewer();
+    init_DrawGroup();
     init_DrawShape();
     init_DrawShapeLayer();
     init_DrawSprite();
@@ -45685,10 +45532,6 @@ var init_component_registry_generated = __esm({
     init_SubagentTracePanel();
     init_SvgBranch();
     init_SvgConnection();
-    init_SvgDrawGroup();
-    init_SvgDrawShape();
-    init_SvgDrawShapeLayer();
-    init_SvgDrawText();
     init_SvgFlow();
     init_SvgGrid();
     init_SvgLobe();
@@ -45699,7 +45542,6 @@ var init_component_registry_generated = __esm({
     init_SvgRing();
     init_SvgShield();
     init_SvgStack();
-    init_SvgStage();
     init_SwipeableRow();
     init_Switch();
     init_TabbedContainer();
@@ -45813,6 +45655,7 @@ var init_component_registry_generated = __esm({
       "DocSidebar": exports.DocSidebar,
       "DocTOC": exports.DocTOC,
       "DocumentViewer": exports.DocumentViewer,
+      "DrawGroup": DrawGroup,
       "DrawShape": DrawShape,
       "DrawShapeLayer": DrawShapeLayer,
       "DrawSprite": DrawSprite,
@@ -45961,10 +45804,6 @@ var init_component_registry_generated = __esm({
       "SubagentTracePanel": exports.SubagentTracePanel,
       "SvgBranch": exports.SvgBranch,
       "SvgConnection": exports.SvgConnection,
-      "SvgDrawGroup": SvgDrawGroup,
-      "SvgDrawShape": SvgDrawShape,
-      "SvgDrawShapeLayer": SvgDrawShapeLayer,
-      "SvgDrawText": SvgDrawText,
       "SvgFlow": exports.SvgFlow,
       "SvgGrid": exports.SvgGrid,
       "SvgLobe": exports.SvgLobe,
@@ -45975,7 +45814,6 @@ var init_component_registry_generated = __esm({
       "SvgRing": exports.SvgRing,
       "SvgShield": exports.SvgShield,
       "SvgStack": exports.SvgStack,
-      "SvgStage": SvgStage,
       "SwipeableRow": exports.SwipeableRow,
       "Switch": exports.Switch,
       "TabbedContainer": exports.TabbedContainer,
@@ -49492,11 +49330,6 @@ exports.StateGraph = StateGraph;
 exports.StateJsonView = StateJsonView;
 exports.StateNode = StateNode2;
 exports.StatusBar = StatusBar;
-exports.SvgDrawGroup = SvgDrawGroup;
-exports.SvgDrawShape = SvgDrawShape;
-exports.SvgDrawShapeLayer = SvgDrawShapeLayer;
-exports.SvgDrawText = SvgDrawText;
-exports.SvgStage = SvgStage;
 exports.TableView = TableView;
 exports.TerrainPalette = TerrainPalette;
 exports.TimeSlotCell = TimeSlotCell;