Skip to content

fix(Charts - New): layouting fixes #488

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
merged 4 commits into from
May 7, 2020
Merged

fix(Charts - New): layouting fixes #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e315f3f
legend position for polar charts
MarcusNotheis May 6, 2020
0db821d
x and y axis ticks optimization
MarcusNotheis May 7, 2020
7f484c9
add x axis height observation
MarcusNotheis May 7, 2020
fa57fce
fix secondary dimension ticks
MarcusNotheis May 7, 2020
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
47 changes: 24 additions & 23 deletions packages/charts/src/components/BarChart/BarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,22 @@ import {
YAxis
} from 'recharts';
import { useChartMargin } from '../../hooks/useChartMargin';
import { useLongestYAxisLabel } from '../../hooks/useLongestYAxisLabel';
import { useObserveXAxisHeights } from '../../hooks/useObserveXAxisHeights';
import { usePrepareDimensionsAndMeasures } from '../../hooks/usePrepareDimensionsAndMeasures';
import { useTooltipFormatter } from '../../hooks/useTooltipFormatter';
import { IChartDimension } from '../../interfaces/IChartDimension';
import { IChartMeasure } from '../../interfaces/IChartMeasure';
import { RechartBaseProps } from '../../interfaces/RechartBaseProps';
import { defaultFormatter } from '../../internal/defaults';
import { tickLineConfig, tooltipContentStyle, tooltipFillOpacity } from '../../internal/staticProps';

const formatYAxisTicks = (tick = '') => {
const splitTick = tick.split(' ');
return splitTick.length > 3
? `${splitTick.slice(0, 3).join(' ')}...`
: tick.length > 11
? `${tick.slice(0, 12)}...`
: tick;
};

const dimensionDefaults = {
formatter: formatYAxisTicks
formatter: defaultFormatter
};

const measureDefaults = {
formatter: (d) => d,
formatter: defaultFormatter,
opacity: 1
};

