# 11.0.0

* Migrate to 3.7.0
fluttercandies · Jan 31, 2023 · 2ed3c13 · 2ed3c13
1 parent 37a0ee4
commit 2ed3c13
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 11.0.0
+
+* Migrate to 3.7.0
+
 # 10.2.0
 
 * Add TextInputBindingMixin to prevent system keyboard show.

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -14,8 +14,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 

diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -222,6 +222,7 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -236,6 +237,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -43,5 +43,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/example/lib/pages/complex/text_demo.dart b/example/lib/pages/complex/text_demo.dart
@@ -111,9 +111,9 @@ class _TextDemoState extends State<TextDemo> {
                   specialTextSpanBuilder: _mySpecialTextSpanBuilder,
                   onSpecialTextTap: (dynamic value) {
                     if (value.toString().startsWith('\$')) {
-                      launch('https://github.com/fluttercandies');
+                      launchUrl(Uri.parse('https://github.com/fluttercandies'));
                     } else if (value.toString().startsWith('@')) {
-                      launch('mailto:zmtzawqlp@live.com');
+                      launchUrl(Uri.parse('mailto:zmtzawqlp@live.com'));
                     }
                   },
                 );

diff --git a/example/lib/pages/main_page.dart b/example/lib/pages/main_page.dart
@@ -52,7 +52,8 @@ class MainPage extends StatelessWidget {
                 ),
               ),
               onPressed: () {
-                launch('https://github.com/fluttercandies/extended_text_field');
+                launchUrl(Uri.parse(
+                    'https://github.com/fluttercandies/extended_text_field'));
               },
             ),
           ),
@@ -64,7 +65,7 @@ class MainPage extends StatelessWidget {
                 child: Image.network(
                     'https://pub.idqqimg.com/wpa/images/group.png'),
                 onPressed: () {
-                  launch('https://jq.qq.com/?_wv=1027&k=5bcc0gy');
+                  launchUrl(Uri.parse('https://jq.qq.com/?_wv=1027&k=5bcc0gy'));
                 },
               ),
             )

