Re-land text selection theme clean up (#99927)

Author: Piinks

packages/flutter/lib/src/material/theme_data.dart

@@ -354,26 +354,6 @@ class ThemeData with Diagnosticable {
     TooltipThemeData? tooltipTheme,
     ExpansionTileThemeData? expansionTileTheme,
     // DEPRECATED (newest deprecations at the bottom)
-    @Deprecated(
-      'No longer used by the framework, please remove any reference to it. '
-      'This feature was deprecated after v1.23.0-4.0.pre.',
-    )
-    bool? useTextSelectionTheme,
-    @Deprecated(
-      'Use TextSelectionThemeData.selectionColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    Color? textSelectionColor,
-    @Deprecated(
-      'Use TextSelectionThemeData.cursorColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    Color? cursorColor,
-    @Deprecated(
-      'Use TextSelectionThemeData.selectionHandleColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    Color? textSelectionHandleColor,
     @Deprecated(
       'Use colorScheme.secondary instead. '
       'For more information, consult the migration guide at '
@@ -583,10 +563,6 @@ class ThemeData with Diagnosticable {
     expansionTileTheme ??= const ExpansionTileThemeData();
 
      // DEPRECATED (newest deprecations at the bottom)
-    useTextSelectionTheme ??= true;
-    textSelectionColor ??= isDark ? accentColor : primarySwatch[200]!;
-    cursorColor = cursorColor ?? const Color.fromRGBO(66, 133, 244, 1.0);
-    textSelectionHandleColor ??= isDark ? Colors.tealAccent[400]! : primarySwatch[300]!;
     accentTextTheme = defaultAccentTextTheme.merge(accentTextTheme);
     accentIconTheme ??= accentIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black);
     buttonColor ??= isDark ? primarySwatch[600]! : Colors.grey[300]!;
@@ -672,10 +648,6 @@ class ThemeData with Diagnosticable {
       tooltipTheme: tooltipTheme,
       expansionTileTheme: expansionTileTheme,
       // DEPRECATED (newest deprecations at the bottom)
-      useTextSelectionTheme: useTextSelectionTheme,
-      textSelectionColor: textSelectionColor,
-      cursorColor: cursorColor,
-      textSelectionHandleColor: textSelectionHandleColor,
       accentColor: accentColor,
       accentColorBrightness: accentColorBrightness,
       accentTextTheme: accentTextTheme,
@@ -779,26 +751,6 @@ class ThemeData with Diagnosticable {
     required this.tooltipTheme,
     required this.expansionTileTheme,
     // DEPRECATED (newest deprecations at the bottom)
-    @Deprecated(
-      'No longer used by the framework, please remove any reference to it. '
-      'This feature was deprecated after v1.23.0-4.0.pre.',
-    )
-    required this.useTextSelectionTheme,
-    @Deprecated(
-      'Use TextSelectionThemeData.selectionColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    required this.textSelectionColor,
-    @Deprecated(
-      'Use TextSelectionThemeData.cursorColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    required this.cursorColor,
-    @Deprecated(
-      'Use TextSelectionThemeData.selectionHandleColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    required this.textSelectionHandleColor,
     @Deprecated(
       'Use colorScheme.secondary instead. '
       'For more information, consult the migration guide at '
@@ -924,10 +876,6 @@ class ThemeData with Diagnosticable {
        assert(tooltipTheme != null),
        assert(expansionTileTheme != null),
         // DEPRECATED (newest deprecations at the bottom)
-       assert(useTextSelectionTheme != null),
-       assert(textSelectionColor != null),
-       assert(cursorColor != null),
-       assert(textSelectionHandleColor != null),
        assert(accentColor != null),
        assert(accentColorBrightness != null),
        assert(accentTextTheme != null),
@@ -1519,37 +1467,6 @@ class ThemeData with Diagnosticable {
 
   // DEPRECATED (newest deprecations at the bottom)
 
-  /// A temporary flag that was used to opt-in to the new [TextSelectionTheme]
-  /// during the migration to this new theme. That migration is now complete
-  /// and this flag is not longer used by the framework. Please remove any
-  /// reference to this property, as it will be removed in future releases.
-  @Deprecated(
-    'No longer used by the framework, please remove any reference to it. '
-    'This feature was deprecated after v1.23.0-4.0.pre.',
-  )
-  final bool useTextSelectionTheme;
-
-  /// The color of text selections in text fields, such as [TextField].
-  @Deprecated(
-    'Use TextSelectionThemeData.selectionColor instead. '
-    'This feature was deprecated after v1.26.0-18.0.pre.',
-  )
-  final Color textSelectionColor;
-
-  /// The color of cursors in Material-style text fields, such as [TextField].
-  @Deprecated(
-    'Use TextSelectionThemeData.cursorColor instead. '
-    'This feature was deprecated after v1.26.0-18.0.pre.',
-  )
-  final Color cursorColor;
-
-  /// The color of the handles used to adjust what part of the text is currently selected.
-  @Deprecated(
-    'Use TextSelectionThemeData.selectionHandleColor instead. '
-    'This feature was deprecated after v1.26.0-18.0.pre.',
-  )
-  final Color textSelectionHandleColor;
-
   /// Obsolete property that was originally used as the foreground
   /// color for widgets (knobs, text, overscroll edge effect, etc).
   ///
@@ -1744,26 +1661,6 @@ class ThemeData with Diagnosticable {
     TooltipThemeData? tooltipTheme,
     ExpansionTileThemeData? expansionTileTheme,
     // DEPRECATED (newest deprecations at the bottom)
-    @Deprecated(
-      'No longer used by the framework, please remove any reference to it. '
-      'This feature was deprecated after v1.23.0-4.0.pre.',
-    )
-    bool? useTextSelectionTheme,
-    @Deprecated(
-      'Use TextSelectionThemeData.selectionColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    Color? textSelectionColor,
-    @Deprecated(
-      'Use TextSelectionThemeData.cursorColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    Color? cursorColor,
-    @Deprecated(
-      'Use TextSelectionThemeData.selectionHandleColor instead. '
-      'This feature was deprecated after v1.26.0-18.0.pre.',
-    )
-    Color? textSelectionHandleColor,
     @Deprecated(
       'No longer used by the framework, please remove any reference to it. '
       'For more information, consult the migration guide at '
@@ -1893,10 +1790,6 @@ class ThemeData with Diagnosticable {
       tooltipTheme: tooltipTheme ?? this.tooltipTheme,
       expansionTileTheme: expansionTileTheme ?? this.expansionTileTheme,
       // DEPRECATED (newest deprecations at the bottom)
-      useTextSelectionTheme: useTextSelectionTheme ?? this.useTextSelectionTheme,
-      textSelectionColor: textSelectionColor ?? this.textSelectionColor,
-      cursorColor: cursorColor ?? this.cursorColor,
-      textSelectionHandleColor: textSelectionHandleColor ?? this.textSelectionHandleColor,
       accentColor: accentColor ?? this.accentColor,
       accentColorBrightness: accentColorBrightness ?? this.accentColorBrightness,
       accentTextTheme: accentTextTheme ?? this.accentTextTheme,
@@ -2092,10 +1985,6 @@ class ThemeData with Diagnosticable {
       tooltipTheme: TooltipThemeData.lerp(a.tooltipTheme, b.tooltipTheme, t)!,
       expansionTileTheme: ExpansionTileThemeData.lerp(a.expansionTileTheme, b.expansionTileTheme, t)!,
       // DEPRECATED (newest deprecations at the bottom)
-      useTextSelectionTheme: t < 0.5 ? a.useTextSelectionTheme : b.useTextSelectionTheme,
-      textSelectionColor: Color.lerp(a.textSelectionColor, b.textSelectionColor, t)!,
-      cursorColor: Color.lerp(a.cursorColor, b.cursorColor, t)!,
-      textSelectionHandleColor: Color.lerp(a.textSelectionHandleColor, b.textSelectionHandleColor, t)!,
       accentColor: Color.lerp(a.accentColor, b.accentColor, t)!,
       accentColorBrightness: t < 0.5 ? a.accentColorBrightness : b.accentColorBrightness,
       accentTextTheme: TextTheme.lerp(a.accentTextTheme, b.accentTextTheme, t),
@@ -2193,10 +2082,6 @@ class ThemeData with Diagnosticable {
         other.tooltipTheme == tooltipTheme &&
         other.expansionTileTheme == expansionTileTheme &&
         // DEPRECATED (newest deprecations at the bottom)
-        other.useTextSelectionTheme == useTextSelectionTheme &&
-        other.textSelectionColor == textSelectionColor &&
-        other.cursorColor == cursorColor &&
-        other.textSelectionHandleColor == textSelectionHandleColor &&
         other.accentColor == accentColor &&
         other.accentColorBrightness == accentColorBrightness &&
         other.accentTextTheme == accentTextTheme &&
@@ -2292,10 +2177,6 @@ class ThemeData with Diagnosticable {
       tooltipTheme,
       expansionTileTheme,
       // DEPRECATED (newest deprecations at the bottom)
-      useTextSelectionTheme,
-      textSelectionColor,
-      cursorColor,
-      textSelectionHandleColor,
       accentColor,
       accentColorBrightness,
       accentTextTheme,
@@ -2390,10 +2271,6 @@ class ThemeData with Diagnosticable {
     properties.add(DiagnosticsProperty<TooltipThemeData>('tooltipTheme', tooltipTheme, level: DiagnosticLevel.debug));
     properties.add(DiagnosticsProperty<ExpansionTileThemeData>('expansionTileTheme', expansionTileTheme, level: DiagnosticLevel.debug));
     // DEPRECATED (newest deprecations at the bottom)
-    properties.add(DiagnosticsProperty<bool>('useTextSelectionTheme', useTextSelectionTheme, level: DiagnosticLevel.debug));
-    properties.add(ColorProperty('textSelectionColor', textSelectionColor, defaultValue: defaultData.textSelectionColor, level: DiagnosticLevel.debug));
-    properties.add(ColorProperty('cursorColor', cursorColor, defaultValue: defaultData.cursorColor, level: DiagnosticLevel.debug));
-    properties.add(ColorProperty('textSelectionHandleColor', textSelectionHandleColor, defaultValue: defaultData.textSelectionHandleColor, level: DiagnosticLevel.debug));
     properties.add(ColorProperty('accentColor', accentColor, defaultValue: defaultData.accentColor, level: DiagnosticLevel.debug));
     properties.add(EnumProperty<Brightness>('accentColorBrightness', accentColorBrightness, defaultValue: defaultData.accentColorBrightness, level: DiagnosticLevel.debug));
     properties.add(DiagnosticsProperty<TextTheme>('accentTextTheme', accentTextTheme, level: DiagnosticLevel.debug));

packages/flutter/lib/src/widgets/editable_text.dart

@@ -963,7 +963,7 @@ class EditableText extends StatefulWidget {
   ///
   /// For [CupertinoTextField]s, the value is set to the ambient
   /// [CupertinoThemeData.primaryColor] with 20% opacity. For [TextField]s, the
-  /// value is set to the ambient [ThemeData.textSelectionColor].
+  /// value is set to the ambient [TextSelectionThemeData.selectionColor].
   final Color? selectionColor;
 
   /// {@template flutter.widgets.editableText.selectionControls}

packages/flutter/test/material/snack_bar_test.dart

@@ -752,9 +752,6 @@ void main() {
       buttonTheme: const ButtonThemeData(colorScheme: ColorScheme.dark()),
       toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)),
       secondaryHeaderColor: Colors.black,
-      textSelectionColor: Colors.black,
-      cursorColor: Colors.black,
-      textSelectionHandleColor: Colors.black,
       backgroundColor: Colors.black,
       dialogBackgroundColor: Colors.black,
       indicatorColor: Colors.black,
@@ -799,7 +796,6 @@ void main() {
       radioTheme: const RadioThemeData(),
       switchTheme: const SwitchThemeData(),
       progressIndicatorTheme: const ProgressIndicatorThemeData(),
-      useTextSelectionTheme: false,
     );
 
     ThemeData? themeBeforeSnackBar;

packages/flutter/test/material/theme_data_test.dart

@@ -634,9 +634,6 @@ void main() {
       toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)),
       buttonColor: Colors.black,
       secondaryHeaderColor: Colors.black,
-      textSelectionColor: Colors.black,
-      cursorColor: Colors.black,
-      textSelectionHandleColor: Colors.black,
       backgroundColor: Colors.black,
       dialogBackgroundColor: Colors.black,
       indicatorColor: Colors.black,
@@ -690,7 +687,6 @@ void main() {
       drawerTheme: const DrawerThemeData(),
       listTileTheme: const ListTileThemeData(),
       fixTextFieldOutlineLabel: false,
-      useTextSelectionTheme: false,
       androidOverscrollIndicator: null,
       extensions: const <Object, ThemeExtension<dynamic>>{},
     );
@@ -735,9 +731,6 @@ void main() {
       toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.white)),
       buttonColor: Colors.white,
       secondaryHeaderColor: Colors.white,
-      textSelectionColor: Colors.white,
-      cursorColor: Colors.white,
-      textSelectionHandleColor: Colors.white,
       backgroundColor: Colors.white,
       dialogBackgroundColor: Colors.white,
       indicatorColor: Colors.white,
@@ -791,7 +784,6 @@ void main() {
       drawerTheme: const DrawerThemeData(),
       listTileTheme: const ListTileThemeData(),
       fixTextFieldOutlineLabel: true,
-      useTextSelectionTheme: true,
       androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
       extensions: const <Object, ThemeExtension<dynamic>>{
         MyThemeExtensionB: MyThemeExtensionB(textStyle: TextStyle()),
@@ -822,9 +814,6 @@ void main() {
       toggleButtonsTheme: otherTheme.toggleButtonsTheme,
       buttonColor: otherTheme.buttonColor,
       secondaryHeaderColor: otherTheme.secondaryHeaderColor,
-      textSelectionColor: otherTheme.textSelectionTheme.selectionColor,
-      cursorColor: otherTheme.textSelectionTheme.cursorColor,
-      textSelectionHandleColor: otherTheme.textSelectionTheme.selectionHandleColor,
       backgroundColor: otherTheme.backgroundColor,
       dialogBackgroundColor: otherTheme.dialogBackgroundColor,
       indicatorColor: otherTheme.indicatorColor,
@@ -1076,10 +1065,6 @@ void main() {
       'tooltipTheme',
       'expansionTileTheme',
       // DEPRECATED (newest deprecations at the bottom)
-      'useTextSelectionTheme',
-      'textSelectionColor',
-      'cursorColor',
-      'textSelectionHandleColor',
       'accentColor',
       'accentColorBrightness',
       'accentTextTheme',