lint

Author: neSpecc

packages/core/src/components/BlockManager.ts

@@ -173,7 +173,7 @@ export class BlocksManager {
      * without additional storing inputs in the caret adapter
      * Thus, it won't care about block index change (block removed, block added, block moved)
      */
-    this.#caretAdapter.attachBlock(blockToolAdapter, index);
+    this.#caretAdapter.attachBlock(blockToolAdapter);
 
     const tool = this.#toolsManager.blockTools.get(data.name);
 

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

@@ -11,14 +11,14 @@ import {
   type ModelEvents,
   TextAddedEvent,
   TextRemovedEvent,
-  Index
+  type Index
 } from '@editorjs/model';
 import type {
   EventBus,
   BlockToolAdapter as BlockToolAdapterInterface,
   CoreConfig,
   BeforeInputUIEvent,
-  BeforeInputUIEventPayload,
+  BeforeInputUIEventPayload
 } from '@editorjs/sdk';
 import { BeforeInputUIEventName } from '@editorjs/sdk';
 import type { CaretAdapter } from '../CaretAdapter/index.js';
@@ -306,6 +306,7 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
      */
     if (start !== end) {
       this.#model.removeText(this.#config.userId, this.#blockIndex, key, start, end);
+
       return;
     }
 
@@ -359,18 +360,42 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
     this.#model.removeText(this.#config.userId, this.#blockIndex, key, start, end);
   }
 
+  /**
+   * True if input contains only the start of the cross-input selection
+   *
+   * @param input - input element
+   * @param range - selection range
+   */
   #isInputContainsOnlyStartOfSelection(input: HTMLElement, range: StaticRange): boolean {
     return input.contains(range.startContainer) && !input.contains(range.endContainer);
   }
 
+  /**
+   * True if input contains only the end of the cross-input selection
+   *
+   * @param input - input element
+   * @param range - selection range
+   */
   #isInputContainsOnlyEndOfSelection(input: HTMLElement, range: StaticRange): boolean {
     return input.contains(range.endContainer) && !input.contains(range.startContainer);
   }
 
+  /**
+   * True if input contains the whole selection (not cross-input)
+   *
+   * @param input - input element
+   * @param range - selection range
+   */
   #isInputContainsWholeSelection(input: HTMLElement, range: StaticRange): boolean {
     return input.contains(range.startContainer) && input.contains(range.endContainer);
   }
 
+  /**
+   * True if input is in between cross-input selection
+   *
+   * @param input - input element
+   * @param range - selection range
+   */
   #isInputInBetweenSelection(input: HTMLElement, range: StaticRange): boolean {
     return !this.#isInputContainsWholeSelection(input, range) &&
            !this.#isInputContainsOnlyStartOfSelection(input, range) &&
@@ -397,22 +422,15 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
     let end: number;
     let newCaretIndex: number | null = null;
 
