@quillsql/react 2.16.72 → 2.16.74

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();
@@ -66264,14 +66276,16 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQueryEnabled,
     effectiveReportId
   ]);
+  const settledPivotForChart = sourceReport?.pivot ?? null;
+  const settledSourceRowFieldForChart = String(
+    sourceReport?.pivotResultSourceRowField ?? settledPivotForChart?.rowField ?? ""
+  ).trim();
+  const pendingPivotChangesDimensions = Boolean(
+    sourceReport && pendingPivotRefresh && nextPivot && (settledSourceRowFieldForChart !== String(nextPivot.rowField ?? "").trim() || String(settledPivotForChart?.rowFieldTable ?? "").trim() !== String(nextPivot.rowFieldTable ?? "").trim() || String(settledPivotForChart?.columnField ?? "").trim() !== String(nextPivot.columnField ?? "").trim() || String(settledPivotForChart?.columnFieldTable ?? "").trim() !== String(nextPivot.columnFieldTable ?? "").trim())
+  );
   const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const settledPivot = sourceReport.pivot ?? null;
-    const settledSourceRowField = String(
-      sourceReport.pivotResultSourceRowField ?? settledPivot?.rowField ?? ""
-    ).trim();
-    const pendingPivotChangesDimensions = pendingPivotRefresh && Boolean(nextPivot) && (settledSourceRowField !== String(nextPivot?.rowField ?? "").trim() || String(settledPivot?.rowFieldTable ?? "").trim() !== String(nextPivot?.rowFieldTable ?? "").trim() || String(settledPivot?.columnField ?? "").trim() !== String(nextPivot?.columnField ?? "").trim() || String(settledPivot?.columnFieldTable ?? "").trim() !== String(nextPivot?.columnFieldTable ?? "").trim());
     const chartPivot = pendingPivotChangesDimensions ? sourceReport.pivot ?? null : nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
       ...chartPivot,
@@ -66298,7 +66312,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport,
     chartType,
     nextPivot,
-    pendingPivotRefresh,
+    pendingPivotChangesDimensions,
     effectiveReportBuilderState,
     useInMemoryEngines,
     chartPivotHydrationEpoch
