Merge branch 'next' into fix/inline-toolbar-safari-scrollbar

Author: neSpecc

docs/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+### 2.31.6
+
+- `Fix` - Widen `sanitize` type on `BlockTool` and `BaseToolConstructable` to accept per-field `SanitizerConfig`
+
+### 2.31.5
+
+- `Fix` - Handle __Ctrl + click__ on links with inline styles applied (e.g., bold, italic)
+
+### 2.31.4
+
+- `Fix` - Prevent inline-toolbar re-renders when linked text is selected
+
 ### 2.31.3
 
 - `Fix` - Prevent text formatting removal when applying link

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editorjs/editorjs",
-  "version": "2.31.3",
+  "version": "2.31.6",
   "description": "Editor.js — open source block-style WYSIWYG editor with JSON output",
   "main": "dist/editorjs.umd.js",
   "module": "dist/editorjs.mjs",

src/components/dom.ts

@@ -566,6 +566,16 @@ export default class Dom {
     return element.tagName.toLowerCase() === 'a';
   }
 
+  /**
+   * Returns the closest ancestor anchor (A tag) of the given element (including itself)
+   * 
+   * @param element - element to check
+   * @returns {HTMLAnchorElement | null}
+   */
+  public static getClosestAnchor(element: Element): HTMLAnchorElement | null {
+    return element.closest("a");
+  }
+
   /**
    * Return element's offset related to the document
    *

src/components/inline-tools/inline-tool-link.ts

@@ -212,7 +212,7 @@ export default class LinkInlineTool implements InlineTool {
        */
       const hrefAttr = anchorTag.getAttribute('href');
 
-      this.nodes.input.value = hrefAttr !== 'null' ? hrefAttr : '';
+      this.nodes.input.defaultValue = hrefAttr !== 'null' ? hrefAttr : '';
 
       this.selection.save();
     } else {

src/components/modules/ui.ts

@@ -773,12 +773,13 @@ export default class UI extends Module<UINodes> {
      */
     const element = event.target as Element;
     const ctrlKey = event.metaKey || event.ctrlKey;
-
-    if ($.isAnchor(element) && ctrlKey) {
+    const anchor = $.getClosestAnchor(element);
+  
+    if (anchor && ctrlKey) {
       event.stopImmediatePropagation();
       event.stopPropagation();
 
-      const href = element.getAttribute('href');
+      const href = anchor.getAttribute('href');
       const validUrl = _.getValidUrl(href);
 
       _.openTab(validUrl);

test/cypress/tests/inline-tools/link.cy.ts

@@ -192,4 +192,50 @@ describe('Inline Tool Link', () => {
       .should('have.attr', 'href', 'https://editorjs.io')
       .should('contain', 'Bold and italic text');
   });
+
+  it('should open a link if it is wrapped in another formatting', () => {
+    cy.createEditor({
+      data: {
+        blocks: [
+          {
+            type: 'paragraph',
+            data: {
+              text: 'Link text',
+            },
+          },
+        ],
+      },
+    });
+
+    cy.get('[data-cy=editorjs]')
+      .find('.ce-paragraph')
+      .selectText('Link text');
+
+    cy.get('[data-cy=editorjs]')
+      .find('[data-item-name=link]')
+      .click();
+
+    cy.get('[data-cy=editorjs]')
+      .find('.ce-inline-tool-input')
+      .type('https://test.io/')
+      .type('{enter}');
+
+    cy.get('[data-cy=editorjs]')
+      .find('div.ce-block')
+      .find('a')
+      .selectText('Link text');
+
+    cy.get('[data-cy=editorjs]')
+      .find('[data-item-name=italic]')
+      .click();
+
+    cy.window().then((win) => {
+      cy.stub(win, 'open').as('windowOpen');
+    });
+
+    cy.contains('[data-cy=editorjs] div.ce-block i', 'Link text')
+      .click({ ctrlKey: true });
+
+    cy.get('@windowOpen').should('be.calledWith', 'https://test.io/');
+  });
 });

types/tools/block-tool.d.ts

@@ -13,9 +13,15 @@ import { MenuConfig } from './menu-config';
  */
 export interface BlockTool extends BaseTool {
   /**
-   * Sanitizer rules description
+   * Sanitizer rules description.
+   *
+   * @example Flat config (tag-level rules applied to all output)
+   * { b: true, a: { href: true } }
+   *
+   * @example Per-field config
+   * { text: { br: true, b: true }, caption: { b: true, i: true } }
    */
-  sanitize?: SanitizerConfig;
+  sanitize?: SanitizerConfig | Record<string, SanitizerConfig>;
 
   /**
    * Process Tool's element in DOM and return raw data

types/tools/tool.d.ts

@@ -37,9 +37,12 @@ export interface BaseToolConstructable {
   isInline?: boolean;
 
   /**
-   * Tool`s sanitizer configuration
+   * Tool`s sanitizer configuration.
+   *
+   * For Block Tools, can be a Record mapping data field names to their SanitizerConfig.
+   * For Inline Tools, should be a flat SanitizerConfig with tag names as keys.
    */
-  sanitize?: SanitizerConfig;
+  sanitize?: SanitizerConfig | Record<string, SanitizerConfig>;
 
   /**
    * Title of Inline Tool.