@almadar/ui 4.21.0 → 4.22.1

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.21.0",
+  "version": "4.22.1",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",
@@ -118,7 +118,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^7.9.0",
+    "@almadar/core": "^7.10.0",
     "@almadar/evaluator": ">=2.9.2",
     "@almadar/patterns": ">=2.17.1",
     "@almadar/runtime": "^6.0.0",