@@ -67197,6 +67211,12 @@ function useReport(reportIdArg, options = {}) {
   const tableColumnSettingsById = (0, import_react61.useMemo)(() => {
     const map = /* @__PURE__ */ new Map();
     const effectiveById = tableFormatMerge.formatByColumnOptionId;
+    const mergedColumnByField = /* @__PURE__ */ new Map();
+    for (const column of tableFormatMerge.columns) {
+      if (!mergedColumnByField.has(column.field)) {
+        mergedColumnByField.set(column.field, column);
+      }
+    }
     const chartColById = /* @__PURE__ */ new Map();
     if (isPivotTableChart && chart?.columns?.length) {
       for (const c of chart.columns) {
@@ -67277,9 +67297,8 @@ function useReport(reportIdArg, options = {}) {
         optionField
       );
       const effectiveFromId = effectiveById.get(columnId) ?? (encodedForMerge !== columnId ? effectiveById.get(encodedForMerge) : void 0) ?? "";
-      const mergeByFieldFormat = String(
-        tableFormatMerge.columns.find((c) => c.field === optionField)?.format ?? ""
-      ).trim();
+      const mergedByField = mergedColumnByField.get(optionField);
+      const mergeByFieldFormat = String(mergedByField?.format ?? "").trim();
       const columnPivotMeasureFormat = columnPivotMeasureFormatByAggregationField.get(optionField) ?? columnPivotMeasureFormatByAggregationField.get(columnId);
       const chartFallback = isPivotTableChart ? chartColById.get(columnId) ?? chartColById.get(encodedForMerge) ?? yAxisByField.get(optionField) ?? (columnPivotMeasureFormat ? {
         label: "",
@@ -67289,11 +67308,16 @@ 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) ?? mergedByField?.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();
@@ -66476,14 +66488,16 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQueryEnabled,
     effectiveReportId
   ]);
+  const settledPivotForChart = sourceReport?.pivot ?? null;
+  const settledSourceRowFieldForChart = String(
+    sourceReport?.pivotResultSourceRowField ?? settledPivotForChart?.rowField ?? ""
+  ).trim();
+  const pendingPivotChangesDimensions = Boolean(
+    sourceReport && pendingPivotRefresh && nextPivot && (settledSourceRowFieldForChart !== String(nextPivot.rowField ?? "").trim() || String(settledPivotForChart?.rowFieldTable ?? "").trim() !== String(nextPivot.rowFieldTable ?? "").trim() || String(settledPivotForChart?.columnField ?? "").trim() !== String(nextPivot.columnField ?? "").trim() || String(settledPivotForChart?.columnFieldTable ?? "").trim() !== String(nextPivot.columnFieldTable ?? "").trim())
+  );
   const chartData = useMemo33(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const settledPivot = sourceReport.pivot ?? null;
-    const settledSourceRowField = String(
-      sourceReport.pivotResultSourceRowField ?? settledPivot?.rowField ?? ""
-    ).trim();
-    const pendingPivotChangesDimensions = pendingPivotRefresh && Boolean(nextPivot) && (settledSourceRowField !== String(nextPivot?.rowField ?? "").trim() || String(settledPivot?.rowFieldTable ?? "").trim() !== String(nextPivot?.rowFieldTable ?? "").trim() || String(settledPivot?.columnField ?? "").trim() !== String(nextPivot?.columnField ?? "").trim() || String(settledPivot?.columnFieldTable ?? "").trim() !== String(nextPivot?.columnFieldTable ?? "").trim());
     const chartPivot = pendingPivotChangesDimensions ? sourceReport.pivot ?? null : nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
       ...chartPivot,
@@ -66510,7 +66524,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport,
     chartType,
     nextPivot,
-    pendingPivotRefresh,
+    pendingPivotChangesDimensions,
     effectiveReportBuilderState,
     useInMemoryEngines,
     chartPivotHydrationEpoch
@@ -67409,6 +67423,12 @@ function useReport(reportIdArg, options = {}) {
   const tableColumnSettingsById = useMemo33(() => {
     const map = /* @__PURE__ */ new Map();
     const effectiveById = tableFormatMerge.formatByColumnOptionId;
+    const mergedColumnByField = /* @__PURE__ */ new Map();
+    for (const column of tableFormatMerge.columns) {
+      if (!mergedColumnByField.has(column.field)) {
+        mergedColumnByField.set(column.field, column);
+      }
+    }
     const chartColById = /* @__PURE__ */ new Map();
     if (isPivotTableChart && chart?.columns?.length) {
       for (const c of chart.columns) {
@@ -67489,9 +67509,8 @@ function useReport(reportIdArg, options = {}) {
         optionField
       );
       const effectiveFromId = effectiveById.get(columnId) ?? (encodedForMerge !== columnId ? effectiveById.get(encodedForMerge) : void 0) ?? "";
-      const mergeByFieldFormat = String(
-        tableFormatMerge.columns.find((c) => c.field === optionField)?.format ?? ""
-      ).trim();
+      const mergedByField = mergedColumnByField.get(optionField);
+      const mergeByFieldFormat = String(mergedByField?.format ?? "").trim();
       const columnPivotMeasureFormat = columnPivotMeasureFormatByAggregationField.get(optionField) ?? columnPivotMeasureFormatByAggregationField.get(columnId);
       const chartFallback = isPivotTableChart ? chartColById.get(columnId) ?? chartColById.get(encodedForMerge) ?? yAxisByField.get(optionField) ?? (columnPivotMeasureFormat ? {
         label: "",
@@ -67501,11 +67520,16 @@ 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) ?? mergedByField?.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.74",
   "type": "module",
   "exports": {
     ".": {