@almadar/ui 5.124.0 → 5.126.0

package/dist/runtime/index.js

@@ -1,6 +1,6 @@
 import * as React82 from 'react';
 import React82__default, { createContext, useContext, useMemo, useRef, useEffect, useCallback, Suspense, useState, useSyncExternalStore, useLayoutEffect, lazy, useId } from 'react';
-import { EventBusContext, useTraitScopeChain, useEntitySchemaOptional, useEntitySchema, getAllPages, matchPath, OrbitalProvider, TraitScopeProvider, ServerBridgeProvider, useCurrentPagePath, useGameAudioContextOptional, VerificationProvider, EntitySchemaProvider, OrbitalThemeProvider, useServerBridge } from '@almadar/ui/providers';
+import { EventBusContext, useTraitScopeChain, useEntitySchemaOptional, useEntitySchema, getAllPages, matchPathAmong, OrbitalProvider, TraitScopeProvider, ServerBridgeProvider, useCurrentPagePath, useGameAudioContextOptional, VerificationProvider, EntitySchemaProvider, OrbitalThemeProvider, useServerBridge } from '@almadar/ui/providers';
 export { EntitySchemaProvider, ServerBridgeProvider, TraitContext, TraitProvider, useEntitySchema, useEntitySchemaOptional, useServerBridge, useTrait, useTraitContext } from '@almadar/ui/providers';
 import { createLogger, setNamespaceLevel, isLogLevelEnabled } from '@almadar/logger';
 import { clsx } from 'clsx';
@@ -18483,17 +18483,27 @@ function getWeekDays(start) {
   }
   return days;
 }
