Support Flutter 3.44 text input changes (#583)

Author: john-unger

.github/workflows/fleather.yml

@@ -10,10 +10,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.38.0"
+          flutter-version: "3.44.0"
           cache: true
           # Manually Update this `key`
-          cache-key: "3.38.0"
+          cache-key: "3.44.0"
       - run: dart pub global activate coverage
 
       #

packages/fleather/example/lib/main.dart

@@ -148,6 +148,7 @@ class _HomePageState extends State<HomePage> {
       final data = node.value.data;
       // Icons.rocket_launch_outlined
       return Icon(
+        // ignore: non_const_argument_for_const_parameter
         IconData(int.parse(data['codePoint']), fontFamily: data['fontFamily']),
         color: Color(int.parse(data['color'])),
         size: 18,

packages/fleather/lib/l10n/fleather_localizations.g.dart

@@ -146,12 +146,12 @@ mixin RawEditorStateTextInputClientMixin on EditorState
         return;
       }
 
-      _textInputConnection?.setStyle(
+      _textInputConnection?.updateStyle(TextInputStyle(
           fontFamily: style.textStyle.fontFamily,
           fontSize: style.textStyle.fontSize,
           fontWeight: style.textStyle.fontWeight,
           textDirection: style.textDirection,
-          textAlign: style.textAlign);
+          textAlign: style.textAlign));
     });
   }
 
@@ -200,6 +200,17 @@ mixin RawEditorStateTextInputClientMixin on EditorState
     // no-op
   }
 
+  @override
+  bool onFocusReceived() {
+    if (mounted &&
+        !effectiveFocusNode.hasFocus &&
+        effectiveFocusNode.canRequestFocus) {
+      effectiveFocusNode.requestFocus();
+      return true;
+    }
+    return false;
+  }
+
   @override
   void performAction(TextInputAction action) {
     // no-op

…es/fleather/lib/l10n/translations/BR.arb …fleather/lib/l10n/translations/pt-BR.arbpackages/fleather/lib/l10n/translations/BR.arb renamed to packages/fleather/lib/l10n/translations/pt-BR.arb packages/fleather/lib/l10n/translations/BR.arb renamed to packages/fleather/lib/l10n/translations/pt-BR.arb

@@ -352,6 +352,9 @@ class FakeTickerProvider implements TickerProvider {
 }
 
 class FakeTicker implements Ticker {
+  @override
+  bool forceFrames = false;
+
   @override
   bool muted = false;
 

packages/fleather/lib/src/widgets/editor_input_client_mixin.dart

@@ -7,6 +7,46 @@ import 'package:flutter_test/flutter_test.dart';
 import '../testing.dart';
 
 void main() {
+  group('onFocusReceived', () {
+    testWidgets('requests focus when the editor can receive focus',
+        (tester) async {
+      final editor = EditorSandBox(tester: tester);
+      await editor.pump();
+
+      final inputClient = getInputClient();
+      expect(editor.focusNode.hasFocus, isFalse);
+
+      expect(inputClient.onFocusReceived(), isTrue);
+      await tester.pump();
+
+      expect(editor.focusNode.hasFocus, isTrue);
+    });
+
+    testWidgets('returns false when the editor already has focus',
+        (tester) async {
+      final editor = EditorSandBox(tester: tester);
+      await editor.pumpAndTap();
+
+      final inputClient = getInputClient();
+
+      expect(inputClient.onFocusReceived(), isFalse);
+      expect(editor.focusNode.hasFocus, isTrue);
+    });
+
+    testWidgets('returns false when focus cannot be requested', (tester) async {
+      final focusNode = FocusNode(canRequestFocus: false);
+      final editor = EditorSandBox(tester: tester, focusNode: focusNode);
+      await editor.pump();
+
+      final inputClient = getInputClient();
+
+      expect(inputClient.onFocusReceived(), isFalse);
+      await tester.pump();
+
+      expect(focusNode.hasFocus, isFalse);
+    });
+  });
+
   group('send text editing state to TextInputConnection', () {
     final composingRanges = <TextRange>[];
 

packages/fleather/test/rendering/rendering_tools.dart

@@ -237,7 +237,8 @@ void main() {
             baseOffset: 13, extentOffset: 0, affinity: TextAffinity.upstream));
   });
 
-  testWidgets('$ExtendSelectionByPageIntent selection to end', (tester) async {
+  testWidgets('$ExtendSelectionVerticallyToAdjacentPageIntent selection to end',
+      (tester) async {
     final editor = EditorSandBox(
         tester: tester,
         document: ParchmentDocument.fromJson([
@@ -253,7 +254,8 @@ void main() {
             baseOffset: 3, extentOffset: 19, affinity: TextAffinity.upstream));
   });
 
-  testWidgets('$ExtendSelectionByPageIntent selection to end', (tester) async {
+  testWidgets('$ExtendSelectionVerticallyToAdjacentPageIntent selection to end',
+      (tester) async {
     final editor = EditorSandBox(
         tester: tester,
         document: ParchmentDocument.fromJson([

packages/fleather/test/widgets/editor_input_client_mixin_test.dart

@@ -1323,7 +1323,9 @@ void main() {
             if (node.value.type == 'icon') {
               final data = node.value.data;
               return Icon(
+                // ignore: non_const_argument_for_const_parameter
                 IconData(int.parse(data['codePoint']),
+                    // ignore: non_const_argument_for_const_parameter
                     fontFamily: data['fontFamily']),
                 color: Color(int.parse(data['color'])),
                 size: 100,
@@ -1420,7 +1422,9 @@ void main() {
             if (node.value.type == 'icon') {
               final data = node.value.data;
               return Icon(
+                // ignore: non_const_argument_for_const_parameter
                 IconData(int.parse(data['codePoint']),
+                    // ignore: non_const_argument_for_const_parameter
                     fontFamily: data['fontFamily']),
                 color: Color(int.parse(data['color'])),
                 size: 100,