Expand Down Expand Up @@ -120,7 +114,8 @@ const BarChart: FC<BarChartProps> = forwardRef((props: BarChartProps, ref: Ref<a
gridStroke: ThemingParameters.sapList_BorderColor,
gridHorizontal: true,
gridVertical: false,
legendPosition: 'top',
legendPosition: 'bottom',
legendHorizontalAlign: 'left',
barGap: 3,
zoomingTool: false,
...props.chartConfig
Expand Down Expand Up @@ -164,14 +159,11 @@ const BarChart: FC<BarChartProps> = forwardRef((props: BarChartProps, ref: Ref<a
const isBigDataSet = dataset?.length > 30;
const primaryDimensionAccessor = primaryDimension?.accessor;

const marginChart = useChartMargin(
dataset,
dimensions,
chartConfig.margin,
true,
dimensions.length > 1,
chartConfig.zoomingTool
);
const [width, legendPosition] = useLongestYAxisLabel(dataset, dimensions);

const marginChart = useChartMargin(chartConfig.margin, chartConfig.zoomingTool);

const [xAxisHeight] = useObserveXAxisHeights(chartRef, 1);

return (
<ChartContainer
Expand All @@ -194,13 +186,14 @@ const BarChart: FC<BarChartProps> = forwardRef((props: BarChartProps, ref: Ref<a
<XAxis
interval={0}
type="number"
tick={<XAxisTicks config={primaryMeasure} chartRef={chartRef} />}
tick={<XAxisTicks config={primaryMeasure} />}
axisLine={chartConfig.xAxisVisible}
tickLine={tickLineConfig}
tickFormatter={primaryMeasure?.formatter}
height={xAxisHeight}
/>
)}
{(chartConfig.yAxisVisible) &&
{chartConfig.yAxisVisible &&
dimensions.map((dimension, index) => {
return (
<YAxis
Expand All @@ -213,6 +206,7 @@ const BarChart: FC<BarChartProps> = forwardRef((props: BarChartProps, ref: Ref<a
tickLine={index < 1}
axisLine={index < 1}
yAxisId={index}
width={width}
/>
);
})}
Expand All @@ -234,7 +228,14 @@ const BarChart: FC<BarChartProps> = forwardRef((props: BarChartProps, ref: Ref<a
/>
);
})}
{!noLegend && <Legend verticalAlign={chartConfig.legendPosition} onClick={onItemLegendClick} />}
{!noLegend && (
<Legend
verticalAlign={chartConfig.legendPosition}
align={chartConfig.legendHorizontalAlign}
onClick={onItemLegendClick}
wrapperStyle={legendPosition}
/>
)}
{chartConfig.referenceLine && (
<ReferenceLine
stroke={chartConfig.referenceLine.color}
Expand Down
35 changes: 22 additions & 13 deletions packages/charts/src/components/ColumnChart/ColumnChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@ import {
YAxis
} from 'recharts';
import { useChartMargin } from '../../hooks/useChartMargin';
import { useLongestYAxisLabel } from '../../hooks/useLongestYAxisLabel';
import { useObserveXAxisHeights } from '../../hooks/useObserveXAxisHeights';
import { usePrepareDimensionsAndMeasures } from '../../hooks/usePrepareDimensionsAndMeasures';
import { useTooltipFormatter } from '../../hooks/useTooltipFormatter';
import { IChartDimension } from '../../interfaces/IChartDimension';
import { IChartMeasure } from '../../interfaces/IChartMeasure';
import { RechartBaseProps } from '../../interfaces/RechartBaseProps';
import { defaultFormatter } from '../../internal/defaults';
import { tickLineConfig, tooltipContentStyle, tooltipFillOpacity } from '../../internal/staticProps';

interface MeasureConfig extends IChartMeasure {
Expand Down Expand Up @@ -76,11 +79,11 @@ export interface ColumnChartProps extends RechartBaseProps {
}

const dimensionDefaults = {
formatter: (d) => d
formatter: defaultFormatter
};

const measureDefaults = {
formatter: (d) => d,
formatter: defaultFormatter,
opacity: 1
};

Expand Down Expand Up @@ -108,7 +111,8 @@ const ColumnChart: FC<ColumnChartProps> = forwardRef((props: ColumnChartProps, r
gridStroke: ThemingParameters.sapList_BorderColor,
gridHorizontal: true,
gridVertical: false,
legendPosition: 'top',
legendPosition: 'bottom',
legendHorizontalAlign: 'left',
barGap: 3,
zoomingTool: false,
...props.chartConfig
Expand All @@ -124,6 +128,8 @@ const ColumnChart: FC<ColumnChartProps> = forwardRef((props: ColumnChartProps, r

const tooltipValueFormatter = useTooltipFormatter(measures);

const [yAxisWidth, legendPosition] = useLongestYAxisLabel(dataset, measures);

const primaryDimension = dimensions[0];
const primaryMeasure = measures[0];

Expand Down Expand Up @@ -159,14 +165,8 @@ const ColumnChart: FC<ColumnChartProps> = forwardRef((props: ColumnChartProps, r
const isBigDataSet = dataset?.length > 30 ?? false;
const primaryDimensionAccessor = primaryDimension?.accessor;

const marginChart = useChartMargin(
dataset,
measures,
chartConfig.margin,
false,
dimensions.length > 1,
chartConfig.zoomingTool
);
const marginChart = useChartMargin(chartConfig.margin, chartConfig.zoomingTool);
const xAxisHeights = useObserveXAxisHeights(chartRef, props.dimensions.length);

return (
<ChartContainer
Expand All @@ -193,9 +193,10 @@ const ColumnChart: FC<ColumnChartProps> = forwardRef((props: ColumnChartProps, r
dataKey={dimension.accessor}
xAxisId={index}
interval={dimension?.interval ?? (isBigDataSet ? 'preserveStart' : 0)}
tick={<XAxisTicks config={dimension} chartRef={chartRef} level={index} />}
tick={<XAxisTicks config={dimension} level={index} />}
tickLine={index < 1}
axisLine={index < 1}
height={xAxisHeights[index]}
/>
);
})}
Expand All @@ -205,6 +206,7 @@ const ColumnChart: FC<ColumnChartProps> = forwardRef((props: ColumnChartProps, r
yAxisId="left"
interval={0}
tick={<YAxisTicks config={primaryMeasure} />}
width={yAxisWidth}
/>
{chartConfig.secondYAxis?.dataKey && (
<YAxis
Expand Down Expand Up @@ -235,7 +237,14 @@ const ColumnChart: FC<ColumnChartProps> = forwardRef((props: ColumnChartProps, r
/>
);
})}
{!noLegend && <Legend verticalAlign={chartConfig.legendPosition} onClick={onItemLegendClick} />}
{!noLegend && (
<Legend
verticalAlign={chartConfig.legendPosition}
align={chartConfig.legendHorizontalAlign}
onClick={onItemLegendClick}
wrapperStyle={legendPosition}
/>
)}
{chartConfig.referenceLine && (
<ReferenceLine
stroke={chartConfig.referenceLine.color}
Expand Down
Loading