@jackuait/blok 0.10.0-beta.5 → 0.10.0-beta.7

package/src/components/inline-tools/inline-tool-code.ts

@@ -0,0 +1,399 @@
+import type { InlineTool, SanitizerConfig } from '../../../types';
+import type { MenuConfig } from '../../../types/tools';
+import { IconCode } from '../icons';
+
+import {
+  isRangeFormatted,
+  findFormattingAncestor,
+  collectFormattingAncestors,
+} from './utils/formatting-range-utils';
+
+/**
+ * Check if an element is a code tag (<code>)
+ * @param element - The element to check
+ */
+const isCodeTag = (element: Element): boolean => {
+  return element.tagName === 'CODE';
+};
+
+/**
+ * Code Inline Tool
+ *
+ * Inline Toolbar Tool
+ *
+ * Style selected text with inline code
+ */
+export class CodeInlineTool implements InlineTool {
+  /**
+   * Specifies Tool as Inline Toolbar Tool
+   * @returns {boolean}
+   */
+  public static isInline = true;
+
+  /**
+   * Title for the Inline Tool
+   */
+  public static title = 'Code';
+
+  /**
+   * Translation key for i18n
+   */
+  public static titleKey = 'inlineCode';
+
+  /**
+   * Sanitizer Rule
+   * Leave <code> tags
+   * @returns {object}
+   */
+  public static get sanitize(): SanitizerConfig {
+    return {
+      code: {},
+    } as SanitizerConfig;
+  }
+
+  /**
+   * Create button for Inline Toolbar
+   */
+  public render(): MenuConfig {
+    return {
+      icon: IconCode,
+      name: 'code',
+      onActivate: () => {
+        this.toggleCode();
+      },
+      isActive: () => {
+        const selection = window.getSelection();
+
+        return selection ? this.isSelectionVisuallyCode(selection) : false;
+      },
+    };
+  }
+
+  /**
+   * Shortcut for code tool
+   */
+  public static shortcut = 'CMD+E';
+
+  /**
+   * Apply or remove code formatting using modern Selection API
+   */
+  private toggleCode(): void {
+    const selection = window.getSelection();
+
+    if (!selection || selection.rangeCount === 0) {
+      return;
+    }
+
+    const range = selection.getRangeAt(0);
+
+    if (range.collapsed) {
+      this.toggleCollapsedCode(range, selection);
+
+      return;
+    }
+
+    const shouldUnwrap = this.isRangeCode(range, { ignoreWhitespace: true });
+
+    if (shouldUnwrap) {
+      this.unwrapCodeTags(range);
+    } else {
+      this.wrapWithCode(range);
+    }
+  }
+
+  /**
+   * Handle toggle for collapsed selection (caret)
+   * @param range - Current range
+   * @param selection - Current selection
+   */
+  private toggleCollapsedCode(range: Range, selection: Selection): void {
+    const isCode = this.isRangeCode(range, { ignoreWhitespace: true });
+
+    if (isCode) {
+      const textNode = document.createTextNode('\u200B');
+
+      range.insertNode(textNode);
+      range.selectNode(textNode);
+      this.unwrapCodeTags(range);
+
+      const newRange = document.createRange();
+
+      newRange.setStart(textNode, 1);
+      newRange.setEnd(textNode, 1);
+
+      selection.removeAllRanges();
+      selection.addRange(newRange);
+    } else {
+      const code = document.createElement('code');
+      const textNode = document.createTextNode('\u200B');
+
+      code.appendChild(textNode);
+      range.insertNode(code);
+
+      const newRange = document.createRange();
+
+      newRange.setStart(textNode, 1);
+      newRange.setEnd(textNode, 1);
+
+      selection.removeAllRanges();
+      selection.addRange(newRange);
+    }
+  }
+
+  /**
+   * Check if current selection is within a code tag
+   * @param selection - The Selection object to check
+   */
+  private isSelectionVisuallyCode(selection: Selection): boolean {
+    if (selection.rangeCount === 0) {
+      return false;
+    }
+
+    const range = selection.getRangeAt(0);
+
+    return this.isRangeCode(range, { ignoreWhitespace: true });
+  }
+
+  /**
+   * Check if a range contains code text
+   * @param range - The range to check
+   * @param options - Options for checking code status
+   */
+  private isRangeCode(range: Range, options: { ignoreWhitespace: boolean }): boolean {
+    return isRangeFormatted(range, isCodeTag, options);
+  }
+
+  /**
+   * Wrap selection with <code> tag
+   * @param range - The Range object containing the selection to wrap
+   */
+  private wrapWithCode(range: Range): void {
+    const html = this.getRangeHtmlWithoutCode(range);
+    const insertedRange = this.replaceRangeWithHtml(range, `<code>${html}</code>`);
+    const selection = window.getSelection();
+
+    if (selection && insertedRange) {
+      selection.removeAllRanges();
+      selection.addRange(insertedRange);
+    }
+  }
+
+  /**
+   * Remove code tags (<code>) while preserving content
+   * @param range - The Range object containing the selection to unwrap
+   */
+  private unwrapCodeTags(range: Range): void {
+    const codeAncestors = this.collectCodeAncestors(range);
+    const selection = window.getSelection();
+
+    if (!selection) {
+      return;
+    }
+
+    const marker = document.createElement('span');
+    const fragment = range.extractContents();
+
+    marker.appendChild(fragment);
+    this.removeNestedCode(marker);
+
+    range.insertNode(marker);
+
+    const markerRange = document.createRange();
+
+    markerRange.selectNodeContents(marker);
+    selection.removeAllRanges();
+    selection.addRange(markerRange);
+
+    for (; ;) {
+      const currentCode = this.findCodeElement(marker);
+
+      if (!currentCode) {
+        break;
+      }
+
+      this.moveMarkerOutOfCode(marker, currentCode);
+    }
+
+    const firstChild = marker.firstChild;
+    const lastChild = marker.lastChild;
+
+    this.unwrapElement(marker);
+
+    const finalRange = firstChild && lastChild ? (() => {
+      const newRange = document.createRange();
+
+      newRange.setStartBefore(firstChild);
+      newRange.setEndAfter(lastChild);
+
+      selection.removeAllRanges();
+      selection.addRange(newRange);
+
+      return newRange;
+    })() : undefined;
+
+    if (!finalRange) {
+      selection.removeAllRanges();
+    }
+
+    codeAncestors.forEach((element) => {
+      if (element.textContent.length === 0) {
+        element.remove();
+      }
+    });
+  }
+
+  /**
+   * Find a code element in the parent chain
+   * @param node - The node to start searching from
+   */
+  private findCodeElement(node: Node | null): HTMLElement | null {
+    return findFormattingAncestor(node, isCodeTag);
+  }
+
+  /**
+   * Collect all code ancestor elements within a range
+   * @param range - The range to search for code ancestors
+   */
+  private collectCodeAncestors(range: Range): HTMLElement[] {
+    return collectFormattingAncestors(range, isCodeTag);
+  }
+
+  /**
+   * Get HTML content of a range with code tags removed
+   * @param range - The range to extract HTML from
+   */
+  private getRangeHtmlWithoutCode(range: Range): string {
+    const contents = range.cloneContents();
+
+    this.removeNestedCode(contents);
+
+    const container = document.createElement('div');
+
+    container.appendChild(contents);
+
+    return container.innerHTML;
+  }
+
+  /**
+   * Remove nested code tags from a root node
+   * @param root - The root node to process
+   */
+  private removeNestedCode(root: ParentNode): void {
+    const codeNodes = root.querySelectorAll('code');
+
+    codeNodes.forEach((node) => {
+      this.unwrapElement(node);
+    });
+  }
+
+  /**
+   * Unwrap an element by moving its children to the parent
+   * @param element - The element to unwrap
+   */
+  private unwrapElement(element: Element): void {
+    const parent = element.parentNode;
+
+    if (!parent) {
+      element.remove();
+
+      return;
+    }
+
+    while (element.firstChild) {
+      parent.insertBefore(element.firstChild, element);
+    }
+
+    parent.removeChild(element);
+  }
+
+  /**
+   * Replace the current range contents with provided HTML snippet
+   * @param range - Range to replace
+   * @param html - HTML string to insert
+   */
+  private replaceRangeWithHtml(range: Range, html: string): Range | undefined {
+    const fragment = this.createFragmentFromHtml(html);
+    const firstInserted = fragment.firstChild ?? null;
+    const lastInserted = fragment.lastChild ?? null;
+
+    range.deleteContents();
+
+    if (!firstInserted || !lastInserted) {
+      return;
+    }
+
+    range.insertNode(fragment);
+
+    const newRange = document.createRange();
+
+    newRange.setStartBefore(firstInserted);
+    newRange.setEndAfter(lastInserted);
+
+    return newRange;
+  }
+
+  /**
+   * Convert an HTML snippet to a document fragment
+   * @param html - HTML string to convert
+   */
+  private createFragmentFromHtml(html: string): DocumentFragment {
+    const template = document.createElement('template');
+
+    template.innerHTML = html;
+
+    return template.content;
+  }
+
+  /**
+   * Move a temporary marker element outside of a code ancestor while preserving content order
+   * @param marker - Marker element wrapping the selection contents
+   * @param codeElement - Code ancestor containing the marker
+   */
+  private moveMarkerOutOfCode(marker: HTMLElement, codeElement: HTMLElement): void {
+    const parent = codeElement.parentNode;
+
+    if (!parent) {
+      return;
+    }
+
+    // Remove empty text nodes to ensure accurate child count
+    Array.from(codeElement.childNodes).forEach((node) => {
+      if (node.nodeType === Node.TEXT_NODE && (node.textContent ?? '').length === 0) {
+        node.remove();
+      }
+    });
+
+    const isOnlyChild = codeElement.childNodes.length === 1 && codeElement.firstChild === marker;
+
+    if (isOnlyChild) {
+      codeElement.replaceWith(marker);
+
+      return;
+    }
+
+    const isFirstChild = codeElement.firstChild === marker;
+
+    if (isFirstChild) {
+      parent.insertBefore(marker, codeElement);
+
+      return;
+    }
+
+    const isLastChild = codeElement.lastChild === marker;
+
+    if (isLastChild) {
+      parent.insertBefore(marker, codeElement.nextSibling);
+
+      return;
+    }
+
+    const trailingClone = codeElement.cloneNode(false) as HTMLElement;
+
+    while (marker.nextSibling) {
+      trailingClone.appendChild(marker.nextSibling);
+    }
+
+    parent.insertBefore(trailingClone, codeElement.nextSibling);
+    parent.insertBefore(marker, trailingClone);
+  }
+}

