Show warning if Block to delete is not found (#1111)

Resolves #1102
codex-team · Apr 25, 2020 · 4a81699 · 4a81699
1 parent 2997ed0
commit 4a81699
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/dist/editor.js b/dist/editor.js
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -5,6 +5,7 @@
 - `Improvements` - TSLint (deprecated) replaced with ESLint, old config changed to [CodeX ESLint Config](https://github.com/codex-team/eslint-config).
 - `Improvements` - Fix many code-style issues, add missed annotations.
 - `Improvements` - Adjusted GitHub action for ESLint.
+- `Improvements` - API: If `blocks.delete` method is called, but no Block is selected, show warning instead of throwing an error [#1102](https://github.com/codex-team/editor.js/issues/1102)
 - `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)
 - `New` *I18n API* — Ability to provide internalization for Editor.js core and tools. [#751](https://github.com/codex-team/editor.js/issues/751)
 - `Fix` - Fixed wrong toolbar icon centering in Firefox [#1120](https://github.com/codex-team/editor.js/pull/1120)

diff --git a/src/components/modules/api/blocks.ts b/src/components/modules/api/blocks.ts
@@ -101,7 +101,13 @@ export default class BlocksAPI extends Module {
    * @param {number} blockIndex - index of Block to delete
    */
   public delete(blockIndex?: number): void {
-    this.Editor.BlockManager.removeBlock(blockIndex);
+    try {
+      this.Editor.BlockManager.removeBlock(blockIndex);
+    } catch (e) {
+      _.logLabeled(e, 'warn');
+
+      return;
+    }
 
     /**
      * in case of last block deletion

diff --git a/src/components/modules/blockManager.ts b/src/components/modules/blockManager.ts
@@ -348,11 +348,16 @@ export default class BlockManager extends Module {
    * Remove block with passed index or remove last
    *
    * @param {number|null} index - index of Block to remove
+   * @throws {Error} if Block to remove is not found
    */
-  public removeBlock(index?: number): void {
-    if (index === undefined) {
-      index = this.currentBlockIndex;
+  public removeBlock(index = this.currentBlockIndex): void {
+    /**
+     * If index is not passed and there is no block selected, show a warning
+     */
+    if (!this.validateIndex(index)) {
+      throw new Error('Can\'t find a Block to remove');
     }
+
     this._blocks.remove(index);
 
     if (this.currentBlockIndex >= index) {