Merged in changes from beta channel, resolved conflicts

packages/zefyr/CHANGELOG.md

 * Breaking change: removed `ZefyrEditor.of` and `ZefyrEditableText.of` static methods.
   Use `ZefyrScope.of` instead.
 
+## 0.3.1
+
+- Fixed autofocus not being triggered when set to `true` for the first time.
+- Allow customizing cursor color via ZefyrTheme.
+
 ## 0.3.0
 
 This version introduces new widget `ZefyrScaffold` which allows embedding Zefyr in custom

packages/zefyr/example/lib/src/form.dart

         decoration: InputDecoration(labelText: 'Description'),
         controller: _controller,
         focusNode: _focusNode,
-        autofocus: false,
+        autofocus: true,
         imageDelegate: new CustomImageDelegate(),
         physics: ClampingScrollPhysics(),
       ),

packages/zefyr/example/lib/src/full_page.dart

   @override
   Widget build(BuildContext context) {
     final theme = new ZefyrThemeData(
+      cursorColor: Colors.blue,
       toolbarTheme: ZefyrToolbarTheme.fallback(context).copyWith(
         color: Colors.grey.shade800,
         toggleColor: Colors.grey.shade900,

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

 
 import 'package:flutter/material.dart';
 
-class CaretPainter {
+/// Helper class responsible for cursor layout and painting.
+class CursorPainter {
   static const double _kCaretHeightOffset = 2.0; // pixels
   static const double _kCaretWidth = 1.0; // pixels
 
         0.0, 0.0, _kCaretWidth, lineHeight - _kCaretHeightOffset);
   }
 
+  CursorPainter(Color color)
+      : assert(color != null),
+        _color = color;
+
   Rect _prototype;
 
   Rect get prototype => _prototype;
 
+  Color _color;
+  Color get color => _color;
+  set color(Color value) {
+    assert(value != null);
+    _color = value;
+  }
+
   void layout(double lineHeight) {
     _prototype = buildPrototype(lineHeight);
   }
 
   void paint(Canvas canvas, Offset offset) {
-    final Paint paint = new Paint()..color = Colors.black;
+    final Paint paint = new Paint()..color = _color;
     final Rect caretRect = _prototype.shift(offset);
     canvas.drawRect(caretRect, paint);
   }

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

         showCursor: scope.showCursor,
         selection: scope.selection,
         selectionColor: theme.selectionColor,
+        cursorColor: theme.cursorColor,
       );
       content = CompositedTransformTarget(link: _link, child: content);
     }

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

     @required this.showCursor,
     @required this.selection,
     @required this.selectionColor,
+    @required this.cursorColor,
   }) : super(child: child);
 
   final ContainerNode node;
   final ValueNotifier<bool> showCursor;
   final TextSelection selection;
   final Color selectionColor;
+  final Color cursorColor;
 
   @override
   RenderEditableProxyBox createRenderObject(BuildContext context) {
       showCursor: showCursor,
       selection: selection,
       selectionColor: selectionColor,
+      cursorColor: cursorColor,
     );
   }
 
       ..renderContext = renderContext
       ..showCursor = showCursor
       ..selection = selection
-      ..selectionColor = selectionColor;
+      ..selectionColor = selectionColor
+      ..cursorColor = cursorColor;
   }
 }
 
     @required ValueNotifier<bool> showCursor,
     @required TextSelection selection,
     @required Color selectionColor,
+    @required Color cursorColor,
   })  : _node = node,
         _layerLink = layerLink,
         _renderContext = renderContext,
         _selectionColor = selectionColor,
         super() {
     this.child = child;
+    _cursorPainter = CursorPainter(cursorColor);
+  }
+
+  CursorPainter _cursorPainter;
+
+  set cursorColor(Color value) {
+    if (_cursorPainter.color != value) {
+      _cursorPainter.color = value;
+      markNeedsPaint();
+    }
   }
 
   bool _isDirty = true;
   @mustCallSuper
   void performLayout() {
     super.performLayout();
-    _caretPainter.layout(preferredLineHeight);
+    _cursorPainter.layout(preferredLineHeight);
     // Indicate to render context that this object can be used by other
     // layers (selection overlay, for instance).
     _isDirty = false;
       paintSelection(context, offset, selection, selectionColor);
     }
     if (isCaretVisible) {
-      _paintCaret(context, offset);
+      _paintCursor(context, offset);
     }
   }
 
