@almadar/ui 4.22.0 → 4.22.1

package/dist/avl/index.cjs

@@ -21941,6 +21941,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -21962,6 +21963,7 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = React127.useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = React127.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;
@@ -21989,9 +21991,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) => {
@@ -22004,7 +22006,7 @@ function DataGrid({
   };
   const hasRenderProp = typeof children === "function";
   React127.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", {
@@ -22012,7 +22014,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",
@@ -22317,6 +22319,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -22346,6 +22349,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React127__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;
@@ -22360,7 +22364,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,
@@ -22369,11 +22373,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) => {
@@ -22405,7 +22409,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(React127__namespace.default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsxRuntime.jsx(Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -22413,7 +22417,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/avl/index.js

@@ -21895,6 +21895,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -21916,6 +21917,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;
@@ -21943,9 +21945,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) => {
@@ -21958,7 +21960,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", {
@@ -21966,7 +21968,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",
@@ -22271,6 +22273,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -22300,6 +22303,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React127__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;
@@ -22314,7 +22318,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,
@@ -22323,11 +22327,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) => {
@@ -22359,7 +22363,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(React127__default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsx(Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -22367,7 +22371,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/components/index.cjs

@@ -17369,6 +17369,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -17390,6 +17391,7 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = React110.useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = React110.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;
@@ -17417,9 +17419,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) => {
@@ -17432,7 +17434,7 @@ function DataGrid({
   };
   const hasRenderProp = typeof children === "function";
   React110.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", {
@@ -17440,7 +17442,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",
@@ -17745,6 +17747,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -17774,6 +17777,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React110__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;
@@ -17788,7 +17792,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,
@@ -17797,11 +17801,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) => {
@@ -17833,7 +17837,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(exports.VStack, { gap: "sm", className: cn("py-2", className), children: groups2.map((group, gi) => /* @__PURE__ */ jsxRuntime.jsxs(React110__namespace.default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsxRuntime.jsx(exports.Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -17841,7 +17845,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(
           exports.Box,

package/dist/components/index.js

@@ -17324,6 +17324,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -17345,6 +17346,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;
@@ -17372,9 +17374,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) => {
@@ -17387,7 +17389,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", {
@@ -17395,7 +17397,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",
@@ -17700,6 +17702,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -17729,6 +17732,7 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React110__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;
@@ -17743,7 +17747,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,
@@ -17752,11 +17756,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) => {
@@ -17788,7 +17792,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(React110__default.Fragment, { children: [
       group.label && /* @__PURE__ */ jsx(Divider, { label: group.label, className: "my-2" }),
       group.items.map((itemData, index) => {
@@ -17796,7 +17800,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/components/molecules/DataGrid.d.ts

@@ -55,8 +55,14 @@ export interface DataGridProps<T extends EntityRow = EntityRow> {
      * receive cards typed to that exact shape.
      */
     entity: T | readonly T[];
-    /** Field definitions for rendering each card */
-    fields: readonly DataGridField[];
+    /**
+     * Field definitions for rendering each card. The pattern contract in
+     * `@almadar/patterns` documents `columns` as the wire-format alias the
+     * compiler emits — both names resolve to the same shape here. Pass either.
+     */
+    fields?: readonly DataGridField[];
+    /** Alias for `fields` — the compiler emits `columns` for field defs. */
+    columns?: readonly DataGridField[];
     /** Per-item action buttons */
     itemActions?: readonly DataGridItemAction[];
     /** Number of columns (uses auto-fit if omitted) */
@@ -96,7 +102,7 @@ export interface DataGridProps<T extends EntityRow = EntityRow> {
     /** Max items to show before "Show More" button. Defaults to 0 (disabled). */
     pageSize?: number;
 }
-export declare function DataGrid<T extends EntityRow = EntityRow>({ entity, fields, itemActions, cols, gap, minCardWidth, className, isLoading, error, imageField, selectable, selectionEvent, infiniteScroll, loadMoreEvent, hasMore, children, pageSize, renderItem: schemaRenderItem, }: DataGridProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function DataGrid<T extends EntityRow = EntityRow>({ entity, fields, columns, itemActions, cols, gap, minCardWidth, className, isLoading, error, imageField, selectable, selectionEvent, infiniteScroll, loadMoreEvent, hasMore, children, pageSize, renderItem: schemaRenderItem, }: DataGridProps<T>): import("react/jsx-runtime").JSX.Element;
 export declare namespace DataGrid {
     var displayName: string;
 }

package/dist/components/molecules/DataList.d.ts

@@ -45,8 +45,14 @@ export interface DataListProps<T extends EntityRow = EntityRow> {
      * receive items of that exact shape.
      */
     entity: T | readonly T[];
-    /** Field definitions for rendering each row */
-    fields: readonly DataListField[];
+    /**
+     * Field definitions for rendering each row. The pattern contract in
+     * `@almadar/patterns` documents `columns` as the wire-format alias the
+     * compiler emits — both names resolve to the same shape here. Pass either.
+     */
+    fields?: readonly DataListField[];
+    /** Alias for `fields` — the compiler emits `columns` for field defs. */
+    columns?: readonly DataListField[];
     /** Per-item action buttons */
     itemActions?: readonly DataListItemAction[];
     /** Gap between rows */
@@ -110,7 +116,7 @@ export interface DataListProps<T extends EntityRow = EntityRow> {
     /** Max items to show before "Show More" button. Defaults to 5. Set to 0 to disable. */
     pageSize?: number;
 }
-export declare function DataList<T extends EntityRow = EntityRow>({ entity, fields, itemActions, gap, variant, groupBy, senderField, currentUser, className, isLoading, error, reorderable: _reorderable, reorderEvent: _reorderEvent, swipeLeftEvent: _swipeLeftEvent, swipeLeftActions: _swipeLeftActions, swipeRightEvent: _swipeRightEvent, swipeRightActions: _swipeRightActions, longPressEvent: _longPressEvent, infiniteScroll, loadMoreEvent, hasMore, children, pageSize, renderItem: schemaRenderItem, }: DataListProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function DataList<T extends EntityRow = EntityRow>({ entity, fields, columns, itemActions, gap, variant, groupBy, senderField, currentUser, className, isLoading, error, reorderable: _reorderable, reorderEvent: _reorderEvent, swipeLeftEvent: _swipeLeftEvent, swipeLeftActions: _swipeLeftActions, swipeRightEvent: _swipeRightEvent, swipeRightActions: _swipeRightActions, longPressEvent: _longPressEvent, infiniteScroll, loadMoreEvent, hasMore, children, pageSize, renderItem: schemaRenderItem, }: DataListProps<T>): import("react/jsx-runtime").JSX.Element;
 export declare namespace DataList {
     var displayName: string;
 }

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,

package/dist/runtime/index.js

@@ -18423,6 +18423,7 @@ function formatValue(value, format) {
 function DataGrid({
   entity,
   fields,
+  columns,
   itemActions,
   cols,
   gap = "md",
@@ -18444,6 +18445,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 +18473,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 +18488,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 +18496,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 +18801,7 @@ function groupData(items, field) {
 function DataList({
   entity,
   fields,
+  columns,
   itemActions,
   gap = "none",
   variant = "default",
@@ -18828,6 +18831,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 +18846,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 +18855,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 +18891,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 +18899,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "4.22.0",
+  "version": "4.22.1",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",