Allow navigate next from last non-initial block (#1110)

Resolves #1103
codex-team · Apr 25, 2020 · ae8591c · ae8591c
1 parent 5218a6a
commit ae8591c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/dist/editor.js b/dist/editor.js
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,15 +2,16 @@
 
 ### 2.18
 
+- `New` *I18n API* — Ability to provide internalization for Editor.js core and tools. [#751](https://github.com/codex-team/editor.js/issues/751)
 - `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` - Blocks 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)
 - `Improvements` - Blocks API: allow deletion of blocks by specifying block index via `blocks.delete(index)`.
+- `Improvements` - UX: Navigate next Block from the last non-initial one creates new initial Block now [1103](https://github.com/codex-team/editor.js/issues/1103)
+- `Improvements` - Improve performance of DOM traversing at the `isEmpty()` method [#1095](https://github.com/codex-team/editor.js/issues/1095)
 - `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)
-- `Improvements` - Improve performance of DOM traversing at the `isEmpty()` method [#1095](https://github.com/codex-team/editor.js/issues/1095)
 - `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)
 
 ### 2.17

diff --git a/src/components/modules/caret.ts b/src/components/modules/caret.ts
@@ -397,17 +397,31 @@ export default class Caret extends Module {
    * @returns {boolean}
    */
   public navigateNext(force = false): boolean {
-    const { currentBlock, nextContentfulBlock } = this.Editor.BlockManager;
+    const { BlockManager, Tools } = this.Editor;
+    const { currentBlock, nextContentfulBlock } = BlockManager;
     const { nextInput } = currentBlock;
 
-    if (!nextContentfulBlock && !nextInput) {
-      return false;
+    let nextBlock = nextContentfulBlock;
+
+    if (!nextBlock && !nextInput) {
+      /**
+       * If there is no nextBlock and currentBlock is initial, do not navigate
+       */
+      if (Tools.isInitial(currentBlock.tool)) {
+        return false;
+      }
+
+      /**
+       * If there is no nextBlock, but currentBlock is not initial,
+       * insert new initial block at the end and navigate to it
+       */
+      nextBlock = BlockManager.insertAtEnd();
     }
 
     if (force || this.isAtEnd) {
       /** If next Tool`s input exists, focus on it. Otherwise set caret to the next Block */
       if (!nextInput) {
-        this.setToBlock(nextContentfulBlock, this.positions.START);
+        this.setToBlock(nextBlock, this.positions.START);
       } else {
         this.setToInput(nextInput, this.positions.START);
       }