@almadar/ui 4.21.0 → 4.22.1

package/dist/components/organisms/game/hooks/useBattleState.d.ts

@@ -1,12 +1,24 @@
+import type { EventEmit } from '@almadar/core';
 import type { BattleUnit, BattlePhase } from '../BattleBoard';
 export interface BattleStateEventConfig {
-    tileClickEvent?: string;
-    unitClickEvent?: string;
-    endTurnEvent?: string;
-    cancelEvent?: string;
-    gameEndEvent?: string;
-    playAgainEvent?: string;
-    attackEvent?: string;
+    tileClickEvent?: EventEmit<{
+        x: number;
+        y: number;
+    }>;
+    unitClickEvent?: EventEmit<{
+        unitId: string;
+    }>;
+    endTurnEvent?: EventEmit<Record<string, never>>;
+    cancelEvent?: EventEmit<Record<string, never>>;
+    gameEndEvent?: EventEmit<{
+        result: 'victory' | 'defeat';
+    }>;
+    playAgainEvent?: EventEmit<Record<string, never>>;
+    attackEvent?: EventEmit<{
+        attackerId: string;
+        targetId: string;
+        damage: number;
+    }>;
 }
 export interface BattleStateCallbacks {
     /** Called when a unit attacks another */

package/dist/components/organisms/game/puzzles/builder/BuilderBoard.d.ts

@@ -9,6 +9,7 @@
  * Events emitted via completeEvent (default UI:PUZZLE_COMPLETE).
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { EntityDisplayProps } from '../../../types';
 export interface BuilderComponent {
     id: string;
@@ -44,7 +45,10 @@ export interface BuilderPuzzleEntity {
 }
 export interface BuilderBoardProps extends Omit<EntityDisplayProps, 'entity'> {
     entity: BuilderPuzzleEntity;
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+        attempts: number;
+    }>;
 }
 export declare function BuilderBoard({ entity, completeEvent, className, }: BuilderBoardProps): React.JSX.Element;
 export declare namespace BuilderBoard {

package/dist/components/organisms/game/puzzles/classifier/ClassifierBoard.d.ts

@@ -10,6 +10,7 @@
  * Events emitted via completeEvent (default UI:PUZZLE_COMPLETE).
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { EntityDisplayProps } from '../../../types';
 export interface ClassifierItem {
     id: string;
@@ -45,7 +46,10 @@ export interface ClassifierPuzzleEntity {
 }
 export interface ClassifierBoardProps extends Omit<EntityDisplayProps, 'entity'> {
     entity: ClassifierPuzzleEntity;
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+        attempts: number;
+    }>;
 }
 export declare function ClassifierBoard({ entity, completeEvent, className, }: ClassifierBoardProps): React.JSX.Element;
 export declare namespace ClassifierBoard {

package/dist/components/organisms/game/puzzles/debugger/DebuggerBoard.d.ts

@@ -9,6 +9,7 @@
  * Events emitted via completeEvent (default UI:PUZZLE_COMPLETE).
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { EntityDisplayProps } from '../../../types';
 export interface DebuggerLine {
     id: string;
@@ -37,7 +38,10 @@ export interface DebuggerPuzzleEntity {
 }
 export interface DebuggerBoardProps extends Omit<EntityDisplayProps, 'entity'> {
     entity: DebuggerPuzzleEntity;
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+        attempts: number;
+    }>;
 }
 export declare function DebuggerBoard({ entity, completeEvent, className, }: DebuggerBoardProps): React.JSX.Element;
 export declare namespace DebuggerBoard {

package/dist/components/organisms/game/puzzles/event-handler/EventHandlerBoard.d.ts

@@ -11,6 +11,7 @@
  * @packageDocumentation
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { EntityDisplayProps } from '../../../types';
 import { type PuzzleObjectDef } from './ObjectRulePanel';
 export interface EventHandlerPuzzleEntity {
@@ -44,9 +45,11 @@ export interface EventHandlerBoardProps extends Omit<EntityDisplayProps, 'entity
     /** Playback speed in ms per event */
     stepDurationMs?: number;
     /** Emits UI:{playEvent} */
-    playEvent?: string;
+    playEvent?: EventEmit<Record<string, never>>;
     /** Emits UI:{completeEvent} with { success } */
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+    }>;
 }
 export declare function EventHandlerBoard({ entity, stepDurationMs, playEvent, completeEvent, className, }: EventHandlerBoardProps): React.JSX.Element;
 export declare namespace EventHandlerBoard {

package/dist/components/organisms/game/puzzles/negotiator/NegotiatorBoard.d.ts

@@ -11,6 +11,7 @@
  * Events emitted via completeEvent (default UI:PUZZLE_COMPLETE).
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { EntityDisplayProps } from '../../../types';
 export interface NegotiatorAction {
     id: string;
@@ -46,7 +47,10 @@ export interface NegotiatorPuzzleEntity {
 }
 export interface NegotiatorBoardProps extends Omit<EntityDisplayProps, 'entity'> {
     entity: NegotiatorPuzzleEntity;
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+        score: number;
+    }>;
 }
 export declare function NegotiatorBoard({ entity, completeEvent, className, }: NegotiatorBoardProps): React.JSX.Element;
 export declare namespace NegotiatorBoard {

package/dist/components/organisms/game/puzzles/sequencer/SequencerBoard.d.ts

@@ -18,6 +18,7 @@
  * @packageDocumentation
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { SlotItemData } from '../../TraitSlot';
 import type { EntityDisplayProps } from '../../../types';
 export interface SequencerPuzzleEntity {
@@ -61,9 +62,14 @@ export interface SequencerBoardProps extends Omit<EntityDisplayProps, 'entity'>
     /** Playback speed in ms per step */
     stepDurationMs?: number;
     /** Emits UI:{playEvent} with { sequence: string[] } */
-    playEvent?: string;
+    playEvent?: EventEmit<{
+        sequence: string[];
+    }>;
     /** Emits UI:{completeEvent} with { success: boolean } */
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+        sequence: string[];
+    }>;
 }
 export declare function SequencerBoard({ entity, categoryColors, stepDurationMs, playEvent, completeEvent, className, }: SequencerBoardProps): React.JSX.Element;
 export declare namespace SequencerBoard {

package/dist/components/organisms/game/puzzles/simulator/SimulatorBoard.d.ts

@@ -10,6 +10,7 @@
  * Events emitted via completeEvent (default UI:PUZZLE_COMPLETE).
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { EntityDisplayProps } from '../../../types';
 export interface SimulatorParameter {
     id: string;
@@ -46,7 +47,10 @@ export interface SimulatorPuzzleEntity {
 }
 export interface SimulatorBoardProps extends Omit<EntityDisplayProps, 'entity'> {
     entity: SimulatorPuzzleEntity;
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+        attempts: number;
+    }>;
 }
 export declare function SimulatorBoard({ entity, completeEvent, className, }: SimulatorBoardProps): React.JSX.Element;
 export declare namespace SimulatorBoard {

package/dist/components/organisms/game/puzzles/state-architect/StateArchitectBoard.d.ts

@@ -8,6 +8,7 @@
  * @packageDocumentation
  */
 import React from 'react';
+import type { EventEmit } from '@almadar/core';
 import type { EntityDisplayProps } from '../../../types';
 import { type VariableDef } from './VariablePanel';
 export interface StateArchitectTransition {
@@ -65,9 +66,12 @@ export interface StateArchitectBoardProps extends Omit<EntityDisplayProps, 'enti
     /** Playback speed */
     stepDurationMs?: number;
     /** Emits UI:{testEvent} */
-    testEvent?: string;
+    testEvent?: EventEmit<Record<string, never>>;
     /** Emits UI:{completeEvent} with { success, passedTests } */
-    completeEvent?: string;
+    completeEvent?: EventEmit<{
+        success: boolean;
+        passedTests: number;
+    }>;
 }
 export declare function StateArchitectBoard({ entity, stepDurationMs, testEvent, completeEvent, className, }: StateArchitectBoardProps): React.JSX.Element;
 export declare namespace StateArchitectBoard {

package/dist/components/organisms/game/three/hooks/useGameCanvas3DEvents.d.ts

@@ -1,21 +1,65 @@
+import type { EventEmit } from '@almadar/core';
 import type { IsometricTile, IsometricUnit, IsometricFeature } from '../../types/isometric';
 export interface GameCanvas3DEventConfig {
     /** Event name for tile clicks */
-    tileClickEvent?: string;
+    tileClickEvent?: EventEmit<{
+        tileId: string;
+        x: number;
+        z: number;
+        type?: string;
+        terrain?: string;
+        elevation?: number;
+    }>;
     /** Event name for unit clicks */
-    unitClickEvent?: string;
+    unitClickEvent?: EventEmit<{
+        unitId: string;
+        x: number;
+        z: number;
+        unitType?: string;
+        name?: string;
+        team?: string;
+        faction?: string;
+        health?: number;
+        maxHealth?: number;
+    }>;
     /** Event name for feature clicks */
-    featureClickEvent?: string;
+    featureClickEvent?: EventEmit<{
+        featureId: string;
+        x: number;
+        z: number;
+        type?: string;
+        elevation?: number;
+    }>;
     /** Event name for canvas clicks */
-    canvasClickEvent?: string;
+    canvasClickEvent?: EventEmit<{
+        clientX: number;
+        clientY: number;
+        button: number;
+    }>;
     /** Event name for tile hover */
-    tileHoverEvent?: string;
+    tileHoverEvent?: EventEmit<{
+        tileId: string;
+        x: number;
+        z: number;
+        type?: string;
+    }>;
     /** Event name for tile leave */
-    tileLeaveEvent?: string;
+    tileLeaveEvent?: EventEmit<Record<string, never>>;
     /** Event name for unit animation changes */
-    unitAnimationEvent?: string;
+    unitAnimationEvent?: EventEmit<{
+        unitId: string;
+        state: string;
+        timestamp: number;
+    }>;
     /** Event name for camera changes */
-    cameraChangeEvent?: string;
+    cameraChangeEvent?: EventEmit<{
+        position: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        timestamp: number;
+    }>;
 }
 /** Minimal mouse event interface — satisfied by both React.MouseEvent and ThreeEvent<MouseEvent> */
 export interface MinimalMouseEvent {

package/dist/providers/index.cjs

@@ -18692,6 +18692,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -18713,6 +18714,7 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = React115.useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = React115.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;
@@ -18740,9 +18742,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) => {
@@ -18755,7 +18757,7 @@ function DataGrid({
   };
   const hasRenderProp = typeof children === "function";
   React115.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", {
@@ -18763,7 +18765,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",
@@ -19068,6 +19070,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -19097,6 +19100,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React115__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;
@@ -19111,7 +19115,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,
@@ -19120,11 +19124,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) => {
@@ -19156,7 +19160,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(React115__namespace.default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsxRuntime.jsx(Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -19164,7 +19168,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,

package/dist/providers/index.js

@@ -18647,6 +18647,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -18668,6 +18669,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;
@@ -18695,9 +18697,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) => {
@@ -18710,7 +18712,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", {
@@ -18718,7 +18720,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",
@@ -19023,6 +19025,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -19052,6 +19055,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React115__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;
@@ -19066,7 +19070,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,
@@ -19075,11 +19079,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) => {
@@ -19111,7 +19115,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(React115__default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsx(Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -19119,7 +19123,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,

package/dist/runtime/index.cjs

@@ -18468,6 +18468,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -18489,6 +18490,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 +18518,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 +18533,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 +18541,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 +18846,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -18873,6 +18876,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 +18891,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 +18900,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 +18936,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 +18944,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,