diff --git a/packages/volto-slate/news/6080.bugfix b/packages/volto-slate/news/6080.bugfix new file mode 100644 index 0000000000..284e43b595 --- /dev/null +++ b/packages/volto-slate/news/6080.bugfix @@ -0,0 +1 @@ +Fix removal of slate formatting applied to text when toggling the list buttons @robgietema diff --git a/packages/volto-slate/src/utils/blocks.js b/packages/volto-slate/src/utils/blocks.js index 127d9a721e..4175ebeddb 100644 --- a/packages/volto-slate/src/utils/blocks.js +++ b/packages/volto-slate/src/utils/blocks.js @@ -264,7 +264,7 @@ export const toggleBlock = (editor, format, allowedChildren) => { } else if (!isListItem && !wantsList) { toggleFormat(editor, format, allowedChildren); } else if (isListItem && wantsList && isActive) { - clearFormatting(editor); + clearList(editor); } else { console.warn('toggleBlock case not covered, please examine:', { wantsList, @@ -298,6 +298,21 @@ export const switchListType = (editor, format) => { Transforms.wrapNodes(editor, block); }; +/* + * Clear list by exploding the block + */ +export const clearList = (editor) => { + const { slate } = config.settings; + Transforms.unwrapNodes(editor, { + match: (n) => slate.listTypes.includes(n.type), + split: true, + }); + Transforms.setNodes(editor, { + type: 'p', + }); + Editor.normalize(editor); +}; + export const changeBlockToList = (editor, format) => { const { slate } = config.settings; const [match] = Editor.nodes(editor, { diff --git a/packages/volto/news/6085.bugfix b/packages/volto/news/6085.bugfix new file mode 100644 index 0000000000..c3db4e94da --- /dev/null +++ b/packages/volto/news/6085.bugfix @@ -0,0 +1 @@ +Fix link in pop-up in `RelationsMatrix.jsx`. @stevepiercy diff --git a/packages/volto/src/components/manage/Controlpanels/Relations/RelationsMatrix.jsx b/packages/volto/src/components/manage/Controlpanels/Relations/RelationsMatrix.jsx index b4b4a10ac1..3bc8003b15 100644 --- a/packages/volto/src/components/manage/Controlpanels/Relations/RelationsMatrix.jsx +++ b/packages/volto/src/components/manage/Controlpanels/Relations/RelationsMatrix.jsx @@ -414,7 +414,7 @@ const RelationsMatrix = (props) => {