@almadar/ui 5.125.0 → 5.127.0

package/dist/runtime/index.cjs

@@ -18511,6 +18511,32 @@ var init_ButtonGroup = __esm({
     ButtonGroup.displayName = "ButtonGroup";
   }
 });
+
+// lib/getNestedValue.ts
+function getNestedValue(obj, path) {
+  if (obj === null || obj === void 0 || !path) {
+    return void 0;
+  }
+  if (!path.includes(".")) {
+    return obj[path];
+  }
+  const parts = path.split(".");
+  let value = obj;
+  for (const part of parts) {
+    if (value === null || value === void 0) {
+      return void 0;
+    }
+    if (typeof value !== "object" || Array.isArray(value)) {
+      return void 0;
+    }
+    value = value[part];
+  }
+  return value;
+}
+var init_getNestedValue = __esm({
+  "lib/getNestedValue.ts"() {
+  }
+});
 function dayWindowForViewport(width) {
   if (width <= 640) return 1;
   if (width <= 1024) return 3;
@@ -18557,17 +18583,31 @@ function getWeekDays(start) {
   }
   return days;
 }
-function generateDefaultTimeSlots() {
+function eventStartDate(event, startField) {
+  const raw = getNestedValue(event, startField);
+  return new Date(raw ?? "");
+}
+function generateDefaultTimeSlots(events2, startField) {
+  let first = DEFAULT_FIRST_HOUR;
+  let last = DEFAULT_LAST_HOUR;
+  for (const ev of events2) {
+    const start = eventStartDate(ev, startField);
+    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;
+function eventInSlot(event, day, slotTime, startField) {
+  const eventStart = eventStartDate(event, startField);
+  if (Number.isNaN(eventStart.getTime())) return false;
+  const [slotHour] = slotTime.split(":").map(Number);
+  return eventStart.toDateString() === day.toDateString() && eventStart.getHours() === slotHour;
 }
 function CalendarGrid({
   weekStart,
@@ -18581,7 +18621,12 @@ function CalendarGrid({
   longPressPayload,
   swipeLeftEvent,
   swipeRightEvent,
-  dayWindow = "auto"
+  dayWindow = "auto",
+  titleField = "title",
+  startField = "startTime",
+  colorField = "color",
+  children,
+  renderItem
 }) {
   const evs = Array.isArray(events2) ? events2 : events2 ? [events2] : [];
   const eventBus = useEventBus();
@@ -18596,8 +18641,8 @@ function CalendarGrid({
     [resolvedWeekStart]
   );
   const resolvedTimeSlots = React82.useMemo(
-    () => timeSlots ?? generateDefaultTimeSlots(),
-    [timeSlots]
+    () => timeSlots ?? generateDefaultTimeSlots(evs, startField),
+    [timeSlots, evs, startField]
   );
   const visibleCount = useDayWindow(dayWindow);
   const [dayOffset, setDayOffset] = React82.useState(0);
@@ -18634,9 +18679,9 @@ function CalendarGrid({
   );
   const eventsForDayCount = React82.useCallback(
     (day) => evs.filter(
-      (ev) => new Date(ev.startTime).toDateString() === day.toDateString()
+      (ev) => eventStartDate(ev, startField).toDateString() === day.toDateString()
     ).length,
-    [events2]
+    [events2, startField]
   );
   const swipeCallbacks = React82.useMemo(() => ({
     onSwipeLeft: swipeLeftEvent ? () => eventBus.emit(`UI:${swipeLeftEvent}`, {}) : void 0,
@@ -18655,8 +18700,11 @@ function CalendarGrid({
       eventBus.emit(`UI:${longPressEvent}`, { date: day.toISOString(), time, ...longPressPayload });
     }, 500);
   }, [longPressEvent, longPressPayload, eventBus]);
+  const renderChip = children ?? renderItem;
   const renderEvent = (event) => {
-    const color = event.color;
+    const color = getNestedValue(event, colorField);
+    const label = String(getNestedValue(event, titleField) ?? "");
+    const eventIndex = evs.indexOf(event);
     return /* @__PURE__ */ jsxRuntime.jsx(
       Box,
       {
@@ -18668,7 +18716,7 @@ function CalendarGrid({
           color ? color : "bg-primary/10 border-primary/30 text-primary"
         ),
         onClick: (e) => handleEventClick(event, e),
-        children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "small", className: "truncate font-medium", children: event.title })
+        children: renderChip ? renderChip(event, eventIndex) : /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "small", className: "truncate font-medium", children: label })
       },
       event.id
     );
@@ -18752,7 +18800,7 @@ function CalendarGrid({
                 ) }),
                 visibleDays.map((day) => {
                   const slotEvents = evs.filter(
-                    (ev) => eventInSlot(ev, day, time)
+                    (ev) => eventInSlot(ev, day, time, startField)
                   );
                   const isToday = day.toDateString() === (/* @__PURE__ */ new Date()).toDateString();
                   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -18784,11 +18832,12 @@ 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";
     init_cn();
+    init_getNestedValue();
     init_Box();
     init_Button();
     init_Stack();
@@ -18799,35 +18848,12 @@ 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";
   }
 });
-
-// lib/getNestedValue.ts
-function getNestedValue(obj, path) {
-  if (obj === null || obj === void 0 || !path) {
-    return void 0;
-  }
-  if (!path.includes(".")) {
-    return obj[path];
-  }
-  const parts = path.split(".");
-  let value = obj;
-  for (const part of parts) {
-    if (value === null || value === void 0) {
-      return void 0;
-    }
-    if (typeof value !== "object" || Array.isArray(value)) {
-      return void 0;
-    }
-    value = value[part];
-  }
-  return value;
-}
-var init_getNestedValue = __esm({
-  "lib/getNestedValue.ts"() {
-  }
-});
 var Pagination;
 var init_Pagination = __esm({
   "components/core/molecules/Pagination.tsx"() {
@@ -43328,6 +43354,13 @@ function MaybeTraitScope({
   if (wrap) {
     return /* @__PURE__ */ jsxRuntime.jsx(providers.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__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children });
 }
 function UISlotComponent({
@@ -43625,7 +43658,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;
@@ -43640,11 +43673,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__ */ jsxRuntime.jsx(
+    const renderedChild = /* @__PURE__ */ jsxRuntime.jsx(
       SlotContentRenderer,
       {
         content: childContent,
@@ -43653,6 +43689,7 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       },
       childId
     );
+    return childSourceTrait !== void 0 ? /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait: childSourceTrait, children: renderedChild }, childId) : renderedChild;
   });
 }
 function toDrawableNodes(children) {
@@ -45386,7 +45423,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           crossTraitLog.debug("listen:fired", { busKey, targetTrait: binding.trait.name, triggers: listen.triggers });
           enqueueAndDrain(
             listen.triggers,
-            core.applyListenPayloadMapping(listen.payloadMapping, event.payload),
+            core.applyListenPayloadMapping(listen.payloadMapping, event.payload, evaluator.evaluateListenPayloadExpr),
             binding.trait.name
           );
         });

package/dist/runtime/index.js

@@ -11,7 +11,7 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { createPortal } from 'react-dom';
 import { useTranslate } from '@almadar/ui/hooks';
 import { useUISlots, UISlotProvider, useTheme } from '@almadar/ui/context';
-import { evaluateGuard, evaluate, createMinimalContext, executeEffects } from '@almadar/evaluator';
+import { evaluateGuard, evaluateListenPayloadExpr, evaluate, createMinimalContext, executeEffects } from '@almadar/evaluator';
 import { wrapCallbackForEvent, prepareSchemaForPreview, perfStore, pushPerfEntry, collectTraitRefsFromResolvedTrait, buildOrbitalsByTrait, collectEmbeddedTraits } from '@almadar/runtime/ui';
 export { PERF_NAMESPACE, adjustSchemaForMockData, buildMockData, clearPerf, perfEnd, perfStart, perfTime, prepareSchemaForPreview, wrapCallbackForEvent } from '@almadar/runtime/ui';
 import { Link, Outlet, useLocation } from 'react-router-dom';
@@ -18437,6 +18437,32 @@ var init_ButtonGroup = __esm({
     ButtonGroup.displayName = "ButtonGroup";
   }
 });
+
+// lib/getNestedValue.ts
+function getNestedValue(obj, path) {
+  if (obj === null || obj === void 0 || !path) {
+    return void 0;
+  }
+  if (!path.includes(".")) {
+    return obj[path];
+  }
+  const parts = path.split(".");
+  let value = obj;
+  for (const part of parts) {
+    if (value === null || value === void 0) {
+      return void 0;
+    }
+    if (typeof value !== "object" || Array.isArray(value)) {
+      return void 0;
+    }
+    value = value[part];
+  }
+  return value;
+}
+var init_getNestedValue = __esm({
+  "lib/getNestedValue.ts"() {
+  }
+});
 function dayWindowForViewport(width) {
   if (width <= 640) return 1;
   if (width <= 1024) return 3;
@@ -18483,17 +18509,31 @@ function getWeekDays(start) {
   }
   return days;
 }
-function generateDefaultTimeSlots() {
+function eventStartDate(event, startField) {
+  const raw = getNestedValue(event, startField);
+  return new Date(raw ?? "");
+}
+function generateDefaultTimeSlots(events2, startField) {
+  let first = DEFAULT_FIRST_HOUR;
+  let last = DEFAULT_LAST_HOUR;
+  for (const ev of events2) {
+    const start = eventStartDate(ev, startField);
+    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;
+function eventInSlot(event, day, slotTime, startField) {
+  const eventStart = eventStartDate(event, startField);
+  if (Number.isNaN(eventStart.getTime())) return false;
+  const [slotHour] = slotTime.split(":").map(Number);
+  return eventStart.toDateString() === day.toDateString() && eventStart.getHours() === slotHour;
 }
 function CalendarGrid({
   weekStart,
@@ -18507,7 +18547,12 @@ function CalendarGrid({
   longPressPayload,
   swipeLeftEvent,
   swipeRightEvent,
-  dayWindow = "auto"
+  dayWindow = "auto",
+  titleField = "title",
+  startField = "startTime",
+  colorField = "color",
+  children,
+  renderItem
 }) {
   const evs = Array.isArray(events2) ? events2 : events2 ? [events2] : [];
   const eventBus = useEventBus();
@@ -18522,8 +18567,8 @@ function CalendarGrid({
     [resolvedWeekStart]
   );
   const resolvedTimeSlots = useMemo(
-    () => timeSlots ?? generateDefaultTimeSlots(),
-    [timeSlots]
+    () => timeSlots ?? generateDefaultTimeSlots(evs, startField),
+    [timeSlots, evs, startField]
   );
   const visibleCount = useDayWindow(dayWindow);
   const [dayOffset, setDayOffset] = useState(0);
@@ -18560,9 +18605,9 @@ function CalendarGrid({
   );
   const eventsForDayCount = useCallback(
     (day) => evs.filter(
-      (ev) => new Date(ev.startTime).toDateString() === day.toDateString()
+      (ev) => eventStartDate(ev, startField).toDateString() === day.toDateString()
     ).length,
-    [events2]
+    [events2, startField]
   );
   const swipeCallbacks = useMemo(() => ({
     onSwipeLeft: swipeLeftEvent ? () => eventBus.emit(`UI:${swipeLeftEvent}`, {}) : void 0,
@@ -18581,8 +18626,11 @@ function CalendarGrid({
       eventBus.emit(`UI:${longPressEvent}`, { date: day.toISOString(), time, ...longPressPayload });
     }, 500);
   }, [longPressEvent, longPressPayload, eventBus]);
+  const renderChip = children ?? renderItem;
   const renderEvent = (event) => {
-    const color = event.color;
+    const color = getNestedValue(event, colorField);
+    const label = String(getNestedValue(event, titleField) ?? "");
+    const eventIndex = evs.indexOf(event);
     return /* @__PURE__ */ jsx(
       Box,
       {
@@ -18594,7 +18642,7 @@ function CalendarGrid({
           color ? color : "bg-primary/10 border-primary/30 text-primary"
         ),
         onClick: (e) => handleEventClick(event, e),
-        children: /* @__PURE__ */ jsx(Typography, { variant: "small", className: "truncate font-medium", children: event.title })
+        children: renderChip ? renderChip(event, eventIndex) : /* @__PURE__ */ jsx(Typography, { variant: "small", className: "truncate font-medium", children: label })
       },
       event.id
     );
@@ -18678,7 +18726,7 @@ function CalendarGrid({
                 ) }),
                 visibleDays.map((day) => {
                   const slotEvents = evs.filter(
-                    (ev) => eventInSlot(ev, day, time)
+                    (ev) => eventInSlot(ev, day, time, startField)
                   );
                   const isToday = day.toDateString() === (/* @__PURE__ */ new Date()).toDateString();
                   return /* @__PURE__ */ jsx(
@@ -18710,11 +18758,12 @@ 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";
     init_cn();
+    init_getNestedValue();
     init_Box();
     init_Button();
     init_Stack();
@@ -18725,35 +18774,12 @@ 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";
   }
 });
-
-// lib/getNestedValue.ts
-function getNestedValue(obj, path) {
-  if (obj === null || obj === void 0 || !path) {
-    return void 0;
-  }
-  if (!path.includes(".")) {
-    return obj[path];
-  }
-  const parts = path.split(".");
-  let value = obj;
-  for (const part of parts) {
-    if (value === null || value === void 0) {
-      return void 0;
-    }
-    if (typeof value !== "object" || Array.isArray(value)) {
-      return void 0;
-    }
-    value = value[part];
-  }
-  return value;
-}
-var init_getNestedValue = __esm({
-  "lib/getNestedValue.ts"() {
-  }
-});
 var Pagination;
 var init_Pagination = __esm({
   "components/core/molecules/Pagination.tsx"() {
@@ -43254,6 +43280,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({
@@ -43551,7 +43584,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;
@@ -43566,11 +43599,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,
@@ -43579,6 +43615,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) {
@@ -45312,7 +45349,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           crossTraitLog.debug("listen:fired", { busKey, targetTrait: binding.trait.name, triggers: listen.triggers });
           enqueueAndDrain(
             listen.triggers,
-            applyListenPayloadMapping(listen.payloadMapping, event.payload),
+            applyListenPayloadMapping(listen.payloadMapping, event.payload, evaluateListenPayloadExpr),
             binding.trait.name
           );
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "5.125.0",
+  "version": "5.127.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [
@@ -117,11 +117,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^10.34.0",
-    "@almadar/evaluator": "^2.35.0",
+    "@almadar/core": "^10.35.0",
+    "@almadar/evaluator": "^2.36.0",
     "@almadar/logger": "^1.10.0",
-    "@almadar/runtime": "^6.37.0",
-    "@almadar/std": "^16.144.0",
+    "@almadar/runtime": "^6.38.0",
+    "@almadar/std": "^16.145.0",
     "@almadar/syntax": "^1.12.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
@@ -231,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 .",