zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Reland "Add BuildContext parameter to TextEditingController.buildTextSpan" (#73510)

Browse Source
This commit is contained in:
Jesse
2021-01-28 18:49:03 +01:00
committed by GitHub
parent d40f4399e2
commit 2e7ab87a4d
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/material/selectable_text.dart
View File

@@ -32,7 +32,7 @@ class _TextSpanEditingController extends TextEditingController {
final TextSpan _textSpan;
@override
TextSpan buildTextSpan({TextStyle? style ,bool? withComposing}) {
TextSpan buildTextSpan({required BuildContext context, TextStyle? style, required bool withComposing}) {
// This does not care about composing.
return TextSpan(
style: style,

3
packages/flutter/lib/src/widgets/editable_text.dart
View File

@@ -198,7 +198,7 @@ class TextEditingController extends ValueNotifier<TextEditingValue> {
///
/// By default makes text in composing range appear as underlined. Descendants
/// can override this method to customize appearance of text.
TextSpan buildTextSpan({TextStyle? style , required bool withComposing}) {
TextSpan buildTextSpan({required BuildContext context, TextStyle? style , required bool withComposing}) {
assert(!value.composing.isValid || !withComposing || value.isComposingRangeValid);
// If the composing range is out of range for the current text, ignore it to
// preserve the tree integrity, otherwise in release mode a RangeError will
@@ -2680,6 +2680,7 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
}
// Read only mode should not paint text composing.
return widget.controller.buildTextSpan(
context: context,
style: widget.style,
withComposing: !widget.readOnly,
);

29
packages/flutter/test/widgets/editable_text_test.dart
View File

@@ -5810,6 +5810,25 @@ void main() {
}),
);
});
testWidgets('TextEditingController.buildTextSpan receives build context', (WidgetTester tester) async {
final _AccentColorTextEditingController controller = _AccentColorTextEditingController('a');
const Color color = Color.fromARGB(255, 1, 2, 3);
await tester.pumpWidget(MaterialApp(
theme: ThemeData.light().copyWith(accentColor: color),
home: EditableText(
controller: controller,
focusNode: FocusNode(),
style: Typography.material2018(platform: TargetPlatform.android).black.subtitle1!,
cursorColor: Colors.blue,
backgroundCursorColor: Colors.grey,
),
));
final RenderEditable renderEditable = findRenderEditable(tester);
final TextSpan textSpan = renderEditable.text!;
expect(textSpan.style!.color, color);
});
});
testWidgets('autofocus:true on first frame does not throw', (WidgetTester tester) async {
@@ -7286,3 +7305,13 @@ class SkipPaintingRenderObject extends RenderProxyBox {
@override
void paint(PaintingContext context, Offset offset) { }
}
class _AccentColorTextEditingController extends TextEditingController {
_AccentColorTextEditingController(String text) : super(text: text);
@override
TextSpan buildTextSpan({required BuildContext context, TextStyle? style, required bool withComposing}) {
final Color color = Theme.of(context).accentColor;
return super.buildTextSpan(context: context, style: TextStyle(color: color), withComposing: withComposing);
}
}