-  final CaretPainter _caretPainter = new CaretPainter();
-
-  void _paintCaret(PaintingContext context, Offset offset) {
+  void _paintCursor(PaintingContext context, Offset offset) {
     Offset caretOffset =
-        getOffsetForCaret(_selection.extent, _caretPainter.prototype);
-    _caretPainter.paint(context.canvas, caretOffset + offset);
+        getOffsetForCaret(_selection.extent, _cursorPainter.prototype);
+    _cursorPainter.paint(context.canvas, caretOffset + offset);
   }
 
   @override

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

       FocusScope.of(context).requestFocus(focusNode);
   }
 
+  void focusOrUnfocusIfNeeded() {
+    if (!_didAutoFocus && widget.autofocus && widget.enabled) {
+      FocusScope.of(context).autofocus(focusNode);
+      _didAutoFocus = true;
+    }
+    if (!widget.enabled && focusNode.hasFocus) {
+      _didAutoFocus = false;
+      focusNode.unfocus();
+    }
+  }
+
   //
   // Overridden members of State
   //
   void didUpdateWidget(ZefyrEditableText oldWidget) {
     super.didUpdateWidget(oldWidget);
     _updateSubscriptions(oldWidget);
-    if (!_didAutoFocus && widget.autofocus && widget.enabled) {
-      FocusScope.of(context).autofocus(focusNode);
-      _didAutoFocus = true;
-    }
-    if (!widget.enabled && focusNode.hasFocus) {
-      _didAutoFocus = false;
-      focusNode.unfocus();
-    }
+    focusOrUnfocusIfNeeded();
   }
 
   @override
       _cursorTimer = scope.cursorTimer;
       _cursorTimer.startOrStop(focusNode, selection);
     }
+    focusOrUnfocusIfNeeded();
   }
 
   @override

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

   List<ui.TextBox> getEndpointsForSelection(TextSelection selection) {
     TextSelection local = getLocalSelection(selection);
     if (local.isCollapsed) {
-      final caret = CaretPainter.buildPrototype(preferredLineHeight);
+      final caret = CursorPainter.buildPrototype(preferredLineHeight);
       final offset = getOffsetForCaret(local.extent, caret);
       return [
         new ui.TextBox.fromLTRBD(

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

   final HeadingTheme headingTheme;
   final BlockTheme blockTheme;
   final Color selectionColor;
+  final Color cursorColor;
 
   /// Size of indentation for blocks.
   final double indentSize;
       headingTheme: new HeadingTheme.fallback(),
       blockTheme: new BlockTheme.fallback(),
       selectionColor: Colors.lightBlueAccent.shade100,
+      cursorColor: Colors.black,
       indentSize: 16.0,
       toolbarTheme: new ZefyrToolbarTheme.fallback(context),
     );
     this.headingTheme,
     this.blockTheme,
     this.selectionColor,
+    this.cursorColor,
     this.indentSize,
     this.toolbarTheme,
   });
     HeadingTheme headingTheme,
     BlockTheme blockTheme,
     Color selectionColor,
+    Color cursorColor,
     double indentSize,
     ZefyrToolbarTheme toolbarTheme,
   }) {
       headingTheme: headingTheme ?? this.headingTheme,
       blockTheme: blockTheme ?? this.blockTheme,
       selectionColor: selectionColor ?? this.selectionColor,
+      cursorColor: cursorColor ?? this.cursorColor,
       indentSize: indentSize ?? this.indentSize,
       toolbarTheme: toolbarTheme ?? this.toolbarTheme,
     );
       headingTheme: other.headingTheme,
       blockTheme: other.blockTheme,
       selectionColor: other.selectionColor,
+      cursorColor: other.cursorColor,
       indentSize: other.indentSize,
       toolbarTheme: other.toolbarTheme,
     );

packages/zefyr/pubspec.yaml

 name: zefyr
 description: Clean, minimalistic and collaboration-ready rich text editor for Flutter.
-version: 0.3.0
+version: 0.3.1
 author: Anatoly Pulyaevskiy <anatoly.pulyaevskiy@gmail.com>
 homepage: https://github.com/memspace/zefyr
 