diff --git a/example/lib/special_text/my_extended_text_selection_controls.dart b/example/lib/special_text/my_extended_text_selection_controls.dart
@@ -1,6 +1,5 @@
 import 'dart:math' as math;
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 ///
@@ -45,8 +44,8 @@ class MyTextSelectionControls extends TextSelectionControls {
       handleSelectAll:
           canSelectAll(delegate) ? () => handleSelectAll(delegate) : null,
       handleLike: () {
-        launch(
-            'mailto:zmtzawqlp@live.com?subject=extended_text_share&body=${delegate.textEditingValue.text}');
+        launchUrl(Uri.parse(
+            'mailto:zmtzawqlp@live.com?subject=extended_text_share&body=${delegate.textEditingValue.text}'));
         delegate.hideToolbar();
         delegate.userUpdateTextEditingValue(
           delegate.textEditingValue

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -14,8 +14,8 @@ publish_to: none
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
-  flutter: ">=2.10.0"
+  sdk: '>=2.17.0 <3.0.0'
+  flutter: ">=3.7.0"
 dependencies:
 
   # The following adds the Cupertino Icons font to your application.
@@ -27,7 +27,7 @@ dependencies:
   #extended_text: ^9.0.0
   #extended_text_library: ^9.0.0
   ff_annotation_route_library: ^3.0.0
-  extended_text: ^9.1.0
+  extended_text: ^10.0.0
   flutter:
     sdk: flutter
   html: ^0.15.0

diff --git a/lib/src/extended_editable_text.dart b/lib/src/extended_editable_text.dart
@@ -1473,7 +1473,7 @@ class ExtendedEditableTextState extends State<ExtendedEditableText>
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    final AutofillGroupState? newAutofillGroup = AutofillGroup.of(context);
+    final AutofillGroupState? newAutofillGroup = AutofillGroup.maybeOf(context);
     if (currentAutofillScope != newAutofillGroup) {
       _currentAutofillScope?.unregister(autofillId);
       _currentAutofillScope = newAutofillGroup;
@@ -2977,7 +2977,7 @@ class ExtendedEditableTextState extends State<ExtendedEditableText>
                       textDirection: _textDirection,
                       locale: widget.locale,
                       textHeightBehavior: widget.textHeightBehavior ??
-                          DefaultTextHeightBehavior.of(context),
+                          DefaultTextHeightBehavior.maybeOf(context),
                       textWidthBasis: widget.textWidthBasis,
                       obscuringCharacter: widget.obscuringCharacter,
                       obscureText: widget.obscureText,
@@ -3198,6 +3198,27 @@ class ExtendedEditableTextState extends State<ExtendedEditableText>
       _textInputConnection!.setSelectionRects(rects);
     }
   }
+
+  @override
+  void didChangeInputControl(
+      TextInputControl? oldControl, TextInputControl? newControl) {
+    if (_hasFocus && _hasInputConnection) {
+      oldControl?.hide();
+      newControl?.show();
+    }
+  }
+
+  @override
+  void performSelector(String selectorName) {
+    final Intent? intent = intentForMacOSSelector(selectorName);
+
+    if (intent != null) {
+      final BuildContext? primaryContext = primaryFocus?.context;
+      if (primaryContext != null) {
+        Actions.invoke(primaryContext, intent);
+      }
+    }
+  }
 }
 
 class _Editable extends MultiChildRenderObjectWidget {

diff --git a/lib/src/extended_text_field.dart b/lib/src/extended_text_field.dart
@@ -18,7 +18,6 @@ import 'package:flutter/services.dart';
 typedef InputCounterWidgetBuilder = Widget Function(
   /// The build context for the TextField
   BuildContext context, {
-
   /// The length of the string currently in the input.
   required int currentLength,
 
@@ -1400,40 +1399,42 @@ class ExtendedTextFieldState extends State<ExtendedTextField>
       semanticsMaxValueLength = null;
     }
 
-    return FocusTrapArea(
-      focusNode: focusNode,
-      child: MouseRegion(
-        cursor: effectiveMouseCursor,
-        onEnter: (PointerEnterEvent event) => _handleHover(true),
-        onExit: (PointerExitEvent event) => _handleHover(false),
-        child: IgnorePointer(
-          ignoring: !_isEnabled,
-          child: AnimatedBuilder(
-            animation: controller, // changes the _currentLength
-            builder: (BuildContext context, Widget? child) {
-              return Semantics(
-                maxValueLength: semanticsMaxValueLength,
-                currentValueLength: _currentLength,
-                onTap: widget.readOnly
-                    ? null
-                    : () {
-                        if (!_effectiveController.selection.isValid)
-                          _effectiveController.selection =
-                              TextSelection.collapsed(
-                                  offset: _effectiveController.text.length);
-                        _requestKeyboard();
-                      },
-                onDidGainAccessibilityFocus: handleDidGainAccessibilityFocus,
-                child: child,
-              );
-            },
-            child: _selectionGestureDetectorBuilder.buildGestureDetector(
-              behavior: HitTestBehavior.translucent,
+    return MouseRegion(
+      cursor: effectiveMouseCursor,
+      onEnter: (PointerEnterEvent event) => _handleHover(true),
+      onExit: (PointerExitEvent event) => _handleHover(false),
+      child:
+          // we didn't join the tap region
+          // TextFieldTapRegion(
+          //   child:
+          IgnorePointer(
+        ignoring: !_isEnabled,
+        child: AnimatedBuilder(
+          animation: controller, // changes the _currentLength
+          builder: (BuildContext context, Widget? child) {
+            return Semantics(
+              maxValueLength: semanticsMaxValueLength,
+              currentValueLength: _currentLength,
+              onTap: widget.readOnly
+                  ? null
+                  : () {
+                      if (!_effectiveController.selection.isValid)
+                        _effectiveController.selection =
+                            TextSelection.collapsed(
+                                offset: _effectiveController.text.length);
+                      _requestKeyboard();
+                    },
+              onDidGainAccessibilityFocus: handleDidGainAccessibilityFocus,
               child: child,
-            ),
+            );
+          },
+          child: _selectionGestureDetectorBuilder.buildGestureDetector(
+            behavior: HitTestBehavior.translucent,
+            child: child,
           ),
         ),
       ),
+      //  ),
     );
   }
 

diff --git a/lib/src/keyboard/binding.dart b/lib/src/keyboard/binding.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:extended_text_field/src/keyboard/focus_node.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: extended_text_field
 description: Extended official text field to build special text like inline image, @somebody, custom background etc quickly.It also support to build custom seleciton toolbar and handles.
-version: 10.2.0
+version: 11.0.0
 homepage: https://github.com/fluttercandies/extended_text_field
 
 environment:
   sdk: '>=2.17.0 <3.0.0'
-  flutter: ">=3.0.0"
+  flutter: ">=3.7.0"
 dependencies:
 
   extended_text_library: ^9.1.0