Skip to content

fix: exclude undefined linear scale axis props #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marrouchi merged 1 commit into from
Nov 6, 2025
Merged

fix: exclude undefined linear scale axis props #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions packages/ez-react/src/recipes/area/AreaChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Axis } from '@/components/scales/Axis';
import { Grid } from '@/components/scales/grid/Grid';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { Area } from '@/components/Area';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface AreaChartProps extends SVGAttributes<SVGGElement> {
data: RawData;
Expand Down Expand Up @@ -96,15 +97,7 @@ export const AreaChart: FC<AreaChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand All @@ -113,15 +106,7 @@ export const AreaChart: FC<AreaChartProps> = ({
direction: Direction.VERTICAL,
domainKey: yAxis.domainKey,
nice: yAxis.nice || 0,
domain: yAxis.domain,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis),
},
}}
>
Expand Down
20 changes: 3 additions & 17 deletions packages/ez-react/src/recipes/area/MultiAreaChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { CartesianScale } from '@/components/scales/CartesianScale';
import { ColorScale } from '@/components/scales/ColorScale';
import { Grid } from '@/components/scales/grid/Grid';
import { useToggableDomainKey } from '@/lib/useToggableDomainKey';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';
import ScaleLinear from 'eazychart-core/src/scales/ScaleLinear';
import {
RawData,
Expand Down Expand Up @@ -108,15 +109,7 @@ export const MultiAreaChart: FC<MultiAreaChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand All @@ -125,14 +118,7 @@ export const MultiAreaChart: FC<MultiAreaChartProps> = ({
direction: Direction.VERTICAL,
domain: activeDomain,
nice: yAxis.nice || 0,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis, ['domain']),
},
}}
>
Expand Down
11 changes: 2 additions & 9 deletions packages/ez-react/src/recipes/bar/BarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { Grid } from '@/components/scales/grid/Grid';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { ColorScale } from '@/components/scales/ColorScale';
import { useToggableDatum } from '@/lib/useToggableDatum';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface BarChartProps extends SVGAttributes<SVGGElement> {
data: RawData;
Expand Down Expand Up @@ -98,15 +99,7 @@ export const BarChart: FC<BarChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand Down
11 changes: 2 additions & 9 deletions packages/ez-react/src/recipes/column/ColumnChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { Grid } from '@/components/scales/grid/Grid';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { ColorScale } from '@/components/scales/ColorScale';
import { useToggableDatum } from '@/lib/useToggableDatum';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface ColumnChartProps extends SVGAttributes<SVGGElement> {
data: RawData;
Expand Down Expand Up @@ -104,15 +105,7 @@ export const ColumnChart: FC<ColumnChartProps> = ({
direction: Direction.VERTICAL,
domainKey: yAxis.domainKey,
nice: yAxis.nice || 0,
domain: yAxis.domain,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis),
},
}}
>
Expand Down
11 changes: 2 additions & 9 deletions packages/ez-react/src/recipes/column/LineColumnChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Point } from '@/components/shapes/Point';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { ColorScale } from '@/components/scales/ColorScale';
import { useToggableDatum } from '@/lib/useToggableDatum';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface LineColumnChartProps extends ColumnChartProps {
yLineAxis?: AxisConfig<Position.LEFT | Position.RIGHT>;
Expand Down Expand Up @@ -132,15 +133,7 @@ export const LineColumnChart: FC<LineColumnChartProps> = ({
direction: Direction.VERTICAL,
domainKey: yLineAxis.domainKey,
nice: yAxis.nice || 0,
domain: yAxis.domain,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis),
},
}}
>
Expand Down
21 changes: 3 additions & 18 deletions packages/ez-react/src/recipes/line/LineChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Axis } from '@/components/scales/Axis';
import { Grid } from '@/components/scales/grid/Grid';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { Segments } from '@/components/Segments';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface LineChartProps extends SVGAttributes<SVGGElement> {
data: RawData;
Expand Down Expand Up @@ -96,15 +97,7 @@ export const LineChart: FC<LineChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand All @@ -113,15 +106,7 @@ export const LineChart: FC<LineChartProps> = ({
direction: Direction.VERTICAL,
domainKey: yAxis.domainKey,
nice: yAxis.nice || 0,
domain: yAxis.domain,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis),
},
}}
>
Expand Down
22 changes: 6 additions & 16 deletions packages/ez-react/src/recipes/line/LineErrorMarginChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { LinePath } from '@/components/shapes/LinePath';
import { Point } from '@/components/shapes/Point';
import { AreaPath } from '@/components/shapes/AreaPath';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface LineErrorMarginChartProps extends SVGAttributes<SVGGElement> {
line: LineConfig;
Expand Down Expand Up @@ -125,15 +126,7 @@ export const LineErrorMarginChart: FC<LineErrorMarginChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand All @@ -144,13 +137,10 @@ export const LineErrorMarginChart: FC<LineErrorMarginChartProps> = ({
nice: yAxis.nice || 0,
minPadding: lowsestMarginValue,
maxPadding: highestMarginValue,
domain: yAxis.domain,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis, [
'maxPadding',
'minPadding',
]),
},
}}
>
Expand Down
20 changes: 3 additions & 17 deletions packages/ez-react/src/recipes/line/MultiLineChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { ColorScale } from '@/components/scales/ColorScale';
import { Legend, LegendProps } from '@/components/addons/legend/Legend';
import { Segments } from '@/components/Segments';
import { useToggableDomainKey } from '@/lib/useToggableDomainKey';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface MultiLineChartProps extends SVGAttributes<SVGGElement> {
data: RawData;
Expand Down Expand Up @@ -108,15 +109,7 @@ export const MultiLineChart: FC<MultiLineChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand All @@ -125,14 +118,7 @@ export const MultiLineChart: FC<MultiLineChartProps> = ({
direction: Direction.VERTICAL,
domain: activeDomain,
nice: yAxis.nice || 0,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis, ['domain']),
},
}}
>
Expand Down
21 changes: 3 additions & 18 deletions packages/ez-react/src/recipes/scatter/BubbleChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Grid } from '@/components/scales/grid/Grid';
import { Bubbles } from '@/components/Bubbles';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { LinearScale } from '@/components/scales/LinearScale';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface BubbleChartProps extends SVGAttributes<SVGGElement> {
data: RawData;
Expand Down Expand Up @@ -90,15 +91,7 @@ export const BubbleChart: FC<BubbleChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand All @@ -107,15 +100,7 @@ export const BubbleChart: FC<BubbleChartProps> = ({
direction: Direction.VERTICAL,
domainKey: yAxis.domainKey,
nice: yAxis.nice || 0,
domain: yAxis.domain,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis),
},
}}
>
Expand Down
21 changes: 3 additions & 18 deletions packages/ez-react/src/recipes/scatter/ScatterChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { Axis } from '@/components/scales/Axis';
import { Grid } from '@/components/scales/grid/Grid';
import { ScaleLinear } from 'eazychart-core/src';
import { CartesianScale } from '@/components/scales/CartesianScale';
import { getDefinedLinearScaleOptions } from '@/recipes/utils/linearScale';

