DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Flutter 1.26 candidate.8 (#73522)

Browse Source 
* Cherrypick engine to 42a8d4c681baf87d2f2829ed3728eee4fe2bc3fe

* Revert "Add BuildContext parameter to TextEditingController.buildTextSpan (#72344)" (#73503)

This reverts commit 4901744e62f67ad10440725d2c97e84e66ce77f5, which was a minor breaking change that I missed.  Will try to open the PR again following the breaking change process.

Co-authored-by: Justin McCandless <jmccandless@google.com>
This commit is contained in:
Ren You 2021-01-07 18:36:48 -08:00 committed by GitHub
parent d0e9959a46
commit b9d06fffb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/internal/engine.version
View File

@ -1 +1 @@
e115066dcd65008513c66414f2f682c358d76c2a
42a8d4c681baf87d2f2829ed3728eee4fe2bc3fe

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

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

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

@ -185,7 +185,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, required BuildContext context}) {
TextSpan buildTextSpan({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
@ -2669,7 +2669,6 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
return widget.controller.buildTextSpan(
style: widget.style,
withComposing: !widget.readOnly,
context: context,
);
}
}

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

@ -5674,25 +5674,6 @@ 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 {
@ -7128,13 +7109,3 @@ class SkipPaintingRenderObject extends RenderProxyBox {
@override
void paint(PaintingContext context, Offset offset) { }
}
class _AccentColorTextEditingController extends TextEditingController {
_AccentColorTextEditingController(String text) : super(text: text);
@override
TextSpan buildTextSpan({TextStyle? style, required bool withComposing, required BuildContext context}) {
final Color color = Theme.of(context).accentColor;
return super.buildTextSpan(style: TextStyle(color: color), withComposing: withComposing, context: context);
}
}