Revert "TextSelectionTheme support (step 2 of 3) (#65044)" (#66051)
This reverts commit cb92ffc7fa2a3731b98bd4dc7ddfedcc1f50ea6e.
diff --git a/packages/flutter/lib/src/material/text_field.dart b/packages/flutter/lib/src/material/text_field.dart
index 66e0232..2db56a3 100644
--- a/packages/flutter/lib/src/material/text_field.dart
+++ b/packages/flutter/lib/src/material/text_field.dart
@@ -1098,6 +1098,11 @@
}
}
+ Color _defaultSelectionColor(BuildContext context, Color primary) {
+ final bool isDark = Theme.of(context).brightness == Brightness.dark;
+ return primary.withOpacity(isDark ? 0.40 : 0.12);
+ }
+
@override
Widget build(BuildContext context) {
assert(debugCheckHasMaterial(context));
@@ -1131,14 +1136,13 @@
switch (theme.platform) {
case TargetPlatform.iOS:
case TargetPlatform.macOS:
- final CupertinoThemeData cupertinoTheme = CupertinoTheme.of(context);
forcePressEnabled = true;
textSelectionControls = cupertinoTextSelectionControls;
paintCursorAboveText = true;
cursorOpacityAnimates = true;
if (theme.useTextSelectionTheme) {
- cursorColor ??= selectionTheme.cursorColor ?? cupertinoTheme.primaryColor;
- selectionColor = selectionTheme.selectionColor ?? cupertinoTheme.primaryColor.withOpacity(0.40);
+ cursorColor ??= selectionTheme.cursorColor ?? CupertinoTheme.of(context).primaryColor;
+ selectionColor = selectionTheme.selectionColor ?? _defaultSelectionColor(context, CupertinoTheme.of(context).primaryColor);
} else {
cursorColor ??= CupertinoTheme.of(context).primaryColor;
selectionColor = theme.textSelectionColor;
@@ -1158,7 +1162,7 @@
cursorOpacityAnimates = false;
if (theme.useTextSelectionTheme) {
cursorColor ??= selectionTheme.cursorColor ?? theme.colorScheme.primary;
- selectionColor = selectionTheme.selectionColor ?? theme.colorScheme.primary.withOpacity(0.40);
+ selectionColor = selectionTheme.selectionColor ?? _defaultSelectionColor(context, theme.colorScheme.primary);
} else {
cursorColor ??= theme.cursorColor;
selectionColor = theme.textSelectionColor;
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 605c6c5..566193e 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -405,7 +405,7 @@
dataTableTheme ??= const DataTableThemeData();
fixTextFieldOutlineLabel ??= false;
- useTextSelectionTheme ??= true;
+ useTextSelectionTheme ??= false;
return ThemeData.raw(
visualDensity: visualDensity,
@@ -883,21 +883,12 @@
final Color secondaryHeaderColor;
/// The color of text selections in text fields, such as [TextField].
- ///
- /// By default this property is no longer used. It has been replaced with
- /// [TextSelectionThemeData.selectionColor] and will soon be deprecated.
final Color textSelectionColor;
/// The color of cursors in Material-style text fields, such as [TextField].
- ///
- /// By default this property is no longer used. It has been replaced with
- /// [TextSelectionThemeData.cursorColor] and will soon be deprecated.
final Color cursorColor;
/// The color of the handles used to adjust what part of the text is currently selected.
- ///
- /// By default this property is no longer used. It has been replaced with
- /// [TextSelectionThemeData.selectionHandleColor] and will soon be deprecated.
final Color textSelectionHandleColor;
/// A color that contrasts with the [primaryColor], e.g. used as the
diff --git a/packages/flutter/test/material/text_selection_test.dart b/packages/flutter/test/material/text_selection_test.dart
index 57f6db4..ec36761 100644
--- a/packages/flutter/test/material/text_selection_test.dart
+++ b/packages/flutter/test/material/text_selection_test.dart
@@ -554,9 +554,7 @@
await tester.pumpWidget(RepaintBoundary(
child: Theme(
data: ThemeData(
- textSelectionTheme: const TextSelectionThemeData(
- selectionHandleColor: Color(0x550000AA),
- ),
+ textSelectionHandleColor: const Color(0x550000AA),
),
isMaterialAppTheme: true,
child: Builder(
diff --git a/packages/flutter/test/material/text_selection_theme_test.dart b/packages/flutter/test/material/text_selection_theme_test.dart
index cb8df08..ba3def4 100644
--- a/packages/flutter/test/material/text_selection_theme_test.dart
+++ b/packages/flutter/test/material/text_selection_theme_test.dart
@@ -58,10 +58,6 @@
});
testWidgets('Empty textSelectionTheme will use defaults', (WidgetTester tester) async {
- const Color defaultCursorColor = Color(0x002196f3);
- const Color defaultSelectionColor = Color(0x662196f3);
- const Color defaultSelectionHandleColor = Color(0xff2196f3);
-
// Test TextField's cursor & selection color.
await tester.pumpWidget(
const MaterialApp(
@@ -73,8 +69,8 @@
await tester.pumpAndSettle();
final EditableTextState editableTextState = tester.firstState(find.byType(EditableText));
final RenderEditable renderEditable = editableTextState.renderEditable;
- expect(renderEditable.cursorColor, defaultCursorColor);
- expect(Color(renderEditable.selectionColor.value), defaultSelectionColor);
+ expect(renderEditable.cursorColor, const Color(0x004285f4));
+ expect(renderEditable.selectionColor, const Color(0xFF90CAF9));
// Test the selection handle color.
await tester.pumpWidget(
@@ -83,6 +79,46 @@
child: Builder(
builder: (BuildContext context) {
return materialTextSelectionControls.buildHandle(
+ context, TextSelectionHandleType.left, 10.0
+ );
+ },
+ ),
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+ final RenderBox handle = tester.firstRenderObject<RenderBox>(find.byType(CustomPaint));
+ expect(handle, paints..path(color: Colors.blue[300]));
+
+ });
+
+ testWidgets('Empty textSelectionTheme with useTextSelectionTheme set will use new defaults', (WidgetTester tester) async {
+ final ThemeData theme = ThemeData.fallback().copyWith(useTextSelectionTheme: true);
+ final Color primaryColor = Color(theme.colorScheme.primary.value);
+
+ // Test TextField's cursor & selection color.
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: theme,
+ home: const Material(
+ child: TextField(),
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+ final EditableTextState editableTextState = tester.firstState(find.byType(EditableText));
+ final RenderEditable renderEditable = editableTextState.renderEditable;
+ expect(renderEditable.cursorColor, primaryColor.withAlpha(0));
+ expect(Color(renderEditable.selectionColor.value), primaryColor.withOpacity(0.12));
+
+ // Test the selection handle color.
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: theme,
+ home: Material(
+ child: Builder(
+ builder: (BuildContext context) {
+ return materialTextSelectionControls.buildHandle(
context, TextSelectionHandleType.left, 10.0
);
},
@@ -92,7 +128,7 @@
);
await tester.pumpAndSettle();
final RenderBox handle = tester.firstRenderObject<RenderBox>(find.byType(CustomPaint));
- expect(handle, paints..path(color: defaultSelectionHandleColor));
+ expect(handle, paints..path(color: primaryColor));
});
testWidgets('ThemeDate.textSelectionTheme will be used if provided', (WidgetTester tester) async {
@@ -102,6 +138,7 @@
selectionHandleColor: Color(0x00ccbbaa),
);
final ThemeData theme = ThemeData.fallback().copyWith(
+ useTextSelectionTheme: true,
textSelectionTheme: textSelectionTheme,
);
@@ -147,6 +184,7 @@
selectionHandleColor: Color(0x00ccbbaa),
);
final ThemeData theme = ThemeData.fallback().copyWith(
+ useTextSelectionTheme: true,
textSelectionTheme: defaultTextSelectionTheme,
);
const TextSelectionThemeData widgetTextSelectionTheme = TextSelectionThemeData(
@@ -202,6 +240,7 @@
selectionHandleColor: Color(0x00ccbbaa),
);
final ThemeData theme = ThemeData.fallback().copyWith(
+ useTextSelectionTheme: true,
textSelectionTheme: defaultTextSelectionTheme,
);
const TextSelectionThemeData widgetTextSelectionTheme = TextSelectionThemeData(
diff --git a/packages/flutter/test/widgets/editable_text_cursor_test.dart b/packages/flutter/test/widgets/editable_text_cursor_test.dart
index f79db15..5b8c142 100644
--- a/packages/flutter/test/widgets/editable_text_cursor_test.dart
+++ b/packages/flutter/test/widgets/editable_text_cursor_test.dart
@@ -208,7 +208,6 @@
}, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS, TargetPlatform.macOS }));
testWidgets('Cursor does not animate on Android', (WidgetTester tester) async {
- final Color defaultCursorColor = Color(ThemeData.fallback().colorScheme.primary.value);
const Widget widget = MaterialApp(
home: Material(
child: TextField(
@@ -226,12 +225,12 @@
await tester.pump();
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rect(color: defaultCursorColor));
+ expect(renderEditable, paints..rect(color: const Color(0xff4285f4)));
// Android cursor goes from exactly on to exactly off on the 500ms dot.
await tester.pump(const Duration(milliseconds: 499));
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rect(color: defaultCursorColor));
+ expect(renderEditable, paints..rect(color: const Color(0xff4285f4)));
await tester.pump(const Duration(milliseconds: 1));
expect(renderEditable.cursorColor.alpha, 0);
@@ -240,7 +239,7 @@
await tester.pump(const Duration(milliseconds: 500));
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rect(color: defaultCursorColor));
+ expect(renderEditable, paints..rect(color: const Color(0xff4285f4)));
await tester.pump(const Duration(milliseconds: 500));
expect(renderEditable.cursorColor.alpha, 0);
@@ -249,7 +248,6 @@
testWidgets('Cursor does not animates when debugDeterministicCursor is set', (WidgetTester tester) async {
EditableText.debugDeterministicCursor = true;
- final Color defaultCursorColor = Color(ThemeData.fallback().colorScheme.primary.value);
const Widget widget = MaterialApp(
home: Material(
child: TextField(
@@ -270,24 +268,24 @@
await tester.pump();
await tester.pump(const Duration(milliseconds: 200));
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rrect(color: defaultCursorColor));
+ expect(renderEditable, paints..rrect(color: const Color(0xff2196f3)));
// Cursor draw never changes.
await tester.pump(const Duration(milliseconds: 200));
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rrect(color: defaultCursorColor));
+ expect(renderEditable, paints..rrect(color: const Color(0xff2196f3)));
// No more transient calls.
await tester.pumpAndSettle();
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rrect(color: defaultCursorColor));
+ expect(renderEditable, paints..rrect(color: const Color(0xff2196f3)));
EditableText.debugDeterministicCursor = false;
}, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS, TargetPlatform.macOS }));
testWidgets('Cursor does not animate on Android when debugDeterministicCursor is set', (WidgetTester tester) async {
- final Color defaultCursorColor = Color(ThemeData.fallback().colorScheme.primary.value);
EditableText.debugDeterministicCursor = true;
+
const Widget widget = MaterialApp(
home: Material(
child: TextField(
@@ -305,21 +303,21 @@
await tester.pump();
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rect(color: defaultCursorColor));
+ expect(renderEditable, paints..rect(color: const Color(0xff4285f4)));
await tester.pump(const Duration(milliseconds: 500));
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rect(color: defaultCursorColor));
+ expect(renderEditable, paints..rect(color: const Color(0xff4285f4)));
// Cursor draw never changes.
await tester.pump(const Duration(milliseconds: 500));
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rect(color: defaultCursorColor));
+ expect(renderEditable, paints..rect(color: const Color(0xff4285f4)));
// No more transient calls.
await tester.pumpAndSettle();
expect(renderEditable.cursorColor.alpha, 255);
- expect(renderEditable, paints..rect(color: defaultCursorColor));
+ expect(renderEditable, paints..rect(color: const Color(0xff4285f4)));
EditableText.debugDeterministicCursor = false;
});