-function generateDefaultTimeSlots() {
+function generateDefaultTimeSlots(events2) {
+  let first = DEFAULT_FIRST_HOUR;
+  let last = DEFAULT_LAST_HOUR;
+  for (const ev of events2) {
+    const start = new Date(ev.startTime);
+    if (Number.isNaN(start.getTime())) continue;
+    const hour = start.getHours();
+    if (hour < first) first = hour;
+    if (hour > last) last = hour;
+  }
   const slots = [];
-  for (let hour = 9; hour <= 17; hour++) {
-    slots.push(`${hour.toString().padStart(2, "0")}:00`);
+  for (let hour = first; hour <= last; hour++) {
+    slots.push(slotLabel(hour));
   }
   return slots;
 }
 function eventInSlot(event, day, slotTime) {
   const eventStart = new Date(event.startTime);
-  const [slotHour, slotMinute] = slotTime.split(":").map(Number);
-  return eventStart.toDateString() === day.toDateString() && eventStart.getHours() === slotHour && eventStart.getMinutes() === slotMinute;
+  if (Number.isNaN(eventStart.getTime())) return false;
+  const [slotHour] = slotTime.split(":").map(Number);
+  return eventStart.toDateString() === day.toDateString() && eventStart.getHours() === slotHour;
 }
 function CalendarGrid({
   weekStart,
@@ -18522,8 +18532,8 @@ function CalendarGrid({
     [resolvedWeekStart]
   );
   const resolvedTimeSlots = useMemo(
-    () => timeSlots ?? generateDefaultTimeSlots(),
-    [timeSlots]
+    () => timeSlots ?? generateDefaultTimeSlots(evs),
+    [timeSlots, evs]
   );
   const visibleCount = useDayWindow(dayWindow);
   const [dayOffset, setDayOffset] = useState(0);
@@ -18710,7 +18720,7 @@ function CalendarGrid({
     }
   );
 }
-var SHORT_DATE;
+var SHORT_DATE, DEFAULT_FIRST_HOUR, DEFAULT_LAST_HOUR, slotLabel;
 var init_CalendarGrid = __esm({
   "components/core/molecules/CalendarGrid.tsx"() {
     "use client";
@@ -18725,6 +18735,9 @@ var init_CalendarGrid = __esm({
     init_useEventBus();
     init_useSwipeGesture();
     SHORT_DATE = { month: "short", day: "numeric" };
+    DEFAULT_FIRST_HOUR = 9;
+    DEFAULT_LAST_HOUR = 17;
+    slotLabel = (hour) => `${hour.toString().padStart(2, "0")}:00`;
     CalendarGrid.displayName = "CalendarGrid";
   }
 });
@@ -22795,13 +22808,13 @@ function DataGrid({
                         }
                       ),
                       /* @__PURE__ */ jsxs(VStack, { gap: "xs", className: "flex-1 min-w-0", children: [
-                        titleValue !== void 0 && titleValue !== null && /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "items-center", children: [
+                        titleValue !== void 0 && titleValue !== null && /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "items-center min-w-0", children: [
                           titleField?.icon && renderIconInput(titleField.icon, { size: "sm", className: "text-primary flex-shrink-0" }),
                           /* @__PURE__ */ jsx(
                             Typography,
                             {
                               variant: titleField?.variant === "h3" ? "h3" : "h4",
-                              className: "font-semibold truncate",
+                              className: "font-semibold truncate min-w-0",
                               children: String(titleValue)
                             }
                           )
@@ -22859,7 +22872,7 @@ function DataGrid({
                         )
                       ] }, field.name);
                     }) }) }),
-                    primaryActions.length > 0 && /* @__PURE__ */ jsx(Box, { className: "px-4 py-3 mt-auto border-t border-border", children: /* @__PURE__ */ jsxs(HStack, { gap: "sm", className: "justify-end", children: [
+                    primaryActions.length > 0 && /* @__PURE__ */ jsx(Box, { className: "px-4 py-3 mt-auto border-t border-border", children: /* @__PURE__ */ jsxs(HStack, { gap: "sm", className: "justify-end flex-wrap", children: [
                       (maxInlineActions != null ? primaryActions.slice(0, maxInlineActions) : primaryActions).map((action, idx) => /* @__PURE__ */ jsxs(
                         Button,
                         {
@@ -27808,7 +27821,7 @@ function TableView({
             col.key
           );
         }),
-        hasActions && /* @__PURE__ */ jsx(Box, { "aria-hidden": true })
+        hasActions && /* @__PURE__ */ jsx(Box, { "aria-hidden": true, className: "sticky right-0 bg-[var(--color-surface-subtle)]" })
       ]
     }
   );
@@ -27852,41 +27865,54 @@ function TableView({
             }
             return /* @__PURE__ */ jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsx("span", { className: "truncate", children: formatCell(raw, col.format) }) }, col.key);
           }),
-          itemActions && itemActions.length > 0 && /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "justify-end flex-shrink-0 opacity-60 group-hover:opacity-100 transition-opacity", children: [
-            (maxInlineActions != null ? itemActions.slice(0, maxInlineActions) : itemActions).map((action, i) => /* @__PURE__ */ jsxs(
-              Button,
-              {
-                variant: action.variant ?? "ghost",
-                size: "sm",
-                onClick: handleActionClick(action, row),
-                "data-testid": `action-${action.event}`,
-                "data-row-id": String(row.id),
-                className: cn(action.variant === "danger" && "text-error hover:bg-error/10"),
-                children: [
-                  action.icon && renderIconInput3(action.icon, { size: "xs", className: "mr-1" }),
-                  action.label
-                ]
-              },
-              i
-            )),
-            maxInlineActions != null && itemActions.length > maxInlineActions && /* @__PURE__ */ jsx(
-              Menu,
-              {
-                position: "bottom-end",
-                trigger: /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", children: /* @__PURE__ */ jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
-                items: itemActions.slice(maxInlineActions).map((action) => ({
-                  label: action.label,
-                  icon: action.icon,
-                  event: action.event,
-                  variant: action.variant === "danger" ? "danger" : "default",
-                  onClick: () => eventBus.emit(`UI:${action.event}`, {
-                    id: row.id,
-                    row
-                  })
-                }))
-              }
-            )
-          ] })
+          itemActions && itemActions.length > 0 && /* @__PURE__ */ jsxs(
+            HStack,
+            {
+              gap: "xs",
+              className: cn(
+                // Pinned: the fixed column tracks routinely overflow the caller's
+                // scroll container, which used to leave the actions off-screen.
+                // Opaque so scrolled cells pass underneath it.
+                "justify-end flex-shrink-0 sticky right-0 z-[1] transition-colors",
+                lk.striped && index % 2 === 1 ? "bg-[var(--color-surface-subtle)]" : "bg-[var(--color-card)] group-hover:bg-[var(--color-surface-subtle)]"
+              ),
+              children: [
+                (maxInlineActions != null ? itemActions.slice(0, maxInlineActions) : itemActions).map((action, i) => /* @__PURE__ */ jsxs(
+                  Button,
+                  {
+                    variant: action.variant ?? "ghost",
+                    size: "sm",
+                    onClick: handleActionClick(action, row),
+                    "data-testid": `action-${action.event}`,
+                    "data-row-id": String(row.id),
+                    className: cn(action.variant === "danger" && "text-error hover:bg-error/10"),
+                    children: [
+                      action.icon && renderIconInput3(action.icon, { size: "xs", className: "mr-1" }),
+                      action.label
+                    ]
+                  },
+                  i
+                )),
+                maxInlineActions != null && itemActions.length > maxInlineActions && /* @__PURE__ */ jsx(
+                  Menu,
+                  {
+                    position: "bottom-end",
+                    trigger: /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", children: /* @__PURE__ */ jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
+                    items: itemActions.slice(maxInlineActions).map((action) => ({
+                      label: action.label,
+                      icon: action.icon,
+                      event: action.event,
+                      variant: action.variant === "danger" ? "danger" : "default",
+                      onClick: () => eventBus.emit(`UI:${action.event}`, {
+                        id: row.id,
+                        row
+                      })
+                    }))
+                  }
+                )
+              ]
+            }
+          )
         ]
       }
     );
@@ -36483,6 +36509,16 @@ function normalizeFieldDefs(fields) {
     return String(f3);
   });
 }
+function buildFieldLabelMap(fields) {
+  const map = {};
+  if (!fields) return map;
+  for (const f3 of fields) {
+    if (typeof f3 === "object" && "key" in f3 && f3.header !== void 0 && f3.header !== "") {
+      map[f3.key] = f3.header;
+    }
+  }
+  return map;
+}
 function buildFieldTypeMap(fields) {
   const map = {};
   if (!fields) return map;
@@ -36534,6 +36570,8 @@ var init_DetailPanel = __esm({
       };
       const effectiveFieldNames = isFieldDefArray(propFields) ? normalizeFieldDefs(propFields) : fieldNames;
       const fieldTypeMap = isFieldDefArray(propFields) ? buildFieldTypeMap(propFields) : {};
+      const fieldLabelMap = isFieldDefArray(propFields) ? buildFieldLabelMap(propFields) : {};
+      const labelFor = (field) => fieldLabelMap[field] ?? formatFieldLabel(field);
       const handleActionClick = useCallback(
         (action, data2) => {
           if (action.navigatesTo) {
@@ -36569,7 +36607,7 @@ var init_DetailPanel = __esm({
             if (typeof field === "string") {
               const value = getNestedValue(normalizedData, field);
               return {
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: formatFieldValue(value, field),
                 icon: getFieldIcon(field)
               };
@@ -36580,7 +36618,10 @@ var init_DetailPanel = __esm({
       }
       if (normalizedData && effectiveFieldNames) {
         const primaryField = effectiveFieldNames[0];
-        if (!title && primaryField && normalizedData[primaryField]) {
+        const titleDerivedFromPrimary = Boolean(
+          !title && primaryField && normalizedData[primaryField]
+        );
+        if (titleDerivedFromPrimary) {
           title = String(normalizedData[primaryField]);
         }
         const statusFields = effectiveFieldNames.filter(
@@ -36599,16 +36640,16 @@ var init_DetailPanel = __esm({
           (f3) => f3.toLowerCase().includes("description") || f3.toLowerCase().includes("note")
         );
         const otherFields = effectiveFieldNames.filter(
-          (f3) => f3 !== primaryField && !statusFields.includes(f3) && !progressFields.includes(f3) && !metricFields.includes(f3) && !dateFields.includes(f3) && !descriptionFields.includes(f3)
+          (f3) => (!titleDerivedFromPrimary || f3 !== primaryField) && !statusFields.includes(f3) && !progressFields.includes(f3) && !metricFields.includes(f3) && !dateFields.includes(f3) && !descriptionFields.includes(f3)
         );
         sections = [];
         if (statusFields.length > 0 || otherFields.length > 0) {
           const overviewFields = [];
-          [...statusFields, ...otherFields.slice(0, 3)].forEach((field) => {
+          [...statusFields, ...otherFields].forEach((field) => {
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               overviewFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -36624,7 +36665,7 @@ var init_DetailPanel = __esm({
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               metricsFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -36640,7 +36681,7 @@ var init_DetailPanel = __esm({
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               timelineFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -36656,7 +36697,7 @@ var init_DetailPanel = __esm({
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               descFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -36704,7 +36745,7 @@ var init_DetailPanel = __esm({
             if (typeof field === "string") {
               const value = normalizedData ? getNestedValue(normalizedData, field) : void 0;
               allFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -43226,6 +43267,13 @@ function MaybeTraitScope({
   if (wrap) {
     return /* @__PURE__ */ jsx(TraitScopeProvider, { orbital, trait: sourceTrait, children });
   }
+  if (sourceTrait !== void 0 && schemaCtx !== null) {
+    scopeWrapLog.warn("decline", {
+      sourceTrait,
+      orbitalsByTraitSize: schemaCtx.orbitalsByTrait.size,
+      reason: "sourceTrait not in orbitalsByTrait \u2014 children render unscoped"
+    });
+  }
   return /* @__PURE__ */ jsx(Fragment, { children });
 }
 function UISlotComponent({
@@ -43523,7 +43571,7 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
     const childId = `${parentId}-${index}`;
     const childPath = parentPath === "root" ? `root.children.${index}` : `${parentPath}.children.${index}`;
     const childAsRecord = child;
-    const { type: _childType, props: nestedProps, _id: _childNodeId, children: _childChildren, ...flatProps } = childAsRecord;
+    const { type: _childType, props: nestedProps, _id: _childNodeId, _sourceTrait: childSourceTrait, children: _childChildren, ...flatProps } = childAsRecord;
     const resolvedProps = nestedProps !== void 0 ? nestedProps : flatProps;
     if (_childChildren !== void 0 && nestedProps === void 0) {
       resolvedProps.children = _childChildren;
@@ -43538,11 +43586,14 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       // (e.g. form-section inside a stack) can resolve entityDef via
       // the trait's linkedEntity for form-field enrichment. The orbCtx
       // (slot/transition/state/entity) propagates the same way so every
-      // nested node carries a complete contextual-edit address.
-      ...sourceTrait !== void 0 && { sourceTrait },
+      // nested node carries a complete contextual-edit address. A child
+      // carrying its own `_sourceTrait` (multi-source slot stack) owns it
+      // outright — inheriting the synthetic wrapper's sentinel instead
+      // would erase the real owner.
+      ...childSourceTrait !== void 0 ? { sourceTrait: childSourceTrait } : sourceTrait !== void 0 && { sourceTrait },
       ...orbCtx ?? {}
     };
-    return /* @__PURE__ */ jsx(
+    const renderedChild = /* @__PURE__ */ jsx(
       SlotContentRenderer,
       {
         content: childContent,
@@ -43551,6 +43602,7 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       },
       childId
     );
+    return childSourceTrait !== void 0 ? /* @__PURE__ */ jsx(MaybeTraitScope, { sourceTrait: childSourceTrait, children: renderedChild }, childId) : renderedChild;
   });
 }
 function toDrawableNodes(children) {
@@ -45834,11 +45886,9 @@ function OrbPreview({
   }, [parsedSchema]);
   const initialPageMatch = useMemo(() => {
     if (!initialPagePath) return void 0;
-    for (const { page } of pages) {
-      const params = page.path ? matchPath(page.path, initialPagePath) : null;
-      if (params !== null) return { name: page.name, params };
-    }
-    return void 0;
+    const hit = matchPathAmong(pages, initialPagePath, (entry) => entry.page.path);
+    if (!hit) return void 0;
+    return { name: hit.candidate.page.name, params: hit.params };
   }, [pages, initialPagePath]);
   const initialPageName = initialPageMatch?.name;
   const [currentPage, setCurrentPage] = useState(initialPageName);
@@ -45852,16 +45902,9 @@ function OrbPreview({
     }
   }, [initialPagePath, initialPageName, initialPageMatch]);
   const handleNavigate = useCallback((path) => {
-    let match;
-    let params = {};
-    for (const entry of pages) {
-      const m = entry.page.path ? matchPath(entry.page.path, path) : null;
-      if (m !== null) {
-        match = entry;
-        params = m;
-        break;
-      }
-    }
+    const hit = matchPathAmong(pages, path, (entry) => entry.page.path);
+    const match = hit?.candidate;
+    const params = hit?.params ?? {};
     navLog.debug("handleNavigate", () => ({
       path,
       matched: match?.page.name ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "5.124.0",
+  "version": "5.126.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [
@@ -117,12 +117,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^10.33.0",
-    "@almadar/evaluator": "^2.34.0",
-    "@almadar/logger": "^1.9.0",
-    "@almadar/runtime": "^6.36.0",
-    "@almadar/std": "^16.143.0",
-    "@almadar/syntax": "^1.11.0",
+    "@almadar/core": "^10.34.0",
+    "@almadar/evaluator": "^2.35.0",
+    "@almadar/logger": "^1.10.0",
+    "@almadar/runtime": "^6.37.0",
+    "@almadar/std": "^16.144.0",
+    "@almadar/syntax": "^1.12.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
@@ -208,9 +208,10 @@
     "tsup": "^8.0.0",
     "tsx": "^4.7.0",
     "turbo": "^2.8.17",
-    "typescript": "^5.4.0",
     "vite": "^5.2.0",
-    "vitest": "^3.2.6"
+    "vitest": "^3.2.6",
+    "@typescript/native": "npm:typescript@^7.0.2",
+    "typescript": "npm:@typescript/typescript6@^6.0.2"
   },
   "repository": {
     "type": "git",
@@ -230,7 +231,7 @@
     "@almadar/core": "$@almadar/core"
   },
   "scripts": {
-    "build": "NODE_OPTIONS=--max-old-space-size=8192 tsup",
+    "build": "rm -rf dist && NODE_OPTIONS=--max-old-space-size=8192 tsup",
     "build:watch": "tsup --watch",
     "typecheck": "tsc --noEmit",
     "lint": "eslint --no-warn-ignored --max-warnings 0 .",