Hotfix/issue1133 selection shortcut removed on editor destroy (#1140)

* Removed shortcut CMD+A on editor destroy #1133 * Removed patch version and made code cleaner #1133 * lint error fixes #1133 Co-authored-by: Sisir <sisir@hellosivi.com> Co-authored-by: George Berezhnoy <gohabereg@gmail.com>
codex-team · neSpecc · Aug 18, 2020 · Apr 11, 2020 · Apr 18, 2020 · Apr 20, 2020
commit 7c3bf760502ee52bf7d73693a95dd3c7a3cea6e4
@@ -12,11 +12,13 @@
 - `Improvements` - Improve performance of DOM traversing at the `isEmpty()` method [#1095](https://github.com/codex-team/editor.js/issues/1095)
 - `Improvements` - Add code of conduct
 - `Improvements` - Disabled useCapture flag for a block keydown handling. That will allow plugins to override keydown and stop event propagation, for example, to make own Tab behavior.
+- `Improvements` - All modules now might have `destroy` method called on Editor.js destroy
 - `Fix` - Editor's styles won't be appended to the `<head>` when another instance have already do that [#1079](https://github.com/codex-team/editor.js/issues/1079)
 - `Fix` - Fixed wrong toolbar icon centering in Firefox [#1120](https://github.com/codex-team/editor.js/pull/1120)
 - `Fix` - Toolbox: Tool's order in Toolbox now saved in accordance with `tools` object keys order [#1073](https://github.com/codex-team/editor.js/issues/1073)
 - `Fix` - Setting `autofocus` config property to `true` cause adding `.ce-block--focused` for the autofocused block  [#1073](https://github.com/codex-team/editor.js/issues/1124)
 - `Fix` - Public getter `shortcut` now works for Inline Tools [#1132](https://github.com/codex-team/editor.js/issues/1132)
+- `Fix` - `CMD+A` handler removed after Editor.js destroy [#1133](https://github.com/codex-team/editor.js/issues/1133)
 
 ### 2.17
 

diff --git a/src/codex.ts b/src/codex.ts
@@ -9,6 +9,7 @@ import '@babel/register';
 
 import 'components/polyfills';
 import Core from './components/core';
+import * as _ from './components/utils';
 
 declare const VERSION: string;
 
@@ -81,9 +82,13 @@ export default class EditorJS {
   public exportAPI(editor: Core): void {
     const fieldsToExport = [ 'configuration' ];
     const destroy = (): void => {
-      editor.moduleInstances.Listeners.removeAll();
-      editor.moduleInstances.UI.destroy();
-      editor.moduleInstances.ModificationsObserver.destroy();
+      Object.values(editor.moduleInstances)
+        .forEach((moduleInstance) => {
+          if (_.isFunction(moduleInstance.destroy)) {
+            moduleInstance.destroy();
+          }
+        });
+
       editor = null;
 
       for (const field in this) {

diff --git a/src/components/modules/blockSelection.ts b/src/components/modules/blockSelection.ts
@@ -291,6 +291,17 @@ export default class BlockSelection extends Module {
     this.Editor.InlineToolbar.close();
   }
 
+  /**
+   * Module destruction
+   * De-registers Shortcut CMD+A
+   */
+  public destroy(): void {
+    const { Shortcuts } = this.Editor;
+
+    /** Selection shortcut */
+    Shortcuts.remove('CMD+A');
+  }
+
   /**
    * First CMD+A selects all input content by native behaviour,
    * next CMD+A keypress selects all blocks

diff --git a/src/components/modules/listeners.ts b/src/components/modules/listeners.ts
@@ -160,6 +160,13 @@ export default class Listeners extends Module {
     this.allListeners = [];
   }
 
+  /**
+   * Module cleanup on destruction
+   */
+  public destroy(): void {
+    this.removeAll();
+  }
+
   /**
    * Search method: looks for listener by passed element
    *