@quillsql/react 2.16.97 → 2.16.98

package/dist/index.cjs

@@ -63950,18 +63950,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 +69607,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 +69614,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 +69628,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();

package/dist/index.js

@@ -64158,18 +64158,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 +69815,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 +69822,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 +69836,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();

package/package.json

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