Updated editable to use new ZefyrScope

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

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
@@ -39,6 +40,21 @@ class _FullPageEditorScreenState extends State<FullPageEditorScreen> {
       ZefyrController(NotusDocument.fromDelta(getDelta()));
   final FocusNode _focusNode = new FocusNode();
   bool _editing = false;
+  StreamSubscription<NotusChange> _sub;
+
+  @override
+  void initState() {
+    super.initState();
+    _sub = _controller.document.changes.listen((change) {
+      print('${change.source}: ${change.change}');
+    });
+  }
+
+  @override
+  void dispose() {
+    _sub.cancel();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {

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

@@ -18,11 +18,14 @@ import 'list.dart';
 import 'paragraph.dart';
 import 'quote.dart';
 import 'render_context.dart';
+import 'scope.dart';
 import 'selection.dart';
+import 'theme.dart';
 
 /// Core widget responsible for editing Zefyr documents.
 ///
-/// Depends on presence of [ZefyrTheme] somewhere up the widget tree.
+/// Depends on presence of [ZefyrTheme] and [ZefyrScope] somewhere up the
+/// widget tree.
 ///
 /// Consider using [ZefyrEditor] which wraps this widget and adds a toolbar to
 /// edit style attributes.
@@ -95,8 +98,6 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   /// Current text selection.
   TextSelection get selection => widget.controller.selection;
-  ZefyrRenderContext get renderContext => _renderContext;
-  ValueNotifier<bool> get showCursor => _cursorTimer.value;
 
   /// Express interest in interacting with the keyboard.
   ///
@@ -165,6 +166,22 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
     }
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final scope = ZefyrScope.of(context);
+    if (_renderContext != scope.renderContext) {
+      _renderContext?.removeListener(_handleRenderContextChange);
+      _renderContext = scope.renderContext;
+      _renderContext.addListener(_handleRenderContextChange);
+    }
+    if (_cursorTimer != scope.cursorTimer) {
+      _cursorTimer?.stop();
+      _cursorTimer = scope.cursorTimer;
+      _cursorTimer.startOrStop(focusNode, selection);
+    }
+  }
+
   @override
   void dispose() {
     _cancelSubscriptions();
@@ -183,8 +200,8 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   //
 
   final ScrollController _scrollController = ScrollController();
-  final ZefyrRenderContext _renderContext = ZefyrRenderContext();
-  final CursorTimer _cursorTimer = CursorTimer();
+  ZefyrRenderContext _renderContext;
+  CursorTimer _cursorTimer;
   InputConnectionController _input;
   bool _didAutoFocus = false;
 
@@ -223,7 +240,6 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   void _updateSubscriptions([ZefyrEditableText oldWidget]) {
     if (oldWidget == null) {
-      _renderContext.addListener(_handleRenderContextChange);
       widget.controller.addListener(_handleLocalValueChange);
       focusNode.addListener(_handleFocusChange);
       return;
@@ -243,7 +259,6 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   void _cancelSubscriptions() {
     _renderContext.removeListener(_handleRenderContextChange);
-    _renderContext.dispose();
     widget.controller.removeListener(_handleLocalValueChange);
     focusNode.removeListener(_handleFocusChange);
     _input.closeConnection();

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

@@ -144,9 +144,9 @@ class _ZefyrEditorState extends State<ZefyrEditor> {
   @override
   Widget build(BuildContext context) {
     Widget editable = new ZefyrEditableText(
-      controller: widget.controller,
-      focusNode: widget.focusNode,
-      imageDelegate: _imageDelegate,
+      controller: _scope.controller,
+      focusNode: _scope.focusNode,
+      imageDelegate: _scope.imageDelegate,
       autofocus: widget.autofocus,
       enabled: widget.enabled,
       padding: widget.padding,

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

@@ -176,7 +176,7 @@ class ZefyrScope extends ChangeNotifier {
     final selection = _controller.selection;
     if (_selectionStyle != attrs || _selection != selection) {
       _selectionStyle = attrs;
-      _selection = _controller.selection;
+      _selection = selection;
       notifyListeners();
     }
   }

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

@@ -294,6 +294,8 @@ class SelectionHandleDriver extends StatefulWidget {
 }
 
 class _SelectionHandleDriverState extends State<SelectionHandleDriver> {
+  ZefyrScope _scope;
+
   /// Current document selection.
   TextSelection get selection => _selection;
   TextSelection _selection;
@@ -327,7 +329,18 @@ class _SelectionHandleDriverState extends State<SelectionHandleDriver> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     final scope = ZefyrScope.of(context);
-    _selection = scope.selection;
+    if (_scope != scope) {
+      _scope?.removeListener(_handleScopeChange);
+      _scope = scope;
+      _scope.addListener(_handleScopeChange);
+    }
+    _selection = _scope.selection;
+  }
+
+  @override
+  void dispose() {
+    _scope?.removeListener(_handleScopeChange);
+    super.dispose();
   }
 
   //
@@ -386,6 +399,12 @@ class _SelectionHandleDriverState extends State<SelectionHandleDriver> {
 
   Offset _dragPosition;
 
+  void _handleScopeChange() {
+    setState(() {
+      _selection = _scope.selection;
+    });
+  }
+
   void _handleDragStart(DragStartDetails details) {
     _dragPosition = details.globalPosition;
   }