From 8c72cd5efb8360b18af419a0361b5bfc96dfb6b1 Mon Sep 17 00:00:00 2001 From: James Jackson Date: Mon, 13 Aug 2018 12:27:23 +0100 Subject: [PATCH] Prevent error when there's no activeElement during undo/redo --- src/canvas/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/canvas/index.js b/src/canvas/index.js index a14aad27c..42aea7942 100644 --- a/src/canvas/index.js +++ b/src/canvas/index.js @@ -363,7 +363,11 @@ module.exports = () => { * @return {Boolean} */ isInputFocused() { - return this.getFrameEl().contentDocument.activeElement.tagName !== 'BODY'; + let contentDocument = this.getFrameEl().contentDocument; + return ( + contentDocument.activeElement && + contentDocument.activeElement.tagName !== 'BODY' + ); }, /**