@quillsql/react 2.16.97 → 2.16.99

package/dist/index.cjs

@@ -63505,7 +63505,7 @@ function pivotFallbackValueKeys(chart) {
   return (chart.pivotColumns ?? []).slice(1).map((column) => String(column.field ?? "").trim()).filter(Boolean);
 }
 function findSavedYAxisField(saved, field) {
-  return saved.find((axis) => String(axis.field ?? "").trim() === field) ?? (saved.length === 1 ? saved[0] : void 0);
+  return saved.find((axis) => String(axis.field ?? "").trim() === field);
 }
 function isPlaceholderAxisLabel(label, field) {
   const trimmed = String(label ?? "").trim();
@@ -63889,6 +63889,19 @@ function mergePivotColumnSeriesLabelWithUserEdit(normalizedLabel, userRowLabel,
   }
   return user;
 }
+function applySingleResolvedYAxisFormatToPivotDisplay(normalizedPivotYAxisFields, resolvedYAxisFields) {
+  if (resolvedYAxisFields.length !== 1) return normalizedPivotYAxisFields;
+  const only = resolvedYAxisFields[0];
+  return normalizedPivotYAxisFields.map((axis) => ({
+    ...axis,
+    label: mergePivotColumnSeriesLabelWithUserEdit(
+      String(axis.label ?? "").trim(),
+      only.label,
+      String(axis.field ?? "").trim() || void 0
+    ),
+    format: toAxisFormat(only.format, axis.format)
+  }));
+}
 function mergeChartColumnFormatsFromYAxisFields(columns, yAxisFields) {
   if (!columns?.length || !yAxisFields?.length) return columns;
   const formatByField = /* @__PURE__ */ new Map();
@@ -63910,10 +63923,6 @@ function mergeChartColumnFormatsFromYAxisFields(columns, yAxisFields) {
     return { ...col, format: nextFormat };
   });
 }
