@quillsql/react 2.16.72 → 2.16.73

package/dist/index.cjs

@@ -62007,6 +62007,11 @@ function resolveTableColumnDefaultFormat({
   }
   return currentFormat;
 }
+function resolveTableColumnLabel(fieldRaw, labelRaw) {
+  const field = String(fieldRaw ?? "").trim();
+  const label = String(labelRaw ?? "").trim();
+  return !label || label === field ? toTitleCaseLabel(field) : label;
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -62060,6 +62065,7 @@ function mergeDisplayAndSourceForTableFormats(args) {
     };
   }).filter((column) => Boolean(column));
   const formatByColumnOptionId = /* @__PURE__ */ new Map();
+  const labelByColumnOptionId = /* @__PURE__ */ new Map();
   let columnsWithTableMeta = [];
   if (normalizedSourceColumns.length > 0 && normalizedDisplayColumns.length > 0) {
     const sourceColumnsByKey = /* @__PURE__ */ new Map();
@@ -62161,21 +62167,27 @@ function mergeDisplayAndSourceForTableFormats(args) {
       const id = encodeColumnOptionValue(selection.table, selection.field);
       if (id) {
         formatByColumnOptionId.set(id, String(merged.format ?? "").trim());
+        labelByColumnOptionId.set(
+          id,
+          resolveTableColumnLabel(merged.field, merged.label)
+        );
       }
     }
     columnsWithTableMeta = selectedColumnsForTable;
   }
   const columns = columnsWithTableMeta.map((column) => {
     const field = column.field;
-    const rawLabel = String(column.label ?? "").trim();
-    const label = !rawLabel || rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
     return {
-      label,
+      label: resolveTableColumnLabel(field, column.label),
       field,
       format: column.format
     };
   });
-  return { columns, formatByColumnOptionId };
+  return {
+    columns,
+    formatByColumnOptionId,
+    labelByColumnOptionId
+  };
 }
 function axisFormatToSelectLabel(format9) {
   const raw = String(format9 ?? "").trim();
@@ -67289,11 +67301,18 @@ function useReport(reportIdArg, options = {}) {
         selectedColumn?.format ?? chartFallback?.format ?? ""
       ).trim();
       const isRowPivotCol = isPivotTableChart && Boolean(pivotRowFieldForSettings) && optionField === pivotRowFieldForSettings && Boolean(rowAxisLabel);
+      const selectedLabel = String(selectedColumn?.alias ?? "").trim();
+      const pivotLabel = String(
+        isRowPivotCol ? rowAxisLabel : chartFallback?.label ?? ""
+      ).trim();
+      const persistedTableLabel = String(
+        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? tableFormatMerge.columns.find(
+          (column) => column.field === optionField
+        )?.label ?? ""
+      ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {
-        label: String(
-          selectedColumn?.alias ?? (isRowPivotCol ? rowAxisLabel : chartFallback?.label) ?? ""
-        ).trim(),
+        label: selectedLabel || pivotLabel || (!isPivotTableChart ? persistedTableLabel : ""),
         format: resolvedColFormat
       });
     }

package/dist/index.js

@@ -62219,6 +62219,11 @@ function resolveTableColumnDefaultFormat({
   }
   return currentFormat;
 }
+function resolveTableColumnLabel(fieldRaw, labelRaw) {
+  const field = String(fieldRaw ?? "").trim();
+  const label = String(labelRaw ?? "").trim();
+  return !label || label === field ? toTitleCaseLabel(field) : label;
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -62272,6 +62277,7 @@ function mergeDisplayAndSourceForTableFormats(args) {
     };
   }).filter((column) => Boolean(column));
   const formatByColumnOptionId = /* @__PURE__ */ new Map();
+  const labelByColumnOptionId = /* @__PURE__ */ new Map();
   let columnsWithTableMeta = [];
   if (normalizedSourceColumns.length > 0 && normalizedDisplayColumns.length > 0) {
     const sourceColumnsByKey = /* @__PURE__ */ new Map();
@@ -62373,21 +62379,27 @@ function mergeDisplayAndSourceForTableFormats(args) {
       const id = encodeColumnOptionValue(selection.table, selection.field);
       if (id) {
         formatByColumnOptionId.set(id, String(merged.format ?? "").trim());
+        labelByColumnOptionId.set(
+          id,
+          resolveTableColumnLabel(merged.field, merged.label)
+        );
       }
     }
     columnsWithTableMeta = selectedColumnsForTable;
   }
   const columns = columnsWithTableMeta.map((column) => {
     const field = column.field;
-    const rawLabel = String(column.label ?? "").trim();
-    const label = !rawLabel || rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
     return {
-      label,
+      label: resolveTableColumnLabel(field, column.label),
       field,
       format: column.format
     };
   });
-  return { columns, formatByColumnOptionId };
+  return {
+    columns,
+    formatByColumnOptionId,
+    labelByColumnOptionId
+  };
 }
 function axisFormatToSelectLabel(format9) {
   const raw = String(format9 ?? "").trim();
@@ -67501,11 +67513,18 @@ function useReport(reportIdArg, options = {}) {
         selectedColumn?.format ?? chartFallback?.format ?? ""
       ).trim();
       const isRowPivotCol = isPivotTableChart && Boolean(pivotRowFieldForSettings) && optionField === pivotRowFieldForSettings && Boolean(rowAxisLabel);
+      const selectedLabel = String(selectedColumn?.alias ?? "").trim();
+      const pivotLabel = String(
+        isRowPivotCol ? rowAxisLabel : chartFallback?.label ?? ""
+      ).trim();
+      const persistedTableLabel = String(
+        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? tableFormatMerge.columns.find(
+          (column) => column.field === optionField
+        )?.label ?? ""
+      ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {
-        label: String(
-          selectedColumn?.alias ?? (isRowPivotCol ? rowAxisLabel : chartFallback?.label) ?? ""
-        ).trim(),
+        label: selectedLabel || pivotLabel || (!isPivotTableChart ? persistedTableLabel : ""),
         format: resolvedColFormat
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.16.72",
+  "version": "2.16.73",
   "type": "module",
   "exports": {
     ".": {