Export Klass from Lexical root (facebook#2533)

dosatross · Jun 27, 2022 · ec9134c · ec9134c
1 parent 98a0505
commit ec9134c
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 30 deletions.
diff --git a/packages/lexical-headless/src/index.ts b/packages/lexical-headless/src/index.ts
@@ -9,10 +9,10 @@
 import type {
   EditorState,
   EditorThemeClasses,
+  Klass,
   LexicalEditor,
   LexicalNode,
 } from 'lexical';
-import type {Klass} from 'shared/types';
 
 import {createEditor} from 'lexical';
 

diff --git a/packages/lexical-playground/src/nodes/PlaygroundNodes.ts b/packages/lexical-playground/src/nodes/PlaygroundNodes.ts
@@ -6,8 +6,7 @@
  *
  */
 
-import type {LexicalNode} from 'lexical';
-import type {Klass} from 'shared/types';
+import type {Klass, LexicalNode} from 'lexical';
 
 import {CodeHighlightNode, CodeNode} from '@lexical/code';
 import {HashtagNode} from '@lexical/hashtag';

diff --git a/packages/lexical-react/src/DEPRECATED_useLexical.ts b/packages/lexical-react/src/DEPRECATED_useLexical.ts
@@ -9,10 +9,10 @@
 import type {
   EditorState,
   EditorThemeClasses,
+  Klass,
   LexicalEditor,
   LexicalNode,
 } from 'lexical';
-import type {Klass} from 'shared/types';
 
 import {createEditor} from 'lexical';
 import {useMemo} from 'react';

diff --git a/packages/lexical-react/src/LexicalComposer.tsx b/packages/lexical-react/src/LexicalComposer.tsx
@@ -7,6 +7,7 @@
  */
 
 import type {LexicalComposerContextType} from '@lexical/react/LexicalComposerContext';
+import type {Klass} from 'lexical';
 
 import {
   createLexicalComposerContext,
@@ -22,7 +23,6 @@ import {
 } from 'lexical';
 import {useMemo} from 'react';
 import * as React from 'react';
-import {Klass} from 'shared/types';
 import useLayoutEffect from 'shared/useLayoutEffect';
 
 const HISTORY_MERGE_OPTIONS = {tag: 'history-merge'};

diff --git a/packages/lexical-react/src/useLexicalTextEntity.ts b/packages/lexical-react/src/useLexicalTextEntity.ts
@@ -7,13 +7,12 @@
  */
 
 import type {EntityMatch} from '@lexical/text';
-import type {TextNode} from 'lexical';
+import type {Klass, TextNode} from 'lexical';
 
 import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
 import {registerLexicalTextEntity} from '@lexical/text';
 import {mergeRegister} from '@lexical/utils';
 import {useEffect} from 'react';
-import {Klass} from 'shared/types';
 
 export function useLexicalTextEntity<T extends TextNode>(
   getMatch: (text: string) => null | EntityMatch,

diff --git a/packages/lexical-text/src/index.ts b/packages/lexical-text/src/index.ts
@@ -6,8 +6,13 @@
  *
  */
 
-import type {ElementNode, LexicalEditor, LexicalNode, RootNode} from 'lexical';
-import type {Klass} from 'shared/types';
+import type {
+  ElementNode,
+  Klass,
+  LexicalEditor,
+  LexicalNode,
+  RootNode,
+} from 'lexical';
 
 import {
   $createTextNode,

diff --git a/packages/lexical-utils/src/index.ts b/packages/lexical-utils/src/index.ts
@@ -9,11 +9,11 @@
 import type {
   EditorState,
   ElementNode,
+  Klass,
   LexicalEditor,
   LexicalNode,
   NodeKey,
 } from 'lexical';
-import type {Klass} from 'shared/types';
 
 import {
   $getRoot,

diff --git a/packages/lexical/src/LexicalEditor.ts b/packages/lexical/src/LexicalEditor.ts
@@ -8,7 +8,6 @@
 
 import type {EditorState, SerializedEditorState} from './LexicalEditorState';
 import type {DOMConversion, LexicalNode, NodeKey} from './LexicalNode';
-import type {Klass} from 'shared/types';
 
 import getDOMSelection from 'shared/getDOMSelection';
 import invariant from 'shared/invariant';
@@ -33,6 +32,11 @@ import {RootNode} from './nodes/LexicalRootNode';
 
 export type Spread<T1, T2> = Omit<T2, keyof T1> & T1;
 
+export type Klass<T extends LexicalNode> = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  new (...args: any[]): T;
+} & Omit<LexicalNode, 'constructor'>;
+
 export type EditorThemeClassName = string;
 
 export type TextNodeThemeClasses = {

diff --git a/packages/lexical/src/LexicalNode.ts b/packages/lexical/src/LexicalNode.ts
@@ -9,7 +9,7 @@
 /* eslint-disable no-constant-condition */
 import type {EditorConfig, LexicalEditor} from './LexicalEditor';
 import type {RangeSelection} from './LexicalSelection';
-import type {Klass} from 'shared/types';
+import type {Klass} from 'lexical';
 
 import invariant from 'shared/invariant';
 

diff --git a/packages/lexical/src/LexicalUtils.ts b/packages/lexical/src/LexicalUtils.ts
@@ -9,6 +9,7 @@
 import type {
   EditorThemeClasses,
   IntentionallyMarkedAsDirtyElement,
+  Klass,
   LexicalCommand,
   MutatedNodes,
   MutationListeners,
@@ -26,7 +27,6 @@ import type {
 } from './LexicalSelection';
 import type {RootNode} from './nodes/LexicalRootNode';
 import type {TextFormatType, TextNode} from './nodes/LexicalTextNode';
-import type {Klass} from 'shared/types';
 
 import {IS_APPLE, IS_IOS, IS_SAFARI} from 'shared/environment';
 import getDOMSelection from 'shared/getDOMSelection';

diff --git a/packages/lexical/src/index.ts b/packages/lexical/src/index.ts
@@ -11,6 +11,7 @@ export type {
   EditorConfig,
   EditorThemeClasses,
   IntentionallyMarkedAsDirtyElement,
+  Klass,
   LexicalCommand,
   LexicalEditor,
   NodeMutation,

diff --git a/packages/shared/types.d.ts b/packages/shared/types.d.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -179,8 +179,7 @@
       "shared/invariant": ["./packages/shared/src/invariant.ts"],
       "shared/warnOnlyOnce": ["./packages/shared/src/warnOnlyOnce.ts"],
       "shared/environment": ["./packages/shared/src/environment.ts"],
-      "shared/useLayoutEffect": ["./packages/shared/src/useLayoutEffect.ts"],
-      "shared/types": ["./packages/shared/src/types.d.ts"]
+      "shared/useLayoutEffect": ["./packages/shared/src/useLayoutEffect.ts"]
     }
   },
   "include": ["./libdefs", "./packages"],