NOW MANAGED ON CODEBERG
WYSIWYG: Code & table fixes
Dan Brownc314a60a164a
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.tsindex 3e695eaa4..357ba3e73 100644--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts@@ -83,30 +83,26 @@ export class TableNode extends ElementNode {return {...super.exportDOM(editor),after: (tableElement) => {- if (tableElement) {- const newElement = tableElement.cloneNode() as ParentNode;- const colGroup = document.createElement('colgroup');- const tBody = document.createElement('tbody');- if (isHTMLElement(tableElement)) {- tBody.append(...tableElement.children);- }- const firstRow = this.getFirstChildOrThrow<TableRowNode>();-- if (!$isTableRowNode(firstRow)) {- throw new Error('Expected to find row node.');- }+ if (!tableElement) {+ return;+ }- const colCount = firstRow.getChildrenSize();+ const newElement = tableElement.cloneNode() as ParentNode;+ const tBody = document.createElement('tbody');- for (let i = 0; i < colCount; i++) {- const col = document.createElement('col');- colGroup.append(col);+ if (isHTMLElement(tableElement)) {+ for (const child of Array.from(tableElement.children)) {+ if (child.nodeName === 'TR') {+ tBody.append(child);+ } else {+ newElement.append(child);+ }}+ }- newElement.replaceChildren(colGroup, tBody);+ newElement.append(tBody);- return newElement as HTMLElement;- }+ return newElement as HTMLElement;},};}diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.tsindex a8a142df5..30ff3abc5 100644--- a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts@@ -74,8 +74,12 @@ export class EditorTableCreator extends EditorUiElement {return;}+ const targetColWidth = Math.min(Math.round(840 / columns), 240);+ const colWidths = Array(columns).fill(targetColWidth + 'px');+this.getContext().editor.update(() => {const table = $createTableNodeWithDimensions(rows, columns, false) as CustomTableNode;+ table.setColWidths(colWidths);$insertNewBlockNodeAtSelection(table);});}diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.tsindex 97038f07b..0ec9220dd 100644--- a/resources/js/wysiwyg/utils/formats.ts+++ b/resources/js/wysiwyg/utils/formats.ts@@ -3,7 +3,7 @@ import {$createTextNode, $getSelection, $insertNodes, LexicalEditor, LexicalNodeimport {$getBlockElementNodesInSelection,$getNodeFromSelection,- $insertNewBlockNodeAtSelection, $selectionContainsNodeType,+ $insertNewBlockNodeAtSelection, $selectionContainsNodeType, $selectSingleNode,$toggleSelectionBlockNodeType,getLastSelection} from "./selection";@@ -65,9 +65,19 @@ export function formatCodeBlock(editor: LexicalEditor) {editor.update(() => {const codeBlock = $createCodeBlockNode();codeBlock.setCode(selection?.getTextContent() || '');- $insertNewBlockNodeAtSelection(codeBlock, true);++ const selectionNodes = $getBlockElementNodesInSelection(selection);+ const firstSelectionNode = selectionNodes[0];+ const extraNodes = selectionNodes.slice(1);+ if (firstSelectionNode) {+ firstSelectionNode.replace(codeBlock);+ extraNodes.forEach(n => n.remove());+ } else {+ $insertNewBlockNodeAtSelection(codeBlock, true);+ }+$openCodeEditorForNode(editor, codeBlock);- codeBlock.selectStart();+ $selectSingleNode(codeBlock);});} else {$openCodeEditorForNode(editor, codeBlock);diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.tsindex 48fbe043f..2dd99d369 100644--- a/resources/js/wysiwyg/utils/nodes.ts+++ b/resources/js/wysiwyg/utils/nodes.ts@@ -1,7 +1,7 @@import {$getRoot,$isDecoratorNode,- $isElementNode,+ $isElementNode, $isRootNode,$isTextNode,ElementNode,LexicalEditor,@@ -84,7 +84,7 @@ export function $getNearestBlockNodeForCoords(editor: LexicalEditor, x: number,export function $getNearestNodeBlockParent(node: LexicalNode): LexicalNode|null {const isBlockNode = (node: LexicalNode): boolean => {- return ($isElementNode(node) || $isDecoratorNode(node)) && !node.isInline();+ return ($isElementNode(node) || $isDecoratorNode(node)) && !node.isInline() && !$isRootNode(node);};if (isBlockNode(node)) {diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.tsindex f1055d98a..67c2d91b2 100644--- a/resources/js/wysiwyg/utils/selection.ts+++ b/resources/js/wysiwyg/utils/selection.ts@@ -82,8 +82,8 @@ export function $insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: b}export function $insertNewBlockNodesAtSelection(nodes: LexicalNode[], insertAfter: boolean = true) {- const selection = $getSelection();- const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;+ const selectionNodes = $getSelection()?.getNodes() || [];+ const blockElement = selectionNodes.length > 0 ? $getNearestNodeBlockParent(selectionNodes[0]) : null;if (blockElement) {if (insertAfter) {