packages/zefyr/test/painting/caret_painter_test.dart

 // BSD-style license that can be found in the LICENSE file.
 import 'dart:ui';
 
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:zefyr/src/widgets/caret.dart';
 
 void main() {
-  group('$CaretPainter', () {
+  group('$CursorPainter', () {
     test('prototype is null before layout', () {
-      var painter = new CaretPainter();
+      var painter = new CursorPainter(Colors.black);
       expect(painter.prototype, isNull);
     });
 
     test('prototype is set after layout', () {
-      var painter = new CaretPainter();
+      var painter = new CursorPainter(Colors.black);
       painter.layout(16.0);
       expect(painter.prototype, new Rect.fromLTWH(0.0, 0.0, 1.0, 14.0));
     });

packages/zefyr/test/rendering/render_editable_proxy_box_test.dart

         showCursor: ValueNotifier<bool>(true),
         selection: TextSelection.collapsed(offset: 0),
         selectionColor: Color(0),
+        cursorColor: Color(0),
       );
     });
 

packages/zefyr/test/testing.dart

     FocusNode focusNode,
     NotusDocument document,
     ZefyrThemeData theme,
+    bool autofocus: false,
   }) {
     focusNode ??= FocusNode();
     document ??= NotusDocument.fromDelta(delta);
     var controller = ZefyrController(document);
 
-    Widget widget = _ZefyrSandbox(controller: controller, focusNode: focusNode);
+    Widget widget = _ZefyrSandbox(
+      controller: controller,
+      focusNode: focusNode,
+      autofocus: autofocus,
+    );
+
     if (theme != null) {
       widget = ZefyrTheme(data: theme, child: widget);
     }
     return tester.pumpAndSettle();
   }
 
-  Future<void> tapEditor() async {
+  Future<void> pump() async {
     await tester.pumpWidget(widget);
+  }
+
+  Future<void> tap() async {
     await tester.tap(find.byType(ZefyrParagraph).first);
     await tester.pumpAndSettle();
     expect(focusNode.hasFocus, isTrue);
   }
 
+  Future<void> pumpAndTap() async {
+    await pump();
+    await tap();
+  }
+
   Future<void> tapHideKeyboardButton() async {
     await tapButtonWithIcon(Icons.keyboard_hide);
   }
 }
 
 class _ZefyrSandbox extends StatefulWidget {
-  const _ZefyrSandbox({Key key, this.controller, this.focusNode})
+  const _ZefyrSandbox(
+      {Key key, this.controller, this.focusNode, this.autofocus})
       : super(key: key);
   final ZefyrController controller;
   final FocusNode focusNode;
+  final bool autofocus;
 
   @override
   _ZefyrSandboxState createState() => _ZefyrSandboxState();
       controller: widget.controller,
       focusNode: widget.focusNode,
       enabled: _enabled,
+      autofocus: widget.autofocus,
     );
   }
 