export interface ScatterChartProps extends SVGAttributes<SVGGElement> {
data: RawData;
Expand Down Expand Up @@ -87,15 +88,7 @@ export const ScatterChart: FC<ScatterChartProps> = ({
domainKey: xAxis.domainKey,
nice: xAxis.nice || 0,
reverse: isRTL,
domain: xAxis.domain,
maxPadding: xAxis.maxPadding,
minPadding: xAxis.minPadding,
max: xAxis.max,
min: xAxis.min,
softMax: xAxis.softMax,
softMin: xAxis.softMin,
roundRange: xAxis.roundRange,
clamp: xAxis.clamp,
...getDefinedLinearScaleOptions(xAxis),
},
}}
yScaleConfig={{
Expand All @@ -104,15 +97,7 @@ export const ScatterChart: FC<ScatterChartProps> = ({
direction: Direction.VERTICAL,
domainKey: yAxis.domainKey,
nice: yAxis.nice || 0,
domain: yAxis.domain,
maxPadding: yAxis.maxPadding,
minPadding: yAxis.minPadding,
max: yAxis.max,
min: yAxis.min,
softMax: yAxis.softMax,
softMin: yAxis.softMin,
roundRange: yAxis.roundRange,
clamp: yAxis.clamp,
...getDefinedLinearScaleOptions(yAxis),
},
}}
>
Expand Down
Loading
Loading