merge both compute value

mui · Sep 17, 2024 · e665a1e · e665a1e
1 parent 460cf5f
commit e665a1e
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 203 deletions.
diff --git a/packages/x-charts-pro/src/context/CartesianProviderPro/CartesianProviderPro.tsx b/packages/x-charts-pro/src/context/CartesianProviderPro/CartesianProviderPro.tsx
@@ -13,7 +13,7 @@ import {
 import { useZoom } from '../ZoomProvider/useZoom';
 import { createAxisFilterMapper, createGetAxisFilters } from './createAxisFilterMapper';
 
-const { computeValue } = cartesianProviderUtils;
+const { computeAxisValue } = cartesianProviderUtils;
 
 export interface CartesianProviderProProps extends CartesianProviderProps {}
 
@@ -66,7 +66,7 @@ function CartesianProviderPro(props: CartesianProviderProProps) {
 
   const xValues = React.useMemo(
     () =>
-      computeValue({
+      computeAxisValue({
         drawingArea,
         formattedSeries,
         axis: xAxis,
@@ -81,7 +81,7 @@ function CartesianProviderPro(props: CartesianProviderProProps) {
 
   const yValues = React.useMemo(
     () =>
-      computeValue({
+      computeAxisValue({
         drawingArea,
         formattedSeries,
         axis: yAxis,

diff --git a/packages/x-charts/src/context/CartesianProvider/CartesianProvider.tsx b/packages/x-charts/src/context/CartesianProvider/CartesianProvider.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { useDrawingArea } from '../../hooks/useDrawingArea';
 import { useSeries } from '../../hooks/useSeries';
 import { CartesianContext } from './CartesianContext';
-import { computeValue } from './computeValue';
+import { computeAxisValue } from '../computeAxisValue';
 import { useXExtremumGetter } from '../PluginProvider/useXExtremumGetter';
 import { useYExtremumGetter } from '../PluginProvider';
 import { CartesianProviderProps } from './Cartesian.types';
@@ -18,7 +18,7 @@ function CartesianProvider(props: CartesianProviderProps) {
 
   const xValues = React.useMemo(
     () =>
-      computeValue({
+      computeAxisValue({
         drawingArea,
         formattedSeries,
         axis: xAxis,
@@ -30,7 +30,7 @@ function CartesianProvider(props: CartesianProviderProps) {
 
   const yValues = React.useMemo(
     () =>
-      computeValue({
+      computeAxisValue({
         drawingArea,
         formattedSeries,
         axis: yAxis,

diff --git a/packages/x-charts/src/context/CartesianProvider/index.ts b/packages/x-charts/src/context/CartesianProvider/index.ts
@@ -1,12 +1,12 @@
-import { computeValue } from './computeValue';
+import { computeAxisValue } from '../computeAxisValue';
 
 export * from './CartesianProvider';
 export * from './CartesianContext';
 export * from './useCartesianContext';
 export * from './Cartesian.types';
 
 const cartesianProviderUtils = {
-  computeValue,
+  computeAxisValue,
 };
 
 export { cartesianProviderUtils };
diff --git a/packages/x-charts/src/context/PolarProvider/PolarProvider.tsx b/packages/x-charts/src/context/PolarProvider/PolarProvider.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { useDrawingArea } from '../../hooks/useDrawingArea';
 import { useSeries } from '../../hooks/useSeries';
 import { PolarContext } from './PolarContext';
-import { computeValue } from './computeValue';
+import { computeAxisValue } from '../computeAxisValue';
 import { useRadiusExtremumGetter } from '../PluginProvider/useRadiusExtremumGetter';
 import { useRotationExtremumGetter } from '../PluginProvider/useRotationExtremumGetter';
 import { PolarProviderProps } from './Polar.types';
@@ -18,7 +18,7 @@ function PolarProvider(props: PolarProviderProps) {
 
   const rotationValues = React.useMemo(
     () =>
-      computeValue({
+      computeAxisValue({
         drawingArea,
         formattedSeries,
         axis: rotationAxis,
@@ -30,7 +30,7 @@ function PolarProvider(props: PolarProviderProps) {
 
   const radiusValues = React.useMemo(
     () =>
-      computeValue({
+      computeAxisValue({
         drawingArea,
         formattedSeries,
         axis: radiusAxis,

diff --git a/packages/x-charts/src/context/PolarProvider/computeValue.ts b/packages/x-charts/src/context/PolarProvider/computeValue.ts
diff --git a/packages/x-charts/src/context/PolarProvider/defaultizeAxis.ts b/packages/x-charts/src/context/PolarProvider/defaultizeAxis.ts