NOW MANAGED ON CODEBERG
Lexical: Fixed strange paragraph formatting behaviour
Dan Brown8b062d479518
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.tsindex ffdc7d7e8..7ecf91d23 100644--- a/resources/js/wysiwyg/index.ts+++ b/resources/js/wysiwyg/index.ts@@ -84,7 +84,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st// @ts-ignorewindow.debugEditorState = () => {- console.log(editor.getEditorState().toJSON());+ return editor.getEditorState().toJSON();};registerCommonNodeMutationListeners(context);diff --git a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts b/resources/js/wysiwyg/lexical/core/LexicalEvents.tsindex c70a906a0..26cf25a80 100644--- a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts+++ b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts@@ -355,6 +355,7 @@ function onSelectionChange(lastNode instanceof ParagraphNode &&lastNode.getChildrenSize() === 0) {+ selection.format = lastNode.getTextFormat();selection.style = lastNode.getTextStyle();} else {selection.format = 0;diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.tsindex f6f57c91c..e8d044b21 100644--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts@@ -19,7 +19,7 @@ import type {LexicalNode,NodeKey,} from '../LexicalNode';-import type {RangeSelection} from 'lexical';+import {RangeSelection, TEXT_TYPE_TO_FORMAT, TextFormatType} from 'lexical';import {$applyNodeReplacement,@@ -36,6 +36,7 @@ import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} fexport type SerializedParagraphNode = Spread<{+ textFormat: number;textStyle: string;},SerializedCommonBlockNode@@ -45,10 +46,12 @@ export type SerializedParagraphNode = Spread<export class ParagraphNode extends CommonBlockNode {['constructor']!: KlassConstructor<typeof ParagraphNode>;/** @internal */+ __textFormat: number;__textStyle: string;constructor(key?: NodeKey) {super(key);+ this.__textFormat = 0;this.__textStyle = '';}@@ -56,6 +59,22 @@ export class ParagraphNode extends CommonBlockNode {return 'paragraph';}+ getTextFormat(): number {+ const self = this.getLatest();+ return self.__textFormat;+ }++ setTextFormat(type: number): this {+ const self = this.getWritable();+ self.__textFormat = type;+ return self;+ }++ hasTextFormat(type: TextFormatType): boolean {+ const formatFlag = TEXT_TYPE_TO_FORMAT[type];+ return (this.getTextFormat() & formatFlag) !== 0;+ }+getTextStyle(): string {const self = this.getLatest();return self.__textStyle;@@ -73,6 +92,7 @@ export class ParagraphNode extends CommonBlockNode {afterCloneFrom(prevNode: this) {super.afterCloneFrom(prevNode);+ this.__textFormat = prevNode.__textFormat;this.__textStyle = prevNode.__textStyle;copyCommonBlockProperties(prevNode, this);}@@ -125,12 +145,14 @@ export class ParagraphNode extends CommonBlockNode {static importJSON(serializedNode: SerializedParagraphNode): ParagraphNode {const node = $createParagraphNode();deserializeCommonBlockNode(serializedNode, node);+ node.setTextFormat(serializedNode.textFormat);return node;}exportJSON(): SerializedParagraphNode {return {...super.exportJSON(),+ textFormat: this.getTextFormat(),textStyle: this.getTextStyle(),type: 'paragraph',version: 1,@@ -144,6 +166,7 @@ export class ParagraphNode extends CommonBlockNode {restoreSelection: boolean,): ParagraphNode {const newElement = $createParagraphNode();+ newElement.setTextFormat(rangeSelection.format);newElement.setTextStyle(rangeSelection.style);const direction = this.getDirection();newElement.setDirection(direction);diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.tsindex 167ab32ad..e4b5bf2dc 100644--- a/resources/js/wysiwyg/utils/selection.ts+++ b/resources/js/wysiwyg/utils/selection.ts@@ -3,7 +3,7 @@ import {$createParagraphNode, $createRangeSelection,$getRoot,$getSelection, $isBlockElementNode, $isDecoratorNode,- $isElementNode,+ $isElementNode, $isParagraphNode,$isTextNode,$setSelection,BaseSelection, DecoratorNode,@@ -60,12 +60,19 @@ export function $selectionContainsTextFormat(selection: BaseSelection | null, foreturn false;}- for (const node of selection.getNodes()) {+ // Check text nodes+ const nodes = selection.getNodes();+ for (const node of nodes) {if ($isTextNode(node) && node.hasFormat(format)) {return true;}}+ // If we're in an empty paragraph, check the paragraph format+ if (nodes.length === 1 && $isParagraphNode(nodes[0]) && nodes[0].hasTextFormat(format)) {+ return true;+ }+return false;}