Resolved merge conflicts

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

@@ -77,6 +77,8 @@ class RenderEditableProxyBox extends RenderBox
     this.child = child;
   }
 
+  bool _isDirty = true;
+
   ContainerNode get node => _node;
   ContainerNode _node;
   void set node(ContainerNode value) {
@@ -166,6 +168,7 @@ class RenderEditableProxyBox extends RenderBox
     super.attach(owner);
     _showCursor.addListener(markNeedsCursorPaint);
     _renderContext.addBox(this);
+    _renderContext.markDirty(this, _isDirty);
   }
 
   @override
@@ -182,12 +185,14 @@ class RenderEditableProxyBox extends RenderBox
     _caretPainter.layout(preferredLineHeight);
     // Indicate to render context that this object can be used by other
     // layers (selection overlay, for instance).
+    _isDirty = false;
     _renderContext.markDirty(this, false);
   }
 
   @override
   void markNeedsLayout() {
     // Temporarily remove this object from the render context.
+    _isDirty = true;
     _renderContext.markDirty(this, true);
     super.markNeedsLayout();
   }

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

@@ -103,6 +103,7 @@ class ZefyrRenderContext extends ChangeNotifier {
   /// method picks a box with shortest vertical distance to this [point].
   RenderEditableProxyBox closestBoxForGlobalPoint(Offset point) {
     assert(!_disposed);
+    if (_activeBoxes.isEmpty) return null;
     RenderEditableProxyBox box = boxForGlobalPoint(point);
     if (box != null) return box;
 

packages/zefyr/test/rendering/render_editable_paragraph_test.dart

@@ -1,41 +0,0 @@
-// Copyright (c) 2018, the Zefyr project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-import 'dart:ui';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:zefyr/src/widgets/render_context.dart';
-import 'package:zefyr/src/widgets/rich_text.dart';
-import 'package:zefyr/zefyr.dart';
-
-void main() {
-  group('$RenderZefyrParagraph', () {
-    final doc = new NotusDocument();
-    doc.insert(0, 'This House Is A Circus');
-    final text = new TextSpan(text: 'This House Is A Circus');
-
-    ZefyrRenderContext renderContext;
-    RenderZefyrParagraph p;
-
-    setUp(() {
-      WidgetsFlutterBinding.ensureInitialized();
-      renderContext = new ZefyrRenderContext();
-      p = new RenderZefyrParagraph(
-        text,
-        node: doc.root.children.first as LineNode,
-        textDirection: TextDirection.ltr,
-      );
-    });
-
-    test('it registers with viewport', () {
-      var owner = new PipelineOwner();
-      expect(renderContext.active, isNot(contains(p)));
-      p.attach(owner);
-      expect(renderContext.dirty, contains(p));
-      p.layout(new BoxConstraints());
-      expect(renderContext.active, contains(p));
-    }, skip: 'TODO: move to RenderEditableProxyBox');
-  });
-}

packages/zefyr/test/rendering/render_editable_proxy_box_test.dart

@@ -0,0 +1,63 @@
+// Copyright (c) 2018, the Zefyr project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:zefyr/src/widgets/editable_box.dart';
+import 'package:zefyr/src/widgets/render_context.dart';
+import 'package:zefyr/src/widgets/rich_text.dart';
+import 'package:zefyr/zefyr.dart';
+
+void main() {
+  group('$RenderEditableProxyBox', () {
+    final doc = NotusDocument();
+    doc.insert(0, 'This House Is A Circus');
+    final text = TextSpan(text: 'This House Is A Circus');
+
+    ZefyrRenderContext renderContext;
+    RenderEditableProxyBox p;
+
+    setUp(() {
+      WidgetsFlutterBinding.ensureInitialized();
+      renderContext = ZefyrRenderContext();
+      final rt = RenderEditableParagraph(
+        text,
+        node: doc.root.children.first,
+        textDirection: TextDirection.ltr,
+      );
+      p = RenderEditableProxyBox(
+        child: rt,
+        node: doc.root.children.first,
+        layerLink: LayerLink(),
+        renderContext: renderContext,
+        showCursor: ValueNotifier<bool>(true),
+        selection: TextSelection.collapsed(offset: 0),
+        selectionColor: Color(0),
+      );
+    });
+
+    test('it registers with render context', () {
+      var owner = new PipelineOwner();
+      expect(renderContext.active, isNot(contains(p)));
+      p.attach(owner);
+      expect(renderContext.dirty, contains(p));
+      p.layout(BoxConstraints());
+      expect(renderContext.active, contains(p));
+
+      p.detach();
+      expect(renderContext.active, isNot(contains(p)));
+      p.attach(owner);
+      expect(renderContext.active, contains(p));
+
+      p.markNeedsLayout();
+      p.detach();
+      expect(renderContext.active, isNot(contains(p)));
+
+      p.layout(BoxConstraints());
+      expect(renderContext.active, contains(p));
+    });
+  });
+}