Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions lib/src/chart/base/axis_chart/side_titles/side_titles_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,19 @@ class _SideTitlesWidgetState extends State<SideTitlesWidget> {
List<AxisSideTitleMetaData> axisPositions,
AxisSide side,
) {
final titlesPadding = titlesData.allSidesPadding;
final borderPadding = widget.axisChartData.borderData.allSidesPadding;
final rotatedParentSize = widget.parentSize.rotateByQuarterTurns(
widget.axisChartData.rotationQuarterTurns,
);
final chartSize = Size(
widget.parentSize.width - thisSidePaddingTotal,
widget.parentSize.height - thisSidePaddingTotal,
).rotateByQuarterTurns(widget.axisChartData.rotationQuarterTurns);
rotatedParentSize.width -
titlesPadding.horizontal -
borderPadding.horizontal,
rotatedParentSize.height -
titlesPadding.vertical -
borderPadding.vertical,
);
// Add 1 pixel to the chart's edges to avoid clipping the last title.
final chartRect = (Offset.zero & chartSize).inflate(1);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,38 @@ void main() {
);
}

LineChartData createLineChartDataWithLargeBottomReservedSize({
required int rotationQuarterTurns,
}) {
return lineChartDataBase.copyWith(
rotationQuarterTurns: rotationQuarterTurns,
titlesData: FlTitlesData(
leftTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 30,
interval: 1,
getTitlesWidget: (value, meta) {
return Text('L-${value.toInt()}');
},
),
),
topTitles: const AxisTitles(),
rightTitles: const AxisTitles(),
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 190,
interval: 1,
getTitlesWidget: (value, meta) {
return const SizedBox.shrink();
},
),
),
),
);
}

testWidgets(
'LineChart with no titles',
(tester) async {
Expand Down Expand Up @@ -436,4 +468,51 @@ void main() {
expect(find.byType(TextButton), findsOneWidget);
},
);

testWidgets(
'LineChart left titles remain visible with large cross-axis reserved size (unrotated and rotated)',
(tester) async {
Future<void> pumpChart({
required Size parentSize,
required int rotationQuarterTurns,
}) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: Center(
child: SizedBox(
width: parentSize.width,
height: parentSize.height,
child: SideTitlesWidget(
side: AxisSide.left,
axisChartData:
createLineChartDataWithLargeBottomReservedSize(
rotationQuarterTurns: rotationQuarterTurns,
),
parentSize: parentSize,
),
),
),
),
),
);
}

await pumpChart(
parentSize: const Size(180, 400),
rotationQuarterTurns: 0,
);
for (var i = 0; i <= 10; i++) {
expect(find.text('L-$i'), findsOneWidget);
}

await pumpChart(
parentSize: const Size(400, 180),
rotationQuarterTurns: 1,
);
for (var i = 0; i <= 10; i++) {
expect(find.text('L-$i'), findsOneWidget);
}
},
);
}
Loading