From 2ce581ecb2bb025493819ae3fcb99534c16c9a0e Mon Sep 17 00:00:00 2001
From: Cory Forsyth <cory.forsyth@gmail.com>
Date: Fri, 15 Jul 2016 15:58:29 -0400
Subject: [PATCH] Ensure the activeElement is set after rendering cursor

Fixes an issue on Firefox where it blurs the editor element after
`editor.insertCard`
---
 src/js/utils/cursor.js           |  3 +++
 tests/unit/editor/editor-test.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/js/utils/cursor.js b/src/js/utils/cursor.js
index a203fce1e..3403ab3ae 100644
--- a/src/js/utils/cursor.js
+++ b/src/js/utils/cursor.js
@@ -116,6 +116,9 @@ const Cursor = class Cursor {
     const { node:headNode, offset:headOffset } = this._findNodeForPosition(head),
           { node:tailNode, offset:tailOffset } = this._findNodeForPosition(tail);
     this._moveToNode(headNode, headOffset, tailNode, tailOffset, direction);
+    if (document.activeElement !== this.editor.element) {
+      this.editor.element.focus();
+    }
   }
 
   get selection() {
diff --git a/tests/unit/editor/editor-test.js b/tests/unit/editor/editor-test.js
index f87a01cfd..373605111 100644
--- a/tests/unit/editor/editor-test.js
+++ b/tests/unit/editor/editor-test.js
@@ -667,7 +667,35 @@ test('#insertCard returns card object', (assert) => {
     return post();
   }, {cards: [card]});
 
+  Helpers.dom.selectRange(editorElement, 0, editorElement, 0);
+
+  assert.ok(editor.hasCursor(), 'precond - editor has cursor');
+  assert.ok(editor.post.isBlank, 'precond - post is blank');
+
   const insertedCard = editor.insertCard('the-card');
 
+  assert.ok(!!insertedCard, 'insertedCard is present');
   assert.equal(editor.post.sections.tail, insertedCard, 'returned card is the inserted card');
 });
+
+test('#insertCard focuses the cursor at the end of the card', (assert) => {
+  let card = {
+    name: 'the-card',
+    type: 'dom',
+    render() {
+    }
+  };
+
+  editor = Helpers.mobiledoc.renderInto(editorElement, ({post}) => {
+    return post();
+  }, {cards: [card]});
+
+  Helpers.dom.selectRange(editorElement, 0, editorElement, 0);
+
+  let insertedCard = editor.insertCard('the-card');
+
+  let range = editor.range;
+  assert.positionIsEqual(range.head, insertedCard.tailPosition(), 'range head on card tail');
+  assert.positionIsEqual(range.tail, insertedCard.tailPosition(), 'range tail on card tail');
+  assert.ok(document.activeElement === editorElement, 'editor element retains focus');
+});