Skip to content

Commit 461f9a5

Browse files
authoredNov 30, 2019
Issue 869 (#963)
1 parent ea3c767 commit 461f9a5

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed
 

‎dist/editor.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
- `Improvements` — Inline Toolbar design improved
66
- `Improvements` — Conversion Toolbar now included in the Inline Toolbar [#853](https://github.com/codex-team/editor.js/issues/853)
7+
`New` *API* — Block [lifecycle hooks](tools.md#block-lifecycle-hooks)
8+
- `Fix` — On selection from end to start backspace is working as expected now [#869](https://github.com/codex-team/editor.js/issues/869)
79
`Fix` — Fix flipper with empty dom iterator [#926](https://github.com/codex-team/editor.js/issues/926)
810

911
### 2.15.1

‎src/components/modules/blockEvents.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,10 @@ export default class BlockEvents extends Module {
374374
}
375375

376376
const isFirstBlock = BlockManager.currentBlockIndex === 0;
377-
const canMergeBlocks = Caret.isAtStart && currentBlock.currentInput === currentBlock.firstInput && !isFirstBlock;
377+
const canMergeBlocks = Caret.isAtStart &&
378+
SelectionUtils.isCollapsed &&
379+
currentBlock.currentInput === currentBlock.firstInput &&
380+
!isFirstBlock;
378381

379382
if (canMergeBlocks) {
380383
/**

0 commit comments

Comments
 (0)
Please sign in to comment.