@quillsql/react 2.16.86 → 2.16.88

package/dist/index.cjs

@@ -69482,6 +69482,10 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     resolvedYAxisFields
   ]);
+  const xAxisMetadataField = String(
+    chartAxisEdits.xAxisField ?? chartData?.xAxisField ?? ""
+  ).trim();
+  const xAxisMetadataMatchesResolvedField = !xAxisMetadataField || xAxisMetadataField === resolvedXAxisField;
   const resolvedXAxisFormat = (0, import_react63.useMemo)(() => {
     if (!chartAxesBaseChart) {
       return "string";
@@ -69495,22 +69499,24 @@ function useReport(reportIdArg, options = {}) {
       resolvedXAxisField
     );
     if (bucketFormat) return bucketFormat;
-    if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && chartAxisEdits.xAxisFormat === void 0) {
+    if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && (!xAxisMetadataMatchesResolvedField || chartAxisEdits.xAxisFormat === void 0)) {
       defaultFormat = "string";
     }
-    return chartAxisEdits.xAxisFormat !== void 0 ? toAxisFormat(chartAxisEdits.xAxisFormat, defaultFormat) : defaultFormat;
+    return xAxisMetadataMatchesResolvedField && chartAxisEdits.xAxisFormat !== void 0 ? toAxisFormat(chartAxisEdits.xAxisFormat, defaultFormat) : defaultFormat;
   }, [
     chartAxesBaseChart,
     chartAxisEdits.xAxisFormat,
     chartAxisOptionByField,
     resolvedXAxisField,
-    resolvedYAxisFields
+    resolvedYAxisFields,
+    xAxisMetadataMatchesResolvedField
   ]);
   const resolvedXAxisLabel = (0, import_react63.useMemo)(() => {
+    const fieldLabel = chartAxisOptionByField.get(resolvedXAxisField)?.label ?? "";
     const defaultXLabel = String(
-      chartAxesBaseChart?.xAxisLabel ?? chartAxisOptionByField.get(resolvedXAxisField)?.label ?? ""
+      xAxisMetadataMatchesResolvedField ? chartAxesBaseChart?.xAxisLabel ?? fieldLabel : fieldLabel
     ).trim();
-    if (chartAxisEdits.xAxisLabel !== void 0) {
+    if (xAxisMetadataMatchesResolvedField && chartAxisEdits.xAxisLabel !== void 0) {
       return String(chartAxisEdits.xAxisLabel).trim();
     }
     return !defaultXLabel || defaultXLabel === resolvedXAxisField ? toTitleCaseLabel(resolvedXAxisField) : defaultXLabel;
@@ -69518,7 +69524,8 @@ function useReport(reportIdArg, options = {}) {
     chartAxesBaseChart?.xAxisLabel,
     chartAxisEdits.xAxisLabel,
     chartAxisOptionByField,
-    resolvedXAxisField
+    resolvedXAxisField,
+    xAxisMetadataMatchesResolvedField
   ]);
   const chartVisibility = (0, import_react63.useMemo)(
     () => ({
@@ -70422,7 +70429,7 @@ function useReport(reportIdArg, options = {}) {
         pivotField && rowField && pivotField === rowField
       );
       if (isPivotRowColumn) {
-        const xAxisPatch = {};
+        const xAxisPatch = { field: rowField };
         if (updates.format !== void 0) {
           const rawFmt = String(updates.format ?? "").trim();
           const rowIsDateType = isDateType(
@@ -70433,7 +70440,8 @@ function useReport(reportIdArg, options = {}) {
         if (updates.label !== void 0) {
           xAxisPatch.label = String(updates.label ?? "").trim();
         }
-        if (Object.keys(xAxisPatch).length === 0) return null;
+        if (updates.format === void 0 && updates.label === void 0)
+          return null;
         return { chartAxes: { xAxis: xAxisPatch } };
       }
       const aggs = getPivotAggregations(
@@ -71147,7 +71155,7 @@ function useReport(reportIdArg, options = {}) {
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
           ...hasSectionOverride ? { section: overrides.section } : {},
-          ...!isPivotTable ? { columns: table.columns } : {},
+          columns: isPivotTable ? chart?.columns ?? sourceReport.columns : table.columns,
           ...isFlatTable ? {
             sort: effectiveReportBuilderState.sort?.[0] ?? null
           } : {},
@@ -71190,6 +71198,7 @@ function useReport(reportIdArg, options = {}) {
     },
     [
       cacheCab,
+      chart?.columns,
       chartVisibility.showLegend,
       client,
       dashboardNameForNewReport,

package/dist/index.js

@@ -69690,6 +69690,10 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     resolvedYAxisFields
   ]);
+  const xAxisMetadataField = String(
+    chartAxisEdits.xAxisField ?? chartData?.xAxisField ?? ""
+  ).trim();
+  const xAxisMetadataMatchesResolvedField = !xAxisMetadataField || xAxisMetadataField === resolvedXAxisField;
   const resolvedXAxisFormat = useMemo33(() => {
     if (!chartAxesBaseChart) {
       return "string";
@@ -69703,22 +69707,24 @@ function useReport(reportIdArg, options = {}) {
       resolvedXAxisField
     );
     if (bucketFormat) return bucketFormat;
-    if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && chartAxisEdits.xAxisFormat === void 0) {
+    if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && (!xAxisMetadataMatchesResolvedField || chartAxisEdits.xAxisFormat === void 0)) {
       defaultFormat = "string";
     }
-    return chartAxisEdits.xAxisFormat !== void 0 ? toAxisFormat(chartAxisEdits.xAxisFormat, defaultFormat) : defaultFormat;
+    return xAxisMetadataMatchesResolvedField && chartAxisEdits.xAxisFormat !== void 0 ? toAxisFormat(chartAxisEdits.xAxisFormat, defaultFormat) : defaultFormat;
   }, [
     chartAxesBaseChart,
     chartAxisEdits.xAxisFormat,
     chartAxisOptionByField,
     resolvedXAxisField,
-    resolvedYAxisFields
+    resolvedYAxisFields,
+    xAxisMetadataMatchesResolvedField
   ]);
   const resolvedXAxisLabel = useMemo33(() => {
+    const fieldLabel = chartAxisOptionByField.get(resolvedXAxisField)?.label ?? "";
     const defaultXLabel = String(
-      chartAxesBaseChart?.xAxisLabel ?? chartAxisOptionByField.get(resolvedXAxisField)?.label ?? ""
+      xAxisMetadataMatchesResolvedField ? chartAxesBaseChart?.xAxisLabel ?? fieldLabel : fieldLabel
     ).trim();
-    if (chartAxisEdits.xAxisLabel !== void 0) {
+    if (xAxisMetadataMatchesResolvedField && chartAxisEdits.xAxisLabel !== void 0) {
       return String(chartAxisEdits.xAxisLabel).trim();
     }
     return !defaultXLabel || defaultXLabel === resolvedXAxisField ? toTitleCaseLabel(resolvedXAxisField) : defaultXLabel;
@@ -69726,7 +69732,8 @@ function useReport(reportIdArg, options = {}) {
     chartAxesBaseChart?.xAxisLabel,
     chartAxisEdits.xAxisLabel,
     chartAxisOptionByField,
-    resolvedXAxisField
+    resolvedXAxisField,
+    xAxisMetadataMatchesResolvedField
   ]);
   const chartVisibility = useMemo33(
     () => ({
@@ -70630,7 +70637,7 @@ function useReport(reportIdArg, options = {}) {
         pivotField && rowField && pivotField === rowField
       );
       if (isPivotRowColumn) {
-        const xAxisPatch = {};
+        const xAxisPatch = { field: rowField };
         if (updates.format !== void 0) {
           const rawFmt = String(updates.format ?? "").trim();
           const rowIsDateType = isDateType(
@@ -70641,7 +70648,8 @@ function useReport(reportIdArg, options = {}) {
         if (updates.label !== void 0) {
           xAxisPatch.label = String(updates.label ?? "").trim();
         }
-        if (Object.keys(xAxisPatch).length === 0) return null;
+        if (updates.format === void 0 && updates.label === void 0)
+          return null;
         return { chartAxes: { xAxis: xAxisPatch } };
       }
       const aggs = getPivotAggregations(
@@ -71355,7 +71363,7 @@ function useReport(reportIdArg, options = {}) {
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
           ...hasSectionOverride ? { section: overrides.section } : {},
-          ...!isPivotTable ? { columns: table.columns } : {},
+          columns: isPivotTable ? chart?.columns ?? sourceReport.columns : table.columns,
           ...isFlatTable ? {
             sort: effectiveReportBuilderState.sort?.[0] ?? null
           } : {},
@@ -71398,6 +71406,7 @@ function useReport(reportIdArg, options = {}) {
     },
     [
       cacheCab,
+      chart?.columns,
       chartVisibility.showLegend,
       client,
       dashboardNameForNewReport,

package/package.json

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