Merge pull request #1359 from nojacko/dev

Prevent error when there's no activeElement during undo/redo
GrapesJS · Aug 13, 2018 · 1cac4b1 · 1cac4b1
2 parents 81ecb2b + 8c72cd5
commit 1cac4b1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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'
+      );
     },
 
     /**