Updated to resolve breaking changes in Flutter dev channel

packages/zefyr/example/ios/Podfile.lock

@@ -20,7 +20,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
-  image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22
+  image_picker: 86b84c4fe89267356a1f17297a45b5d317ebd2e7
   url_launcher: 92b89c1029a0373879933c21642958c874539095
 
 PODFILE CHECKSUM: 1e5af4103afd21ca5ead147d7b81d06f494f51a2

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

@@ -59,15 +59,15 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   // New public members
   //
 
-  /// Focus node of this widget.
-  FocusNode get focusNode => widget.focusNode;
-
   /// Document controlled by this widget.
   NotusDocument get document => widget.controller.document;
 
   /// Current text selection.
   TextSelection get selection => widget.controller.selection;
 
+  FocusNode _focusNode;
+  FocusAttachment _focusAttachment;
+
   /// Express interest in interacting with the keyboard.
   ///
   /// If this control is already attached to the keyboard, this function will
@@ -76,20 +76,20 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   /// focus, the control will then attach to the keyboard and request that the
   /// keyboard become visible.
   void requestKeyboard() {
-    if (focusNode.hasFocus)
+    if (_focusNode.hasFocus)
       _input.openConnection(widget.controller.plainTextEditingValue);
     else
-      FocusScope.of(context).requestFocus(focusNode);
+      FocusScope.of(context).requestFocus(_focusNode);
   }
 
   void focusOrUnfocusIfNeeded() {
     if (!_didAutoFocus && widget.autofocus && widget.enabled) {
-      FocusScope.of(context).autofocus(focusNode);
+      FocusScope.of(context).autofocus(_focusNode);
       _didAutoFocus = true;
     }
-    if (!widget.enabled && focusNode.hasFocus) {
+    if (!widget.enabled && _focusNode.hasFocus) {
       _didAutoFocus = false;
-      focusNode.unfocus();
+      _focusNode.unfocus();
     }
   }
 
@@ -99,7 +99,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   @override
   Widget build(BuildContext context) {
-    FocusScope.of(context).reparentIfNeeded(focusNode);
+    _focusAttachment.reparent();
     super.build(context); // See AutomaticKeepAliveState.
 
     Widget body = ListBody(children: _buildChildren(context));
@@ -127,7 +127,9 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   @override
   void initState() {
+    _focusNode = widget.focusNode;
     super.initState();
+    _focusAttachment = _focusNode.attach(context);
     _input = new InputConnectionController(_handleRemoteValueChange);
     _updateSubscriptions();
   }
@@ -135,6 +137,11 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   @override
   void didUpdateWidget(ZefyrEditableText oldWidget) {
     super.didUpdateWidget(oldWidget);
+    if (_focusNode != widget.focusNode) {
+      _focusAttachment.detach();
+      _focusNode = widget.focusNode;
+      _focusAttachment = _focusNode.attach(context);
+    }
     _updateSubscriptions(oldWidget);
     focusOrUnfocusIfNeeded();
   }
@@ -151,13 +158,14 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
     if (_cursorTimer != scope.cursorTimer) {
       _cursorTimer?.stop();
       _cursorTimer = scope.cursorTimer;
-      _cursorTimer.startOrStop(focusNode, selection);
+      _cursorTimer.startOrStop(_focusNode, selection);
     }
     focusOrUnfocusIfNeeded();
   }
 
   @override
   void dispose() {
+    _focusAttachment.detach();
     _cancelSubscriptions();
     super.dispose();
   }
@@ -167,7 +175,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   //
 
   @override
-  bool get wantKeepAlive => focusNode.hasFocus;
+  bool get wantKeepAlive => _focusNode.hasFocus;
 
   //
   // Private members
@@ -215,7 +223,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   void _updateSubscriptions([ZefyrEditableText oldWidget]) {
     if (oldWidget == null) {
       widget.controller.addListener(_handleLocalValueChange);
-      focusNode.addListener(_handleFocusChange);
+      _focusNode.addListener(_handleFocusChange);
       return;
     }
 
@@ -234,7 +242,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   void _cancelSubscriptions() {
     _renderContext.removeListener(_handleRenderContextChange);
     widget.controller.removeListener(_handleLocalValueChange);
-    focusNode.removeListener(_handleFocusChange);
+    _focusNode.removeListener(_handleFocusChange);
     _input.closeConnection();
     _cursorTimer.stop();
   }
@@ -247,7 +255,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
       requestKeyboard();
     }
     _input.updateRemoteValue(widget.controller.plainTextEditingValue);
-    _cursorTimer.startOrStop(focusNode, selection);
+    _cursorTimer.startOrStop(_focusNode, selection);
     setState(() {
       // nothing to update internally.
     });
@@ -255,8 +263,8 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   void _handleFocusChange() {
     _input.openOrCloseConnection(
-        focusNode, widget.controller.plainTextEditingValue);
-    _cursorTimer.startOrStop(focusNode, selection);
+        _focusNode, widget.controller.plainTextEditingValue);
+    _cursorTimer.startOrStop(_focusNode, selection);
     updateKeepAlive();
   }
 

