Lexical: Fixed issues with recent changes

diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 0e1cab0f569a7d64a96c7b18669dd6985ae8c514..e12348e814be1cd6df53118663f324ce736849d6 100644 (file)
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -15,7 +15,7 @@ export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
      * This can return false to indicate that the completion of the action should
      * NOT be communicated to parent UI elements, which is what occurs by default.
      */
      * This can return false to indicate that the completion of the action should
      * NOT be communicated to parent UI elements, which is what occurs by default.
      */

-    action: (context: EditorUiContext, button: EditorButton) => void|false;
+    action: (context: EditorUiContext, button: EditorButton) => void|false|Promise<void|boolean>;

     isActive: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     isDisabled?: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     setup?: (context: EditorUiContext, button: EditorButton) => void;
     isActive: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     isDisabled?: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     setup?: (context: EditorUiContext, button: EditorButton) => void;


@@ -84,7 +84,13 @@ export class EditorButton extends EditorUiElement {
 
     protected onClick() {
         const result = this.definition.action(this.getContext(), this);
 
     protected onClick() {
         const result = this.definition.action(this.getContext(), this);

-        if (result !== false) {
+        if (result instanceof Promise) {
+            result.then(result => {
+                if (result === false) {
+                    this.emitEvent('button-action');
+                }
+            });
+        } else if (result !== false) {

             this.emitEvent('button-action');
         }
     }
             this.emitEvent('button-action');
         }
     }

diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 778be5ba6e0a97d32c4b024c3011c228c32806a1..116a3f4e5c01e0a39ee0ed0b564dd325a226b99d 100644 (file)
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -125,9 +125,9 @@ export function $selectOrCreateAdjacent(node: LexicalNode, after: boolean): Rang
     if (!target) {
         target = $createParagraphNode();
         if (after) {
     if (!target) {
         target = $createParagraphNode();
         if (after) {

-            node.insertAfter(target)
+            nearestBlock.insertAfter(target)

         } else {
         } else {

-            node.insertBefore(target);
+            nearestBlock.insertBefore(target);

         }
     }
 
         }
     }