@quillsql/react 2.16.101 → 2.16.103

package/dist/index.cjs

@@ -23368,7 +23368,7 @@ async function fetchReportRows({
   additionalProcessing,
   overwriteCache = false
 }) {
-  const startedAt = performance.now();
+  const startedAt2 = performance.now();
   profileDashboard("raw-report-rows-fetch-start", { reportId });
   const fetchResp = await quillFetch({
     client,
@@ -23389,7 +23389,7 @@ async function fetchReportRows({
   const resp = await parseFetchResponse(client, "report", fetchResp, getToken);
   profileDashboard("raw-report-rows-fetch-finish", {
     reportId,
-    elapsedMs: Math.round(performance.now() - startedAt),
+    elapsedMs: Math.round(performance.now() - startedAt2),
     rowCount: resp.rows?.length ?? 0
   });
   if (client.databaseType?.toLowerCase() === "bigquery") {
@@ -23427,7 +23427,7 @@ async function fetchReport({
 }) {
   let reportInfo = void 0;
   let errorMessage = void 0;
-  const startedAt = performance.now();
+  const startedAt2 = performance.now();
   try {
     const task = usePivotTask ? "pivot-template" : useReportTask ? "report" : "item";
     profileDashboard("fetch-report-start", {
@@ -23482,7 +23482,7 @@ async function fetchReport({
     profileDashboard("fetch-report-response", {
       reportId: reportId ?? null,
       task,
-      elapsedMs: Math.round(performance.now() - startedAt),
+      elapsedMs: Math.round(performance.now() - startedAt2),
       hasRows: !!resp?.rows,
       rowCount: resp?.rows?.length ?? 0,
       hasFields: !!resp?.fields,
@@ -23507,7 +23507,7 @@ async function fetchReport({
     profileDashboard("fetch-report-processed", {
       reportId: reportId ?? null,
       task,
-      elapsedMs: Math.round(performance.now() - startedAt),
+      elapsedMs: Math.round(performance.now() - startedAt2),
       rowCount: reportInfo.rows?.length ?? 0,
       pivotRowCount: reportInfo.pivotRows?.length ?? 0
     });
@@ -23736,6 +23736,15 @@ async function saveReport({
   }
   return data;
 }
+function isPlainNumericCellValue(value) {
+  if (value === null || value === void 0 || value === "") return true;
+  if (typeof value === "number") return Number.isFinite(value);
+  if (typeof value === "bigint") return true;
+  if (typeof value !== "string") return false;
+  const trimmed = value.trim();
+  if (!trimmed) return true;
+  return /^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i.test(trimmed);
+}
 var formatRowsFromReport = (report, xAxisField, xAxisFormat) => {
   if (!report.rows || !report.columns) {
     return [];
@@ -23763,6 +23772,10 @@ var formatRowsFromReport = (report, xAxisField, xAxisFormat) => {
     const formattedRow = {};
     for (const column of resolvedColumns) {
       const rawValue = row[column.field];
+      if (NUMBER_FORMAT_TYPES.includes(String(column.format ?? "")) && !isPlainNumericCellValue(rawValue)) {
+        formattedRow[column.field] = rawValue === null || rawValue === void 0 || rawValue === "" ? "-" : String(rawValue);
+        continue;
+      }
       formattedRow[column.field] = column.inferFormat ? quillAutoFormat(rawValue) : getFormattedWithCache(column.format, rawValue);
     }
     return formattedRow;
@@ -39693,7 +39706,7 @@ var ChartDataLoader = ({
     }
     const fetchRowsRequestId = rowsRequestId.current + 1;
     rowsRequestId.current = fetchRowsRequestId;
-    const startedAt = performance.now();
+    const startedAt2 = performance.now();
     profileDashboard("chart-data-loader-fetch-start", {
       reportId: item.id,
       requestId: fetchRowsRequestId,
@@ -39839,7 +39852,7 @@ var ChartDataLoader = ({
         reportId: item.id,
         requestId: fetchRowsRequestId,
         reason,
-        elapsedMs: Math.round(performance.now() - startedAt),
+        elapsedMs: Math.round(performance.now() - startedAt2),
         isLatestRequest: fetchRowsRequestId === rowsRequestId.current,
         startsBackgroundFetch: !!backgroundFetch
       });
@@ -62391,6 +62404,345 @@ function resolveReportFromCacheCab({
 
 // src/hooks/useForm.tsx
 init_dashboardProfiler();
+
+// src/hooks/useReport.nanPivotDiag.ts
+init_valueFormatter();
+var NAN_PIVOT_DEBUG_FLAG = "__QUILL_DEBUG_NAN_PIVOT__";
+var NAN_PIVOT_LOG_FLAG = "__QUILL_NAN_PIVOT_LOG__";
+var startedAt = Date.now();
+function globalRecord() {
+  return globalThis;
+}
+function isNanPivotDebugEnabled() {
+  const globalValue = globalRecord()[NAN_PIVOT_DEBUG_FLAG];
+  if (globalValue === true) return true;
+  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
+    const envValue = String(process.env.QUILL_DEBUG_NAN_PIVOT ?? "").trim().toLowerCase();
+    return envValue === "1" || envValue === "true";
+  }
+  return false;
+}
+function getNanPivotLog() {
+  const log = globalRecord()[NAN_PIVOT_LOG_FLAG];
+  return Array.isArray(log) ? log : [];
+}
+function findNanValues(value, path = "root") {
+  if (typeof value === "number" && Number.isNaN(value)) {
+    return [`${path}=NaN`];
+  }
+  if (typeof value === "string" && /^[-+]?NaN(?:%|\s*)$/i.test(value.trim())) {
+    return [`${path}=${JSON.stringify(value)}`];
+  }
+  if (Array.isArray(value)) {
+    return value.flatMap(
+      (entry, index) => findNanValues(entry, `${path}[${index}]`)
+    );
+  }
+  if (value && typeof value === "object") {
+    return Object.entries(value).flatMap(
+      ([key, entry]) => findNanValues(entry, `${path}.${key}`)
+    );
+  }
+  return [];
+}
+function pivotKindOf(pivot) {
+  if (pivot == null) return "none";
+  if (typeof pivot !== "object") return "none";
+  const value = pivot;
+  const rowField = String(value.rowField ?? "").trim();
+  const columnField = String(value.columnField ?? "").trim();
+  const hasAggregation = Array.isArray(value.aggregations) && value.aggregations.length > 0 || Boolean(String(value.aggregationType ?? "").trim());
+  if (rowField && columnField) return "2D";
+  if (rowField || columnField) return "1D";
+  if (hasAggregation) return "aggregation-only";
+  return "empty-object";
+}
+function reportDetailSurfaceOf(chart) {
+  if (!chart || typeof chart !== "object") return "none";
+  const value = chart;
+  const chartType = String(value.chartType ?? "").trim().toLowerCase();
+  if (chartType !== "table") {
+    return "chart-display-chart";
+  }
+  const isPivotTable = Boolean(value.pivot) && Array.isArray(value.columns) && value.columns.length > 0;
+  return isPivotTable ? "chart-display-pivot-table" : "flat-table";
+}
+function columnFormats(columns) {
+  if (!Array.isArray(columns)) return [];
+  return columns.map((column) => {
+    const value = column ?? {};
+    return {
+      field: String(value.field ?? ""),
+      label: String(value.label ?? ""),
+      format: String(value.format ?? "")
+    };
+  });
+}
+function sampleRows(rows, count = 2) {
+  return Array.isArray(rows) ? rows.slice(0, count) : [];
+}
+function hitsFor(surface, value) {
+  return findNanValues(value).map((path) => ({ surface, path }));
+}
+function looksNumeric(value) {
+  if (typeof value === "number") return Number.isFinite(value);
+  if (typeof value !== "string") return false;
+  const trimmed = value.trim();
+  if (!trimmed) return false;
+  return Number.isFinite(Number(trimmed.replace(/,/g, "")));
+}
+function alreadyGroupedNumberString(value) {
+  return typeof value === "string" && /^-?\d{1,3}(?:,\d{3})+(?:\.\d+)?$/.test(value.trim());
+}
+function formatRowsAsChartDisplay(chart, rows, columns) {
+  if (!Array.isArray(rows) || rows.length === 0) return [];
+  const value = chart ?? {};
+  try {
+    return formatRowsFromReport(
+      {
+        ...value,
+        rows,
+        columns: Array.isArray(columns) ? columns : [],
+        pivot: chart?.pivot
+      },
+      value.xAxisField,
+      value.xAxisFormat
+    );
+  } catch {
+    return [];
+  }
+}
+function formatMismatchesFor(columns, rows) {
+  if (!Array.isArray(rows) || rows.length === 0) return [];
+  const mismatches = [];
+  for (const column of columns) {
+    if (!NUMBER_FORMAT_TYPES.includes(column.format)) continue;
+    for (let index = 0; index < Math.min(rows.length, 8); index += 1) {
+      const row = rows[index];
+      if (!row || typeof row !== "object") continue;
+      const cell = row[column.field];
+      if (cell == null || cell === "") continue;
+      if (looksNumeric(cell)) continue;
+      mismatches.push(
+        `${column.field} format=${column.format} row[${index}]=${JSON.stringify(cell)}`
+      );
+      break;
+    }
+  }
+  return mismatches;
+}
+function chartDisplayRows(chart) {
+  if (!chart || typeof chart !== "object") return [];
+  const value = chart;
+  if (String(value.chartType ?? "").toLowerCase() !== "table") {
+    return Array.isArray(value.rows) ? value.rows : [];
+  }
+  const tableColumns = value.includeCustomFields && value.columnsWithCustomFields && !value.pivot ? value.columnsWithCustomFields : value.columns ?? value.yAxisFields ?? [];
+  try {
+    return formatRowsFromReport(
+      { ...value, rows: value.rows ?? [], columns: tableColumns },
+      value.xAxisField,
+      value.xAxisFormat
+    );
+  } catch {
+    return [];
+  }
+}
+function pivotFieldHits(pivot) {
+  if (!pivot || typeof pivot !== "object") return [];
+  return hitsFor("pivotFields", {
+    rowField: pivot.rowField,
+    columnField: pivot.columnField,
+    rowFieldTable: pivot.rowFieldTable,
+    columnFieldTable: pivot.columnFieldTable
+  });
+}
+function jsonSafe(value) {
+  try {
+    return JSON.parse(
+      JSON.stringify(value, (_key, current) => {
+        if (typeof current === "number" && Number.isNaN(current)) {
+          return "__NaN__";
+        }
+        if (current === void 0) return "__undefined__";
+        return current;
+      })
+    );
+  } catch {
+    return value;
+  }
+}
+function snapshotUseReportNanState(input) {
+  const chart = input.chart ?? null;
+  const table = input.table ?? null;
+  const sourceReport = input.sourceReport ?? null;
+  const chartType = String(chart?.chartType ?? input.chartType ?? "").trim();
+  const tableColumns = columnFormats(table?.columns);
+  const chartColumns = columnFormats(chart?.columns);
+  const tableRows = Array.isArray(table?.rows) ? table.rows : [];
+  const chartRows = Array.isArray(chart?.rows) ? chart.rows : [];
+  const pivotRows = Array.isArray(chart?.pivotRows) ? chart.pivotRows : [];
+  const sourceRows = Array.isArray(sourceReport?.rows) ? sourceReport.rows : [];
+  const sourcePivotRows = Array.isArray(sourceReport?.pivotRows) ? sourceReport.pivotRows : [];
+  const displayRows = chartDisplayRows(chart);
+  const doubleFormatRows = formatRowsAsChartDisplay(
+    chart,
+    tableRows,
+    table?.columns ?? chart?.columns
+  );
+  const formPivot = input.formPivot ?? null;
+  const nextPivot = input.nextPivot ?? null;
+  const sourcePivot = sourceReport?.pivot ?? null;
+  const chartPivot = chart?.pivot ?? null;
+  const kind = pivotKindOf(chartPivot ?? nextPivot ?? formPivot ?? sourcePivot);
+  const groupRowsBy = String(input.groupRowsBy ?? "").trim() || null;
+  const groupColumnsBy = String(input.groupColumnsBy ?? "").trim() || null;
+  const hasFormPivotSelection = Boolean(
+    groupRowsBy || groupColumnsBy || Array.isArray(input.aggregations) && input.aggregations.some((value) => String(value ?? "").trim())
+  );
+  const unexpectedPivot = !hasFormPivotSelection && (kind === "1D" || kind === "2D" || kind === "aggregation-only" || kind === "empty-object");
+  const nanHits = [
+    ...hitsFor("useReport.table", tableRows),
+    ...hitsFor("useReport.chart.rows", chartRows),
+    ...hitsFor("useReport.chart.pivotRows", pivotRows),
+    ...hitsFor("sourceReport.rows", sourceRows),
+    ...hitsFor("sourceReport.pivotRows", sourcePivotRows),
+    ...hitsFor("chartDisplay.formattedRows", displayRows),
+    ...hitsFor("chartDisplay.doubleFormatTableRows", doubleFormatRows),
+    ...hitsFor("columnLabels", [
+      ...tableColumns.map((column) => column.label),
+      ...chartColumns.map((column) => column.label)
+    ]),
+    ...hitsFor("columnFields", [
+      ...tableColumns.map((column) => column.field),
+      ...chartColumns.map((column) => column.field)
+    ]),
+    ...pivotFieldHits(chartPivot),
+    ...pivotFieldHits(formPivot),
+    ...pivotFieldHits(sourcePivot)
+  ];
+  return {
+    at: (/* @__PURE__ */ new Date()).toISOString(),
+    atMs: Date.now() - startedAt,
+    source: input.source ?? "useReport",
+    flow: input.flow,
+    step: input.step,
+    reportId: String(input.reportId ?? ""),
+    datasources: Array.isArray(input.datasources) ? input.datasources.map((value) => String(value)) : [],
+    chartType,
+    chartLoading: Boolean(input.chartLoading),
+    tableLoading: Boolean(input.tableLoading),
+    loading: Boolean(input.loading),
+    groupRowsBy,
+    groupColumnsBy,
+    aggregations: input.aggregations ?? [],
+    formPivot,
+    nextPivot,
+    sourcePivot,
+    chartPivot,
+    pivotKind: kind,
+    unexpectedPivot,
+    isPivotTableChart: Boolean(input.isPivotTableChart),
+    reportDetailSurface: reportDetailSurfaceOf(chart),
+    tableColumnFormats: tableColumns,
+    chartColumnFormats: chartColumns,
+    tableRowCount: tableRows.length,
+    chartRowCount: chartRows.length,
+    pivotRowCount: pivotRows.length,
+    tableSample: sampleRows(tableRows),
+    chartRowSample: sampleRows(chartRows),
+    pivotRowSample: sampleRows(pivotRows),
+    chartDisplaySample: sampleRows(displayRows),
+    doubleFormatSample: sampleRows(doubleFormatRows),
+    formatMismatches: [
+      ...formatMismatchesFor(tableColumns, sourceRows.length ? sourceRows : tableRows),
+      ...formatMismatchesFor(chartColumns, chartRows.length ? chartRows : pivotRows),
+      ...tableRows.flatMap((row, index) => {
+        if (!row || typeof row !== "object") return [];
+        return tableColumns.filter(
+          (column) => NUMBER_FORMAT_TYPES.includes(column.format) && alreadyGroupedNumberString(
+            row[column.field]
+          )
+        ).map(
+          (column) => `already-formatted ${column.field} row[${index}]=${JSON.stringify(
+            row[column.field]
+          )}`
+        );
+      })
+    ],
+    nanHits
+  };
+}
+var lastSerializedBySource = /* @__PURE__ */ new Map();
+function recordUseReportNanPivotState(input) {
+  if (!isNanPivotDebugEnabled()) return null;
+  const snapshot = snapshotUseReportNanState(input);
+  const key = `${snapshot.source}:${snapshot.flow ?? ""}:${snapshot.reportId}`;
+  const serialized = JSON.stringify(jsonSafe(snapshot));
+  if (lastSerializedBySource.get(key) === serialized) {
+    return snapshot;
+  }
+  lastSerializedBySource.set(key, serialized);
+  const log = getNanPivotLog();
+  log.push(snapshot);
+  globalRecord()[NAN_PIVOT_LOG_FLAG] = log;
+  const liveHits = snapshot.nanHits.filter(
+    (hit) => hit.surface !== "chartDisplay.doubleFormatTableRows"
+  );
+  const compact = {
+    atMs: snapshot.atMs,
+    source: snapshot.source,
+    flow: snapshot.flow,
+    step: snapshot.step,
+    reportId: snapshot.reportId,
+    datasources: snapshot.datasources,
+    chartType: snapshot.chartType,
+    loading: snapshot.loading,
+    chartLoading: snapshot.chartLoading,
+    tableLoading: snapshot.tableLoading,
+    groupRowsBy: snapshot.groupRowsBy,
+    groupColumnsBy: snapshot.groupColumnsBy,
+    pivotKind: snapshot.pivotKind,
+    unexpectedPivot: snapshot.unexpectedPivot,
+    isPivotTableChart: snapshot.isPivotTableChart,
+    reportDetailSurface: snapshot.reportDetailSurface,
+    tableRowCount: snapshot.tableRowCount,
+    chartRowCount: snapshot.chartRowCount,
+    pivotRowCount: snapshot.pivotRowCount,
+    formatMismatches: snapshot.formatMismatches.slice(0, 8),
+    nanHits: snapshot.nanHits.slice(0, 12)
+  };
+  if (liveHits.length > 0 || snapshot.unexpectedPivot) {
+    console.log(
+      "[useReport][nan-pivot][hit]",
+      JSON.stringify(
+        jsonSafe({
+          ...compact,
+          tableSample: snapshot.tableSample,
+          chartRowSample: snapshot.chartRowSample,
+          pivotRowSample: snapshot.pivotRowSample,
+          chartDisplaySample: snapshot.chartDisplaySample,
+          doubleFormatSample: snapshot.doubleFormatSample,
+          formPivot: snapshot.formPivot,
+          chartPivot: snapshot.chartPivot,
+          sourcePivot: snapshot.sourcePivot
+        }),
+        null,
+        2
+      )
+    );
+  } else if (snapshot.nanHits.length > 0) {
+    console.log(
+      "[useReport][nan-pivot][double-format]",
+      JSON.stringify(compact)
+    );
+  } else {
+    console.log("[useReport][nan-pivot][state]", JSON.stringify(compact));
+  }
+  return snapshot;
+}
+
+// src/hooks/useForm.tsx
 init_reportRequestPool();
 
 // src/hooks/useForm.queries.ts
@@ -63570,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(
@@ -63656,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),
@@ -63669,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 ?? [];
@@ -63680,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);
@@ -63702,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);
@@ -63731,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
+        )
       }
     ];
   });
@@ -63771,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()
   );
@@ -66598,7 +66967,7 @@ function useReport(reportIdArg, options = {}) {
       pivot,
       operation
     }) => {
-      const startedAt = performance.now();
+      const startedAt2 = performance.now();
       const snapshot = await cacheCab.getReportSnapshot(
         effectiveReportId,
         tenants
@@ -66617,7 +66986,7 @@ function useReport(reportIdArg, options = {}) {
         )
       });
       const diagnostics = globalThis.__QUILL_CACHECAB_DIAGNOSTICS__;
-      const durationMs = performance.now() - startedAt;
+      const durationMs = performance.now() - startedAt2;
       const outcome = resolution.resolved ? "hit" : "fallback";
       if (Array.isArray(diagnostics)) {
         diagnostics.push({
@@ -69605,11 +69974,12 @@ function useReport(reportIdArg, options = {}) {
       registerOption(column.field, column.label, column.format);
     }
     for (const yAxis2 of yAxisResolved.measures) {
-      registerOption(yAxis2.field, yAxis2.label, yAxis2.format);
+      const field = String(yAxis2.field ?? "").trim();
+      registerOption(field, field, yAxis2.format);
       if (yAxis2.format) {
-        const existing = optionsByField.get(yAxis2.field);
+        const existing = optionsByField.get(field);
         if (existing) {
-          optionsByField.set(yAxis2.field, {
+          optionsByField.set(field, {
             ...existing,
             format: toAxisFormat(yAxis2.format, existing.format)
           });
@@ -69686,12 +70056,17 @@ 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]
+    () => yAxisMeasures.map((measure) => {
+      const field = String(measure.field ?? "").trim();
+      const catalog = chartAxisOptionByField.get(field);
+      if (catalog) return catalog;
+      return {
+        value: field,
+        label: toTitleCaseLabel(field),
+        format: toAxisFormat(measure.format, "string")
+      };
+    }),
+    [chartAxisOptionByField, yAxisMeasures]
   );
   const normalizedChartYAxisOptions = (0, import_react63.useMemo)(() => {
     return yAxisOptions.map((option) => ({
@@ -70031,11 +70406,7 @@ function useReport(reportIdArg, options = {}) {
   );
   const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
   const pivotTableColumns = (0, import_react63.useMemo)(
-    () => isPivotTableChart ? buildPivotTableColumns(
-      pivotState,
-      chart,
-      resolveTableDisplayLabel
-    ) : null,
+    () => isPivotTableChart ? buildPivotTableColumns(pivotState, chart, resolveTableDisplayLabel) : null,
     [chart, isPivotTableChart, pivotState, resolveTableDisplayLabel]
   );
   const chartAxes = (0, import_react63.useMemo)(() => {
@@ -70686,6 +71057,43 @@ function useReport(reportIdArg, options = {}) {
     tableRefreshQuery.isFetching,
     tableRefreshQueryEnabled
   ]);
+  (0, import_react63.useEffect)(() => {
+    if (!isNanPivotDebugEnabled()) return;
+    recordUseReportNanPivotState({
+      source: "useReport",
+      reportId: effectiveReportId,
+      datasources,
+      chartType: resolvedChartType,
+      chartLoading,
+      tableLoading,
+      loading,
+      groupRowsBy,
+      groupColumnsBy,
+      aggregations: aggregationValues,
+      formPivot: pivotState,
+      nextPivot,
+      sourceReport,
+      chart: chartWithSort,
+      table,
+      isPivotTableChart
+    });
+  }, [
+    aggregationValues,
+    chartLoading,
+    chartWithSort,
+    datasources,
+    effectiveReportId,
+    groupColumnsBy,
+    groupRowsBy,
+    isPivotTableChart,
+    loading,
+    nextPivot,
+    pivotState,
+    resolvedChartType,
+    sourceReport,
+    table,
+    tableLoading
+  ]);
   const buildSetReportColumnsFromIds = (nextColumnIds, settingsById) => {
     const normalizedNextIds = nextColumnIds.map((columnId) => String(columnId ?? "").trim()).filter(Boolean);
     return normalizedNextIds.map((columnId) => {

package/dist/index.js

@@ -23350,7 +23350,7 @@ async function fetchReportRows({
   additionalProcessing,
   overwriteCache = false
 }) {
-  const startedAt = performance.now();
+  const startedAt2 = performance.now();
   profileDashboard("raw-report-rows-fetch-start", { reportId });
   const fetchResp = await quillFetch({
     client,
@@ -23371,7 +23371,7 @@ async function fetchReportRows({
   const resp = await parseFetchResponse(client, "report", fetchResp, getToken);
   profileDashboard("raw-report-rows-fetch-finish", {
     reportId,
-    elapsedMs: Math.round(performance.now() - startedAt),
+    elapsedMs: Math.round(performance.now() - startedAt2),
     rowCount: resp.rows?.length ?? 0
   });
   if (client.databaseType?.toLowerCase() === "bigquery") {
@@ -23409,7 +23409,7 @@ async function fetchReport({
 }) {
   let reportInfo = void 0;
   let errorMessage = void 0;
-  const startedAt = performance.now();
+  const startedAt2 = performance.now();
   try {
     const task = usePivotTask ? "pivot-template" : useReportTask ? "report" : "item";
     profileDashboard("fetch-report-start", {
@@ -23464,7 +23464,7 @@ async function fetchReport({
     profileDashboard("fetch-report-response", {
       reportId: reportId ?? null,
       task,
-      elapsedMs: Math.round(performance.now() - startedAt),
+      elapsedMs: Math.round(performance.now() - startedAt2),
       hasRows: !!resp?.rows,
       rowCount: resp?.rows?.length ?? 0,
       hasFields: !!resp?.fields,
@@ -23489,7 +23489,7 @@ async function fetchReport({
     profileDashboard("fetch-report-processed", {
       reportId: reportId ?? null,
       task,
-      elapsedMs: Math.round(performance.now() - startedAt),
+      elapsedMs: Math.round(performance.now() - startedAt2),
       rowCount: reportInfo.rows?.length ?? 0,
       pivotRowCount: reportInfo.pivotRows?.length ?? 0
     });
@@ -23718,6 +23718,15 @@ async function saveReport({
   }
   return data;
 }
+function isPlainNumericCellValue(value) {
+  if (value === null || value === void 0 || value === "") return true;
+  if (typeof value === "number") return Number.isFinite(value);
+  if (typeof value === "bigint") return true;
+  if (typeof value !== "string") return false;
+  const trimmed = value.trim();
+  if (!trimmed) return true;
+  return /^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i.test(trimmed);
+}
 var formatRowsFromReport = (report, xAxisField, xAxisFormat) => {
   if (!report.rows || !report.columns) {
     return [];
@@ -23745,6 +23754,10 @@ var formatRowsFromReport = (report, xAxisField, xAxisFormat) => {
     const formattedRow = {};
     for (const column of resolvedColumns) {
       const rawValue = row[column.field];
+      if (NUMBER_FORMAT_TYPES.includes(String(column.format ?? "")) && !isPlainNumericCellValue(rawValue)) {
+        formattedRow[column.field] = rawValue === null || rawValue === void 0 || rawValue === "" ? "-" : String(rawValue);
+        continue;
+      }
       formattedRow[column.field] = column.inferFormat ? quillAutoFormat(rawValue) : getFormattedWithCache(column.format, rawValue);
     }
     return formattedRow;
@@ -39780,7 +39793,7 @@ var ChartDataLoader = ({
     }
     const fetchRowsRequestId = rowsRequestId.current + 1;
     rowsRequestId.current = fetchRowsRequestId;
-    const startedAt = performance.now();
+    const startedAt2 = performance.now();
     profileDashboard("chart-data-loader-fetch-start", {
       reportId: item.id,
       requestId: fetchRowsRequestId,
@@ -39926,7 +39939,7 @@ var ChartDataLoader = ({
         reportId: item.id,
         requestId: fetchRowsRequestId,
         reason,
-        elapsedMs: Math.round(performance.now() - startedAt),
+        elapsedMs: Math.round(performance.now() - startedAt2),
         isLatestRequest: fetchRowsRequestId === rowsRequestId.current,
         startsBackgroundFetch: !!backgroundFetch
       });
@@ -62599,6 +62612,345 @@ function resolveReportFromCacheCab({
 
 // src/hooks/useForm.tsx
 init_dashboardProfiler();
+
+// src/hooks/useReport.nanPivotDiag.ts
+init_valueFormatter();
+var NAN_PIVOT_DEBUG_FLAG = "__QUILL_DEBUG_NAN_PIVOT__";
+var NAN_PIVOT_LOG_FLAG = "__QUILL_NAN_PIVOT_LOG__";
+var startedAt = Date.now();
+function globalRecord() {
+  return globalThis;
+}
+function isNanPivotDebugEnabled() {
+  const globalValue = globalRecord()[NAN_PIVOT_DEBUG_FLAG];
+  if (globalValue === true) return true;
+  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
+    const envValue = String(process.env.QUILL_DEBUG_NAN_PIVOT ?? "").trim().toLowerCase();
+    return envValue === "1" || envValue === "true";
+  }
+  return false;
+}
+function getNanPivotLog() {
+  const log = globalRecord()[NAN_PIVOT_LOG_FLAG];
+  return Array.isArray(log) ? log : [];
+}
+function findNanValues(value, path = "root") {
+  if (typeof value === "number" && Number.isNaN(value)) {
+    return [`${path}=NaN`];
+  }
+  if (typeof value === "string" && /^[-+]?NaN(?:%|\s*)$/i.test(value.trim())) {
+    return [`${path}=${JSON.stringify(value)}`];
+  }
+  if (Array.isArray(value)) {
+    return value.flatMap(
+      (entry, index) => findNanValues(entry, `${path}[${index}]`)
+    );
+  }
+  if (value && typeof value === "object") {
+    return Object.entries(value).flatMap(
+      ([key, entry]) => findNanValues(entry, `${path}.${key}`)
+    );
+  }
+  return [];
+}
+function pivotKindOf(pivot) {
+  if (pivot == null) return "none";
+  if (typeof pivot !== "object") return "none";
+  const value = pivot;
+  const rowField = String(value.rowField ?? "").trim();
+  const columnField = String(value.columnField ?? "").trim();
+  const hasAggregation = Array.isArray(value.aggregations) && value.aggregations.length > 0 || Boolean(String(value.aggregationType ?? "").trim());
+  if (rowField && columnField) return "2D";
+  if (rowField || columnField) return "1D";
+  if (hasAggregation) return "aggregation-only";
+  return "empty-object";
+}
+function reportDetailSurfaceOf(chart) {
+  if (!chart || typeof chart !== "object") return "none";
+  const value = chart;
+  const chartType = String(value.chartType ?? "").trim().toLowerCase();
+  if (chartType !== "table") {
+    return "chart-display-chart";
+  }
+  const isPivotTable = Boolean(value.pivot) && Array.isArray(value.columns) && value.columns.length > 0;
+  return isPivotTable ? "chart-display-pivot-table" : "flat-table";
+}
+function columnFormats(columns) {
+  if (!Array.isArray(columns)) return [];
+  return columns.map((column) => {
+    const value = column ?? {};
+    return {
+      field: String(value.field ?? ""),
+      label: String(value.label ?? ""),
+      format: String(value.format ?? "")
+    };
+  });
+}
+function sampleRows(rows, count = 2) {
+  return Array.isArray(rows) ? rows.slice(0, count) : [];
+}
+function hitsFor(surface, value) {
+  return findNanValues(value).map((path) => ({ surface, path }));
+}
+function looksNumeric(value) {
+  if (typeof value === "number") return Number.isFinite(value);
+  if (typeof value !== "string") return false;
+  const trimmed = value.trim();
+  if (!trimmed) return false;
+  return Number.isFinite(Number(trimmed.replace(/,/g, "")));
+}
+function alreadyGroupedNumberString(value) {
+  return typeof value === "string" && /^-?\d{1,3}(?:,\d{3})+(?:\.\d+)?$/.test(value.trim());
+}
+function formatRowsAsChartDisplay(chart, rows, columns) {
+  if (!Array.isArray(rows) || rows.length === 0) return [];
+  const value = chart ?? {};
+  try {
+    return formatRowsFromReport(
+      {
+        ...value,
+        rows,
+        columns: Array.isArray(columns) ? columns : [],
+        pivot: chart?.pivot
+      },
+      value.xAxisField,
+      value.xAxisFormat
+    );
+  } catch {
+    return [];
+  }
+}
+function formatMismatchesFor(columns, rows) {
+  if (!Array.isArray(rows) || rows.length === 0) return [];
+  const mismatches = [];
+  for (const column of columns) {
+    if (!NUMBER_FORMAT_TYPES.includes(column.format)) continue;
+    for (let index = 0; index < Math.min(rows.length, 8); index += 1) {
+      const row = rows[index];
+      if (!row || typeof row !== "object") continue;
+      const cell = row[column.field];
+      if (cell == null || cell === "") continue;
+      if (looksNumeric(cell)) continue;
+      mismatches.push(
+        `${column.field} format=${column.format} row[${index}]=${JSON.stringify(cell)}`
+      );
+      break;
+    }
+  }
+  return mismatches;
+}
+function chartDisplayRows(chart) {
+  if (!chart || typeof chart !== "object") return [];
+  const value = chart;
+  if (String(value.chartType ?? "").toLowerCase() !== "table") {
+    return Array.isArray(value.rows) ? value.rows : [];
+  }
+  const tableColumns = value.includeCustomFields && value.columnsWithCustomFields && !value.pivot ? value.columnsWithCustomFields : value.columns ?? value.yAxisFields ?? [];
+  try {
+    return formatRowsFromReport(
+      { ...value, rows: value.rows ?? [], columns: tableColumns },
+      value.xAxisField,
+      value.xAxisFormat
+    );
+  } catch {
+    return [];
+  }
+}
+function pivotFieldHits(pivot) {
+  if (!pivot || typeof pivot !== "object") return [];
+  return hitsFor("pivotFields", {
+    rowField: pivot.rowField,
+    columnField: pivot.columnField,
+    rowFieldTable: pivot.rowFieldTable,
+    columnFieldTable: pivot.columnFieldTable
+  });
+}
+function jsonSafe(value) {
+  try {
+    return JSON.parse(
+      JSON.stringify(value, (_key, current) => {
+        if (typeof current === "number" && Number.isNaN(current)) {
+          return "__NaN__";
+        }
+        if (current === void 0) return "__undefined__";
+        return current;
+      })
+    );
+  } catch {
+    return value;
+  }
+}
+function snapshotUseReportNanState(input) {
+  const chart = input.chart ?? null;
+  const table = input.table ?? null;
+  const sourceReport = input.sourceReport ?? null;
+  const chartType = String(chart?.chartType ?? input.chartType ?? "").trim();
+  const tableColumns = columnFormats(table?.columns);
+  const chartColumns = columnFormats(chart?.columns);
+  const tableRows = Array.isArray(table?.rows) ? table.rows : [];
+  const chartRows = Array.isArray(chart?.rows) ? chart.rows : [];
+  const pivotRows = Array.isArray(chart?.pivotRows) ? chart.pivotRows : [];
+  const sourceRows = Array.isArray(sourceReport?.rows) ? sourceReport.rows : [];
+  const sourcePivotRows = Array.isArray(sourceReport?.pivotRows) ? sourceReport.pivotRows : [];
+  const displayRows = chartDisplayRows(chart);
+  const doubleFormatRows = formatRowsAsChartDisplay(
+    chart,
+    tableRows,
+    table?.columns ?? chart?.columns
+  );
+  const formPivot = input.formPivot ?? null;
+  const nextPivot = input.nextPivot ?? null;
+  const sourcePivot = sourceReport?.pivot ?? null;
+  const chartPivot = chart?.pivot ?? null;
+  const kind = pivotKindOf(chartPivot ?? nextPivot ?? formPivot ?? sourcePivot);
+  const groupRowsBy = String(input.groupRowsBy ?? "").trim() || null;
+  const groupColumnsBy = String(input.groupColumnsBy ?? "").trim() || null;
+  const hasFormPivotSelection = Boolean(
+    groupRowsBy || groupColumnsBy || Array.isArray(input.aggregations) && input.aggregations.some((value) => String(value ?? "").trim())
+  );
+  const unexpectedPivot = !hasFormPivotSelection && (kind === "1D" || kind === "2D" || kind === "aggregation-only" || kind === "empty-object");
+  const nanHits = [
+    ...hitsFor("useReport.table", tableRows),
+    ...hitsFor("useReport.chart.rows", chartRows),
+    ...hitsFor("useReport.chart.pivotRows", pivotRows),
+    ...hitsFor("sourceReport.rows", sourceRows),
+    ...hitsFor("sourceReport.pivotRows", sourcePivotRows),
+    ...hitsFor("chartDisplay.formattedRows", displayRows),
+    ...hitsFor("chartDisplay.doubleFormatTableRows", doubleFormatRows),
+    ...hitsFor("columnLabels", [
+      ...tableColumns.map((column) => column.label),
+      ...chartColumns.map((column) => column.label)
+    ]),
+    ...hitsFor("columnFields", [
+      ...tableColumns.map((column) => column.field),
+      ...chartColumns.map((column) => column.field)
+    ]),
+    ...pivotFieldHits(chartPivot),
+    ...pivotFieldHits(formPivot),
+    ...pivotFieldHits(sourcePivot)
+  ];
+  return {
+    at: (/* @__PURE__ */ new Date()).toISOString(),
+    atMs: Date.now() - startedAt,
+    source: input.source ?? "useReport",
+    flow: input.flow,
+    step: input.step,
+    reportId: String(input.reportId ?? ""),
+    datasources: Array.isArray(input.datasources) ? input.datasources.map((value) => String(value)) : [],
+    chartType,
+    chartLoading: Boolean(input.chartLoading),
+    tableLoading: Boolean(input.tableLoading),
+    loading: Boolean(input.loading),
+    groupRowsBy,
+    groupColumnsBy,
+    aggregations: input.aggregations ?? [],
+    formPivot,
+    nextPivot,
+    sourcePivot,
+    chartPivot,
+    pivotKind: kind,
+    unexpectedPivot,
+    isPivotTableChart: Boolean(input.isPivotTableChart),
+    reportDetailSurface: reportDetailSurfaceOf(chart),
+    tableColumnFormats: tableColumns,
+    chartColumnFormats: chartColumns,
+    tableRowCount: tableRows.length,
+    chartRowCount: chartRows.length,
+    pivotRowCount: pivotRows.length,
+    tableSample: sampleRows(tableRows),
+    chartRowSample: sampleRows(chartRows),
+    pivotRowSample: sampleRows(pivotRows),
+    chartDisplaySample: sampleRows(displayRows),
+    doubleFormatSample: sampleRows(doubleFormatRows),
+    formatMismatches: [
+      ...formatMismatchesFor(tableColumns, sourceRows.length ? sourceRows : tableRows),
+      ...formatMismatchesFor(chartColumns, chartRows.length ? chartRows : pivotRows),
+      ...tableRows.flatMap((row, index) => {
+        if (!row || typeof row !== "object") return [];
+        return tableColumns.filter(
+          (column) => NUMBER_FORMAT_TYPES.includes(column.format) && alreadyGroupedNumberString(
+            row[column.field]
+          )
+        ).map(
+          (column) => `already-formatted ${column.field} row[${index}]=${JSON.stringify(
+            row[column.field]
+          )}`
+        );
+      })
+    ],
+    nanHits
+  };
+}
+var lastSerializedBySource = /* @__PURE__ */ new Map();
+function recordUseReportNanPivotState(input) {
+  if (!isNanPivotDebugEnabled()) return null;
+  const snapshot = snapshotUseReportNanState(input);
+  const key = `${snapshot.source}:${snapshot.flow ?? ""}:${snapshot.reportId}`;
+  const serialized = JSON.stringify(jsonSafe(snapshot));
+  if (lastSerializedBySource.get(key) === serialized) {
+    return snapshot;
+  }
+  lastSerializedBySource.set(key, serialized);
+  const log = getNanPivotLog();
+  log.push(snapshot);
+  globalRecord()[NAN_PIVOT_LOG_FLAG] = log;
+  const liveHits = snapshot.nanHits.filter(
+    (hit) => hit.surface !== "chartDisplay.doubleFormatTableRows"
+  );
+  const compact = {
+    atMs: snapshot.atMs,
+    source: snapshot.source,
+    flow: snapshot.flow,
+    step: snapshot.step,
+    reportId: snapshot.reportId,
+    datasources: snapshot.datasources,
+    chartType: snapshot.chartType,
+    loading: snapshot.loading,
+    chartLoading: snapshot.chartLoading,
+    tableLoading: snapshot.tableLoading,
+    groupRowsBy: snapshot.groupRowsBy,
+    groupColumnsBy: snapshot.groupColumnsBy,
+    pivotKind: snapshot.pivotKind,
+    unexpectedPivot: snapshot.unexpectedPivot,
+    isPivotTableChart: snapshot.isPivotTableChart,
+    reportDetailSurface: snapshot.reportDetailSurface,
+    tableRowCount: snapshot.tableRowCount,
+    chartRowCount: snapshot.chartRowCount,
+    pivotRowCount: snapshot.pivotRowCount,
+    formatMismatches: snapshot.formatMismatches.slice(0, 8),
+    nanHits: snapshot.nanHits.slice(0, 12)
+  };
+  if (liveHits.length > 0 || snapshot.unexpectedPivot) {
+    console.log(
+      "[useReport][nan-pivot][hit]",
+      JSON.stringify(
+        jsonSafe({
+          ...compact,
+          tableSample: snapshot.tableSample,
+          chartRowSample: snapshot.chartRowSample,
+          pivotRowSample: snapshot.pivotRowSample,
+          chartDisplaySample: snapshot.chartDisplaySample,
+          doubleFormatSample: snapshot.doubleFormatSample,
+          formPivot: snapshot.formPivot,
+          chartPivot: snapshot.chartPivot,
+          sourcePivot: snapshot.sourcePivot
+        }),
+        null,
+        2
+      )
+    );
+  } else if (snapshot.nanHits.length > 0) {
+    console.log(
+      "[useReport][nan-pivot][double-format]",
+      JSON.stringify(compact)
+    );
+  } else {
+    console.log("[useReport][nan-pivot][state]", JSON.stringify(compact));
+  }
+  return snapshot;
+}
+
+// src/hooks/useForm.tsx
 init_reportRequestPool();
 
 // src/hooks/useForm.queries.ts
@@ -63778,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(
@@ -63864,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),
@@ -63877,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 ?? [];
@@ -63888,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);
@@ -63910,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);
@@ -63939,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
+        )
       }
     ];
   });
@@ -63979,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()
   );
@@ -66806,7 +67175,7 @@ function useReport(reportIdArg, options = {}) {
       pivot,
       operation
     }) => {
-      const startedAt = performance.now();
+      const startedAt2 = performance.now();
       const snapshot = await cacheCab.getReportSnapshot(
         effectiveReportId,
         tenants
@@ -66825,7 +67194,7 @@ function useReport(reportIdArg, options = {}) {
         )
       });
       const diagnostics = globalThis.__QUILL_CACHECAB_DIAGNOSTICS__;
-      const durationMs = performance.now() - startedAt;
+      const durationMs = performance.now() - startedAt2;
       const outcome = resolution.resolved ? "hit" : "fallback";
       if (Array.isArray(diagnostics)) {
         diagnostics.push({
@@ -69813,11 +70182,12 @@ function useReport(reportIdArg, options = {}) {
       registerOption(column.field, column.label, column.format);
     }
     for (const yAxis2 of yAxisResolved.measures) {
-      registerOption(yAxis2.field, yAxis2.label, yAxis2.format);
+      const field = String(yAxis2.field ?? "").trim();
+      registerOption(field, field, yAxis2.format);
       if (yAxis2.format) {
-        const existing = optionsByField.get(yAxis2.field);
+        const existing = optionsByField.get(field);
         if (existing) {
-          optionsByField.set(yAxis2.field, {
+          optionsByField.set(field, {
             ...existing,
             format: toAxisFormat(yAxis2.format, existing.format)
           });
@@ -69894,12 +70264,17 @@ 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]
+    () => yAxisMeasures.map((measure) => {
+      const field = String(measure.field ?? "").trim();
+      const catalog = chartAxisOptionByField.get(field);
+      if (catalog) return catalog;
+      return {
+        value: field,
+        label: toTitleCaseLabel(field),
+        format: toAxisFormat(measure.format, "string")
+      };
+    }),
+    [chartAxisOptionByField, yAxisMeasures]
   );
   const normalizedChartYAxisOptions = useMemo33(() => {
     return yAxisOptions.map((option) => ({
@@ -70239,11 +70614,7 @@ function useReport(reportIdArg, options = {}) {
   );
   const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
   const pivotTableColumns = useMemo33(
-    () => isPivotTableChart ? buildPivotTableColumns(
-      pivotState,
-      chart,
-      resolveTableDisplayLabel
-    ) : null,
+    () => isPivotTableChart ? buildPivotTableColumns(pivotState, chart, resolveTableDisplayLabel) : null,
     [chart, isPivotTableChart, pivotState, resolveTableDisplayLabel]
   );
   const chartAxes = useMemo33(() => {
@@ -70894,6 +71265,43 @@ function useReport(reportIdArg, options = {}) {
     tableRefreshQuery.isFetching,
     tableRefreshQueryEnabled
   ]);
+  useEffect33(() => {
+    if (!isNanPivotDebugEnabled()) return;
+    recordUseReportNanPivotState({
+      source: "useReport",
+      reportId: effectiveReportId,
+      datasources,
+      chartType: resolvedChartType,
+      chartLoading,
+      tableLoading,
+      loading,
+      groupRowsBy,
+      groupColumnsBy,
+      aggregations: aggregationValues,
+      formPivot: pivotState,
+      nextPivot,
+      sourceReport,
+      chart: chartWithSort,
+      table,
+      isPivotTableChart
+    });
+  }, [
+    aggregationValues,
+    chartLoading,
+    chartWithSort,
+    datasources,
+    effectiveReportId,
+    groupColumnsBy,
+    groupRowsBy,
+    isPivotTableChart,
+    loading,
+    nextPivot,
+    pivotState,
+    resolvedChartType,
+    sourceReport,
+    table,
+    tableLoading
+  ]);
   const buildSetReportColumnsFromIds = (nextColumnIds, settingsById) => {
     const normalizedNextIds = nextColumnIds.map((columnId) => String(columnId ?? "").trim()).filter(Boolean);
     return normalizedNextIds.map((columnId) => {

package/package.json

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