Skip to content
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

Jump to bottom

feat: x-axis padding prop #1080

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: x-axis padding prop #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1429ff
feat: x-axis padding prop
alexbalonperin Jun 8, 2024
f1380fe
allow setting padding left and right independently
alexbalonperin Jun 9, 2024
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
11 changes: 9 additions & 2 deletions src/components/chart-elements/AreaChart/AreaChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,18 @@ const AreaChart = React.forwardRef<HTMLDivElement, AreaChartProps>((props, ref)
rotateLabelX,
tickGap = 5,
xAxisLabel,
xAxisPadding,
yAxisLabel,
...other
} = props;
const CustomTooltip = customTooltip;
const paddingValue = (!showXAxis && !showYAxis) || (startEndOnly && !showYAxis) ? 0 : 20;

const defaultPadding: number =
(!showXAxis && !showYAxis) || (startEndOnly && !showYAxis) ? 0 : 20;
const paddingValue: Required<typeof xAxisPadding> = {
left: xAxisPadding?.left ?? defaultPadding,
right: xAxisPadding?.right ?? defaultPadding,
};
const [legendHeight, setLegendHeight] = useState(60);
const [activeDot, setActiveDot] = useState<ActiveDot | undefined>(undefined);
const [activeLegend, setActiveLegend] = useState<string | undefined>(undefined);
Expand Down Expand Up @@ -174,7 +181,7 @@ const AreaChart = React.forwardRef<HTMLDivElement, AreaChartProps>((props, ref)
/>
) : null}
<XAxis
padding={{ left: paddingValue, right: paddingValue }}
padding={paddingValue}
hide={!showXAxis}
dataKey={index}
tick={{ transform: "translate(0, 6)" }}
Expand Down
9 changes: 7 additions & 2 deletions src/components/chart-elements/BarChart/BarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,17 @@ const BarChart = React.forwardRef<HTMLDivElement, BarChartProps>((props, ref) =>
barCategoryGap,
tickGap = 5,
xAxisLabel,
xAxisPadding,
yAxisLabel,
className,
...other
} = props;
const CustomTooltip = customTooltip;
const paddingValue = !showXAxis && !showYAxis ? 0 : 20;
const defaultPadding: number = !showXAxis && !showYAxis ? 0 : 20;
const paddingValue: Required<typeof xAxisPadding> = {
left: xAxisPadding?.left ?? defaultPadding,
right: xAxisPadding?.right ?? defaultPadding,
};
const [legendHeight, setLegendHeight] = useState(60);
const categoryColors = constructCategoryColors(categories, colors);
const [activeBar, setActiveBar] = React.useState<any | undefined>(undefined);
Expand Down Expand Up @@ -187,7 +192,7 @@ const BarChart = React.forwardRef<HTMLDivElement, BarChartProps>((props, ref) =>

{layout !== "vertical" ? (
<XAxis
padding={{ left: paddingValue, right: paddingValue }}
padding={paddingValue}
hide={!showXAxis}
dataKey={index}
interval={startEndOnly ? "preserveStartEnd" : intervalType}
Expand Down
9 changes: 7 additions & 2 deletions src/components/chart-elements/LineChart/LineChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,15 @@ const LineChart = React.forwardRef<HTMLDivElement, LineChartProps>((props, ref)
tickGap = 5,
xAxisLabel,
yAxisLabel,
xAxisPadding,
...other
} = props;
const CustomTooltip = customTooltip;
const paddingValue = !showXAxis && !showYAxis ? 0 : 20;
const defaultPadding: number = !showXAxis && !showYAxis ? 0 : 20;
const paddingValue: Required<typeof xAxisPadding> = {
left: xAxisPadding?.left ?? defaultPadding,
right: xAxisPadding?.right ?? defaultPadding,
};
const [legendHeight, setLegendHeight] = useState(60);
const [activeDot, setActiveDot] = useState<ActiveDot | undefined>(undefined);
const [activeLegend, setActiveLegend] = useState<string | undefined>(undefined);
Expand Down Expand Up @@ -170,7 +175,7 @@ const LineChart = React.forwardRef<HTMLDivElement, LineChartProps>((props, ref)
/>
) : null}
<XAxis
padding={{ left: paddingValue, right: paddingValue }}
padding={paddingValue}
hide={!showXAxis}
dataKey={index}
interval={startEndOnly ? "preserveStartEnd" : intervalType}
Expand Down
1 change: 1 addition & 0 deletions src/components/chart-elements/common/BaseChartProps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ interface BaseChartProps extends BaseAnimationTimingProps, React.HTMLAttributes<
};
tickGap?: number;
xAxisLabel?: string;
xAxisPadding?: { left?: number; right?: number };
yAxisLabel?: string;
}

Expand Down
12 changes: 12 additions & 0 deletions src/stories/chart-elements/AreaChart.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,3 +364,15 @@ export const AxisLabels: Story = {
yAxisLabel: "Amount (USD)",
},
};

export const xAxisNoPadding: Story = {
args: {
xAxisPadding: { left: 0, right: 0 },
},
};

export const xAxisNoLeftPadding: Story = {
args: {
xAxisPadding: { left: 0 },
},
};
12 changes: 12 additions & 0 deletions src/stories/chart-elements/BarChart.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,3 +387,15 @@ export const AxisLabels: Story = {
yAxisLabel: "Amount (USD)",
},
};

export const xAxisNoPadding: Story = {
args: {
xAxisPadding: { left: 0, right: 0 },
},
};

export const xAxisNoLeftPadding: Story = {
args: {
xAxisPadding: { left: 0 },
},
};
12 changes: 12 additions & 0 deletions src/stories/chart-elements/LineChart.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,3 +324,15 @@ export const AxisLabels: Story = {
yAxisLabel: "Amount (USD)",
},
};

export const xAxisNoPadding: Story = {
args: {
xAxisPadding: { left: 0, right: 0 },
},
};

export const xAxisNoLeftPadding: Story = {
args: {
xAxisPadding: { left: 0 },
},
};
Loading