From 25fd2b9c47c309d0a055c371071392e914ca41e3 Mon Sep 17 00:00:00 2001
From: Xilai Zhang <xilaizhang@google.com>
Date: Tue, 28 Feb 2023 11:48:59 -0800
Subject: [PATCH] Revert "Fix Ink decoration image does not render (#121521)"
This reverts commit a297cb368b8404ed6c5e3ebd49299031e456db0e.
---
.../lib/src/material/ink_decoration.dart | 2 +-
.../flutter/test/material/ink_paint_test.dart | 36 ++++++++-----------
2 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/packages/flutter/lib/src/material/ink_decoration.dart b/packages/flutter/lib/src/material/ink_decoration.dart
index 3df3cd07f86..3b5a9c6880d 100644
--- a/packages/flutter/lib/src/material/ink_decoration.dart
+++ b/packages/flutter/lib/src/material/ink_decoration.dart
@@ -288,7 +288,7 @@ class _InkState extends State<Ink> {
_ink!.decoration = widget.decoration;
_ink!.configuration = createLocalImageConfiguration(context);
}
- return widget.child ?? ConstrainedBox(constraints: const BoxConstraints.expand());
+ return widget.child ?? const SizedBox();
}
@override
diff --git a/packages/flutter/test/material/ink_paint_test.dart b/packages/flutter/test/material/ink_paint_test.dart
index 6af9a771ac1..b119cb70bbb 100644
--- a/packages/flutter/test/material/ink_paint_test.dart
+++ b/packages/flutter/test/material/ink_paint_test.dart
@@ -9,17 +9,20 @@ import 'package:flutter_test/flutter_test.dart';
import '../rendering/mock_canvas.dart';
void main() {
- testWidgets('The Ink widget expands when no dimensions are set', (WidgetTester tester) async {
+ testWidgets('The Ink widget renders a SizedBox by default', (WidgetTester tester) async {
await tester.pumpWidget(
Material(
child: Ink(),
),
);
- expect(find.byType(Ink), findsOneWidget);
- expect(tester.getSize(find.byType(Ink)), const Size(800.0, 600.0));
- });
+ Finder sizedBox = find.descendant(
+ of: find.byType(Ink),
+ matching: find.byType(SizedBox),
+ );
+ expect(sizedBox, findsOneWidget);
+ expect(tester.getSize(sizedBox).height, 600.0);
+ expect(tester.getSize(sizedBox).width, 800.0);
- testWidgets('The Ink widget fits the specified size', (WidgetTester tester) async {
const double height = 150.0;
const double width = 200.0;
await tester.pumpWidget(
@@ -33,24 +36,13 @@ void main() {
),
);
await tester.pumpAndSettle();
- expect(find.byType(Ink), findsOneWidget);
- expect(tester.getSize(find.byType(Ink)), const Size(width, height));
- });
-
- testWidgets('The Ink widget expands on a unspecified dimension', (WidgetTester tester) async {
- const double height = 150.0;
- await tester.pumpWidget(
- Material(
- child: Center( // used to constrain to child's size
- child: Ink(
- height: height,
- ),
- ),
- ),
+ sizedBox = find.descendant(
+ of: find.byType(Ink),
+ matching: find.byType(SizedBox),
);
- await tester.pumpAndSettle();
- expect(find.byType(Ink), findsOneWidget);
- expect(tester.getSize(find.byType(Ink)), const Size(800, height));
+ expect(sizedBox, findsNWidgets(2));
+ expect(tester.getSize(sizedBox.at(0)).height, height);
+ expect(tester.getSize(sizedBox.at(0)).width, width);
});
testWidgets('The InkWell widget renders an ink splash', (WidgetTester tester) async {
--
GitLab