packages/zefyr/test/widgets/buttons_test.dart

   group('$ZefyrButton', () {
     testWidgets('toggle style', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.updateSelection(base: 5, extent: 10);
       await editor.tapButtonWithIcon(Icons.format_bold);
 
     testWidgets('toggle state for different styles of the same attribute',
         (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
 
       await editor.tapButtonWithIcon(Icons.format_list_bulleted);
       expect(editor.document.root.children.first, isInstanceOf<BlockNode>());
   group('$HeadingButton', () {
     testWidgets('toggle menu', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.format_size);
 
       expect(find.text('H1'), findsOneWidget);
 
     testWidgets('toggle styles', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.format_size);
       await editor.tapButtonWithText('H3');
       LineNode line = editor.document.root.children.first;
 
     testWidgets('close overlay', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.format_size);
       expect(find.text('H1'), findsOneWidget);
       await editor.tapButtonWithIcon(Icons.close);
   group('$LinkButton', () {
     testWidgets('disabled when selection is collapsed', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.link);
       expect(find.byIcon(Icons.link_off), findsNothing);
     });
     testWidgets('enabled and toggles menu with non-empty selection',
         (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.updateSelection(base: 5, extent: 10);
       await editor.tapButtonWithIcon(Icons.link);
       expect(find.byIcon(Icons.link_off), findsOneWidget);
 
     testWidgets('auto cancels edit on selection update', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.updateSelection(base: 5, extent: 10);
       await editor.tapButtonWithIcon(Icons.link);
       await tester
 
     testWidgets('editing link', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.updateSelection(base: 5, extent: 10);
 
       await editor.tapButtonWithIcon(Icons.link);
 
     testWidgets('toggle overlay', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.photo);
 
       expect(find.byIcon(Icons.photo_camera), findsOneWidget);
 
     testWidgets('pick from camera', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.photo);
       await editor.tapButtonWithIcon(Icons.photo_camera);
       expect(log, hasLength(1));
 
     testWidgets('pick from gallery', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.photo);
       await editor.tapButtonWithIcon(Icons.photo_library);
       expect(log, hasLength(1));

packages/zefyr/test/widgets/code_test.dart

   group('$ZefyrCode', () {
     testWidgets('format as code', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.code);
 
       BlockNode block = editor.document.root.children.first;

packages/zefyr/test/widgets/editable_text_test.dart

   group('$ZefyrEditableText', () {
     testWidgets('user input', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       final currentValue = editor.document.toPlainText();
       await enterText(tester, 'Added $currentValue');
       expect(editor.document.toPlainText(), 'Added This House Is A Circus\n');
     });
+
+    testWidgets('autofocus', (tester) async {
+      final editor = new EditorSandBox(tester: tester, autofocus: true);
+      await editor.pump();
+      expect(editor.focusNode.hasFocus, isTrue);
+    });
+
+    testWidgets('no autofocus', (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.pump();
+      expect(editor.focusNode.hasFocus, isFalse);
+    });
   });
 }
 

packages/zefyr/test/widgets/editor_test.dart

       var theme = ZefyrThemeData(linkStyle: TextStyle(color: Colors.red));
       var editor =
           new EditorSandBox(tester: tester, document: doc, theme: theme);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       // TODO: figure out why this extra pump is needed here
       await tester.pumpAndSettle();
       ZefyrRichText p = tester.widget(find.byType(ZefyrRichText).first);
 
     testWidgets('collapses selection when unfocused', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.updateSelection(base: 0, extent: 3);
       expect(editor.findSelectionHandle(), findsNWidgets(2));
       await editor.tapHideKeyboardButton();
 
     testWidgets('toggle enabled state', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.updateSelection(base: 0, extent: 3);
       await editor.disable();
       ZefyrEditor widget = tester.widget(find.byType(ZefyrEditor));

packages/zefyr/test/widgets/horizontal_rule_test.dart

   group('$ZefyrHorizontalRule', () {
     testWidgets('format as horizontal rule', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.remove);
 
       LineNode line = editor.document.root.children.last;
     testWidgets('tap left side of horizontal rule puts caret before it',
         (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.remove);
       await editor.updateSelection(base: 0, extent: 0);
 
     testWidgets('tap right side of horizontal rule puts caret after it',
         (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.remove);
       await editor.updateSelection(base: 0, extent: 0);
 
     testWidgets('selects on long press',
         (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.remove);
       await editor.updateSelection(base: 0, extent: 0);
 

packages/zefyr/test/widgets/image_test.dart

 
     testWidgets('embed image', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.photo);
       await editor.tapButtonWithIcon(Icons.photo_camera);
       LineNode line = editor.document.root.children.last;
     testWidgets('tap on left side of image puts caret before it',
         (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.photo);
       await editor.tapButtonWithIcon(Icons.photo_camera);
       await editor.updateSelection(base: 0, extent: 0);
     testWidgets('tap right side of image puts caret after it',
         (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.photo);
       await editor.tapButtonWithIcon(Icons.photo_camera);
       await editor.updateSelection(base: 0, extent: 0);
 
     testWidgets('selects on long press', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.photo);
       await editor.tapButtonWithIcon(Icons.photo_camera);
       await editor.updateSelection(base: 0, extent: 0);

packages/zefyr/test/widgets/list_test.dart

   group('$ZefyrList', () {
     testWidgets('format as list', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.format_list_bulleted);
       BlockNode block = editor.document.root.children.first;
       expect(block.style.get(NotusAttribute.block),

packages/zefyr/test/widgets/quote_test.dart

   group('$ZefyrQuote', () {
     testWidgets('format as quote', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.tapButtonWithIcon(Icons.format_quote);
 
       BlockNode block = editor.document.root.children.first;

packages/zefyr/test/widgets/render_context_test.dart

     showCursor: showCursor,
     selection: selection,
     selectionColor: selectionColor,
+    cursorColor: Color(0),
   );
 }

packages/zefyr/test/widgets/selection_test.dart

   group('$ZefyrSelectionOverlay', () {
     testWidgets('double tap caret shows toolbar', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
 
       RenderZefyrParagraph renderObject =
           tester.firstRenderObject(find.byType(ZefyrRichText));
 
     testWidgets('hides when editor lost focus', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       await editor.updateSelection(base: 0, extent: 5);
       expect(editor.findSelectionHandle(), findsNWidgets(2));
       await editor.unfocus();
 
     testWidgets('tap on padding area finds closest paragraph', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       editor.controller
           .updateSelection(new TextSelection.collapsed(offset: 10));
       await tester.pumpAndSettle();
 
     testWidgets('tap on empty space finds closest paragraph', (tester) async {
       final editor = new EditorSandBox(tester: tester);
-      await editor.tapEditor();
+      await editor.pumpAndTap();
       editor.controller.replaceText(10, 1, '\n',
           selection: new TextSelection.collapsed(offset: 0));
       await tester.pumpAndSettle();