Lexical: Reorganised custom node code into lexical codebase

Also cleaned up old unused imports.

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index c4403773bf2a93f6dfb3551da78bc10493643766..9066b402f330aa8959e5d69d1221cc95aa9f4214 100644 (file)
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,4 +1,4 @@
-import {$getSelection, createEditor, CreateEditorArgs, isCurrentlyReadOnlyMode, LexicalEditor} from 'lexical';
+import {$getSelection, createEditor, CreateEditorArgs, LexicalEditor} from 'lexical';

 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';

diff --git a/resources/js/wysiwyg/lexical/core/LexicalMutations.ts b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
index c24dc9ebb3c55a520a6b7a2fa7a3f3e7bfade934..80645205679615a4ae577deb06f300691beae5c4 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
@@ -16,7 +16,6 @@ import {
   $getSelection,
   $isDecoratorNode,
   $isElementNode,
   $getSelection,
   $isDecoratorNode,
   $isElementNode,

-  $isRangeSelection,

   $isTextNode,
   $setSelection,
 } from '.';
   $isTextNode,
   $setSelection,
 } from '.';

diff --git a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
index 7843027d713ce8d1e3882f1aa815751c415c2201..fccf1ae23a8424c97393161e6ee86fe1c862a3b5 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
@@ -29,12 +29,12 @@ import {
 import {
   DOUBLE_LINE_BREAK,
   FULL_RECONCILE,
 import {
   DOUBLE_LINE_BREAK,
   FULL_RECONCILE,

-  IS_ALIGN_CENTER,
-  IS_ALIGN_END,
-  IS_ALIGN_JUSTIFY,
-  IS_ALIGN_LEFT,
-  IS_ALIGN_RIGHT,
-  IS_ALIGN_START,
+
+
+
+
+
+

 } from './LexicalConstants';
 import {EditorState} from './LexicalEditorState';
 import {
 } from './LexicalConstants';
 import {EditorState} from './LexicalEditorState';
 import {

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
index f3c6f710509abfe8cc38873c6e1fd962bd019c69..28a203100c42cbd9134defc73e0260ca2ee7aacc 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -47,7 +47,6 @@ import {
 import invariant from 'lexical/shared/invariant';
 
 import {
 import invariant from 'lexical/shared/invariant';
 
 import {

-  $createTestDecoratorNode,

   $createTestElementNode,
   $createTestInlineElementNode,
   createTestEditor,
   $createTestElementNode,
   $createTestInlineElementNode,
   createTestEditor,

diff --git a/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
index bf4fc08ca608088542d9fa9bdeda67e02e5e558f..572c9448b0c13b1d428e68952cd278bf5ba9ad7a 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
@@ -1,8 +1,15 @@
-import {ElementNode} from "./LexicalElementNode";
-import {CommonBlockAlignment, SerializedCommonBlockNode} from "../../../nodes/_common";
+import {ElementNode, type SerializedElementNode} from "./LexicalElementNode";
+import {CommonBlockAlignment, CommonBlockInterface} from "./common";
+import {Spread} from "lexical";

 
 
 
 

-export class CommonBlockNode extends ElementNode {
+export type SerializedCommonBlockNode = Spread<{
+    id: string;
+    alignment: CommonBlockAlignment;
+    inset: number;
+}, SerializedElementNode>
+
+export class CommonBlockNode extends ElementNode implements CommonBlockInterface {

     __id: string = '';
     __alignment: CommonBlockAlignment = '';
     __inset: number = 0;
     __id: string = '';
     __alignment: CommonBlockAlignment = '';
     __inset: number = 0;

diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index 002d825d6ea083d71ff117b935d6738940983183..9624af67e7eb38b04a3443f4dd88757c567873b8 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -19,8 +19,8 @@ import invariant from 'lexical/shared/invariant';
 import {$isTextNode, TextNode} from '../index';
 import {
   DOUBLE_LINE_BREAK,
 import {$isTextNode, TextNode} from '../index';
 import {
   DOUBLE_LINE_BREAK,

-  ELEMENT_FORMAT_TO_TYPE,
-  ELEMENT_TYPE_TO_FORMAT,
+
+

 } from '../LexicalConstants';
 import {LexicalNode} from '../LexicalNode';
 import {
 } from '../LexicalConstants';
 import {LexicalNode} from '../LexicalNode';
 import {

diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
index 6517d939eda15557683dab11a8eeba66fc200f2e..f6f57c91c7573db70ae87fa75d5d198693ec9f81 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
@@ -29,10 +29,10 @@ import {
 import {$isTextNode} from './LexicalTextNode';
 import {
   commonPropertiesDifferent, deserializeCommonBlockNode,
 import {$isTextNode} from './LexicalTextNode';
 import {
   commonPropertiesDifferent, deserializeCommonBlockNode,

-  SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+  setCommonBlockPropsFromElement,

   updateElementWithCommonBlockProps
   updateElementWithCommonBlockProps

-} from "../../../nodes/_common";
-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+} from "./common";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";

 
 export type SerializedParagraphNode = Spread<
   {
 
 export type SerializedParagraphNode = Spread<
   {

diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
index 9831114340def02f0591dd5c76288fe37e161c7a..d1ba53597528cc63f30f9e473d700701f56e480f 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
@@ -10,21 +10,14 @@ import {
   $insertDataTransferForPlainText,
   $insertDataTransferForRichText,
 } from '@lexical/clipboard';
   $insertDataTransferForPlainText,
   $insertDataTransferForRichText,
 } from '@lexical/clipboard';

-import {$createListItemNode, $createListNode} from '@lexical/list';
-import {registerRichText} from '@lexical/rich-text';

 import {
   $createParagraphNode,
 import {
   $createParagraphNode,

-  $createRangeSelection,

   $createTabNode,
   $createTabNode,

-  $createTextNode,

   $getRoot,
   $getSelection,
   $insertNodes,
   $getRoot,
   $getSelection,
   $insertNodes,

-  $isElementNode,

   $isRangeSelection,
   $isRangeSelection,

-  $isTextNode,
-  $setSelection,
-  KEY_TAB_COMMAND,
+

 } from 'lexical';
 
 import {
 } from 'lexical';
 
 import {


@@ -32,7 +25,6 @@ import {
   initializeUnitTest,
   invariant,
 } from '../../../__tests__/utils';
   initializeUnitTest,
   invariant,
 } from '../../../__tests__/utils';

-import {$createHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";

 
 describe('LexicalTabNode tests', () => {
   initializeUnitTest((testEnv) => {
 
 describe('LexicalTabNode tests', () => {
   initializeUnitTest((testEnv) => {

diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
index b1ea099ac1ecd763fdf1d64f2e5c78844bb6552a..c54760ff242119335da20194934db6b14926d846 100644 (file)
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
@@ -41,9 +41,7 @@ import {
   $setCompositionKey,
   getEditorStateTextContent,
 } from '../../../LexicalUtils';
   $setCompositionKey,
   getEditorStateTextContent,
 } from '../../../LexicalUtils';

-import {Text} from "@codemirror/state";

 import {$generateHtmlFromNodes} from "@lexical/html";
 import {$generateHtmlFromNodes} from "@lexical/html";

-import {formatBold} from "@lexical/selection/__tests__/utils";

 
 const editorConfig = Object.freeze({
   namespace: '',
 
 const editorConfig = Object.freeze({
   namespace: '',

diff --git a/resources/js/wysiwyg/nodes/_common.ts b/resources/js/wysiwyg/lexical/core/nodes/common.ts
similarity index 89%
rename from resources/js/wysiwyg/nodes/_common.ts
rename to resources/js/wysiwyg/lexical/core/nodes/common.ts
index 71849bb4589484fb741a1f65019038fdbec34e51..eac9c82959573ee8d74b5f7d1ee17e18cae05492 100644 (file)
--- a/resources/js/wysiwyg/nodes/_common.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/common.ts
@@ -1,18 +1,11 @@
-import {LexicalNode, Spread} from "lexical";
-import type {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
-import {el, sizeToPixels} from "../utils/dom";
+import {sizeToPixels} from "../../../utils/dom";
+import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";

 
 export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
 const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
 
 type EditorNodeDirection = 'ltr' | 'rtl' | null;
 
 
 export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
 const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
 
 type EditorNodeDirection = 'ltr' | 'rtl' | null;
 

-export type SerializedCommonBlockNode = Spread<{
-    id: string;
-    alignment: CommonBlockAlignment;
-    inset: number;
-}, SerializedElementNode>
-

 export interface NodeHasAlignment {
     readonly __alignment: CommonBlockAlignment;
     setAlignment(alignment: CommonBlockAlignment): void;
 export interface NodeHasAlignment {
     readonly __alignment: CommonBlockAlignment;
     setAlignment(alignment: CommonBlockAlignment): void;


@@ -37,7 +30,7 @@ export interface NodeHasDirection {
     getDirection(): EditorNodeDirection;
 }
 
     getDirection(): EditorNodeDirection;
 }
 

-interface CommonBlockInterface extends NodeHasId, NodeHasAlignment, NodeHasInset, NodeHasDirection {}
+export interface CommonBlockInterface extends NodeHasId, NodeHasAlignment, NodeHasInset, NodeHasDirection {}

 
 export function extractAlignmentFromElement(element: HTMLElement): CommonBlockAlignment {
     const textAlignStyle: string = element.style.textAlign || '';
 
 export function extractAlignmentFromElement(element: HTMLElement): CommonBlockAlignment {
     const textAlignStyle: string = element.style.textAlign || '';

diff --git a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
index 138c895e6b8154f88df1770a626cc68d55253693..6edf0d64a2e0b5aa4c1450e8850130da00761875 100644 (file)
--- a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
@@ -36,7 +36,7 @@ import {
   updateChildrenListItemValue,
 } from './formatList';
 import {$getListDepth, $wrapInListItem} from './utils';
   updateChildrenListItemValue,
 } from './formatList';
 import {$getListDepth, $wrapInListItem} from './utils';

-import {extractDirectionFromElement} from "../../nodes/_common";
+import {extractDirectionFromElement} from "lexical/nodes/common";

 
 export type SerializedListNode = Spread<
   {
 
 export type SerializedListNode = Spread<
   {

diff --git a/resources/js/wysiwyg/lexical/readme.md b/resources/js/wysiwyg/lexical/readme.md
index 31db8fab1cafb5741a5c78e6c861c98973cf6157..24440ec8077e0fdb078319309490221a2d2befdd 100644 (file)
--- a/resources/js/wysiwyg/lexical/readme.md
+++ b/resources/js/wysiwyg/lexical/readme.md
@@ -9,4 +9,4 @@ Only components used, or intended to be used, were copied in at this point.
 The original work built upon in this directory and below is under the copyright of Meta Platforms, Inc. and affiliates.
 The original license can be seen in the [ORIGINAL-LEXICAL-LICENSE](./ORIGINAL-LEXICAL-LICENSE) file.
 
 The original work built upon in this directory and below is under the copyright of Meta Platforms, Inc. and affiliates.
 The original license can be seen in the [ORIGINAL-LEXICAL-LICENSE](./ORIGINAL-LEXICAL-LICENSE) file.
 

-Files may have since been modified with modifications being under the license and copyright of the BookStack project as a whole. 
\ No newline at end of file
+Files may have since been added or modified with changes being under the license and copyright of the BookStack project as a whole. 
\ No newline at end of file

diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCalloutNode.ts
similarity index 98%
rename from resources/js/wysiwyg/nodes/callout.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalCalloutNode.ts
index cfe32ec854cad1e13caf9c6a531b9da701422e10..6f97ba751ffd26f0f665c559273997d0fdb612de 100644 (file)
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCalloutNode.ts
@@ -11,10 +11,10 @@ import type {EditorConfig} from "lexical/LexicalEditor";
 import type {RangeSelection} from "lexical/LexicalSelection";
 import {
     CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
 import type {RangeSelection} from "lexical/LexicalSelection";
 import {
     CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,

-    SerializedCommonBlockNode,

     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps

-} from "./_common";
+} from "lexical/nodes/common";
+import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";

 
 export type CalloutCategory = 'info' | 'danger' | 'warning' | 'success';
 
 
 export type CalloutCategory = 'info' | 'danger' | 'warning' | 'success';
 

diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/code-block.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
index 76c17197111643defb014eb1dbdf128dba2d848a..cbe6918488724dcf59bd5fa6b7b06d7d2c260edc 100644 (file)
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
@@ -8,9 +8,9 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";

-import {EditorDecoratorAdapter} from "../ui/framework/decorator";
-import {CodeEditor} from "../../components";
-import {el} from "../utils/dom";
+import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
+import {CodeEditor} from "../../../components";
+import {el} from "../../utils/dom";

 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;

diff --git a/resources/js/wysiwyg/nodes/details.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/details.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index de87696f34570b3bfefa637ef352e398de0d1edd..178b0d9531d424e2a6f90729da7fe7fb3dd4cc56 100644 (file)
--- a/resources/js/wysiwyg/nodes/details.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -8,8 +8,8 @@ import {
     EditorConfig,
 } from 'lexical';
 
     EditorConfig,
 } from 'lexical';
 

-import {el} from "../utils/dom";
-import {extractDirectionFromElement} from "./_common";
+import {el} from "../../utils/dom";
+import {extractDirectionFromElement} from "lexical/nodes/common";

 
 export type SerializedDetailsNode = Spread<{
     id: string;
 
 export type SerializedDetailsNode = Spread<{
     id: string;

diff --git a/resources/js/wysiwyg/nodes/diagram.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/diagram.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
index bd37b200c80ba610f14bb42c65daffae2ff8e9f3..e69f97848ac3c31282830801a8ced4f6d8ff707d 100644 (file)
--- a/resources/js/wysiwyg/nodes/diagram.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
@@ -8,8 +8,8 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";

-import {EditorDecoratorAdapter} from "../ui/framework/decorator";
-import {el} from "../utils/dom";
+import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
+import {el} from "../../utils/dom";

 
 export type SerializedDiagramNode = Spread<{
     id: string;
 
 export type SerializedDiagramNode = Spread<{
     id: string;

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
index 0f30263ba0eef3e7d1208081cd87777d61b325d0..30563c09d5ab878c6648e9947cd6cfd841221683 100644 (file)
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
@@ -11,16 +11,15 @@ import {
     type NodeKey,
     type ParagraphNode,
     type RangeSelection,
     type NodeKey,
     type ParagraphNode,
     type RangeSelection,

-    type SerializedElementNode,

     type Spread
 } from "lexical";
 import {addClassNamesToElement} from "@lexical/utils";
     type Spread
 } from "lexical";
 import {addClassNamesToElement} from "@lexical/utils";

-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";

 import {
     commonPropertiesDifferent, deserializeCommonBlockNode,
 import {
     commonPropertiesDifferent, deserializeCommonBlockNode,

-    SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+    setCommonBlockPropsFromElement,

     updateElementWithCommonBlockProps
     updateElementWithCommonBlockProps

-} from "../../nodes/_common";
+} from "lexical/nodes/common";

 
 export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 
 
 export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 

diff --git a/resources/js/wysiwyg/nodes/horizontal-rule.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalHorizontalRuleNode.ts
similarity index 100%
rename from resources/js/wysiwyg/nodes/horizontal-rule.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalHorizontalRuleNode.ts

diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
similarity index 98%
rename from resources/js/wysiwyg/nodes/image.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
index b6d362b62c91afe2ee79514c8af89b75ffd44030..9f42ad73204042ec4045e97ac4e73b4fa2e07e0e 100644 (file)
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
@@ -6,8 +6,8 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";

-import {CommonBlockAlignment, extractAlignmentFromElement} from "./_common";
-import {$selectSingleNode} from "../utils/selection";
+import {CommonBlockAlignment, extractAlignmentFromElement} from "lexical/nodes/common";
+import {$selectSingleNode} from "../../utils/selection";

 import {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
 
 export interface ImageNodeOptions {
 import {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
 
 export interface ImageNodeOptions {

diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/media.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
index 64fe8f77b4d2fed2dc664bf22366d8c594844074..a675665ac140146fc425ff5228c4e86657d61205 100644 (file)
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
@@ -8,14 +8,14 @@ import {
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 

-import {el, setOrRemoveAttribute, sizeToPixels} from "../utils/dom";
+import {el, setOrRemoveAttribute, sizeToPixels} from "../../utils/dom";

 import {
     CommonBlockAlignment, deserializeCommonBlockNode,
 import {
     CommonBlockAlignment, deserializeCommonBlockNode,

-    SerializedCommonBlockNode,

     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps

-} from "./_common";
-import {$selectSingleNode} from "../utils/selection";
+} from "lexical/nodes/common";
+import {$selectSingleNode} from "../../utils/selection";
+import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";

 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
index 53caca80115bb4612c08a2646dfefdc4124acd8f..f0d97fe98062b1602838877bf2e8be432269b88a 100644 (file)
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
@@ -5,22 +5,20 @@ import {
     type DOMConversionOutput,
     type DOMExportOutput,
     type EditorConfig,
     type DOMConversionOutput,
     type DOMExportOutput,
     type EditorConfig,

-    ElementNode,

     isHTMLElement,
     type LexicalEditor,
     LexicalNode,
     type NodeKey,
     type ParagraphNode,
     isHTMLElement,
     type LexicalEditor,
     LexicalNode,
     type NodeKey,
     type ParagraphNode,

-    type RangeSelection,
-    SerializedElementNode
+    type RangeSelection

 } from "lexical";
 import {addClassNamesToElement} from "@lexical/utils";
 } from "lexical";
 import {addClassNamesToElement} from "@lexical/utils";

-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";

 import {
     commonPropertiesDifferent, deserializeCommonBlockNode,
 import {
     commonPropertiesDifferent, deserializeCommonBlockNode,

-    SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+    setCommonBlockPropsFromElement,

     updateElementWithCommonBlockProps
     updateElementWithCommonBlockProps

-} from "../../nodes/_common";
+} from "lexical/nodes/common";

 
 export type SerializedQuoteNode = SerializedCommonBlockNode;
 
 
 export type SerializedQuoteNode = SerializedCommonBlockNode;
 

diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
index 72676b9bacbea5a94262ed709869902f58904828..1fc6b42bbeba271f22c6ca1d1e40e67d9b6c601c 100644 (file)
--- a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
@@ -29,7 +29,7 @@ import {
 } from 'lexical';
 
 import {extractStyleMapFromElement, StyleMap} from "../../utils/dom";
 } from 'lexical';
 
 import {extractStyleMapFromElement, StyleMap} from "../../utils/dom";

-import {CommonBlockAlignment, extractAlignmentFromElement} from "../../nodes/_common";
+import {CommonBlockAlignment, extractAlignmentFromElement} from "lexical/nodes/common";

 
 export const TableCellHeaderStates = {
   BOTH: 3,
 
 export const TableCellHeaderStates = {
   BOTH: 3,

diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
index ab163005370a4f246701511e5d21c8f646870f64..9443747a6f716d6f9b832f5c95fb0914c41a3766 100644 (file)
--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -15,25 +15,25 @@ import {
   LexicalEditor,
   LexicalNode,
   NodeKey,
   LexicalEditor,
   LexicalNode,
   NodeKey,

-  SerializedElementNode, Spread,
+  Spread,

 } from 'lexical';
 
 import {addClassNamesToElement, isHTMLElement} from '@lexical/utils';
 import {
   $applyNodeReplacement,
   $getNearestNodeFromDOMNode,
 } from 'lexical';
 
 import {addClassNamesToElement, isHTMLElement} from '@lexical/utils';
 import {
   $applyNodeReplacement,
   $getNearestNodeFromDOMNode,

-  ElementNode,
+

 } from 'lexical';
 
 import {$isTableCellNode} from './LexicalTableCellNode';
 import {TableDOMCell, TableDOMTable} from './LexicalTableObserver';
 import {getTable} from './LexicalTableSelectionHelpers';
 } from 'lexical';
 
 import {$isTableCellNode} from './LexicalTableCellNode';
 import {TableDOMCell, TableDOMTable} from './LexicalTableObserver';
 import {getTable} from './LexicalTableSelectionHelpers';

-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";

 import {
   commonPropertiesDifferent, deserializeCommonBlockNode,
 import {
   commonPropertiesDifferent, deserializeCommonBlockNode,

-  SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+  setCommonBlockPropsFromElement,

   updateElementWithCommonBlockProps
   updateElementWithCommonBlockProps

-} from "../../nodes/_common";
+} from "lexical/nodes/common";

 import {el, extractStyleMapFromElement, StyleMap} from "../../utils/dom";
 import {getTableColumnWidths} from "../../utils/tables";
 
 import {el, extractStyleMapFromElement, StyleMap} from "../../utils/dom";
 import {getTableColumnWidths} from "../../utils/tables";
 

diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
index 6c3317c5dfaff54878b9c3bd72e751fb4fd0f695..e098a21e498a64988efaa5960c1ab8842e4662a3 100644 (file)
--- a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -16,7 +16,6 @@ import type {
 } from './LexicalTableSelection';
 import type {
   BaseSelection,
 } from './LexicalTableSelection';
 import type {
   BaseSelection,

-  ElementFormatType,

   LexicalCommand,
   LexicalEditor,
   LexicalNode,
   LexicalCommand,
   LexicalEditor,
   LexicalNode,


@@ -50,7 +49,6 @@ import {
   DELETE_LINE_COMMAND,
   DELETE_WORD_COMMAND,
   FOCUS_COMMAND,
   DELETE_LINE_COMMAND,
   DELETE_WORD_COMMAND,
   FOCUS_COMMAND,

-  FORMAT_ELEMENT_COMMAND,

   FORMAT_TEXT_COMMAND,
   INSERT_PARAGRAPH_COMMAND,
   KEY_ARROW_DOWN_COMMAND,
   FORMAT_TEXT_COMMAND,
   INSERT_PARAGRAPH_COMMAND,
   KEY_ARROW_DOWN_COMMAND,

diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes.ts
similarity index 75%
rename from resources/js/wysiwyg/nodes/index.ts
rename to resources/js/wysiwyg/nodes.ts
index 03213e2629ab5bcd1991a4f1e76f83f75867ab04..eb836bdce023a030a6568cd6d8a965ae8f5d3d19 100644 (file)
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes.ts
@@ -1,4 +1,4 @@
-import {CalloutNode} from './callout';
+import {CalloutNode} from '@lexical/rich-text/LexicalCalloutNode';

 import {
     ElementNode,
     KlassConstructor,
 import {
     ElementNode,
     KlassConstructor,


@@ -7,15 +7,15 @@ import {
     ParagraphNode
 } from "lexical";
 import {LinkNode} from "@lexical/link";
     ParagraphNode
 } from "lexical";
 import {LinkNode} from "@lexical/link";

-import {ImageNode} from "./image";
-import {DetailsNode, SummaryNode} from "./details";
+import {ImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {DetailsNode, SummaryNode} from "@lexical/rich-text/LexicalDetailsNode";

 import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";

-import {HorizontalRuleNode} from "./horizontal-rule";
-import {CodeBlockNode} from "./code-block";
-import {DiagramNode} from "./diagram";
-import {EditorUiContext} from "../ui/framework/core";
-import {MediaNode} from "./media";
+import {HorizontalRuleNode} from "@lexical/rich-text/LexicalHorizontalRuleNode";
+import {CodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
+import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
+import {EditorUiContext} from "./ui/framework/core";
+import {MediaNode} from "@lexical/rich-text/LexicalMediaNode";

 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 

diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index e049d5e7c9e359ec0f3a842ceb6de0d681f80126..2ee831d74fc0e541a7f592dcbcfbc5bfd6a94914 100644 (file)
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -8,7 +8,7 @@ import {
 import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selection";
 import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
 import {Clipboard} from "../../services/clipboard";
 import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selection";
 import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
 import {Clipboard} from "../../services/clipboard";

-import {$createImageNode} from "../nodes/image";
+import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";

 import {$createLinkNode} from "@lexical/link";
 import {EditorImageData, uploadImageFile} from "../utils/images";
 import {EditorUiContext} from "../ui/framework/core";
 import {$createLinkNode} from "@lexical/link";
 import {EditorImageData, uploadImageFile} from "../utils/images";
 import {EditorUiContext} from "../ui/framework/core";

diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 5f7f41ef02c12f8bb3a73b601098978d04622fb2..6a1345fac6d5596cfdf92c19919d8bf4fc9bd57c 100644 (file)
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -10,8 +10,8 @@ import {
     LexicalEditor,
     LexicalNode
 } from "lexical";
     LexicalEditor,
     LexicalNode
 } from "lexical";

-import {$isImageNode} from "../nodes/image";
-import {$isMediaNode} from "../nodes/media";
+import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";

 import {getLastSelection} from "../utils/selection";
 import {$getNearestNodeBlockParent} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";
 import {getLastSelection} from "../utils/selection";
 import {$getNearestNodeBlockParent} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";

diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index 37d3df588c3e49f0538a041802156816aff965e0..daae32e1982bb758e4cbacce01f487259e3dbf1f 100644 (file)
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -1,7 +1,7 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";

-import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
-import {$isDecoratorNode, BaseSelection} from "lexical";
+import {$openCodeEditorForNode, CodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
+import {BaseSelection} from "lexical";

 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 
 
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 
 

diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
index 44d332939e842dd9e66454afaf31e35c0374ea8e..d53bcb482ec78b5850eb202d8fe4b623a16c51b0 100644 (file)
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -1,7 +1,7 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {BaseSelection} from "lexical";
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {BaseSelection} from "lexical";

-import {DiagramNode} from "../../nodes/diagram";
+import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";

 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 import {$openDrawingEditorForNode} from "../../utils/diagrams";
 
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 import {$openDrawingEditorForNode} from "../../utils/diagrams";
 

diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index f0f46ddc674d37c14a0c8cb8cb7dc7e9e2eeebcf..98edf44b3b9c9423f03dc061343ade383c540179 100644 (file)
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -9,9 +9,9 @@ import ltrIcon from "@icons/editor/direction-ltr.svg";
 import rtlIcon from "@icons/editor/direction-rtl.svg";
 import {
     $getBlockElementNodesInSelection,
 import rtlIcon from "@icons/editor/direction-rtl.svg";
 import {
     $getBlockElementNodesInSelection,

-    $selectionContainsAlignment, $selectionContainsDirection, $selectSingleNode, $toggleSelection, getLastSelection
+    $selectionContainsAlignment, $selectionContainsDirection, $selectSingleNode, getLastSelection

 } from "../../../utils/selection";
 } from "../../../utils/selection";

-import {CommonBlockAlignment} from "../../../nodes/_common";
+import {CommonBlockAlignment} from "lexical/nodes/common";

 import {nodeHasAlignment} from "../../../utils/nodes";
 
 
 import {nodeHasAlignment} from "../../../utils/nodes";
 
 

diff --git a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
index e0d1e7077fa1e0a2165b1551b6add1b5d4fa8860..b36fd1c4f0cc7a694aeeb7a140271f89c8e77c17 100644 (file)
--- a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
@@ -1,4 +1,4 @@
-import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../../nodes/callout";
+import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "@lexical/rich-text/LexicalCalloutNode";

 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
 import {$isParagraphNode, BaseSelection, LexicalNode} from "lexical";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
 import {$isParagraphNode, BaseSelection, LexicalNode} from "lexical";

diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index fd95f9f35d251dd5713d479575aed541e927b1e6..f9c029ff14c63b1338d871eb5cbcf7531d3ac800 100644 (file)
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -2,27 +2,26 @@ import {EditorButtonDefinition} from "../../framework/buttons";
 import linkIcon from "@icons/editor/link.svg";
 import {EditorUiContext} from "../../framework/core";
 import {
 import linkIcon from "@icons/editor/link.svg";
 import {EditorUiContext} from "../../framework/core";
 import {

-    $createTextNode,

     $getRoot,
     $getSelection, $insertNodes,
     BaseSelection,
     $getRoot,
     $getSelection, $insertNodes,
     BaseSelection,

-    ElementNode, isCurrentlyReadOnlyMode
+    ElementNode

 } from "lexical";
 import {$isLinkNode, LinkNode} from "@lexical/link";
 import unlinkIcon from "@icons/editor/unlink.svg";
 import imageIcon from "@icons/editor/image.svg";
 } from "lexical";
 import {$isLinkNode, LinkNode} from "@lexical/link";
 import unlinkIcon from "@icons/editor/unlink.svg";
 import imageIcon from "@icons/editor/image.svg";

-import {$isImageNode, ImageNode} from "../../../nodes/image";
+import {$isImageNode, ImageNode} from "@lexical/rich-text/LexicalImageNode";

 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";
 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";

-import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../../nodes/horizontal-rule";
+import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "@lexical/rich-text/LexicalHorizontalRuleNode";

 import codeBlockIcon from "@icons/editor/code-block.svg";
 import codeBlockIcon from "@icons/editor/code-block.svg";

-import {$isCodeBlockNode} from "../../../nodes/code-block";
+import {$isCodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";

 import editIcon from "@icons/edit.svg";
 import diagramIcon from "@icons/editor/diagram.svg";
 import editIcon from "@icons/edit.svg";
 import diagramIcon from "@icons/editor/diagram.svg";

-import {$createDiagramNode, DiagramNode} from "../../../nodes/diagram";
+import {$createDiagramNode, DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";

 import detailsIcon from "@icons/editor/details.svg";
 import mediaIcon from "@icons/editor/media.svg";
 import detailsIcon from "@icons/editor/details.svg";
 import mediaIcon from "@icons/editor/media.svg";

-import {$createDetailsNode, $isDetailsNode} from "../../../nodes/details";
-import {$isMediaNode, MediaNode} from "../../../nodes/media";
+import {$createDetailsNode, $isDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {$isMediaNode, MediaNode} from "@lexical/rich-text/LexicalMediaNode";

 import {
     $getNodeFromSelection,
     $insertNewBlockNodeAtSelection,
 import {
     $getNodeFromSelection,
     $insertNewBlockNodeAtSelection,

diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 228566d442e5ce8c609dc4d363b3b29550f26bf3..f00a08bb5f5d218f40cd0235ce105a439054b6f7 100644 (file)
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -5,11 +5,10 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";

-import {$createNodeSelection, $createTextNode, $getSelection, $insertNodes, $setSelection} from "lexical";
-import {$isImageNode, ImageNode} from "../../../nodes/image";
-import {$createLinkNode, $isLinkNode, LinkNode} from "@lexical/link";
-import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
-import {$insertNodeToNearestRoot} from "@lexical/utils";
+import {$createNodeSelection, $getSelection, $insertNodes, $setSelection} from "lexical";
+import {$isImageNode, ImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {LinkNode} from "@lexical/link";
+import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "@lexical/rich-text/LexicalMediaNode";

 import {$getNodeFromSelection, getLastSelection} from "../../../utils/selection";
 import {EditorFormModal} from "../../framework/modals";
 import {EditorActionField} from "../../framework/blocks/action-field";
 import {$getNodeFromSelection, getLastSelection} from "../../../utils/selection";
 import {EditorFormModal} from "../../framework/modals";
 import {EditorActionField} from "../../framework/blocks/action-field";

diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 3cfe9592ccb9e16e034fbe8ec7473a3136e1b513..63fa24c800feebbb121c82e384843ea496bd94e3 100644 (file)
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -6,7 +6,7 @@ import {
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
 import {EditorFormModal} from "../../framework/modals";
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
 import {EditorFormModal} from "../../framework/modals";

-import {$getSelection, ElementFormatType} from "lexical";
+import {$getSelection} from "lexical";

 import {
     $forEachTableCell, $getCellPaddingForTable,
     $getTableCellColumnWidth,
 import {
     $forEachTableCell, $getCellPaddingForTable,
     $getTableCellColumnWidth,


@@ -16,7 +16,7 @@ import {
 } from "../../../utils/tables";
 import {formatSizeValue} from "../../../utils/dom";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 } from "../../../utils/tables";
 import {formatSizeValue} from "../../../utils/dom";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";

-import {CommonBlockAlignment} from "../../../nodes/_common";
+import {CommonBlockAlignment} from "lexical/nodes/common";

 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',

diff --git a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
index 2e4f2939ca2a2d78029aa65f4631855b889082b4..fa8ff48be56fa1361c52fae6ddbf982ce95141ef 100644 (file)
--- a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
@@ -1,10 +1,10 @@
 import {BaseSelection, LexicalNode,} from "lexical";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
 import {el} from "../../../utils/dom";
 import {BaseSelection, LexicalNode,} from "lexical";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
 import {el} from "../../../utils/dom";

-import {$isImageNode} from "../../../nodes/image";
+import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";

 import {EditorUiContext} from "../core";
 import {EditorUiContext} from "../core";

-import {NodeHasSize} from "../../../nodes/_common";
-import {$isMediaNode} from "../../../nodes/media";
+import {NodeHasSize} from "lexical/nodes/common";
+import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";

 
 function isNodeWithSize(node: LexicalNode): node is NodeHasSize&LexicalNode {
     return $isImageNode(node) || $isMediaNode(node);
 
 function isNodeWithSize(node: LexicalNode): node is NodeHasSize&LexicalNode {
     return $isImageNode(node) || $isMediaNode(node);

diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 7c0975da7e7193cf055bc8e29df3f97ff53db62a..185cd5dccd05db5ac723a5c5a7b02c8ae0f188d8 100644 (file)
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,7 +1,7 @@
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
 import {EditorContainerUiElement, EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {EditorDecorator, EditorDecoratorAdapter} from "./decorator";
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
 import {EditorContainerUiElement, EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {EditorDecorator, EditorDecoratorAdapter} from "./decorator";

-import {$getSelection, BaseSelection, COMMAND_PRIORITY_LOW, LexicalEditor, SELECTION_CHANGE_COMMAND} from "lexical";
+import {BaseSelection, LexicalEditor} from "lexical";

 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";

diff --git a/resources/js/wysiwyg/utils/diagrams.ts b/resources/js/wysiwyg/utils/diagrams.ts
index fb5543005c2b8f5e26ccc39e187ecb9d36ff9012..ffd8e603b99fe2d4c7e35814099ed01b94c6f67d 100644 (file)
--- a/resources/js/wysiwyg/utils/diagrams.ts
+++ b/resources/js/wysiwyg/utils/diagrams.ts
@@ -1,8 +1,8 @@
-import {$getSelection, $insertNodes, LexicalEditor, LexicalNode} from "lexical";
+import {$insertNodes, LexicalEditor, LexicalNode} from "lexical";

 import {HttpError} from "../../services/http";
 import {EditorUiContext} from "../ui/framework/core";
 import * as DrawIO from "../../services/drawio";
 import {HttpError} from "../../services/http";
 import {EditorUiContext} from "../ui/framework/core";
 import * as DrawIO from "../../services/drawio";

-import {$createDiagramNode, DiagramNode} from "../nodes/diagram";
+import {$createDiagramNode, DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";

 import {ImageManager} from "../../components";
 import {EditorImageData} from "./images";
 import {$getNodeFromSelection, getLastSelection} from "./selection";
 import {ImageManager} from "../../components";
 import {EditorImageData} from "./images";
 import {$getNodeFromSelection, getLastSelection} from "./selection";

diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index 1be802ebf1c326e594dd60eeb77fa1af8d7963a9..a5f06f147d27593d9b4635dded3c664bdd5d9305 100644 (file)
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -14,8 +14,8 @@ import {
     $toggleSelectionBlockNodeType,
     getLastSelection
 } from "./selection";
     $toggleSelectionBlockNodeType,
     getLastSelection
 } from "./selection";

-import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../nodes/code-block";
-import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "../nodes/callout";
+import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
+import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "@lexical/rich-text/LexicalCalloutNode";

 import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
 import {$createLinkNode, $isLinkNode} from "@lexical/link";
 import {$createHeadingNode, $isHeadingNode, HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
 import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
 import {$createLinkNode, $isLinkNode} from "@lexical/link";
 import {$createHeadingNode, $isHeadingNode, HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";

diff --git a/resources/js/wysiwyg/utils/images.ts b/resources/js/wysiwyg/utils/images.ts
index 2c13427d967f00c612876f9d61f4b0d069908131..85bae18e5e568599e3780e75e0773207d431bf6e 100644 (file)
--- a/resources/js/wysiwyg/utils/images.ts
+++ b/resources/js/wysiwyg/utils/images.ts
@@ -1,5 +1,5 @@
 import {ImageManager} from "../../components";
 import {ImageManager} from "../../components";

-import {$createImageNode} from "../nodes/image";
+import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";

 import {$createLinkNode, LinkNode} from "@lexical/link";
 
 export type EditorImageData = {
 import {$createLinkNode, LinkNode} from "@lexical/link";
 
 export type EditorImageData = {

diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 97634f96b4e5bfc6eb5eb4fc48e8b51567c1c7e3..b5cc789550cda2a0d82f10a09911aef306a54887 100644 (file)
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -11,7 +11,7 @@ import {
 import {LexicalNodeMatcher} from "../nodes";
 import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
 import {LexicalNodeMatcher} from "../nodes";
 import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";

-import {NodeHasAlignment, NodeHasInset} from "../nodes/_common";
+import {NodeHasAlignment, NodeHasInset} from "lexical/nodes/common";

 import {$findMatchingParent} from "@lexical/utils";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
 import {$findMatchingParent} from "@lexical/utils";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {

diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 02838eba034e7fdb9adec28db8b8a0b52301f60b..28e729e92ae3ee8bca6691f895893d2b839cb691 100644 (file)
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -16,7 +16,7 @@ import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
 import {$getNearestNodeBlockParent, $getParentOfType, nodeHasAlignment} from "./nodes";
 import {$setBlocksType} from "@lexical/selection";
 
 import {$getNearestNodeBlockParent, $getParentOfType, nodeHasAlignment} from "./nodes";

-import {CommonBlockAlignment} from "../nodes/_common";
+import {CommonBlockAlignment} from "lexical/nodes/common";

 
 const lastSelectionByEditor = new WeakMap<LexicalEditor, BaseSelection|null>;
 
 
 const lastSelectionByEditor = new WeakMap<LexicalEditor, BaseSelection|null>;