Move isHTMLElement into core (#4977)

facebook · Sep 8, 2023 · aa1e99a · aa1e99a
1 parent 29f77c2
commit aa1e99a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/packages/lexical-utils/src/index.ts b/packages/lexical-utils/src/index.ts
@@ -23,13 +23,15 @@ import {
   DEPRECATED_$isGridSelection,
   EditorState,
   ElementNode,
+  isHTMLAnchorElement,
+  isHTMLElement,
   Klass,
   LexicalEditor,
   LexicalNode,
 } from 'lexical';
 import invariant from 'shared/invariant';
 
-export {$splitNode};
+export {$splitNode, isHTMLAnchorElement, isHTMLElement};
 
 export type DFSNode = Readonly<{
   depth: number;
@@ -495,23 +497,6 @@ export function $wrapNodeInElement(
   return elementNode;
 }
 
-/**
- * @param x - The element being tested
- * @returns Returns true if x is an HTML anchor tag, false otherwise
- */
-export function isHTMLAnchorElement(x: Node): x is HTMLAnchorElement {
-  return isHTMLElement(x) && x.tagName === 'A';
-}
-
-/**
- * @param x - The element being testing
- * @returns Returns true if x is an HTML element, false otherwise.
- */
-export function isHTMLElement(x: Node | EventTarget): x is HTMLElement {
-  // @ts-ignore-next-line - strict check on nodeType here should filter out non-Element EventTarget implementors
-  return x.nodeType === 1;
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type ObjectKlass<T> = new (...args: any[]) => T;
 

diff --git a/packages/lexical/src/LexicalUtils.ts b/packages/lexical/src/LexicalUtils.ts
@@ -1573,3 +1573,20 @@ export function $getChildrenRecursively(node: LexicalNode): Array<LexicalNode> {
   }
   return nodes;
 }
+
+/**
+ * @param x - The element being tested
+ * @returns Returns true if x is an HTML anchor tag, false otherwise
+ */
+export function isHTMLAnchorElement(x: Node): x is HTMLAnchorElement {
+  return isHTMLElement(x) && x.tagName === 'A';
+}
+
+/**
+ * @param x - The element being testing
+ * @returns Returns true if x is an HTML element, false otherwise.
+ */
+export function isHTMLElement(x: Node | EventTarget): x is HTMLElement {
+  // @ts-ignore-next-line - strict check on nodeType here should filter out non-Element EventTarget implementors
+  return x.nodeType === 1;
+}
diff --git a/packages/lexical/src/index.ts b/packages/lexical/src/index.ts
@@ -156,6 +156,8 @@ export {
   $setSelection,
   $splitNode,
   getNearestEditorFromDOMNode,
+  isHTMLAnchorElement,
+  isHTMLElement,
   isSelectionCapturedInDecoratorInput,
   isSelectionWithinEditor,
 } from './LexicalUtils';

diff --git a/packages/lexical/src/nodes/LexicalParagraphNode.ts b/packages/lexical/src/nodes/LexicalParagraphNode.ts
@@ -19,9 +19,11 @@ import type {
 } from './LexicalElementNode';
 import type {RangeSelection} from 'lexical';
 
-import {isHTMLElement} from '@lexical/utils';
-
-import {$applyNodeReplacement, getCachedClassNameArray} from '../LexicalUtils';
+import {
+  $applyNodeReplacement,
+  getCachedClassNameArray,
+  isHTMLElement,
+} from '../LexicalUtils';
 import {ElementNode} from './LexicalElementNode';
 import {$isTextNode} from './LexicalTextNode';
 

diff --git a/packages/lexical/src/nodes/LexicalTextNode.ts b/packages/lexical/src/nodes/LexicalTextNode.ts
@@ -25,7 +25,6 @@ import type {
   RangeSelection,
 } from '../LexicalSelection';
 
-import {isHTMLElement} from '@lexical/utils';
 import {IS_FIREFOX} from 'shared/environment';
 import invariant from 'shared/invariant';
 
@@ -65,6 +64,7 @@ import {
   $setCompositionKey,
   getCachedClassNameArray,
   internalMarkSiblingsAsDirty,
+  isHTMLElement,
   toggleTextFormatType,
 } from '../LexicalUtils';
 import {$createLineBreakNode} from './LexicalLineBreakNode';