From ba45df0aba9df616ceaf8bb073847d2f2297e6ae Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 26 Jun 2018 22:47:11 +0200
Subject: [PATCH] Create dedicated commands for canvas-clear and
 component-delete

---
 src/commands/index.js                | 56 ++++++++--------------------
 src/commands/view/CanvasClear.js     |  6 +++
 src/commands/view/ComponentRemove.js | 25 +++++++++++++
 3 files changed, 47 insertions(+), 40 deletions(-)
 create mode 100644 src/commands/view/CanvasClear.js
 create mode 100644 src/commands/view/ComponentRemove.js

diff --git a/src/commands/index.js b/src/commands/index.js
index b3874e753..8d523a983 100644
--- a/src/commands/index.js
+++ b/src/commands/index.js
@@ -38,7 +38,7 @@
  * },
  * ...
  */
-import { isFunction, isArray } from 'underscore';
+import { isFunction } from 'underscore';
 
 module.exports = () => {
   let em;
@@ -197,45 +197,21 @@ module.exports = () => {
       // Core commands
       defaultCommands['core:undo'] = e => e.UndoManager.undo();
       defaultCommands['core:redo'] = e => e.UndoManager.redo();
-      defaultCommands['core:copy'] = require('./view/CopyComponent').run;
-      defaultCommands['core:paste'] = require('./view/PasteComponent').run;
-      defaultCommands[
-        'core:component-next'
-      ] = require('./view/ComponentNext').run;
-      defaultCommands[
-        'core:component-prev'
-      ] = require('./view/ComponentPrev').run;
-      defaultCommands[
-        'core:component-enter'
-      ] = require('./view/ComponentEnter').run;
-      defaultCommands[
-        'core:component-exit'
-      ] = require('./view/ComponentExit').run;
-      defaultCommands['core:canvas-clear'] = e => {
-        e.DomComponents.clear();
-        e.CssComposer.clear();
-      };
-      defaultCommands['core:component-delete'] = (ed, sender, opts = {}) => {
-        let components = opts.component || ed.getSelectedAll();
-        components = isArray(components) ? [...components] : [components];
-
-        // It's important to deselect components first otherwise,
-        // with undo, the component will be set with the wrong `collection`
-        ed.select(null);
-
-        components.forEach(component => {
-          if (!component || !component.get('removable')) {
-            console.warn('The element is not removable', component);
-            return;
-          }
-          if (component) {
-            const coll = component.collection;
-            coll && coll.remove(component);
-          }
-        });
-
-        return components;
-      };
+      [
+        ['copy', 'CopyComponent'],
+        ['paste', 'PasteComponent'],
+        ['component-next', 'ComponentNext'],
+        ['component-prev', 'ComponentPrev'],
+        ['component-enter', 'ComponentEnter'],
+        ['component-exit', 'ComponentExit'],
+        ['canvas-clear', 'CanvasClear'],
+        ['component-delete', 'ComponentRemove']
+      ].forEach(
+        item =>
+          (defaultCommands[`core:${item[0]}`] = require(`./view/${
+            item[1]
+          }`).run)
+      );
 
       if (c.em) c.model = c.em.get('Canvas');
 
diff --git a/src/commands/view/CanvasClear.js b/src/commands/view/CanvasClear.js
new file mode 100644
index 000000000..12102fc7d
--- /dev/null
+++ b/src/commands/view/CanvasClear.js
@@ -0,0 +1,6 @@
+module.exports = {
+  run(ed) {
+    ed.DomComponents.clear();
+    ed.CssComposer.clear();
+  }
+};
diff --git a/src/commands/view/ComponentRemove.js b/src/commands/view/ComponentRemove.js
new file mode 100644
index 000000000..b8e75b350
--- /dev/null
+++ b/src/commands/view/ComponentRemove.js
@@ -0,0 +1,25 @@
+import { isArray } from 'underscore';
+
+module.exports = {
+  run(ed, sender, opts = {}) {
+    let components = opts.component || ed.getSelectedAll();
+    components = isArray(components) ? [...components] : [components];
+
+    // It's important to deselect components first otherwise,
+    // with undo, the component will be set with the wrong `collection`
+    ed.select(null);
+
+    components.forEach(component => {
+      if (!component || !component.get('removable')) {
+        console.warn('The element is not removable', component);
+        return;
+      }
+      if (component) {
+        const coll = component.collection;
+        coll && coll.remove(component);
+      }
+    });
+
+    return components;
+  }
+};