@quillsql/react 2.16.102 → 2.16.103

package/dist/index.cjs

@@ -63922,22 +63922,21 @@ function isPlaceholderAxisLabel(label, field) {
 function resolvedAxisLabel(savedLabel, field, generatedLabel) {
   return isPlaceholderAxisLabel(savedLabel, field) ? generatedLabel : savedLabel;
 }
+function uniqueAxisFormat(formats) {
+  const values = formats.map((format9) => String(format9 ?? "").trim()).filter(Boolean);
+  if (values.length === 0) return void 0;
+  return values.every((format9) => format9 === values[0]) ? values[0] : void 0;
+}
 function resolveYAxisFormatForField(field, aggregation, saved, fallback) {
   const formatByField = new Map(
     saved.map((axis) => [String(axis.field ?? "").trim(), axis.format])
   );
+  const savedFormats = uniqueAxisFormat(saved.map((axis) => axis.format));
   if (aggregation?.aggregationType === "count") {
-    return formatByField.get(field) ?? formatByField.get("count") ?? saved[0]?.format ?? "whole_number";
-  }
-  if (aggregation?.aggregationType === "percentage") {
-    const savedFormat = formatByField.get(field);
-    if (savedFormat === "percent" || savedFormat === "percentage") {
-      return savedFormat;
-    }
-    return "percentage";
+    return formatByField.get(field) ?? formatByField.get("count") ?? savedFormats ?? "whole_number";
   }
   const aggType = aggregation?.aggregationType ? String(aggregation.aggregationType) : void 0;
-  return formatByField.get(field) ?? formatByField.get(trimAggregationSuffix(field, aggType)) ?? (aggregation?.valueField ? formatByField.get(aggregation.valueField) : void 0) ?? fallback;
+  return formatByField.get(field) ?? formatByField.get(trimAggregationSuffix(field, aggType)) ?? (aggregation?.valueField ? formatByField.get(aggregation.valueField) : void 0) ?? savedFormats ?? fallback;
 }
 function aggregationIdentityForField(field, aggregations) {
   return getAggregationIdentityKey(
@@ -64008,6 +64007,7 @@ function applyYAxisEdits(measures, edits, aggregations) {
     const base = (identity ? byIdentity.get(identity) : void 0) ?? byField.get(field);
     const label = String(edit.label ?? "").trim();
     if (!base) {
+      if (aggregations.length > 0) continue;
       next.push({
         field,
         label: label || toTitleCaseLabel(field),
@@ -64021,7 +64021,16 @@ function applyYAxisEdits(measures, edits, aggregations) {
       format: toAxisFormat(edit.format, base.format)
     });
   }
-  return next.length > 0 ? next : measures;
+  if (next.length > 0) return next;
+  if (aggregations.length > 0 && measures.length === 1 && edits.length === 1 && edits[0]?.format) {
+    return [
+      {
+        ...measures[0],
+        format: toAxisFormat(edits[0].format, measures[0].format)
+      }
+    ];
+  }
+  return measures;
 }
 function resolveReportYAxis(chart, edits, resolveTableLabel) {
   const saved = chart.yAxisFields ?? [];
@@ -64032,7 +64041,6 @@ function resolveReportYAxis(chart, edits, resolveTableLabel) {
   const aggregations = getPivotAggregations(chart);
   const hasMultipleAggregations = aggregations.length > 1;
   const columnField = String(chart.pivot?.columnField ?? "").trim();
-  const isAggregationOnlyPivot = !String(chart.pivot?.rowField ?? "").trim() && !columnField;
   const fallback = saved[0]?.format ?? chart.xAxisFormat ?? "whole_number";
   const valueKeys = pivotValueFieldKeys(chart);
   const fallbackKeys = pivotFallbackValueKeys(chart);
@@ -64054,9 +64062,9 @@ function resolveReportYAxis(chart, edits, resolveTableLabel) {
       measure.field
     );
     if (matchedKey) return [{ ...measure, field: matchedKey }];
-    return isAggregationOnlyPivot ? [measure] : [];
+    return [measure];
   });
-  if (!columnField && measures.length === 0 && saved.length > 0) {
+  if (!columnField && measures.length === 0 && saved.length > 0 && aggregations.length === 0) {
     measures = saved;
   }
   measures = applyYAxisEdits(measures, edits, aggregations);
@@ -64083,7 +64091,12 @@ function resolveReportYAxis(chart, edits, resolveTableLabel) {
           measureLabel,
           hasMultipleAggregations
         ),
-        format: measure?.format ?? resolveYAxisFormatForField(field, aggregation, saved, fallback)
+        format: measure?.format ?? resolveYAxisFormatForField(
+          field,
+          aggregation,
+          saved,
+          fallback
+        )
       }
     ];
   });
@@ -64123,7 +64136,11 @@ function normalizePivotChartForDisplay(chart) {
     pivotRowFieldEarly,
     String(rowColumn?.format ?? "")
   ) ? pivotRowFieldEarly : config.xAxisField;
-  const withResolvedXAxis = resolvedXAxisField && resolvedXAxisField !== config.xAxisField ? { ...config, xAxisField: resolvedXAxisField } : config;
+  const withResolvedXAxis = resolvedXAxisField && resolvedXAxisField !== config.xAxisField ? {
+    ...config,
+    xAxisField: resolvedXAxisField,
+    xAxisFormat: toAxisFormat(rowColumn?.format, "string")
+  } : config;
   const isMetricOrGauge = ["metric", "gauge"].includes(
     String(withResolvedXAxis.chartType ?? "").toLowerCase()
   );

package/dist/index.js

@@ -64130,22 +64130,21 @@ function isPlaceholderAxisLabel(label, field) {
 function resolvedAxisLabel(savedLabel, field, generatedLabel) {
   return isPlaceholderAxisLabel(savedLabel, field) ? generatedLabel : savedLabel;
 }
+function uniqueAxisFormat(formats) {
+  const values = formats.map((format9) => String(format9 ?? "").trim()).filter(Boolean);
+  if (values.length === 0) return void 0;
+  return values.every((format9) => format9 === values[0]) ? values[0] : void 0;
+}
 function resolveYAxisFormatForField(field, aggregation, saved, fallback) {
   const formatByField = new Map(
     saved.map((axis) => [String(axis.field ?? "").trim(), axis.format])
   );
+  const savedFormats = uniqueAxisFormat(saved.map((axis) => axis.format));
   if (aggregation?.aggregationType === "count") {
-    return formatByField.get(field) ?? formatByField.get("count") ?? saved[0]?.format ?? "whole_number";
-  }
-  if (aggregation?.aggregationType === "percentage") {
-    const savedFormat = formatByField.get(field);
-    if (savedFormat === "percent" || savedFormat === "percentage") {
-      return savedFormat;
-    }
-    return "percentage";
+    return formatByField.get(field) ?? formatByField.get("count") ?? savedFormats ?? "whole_number";
   }
   const aggType = aggregation?.aggregationType ? String(aggregation.aggregationType) : void 0;
-  return formatByField.get(field) ?? formatByField.get(trimAggregationSuffix(field, aggType)) ?? (aggregation?.valueField ? formatByField.get(aggregation.valueField) : void 0) ?? fallback;
+  return formatByField.get(field) ?? formatByField.get(trimAggregationSuffix(field, aggType)) ?? (aggregation?.valueField ? formatByField.get(aggregation.valueField) : void 0) ?? savedFormats ?? fallback;
 }
 function aggregationIdentityForField(field, aggregations) {
   return getAggregationIdentityKey(
@@ -64216,6 +64215,7 @@ function applyYAxisEdits(measures, edits, aggregations) {
     const base = (identity ? byIdentity.get(identity) : void 0) ?? byField.get(field);
     const label = String(edit.label ?? "").trim();
     if (!base) {
+      if (aggregations.length > 0) continue;
       next.push({
         field,
         label: label || toTitleCaseLabel(field),
@@ -64229,7 +64229,16 @@ function applyYAxisEdits(measures, edits, aggregations) {
       format: toAxisFormat(edit.format, base.format)
     });
   }
-  return next.length > 0 ? next : measures;
+  if (next.length > 0) return next;
+  if (aggregations.length > 0 && measures.length === 1 && edits.length === 1 && edits[0]?.format) {
+    return [
+      {
+        ...measures[0],
+        format: toAxisFormat(edits[0].format, measures[0].format)
+      }
+    ];
+  }
+  return measures;
 }
 function resolveReportYAxis(chart, edits, resolveTableLabel) {
   const saved = chart.yAxisFields ?? [];
@@ -64240,7 +64249,6 @@ function resolveReportYAxis(chart, edits, resolveTableLabel) {
   const aggregations = getPivotAggregations(chart);
   const hasMultipleAggregations = aggregations.length > 1;
   const columnField = String(chart.pivot?.columnField ?? "").trim();
-  const isAggregationOnlyPivot = !String(chart.pivot?.rowField ?? "").trim() && !columnField;
   const fallback = saved[0]?.format ?? chart.xAxisFormat ?? "whole_number";
   const valueKeys = pivotValueFieldKeys(chart);
   const fallbackKeys = pivotFallbackValueKeys(chart);
@@ -64262,9 +64270,9 @@ function resolveReportYAxis(chart, edits, resolveTableLabel) {
       measure.field
     );
     if (matchedKey) return [{ ...measure, field: matchedKey }];
-    return isAggregationOnlyPivot ? [measure] : [];
+    return [measure];
   });
-  if (!columnField && measures.length === 0 && saved.length > 0) {
+  if (!columnField && measures.length === 0 && saved.length > 0 && aggregations.length === 0) {
     measures = saved;
   }
   measures = applyYAxisEdits(measures, edits, aggregations);
@@ -64291,7 +64299,12 @@ function resolveReportYAxis(chart, edits, resolveTableLabel) {
           measureLabel,
           hasMultipleAggregations
         ),
-        format: measure?.format ?? resolveYAxisFormatForField(field, aggregation, saved, fallback)
+        format: measure?.format ?? resolveYAxisFormatForField(
+          field,
+          aggregation,
+          saved,
+          fallback
+        )
       }
     ];
   });
@@ -64331,7 +64344,11 @@ function normalizePivotChartForDisplay(chart) {
     pivotRowFieldEarly,
     String(rowColumn?.format ?? "")
   ) ? pivotRowFieldEarly : config.xAxisField;
-  const withResolvedXAxis = resolvedXAxisField && resolvedXAxisField !== config.xAxisField ? { ...config, xAxisField: resolvedXAxisField } : config;
+  const withResolvedXAxis = resolvedXAxisField && resolvedXAxisField !== config.xAxisField ? {
+    ...config,
+    xAxisField: resolvedXAxisField,
+    xAxisFormat: toAxisFormat(rowColumn?.format, "string")
+  } : config;
   const isMetricOrGauge = ["metric", "gauge"].includes(
     String(withResolvedXAxis.chartType ?? "").toLowerCase()
   );

package/package.json

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