@elliemae/ds-dataviz 3.8.1 → 3.9.0-next.1

package/dist/cjs/graphs/Chart/config/useScales.js

@@ -47,37 +47,54 @@ const useScales = ({
   const getLinearDomain = (0, import_react.useCallback)(
     (axis, axisString, withStackData = true) => {
       const begin = axis?.beginAtZero ? 0 : void 0;
-      const data = series.filter((serie) => {
-        if (serie.scale === "y2") {
-          return serie.scale === axisString;
+      const data = currentData.filter((serie) => {
+        if (serie.isHidden)
+          return false;
+        if (serie.scale === axisString) {
+          return true;
         }
-        return true;
+        if (!serie.scale && ["y", "x"].includes(axisString)) {
+          return true;
+        }
+        return false;
       }).map(
-        (serie) => typeof serie.data[0] === "number" ? serie.data : serie.data.map((coord) => coord[axisString])
+        (serie) => serie.data.filter((datum) => datum.value).map((datum) => {
+          if (typeof datum.value === "number") {
+            return datum.value;
+          }
+          return datum.value[axisString];
+        })
       );
       const stack = withStackData && [
         (0, import_d3.min)(stackedData.flat(), (layer) => (0, import_d3.min)(layer, (sequence) => sequence[1])),
         (0, import_d3.max)(stackedData.flat(), (layer) => (0, import_d3.max)(layer, (sequence) => sequence[1]))
       ];
       const minRange = (0, import_d3.min)([begin, (0, import_d3.min)(data.flat()), stack[0]]);
-      const maxRange = (0, import_d3.max)([(0, import_d3.max)(data.flat()), stack[1]]);
-      return [minRange, maxRange];
+      const maxRange = (0, import_d3.max)([begin, (0, import_d3.max)(data.flat()), stack[1]]);
+      const [leftPadding, rightPadding] = typeof axis.domainPadding === "number" ? [axis.domainPadding, axis.domainPadding] : axis.domainPadding ?? [0, 0];
+      if (axis.type === "time") {
+        return [minRange, maxRange];
+      }
+      return [
+        minRange - (maxRange - minRange) * (leftPadding ?? 0),
+        maxRange + (maxRange - minRange) * (rightPadding ?? 0)
+      ];
     },
-    [series, stackedData]
+    [currentData, stackedData]
   );
-  const getScaleTime = (domain, range) => (0, import_d3.scaleTime)().domain([(0, import_d3.min)(domain) ?? 0, (0, import_d3.max)(domain) ?? 0]).range(range);
+  const getScaleTime = (domain, range) => (0, import_d3.scaleUtc)().domain(domain).range(range);
   const getScaleBand = (domain, range, padding = 0.2) => (0, import_d3.scaleBand)().domain(domain).range(range).padding(padding).paddingOuter(0.1);
   const getScaleLinear = (domain, range) => (0, import_d3.scaleLinear)().domain(domain).range(range);
   const getScaleLog = (domain, range) => (0, import_d3.scaleLog)().domain(domain).range(range);
   const xScale = (0, import_react.useMemo)(() => {
     if (xAxis?.type === "time")
-      return getScaleTime(xAxis.cols, [0, rangeTo]);
+      return getScaleTime(getLinearDomain(xAxis, "x", false), [0, rangeTo]);
     if (xAxis?.type === "linear" || yAxis?.type === "band") {
       const withStackData = yAxis?.type === "band";
       return getScaleLinear(getLinearDomain(xAxis, "x", withStackData), [0, rangeTo], xAxis.padding);
     }
-    return getScaleBand(getBandDomain(xAxis), [0, innerWidth], xAxis.padding);
-  }, [getBandDomain, getLinearDomain, innerWidth, rangeTo, xAxis, yAxis?.type]);
+    return getScaleBand(getBandDomain(xAxis), [0, rangeTo], xAxis.padding);
+  }, [getBandDomain, getLinearDomain, rangeTo, xAxis, yAxis?.type]);
   const yScale = (0, import_react.useMemo)(() => {
     if (yAxis?.type === "band")
       return getScaleBand(getBandDomain(yAxis), [innerHeight, 0], yAxis.padding);
@@ -94,10 +111,16 @@ const useScales = ({
       return getScaleLog(getLinearDomain(y2Axis, "y2"), [innerHeight, 0]);
     return getScaleLinear(getLinearDomain(y2Axis, "y2"), [innerHeight, 0]);
   }, [getBandDomain, getLinearDomain, innerHeight, y2Axis]);
-  const colorScale = (0, import_d3.scaleOrdinal)().domain(groups).range(currentData.map((d) => import_colorPallet.COLOR_PALLET[d.color] ?? d.color));
-  const subgroupsWithBars = currentData.filter(
-    (serie) => serie.type === "bar" && !(stackedSeries?.length && (0, import_helpers.getStackedIndex)(stackedSeries, serie.name) > -1)
-  ).map((serie) => serie.name);
+  const colorScale = (0, import_react.useMemo)(
+    () => (0, import_d3.scaleOrdinal)().domain(groups).range(currentData.map((d) => import_colorPallet.COLOR_PALLET[d.color] ?? d.color)),
+    [currentData, groups]
+  );
+  const subgroupsWithBars = (0, import_react.useMemo)(
+    () => currentData.filter(
+      (serie) => serie.type === "bar" && !(stackedSeries?.length && (0, import_helpers.getStackedIndex)(stackedSeries, serie.name) > -1) && !serie.isHidden
+    ).map((serie) => serie.name),
+    [currentData, stackedSeries]
+  );
   const getBandwidth = (0, import_react.useCallback)(() => {
     if (xScale.bandwidth)
       return xScale.bandwidth();
@@ -108,7 +131,10 @@ const useScales = ({
   if (stackedSeries?.length) {
     stackedSeries.forEach((_, i) => subgroupsWithBars.push(`stacked-data-${i}`));
   }
-  const subGroupScale = getBandwidth() ? (0, import_d3.scaleBand)().domain(subgroupsWithBars).range([0, getBandwidth() ?? 0]).paddingInner(0.55).padding(0.2) : null;
+  const subGroupScale = (0, import_react.useMemo)(
+    () => getBandwidth() ? (0, import_d3.scaleBand)().domain(subgroupsWithBars).range([0, getBandwidth() ?? 0]).paddingInner(0.55).padding(0.2) : null,
+    [getBandwidth, subgroupsWithBars]
+  );
   return { xScale, y2Scale, yScale, subGroupScale, colorScale, getBandwidth };
 };
 //# sourceMappingURL=useScales.js.map

package/dist/cjs/graphs/Chart/config/useScales.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/graphs/Chart/config/useScales.tsx", "../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable max-statements */\n/* eslint-disable indent */\nimport { useMemo, useCallback } from 'react';\nimport { max, min, scaleLinear, scaleBand, scaleTime, scaleOrdinal, scaleLog, Series, ScaleBand } from 'd3';\nimport { DSChartT } from '../react-desc-prop-types';\nimport { getStackedIndex } from '../helpers';\nimport { COLOR_PALLET } from '../helpers/colorPallet';\ninterface UseScales {\n  props: DSChartT.Props;\n  innerHeight: number;\n  innerWidth: number;\n  stackedData: Series<\n    {\n      [key: string]: number;\n    },\n    string\n  >[][];\n  currentData: {\n    key: string;\n    group: string;\n    type: DSChartT.SerieTypeT;\n    scale?: string;\n    color: string;\n    data: {\n      key: string;\n      value: number | { x: number; y: number };\n      position: number;\n    }[];\n  }[];\n  groups: string[];\n}\nexport const useScales = ({\n  props,\n  innerHeight,\n  innerWidth,\n  stackedData,\n  currentData,\n  groups,\n  containerRatio,\n}: UseScales) => {\n  const { series, xAxis, yAxis, y2Axis, groups: stackedSeries, types } = props;\n\n  const rangeTo = innerWidth * (containerRatio ?? 1);\n  const getBandDomain = useCallback((axis: DSChartT.AxisT) => axis.cols ?? [...series[0].data.keys()], [series]);\n\n  const getLinearDomain = useCallback(\n    (axis?: DSChartT.AxisT, axisString?: string, withStackData = true) => {\n      // const data2 = data ? extent(data) : [];\n      const begin = axis?.beginAtZero ? 0 : undefined;\n      const data = series\n        .filter((serie) => {\n          if (serie.scale === 'y2') {\n            return serie.scale === axisString;\n          }\n          return true;\n        })\n        .map((serie) =>\n          typeof serie.data[0] === 'number' ? serie.data : serie.data.map((coord) => coord[axisString]),\n        );\n\n      const stack = withStackData && [\n        min(stackedData.flat(), (layer) => min(layer, (sequence) => sequence[1])),\n        max(stackedData.flat(), (layer) => max(layer, (sequence) => sequence[1])),\n      ];\n      const minRange = min([begin, min(data.flat()), stack[0]]);\n      const maxRange = max([max(data.flat()), stack[1]]);\n      // @TODO altering the domain to get padding right and left on axis\n      // we set a pad on the x axis, we can create a prop to set this constant\n      // return [\n      //   minRange - (axisString === 'x' ? (maxRange - minRange) * 0.05 : 0),\n      //   maxRange + (axisString === 'x' ? (maxRange - minRange) * 0.05 : 0),\n      // ];\n      return [minRange, maxRange];\n    },\n    [series, stackedData],\n  );\n\n  const getScaleTime = (domain: Date[], range: number[]) =>\n    scaleTime()\n      .domain([min(domain) ?? 0, max(domain) ?? 0])\n      .range(range);\n\n  const getScaleBand = (domain: string[], range: number[], padding = 0.2) =>\n    scaleBand().domain(domain).range(range).padding(padding).paddingOuter(0.1);\n  const getScaleLinear = (domain: number[], range: number[]) => scaleLinear().domain(domain).range(range);\n  const getScaleLog = (domain: number[], range: number[]) => scaleLog().domain(domain).range(range);\n\n  const xScale = useMemo(() => {\n    if (xAxis?.type === 'time') return getScaleTime(xAxis.cols as Date[], [0, rangeTo]);\n    if (xAxis?.type === 'linear' || yAxis?.type === 'band') {\n      // @TODO is this really a thing ?\n      const withStackData = yAxis?.type === 'band';\n      return getScaleLinear(getLinearDomain(xAxis, 'x', withStackData) as number[], [0, rangeTo], xAxis.padding);\n    }\n\n    return getScaleBand(getBandDomain(xAxis) as string[], [0, innerWidth], xAxis.padding);\n  }, [getBandDomain, getLinearDomain, innerWidth, rangeTo, xAxis, yAxis?.type]);\n\n  const yScale = useMemo(() => {\n    if (yAxis?.type === 'band') return getScaleBand(getBandDomain(yAxis), [innerHeight, 0], yAxis.padding);\n    if (yAxis?.type === 'log') return getScaleLog(getLinearDomain(yAxis, 'y'), [innerHeight, 0]);\n    return getScaleLinear(getLinearDomain(yAxis, 'y'), [innerHeight, 0]);\n  }, [getBandDomain, getLinearDomain, innerHeight, yAxis]);\n\n  const y2Scale = useMemo(() => {\n    if (!y2Axis) return null;\n    if (y2Axis?.type === 'band') return getScaleBand(getBandDomain(y2Axis), [innerHeight, 0], y2Scale.padding);\n    if (y2Axis?.type === 'log') return getScaleLog(getLinearDomain(y2Axis, 'y2'), [innerHeight, 0]);\n    return getScaleLinear(getLinearDomain(y2Axis, 'y2'), [innerHeight, 0]);\n  }, [getBandDomain, getLinearDomain, innerHeight, y2Axis]);\n\n  const colorScale = scaleOrdinal()\n    .domain(groups)\n    .range(currentData.map((d) => COLOR_PALLET[d.color] ?? d.color));\n  // get only groups bars to calculate the subgroup scale\n\n  const subgroupsWithBars = currentData\n    .filter(\n      (serie) => serie.type === 'bar' && !(stackedSeries?.length && getStackedIndex(stackedSeries, serie.name) > -1),\n    )\n    .map((serie) => serie.name);\n\n  const getBandwidth = useCallback(() => {\n    if ((xScale as ScaleBand<string>).bandwidth) return (xScale as ScaleBand<string>).bandwidth();\n    if ((yScale as ScaleBand<string>).bandwidth) return (yScale as ScaleBand<string>).bandwidth();\n    return innerWidth / xScale.ticks().length / 2;\n  }, [innerWidth, xScale, yScale]);\n\n  if (stackedSeries?.length) {\n    stackedSeries.forEach((_, i) => subgroupsWithBars.push(`stacked-data-${i}`));\n  }\n\n  const subGroupScale = getBandwidth()\n    ? scaleBand()\n        .domain(subgroupsWithBars)\n        .range([0, getBandwidth() ?? 0])\n        .paddingInner(0.55)\n        .padding(0.2)\n    : null;\n\n  return { xScale, y2Scale, yScale, subGroupScale, colorScale, getBandwidth };\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable max-statements */\n/* eslint-disable indent */\nimport { useMemo, useCallback } from 'react';\nimport { max, min, scaleLinear, scaleBand, scaleUtc, scaleOrdinal, scaleLog, Series, ScaleBand } from 'd3';\nimport { DSChartT } from '../react-desc-prop-types';\nimport { getStackedIndex } from '../helpers';\nimport { COLOR_PALLET } from '../helpers/colorPallet';\ninterface UseScales {\n  props: DSChartT.Props;\n  innerHeight: number;\n  innerWidth: number;\n  stackedData: Series<\n    {\n      [key: string]: number;\n    },\n    string\n  >[][];\n  currentData: {\n    key: string;\n    group: string;\n    type: DSChartT.SerieTypeT;\n    scale?: string;\n    color: string;\n    data: {\n      key: string;\n      value: number | { x: number; y: number };\n      position: number;\n    }[];\n  }[];\n  groups: string[];\n}\nexport const useScales = ({\n  props,\n  innerHeight,\n  innerWidth,\n  stackedData,\n  currentData,\n  groups,\n  containerRatio,\n}: UseScales) => {\n  const { series, xAxis, yAxis, y2Axis, groups: stackedSeries, types } = props;\n\n  const rangeTo = innerWidth * (containerRatio ?? 1);\n  const getBandDomain = useCallback((axis: DSChartT.AxisT) => axis.cols ?? [...series[0].data.keys()], [series]);\n\n  const getLinearDomain = useCallback(\n    (axis?: DSChartT.AxisT, axisString?: string, withStackData = true) => {\n      // const data2 = data ? extent(data) : [];\n      const begin = axis?.beginAtZero ? 0 : undefined;\n      const data = currentData\n        .filter((serie) => {\n          if (serie.isHidden) return false;\n          if (serie.scale === axisString) {\n            return true;\n          }\n          if (!serie.scale && ['y', 'x'].includes(axisString)) {\n            return true;\n          }\n          return false;\n        })\n        .map(\n          (serie) =>\n            serie.data\n              .filter((datum) => datum.value)\n              .map((datum) => {\n                if (typeof datum.value === 'number') {\n                  return datum.value;\n                }\n                return datum.value[axisString];\n              }),\n\n          // ? serie.data.map((datum) => datum.value).flat()\n          // : serie.data.map((datum) => datum.value.map((coord) => coord[axisString]).flat()),\n        );\n\n      const stack = withStackData && [\n        min(stackedData.flat(), (layer) => min(layer, (sequence) => sequence[1])),\n        max(stackedData.flat(), (layer) => max(layer, (sequence) => sequence[1])),\n      ];\n      const minRange = min([begin, min(data.flat()), stack[0]]);\n      const maxRange = max([begin, max(data.flat()), stack[1]]);\n\n      // @TODO fix this\n      const [leftPadding, rightPadding] =\n        typeof axis.domainPadding === 'number'\n          ? [axis.domainPadding, axis.domainPadding]\n          : axis.domainPadding ?? [0, 0];\n\n      if (axis.type === 'time') {\n        // @todo padding for time series\n        return [minRange, maxRange];\n      }\n      return [\n        minRange - (maxRange - minRange) * (leftPadding ?? 0),\n        maxRange + (maxRange - minRange) * (rightPadding ?? 0),\n      ];\n    },\n    [currentData, stackedData],\n  );\n\n  const getScaleTime = (domain: Date[], range: number[]) => scaleUtc().domain(domain).range(range);\n\n  const getScaleBand = (domain: string[], range: number[], padding = 0.2) =>\n    scaleBand().domain(domain).range(range).padding(padding).paddingOuter(0.1);\n  const getScaleLinear = (domain: number[], range: number[]) => scaleLinear().domain(domain).range(range);\n  const getScaleLog = (domain: number[], range: number[]) => scaleLog().domain(domain).range(range);\n\n  const xScale = useMemo(() => {\n    if (xAxis?.type === 'time') return getScaleTime(getLinearDomain(xAxis, 'x', false), [0, rangeTo]);\n    if (xAxis?.type === 'linear' || yAxis?.type === 'band') {\n      // @TODO is this really a thing ?\n      const withStackData = yAxis?.type === 'band';\n      return getScaleLinear(getLinearDomain(xAxis, 'x', withStackData) as number[], [0, rangeTo], xAxis.padding);\n    }\n\n    return getScaleBand(getBandDomain(xAxis) as string[], [0, rangeTo], xAxis.padding);\n  }, [getBandDomain, getLinearDomain, rangeTo, xAxis, yAxis?.type]);\n\n  const yScale = useMemo(() => {\n    if (yAxis?.type === 'band') return getScaleBand(getBandDomain(yAxis), [innerHeight, 0], yAxis.padding);\n    if (yAxis?.type === 'log') return getScaleLog(getLinearDomain(yAxis, 'y'), [innerHeight, 0]);\n    return getScaleLinear(getLinearDomain(yAxis, 'y'), [innerHeight, 0]);\n  }, [getBandDomain, getLinearDomain, innerHeight, yAxis]);\n\n  const y2Scale = useMemo(() => {\n    if (!y2Axis) return null;\n    if (y2Axis?.type === 'band') return getScaleBand(getBandDomain(y2Axis), [innerHeight, 0], y2Scale.padding);\n    if (y2Axis?.type === 'log') return getScaleLog(getLinearDomain(y2Axis, 'y2'), [innerHeight, 0]);\n    return getScaleLinear(getLinearDomain(y2Axis, 'y2'), [innerHeight, 0]);\n  }, [getBandDomain, getLinearDomain, innerHeight, y2Axis]);\n\n  const colorScale = useMemo(\n    () =>\n      scaleOrdinal()\n        .domain(groups)\n        .range(currentData.map((d) => COLOR_PALLET[d.color] ?? d.color)),\n    [currentData, groups],\n  );\n  // get only groups bars to calculate the subgroup scale\n\n  const subgroupsWithBars = useMemo(\n    () =>\n      currentData\n        .filter(\n          (serie) =>\n            serie.type === 'bar' &&\n            !(stackedSeries?.length && getStackedIndex(stackedSeries, serie.name) > -1) &&\n            !serie.isHidden,\n        )\n        .map((serie) => serie.name),\n    [currentData, stackedSeries],\n  );\n\n  const getBandwidth = useCallback(() => {\n    if ((xScale as ScaleBand<string>).bandwidth) return (xScale as ScaleBand<string>).bandwidth();\n    if ((yScale as ScaleBand<string>).bandwidth) return (yScale as ScaleBand<string>).bandwidth();\n    return innerWidth / xScale.ticks().length / 2;\n  }, [innerWidth, xScale, yScale]);\n\n  if (stackedSeries?.length) {\n    stackedSeries.forEach((_, i) => subgroupsWithBars.push(`stacked-data-${i}`));\n  }\n\n  const subGroupScale = useMemo(\n    () =>\n      getBandwidth()\n        ? scaleBand()\n            .domain(subgroupsWithBars)\n            .range([0, getBandwidth() ?? 0])\n            .paddingInner(0.55)\n            .padding(0.2)\n        : null,\n    [getBandwidth, subgroupsWithBars],\n  );\n\n  return { xScale, y2Scale, yScale, subGroupScale, colorScale, getBandwidth };\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/graphs/Chart/helpers/index.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var helpers_exports = {};
 __export(helpers_exports, {
-  getSeriesValuesAt: () => getSeriesValuesAt,
+  getFormatGenerator: () => getFormatGenerator,
   getStackedData: () => getStackedData,
   getStackedIndex: () => getStackedIndex,
   stackData: () => stackData
@@ -54,11 +54,11 @@ const stackData = (groupsStacked, series) => {
   if (!groupsStacked)
     return [];
   groupsStacked?.forEach((g) => {
-    const seriesStacked = series.filter((serie) => g.includes(serie.name));
+    const seriesStacked = series.filter((serie) => g.includes(serie.name) && !serie.isHidden);
     const keys = seriesStacked.map((serie) => serie.name);
     const stackData2 = [];
     seriesStacked.forEach((serie) => {
-      serie.data.forEach((d, i) => {
+      serie.originalData.data.forEach((d, i) => {
         if (typeof stackData2[i] === "object") {
           stackData2[i][serie.name] = typeof d === "number" ? d : d.y;
         }
@@ -69,15 +69,11 @@ const stackData = (groupsStacked, series) => {
   });
   return aux;
 };
-const getSeriesValuesAt = (data, point) => {
-  const seriesValuesAtPoint = {};
-  data.forEach((serie) => {
-    serie.data.forEach((datum) => {
-      if (datum.value === point) {
-        seriesValuesAtPoint[serie.name] = seriesValuesAtPoint[serie.name] ? [...seriesValuesAtPoint[serie.name], point] : [point];
-      }
-    });
-  });
-  return seriesValuesAtPoint;
+const getFormatGenerator = (type) => {
+  if (type === "time")
+    return import_d3.timeFormat;
+  if (type === "linear")
+    return import_d3.format;
+  return null;
 };
 //# sourceMappingURL=index.js.map

package/dist/cjs/graphs/Chart/helpers/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/graphs/Chart/helpers/index.tsx", "../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import { stack } from 'd3';\nimport { values } from 'lodash';\n\nexport const getStackedIndex = (groups: string[][], serie: string) => {\n  for (let i = 0; i < groups.length; i += 1) {\n    for (let j = 0; j < groups[i].length; j += 1) {\n      if (groups[i][j] === serie) return i;\n    }\n  }\n  return -1;\n};\n\nexport const getStackedData = (stackedData, serie) => {\n  for (let i = 0; i < stackedData?.length; i += 1) {\n    const data = stackedData[i].find((d) => d.key === serie.name);\n    if (data) return data;\n  }\n  return false;\n};\n\nexport const stackData = (groupsStacked, series) => {\n  const aux = [];\n  if (!groupsStacked) return [];\n  groupsStacked?.forEach((g) => {\n    const seriesStacked = series.filter((serie) => g.includes(serie.name));\n    const keys = seriesStacked.map((serie) => serie.name);\n    const stackData: Array<{ [key: string]: number }> = [];\n    seriesStacked.forEach((serie) => {\n      serie.data.forEach((d, i) => {\n        if (typeof stackData[i] === 'object') {\n          stackData[i][serie.name] = typeof d === 'number' ? d : d.y;\n        }\n        stackData[i] = { ...stackData[i], [serie.name]: typeof d === 'number' ? d : d.y };\n      });\n    });\n\n    aux.push(stack().keys(keys)(stackData));\n  });\n  return aux;\n};\n\nexport const getSeriesValuesAt = (data, point) => {\n  const seriesValuesAtPoint = {};\n  data.forEach((serie) => {\n    serie.data.forEach((datum) => {\n      if (datum.value === point) {\n        seriesValuesAtPoint[serie.name] = seriesValuesAtPoint[serie.name]\n          ? [...seriesValuesAtPoint[serie.name], point]\n          : [point];\n      }\n    });\n  });\n  return seriesValuesAtPoint;\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,gBAAsB;AAGf,MAAM,kBAAkB,CAAC,QAAoB,UAAkB;AACpE,WAAS,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK,GAAG;AACzC,aAAS,IAAI,GAAG,IAAI,OAAO,GAAG,QAAQ,KAAK,GAAG;AAC5C,UAAI,OAAO,GAAG,OAAO;AAAO,eAAO;AAAA,IACrC;AAAA,EACF;AACA,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAC,aAAa,UAAU;AACpD,WAAS,IAAI,GAAG,IAAI,aAAa,QAAQ,KAAK,GAAG;AAC/C,UAAM,OAAO,YAAY,GAAG,KAAK,CAAC,MAAM,EAAE,QAAQ,MAAM,IAAI;AAC5D,QAAI;AAAM,aAAO;AAAA,EACnB;AACA,SAAO;AACT;AAEO,MAAM,YAAY,CAAC,eAAe,WAAW;AAClD,QAAM,MAAM,CAAC;AACb,MAAI,CAAC;AAAe,WAAO,CAAC;AAC5B,iBAAe,QAAQ,CAAC,MAAM;AAC5B,UAAM,gBAAgB,OAAO,OAAO,CAAC,UAAU,EAAE,SAAS,MAAM,IAAI,CAAC;AACrE,UAAM,OAAO,cAAc,IAAI,CAAC,UAAU,MAAM,IAAI;AACpD,UAAMA,aAA8C,CAAC;AACrD,kBAAc,QAAQ,CAAC,UAAU;AAC/B,YAAM,KAAK,QAAQ,CAAC,GAAG,MAAM;AAC3B,YAAI,OAAOA,WAAU,OAAO,UAAU;AACpC,UAAAA,WAAU,GAAG,MAAM,QAAQ,OAAO,MAAM,WAAW,IAAI,EAAE;AAAA,QAC3D;AACA,QAAAA,WAAU,KAAK,EAAE,GAAGA,WAAU,IAAI,CAAC,MAAM,OAAO,OAAO,MAAM,WAAW,IAAI,EAAE,EAAE;AAAA,MAClF,CAAC;AAAA,IACH,CAAC;AAED,QAAI,SAAK,iBAAM,EAAE,KAAK,IAAI,EAAEA,UAAS,CAAC;AAAA,EACxC,CAAC;AACD,SAAO;AACT;AAEO,MAAM,oBAAoB,CAAC,MAAM,UAAU;AAChD,QAAM,sBAAsB,CAAC;AAC7B,OAAK,QAAQ,CAAC,UAAU;AACtB,UAAM,KAAK,QAAQ,CAAC,UAAU;AAC5B,UAAI,MAAM,UAAU,OAAO;AACzB,4BAAoB,MAAM,QAAQ,oBAAoB,MAAM,QACxD,CAAC,GAAG,oBAAoB,MAAM,OAAO,KAAK,IAC1C,CAAC,KAAK;AAAA,MACZ;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACD,SAAO;AACT;",
+  "sourcesContent": ["import { stack, timeFormat, format } from 'd3';\nimport { values } from 'lodash';\n\nexport const getStackedIndex = (groups: string[][], serie: string) => {\n  for (let i = 0; i < groups.length; i += 1) {\n    for (let j = 0; j < groups[i].length; j += 1) {\n      if (groups[i][j] === serie) return i;\n    }\n  }\n  return -1;\n};\n\nexport const getStackedData = (stackedData, serie) => {\n  for (let i = 0; i < stackedData?.length; i += 1) {\n    const data = stackedData[i].find((d) => d.key === serie.name);\n    if (data) return data;\n  }\n  return false;\n};\n\nexport const stackData = (groupsStacked, series) => {\n  const aux = [];\n  if (!groupsStacked) return [];\n  groupsStacked?.forEach((g) => {\n    const seriesStacked = series.filter((serie) => g.includes(serie.name) && !serie.isHidden);\n    const keys = seriesStacked.map((serie) => serie.name);\n    const stackData: Array<{ [key: string]: number }> = [];\n    seriesStacked.forEach((serie) => {\n      serie.originalData.data.forEach((d, i) => {\n        if (typeof stackData[i] === 'object') {\n          stackData[i][serie.name] = typeof d === 'number' ? d : d.y;\n        }\n        stackData[i] = { ...stackData[i], [serie.name]: typeof d === 'number' ? d : d.y };\n      });\n    });\n\n    aux.push(stack().keys(keys)(stackData));\n  });\n  return aux;\n};\n\nexport const getFormatGenerator = (type: string) => {\n  if (type === 'time') return timeFormat;\n  if (type === 'linear') return format;\n  return null;\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,gBAA0C;AAGnC,MAAM,kBAAkB,CAAC,QAAoB,UAAkB;AACpE,WAAS,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK,GAAG;AACzC,aAAS,IAAI,GAAG,IAAI,OAAO,GAAG,QAAQ,KAAK,GAAG;AAC5C,UAAI,OAAO,GAAG,OAAO;AAAO,eAAO;AAAA,IACrC;AAAA,EACF;AACA,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAC,aAAa,UAAU;AACpD,WAAS,IAAI,GAAG,IAAI,aAAa,QAAQ,KAAK,GAAG;AAC/C,UAAM,OAAO,YAAY,GAAG,KAAK,CAAC,MAAM,EAAE,QAAQ,MAAM,IAAI;AAC5D,QAAI;AAAM,aAAO;AAAA,EACnB;AACA,SAAO;AACT;AAEO,MAAM,YAAY,CAAC,eAAe,WAAW;AAClD,QAAM,MAAM,CAAC;AACb,MAAI,CAAC;AAAe,WAAO,CAAC;AAC5B,iBAAe,QAAQ,CAAC,MAAM;AAC5B,UAAM,gBAAgB,OAAO,OAAO,CAAC,UAAU,EAAE,SAAS,MAAM,IAAI,KAAK,CAAC,MAAM,QAAQ;AACxF,UAAM,OAAO,cAAc,IAAI,CAAC,UAAU,MAAM,IAAI;AACpD,UAAMA,aAA8C,CAAC;AACrD,kBAAc,QAAQ,CAAC,UAAU;AAC/B,YAAM,aAAa,KAAK,QAAQ,CAAC,GAAG,MAAM;AACxC,YAAI,OAAOA,WAAU,OAAO,UAAU;AACpC,UAAAA,WAAU,GAAG,MAAM,QAAQ,OAAO,MAAM,WAAW,IAAI,EAAE;AAAA,QAC3D;AACA,QAAAA,WAAU,KAAK,EAAE,GAAGA,WAAU,IAAI,CAAC,MAAM,OAAO,OAAO,MAAM,WAAW,IAAI,EAAE,EAAE;AAAA,MAClF,CAAC;AAAA,IACH,CAAC;AAED,QAAI,SAAK,iBAAM,EAAE,KAAK,IAAI,EAAEA,UAAS,CAAC;AAAA,EACxC,CAAC;AACD,SAAO;AACT;AAEO,MAAM,qBAAqB,CAAC,SAAiB;AAClD,MAAI,SAAS;AAAQ,WAAO;AAC5B,MAAI,SAAS;AAAU,WAAO;AAC9B,SAAO;AACT;",
   "names": ["stackData"]
 }

package/dist/cjs/graphs/Chart/parts/ActivePoint.js

@@ -49,7 +49,7 @@ const ActivePoint = () => {
       item = data.find((serie) => serie.key === activeSerie);
       lastActiveSerie.current = item;
     } else if (activePoint) {
-      item = data.find((serie) => serie.data.some((value) => activePoint === value.key));
+      item = data.find((serie) => serie.data.some((value) => activePoint?.key === value.key));
       lastActiveSerie.current = item;
     } else if (!lastActiveSerie.current) {
       return;

package/dist/cjs/graphs/Chart/parts/ActivePoint.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/graphs/Chart/parts/ActivePoint.tsx", "../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable complexity */\n/* eslint-disable arrow-body-style */\n/* eslint-disable indent */\nimport React, { useContext, useMemo, useRef } from 'react';\nimport { ChartContext } from '../ChartContext';\nimport { Line, Points, Bars, StackedBar } from '../series';\nimport { getStackedIndex } from '../helpers';\n\nexport const ActivePoint = () => {\n  const {\n    props: { data, groups },\n    activePoint,\n    activeSerie,\n  } = useContext(ChartContext);\n\n  const lastActiveSerie = useRef(null);\n  const activeItem = useMemo(() => {\n    let item = null;\n    if (!activePoint && !activeSerie && lastActiveSerie.current) {\n      item = lastActiveSerie.current;\n    }\n    if (activeSerie) {\n      item = data.find((serie) => serie.key === activeSerie);\n      lastActiveSerie.current = item;\n    } else if (activePoint) {\n      item = data.find((serie) => serie.data.some((value) => activePoint === value.key));\n      lastActiveSerie.current = item;\n    } else if (!lastActiveSerie.current) {\n      return;\n    }\n\n    if (item.type === 'bar' && groups && getStackedIndex(groups, item.name) > -1) {\n      return <StackedBar serie={item} />;\n    }\n    if (item.type === 'bar') {\n      return <Bars serie={item} />;\n    }\n    if (item.type === 'point') {\n      return <Points serie={item} />;\n    }\n    if (item.type === 'line') {\n      return <Line serie={item} />;\n    }\n  }, [activePoint, activeSerie, data, groups]);\n\n  return <g className=\"redraw\">{activeItem}</g>;\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAGA,mBAAmD;AACnD,0BAA6B;AAC7B,oBAA+C;AAC/C,qBAAgC;AAEzB,MAAM,cAAc,MAAM;AAC/B,QAAM;AAAA,IACJ,OAAO,EAAE,MAAM,OAAO;AAAA,IACtB;AAAA,IACA;AAAA,EACF,QAAI,yBAAW,gCAAY;AAE3B,QAAM,sBAAkB,qBAAO,IAAI;AACnC,QAAM,iBAAa,sBAAQ,MAAM;AAC/B,QAAI,OAAO;AACX,QAAI,CAAC,eAAe,CAAC,eAAe,gBAAgB,SAAS;AAC3D,aAAO,gBAAgB;AAAA,IACzB;AACA,QAAI,aAAa;AACf,aAAO,KAAK,KAAK,CAAC,UAAU,MAAM,QAAQ,WAAW;AACrD,sBAAgB,UAAU;AAAA,IAC5B,WAAW,aAAa;AACtB,aAAO,KAAK,KAAK,CAAC,UAAU,MAAM,KAAK,KAAK,CAAC,UAAU,gBAAgB,MAAM,GAAG,CAAC;AACjF,sBAAgB,UAAU;AAAA,IAC5B,WAAW,CAAC,gBAAgB,SAAS;AACnC;AAAA,IACF;AAEA,QAAI,KAAK,SAAS,SAAS,cAAU,gCAAgB,QAAQ,KAAK,IAAI,IAAI,IAAI;AAC5E,aAAO,4CAAC;AAAA,QAAW,OAAO;AAAA,OAAM;AAAA,IAClC;AACA,QAAI,KAAK,SAAS,OAAO;AACvB,aAAO,4CAAC;AAAA,QAAK,OAAO;AAAA,OAAM;AAAA,IAC5B;AACA,QAAI,KAAK,SAAS,SAAS;AACzB,aAAO,4CAAC;AAAA,QAAO,OAAO;AAAA,OAAM;AAAA,IAC9B;AACA,QAAI,KAAK,SAAS,QAAQ;AACxB,aAAO,4CAAC;AAAA,QAAK,OAAO;AAAA,OAAM;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,aAAa,aAAa,MAAM,MAAM,CAAC;AAE3C,SAAO,4CAAC;AAAA,IAAE,WAAU;AAAA,IAAU;AAAA,GAAW;AAC3C;",
+  "sourcesContent": ["/* eslint-disable complexity */\n/* eslint-disable arrow-body-style */\n/* eslint-disable indent */\nimport React, { useContext, useMemo, useRef } from 'react';\nimport { ChartContext } from '../ChartContext';\nimport { Line, Points, Bars, StackedBar } from '../series';\nimport { getStackedIndex } from '../helpers';\n\nexport const ActivePoint = () => {\n  const {\n    props: { data, groups },\n    activePoint,\n    activeSerie,\n  } = useContext(ChartContext);\n\n  const lastActiveSerie = useRef(null);\n  const activeItem = useMemo(() => {\n    let item = null;\n    if (!activePoint && !activeSerie && lastActiveSerie.current) {\n      item = lastActiveSerie.current;\n    }\n    if (activeSerie) {\n      item = data.find((serie) => serie.key === activeSerie);\n      lastActiveSerie.current = item;\n    } else if (activePoint) {\n      item = data.find((serie) => serie.data.some((value) => activePoint?.key === value.key));\n      lastActiveSerie.current = item;\n    } else if (!lastActiveSerie.current) {\n      return;\n    }\n\n    if (item.type === 'bar' && groups && getStackedIndex(groups, item.name) > -1) {\n      return <StackedBar serie={item} />;\n    }\n    if (item.type === 'bar') {\n      return <Bars serie={item} />;\n    }\n    if (item.type === 'point') {\n      return <Points serie={item} />;\n    }\n    if (item.type === 'line') {\n      return <Line serie={item} />;\n    }\n  }, [activePoint, activeSerie, data, groups]);\n\n  return <g className=\"redraw\">{activeItem}</g>;\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAGA,mBAAmD;AACnD,0BAA6B;AAC7B,oBAA+C;AAC/C,qBAAgC;AAEzB,MAAM,cAAc,MAAM;AAC/B,QAAM;AAAA,IACJ,OAAO,EAAE,MAAM,OAAO;AAAA,IACtB;AAAA,IACA;AAAA,EACF,QAAI,yBAAW,gCAAY;AAE3B,QAAM,sBAAkB,qBAAO,IAAI;AACnC,QAAM,iBAAa,sBAAQ,MAAM;AAC/B,QAAI,OAAO;AACX,QAAI,CAAC,eAAe,CAAC,eAAe,gBAAgB,SAAS;AAC3D,aAAO,gBAAgB;AAAA,IACzB;AACA,QAAI,aAAa;AACf,aAAO,KAAK,KAAK,CAAC,UAAU,MAAM,QAAQ,WAAW;AACrD,sBAAgB,UAAU;AAAA,IAC5B,WAAW,aAAa;AACtB,aAAO,KAAK,KAAK,CAAC,UAAU,MAAM,KAAK,KAAK,CAAC,UAAU,aAAa,QAAQ,MAAM,GAAG,CAAC;AACtF,sBAAgB,UAAU;AAAA,IAC5B,WAAW,CAAC,gBAAgB,SAAS;AACnC;AAAA,IACF;AAEA,QAAI,KAAK,SAAS,SAAS,cAAU,gCAAgB,QAAQ,KAAK,IAAI,IAAI,IAAI;AAC5E,aAAO,4CAAC;AAAA,QAAW,OAAO;AAAA,OAAM;AAAA,IAClC;AACA,QAAI,KAAK,SAAS,OAAO;AACvB,aAAO,4CAAC;AAAA,QAAK,OAAO;AAAA,OAAM;AAAA,IAC5B;AACA,QAAI,KAAK,SAAS,SAAS;AACzB,aAAO,4CAAC;AAAA,QAAO,OAAO;AAAA,OAAM;AAAA,IAC9B;AACA,QAAI,KAAK,SAAS,QAAQ;AACxB,aAAO,4CAAC;AAAA,QAAK,OAAO;AAAA,OAAM;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,aAAa,aAAa,MAAM,MAAM,CAAC;AAE3C,SAAO,4CAAC;AAAA,IAAE,WAAU;AAAA,IAAU;AAAA,GAAW;AAC3C;",
   "names": []
 }

package/dist/cjs/graphs/Chart/parts/Axis/AxisBottom.js

@@ -29,28 +29,31 @@ __export(AxisBottom_exports, {
 module.exports = __toCommonJS(AxisBottom_exports);
 var React = __toESM(require("react"));
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
+var import_react = __toESM(require("react"));
 var import_d3 = require("d3");
 var import_styles = require("../../styles");
 var import_ChartContext = require("../../ChartContext");
-const AxisBottom = () => {
+const AxisBottom = import_react.default.memo(() => {
   const {
-    props: { xAxis, xAxisLabelOffset = 50 },
+    props: { xAxis, width },
     innerHeight,
-    innerWidth,
     xScale,
-    setAxisBottomHeight,
-    tickOffset = 3
+    setAxisBottomRef
   } = (0, import_react.useContext)(import_ChartContext.ChartContext);
+  if (xAxis.hideAxis)
+    return null;
   const axisRef = (0, import_react.useRef)();
   const gridRef = (0, import_react.useRef)();
-  const ticks = xScale.ticks?.();
+  const ticks = xScale.ticks?.(xAxis.tickCount ?? width / 100);
   (0, import_react.useEffect)(() => {
     const grid = (0, import_d3.axisBottom)(xScale).tickSize(xAxis?.showGrid ? -innerHeight : 0).tickFormat("").tickSizeOuter(0);
-    const axis = (0, import_d3.axisBottom)(xScale);
+    const axis = (0, import_d3.axisBottom)(xScale).tickSizeOuter(0);
     if (xAxis.tickValues && ticks) {
       const finalTicks = xAxis.overwriteTicks ? xAxis.tickValues : [...ticks, ...xAxis.tickValues];
       axis.tickValues(finalTicks);
+    } else {
+      axis.tickValues(ticks);
+      grid.tickValues(ticks);
     }
     if (xAxis.tickFormat) {
       if (typeof xAxis.tickFormat === "string") {
@@ -67,27 +70,16 @@ const AxisBottom = () => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("g", {
     transform: `translate(0,${innerHeight})`,
     children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("g", {
-        ref: setAxisBottomHeight,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("g", {
-            transform: `translate(${innerWidth / 2},${axisRef.current?.getBoundingClientRect().height - 20})`,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledAxisLabel, {
-              className: "axis-label",
-              textAnchor: "middle",
-              dy: 50,
-              children: xAxis?.label
-            })
-          }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledAxis, {
-            ref: axisRef
-          })
-        ]
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("g", {
+        ref: setAxisBottomRef,
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledAxis, {
+          ref: axisRef
+        })
       }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledGrid, {
         ref: gridRef
       })
     ]
   });
-};
+});
 //# sourceMappingURL=AxisBottom.js.map

package/dist/cjs/graphs/Chart/parts/Axis/AxisBottom.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/graphs/Chart/parts/Axis/AxisBottom.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useContext, useEffect, useRef } from 'react';\nimport { select, axisBottom, timeFormat } from 'd3';\nimport { StyledAxis, StyledGrid, StyledAxisLabel } from '../../styles';\nimport { ChartContext } from '../../ChartContext';\n\nexport const AxisBottom = () => {\n  const {\n    props: { xAxis, xAxisLabelOffset = 50 },\n    innerHeight,\n    innerWidth,\n    xScale,\n    setAxisBottomHeight,\n    tickOffset = 3,\n  } = useContext(ChartContext);\n\n  const axisRef = useRef();\n  const gridRef = useRef();\n  const ticks = xScale.ticks?.();\n  useEffect(() => {\n    const grid = axisBottom(xScale)\n      .tickSize(xAxis?.showGrid ? -innerHeight : 0)\n      .tickFormat('')\n      .tickSizeOuter(0);\n\n    const axis = axisBottom(xScale);\n\n    if (xAxis.tickValues && ticks) {\n      const finalTicks = xAxis.overwriteTicks ? xAxis.tickValues : [...ticks, ...xAxis.tickValues];\n      axis.tickValues(finalTicks);\n    }\n\n    if (xAxis.tickFormat) {\n      if (typeof xAxis.tickFormat === 'string') {\n        const formatGenerator = timeFormat(xAxis.tickFormat);\n        axis.tickFormat((d) => formatGenerator(d));\n      }\n      if (typeof xAxis.tickFormat === 'function') {\n        axis.tickFormat(xAxis.tickFormat);\n      }\n    }\n\n    select(gridRef.current).call(grid);\n    select(axisRef.current).call(axis);\n  }, [innerHeight, ticks, xAxis.overwriteTicks, xAxis?.showGrid, xAxis.tickFormat, xAxis.tickValues, xScale]);\n\n  return (\n    <g transform={`translate(0,${innerHeight})`}>\n      <g ref={setAxisBottomHeight}>\n        <g transform={`translate(${innerWidth / 2},${axisRef.current?.getBoundingClientRect().height - 20 ?? 0})`}>\n          <StyledAxisLabel className=\"axis-label\" textAnchor=\"middle\" dy={50}>\n            {xAxis?.label}\n          </StyledAxisLabel>\n        </g>\n        <StyledAxis ref={axisRef}></StyledAxis>\n      </g>\n\n      <StyledGrid ref={gridRef}></StyledGrid>\n    </g>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAAA,mBAAqD;AACrD,gBAA+C;AAC/C,oBAAwD;AACxD,0BAA6B;AAEtB,MAAM,aAAa,MAAM;AAC9B,QAAM;AAAA,IACJ,OAAO,EAAE,OAAO,mBAAmB,GAAG;AAAA,IACtC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,EACf,QAAI,yBAAW,gCAAY;AAE3B,QAAM,cAAU,qBAAO;AACvB,QAAM,cAAU,qBAAO;AACvB,QAAM,QAAQ,OAAO,QAAQ;AAC7B,8BAAU,MAAM;AACd,UAAM,WAAO,sBAAW,MAAM,EAC3B,SAAS,OAAO,WAAW,CAAC,cAAc,CAAC,EAC3C,WAAW,EAAE,EACb,cAAc,CAAC;AAElB,UAAM,WAAO,sBAAW,MAAM;AAE9B,QAAI,MAAM,cAAc,OAAO;AAC7B,YAAM,aAAa,MAAM,iBAAiB,MAAM,aAAa,CAAC,GAAG,OAAO,GAAG,MAAM,UAAU;AAC3F,WAAK,WAAW,UAAU;AAAA,IAC5B;AAEA,QAAI,MAAM,YAAY;AACpB,UAAI,OAAO,MAAM,eAAe,UAAU;AACxC,cAAM,sBAAkB,sBAAW,MAAM,UAAU;AACnD,aAAK,WAAW,CAAC,MAAM,gBAAgB,CAAC,CAAC;AAAA,MAC3C;AACA,UAAI,OAAO,MAAM,eAAe,YAAY;AAC1C,aAAK,WAAW,MAAM,UAAU;AAAA,MAClC;AAAA,IACF;AAEA,0BAAO,QAAQ,OAAO,EAAE,KAAK,IAAI;AACjC,0BAAO,QAAQ,OAAO,EAAE,KAAK,IAAI;AAAA,EACnC,GAAG,CAAC,aAAa,OAAO,MAAM,gBAAgB,OAAO,UAAU,MAAM,YAAY,MAAM,YAAY,MAAM,CAAC;AAE1G,SACE,6CAAC;AAAA,IAAE,WAAW,eAAe;AAAA,IAC3B;AAAA,mDAAC;AAAA,QAAE,KAAK;AAAA,QACN;AAAA,sDAAC;AAAA,YAAE,WAAW,aAAa,aAAa,KAAK,QAAQ,SAAS,sBAAsB,EAAE,SAAS;AAAA,YAC7F,sDAAC;AAAA,cAAgB,WAAU;AAAA,cAAa,YAAW;AAAA,cAAS,IAAI;AAAA,cAC7D,iBAAO;AAAA,aACV;AAAA,WACF;AAAA,UACA,4CAAC;AAAA,YAAW,KAAK;AAAA,WAAS;AAAA;AAAA,OAC5B;AAAA,MAEA,4CAAC;AAAA,QAAW,KAAK;AAAA,OAAS;AAAA;AAAA,GAC5B;AAEJ;",
-  "names": []
+  "sourcesContent": ["import React, { useContext, useMemo, useEffect, useRef } from 'react';\nimport { select, axisBottom, timeFormat } from 'd3';\nimport { StyledAxis, StyledGrid, StyledAxisLabel } from '../../styles';\nimport { ChartContext } from '../../ChartContext';\n\nexport const AxisBottom = React.memo(() => {\n  const {\n    props: { xAxis, width },\n    innerHeight,\n    xScale,\n    setAxisBottomRef,\n  } = useContext(ChartContext);\n  if (xAxis.hideAxis) return null;\n  const axisRef = useRef();\n  const gridRef = useRef();\n  const ticks = xScale.ticks?.(xAxis.tickCount ?? width / 100);\n\n  useEffect(() => {\n    const grid = axisBottom(xScale)\n      .tickSize(xAxis?.showGrid ? -innerHeight : 0)\n      .tickFormat('')\n      .tickSizeOuter(0);\n\n    const axis = axisBottom(xScale).tickSizeOuter(0);\n\n    if (xAxis.tickValues && ticks) {\n      const finalTicks = xAxis.overwriteTicks ? xAxis.tickValues : [...ticks, ...xAxis.tickValues];\n      axis.tickValues(finalTicks);\n    } else {\n      axis.tickValues(ticks);\n      grid.tickValues(ticks);\n    }\n\n    if (xAxis.tickFormat) {\n      if (typeof xAxis.tickFormat === 'string') {\n        const formatGenerator = timeFormat(xAxis.tickFormat);\n        axis.tickFormat((d) => formatGenerator(d));\n      }\n      if (typeof xAxis.tickFormat === 'function') {\n        axis.tickFormat(xAxis.tickFormat);\n      }\n    }\n\n    select(gridRef.current).call(grid);\n    select(axisRef.current).call(axis);\n  }, [innerHeight, ticks, xAxis.overwriteTicks, xAxis?.showGrid, xAxis.tickFormat, xAxis.tickValues, xScale]);\n\n  return (\n    <g transform={`translate(0,${innerHeight})`}>\n      <g ref={setAxisBottomRef}>\n        <StyledAxis ref={axisRef}></StyledAxis>\n      </g>\n\n      <StyledGrid ref={gridRef}></StyledGrid>\n    </g>\n  );\n});\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAAA,mBAA8D;AAC9D,gBAA+C;AAC/C,oBAAwD;AACxD,0BAA6B;AAEtB,MAAM,aAAa,aAAAA,QAAM,KAAK,MAAM;AACzC,QAAM;AAAA,IACJ,OAAO,EAAE,OAAO,MAAM;AAAA,IACtB;AAAA,IACA;AAAA,IACA;AAAA,EACF,QAAI,yBAAW,gCAAY;AAC3B,MAAI,MAAM;AAAU,WAAO;AAC3B,QAAM,cAAU,qBAAO;AACvB,QAAM,cAAU,qBAAO;AACvB,QAAM,QAAQ,OAAO,QAAQ,MAAM,aAAa,QAAQ,GAAG;AAE3D,8BAAU,MAAM;AACd,UAAM,WAAO,sBAAW,MAAM,EAC3B,SAAS,OAAO,WAAW,CAAC,cAAc,CAAC,EAC3C,WAAW,EAAE,EACb,cAAc,CAAC;AAElB,UAAM,WAAO,sBAAW,MAAM,EAAE,cAAc,CAAC;AAE/C,QAAI,MAAM,cAAc,OAAO;AAC7B,YAAM,aAAa,MAAM,iBAAiB,MAAM,aAAa,CAAC,GAAG,OAAO,GAAG,MAAM,UAAU;AAC3F,WAAK,WAAW,UAAU;AAAA,IAC5B,OAAO;AACL,WAAK,WAAW,KAAK;AACrB,WAAK,WAAW,KAAK;AAAA,IACvB;AAEA,QAAI,MAAM,YAAY;AACpB,UAAI,OAAO,MAAM,eAAe,UAAU;AACxC,cAAM,sBAAkB,sBAAW,MAAM,UAAU;AACnD,aAAK,WAAW,CAAC,MAAM,gBAAgB,CAAC,CAAC;AAAA,MAC3C;AACA,UAAI,OAAO,MAAM,eAAe,YAAY;AAC1C,aAAK,WAAW,MAAM,UAAU;AAAA,MAClC;AAAA,IACF;AAEA,0BAAO,QAAQ,OAAO,EAAE,KAAK,IAAI;AACjC,0BAAO,QAAQ,OAAO,EAAE,KAAK,IAAI;AAAA,EACnC,GAAG,CAAC,aAAa,OAAO,MAAM,gBAAgB,OAAO,UAAU,MAAM,YAAY,MAAM,YAAY,MAAM,CAAC;AAE1G,SACE,6CAAC;AAAA,IAAE,WAAW,eAAe;AAAA,IAC3B;AAAA,kDAAC;AAAA,QAAE,KAAK;AAAA,QACN,sDAAC;AAAA,UAAW,KAAK;AAAA,SAAS;AAAA,OAC5B;AAAA,MAEA,4CAAC;AAAA,QAAW,KAAK;AAAA,OAAS;AAAA;AAAA,GAC5B;AAEJ,CAAC;",
+  "names": ["React"]
 }

package/dist/cjs/graphs/Chart/parts/Axis/AxisLeft.js

@@ -33,60 +33,55 @@ var import_react = require("react");
 var import_d3 = require("d3");
 var import_styles = require("../../styles");
 var import_ChartContext = require("../../ChartContext");
+var import_helpers = require("../../helpers");
 const AxisLeft = () => {
   const {
-    props: { yAxis, yAxisLabelOffset = 45, yAxisLabel },
+    props: { yAxis, height },
     innerHeight,
     innerWidth,
     yScale,
-    internalMargin,
-    setAxisLeftWidth
+    setAxisLeftRef
   } = (0, import_react.useContext)(import_ChartContext.ChartContext);
+  if (yAxis.hideAxis)
+    return null;
   const ref = (0, import_react.useRef)();
   const gridRef = (0, import_react.useRef)();
-  const ticks = yScale.ticks?.();
+  const ticks = yScale.ticks?.(yAxis.tickCount ?? height / 80);
+  const hasNegativeDomain = yScale(innerHeight) < 0;
+  const { tickFormat, type } = yAxis;
   (0, import_react.useEffect)(() => {
-    const axis = (0, import_d3.axisLeft)(yScale);
+    const axis = (0, import_d3.axisLeft)(yScale).tickSizeOuter(0);
+    const grid = (0, import_d3.axisLeft)(yScale).tickFormat((_) => "").tickSize(yAxis?.showGrid ? -innerWidth : 0).tickSizeOuter(0);
     if (yAxis.tickValues && ticks) {
       const finalTicks = yAxis.overwriteTicks ? yAxis.tickValues : [...ticks, ...yAxis.tickValues];
       axis.tickValues(finalTicks);
+    } else {
+      axis.tickValues(ticks);
+      grid.tickValues(ticks);
     }
-    if (yAxis.tickFormat) {
-      axis.tickFormat(yAxis.tickFormat);
+    if (tickFormat) {
+      if (typeof tickFormat === "string") {
+        const formatGenerator = (0, import_helpers.getFormatGenerator)(type ?? "linear");
+        axis.tickFormat((d) => formatGenerator(tickFormat)(d));
+      }
+      if (typeof tickFormat === "function") {
+        axis.tickFormat(tickFormat);
+      }
     }
-    const grid = (0, import_d3.axisLeft)(yScale).tickFormat("").tickSize(yAxis?.showGrid ? -innerWidth : 0).tickSizeOuter(0);
-    (0, import_d3.select)(ref.current).call(axis);
-    (0, import_d3.select)(gridRef.current).call(grid);
-  }, [
-    innerHeight,
-    innerWidth,
-    ticks,
-    yAxis.overwriteTicks,
-    yAxis?.showGrid,
-    yAxis.tickFormat,
-    yAxis.tickValues,
-    yScale
-  ]);
+    if (ref?.current && gridRef?.current) {
+      (0, import_d3.select)(gridRef.current).call(grid);
+      (0, import_d3.select)(ref.current).call(axis);
+    }
+  }, [hasNegativeDomain, innerHeight, innerWidth, tickFormat, ticks, type, yAxis, yScale]);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("g", {
     children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("g", {
-        ref: setAxisLeftWidth,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("g", {
-            transform: `translate(${-ref.current?.getBoundingClientRect().width},${innerHeight / 2 + 10}) rotate(-90)`,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledAxisLabel, {
-              className: "axis-label",
-              textAnchor: "middle",
-              dy: -15,
-              children: yAxis?.label
-            })
-          }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledAxis, {
-            ref,
-            color: yAxis.color,
-            className: "axis-left"
-          })
-        ]
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("g", {
+        ref: setAxisLeftRef,
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledAxis, {
+          ref,
+          color: yAxis.color,
+          className: "axis-left"
+        })
       }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledGrid, {
         ref: gridRef

package/dist/cjs/graphs/Chart/parts/Axis/AxisLeft.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/graphs/Chart/parts/Axis/AxisLeft.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useContext, useCallback, useEffect, useRef } from 'react';\nimport { select, axisLeft } from 'd3';\nimport { StyledAxis, StyledGrid, StyledAxisLabel } from '../../styles';\nimport { ChartContext } from '../../ChartContext';\nexport const AxisLeft = () => {\n  const {\n    props: { yAxis, yAxisLabelOffset = 45, yAxisLabel },\n    innerHeight,\n    innerWidth,\n    yScale,\n    internalMargin,\n    setAxisLeftWidth,\n  } = useContext(ChartContext);\n\n  const ref = useRef();\n  const gridRef = useRef();\n  const ticks = yScale.ticks?.();\n\n  useEffect(() => {\n    const axis = axisLeft(yScale);\n\n    if (yAxis.tickValues && ticks) {\n      const finalTicks = yAxis.overwriteTicks ? yAxis.tickValues : [...ticks, ...yAxis.tickValues];\n      axis.tickValues(finalTicks);\n    }\n\n    if (yAxis.tickFormat) {\n      axis.tickFormat(yAxis.tickFormat);\n    }\n\n    const grid = axisLeft(yScale)\n      .tickFormat('')\n      .tickSize(yAxis?.showGrid ? -innerWidth : 0)\n      .tickSizeOuter(0);\n\n    select(ref.current).call(axis);\n\n    select(gridRef.current).call(grid);\n  }, [\n    innerHeight,\n    innerWidth,\n    ticks,\n    yAxis.overwriteTicks,\n    yAxis?.showGrid,\n    yAxis.tickFormat,\n    yAxis.tickValues,\n    yScale,\n  ]);\n  return (\n    <g>\n      <g ref={setAxisLeftWidth}>\n        <g\n          transform={`translate(${-ref.current?.getBoundingClientRect().width ?? 0},${\n            innerHeight / 2 + 10\n          }) rotate(-90)`}\n        >\n          <StyledAxisLabel className=\"axis-label\" textAnchor=\"middle\" dy={-15}>\n            {yAxis?.label}\n          </StyledAxisLabel>\n        </g>\n        <StyledAxis ref={ref} color={yAxis.color} className=\"axis-left\"></StyledAxis>\n      </g>\n\n      <StyledGrid ref={gridRef}></StyledGrid>\n    </g>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAAA,mBAAkE;AAClE,gBAAiC;AACjC,oBAAwD;AACxD,0BAA6B;AACtB,MAAM,WAAW,MAAM;AAC5B,QAAM;AAAA,IACJ,OAAO,EAAE,OAAO,mBAAmB,IAAI,WAAW;AAAA,IAClD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,QAAI,yBAAW,gCAAY;AAE3B,QAAM,UAAM,qBAAO;AACnB,QAAM,cAAU,qBAAO;AACvB,QAAM,QAAQ,OAAO,QAAQ;AAE7B,8BAAU,MAAM;AACd,UAAM,WAAO,oBAAS,MAAM;AAE5B,QAAI,MAAM,cAAc,OAAO;AAC7B,YAAM,aAAa,MAAM,iBAAiB,MAAM,aAAa,CAAC,GAAG,OAAO,GAAG,MAAM,UAAU;AAC3F,WAAK,WAAW,UAAU;AAAA,IAC5B;AAEA,QAAI,MAAM,YAAY;AACpB,WAAK,WAAW,MAAM,UAAU;AAAA,IAClC;AAEA,UAAM,WAAO,oBAAS,MAAM,EACzB,WAAW,EAAE,EACb,SAAS,OAAO,WAAW,CAAC,aAAa,CAAC,EAC1C,cAAc,CAAC;AAElB,0BAAO,IAAI,OAAO,EAAE,KAAK,IAAI;AAE7B,0BAAO,QAAQ,OAAO,EAAE,KAAK,IAAI;AAAA,EACnC,GAAG;AAAA,IACD;AAAA,IACA;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,OAAO;AAAA,IACP,MAAM;AAAA,IACN,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AACD,SACE,6CAAC;AAAA,IACC;AAAA,mDAAC;AAAA,QAAE,KAAK;AAAA,QACN;AAAA,sDAAC;AAAA,YACC,WAAW,aAAa,CAAC,IAAI,SAAS,sBAAsB,EAAE,SAC5D,cAAc,IAAI;AAAA,YAGpB,sDAAC;AAAA,cAAgB,WAAU;AAAA,cAAa,YAAW;AAAA,cAAS,IAAI;AAAA,cAC7D,iBAAO;AAAA,aACV;AAAA,WACF;AAAA,UACA,4CAAC;AAAA,YAAW;AAAA,YAAU,OAAO,MAAM;AAAA,YAAO,WAAU;AAAA,WAAY;AAAA;AAAA,OAClE;AAAA,MAEA,4CAAC;AAAA,QAAW,KAAK;AAAA,OAAS;AAAA;AAAA,GAC5B;AAEJ;",
+  "sourcesContent": ["/* eslint-disable max-statements */\n/* eslint-disable complexity */\nimport React, { useContext, useEffect, useRef } from 'react';\nimport { select, axisLeft } from 'd3';\nimport { StyledAxis, StyledGrid } from '../../styles';\nimport { ChartContext } from '../../ChartContext';\nimport { getFormatGenerator } from '../../helpers';\nexport const AxisLeft = () => {\n  const {\n    props: { yAxis, height },\n    innerHeight,\n    innerWidth,\n    yScale,\n    setAxisLeftRef,\n  } = useContext(ChartContext);\n  if (yAxis.hideAxis) return null;\n\n  const ref = useRef<SVGSVGElement>();\n  const gridRef = useRef<SVGSVGElement>();\n  const ticks = yScale.ticks?.(yAxis.tickCount ?? height / 80);\n  const hasNegativeDomain = yScale(innerHeight) < 0;\n  const { tickFormat, type } = yAxis;\n  useEffect(() => {\n    const axis = axisLeft(yScale).tickSizeOuter(0);\n\n    const grid = axisLeft(yScale)\n      .tickFormat((_) => '')\n      .tickSize(yAxis?.showGrid ? -innerWidth : 0)\n      .tickSizeOuter(0);\n\n    if (yAxis.tickValues && ticks) {\n      const finalTicks = yAxis.overwriteTicks ? yAxis.tickValues : [...ticks, ...yAxis.tickValues];\n      axis.tickValues(finalTicks);\n    } else {\n      axis.tickValues(ticks);\n      grid.tickValues(ticks);\n    }\n\n    if (tickFormat) {\n      if (typeof tickFormat === 'string') {\n        const formatGenerator = getFormatGenerator(type ?? 'linear');\n\n        axis.tickFormat((d) => formatGenerator(tickFormat)(d));\n      }\n      if (typeof tickFormat === 'function') {\n        axis.tickFormat(tickFormat);\n      }\n    }\n\n    if (ref?.current && gridRef?.current) {\n      select(gridRef.current).call(grid);\n      select(ref.current).call(axis);\n\n      // if (yAxis.hideAxis) {\n      //   select(ref.current).call((g) => {\n      //     g.selectAll('.tick').remove();\n      //     g.select('.domain').remove();\n      //   });\n      //   select(gridRef.current).call((g) => g.select('.domain').remove());\n      // }\n    }\n  }, [hasNegativeDomain, innerHeight, innerWidth, tickFormat, ticks, type, yAxis, yScale]);\n  return (\n    <g>\n      <g ref={setAxisLeftRef}>\n        <StyledAxis ref={ref} color={yAxis.color} className=\"axis-left\"></StyledAxis>\n      </g>\n\n      <StyledGrid ref={gridRef}></StyledGrid>\n      {/* {hasNegativeDomain ? (\n        <line stroke=\"black\" strokeWidth={2} x1={0} x2={innerWidth} y1={yScale(0)} y2={yScale(0)} />\n      ) : null} */}\n    </g>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAEA,mBAAqD;AACrD,gBAAiC;AACjC,oBAAuC;AACvC,0BAA6B;AAC7B,qBAAmC;AAC5B,MAAM,WAAW,MAAM;AAC5B,QAAM;AAAA,IACJ,OAAO,EAAE,OAAO,OAAO;AAAA,IACvB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,QAAI,yBAAW,gCAAY;AAC3B,MAAI,MAAM;AAAU,WAAO;AAE3B,QAAM,UAAM,qBAAsB;AAClC,QAAM,cAAU,qBAAsB;AACtC,QAAM,QAAQ,OAAO,QAAQ,MAAM,aAAa,SAAS,EAAE;AAC3D,QAAM,oBAAoB,OAAO,WAAW,IAAI;AAChD,QAAM,EAAE,YAAY,KAAK,IAAI;AAC7B,8BAAU,MAAM;AACd,UAAM,WAAO,oBAAS,MAAM,EAAE,cAAc,CAAC;AAE7C,UAAM,WAAO,oBAAS,MAAM,EACzB,WAAW,CAAC,MAAM,EAAE,EACpB,SAAS,OAAO,WAAW,CAAC,aAAa,CAAC,EAC1C,cAAc,CAAC;AAElB,QAAI,MAAM,cAAc,OAAO;AAC7B,YAAM,aAAa,MAAM,iBAAiB,MAAM,aAAa,CAAC,GAAG,OAAO,GAAG,MAAM,UAAU;AAC3F,WAAK,WAAW,UAAU;AAAA,IAC5B,OAAO;AACL,WAAK,WAAW,KAAK;AACrB,WAAK,WAAW,KAAK;AAAA,IACvB;AAEA,QAAI,YAAY;AACd,UAAI,OAAO,eAAe,UAAU;AAClC,cAAM,sBAAkB,mCAAmB,QAAQ,QAAQ;AAE3D,aAAK,WAAW,CAAC,MAAM,gBAAgB,UAAU,EAAE,CAAC,CAAC;AAAA,MACvD;AACA,UAAI,OAAO,eAAe,YAAY;AACpC,aAAK,WAAW,UAAU;AAAA,MAC5B;AAAA,IACF;AAEA,QAAI,KAAK,WAAW,SAAS,SAAS;AACpC,4BAAO,QAAQ,OAAO,EAAE,KAAK,IAAI;AACjC,4BAAO,IAAI,OAAO,EAAE,KAAK,IAAI;AAAA,IAS/B;AAAA,EACF,GAAG,CAAC,mBAAmB,aAAa,YAAY,YAAY,OAAO,MAAM,OAAO,MAAM,CAAC;AACvF,SACE,6CAAC;AAAA,IACC;AAAA,kDAAC;AAAA,QAAE,KAAK;AAAA,QACN,sDAAC;AAAA,UAAW;AAAA,UAAU,OAAO,MAAM;AAAA,UAAO,WAAU;AAAA,SAAY;AAAA,OAClE;AAAA,MAEA,4CAAC;AAAA,QAAW,KAAK;AAAA,OAAS;AAAA;AAAA,GAI5B;AAEJ;",
   "names": []
 }

package/dist/cjs/graphs/Chart/parts/Axis/AxisRight.js

@@ -35,31 +35,26 @@ var import_styles = require("../../styles");
 var import_ChartContext = require("../../ChartContext");
 const AxisRight = () => {
   const {
-    props: { y2Axis, yAxisLabelOffset = 45, y2AxisLabel },
-    innerHeight,
+    props: { y2Axis, height },
     innerWidth,
     y2Scale,
-    setAxisRightWidth
+    setAxisRightRef
   } = (0, import_react.useContext)(import_ChartContext.ChartContext);
   if (!y2Axis)
     return null;
+  const ticks = y2Scale.ticks?.(y2Axis.tickCount ?? height / 80);
   const ref = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
     const axis = (0, import_d3.axisRight)(y2Scale).tickSizeOuter(0);
     (0, import_d3.select)(ref.current).call(axis);
   }, [innerWidth, y2Scale]);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("g", {
-    ref: setAxisRightWidth,
+    ref: setAxisRightRef,
     transform: `translate(${innerWidth},0)`,
     children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_styles.StyledAxis, {
       ref,
-      color: y2Axis.color,
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", {
-        className: "axis-label",
-        textAnchor: "middle",
-        transform: `translate(${-yAxisLabelOffset},${innerHeight / 2}) rotate(-90)`
-      })
+      color: y2Axis.color
     })
-  });
+  }, ticks.toString());
 };
 //# sourceMappingURL=AxisRight.js.map

package/dist/cjs/graphs/Chart/parts/Axis/AxisRight.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/graphs/Chart/parts/Axis/AxisRight.tsx", "../../../../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useContext, useEffect, useRef } from 'react';\nimport { select, axisRight } from 'd3';\nimport { StyledAxis } from '../../styles';\nimport { ChartContext } from '../../ChartContext';\n\nexport const AxisRight = () => {\n  const {\n    props: { y2Axis, yAxisLabelOffset = 45, y2AxisLabel },\n    innerHeight,\n    innerWidth,\n    y2Scale,\n    setAxisRightWidth,\n  } = useContext(ChartContext);\n\n  if (!y2Axis) return null;\n  const ref = useRef();\n  useEffect(() => {\n    const axis = axisRight(y2Scale).tickSizeOuter(0);\n\n    select(ref.current).call(axis);\n  }, [innerWidth, y2Scale]);\n  return (\n    <g ref={setAxisRightWidth} transform={`translate(${innerWidth},0)`}>\n      <StyledAxis ref={ref} color={y2Axis.color}>\n        <text\n          className=\"axis-label\"\n          textAnchor=\"middle\"\n          transform={`translate(${-yAxisLabelOffset},${innerHeight / 2}) rotate(-90)`}\n        >\n          {/* {y2Axis?.label} */}\n        </text>\n      </StyledAxis>\n    </g>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAAA,mBAAqD;AACrD,gBAAkC;AAClC,oBAA2B;AAC3B,0BAA6B;AAEtB,MAAM,YAAY,MAAM;AAC7B,QAAM;AAAA,IACJ,OAAO,EAAE,QAAQ,mBAAmB,IAAI,YAAY;AAAA,IACpD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,QAAI,yBAAW,gCAAY;AAE3B,MAAI,CAAC;AAAQ,WAAO;AACpB,QAAM,UAAM,qBAAO;AACnB,8BAAU,MAAM;AACd,UAAM,WAAO,qBAAU,OAAO,EAAE,cAAc,CAAC;AAE/C,0BAAO,IAAI,OAAO,EAAE,KAAK,IAAI;AAAA,EAC/B,GAAG,CAAC,YAAY,OAAO,CAAC;AACxB,SACE,4CAAC;AAAA,IAAE,KAAK;AAAA,IAAmB,WAAW,aAAa;AAAA,IACjD,sDAAC;AAAA,MAAW;AAAA,MAAU,OAAO,OAAO;AAAA,MAClC,sDAAC;AAAA,QACC,WAAU;AAAA,QACV,YAAW;AAAA,QACX,WAAW,aAAa,CAAC,oBAAoB,cAAc;AAAA,OAG7D;AAAA,KACF;AAAA,GACF;AAEJ;",
+  "sourcesContent": ["import React, { useContext, useEffect, useMemo, useRef } from 'react';\nimport { select, axisRight } from 'd3';\nimport { StyledAxis, StyledAxisLabel } from '../../styles';\nimport { ChartContext } from '../../ChartContext';\nexport const AxisRight = () => {\n  const {\n    props: { y2Axis, height },\n    innerWidth,\n    y2Scale,\n    setAxisRightRef,\n  } = useContext(ChartContext);\n  if (!y2Axis) return null;\n\n  const ticks = y2Scale.ticks?.(y2Axis.tickCount ?? height / 80);\n\n  const ref = useRef();\n  useEffect(() => {\n    const axis = axisRight(y2Scale).tickSizeOuter(0);\n\n    select(ref.current).call(axis);\n  }, [innerWidth, y2Scale]);\n\n  return (\n    <g key={ticks.toString()} ref={setAxisRightRef} transform={`translate(${innerWidth},0)`}>\n      <StyledAxis ref={ref} color={y2Axis.color} />\n    </g>\n  );\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB;AAAA,mBAA8D;AAC9D,gBAAkC;AAClC,oBAA4C;AAC5C,0BAA6B;AACtB,MAAM,YAAY,MAAM;AAC7B,QAAM;AAAA,IACJ,OAAO,EAAE,QAAQ,OAAO;AAAA,IACxB;AAAA,IACA;AAAA,IACA;AAAA,EACF,QAAI,yBAAW,gCAAY;AAC3B,MAAI,CAAC;AAAQ,WAAO;AAEpB,QAAM,QAAQ,QAAQ,QAAQ,OAAO,aAAa,SAAS,EAAE;AAE7D,QAAM,UAAM,qBAAO;AACnB,8BAAU,MAAM;AACd,UAAM,WAAO,qBAAU,OAAO,EAAE,cAAc,CAAC;AAE/C,0BAAO,IAAI,OAAO,EAAE,KAAK,IAAI;AAAA,EAC/B,GAAG,CAAC,YAAY,OAAO,CAAC;AAExB,SACE,4CAAC;AAAA,IAAyB,KAAK;AAAA,IAAiB,WAAW,aAAa;AAAA,IACtE,sDAAC;AAAA,MAAW;AAAA,MAAU,OAAO,OAAO;AAAA,KAAO;AAAA,KADrC,MAAM,SAAS,CAEvB;AAEJ;",
   "names": []
 }