package/src/components/modules/api/blocks.ts

@@ -1,6 +1,7 @@
 import type { BlockToolData, OutputBlockData, OutputData, ToolConfig } from '../../../../types';
 import type { BlockAPI as BlockAPIInterface, Blocks } from '../../../../types/api';
 import type { BlockTuneData } from '../../../../types/block-tunes/block-tune-data';
+import type { MarkdownImportConfig } from '../../../markdown/types';
 import { isInsideTableCell, isRestrictedInTableCell } from '../../../tools/table/table-restrictions';
 import { Module } from '../../__module';
 import { Block } from '../../block';
@@ -245,6 +246,22 @@ export class BlocksAPI extends Module {
     }
   }
 
+  /**
+   * Import Markdown string as blocks.
+   * Lazy-loads the markdown converter on first call.
+   * @param md - Markdown source string
+   * @param options - Optional configuration for tool mapping and extensions
+   */
+  public async importMarkdown(md: string, options?: MarkdownImportConfig): Promise<OutputData> {
+    const { markdownToBlocks } = await import('../../../markdown/index');
+    const blocks = await markdownToBlocks(md, options);
+    const data: OutputData = { blocks };
+
+    await this.render(data);
+
+    return data;
+  }
+
   /**
    * Insert new Block and returns it's API
    * @param {string} type — Tool name

package/src/components/modules/api/tools.ts

@@ -11,25 +11,6 @@ export class ToolsAPI extends Module {
   public get methods(): ToolsAPIInterface {
     return {
       getBlockTools: () => Array.from(this.Blok.Tools.blockTools.values()),
-      getToolsConfig: () => {
-        const result: ReturnType<ToolsAPIInterface['getToolsConfig']> = {
-          tools: this.config.tools,
-        };
-
-        if (this.config.inlineToolbar !== undefined) {
-          result.inlineToolbar = this.config.inlineToolbar;
-        }
-
-        if (this.config.tunes !== undefined) {
-          result.tunes = this.config.tunes;
-        }
-
-        if (this.config.theme !== undefined) {
-          result.theme = this.config.theme;
-        }
-
-        return result;
-      },
     };
   }
 }

package/src/components/modules/blockEvents/composers/blockSelectionKeys.ts

@@ -32,19 +32,36 @@ export class BlockSelectionKeys extends BlockEventComposer {
    */
   private canIndentSelectedListItems(): boolean {
     const { BlockSelection, BlockManager } = this.Blok;
+    const selectedSet = new Set(BlockSelection.selectedBlocks);
 
     for (const block of BlockSelection.selectedBlocks) {
       const blockIndex = BlockManager.getBlockIndex(block);
 
-      if (blockIndex === undefined || blockIndex === 0) {
+      if (blockIndex === undefined) {
         return false;
       }
 
-      const previousBlock = BlockManager.getBlockByIndex(blockIndex - 1);
+      const previousBlock = blockIndex > 0
+        ? BlockManager.getBlockByIndex(blockIndex - 1)
+        : undefined;
 
-      if (!previousBlock || previousBlock.name !== LIST_TOOL_NAME) {
+      const isFirstInGroup = !previousBlock || previousBlock.name !== LIST_TOOL_NAME;
+
+      // First-in-group items can nest one level; mid-list items can't exceed previous depth
+      if (isFirstInGroup && this.getListBlockDepth(block) >= 1) {
         return false;
       }
+      if (isFirstInGroup) {
+        continue;
+      }
+
+      /**
+       * If the predecessor is also selected, both will be indented together,
+       * so the relative depth difference is preserved — skip the check.
+       */
+      if (selectedSet.has(previousBlock)) {
+        continue;
+      }
 
       if (this.getListBlockDepth(block) > this.getListBlockDepth(previousBlock)) {
         return false;

package/src/components/modules/blockEvents/composers/keyboardNavigation.ts

@@ -91,14 +91,14 @@ export class KeyboardNavigation extends BlockEventComposer {
       return;
     }
 
-    event.shiftKey ? Caret.navigatePrevious(true) : Caret.navigateNext(true);
+    const isNavigated = event.shiftKey ? Caret.navigatePrevious(true) : Caret.navigateNext(true);
 
     /**
-     * Always prevent default Tab behaviour to keep focus inside the editor.
-     * Without this, pressing Tab on the last block of a nested editor (e.g. a
-     * database card drawer) lets the browser move focus out of the editor entirely.
+     * If we have next Block/input to focus, then focus it. Otherwise, leave native Tab behaviour
      */
-    event.preventDefault();
+    if (isNavigated) {
+      event.preventDefault();
+    }
   }
 
   /**

package/src/components/modules/blockManager/blockManager.ts

@@ -300,17 +300,6 @@ export class BlockManager extends Module {
       eventsDispatcher: this.eventsDispatcher,
       getBlockIndex: (block) => this.repository.getBlockIndex(block),
       onBlockMutated: this.blockDidMutated.bind(this),
-      shouldHandleEvent: (event: Event) => {
-        const target = event.target;
-
-        if (target instanceof Element) {
-          const closestEditor = target.closest('[data-blok-testid="blok-editor"]');
-
-          return closestEditor === null || closestEditor === this.Blok.UI.nodes.wrapper;
-        }
-
-        return true;
-      },
     });
 
     // Initialize factory

package/src/components/modules/blockManager/event-binder.ts

@@ -51,8 +51,6 @@ export interface BlockEventBinderDependencies {
   getBlockIndex: (block: Block) => number;
   /** Callback when block is mutated */
   onBlockMutated: BlockMutationCallback;
-  /** Check if an event should be handled by this editor instance */
-  shouldHandleEvent?: (event: Event) => boolean;
 }
 
 /**
@@ -78,31 +76,22 @@ export class BlockEventBinder {
    * @param block - Block to bind events to
    */
   public bindBlockEvents(block: Block): void {
-    const { blockEvents, listeners, onBlockMutated, getBlockIndex, shouldHandleEvent } = this.dependencies;
+    const { blockEvents, listeners, onBlockMutated, getBlockIndex } = this.dependencies;
 
     listeners.on(block.holder, 'keydown', (event: Event) => {
       if (event instanceof KeyboardEvent) {
-        if (shouldHandleEvent && !shouldHandleEvent(event)) {
-          return;
-        }
         blockEvents.keydown(event);
       }
     });
 
     listeners.on(block.holder, 'keyup', (event: Event) => {
       if (event instanceof KeyboardEvent) {
-        if (shouldHandleEvent && !shouldHandleEvent(event)) {
-          return;
-        }
         blockEvents.keyup(event);
       }
     });
 
     listeners.on(block.holder, 'input', (event: Event) => {
       if (event instanceof InputEvent) {
-        if (shouldHandleEvent && !shouldHandleEvent(event)) {
-          return;
-        }
         blockEvents.input(event);
       }
     });

package/src/components/modules/paste/handlers/html-handler.ts

@@ -77,24 +77,28 @@ export class HtmlHandler extends BasePasteHandler implements PasteHandler {
       const isDetailsElement =
         node.nodeType === Node.ELEMENT_NODE &&
         (node as HTMLElement).tagName === 'DETAILS';
+      const isAsideElement =
+        node.nodeType === Node.ELEMENT_NODE &&
+        (node as HTMLElement).tagName === 'ASIDE';
 
-      if (!isDetailsElement) {
+      if (!isDetailsElement && !isAsideElement) {
         expandedNodes.push({ node });
         continue;
       }
 
-      const toggleExpandedIndex = expandedNodes.length;
+      const parentExpandedIndex = expandedNodes.length;
 
       expandedNodes.push({ node });
 
       // Only direct children are extracted (not deeply nested structures), which
       // is correct for Google Docs DETAILS format where children are flat siblings.
+      // For ASIDE, ALL children become child blocks (no SUMMARY to skip).
       const childElements = Array.from((node as HTMLElement).children).filter(
-        (child) => child.tagName !== 'SUMMARY'
+        (child) => isAsideElement || child.tagName !== 'SUMMARY'
       );
 
       for (const child of childElements) {
-        expandedNodes.push({ node: child, parentExpandedIndex: toggleExpandedIndex });
+        expandedNodes.push({ node: child, parentExpandedIndex });
       }
     }
 
@@ -247,12 +251,11 @@ export class HtmlHandler extends BasePasteHandler implements PasteHandler {
 
     const isSubstitutable = tags.includes(element.tagName);
 
-    // DETAILS is a container-type substitutable element. Always return it as an
-    // atomic block so the toggle tool's onPaste receives the full <details>
-    // element (including <summary> and children), rather than having them split
-    // into flat blocks when the paragraph tool's <p> registration triggers
-    // containsAnotherToolTags = true.
-    if (isSubstitutable && element.tagName === 'DETAILS') {
+    // DETAILS and ASIDE are container-type substitutable elements. Always return
+    // them as atomic blocks so the tool's onPaste receives the full element
+    // (including children), rather than having them split into flat blocks when
+    // the paragraph tool's <p> registration triggers containsAnotherToolTags = true.
+    if (isSubstitutable && (element.tagName === 'DETAILS' || element.tagName === 'ASIDE')) {
       return [...nodes, destNode, element];
     }
 

package/src/components/modules/paste/handlers/index.ts

@@ -7,3 +7,4 @@ export { HtmlHandler } from './html-handler';
 export { PatternHandler } from './pattern-handler';
 export { TableCellsHandler } from './table-cells-handler';
 export { TextHandler } from './text-handler';
+export { MarkdownHandler } from '../../../../markdown/markdown-handler';

package/src/components/modules/paste/index.ts

@@ -9,6 +9,7 @@ import type { PasteHandler } from './handlers/base';
 import { BlokDataHandler } from './handlers/blok-data-handler';
 import { FilesHandler } from './handlers/files-handler';
 import { HtmlHandler } from './handlers/html-handler';
+import { MarkdownHandler } from '../../../markdown/markdown-handler';
 import { PatternHandler } from './handlers/pattern-handler';
 import { TableCellsHandler } from './handlers/table-cells-handler';
 import { TextHandler } from './handlers/text-handler';
@@ -50,6 +51,7 @@ export class Paste extends Module {
       new TableCellsHandler(this.Blok, this.toolRegistry, this.sanitizerBuilder),
       new FilesHandler(this.Blok, this.toolRegistry, this.sanitizerBuilder),
       new PatternHandler(this.Blok, this.toolRegistry, this.sanitizerBuilder),
+      new MarkdownHandler(this.Blok, this.toolRegistry, this.sanitizerBuilder),
       new HtmlHandler(this.Blok, this.toolRegistry, this.sanitizerBuilder),
       new TextHandler(this.Blok, this.toolRegistry, this.sanitizerBuilder, this.config),
     ];
@@ -192,6 +194,10 @@ export class Paste extends Module {
       return plainData;
     }
 
+    if (handler instanceof MarkdownHandler) {
+      return plainData;
+    }
+
     if (handler instanceof TextHandler) {
       return plainData;
     }

package/src/components/modules/themeManager.ts

@@ -108,9 +108,7 @@ export class ThemeManager extends Module {
     }
 
     if (this.mode === 'auto') {
-      if (state.activeInstances <= 1) {
-        this.removeAttribute();
-      }
+      this.removeAttribute();
     } else {
       document.documentElement.setAttribute(ATTR, this.mode);
     }

package/src/components/modules/toolbar/blockSettings.ts

@@ -191,6 +191,7 @@ export class BlockSettings extends Module<BlockSettingsNodes> {
         searchable: true,
         trigger: trigger || this.nodes.wrapper,
         items: await this.getTunesItems(block, commonTunes, toolTunes),
+        scopeElement: this.Blok.API.methods.ui.nodes.redactor,
         messages: {
           nothingFound: this.Blok.I18n.t('popover.nothingFound'),
           search: this.Blok.I18n.t('popover.search'),

package/src/components/modules/toolbar/inline/index.ts

@@ -330,8 +330,11 @@ export class InlineToolbar extends Module<InlineToolbarNodes> {
     const popoverItems = await this.buildPopoverItems();
 
     // Create popover
+    const scopeElement = this.Blok.API?.methods?.ui?.nodes?.redactor ?? this.Blok.UI.nodes.redactor;
+
     this.popover = new PopoverInline({
       items: popoverItems,
+      scopeElement,
       messages: {
         nothingFound: this.Blok.I18n.t('popover.nothingFound'),
         search: this.Blok.I18n.t('popover.search'),