@economic/taco 2.58.0 → 2.58.2-EC-64962.0

package/dist/taco.cjs

@@ -33534,23 +33534,27 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
         enablePrinting,
         enableTruncate,
         enableEditing,
-        header,
-        renderer: renderer2
+        header
+      }
+    };
+    const formattedValueRenderer = (value) => {
+      var _a;
+      const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, { localization });
+      const safeValue = value !== void 0 && value !== null ? String(value) : value;
+      if (Array.isArray(displayValue)) {
+        return displayValue[0] ?? safeValue;
       }
+      return displayValue ?? safeValue;
     };
+    const rendererArgs = (info) => ({
+      formattedValue: formattedValueRenderer(info.getValue()),
+      row: info.row.original,
+      value: info.getValue()
+    });
     if (typeof renderer2 === "function") {
-      column.cell = (info) => renderer2(info.getValue(), info.row.original);
-    } else if (dataTypeProperties.getDisplayValue) {
-      const dataTypeRenderer = (value) => {
-        var _a;
-        const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, { localization });
-        if (Array.isArray(displayValue)) {
-          return displayValue[0] ?? value;
-        }
-        return displayValue ?? value;
-      };
-      column.cell = (info) => dataTypeRenderer(info.getValue());
-      column.meta.renderer = dataTypeRenderer;
+      column.cell = (info) => renderer2(rendererArgs(info));
+    } else {
+      column.cell = (info) => formattedValueRenderer(info.getValue());
     }
     if (typeof footer === "function") {
       column.footer = (info) => footer(info.table.getRowModel().rows.flatMap((row) => row.original !== void 0 ? row.original : []));
@@ -36458,17 +36462,14 @@ function useSearchHighlighting(cell, cellIndex, ref) {
   return isHighlighted;
 }
 function GroupedCell(props) {
-  var _a;
   const { cell, cellRef, index: index2, isHighlighted } = props;
   const { table } = cell.getContext();
   const tableMeta = table.options.meta;
-  const columnMeta = cell.column.columnDef.meta;
   const attributes = getCellAttributes(cell, index2, isHighlighted);
   const { isHovered, rowIndex } = React.useContext(RowContext);
   const isActiveRow = tableMeta.rowActive.rowActiveIndex === rowIndex;
   const canShowActions = isActiveRow || isHovered && !tableMeta.rowActive.isHoverStatePaused;
   const colSpan = cell.row.getVisibleCells().filter((c3) => c3.column.id === "__actions" || !isInternalColumn(c3.column.id)).length - 1;
-  const content = ((_a = columnMeta.renderer) == null ? void 0 : _a.call(columnMeta, cell.getValue(), cell.row.original)) ?? cell.getValue() ?? null;
   const subRows = cell.getContext().row.subRows.map((row) => row.original);
   return /* @__PURE__ */ React.createElement(
     MemoedGroupedCell,
@@ -36482,7 +36483,7 @@ function GroupedCell(props) {
       subRows,
       table
     },
-    content
+    flexRender(cell.column.columnDef.cell, cell.getContext())
   );
 }
 const MemoedGroupedCell = React.memo(function MemoedGroupedCell2(props) {
@@ -36628,19 +36629,11 @@ const DisplayRow = React.memo(function DisplayRow2(props) {
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("tr", { ...attributes, className, ref }, children, row.getVisibleCells().filter((cell) => !(isGrouped && cell.column.id === "__actions")).map((cell, cellIndex) => /* @__PURE__ */ React.createElement(Cell$2, { key: cell.id, cell, index: cellIndex, renderer: CellRenderer }))), expandedRow ? /* @__PURE__ */ React.createElement("tr", { "data-row-parent-id": row.id, ref: expansionRef }, /* @__PURE__ */ React.createElement("td", { className: "col-span-full" }, expandedRow)) : null);
 });
 function DisplayCell(props) {
-  var _a;
   const { cell, cellRef, index: index2, isHighlighted, ...cellAttributes } = props;
   const columnMeta = cell.column.columnDef.meta;
   const attributes = getCellAttributes(cell, index2, isHighlighted);
   const isTruncated = !!columnMeta.enableTruncate;
-  const value = cell.getValue();
-  let content;
-  if (isInternalColumn(cell.column.id)) {
-    content = flexRender(cell.column.columnDef.cell, cell.getContext());
-  } else {
-    content = ((_a = columnMeta.renderer) == null ? void 0 : _a.call(columnMeta, value, cell.row.original)) ?? value ?? null;
-  }
-  return /* @__PURE__ */ React.createElement(MemoedDisplayCell, { ...cellAttributes, ...attributes, cellRef, isTruncated }, content);
+  return /* @__PURE__ */ React.createElement(MemoedDisplayCell, { ...cellAttributes, ...attributes, cellRef, isTruncated }, flexRender(cell.column.columnDef.cell, cell.getContext()));
 }
 const MemoedDisplayCell = React.memo(function MemoedDisplayCell2(props) {
   const { cellRef, children, isTruncated, ...cellAttributes } = props;
@@ -53147,6 +53140,27 @@ function reducer(state, action) {
         temporaryRows: state.temporaryRows.filter((row) => row[rowIdentityAccessor] !== rowId)
       };
     }
+    case "complete": {
+      const { changes, handleDiscard } = payload;
+      if (JSON.stringify(changes) !== JSON.stringify(state.changes.rows[rowId])) {
+        return {
+          ...state,
+          changes: {
+            ...state.changes,
+            originals: setWith(
+              state.changes.originals,
+              rowId,
+              { ...state.changes.originals[rowId], ...changes },
+              Object
+            )
+          }
+        };
+      }
+      if (typeof handleDiscard === "function") {
+        handleDiscard();
+      }
+      return state;
+    }
     case "setRowStatus": {
       const { status } = payload;
       return {
@@ -53364,7 +53378,7 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
     for (const rowId2 of Object.keys(changes)) {
       const status = getRowStatus(rowId2);
       try {
-        const rowChanges = changes[rowId2] ?? {};
+        const rowChanges = JSON.parse(JSON.stringify(changes[rowId2] ?? {}));
         if (!Object.keys(rowChanges).length || status === "saving" || status === "errored") {
           continue;
         }
@@ -53380,7 +53394,7 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
           }
         }
         await handleSave(changeSet);
-        await discardChanges(rowId2, table);
+        await complete(rowId2, table, rowChanges);
         setRowStatus(rowId2, "saved");
         setTimeout(() => {
           setRowStatus(rowId2, void 0);
@@ -53429,6 +53443,16 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
       await handleDiscard();
     }
   }
+  async function complete(rowId, table, changes) {
+    const handleDiscard2 = async () => {
+      await discardChanges(rowId, table);
+    };
+    dispatch({
+      type: "complete",
+      rowId,
+      payload: { rowIdentityAccessor, changes, handleDiscard: handleDiscard2 }
+    });
+  }
   return {
     // row
     getRowValue,