Merge branch 'main' into host-before-input

Author: neSpecc

packages/dom-adapters/src/BlockToolAdapter/index.ts

@@ -1,28 +1,37 @@
 import { isNativeInput } from '@editorjs/dom';
 import {
-  type EditorJSModel,
-  type DataKey,
+  BlockAddedEvent,
+  BlockRemovedEvent,
   createDataKey,
+  type DataKey,
+  type EditorJSModel,
   EventAction,
   EventType,
   IndexBuilder,
   type ModelEvents,
   TextAddedEvent,
   TextRemovedEvent
 } from '@editorjs/model';
+import type { 
+  EventBus,
+  BlockToolAdapter as BlockToolAdapterInterface,
+  CoreConfig,
+  BeforeInputUIEvent,
+  BeforeInputUIEventPayload
+ } from '@editorjs/sdk';
+ import { BeforeInputUIEventName } from '@editorjs/sdk';
 import type { CaretAdapter } from '../CaretAdapter/index.js';
+import type { FormattingAdapter } from '../FormattingAdapter/index.js';
 import {
   findNextHardLineBoundary,
-  findNextWordBoundary, findPreviousHardLineBoundary,
+  findNextWordBoundary,
+  findPreviousHardLineBoundary,
   findPreviousWordBoundary,
   getAbsoluteRangeOffset,
   getBoundaryPointByAbsoluteOffset,
   isNonTextInput
 } from '../utils/index.js';
 import { InputType } from './types/InputType.js';
-import { BeforeInputUIEventName, type BlockToolAdapter as BlockToolAdapterInterface, type CoreConfig } from '@editorjs/sdk';
-import type { FormattingAdapter } from '../FormattingAdapter/index.js';
-import type { BeforeInputUIEvent, BeforeInputUIEventPayload, EventBus } from '@editorjs/sdk';
 
 /**
  * BlockToolAdapter is using inside Block tools to connect browser DOM elements to the model
@@ -578,6 +587,12 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
    * @param key - data key input is attached to
    */
   #handleModelUpdate(event: ModelEvents, input: HTMLElement, key: DataKey): void {
+    if (event instanceof BlockAddedEvent || event instanceof BlockRemovedEvent) {
+      if (event.detail.index.blockIndex! <= this.#blockIndex) {
+        this.#blockIndex += event.detail.action === EventAction.Added ? 1 : -1;
+      }
+    }
+
     const isInputNative = isNativeInput(input);
 
     if (isInputNative === true) {