Merge branch 'codex-team:next' into next

Author: GuillaumeOnepilot

.eslintrc

@@ -34,5 +34,8 @@
     "unknown": true,
     "requestAnimationFrame": true,
     "navigator": true
+  },
+  "rules": {
+    "jsdoc/require-returns-type": "off"
   }
 }

cypress.config.ts

@@ -12,6 +12,8 @@ export default defineConfig({
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
+      on('file:preprocessor', require('cypress-vite')(config));
+
       /**
        * Plugin for cypress that adds better terminal output for easier debugging.
        * Prints cy commands, browser console logs, cy.request and cy.intercept data. Great for your pipelines.

docs/CHANGELOG.md

@@ -1,16 +1,33 @@
 # Changelog
 
-### 2.30.1
-
-– `New` – Block Tunes now supports nesting items
-
 ### 2.30.0
 
+- `New` – Block Tunes now supports nesting items
+- `New` – Block Tunes now supports separator items
+- `New` – "Convert to" control is now also available in Block Tunes
 - `Improvement` — The ability to merge blocks of different types (if both tools provide the conversionConfig)
 - `Fix` — `onChange` will be called when removing the entire text within a descendant element of a block.
 - `Fix` - Unexpected new line on Enter press with selected block without caret
 - `Fix` - Search input autofocus loosing after Block Tunes opening
 - `Fix` - Block removing while Enter press on Block Tunes
+- `Fix` – Unwanted scroll on first typing on iOS devices
+- `Fix` - Unwanted soft line break on Enter press after period and space (". |") on iOS devices
+- `Fix` - Caret lost after block conversion on mobile devices.
+- `Fix` - Caret lost after Backspace at the start of block when previoius block is not convertable
+- `Improvement` - The API `blocks.convert()` now returns the new block API
+- `Improvement` - The API `caret.setToBlock()` now can accept either BlockAPI or block index or block id
+- `New` – *Menu Config* – New item type – HTML
+– `Refactoring` – Switched to Vite as Cypress bundler
+– `New` – *Menu Config* – Default and HTML items now support hints
+- `New` – Inline Toolbar has new look 💅
+- `New` – Inline Tool's `render()` now supports [Menu Config](https://editorjs.io/menu-config/) format
+- `New` – *ToolsAPI* – All installed block tools now accessible via ToolsAPI `getBlockTools()` method
+- `New` – *SelectionAPI* – Exposed methods `save()` and `restore()` that allow to save selection to be able to temporally move focus away, methods `setFakeBackground()` and `removeFakeBackground()` that allow to immitate selection while focus moved away
+- `Impovement` – *MenuConfig* – TunesMenuConfig deprecated, use MenuConfig type instead
+- `New` – *BlocksAPI* – Exposed `getBlockByElement()` method that helps find block by any child html element
+– `Fix` — Deleting whitespaces at the start/end of the block
+– `Improvement` — *Types* — `BlockToolConstructorOptions` type improved, `block` and `config` are not optional anymore
+- `Improvement` - The Plus button and Block Tunes toggler are now better aligned with large line-height blocks, such as Headings
 
 ### 2.29.1
 

example/tools/embed

@@ -132,7 +132,7 @@
          */
         header: {
           class: Header,
-          inlineToolbar: ['marker', 'link'],
+          inlineToolbar: ['link', 'marker'],
           config: {
             placeholder: 'Header'
           },

example/tools/header

@@ -1,6 +1,6 @@
 {
   "name": "@editorjs/editorjs",
-  "version": "2.30.0-rc.3",
+  "version": "2.30.0-rc.13",
   "description": "Editor.js — Native JS, based on API and Open Source",
   "main": "dist/editorjs.umd.js",
   "module": "dist/editorjs.mjs",
@@ -56,6 +56,7 @@
     "cypress-intellij-reporter": "^0.0.7",
     "cypress-plugin-tab": "^1.0.5",
     "cypress-terminal-report": "^5.3.2",
+    "cypress-vite": "^1.5.0",
     "eslint": "^8.37.0",
     "eslint-config-codex": "^1.7.1",
     "eslint-plugin-chai-friendly": "^0.7.2",

example/tools/text-variant-tune

@@ -5,7 +5,7 @@
  */
 import { API, BlockTune } from '../../../types';
 import { IconCross } from '@codexteam/icons';
-import { TunesMenuConfig } from '../../../types/tools';
+import { MenuConfig } from '../../../types/tools/menu-config';
 
 /**
  *
@@ -35,7 +35,7 @@ export default class DeleteTune implements BlockTune {
   /**
    * Tune's appearance in block settings menu
    */
-  public render(): TunesMenuConfig {
+  public render(): MenuConfig {
     return {
       icon: IconCross,
       title: this.api.i18n.t('Delete'),

index.html

@@ -1,5 +1,5 @@
 import Block from './index';
-import { BlockToolData, ToolConfig } from '../../../types/tools';
+import { BlockToolData, ToolConfig, ToolboxConfigEntry } from '../../../types/tools';
 import { SavedData } from '../../../types/data-formats';
 import { BlockAPI as BlockAPIInterface } from '../../../types/api';
 
@@ -128,6 +128,14 @@ function BlockAPI(
     dispatchChange(): void {
       block.dispatchChange();
     },
+
+    /**
+     * Tool could specify several entries to be displayed at the Toolbox (for example, "Heading 1", "Heading 2", "Heading 3")
+     * This method returns the entry that is related to the Block (depended on the Block data)
+     */
+    getActiveToolboxEntry(): Promise<ToolboxConfigEntry | undefined> {
+      return block.getActiveToolboxEntry();
+    },
   };
 
   Object.setPrototypeOf(this, blockAPI);