@almadar/ui 4.22.0 → 4.22.2

package/dist/runtime/index.cjs

@@ -6958,6 +6958,25 @@ var init_renderer = __esm({
     init_init();
   }
 });
+
+// runtime/wrapCallbackForEvent.ts
+function wrapCallbackForEvent(qualifiedEvent, callbackArgs, emit) {
+  const argNames = (callbackArgs ?? []).map((a) => a.name);
+  if (argNames.length === 0) {
+    return () => emit(qualifiedEvent);
+  }
+  return (...args) => {
+    const payload = {};
+    for (let i = 0; i < argNames.length; i += 1) {
+      payload[argNames[i]] = args[i];
+    }
+    emit(qualifiedEvent, payload);
+  };
+}
+var init_wrapCallbackForEvent = __esm({
+  "runtime/wrapCallbackForEvent.ts"() {
+  }
+});
 var variantBorderClasses, variantIconColors, iconMap3, Alert;
 var init_Alert = __esm({
   "components/molecules/Alert.tsx"() {
@@ -18468,6 +18487,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -18489,6 +18509,7 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = React113.useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = React113.useState(pageSize || Infinity);
+  const fieldDefs = fields ?? columns ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -18516,9 +18537,9 @@ function DataGrid({
       return next;
     });
   }, [data, selectionEvent, eventBus]);
-  const titleField = fields.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fields[0];
-  const badgeFields = fields.filter((f3) => f3.variant === "badge" && f3 !== titleField);
-  const bodyFields = fields.filter((f3) => f3 !== titleField && !badgeFields.includes(f3));
+  const titleField = fieldDefs.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fieldDefs[0];
+  const badgeFields = fieldDefs.filter((f3) => f3.variant === "badge" && f3 !== titleField);
+  const bodyFields = fieldDefs.filter((f3) => f3 !== titleField && !badgeFields.includes(f3));
   const primaryActions = itemActions?.filter((a) => a.variant !== "danger") ?? [];
   const dangerActions = itemActions?.filter((a) => a.variant === "danger") ?? [];
   const handleActionClick = (action, itemData) => (e) => {
@@ -18531,7 +18552,7 @@ function DataGrid({
   };
   const hasRenderProp = typeof children === "function";
   React113.useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+    if (data.length > 0 && !hasRenderProp && fieldDefs.length === 0) {
       const renderItemRaw = schemaRenderItem;
       const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
       dataGridLog.warn("renderItem-unresolved", {
@@ -18539,7 +18560,7 @@ function DataGrid({
         renderItemIsFnLambda: isFnLambda
       });
     }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
+  }, [data, hasRenderProp, schemaRenderItem, fieldDefs]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18844,6 +18865,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -18873,6 +18895,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React113__namespace.default.useState(pageSize || Infinity);
+  const fieldDefs = fields ?? columns ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -18887,7 +18910,7 @@ function DataList({
       const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
       dataListLog.warn("renderItem-unresolved", {
         rowCount: data.length,
-        fieldsCount: fields?.length ?? 0,
+        fieldsCount: fieldDefs.length,
         renderItemTypeOf,
         renderItemIsArray: Array.isArray(renderItemRaw),
         renderItemIsFnLambda: isFnLambda,
@@ -18896,11 +18919,11 @@ function DataList({
         sampleRowKeys: sampleKeys
       });
     }
-  }, [data, hasRenderProp, schemaRenderItem, children, fields]);
-  const titleField = fields.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fields[0];
-  const badgeFields = fields.filter((f3) => f3.variant === "badge" && f3 !== titleField);
-  const progressFields = fields.filter((f3) => f3.variant === "progress");
-  const bodyFields = fields.filter(
+  }, [data, hasRenderProp, schemaRenderItem, children, fieldDefs]);
+  const titleField = fieldDefs.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fieldDefs[0];
+  const badgeFields = fieldDefs.filter((f3) => f3.variant === "badge" && f3 !== titleField);
+  const progressFields = fieldDefs.filter((f3) => f3.variant === "progress");
+  const bodyFields = fieldDefs.filter(
     (f3) => f3 !== titleField && !badgeFields.includes(f3) && !progressFields.includes(f3)
   );
   const handleActionClick = (action, itemData) => (e) => {
@@ -18932,7 +18955,7 @@ function DataList({
   if (isMessage) {
     const items2 = data.map((item) => item);
     const groups2 = groupBy ? groupData(items2, groupBy) : [{ label: "", items: items2 }];
-    const contentField = titleField?.name ?? fields[0]?.name ?? "";
+    const contentField = titleField?.name ?? fieldDefs[0]?.name ?? "";
     return /* @__PURE__ */ jsxRuntime.jsx(VStack, { gap: "sm", className: cn("py-2", className), children: groups2.map((group, gi) => /* @__PURE__ */ jsxRuntime.jsxs(React113__namespace.default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsxRuntime.jsx(Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -18940,7 +18963,7 @@ function DataList({
         const sender = senderField ? String(getNestedValue(itemData, senderField) ?? "") : "";
         const isSent = Boolean(currentUser && sender === currentUser);
         const content = getNestedValue(itemData, contentField);
-        const timestampField = fields.find((f3) => f3.format === "date");
+        const timestampField = fieldDefs.find((f3) => f3.format === "date");
         const timestamp = timestampField ? getNestedValue(itemData, timestampField.name) : null;
         return /* @__PURE__ */ jsxRuntime.jsx(
           Box,
@@ -37925,6 +37948,7 @@ function SlotContentRenderer({
       );
     }
   }
+  const eventBus = useEventBus();
   const schemaCtx = useEntitySchemaOptional();
   let entityDef;
   if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
@@ -37946,6 +37970,20 @@ function SlotContentRenderer({
     const { children: _childrenConfig, ...restPropsNoChildren } = content.props;
     const restProps = childrenIsRenderFn ? { ...restPropsNoChildren, children: incomingChildren } : restPropsNoChildren;
     const renderedProps = renderPatternProps(restProps, onDismiss);
+    const patternDef = patterns.getPatternDefinition(content.pattern);
+    const propsSchema = patternDef?.propsSchema;
+    if (propsSchema) {
+      for (const [propKey, propValue] of Object.entries(renderedProps)) {
+        if (typeof propValue !== "string") continue;
+        const propDef = propsSchema[propKey];
+        if (!propDef || propDef.kind !== "callback") continue;
+        renderedProps[propKey] = wrapCallbackForEvent(
+          `UI:${propValue}`,
+          propDef.callbackArgs,
+          (eventKey, payload) => eventBus.emit(eventKey, payload)
+        );
+      }
+    }
     const finalProps = renderedProps;
     const resolvedItems = Array.isArray(
       finalProps.entity
@@ -38070,6 +38108,7 @@ var init_UISlotRenderer = __esm({
     init_logger();
     init_Skeleton();
     init_renderer();
+    init_wrapCallbackForEvent();
     init_TraitFrame();
     init_component_registry_generated();
     scopeWrapLog = createLogger("almadar:ui:scope-wrap");
@@ -39149,6 +39188,9 @@ function useTrait(traitName) {
   return context.getTrait(traitName);
 }
 
+// runtime/index.ts
+init_wrapCallbackForEvent();
+
 // runtime/OrbPreview.tsx
 init_Box();
 init_Typography();
@@ -39927,3 +39969,4 @@ exports.useServerBridge = useServerBridge;
 exports.useTrait = useTrait;
 exports.useTraitContext = useTraitContext;
 exports.useTraitStateMachine = useTraitStateMachine;
+exports.wrapCallbackForEvent = wrapCallbackForEvent;

package/dist/runtime/index.d.ts

@@ -11,6 +11,7 @@ export { useResolvedSchema, type ResolvedSchemaResult, clearSchemaCache } from '
 export { EntitySchemaProvider, useEntitySchema, useEntityDefinition, useEntitySchemaOptional, type EntitySchemaContextValue, type EntitySchemaProviderProps, } from './EntitySchemaContext';
 export { TraitProvider, TraitContext, useTraitContext, useTrait, type TraitContextValue, type TraitInstance, type TraitProviderProps, } from './TraitProvider';
 export type { SlotPatternEntry, SlotSource } from './ui/slot-types';
+export { wrapCallbackForEvent } from './wrapCallbackForEvent';
 export { createClientEffectHandlers, type ClientEventBus, type SlotSetter, type CreateClientEffectHandlersOptions, } from './createClientEffectHandlers';
 export { OrbPreview, type OrbPreviewProps } from './OrbPreview';
 export { BrowserPlayground, type BrowserPlaygroundProps } from './BrowserPlayground';

package/dist/runtime/index.js

@@ -8,7 +8,7 @@ import * as LucideIcons from 'lucide-react';
 import { X, AlertTriangle, Info, AlertCircle, CheckCircle, Loader2, List, Printer, ChevronRight, ChevronLeft, Check, Copy, Code, FileText, WrapText, Trash2, Settings, Menu as Menu$1, Search, Bell, ChevronDown, LogOut, ZoomOut, ZoomIn, Download, FileQuestion, Inbox, XCircle, Filter, Plus, Pause, Play, RotateCcw, Package, Calendar, Pencil, Eye, MoreHorizontal, Image as Image$1, Upload, Minus, ArrowLeft, HelpCircle, ChevronUp, Eraser, Star, TrendingUp, TrendingDown, ArrowUp, ArrowDown, MoreVertical, Sun, Moon, Circle, Clock, CheckCircle2, ArrowRight, FileWarning, SkipForward, Bug, Send, Wrench, User, Tag, DollarSign, Zap, Sword, Move, Heart, Shield } from 'lucide-react';
 import { evaluate, createMinimalContext } from '@almadar/evaluator';
 import { useUISlots, UISlotProvider } from '@almadar/ui/context';
-import { getComponentForPattern as getComponentForPattern$1 } from '@almadar/patterns';
+import { getPatternDefinition, getComponentForPattern as getComponentForPattern$1 } from '@almadar/patterns';
 import { createPortal } from 'react-dom';
 import { Link, Outlet, useLocation } from 'react-router-dom';
 import ReactMarkdown from 'react-markdown';
@@ -6913,6 +6913,25 @@ var init_renderer = __esm({
     init_init();
   }
 });
+
+// runtime/wrapCallbackForEvent.ts
+function wrapCallbackForEvent(qualifiedEvent, callbackArgs, emit) {
+  const argNames = (callbackArgs ?? []).map((a) => a.name);
+  if (argNames.length === 0) {
+    return () => emit(qualifiedEvent);
+  }
+  return (...args) => {
+    const payload = {};
+    for (let i = 0; i < argNames.length; i += 1) {
+      payload[argNames[i]] = args[i];
+    }
+    emit(qualifiedEvent, payload);
+  };
+}
+var init_wrapCallbackForEvent = __esm({
+  "runtime/wrapCallbackForEvent.ts"() {
+  }
+});
 var variantBorderClasses, variantIconColors, iconMap3, Alert;
 var init_Alert = __esm({
   "components/molecules/Alert.tsx"() {
@@ -18423,6 +18442,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -18444,6 +18464,7 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = useState(pageSize || Infinity);
+  const fieldDefs = fields ?? columns ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -18471,9 +18492,9 @@ function DataGrid({
       return next;
     });
   }, [data, selectionEvent, eventBus]);
-  const titleField = fields.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fields[0];
-  const badgeFields = fields.filter((f3) => f3.variant === "badge" && f3 !== titleField);
-  const bodyFields = fields.filter((f3) => f3 !== titleField && !badgeFields.includes(f3));
+  const titleField = fieldDefs.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fieldDefs[0];
+  const badgeFields = fieldDefs.filter((f3) => f3.variant === "badge" && f3 !== titleField);
+  const bodyFields = fieldDefs.filter((f3) => f3 !== titleField && !badgeFields.includes(f3));
   const primaryActions = itemActions?.filter((a) => a.variant !== "danger") ?? [];
   const dangerActions = itemActions?.filter((a) => a.variant === "danger") ?? [];
   const handleActionClick = (action, itemData) => (e) => {
@@ -18486,7 +18507,7 @@ function DataGrid({
   };
   const hasRenderProp = typeof children === "function";
   useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+    if (data.length > 0 && !hasRenderProp && fieldDefs.length === 0) {
       const renderItemRaw = schemaRenderItem;
       const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
       dataGridLog.warn("renderItem-unresolved", {
@@ -18494,7 +18515,7 @@ function DataGrid({
         renderItemIsFnLambda: isFnLambda
       });
     }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
+  }, [data, hasRenderProp, schemaRenderItem, fieldDefs]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18799,6 +18820,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -18828,6 +18850,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React113__default.useState(pageSize || Infinity);
+  const fieldDefs = fields ?? columns ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -18842,7 +18865,7 @@ function DataList({
       const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
       dataListLog.warn("renderItem-unresolved", {
         rowCount: data.length,
-        fieldsCount: fields?.length ?? 0,
+        fieldsCount: fieldDefs.length,
         renderItemTypeOf,
         renderItemIsArray: Array.isArray(renderItemRaw),
         renderItemIsFnLambda: isFnLambda,
@@ -18851,11 +18874,11 @@ function DataList({
         sampleRowKeys: sampleKeys
       });
     }
-  }, [data, hasRenderProp, schemaRenderItem, children, fields]);
-  const titleField = fields.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fields[0];
-  const badgeFields = fields.filter((f3) => f3.variant === "badge" && f3 !== titleField);
-  const progressFields = fields.filter((f3) => f3.variant === "progress");
-  const bodyFields = fields.filter(
+  }, [data, hasRenderProp, schemaRenderItem, children, fieldDefs]);
+  const titleField = fieldDefs.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fieldDefs[0];
+  const badgeFields = fieldDefs.filter((f3) => f3.variant === "badge" && f3 !== titleField);
+  const progressFields = fieldDefs.filter((f3) => f3.variant === "progress");
+  const bodyFields = fieldDefs.filter(
     (f3) => f3 !== titleField && !badgeFields.includes(f3) && !progressFields.includes(f3)
   );
   const handleActionClick = (action, itemData) => (e) => {
@@ -18887,7 +18910,7 @@ function DataList({
   if (isMessage) {
     const items2 = data.map((item) => item);
     const groups2 = groupBy ? groupData(items2, groupBy) : [{ label: "", items: items2 }];
-    const contentField = titleField?.name ?? fields[0]?.name ?? "";
+    const contentField = titleField?.name ?? fieldDefs[0]?.name ?? "";
     return /* @__PURE__ */ jsx(VStack, { gap: "sm", className: cn("py-2", className), children: groups2.map((group, gi) => /* @__PURE__ */ jsxs(React113__default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsx(Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -18895,7 +18918,7 @@ function DataList({
         const sender = senderField ? String(getNestedValue(itemData, senderField) ?? "") : "";
         const isSent = Boolean(currentUser && sender === currentUser);
         const content = getNestedValue(itemData, contentField);
-        const timestampField = fields.find((f3) => f3.format === "date");
+        const timestampField = fieldDefs.find((f3) => f3.format === "date");
         const timestamp = timestampField ? getNestedValue(itemData, timestampField.name) : null;
         return /* @__PURE__ */ jsx(
           Box,
@@ -37880,6 +37903,7 @@ function SlotContentRenderer({
       );
     }
   }
+  const eventBus = useEventBus();
   const schemaCtx = useEntitySchemaOptional();
   let entityDef;
   if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
@@ -37901,6 +37925,20 @@ function SlotContentRenderer({
     const { children: _childrenConfig, ...restPropsNoChildren } = content.props;
     const restProps = childrenIsRenderFn ? { ...restPropsNoChildren, children: incomingChildren } : restPropsNoChildren;
     const renderedProps = renderPatternProps(restProps, onDismiss);
+    const patternDef = getPatternDefinition(content.pattern);
+    const propsSchema = patternDef?.propsSchema;
+    if (propsSchema) {
+      for (const [propKey, propValue] of Object.entries(renderedProps)) {
+        if (typeof propValue !== "string") continue;
+        const propDef = propsSchema[propKey];
+        if (!propDef || propDef.kind !== "callback") continue;
+        renderedProps[propKey] = wrapCallbackForEvent(
+          `UI:${propValue}`,
+          propDef.callbackArgs,
+          (eventKey, payload) => eventBus.emit(eventKey, payload)
+        );
+      }
+    }
     const finalProps = renderedProps;
     const resolvedItems = Array.isArray(
       finalProps.entity
@@ -38025,6 +38063,7 @@ var init_UISlotRenderer = __esm({
     init_logger();
     init_Skeleton();
     init_renderer();
+    init_wrapCallbackForEvent();
     init_TraitFrame();
     init_component_registry_generated();
     scopeWrapLog = createLogger("almadar:ui:scope-wrap");
@@ -39104,6 +39143,9 @@ function useTrait(traitName) {
   return context.getTrait(traitName);
 }
 
+// runtime/index.ts
+init_wrapCallbackForEvent();
+
 // runtime/OrbPreview.tsx
 init_Box();
 init_Typography();
@@ -39863,4 +39905,4 @@ function BrowserPlayground({
   );
 }
 
-export { BrowserPlayground, EntitySchemaProvider, OrbPreview, ServerBridgeProvider, TraitContext, TraitProvider, adjustSchemaForMockData, buildMockData, clearSchemaCache, createClientEffectHandlers, prepareSchemaForPreview, useEntityDefinition, useEntitySchema, useEntitySchemaOptional, useResolvedSchema, useServerBridge, useTrait, useTraitContext, useTraitStateMachine };
+export { BrowserPlayground, EntitySchemaProvider, OrbPreview, ServerBridgeProvider, TraitContext, TraitProvider, adjustSchemaForMockData, buildMockData, clearSchemaCache, createClientEffectHandlers, prepareSchemaForPreview, useEntityDefinition, useEntitySchema, useEntitySchemaOptional, useResolvedSchema, useServerBridge, useTrait, useTraitContext, useTraitStateMachine, wrapCallbackForEvent };

package/dist/runtime/wrapCallbackForEvent.d.ts

@@ -0,0 +1,16 @@
+import type { PatternCallbackArg } from '@almadar/patterns';
+import type { EventPayload, EventPayloadValue } from '@almadar/core';
+/**
+ * Build the runtime wrapper that turns a string-typed callback prop
+ * (e.g. `onTabChange: "TAB_CHANGED"`) into a function the component can
+ * invoke. The wrapper consumes the component's positional callback args
+ * by name and dispatches an OBJECT payload `{ argName: value, ... }` so
+ * the bus carries the trait's declared event payload, not a raw
+ * positional spread. Mirrors the codegen wrapper in
+ * `orbital-shell-typescript/src/codegen/pattern.rs` (C2 compiled path).
+ *
+ * Single-sourcing this logic across runtime and codegen (shared shape,
+ * not shared code — codegen emits string source) is what keeps the two
+ * paths from silently diverging on payload shape.
+ */
+export declare function wrapCallbackForEvent(qualifiedEvent: string, callbackArgs: PatternCallbackArg[] | undefined, emit: (eventKey: string, payload?: EventPayload) => void): (...args: EventPayloadValue[]) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "4.22.0",
+  "version": "4.22.2",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",
@@ -120,7 +120,7 @@
   "dependencies": {
     "@almadar/core": "^7.10.0",
     "@almadar/evaluator": ">=2.9.2",
-    "@almadar/patterns": ">=2.17.1",
+    "@almadar/patterns": "^2.20.1",
     "@almadar/runtime": "^6.0.0",
     "@almadar/std": ">=6.4.1",
     "@almadar/syntax": ">=1.3.1",