-    // console.log('delete in input', input);
-
     /**
      * If range is fully contained within this input
      */
     if (this.#isInputContainsWholeSelection(input, range)) {
-      // console.log('range is fully contained within this input');
-
       start = getAbsoluteRangeOffset(input, range.startContainer, range.startOffset);
       end = getAbsoluteRangeOffset(input, range.endContainer, range.endOffset);
 
       this.#model.removeText(this.#config.userId, this.#blockIndex, key, start, end);
-
-      // newCaretIndex = start;
     } else if (this.#isInputContainsOnlyStartOfSelection(input, range)) {
-      // console.log('only start is in this input');
       /**
        * If only start is in this input, delete from start to end of input
        */
@@ -425,20 +443,18 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
         newCaretIndex = start;
       }
     } else if (this.#isInputContainsOnlyEndOfSelection(input, range)) {
-      // console.log('only end is in this input');
       /**
        * If only end is in this input, delete from start of input to end
-      */
-     start = 0;
-     end = getAbsoluteRangeOffset(input, range.endContainer, range.endOffset);
+       */
+      start = 0;
+      end = getAbsoluteRangeOffset(input, range.endContainer, range.endOffset);
 
+      const removedText = this.#model.removeText(this.#config.userId, this.#blockIndex, key, start, end);
 
-     const removedText = this.#model.removeText(this.#config.userId, this.#blockIndex, key, start, end);
-     if (isRestoreCaretToTheEnd) {
-       newCaretIndex = end - removedText.length;
-     }
+      if (isRestoreCaretToTheEnd) {
+        newCaretIndex = end - removedText.length;
+      }
     } else if (this.#isInputInBetweenSelection(input, range)) {
-      // console.log('range spans across this input');
       /**
        * If range spans across this input, delete everything
        */
@@ -448,7 +464,6 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
     }
 
     if (newCaretIndex !== null) {
-      console.info('restore caret: block %o index %o caret %o', this.#blockIndex, newCaretIndex);
       this.#caretAdapter.updateIndex(
         new IndexBuilder()
           .addBlockIndex(this.#blockIndex)
@@ -544,7 +559,7 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
           (this.#isInputContainsOnlyStartOfSelection(input, range) || this.#isInputContainsWholeSelection(input, range)) &&
           !payload.isCrossInputSelection
         ) {
-          const start = isInputNative ?
+          start = isInputNative ?
             (input as HTMLInputElement | HTMLTextAreaElement).selectionStart as number :
             getAbsoluteRangeOffset(input, range.startContainer, range.startOffset);
 
@@ -783,6 +798,8 @@ export class BlockToolAdapter implements BlockToolAdapterInterface {
 
   /**
    * Allows access to a particular input by key
+   *
+   * @param key - data key of the input
    */
   public getInput(key: DataKey): HTMLElement | undefined {
     return this.#attachedInputs.get(key);

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

@@ -1,4 +1,6 @@
 import { isNativeInput } from '@editorjs/dom';
+import type {
+  ModelEvents } from '@editorjs/model';
 import {
   BlockRemovedEvent,
   type Caret,
@@ -7,7 +9,6 @@ import {
   EventType,
   Index,
   IndexBuilder,
-  ModelEvents,
   type TextRange,
   createDataKey
 } from '@editorjs/model';
@@ -90,9 +91,8 @@ export class CaretAdapter extends EventTarget {
    * Adds block to the caret adapter
    *
    * @param block - block tool adapter
-   * @param index - index of the block in the model tree
    */
-  public attachBlock(block: BlockToolAdapter, index: Index): void {
+  public attachBlock(block: BlockToolAdapter): void {
     this.#blocks.push(block);
   }
 
@@ -103,10 +103,12 @@ export class CaretAdapter extends EventTarget {
    */
   public detachBlock(index: Index): void {
     const block = this.getBlock(index);
+
     if (block) {
-      const index = this.#blocks.indexOf(block);
-      if (index !== -1) {
-        this.#blocks.splice(index, 1);
+      const blockIndex = this.#blocks.indexOf(block);
+
+      if (blockIndex !== -1) {
+        this.#blocks.splice(blockIndex, 1);
       }
     }
   }
@@ -148,6 +150,7 @@ export class CaretAdapter extends EventTarget {
     }
 
     const blockIndex = index.blockIndex;
+
     if (blockIndex === undefined) {
       return undefined;
     }
@@ -159,11 +162,12 @@ export class CaretAdapter extends EventTarget {
    * Finds input by block index and data key
    *
    * @param blockIndex - index of the block
-   * @param dataKey - data key of the input
+   * @param dataKeyRaw - data key of the input
    * @returns input element or undefined if not found
    */
   public findInput(blockIndex: number, dataKeyRaw: string): HTMLElement | undefined {
     const builder = new IndexBuilder();
+
     builder.addBlockIndex(blockIndex);
     const block = this.getBlock(builder.build());
 
@@ -172,6 +176,7 @@ export class CaretAdapter extends EventTarget {
     }
 
     const dataKey = createDataKey(dataKeyRaw);
+
     return block.getInput(dataKey);
   }
 
@@ -208,7 +213,10 @@ export class CaretAdapter extends EventTarget {
 
           const builder = new IndexBuilder();
 
-          builder.from(block.getBlockIndex()).addDataKey(key).addTextRange(textRange);
+          builder
+            .from(block.getBlockIndex())
+            .addDataKey(key)
+            .addTextRange(textRange);
 
           this.updateIndex(builder.build());
 
@@ -230,7 +238,10 @@ export class CaretAdapter extends EventTarget {
 
         const builder = new IndexBuilder();
 
-        builder.from(block.getBlockIndex()).addDataKey(key).addTextRange(textRange);
+        builder
+          .from(block.getBlockIndex())
+          .addDataKey(key)
+          .addTextRange(textRange);
 
         this.updateIndex(builder.build());