-function looksLikeCustomPivotTableMeasureLabel(label) {
-  const l = String(label ?? "").trim();
-  return l.includes(" \xB7 ") || l.includes(" \u2014 ") || /\([^)]+\)/.test(l);
-}
 function mergePivotTableDisplayColumnLabelsFromYAxis({
   columns,
   yAxisFields,
@@ -63923,16 +63932,11 @@ function mergePivotTableDisplayColumnLabelsFromYAxis({
   if (!columns?.length) return columns;
   const row = String(pivotRowField ?? "").trim();
   const xLab = String(xAxisLabel ?? "").trim();
-  const yList = (yAxisFields ?? []).map((y) => ({
-    field: String(y.field ?? "").trim(),
-    label: String(y.label ?? "").trim()
-  }));
-  const valueLabels = yList.map((y) => y.label).filter((l) => l.length > 0);
-  const distinct = new Set(valueLabels);
-  const anyCustom = valueLabels.some(looksLikeCustomPivotTableMeasureLabel);
-  const shouldMergeValueLabels = distinct.size > 1 || anyCustom;
   const labelByField = new Map(
-    yList.filter((y) => y.field).map((y) => [y.field, y.label])
+    (yAxisFields ?? []).map((y) => ({
+      field: String(y.field ?? "").trim(),
+      label: String(y.label ?? "").trim()
+    })).filter((y) => y.field && y.label).map((y) => [y.field, y.label])
   );
   return columns.map((c) => {
     const f = String(c.field ?? "").trim();
@@ -63940,7 +63944,6 @@ function mergePivotTableDisplayColumnLabelsFromYAxis({
     if (row && f === row && xLab && xLab !== row) {
       return { ...c, label: xLab };
     }
-    if (!shouldMergeValueLabels) return c;
     const yl = labelByField.get(f);
     if (!yl || String(c.label ?? "").trim() === yl) return c;
     return { ...c, label: yl };
@@ -63950,18 +63953,6 @@ function encodeColumnOptionValue(table, field) {
   if (!table || !table.trim()) return field;
   return `${table}_${field}`;
 }
-function isNumericishColumnType(type) {
-  const t = String(type ?? "").toLowerCase();
-  return t === "number" || t === "integer" || t === "float" || t === "decimal" || t === "bigint" || t === "double" || t === "whole_number";
-}
-function findSchemaColumnForChartAxisField(chartField, schemaOptions) {
-  const f = String(chartField ?? "").trim();
-  if (!f) return void 0;
-  for (const opt of schemaOptions) {
-    if (opt.value === f || opt.field === f) return opt;
-  }
-  return void 0;
-}
 function getAllColumnOptions({
   schemaColumnOptions,
   tableColumns,
@@ -69619,42 +69610,6 @@ function useReport(reportIdArg, options = {}) {
     }
     return chartAxisOptions;
   }, [chartAxesBaseChart, chartAxisOptions, chartAxisOptionByField]);
-  const yAxisOptions = (0, import_react63.useMemo)(() => {
-    if (!chartAxesBaseChart) return [];
-    const keepOption = (option) => {
-      const col = findSchemaColumnForChartAxisField(
-        option.value,
-        schemaColumnOptions
-      );
-      if (!col) return true;
-      return isNumericishColumnType(col.type);
-    };
-    let eligible = chartAxisOptions.filter(keepOption);
-    const pivot = chartAxesBaseChart.pivot;
-    const pivotRowField = String(pivot?.rowField ?? "").trim();
-    if (pivot && !pivotRowField) {
-      const allowed = new Set(yAxisResolved.measures.map((axis) => axis.field));
-      if (allowed.size > 0) {
-        eligible = eligible.filter((o) => allowed.has(o.value));
-      }
-    }
-    const merged = new Map(
-      eligible.map((o) => [o.value, o])
-    );
-    for (const yAxisField of yAxisResolved.measures) {
-      const field = String(yAxisField?.field ?? "").trim();
-      if (!field || merged.has(field)) continue;
-      const opt = chartAxisOptionByField.get(field);
-      if (opt) merged.set(field, opt);
-    }
-    return Array.from(merged.values());
-  }, [
-    chartAxesBaseChart,
-    chartAxisOptionByField,
-    chartAxisOptions,
-    schemaColumnOptions,
-    yAxisResolved.measures
-  ]);
   const normalizedChartXAxisOptions = (0, import_react63.useMemo)(() => {
     return xAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
@@ -69662,13 +69617,6 @@ function useReport(reportIdArg, options = {}) {
       format: String(option.format ?? "").trim()
     }));
   }, [xAxisOptions]);
-  const normalizedChartYAxisOptions = (0, import_react63.useMemo)(() => {
-    return yAxisOptions.map((option) => ({
-      value: String(option.value ?? "").trim(),
-      label: String(option.label ?? option.value ?? "").trim(),
-      format: String(option.format ?? "").trim()
-    }));
-  }, [yAxisOptions]);
   const yAxisMeasures = (0, import_react63.useMemo)(() => {
     if (yAxisResolved.measures.length > 0) {
       return yAxisResolved.measures;
@@ -69683,6 +69631,21 @@ function useReport(reportIdArg, options = {}) {
       }
     ];
   }, [chartAxisOptions, yAxisResolved.measures]);
+  const yAxisOptions = (0, import_react63.useMemo)(
+    () => yAxisMeasures.map((measure) => ({
+      value: measure.field,
+      label: measure.label,
+      format: toAxisFormat(measure.format, "string")
+    })),
+    [yAxisMeasures]
+  );
+  const normalizedChartYAxisOptions = (0, import_react63.useMemo)(() => {
+    return yAxisOptions.map((option) => ({
+      value: String(option.value ?? "").trim(),
+      label: String(option.label ?? option.value ?? "").trim(),
+      format: String(option.format ?? "").trim()
+    }));
+  }, [yAxisOptions]);
   const resolvedXAxisField = (0, import_react63.useMemo)(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
@@ -69795,10 +69758,16 @@ function useReport(reportIdArg, options = {}) {
   );
   const yAxisSeries = (0, import_react63.useMemo)(() => {
     if (yAxisResolved.series.length > 0) {
+      if (yAxisResolved.measures.length === 1 && yAxisResolved.series !== yAxisResolved.measures) {
+        return applySingleResolvedYAxisFormatToPivotDisplay(
+          yAxisResolved.series,
+          yAxisResolved.measures
+        );
+      }
       return yAxisResolved.series;
     }
     return yAxisMeasures;
-  }, [yAxisMeasures, yAxisResolved.series]);
+  }, [yAxisMeasures, yAxisResolved.measures, yAxisResolved.series]);
   const chart = (0, import_react63.useMemo)(() => {
     if (!baseChart) return void 0;
     let columns2 = mergeChartColumnFormatsFromYAxisFields(
@@ -69820,7 +69789,7 @@ function useReport(reportIdArg, options = {}) {
       if (pivotAggregations2.length > 1 || hasCustomMeasureLabel) {
         columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
           columns: columns2 ?? baseChart.columns,
-          yAxisFields: yAxisSeries,
+          yAxisFields: [...yAxisMeasures, ...yAxisSeries],
           pivotRowField: pivotRowKey(baseChart),
           xAxisLabel: resolvedXAxisLabel
         });
@@ -70202,7 +70171,7 @@ function useReport(reportIdArg, options = {}) {
     ) : mergedFromReport;
     const pivotLabeledColumns = String(chartType ?? "").toLowerCase() === "table" && sourceReport?.pivot ? mergePivotTableDisplayColumnLabelsFromYAxis({
       columns: columns2,
-      yAxisFields: yAxisSeries,
+      yAxisFields: [...yAxisMeasures, ...yAxisSeries],
       pivotRowField: pivotRowKey(sourceReport),
       xAxisLabel: resolvedXAxisLabel
     }) ?? columns2 : columns2;
@@ -70285,6 +70254,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
+    yAxisMeasures,
     yAxisSeries,
     scopedSchemaColumns,
     sourceReport,
@@ -70438,7 +70408,10 @@ function useReport(reportIdArg, options = {}) {
       }
     }
     const yAxisByField = /* @__PURE__ */ new Map();
-    for (const yAxisField of chart?.yAxisFields ?? []) {
+    for (const yAxisField of [
+      ...chart?.yAxisFields ?? [],
+      ...yAxisResolved.measures
+    ]) {
       const f = String(yAxisField.field ?? "").trim();
       if (!f || yAxisByField.has(f)) continue;
       yAxisByField.set(f, {
@@ -70488,7 +70461,7 @@ function useReport(reportIdArg, options = {}) {
       ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {
-        label: selectedLabel || pivotLabel || (!isPivotTableChart ? persistedTableLabel : ""),
+        label: isPivotTableChart ? pivotLabel || selectedLabel : selectedLabel || pivotLabel || persistedTableLabel,
         format: resolvedColFormat
       });
     }
@@ -70748,12 +70721,7 @@ function useReport(reportIdArg, options = {}) {
           const same = clickedAgg && yAgg && getAggregationIdentityKey(clickedAgg) === getAggregationIdentityKey(yAgg);
           const singleBroadcast = Boolean(clickedAgg) && yAxisMeasures.length === 1;
           if (same || singleBroadcast) {
-            const nextLabel2 = yAxisMeasures.length === 1 && pivotModel.columnField ? mergePivotColumnSeriesLabelWithUserEdit(
-              String(y.label ?? "").trim(),
-              lab,
-              String(y.field ?? "").trim() || void 0
-            ) : lab;
-            return { ...y, label: nextLabel2 };
+            return { ...y, label: lab };
           }
           return y;
         });

package/dist/index.js

@@ -63713,7 +63713,7 @@ function pivotFallbackValueKeys(chart) {
   return (chart.pivotColumns ?? []).slice(1).map((column) => String(column.field ?? "").trim()).filter(Boolean);
 }
 function findSavedYAxisField(saved, field) {
-  return saved.find((axis) => String(axis.field ?? "").trim() === field) ?? (saved.length === 1 ? saved[0] : void 0);
+  return saved.find((axis) => String(axis.field ?? "").trim() === field);
 }
 function isPlaceholderAxisLabel(label, field) {
   const trimmed = String(label ?? "").trim();
@@ -64097,6 +64097,19 @@ function mergePivotColumnSeriesLabelWithUserEdit(normalizedLabel, userRowLabel,
   }
   return user;
 }
+function applySingleResolvedYAxisFormatToPivotDisplay(normalizedPivotYAxisFields, resolvedYAxisFields) {
+  if (resolvedYAxisFields.length !== 1) return normalizedPivotYAxisFields;
+  const only = resolvedYAxisFields[0];
+  return normalizedPivotYAxisFields.map((axis) => ({
+    ...axis,
+    label: mergePivotColumnSeriesLabelWithUserEdit(
+      String(axis.label ?? "").trim(),
+      only.label,
+      String(axis.field ?? "").trim() || void 0
+    ),
+    format: toAxisFormat(only.format, axis.format)
+  }));
+}
 function mergeChartColumnFormatsFromYAxisFields(columns, yAxisFields) {
   if (!columns?.length || !yAxisFields?.length) return columns;
   const formatByField = /* @__PURE__ */ new Map();
@@ -64118,10 +64131,6 @@ function mergeChartColumnFormatsFromYAxisFields(columns, yAxisFields) {
     return { ...col, format: nextFormat };
   });
 }
-function looksLikeCustomPivotTableMeasureLabel(label) {
-  const l = String(label ?? "").trim();
-  return l.includes(" \xB7 ") || l.includes(" \u2014 ") || /\([^)]+\)/.test(l);
-}
 function mergePivotTableDisplayColumnLabelsFromYAxis({
   columns,
   yAxisFields,
@@ -64131,16 +64140,11 @@ function mergePivotTableDisplayColumnLabelsFromYAxis({
   if (!columns?.length) return columns;
   const row = String(pivotRowField ?? "").trim();
   const xLab = String(xAxisLabel ?? "").trim();
-  const yList = (yAxisFields ?? []).map((y) => ({
-    field: String(y.field ?? "").trim(),
-    label: String(y.label ?? "").trim()
-  }));
-  const valueLabels = yList.map((y) => y.label).filter((l) => l.length > 0);
-  const distinct = new Set(valueLabels);
-  const anyCustom = valueLabels.some(looksLikeCustomPivotTableMeasureLabel);
-  const shouldMergeValueLabels = distinct.size > 1 || anyCustom;
   const labelByField = new Map(
-    yList.filter((y) => y.field).map((y) => [y.field, y.label])
+    (yAxisFields ?? []).map((y) => ({
+      field: String(y.field ?? "").trim(),
+      label: String(y.label ?? "").trim()
+    })).filter((y) => y.field && y.label).map((y) => [y.field, y.label])
   );
   return columns.map((c) => {
     const f = String(c.field ?? "").trim();
@@ -64148,7 +64152,6 @@ function mergePivotTableDisplayColumnLabelsFromYAxis({
     if (row && f === row && xLab && xLab !== row) {
       return { ...c, label: xLab };
     }
-    if (!shouldMergeValueLabels) return c;
     const yl = labelByField.get(f);
     if (!yl || String(c.label ?? "").trim() === yl) return c;
     return { ...c, label: yl };
@@ -64158,18 +64161,6 @@ function encodeColumnOptionValue(table, field) {
   if (!table || !table.trim()) return field;
   return `${table}_${field}`;
 }
-function isNumericishColumnType(type) {
-  const t = String(type ?? "").toLowerCase();
-  return t === "number" || t === "integer" || t === "float" || t === "decimal" || t === "bigint" || t === "double" || t === "whole_number";
-}
-function findSchemaColumnForChartAxisField(chartField, schemaOptions) {
-  const f = String(chartField ?? "").trim();
-  if (!f) return void 0;
-  for (const opt of schemaOptions) {
-    if (opt.value === f || opt.field === f) return opt;
-  }
-  return void 0;
-}
 function getAllColumnOptions({
   schemaColumnOptions,
   tableColumns,
@@ -69827,42 +69818,6 @@ function useReport(reportIdArg, options = {}) {
     }
     return chartAxisOptions;
   }, [chartAxesBaseChart, chartAxisOptions, chartAxisOptionByField]);
-  const yAxisOptions = useMemo33(() => {
-    if (!chartAxesBaseChart) return [];
-    const keepOption = (option) => {
-      const col = findSchemaColumnForChartAxisField(
-        option.value,
-        schemaColumnOptions
-      );
-      if (!col) return true;
-      return isNumericishColumnType(col.type);
-    };
-    let eligible = chartAxisOptions.filter(keepOption);
-    const pivot = chartAxesBaseChart.pivot;
-    const pivotRowField = String(pivot?.rowField ?? "").trim();
-    if (pivot && !pivotRowField) {
-      const allowed = new Set(yAxisResolved.measures.map((axis) => axis.field));
-      if (allowed.size > 0) {
-        eligible = eligible.filter((o) => allowed.has(o.value));
-      }
-    }
-    const merged = new Map(
-      eligible.map((o) => [o.value, o])
-    );
-    for (const yAxisField of yAxisResolved.measures) {
-      const field = String(yAxisField?.field ?? "").trim();
-      if (!field || merged.has(field)) continue;
-      const opt = chartAxisOptionByField.get(field);
-      if (opt) merged.set(field, opt);
-    }
-    return Array.from(merged.values());
-  }, [
-    chartAxesBaseChart,
-    chartAxisOptionByField,
-    chartAxisOptions,
-    schemaColumnOptions,
-    yAxisResolved.measures
-  ]);
   const normalizedChartXAxisOptions = useMemo33(() => {
     return xAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
@@ -69870,13 +69825,6 @@ function useReport(reportIdArg, options = {}) {
       format: String(option.format ?? "").trim()
     }));
   }, [xAxisOptions]);
-  const normalizedChartYAxisOptions = useMemo33(() => {
-    return yAxisOptions.map((option) => ({
-      value: String(option.value ?? "").trim(),
-      label: String(option.label ?? option.value ?? "").trim(),
-      format: String(option.format ?? "").trim()
-    }));
-  }, [yAxisOptions]);
   const yAxisMeasures = useMemo33(() => {
     if (yAxisResolved.measures.length > 0) {
       return yAxisResolved.measures;
@@ -69891,6 +69839,21 @@ function useReport(reportIdArg, options = {}) {
       }
     ];
   }, [chartAxisOptions, yAxisResolved.measures]);
+  const yAxisOptions = useMemo33(
+    () => yAxisMeasures.map((measure) => ({
+      value: measure.field,
+      label: measure.label,
+      format: toAxisFormat(measure.format, "string")
+    })),
+    [yAxisMeasures]
+  );
+  const normalizedChartYAxisOptions = useMemo33(() => {
+    return yAxisOptions.map((option) => ({
+      value: String(option.value ?? "").trim(),
+      label: String(option.label ?? option.value ?? "").trim(),
+      format: String(option.format ?? "").trim()
+    }));
+  }, [yAxisOptions]);
   const resolvedXAxisField = useMemo33(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
@@ -70003,10 +69966,16 @@ function useReport(reportIdArg, options = {}) {
   );
   const yAxisSeries = useMemo33(() => {
     if (yAxisResolved.series.length > 0) {
+      if (yAxisResolved.measures.length === 1 && yAxisResolved.series !== yAxisResolved.measures) {
+        return applySingleResolvedYAxisFormatToPivotDisplay(
+          yAxisResolved.series,
+          yAxisResolved.measures
+        );
+      }
       return yAxisResolved.series;
     }
     return yAxisMeasures;
-  }, [yAxisMeasures, yAxisResolved.series]);
+  }, [yAxisMeasures, yAxisResolved.measures, yAxisResolved.series]);
   const chart = useMemo33(() => {
     if (!baseChart) return void 0;
     let columns2 = mergeChartColumnFormatsFromYAxisFields(
@@ -70028,7 +69997,7 @@ function useReport(reportIdArg, options = {}) {
       if (pivotAggregations2.length > 1 || hasCustomMeasureLabel) {
         columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
           columns: columns2 ?? baseChart.columns,
-          yAxisFields: yAxisSeries,
+          yAxisFields: [...yAxisMeasures, ...yAxisSeries],
           pivotRowField: pivotRowKey(baseChart),
           xAxisLabel: resolvedXAxisLabel
         });
@@ -70410,7 +70379,7 @@ function useReport(reportIdArg, options = {}) {
     ) : mergedFromReport;
     const pivotLabeledColumns = String(chartType ?? "").toLowerCase() === "table" && sourceReport?.pivot ? mergePivotTableDisplayColumnLabelsFromYAxis({
       columns: columns2,
-      yAxisFields: yAxisSeries,
+      yAxisFields: [...yAxisMeasures, ...yAxisSeries],
       pivotRowField: pivotRowKey(sourceReport),
       xAxisLabel: resolvedXAxisLabel
     }) ?? columns2 : columns2;
@@ -70493,6 +70462,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
+    yAxisMeasures,
     yAxisSeries,
     scopedSchemaColumns,
     sourceReport,
@@ -70646,7 +70616,10 @@ function useReport(reportIdArg, options = {}) {
       }
     }
     const yAxisByField = /* @__PURE__ */ new Map();
-    for (const yAxisField of chart?.yAxisFields ?? []) {
+    for (const yAxisField of [
+      ...chart?.yAxisFields ?? [],
+      ...yAxisResolved.measures
+    ]) {
       const f = String(yAxisField.field ?? "").trim();
       if (!f || yAxisByField.has(f)) continue;
       yAxisByField.set(f, {
@@ -70696,7 +70669,7 @@ function useReport(reportIdArg, options = {}) {
       ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {
-        label: selectedLabel || pivotLabel || (!isPivotTableChart ? persistedTableLabel : ""),
+        label: isPivotTableChart ? pivotLabel || selectedLabel : selectedLabel || pivotLabel || persistedTableLabel,
         format: resolvedColFormat
       });
     }
@@ -70956,12 +70929,7 @@ function useReport(reportIdArg, options = {}) {
           const same = clickedAgg && yAgg && getAggregationIdentityKey(clickedAgg) === getAggregationIdentityKey(yAgg);
           const singleBroadcast = Boolean(clickedAgg) && yAxisMeasures.length === 1;
           if (same || singleBroadcast) {
-            const nextLabel2 = yAxisMeasures.length === 1 && pivotModel.columnField ? mergePivotColumnSeriesLabelWithUserEdit(
-              String(y.label ?? "").trim(),
-              lab,
-              String(y.field ?? "").trim() || void 0
-            ) : lab;
-            return { ...y, label: nextLabel2 };
+            return { ...y, label: lab };
           }
           return y;
         });

package/package.json

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