packages/zefyr/lib/src/widgets/input.dart

@@ -146,11 +146,11 @@ class InputConnectionController implements TextInputClient {
       final diff = fastDiff(oldText, text, cursorPosition);
       onValueChanged(diff.start, diff.deleted, diff.inserted, value.selection);
     } catch (e, trace) {
-      FlutterError.reportError(new FlutterErrorDetails(
+      FlutterError.reportError(FlutterErrorDetails(
         exception: e,
         stack: trace,
         library: 'Zefyr',
-        context: 'while updating editing value',
+        context: ErrorSummary('while updating editing value'),
       ));
       rethrow;
     }

packages/zefyr/lib/src/widgets/selection.dart

@@ -468,19 +468,35 @@ class _SelectionToolbarState extends State<_SelectionToolbar> {
     }
     final boxes = block.getEndpointsForSelection(selection);
     // Find the horizontal midpoint, just above the selected text.
-    final Offset midpoint = new Offset(
+    Offset midpoint = new Offset(
       (boxes.length == 1)
           ? (boxes[0].start + boxes[0].end) / 2.0
           : (boxes[0].start + boxes[1].start) / 2.0,
       boxes[0].bottom - block.preferredLineHeight,
     );
+    List<TextSelectionPoint> endpoints;
+    if (boxes.length == 1) {
+      midpoint = Offset((boxes[0].start + boxes[0].end) / 2.0,
+          boxes[0].bottom - block.preferredLineHeight);
+      final Offset start = Offset(boxes[0].start, block.preferredLineHeight);
+      endpoints = <TextSelectionPoint>[TextSelectionPoint(start, null)];
+    } else {
+      midpoint = Offset((boxes[0].start + boxes[1].start) / 2.0,
+          boxes[0].bottom - block.preferredLineHeight);
+      final Offset start = Offset(boxes.first.start, boxes.first.bottom);
+      final Offset end = Offset(boxes.last.end, boxes.last.bottom);
+      endpoints = <TextSelectionPoint>[
+        TextSelectionPoint(start, boxes.first.direction),
+        TextSelectionPoint(end, boxes.last.direction),
+      ];
+    }
 
     final Rect editingRegion = new Rect.fromPoints(
       block.localToGlobal(Offset.zero),
       block.localToGlobal(block.size.bottomRight(Offset.zero)),
     );
-    final toolbar = widget.controls
-        .buildToolbar(context, editingRegion, midpoint, widget.delegate);
+    final toolbar = widget.controls.buildToolbar(
+        context, editingRegion, midpoint, endpoints, widget.delegate);
     return new CompositedTransformFollower(
       link: block.layerLink,
       showWhenUnlinked: false,

packages/zefyr/pubspec.yaml

@@ -5,7 +5,7 @@ author: Anatoly Pulyaevskiy <anatoly.pulyaevskiy@gmail.com>
 homepage: https://github.com/memspace/zefyr
 
 environment:
-  sdk: '>=2.0.0-dev.58.0 <3.0.0'
+  sdk: '>=2.1.0 <3.0.0'
 
 dependencies:
   flutter: