@plone/volto-slate 18.7.1 → 18.8.1

package/CHANGELOG.md

@@ -8,6 +8,22 @@
 
 <!-- towncrier release notes start -->
 
+## 18.8.1 (2026-03-02)
+
+### Bugfix
+
+- Use Slate Table block when pasting tables snippets (instead of deprecated DraftJS) @cekk [#7865](https://github.com/plone/volto/issues/7865)
+
+## 18.8.0 (2025-12-02)
+
+### Feature
+
+- cross language support and umlaut fix for slash menu @Tishasoumya-02 [#7657](https://github.com/plone/volto/issues/7657)
+
+### Bugfix
+
+- Ensure Delete at end of a text block merges the next text block and removes it; if the next block is non-text (e.g., Description), do nothing. @aryan7081 [#7263](https://github.com/plone/volto/issues/7263)
+
 ## 18.7.1 (2025-10-10)
 
 ### Bugfix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.7.1",
+  "version": "18.8.1",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/blocks/Table/deconstruct.js

@@ -19,7 +19,7 @@ import {
 export function syncCreateTableBlock(rows) {
   const id = uuid();
   const block = {
-    '@type': 'table',
+    '@type': 'slateTable',
     table: {
       rows,
     },

package/src/blocks/Table/deconstruct.test.js

@@ -0,0 +1,24 @@
+import { syncCreateTableBlock } from './deconstruct';
+
+describe('syncCreateTableBlock', () => {
+  it('creates a slateTable block with the given rows', () => {
+    const rows = [
+      {
+        key: 'row1',
+        cells: [
+          {
+            key: 'cell1',
+            type: 'data',
+            value: [{ children: [{ text: '1' }] }],
+          },
+        ],
+      },
+    ];
+
+    const [id, block] = syncCreateTableBlock(rows);
+
+    expect(id).toBeDefined();
+    expect(block['@type']).toBe('slateTableaa');
+    expect(block.table.rows).toEqual(rows);
+  });
+});

package/src/blocks/Text/SlashMenu.jsx

@@ -120,7 +120,7 @@ const PersistentSlashMenu = ({ editor }) => {
   const slashCommand = data.plaintext
     ?.toLowerCase()
     .trim()
-    .match(/^\/([a-z]*)$/);
+    .match(/^\/([\p{L}]*)$/u);
 
   const availableBlocks = React.useMemo(
     () =>
@@ -141,10 +141,12 @@ const PersistentSlashMenu = ({ editor }) => {
         .filter((block) => {
           // typed text is a substring of the title or id
           const title = translateBlockTitle(block, intl).toLowerCase();
+          const originalTitle = block.title.toLowerCase();
           return (
             block.id !== 'slate' &&
             slashCommand &&
-            title.indexOf(slashCommand[1]) !== -1
+            (title.includes(slashCommand[1]) ||
+              originalTitle.includes(slashCommand[1]))
           );
         })
         .sort((a, b) => {

package/src/blocks/Text/keyboard/joinBlocks.js

@@ -48,8 +48,7 @@ export function joinWithPreviousBlock({ editor, event }, intl) {
   const [otherBlock = {}, otherBlockId] = prev;
 
   // Don't join with required blocks
-  if (data?.required || otherBlock?.required || otherBlock['@type'] !== 'slate')
-    return;
+  if (data?.required || otherBlock?.required) return;
 
   event.stopPropagation();
   event.preventDefault();
@@ -123,6 +122,10 @@ export function joinWithNextBlock({ editor, event }, intl) {
   const { properties, onChangeField } = editor.getBlockProps();
   const [otherBlock = {}, otherBlockId] = getNextVoltoBlock(index, properties);
 
+  if (!otherBlockId) {
+    return false;
+  }
+
   // Don't join with required blocks
   if (data?.required || otherBlock?.required || otherBlock['@type'] !== 'slate')
     return;
@@ -130,30 +133,51 @@ export function joinWithNextBlock({ editor, event }, intl) {
   event.stopPropagation();
   event.preventDefault();
 
-  mergeSlateWithBlockForward(editor, otherBlock);
+  const blocksFieldname = getBlocksFieldname(properties);
+  const blocksLayoutFieldname = getBlocksLayoutFieldname(properties);
 
-  // const cursor = JSON.parse(JSON.stringify(editor.selection));
-  const combined = JSON.parse(JSON.stringify(editor.children));
+  // If next block is not a slate text block, do nothing
+  if (otherBlock['@type'] !== 'slate') {
+    return;
+  }
 
-  // TODO: don't remove undo history, etc Should probably save both undo
-  // histories, so that the blocks are split, the undos can be restored??
+  const nextValue = otherBlock?.value;
+  const nextPlaintext =
+    otherBlock?.plaintext ?? serializeNodesToText(nextValue || []);
+  // Treat the next block as empty if both its structured value and plaintext representation
+  // indicate no content. In that case we can delete it instead of attempting a merge.
+  const isEmptySlateBlock =
+    !Array.isArray(nextValue) ||
+    nextValue.length === 0 ||
+    !nextPlaintext ||
+    nextPlaintext.trim().length === 0;
+
+  if (isEmptySlateBlock) {
+    const newFormData = deleteBlock(properties, otherBlockId, intl);
+    ReactDOM.unstable_batchedUpdates(() => {
+      onChangeField(blocksFieldname, newFormData[blocksFieldname]);
+      onChangeField(blocksLayoutFieldname, newFormData[blocksLayoutFieldname]);
+      onSelectBlock(block);
+    });
+    return true;
+  }
+  // Merge next text block into current one and delete the next block
+  mergeSlateWithBlockForward(editor, otherBlock);
 
-  const blocksFieldname = getBlocksFieldname(properties);
-  const blocksLayoutFieldname = getBlocksLayoutFieldname(properties);
+  const combined = JSON.parse(JSON.stringify(editor.children));
 
-  const formData = changeBlock(properties, otherBlockId, {
-    // TODO: use a constant specified in src/constants.js instead of 'slate'
+  const formData = changeBlock(properties, block, {
     '@type': 'slate',
     value: combined,
     plaintext: serializeNodesToText(combined || []),
   });
-  const newFormData = deleteBlock(formData, block, intl);
+
+  const newFormData = deleteBlock(formData, otherBlockId, intl);
 
   ReactDOM.unstable_batchedUpdates(() => {
-    // saveSlateBlockSelection(otherBlockId, cursor);
     onChangeField(blocksFieldname, newFormData[blocksFieldname]);
     onChangeField(blocksLayoutFieldname, newFormData[blocksLayoutFieldname]);
-    onSelectBlock(otherBlockId);
+    onSelectBlock(block);
   });
   return true;
 }

package/src/utils/volto-blocks.js

@@ -87,7 +87,11 @@ export function mergeSlateWithBlockForward(editor, nextBlock, event) {
   // with current block value, then use this result for next block, delete
   // current block
 
-  const next = nextBlock.value;
+  const next = nextBlock?.value;
+  // Safeguard: if next block has no value or an empty value, there is nothing to merge
+  if (!Array.isArray(next) || next.length === 0) {
+    return;
+  }
 
   // collapse the selection to its start point
   Transforms.collapse(editor, { edge: 'end' });