解决循环引用

red-axe · Apr 13, 2022 · d8526b0 · d8526b0
1 parent a92a137
commit d8526b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/packages/engine/src/node/entry.ts b/packages/engine/src/node/entry.ts
@@ -1,12 +1,4 @@
-import {
-	DATA_ELEMENT,
-	ROOT,
-	ROOT_SELECTOR,
-	EDITABLE,
-	EDITABLE_SELECTOR,
-} from '../constants/root';
-import { CARD_EDITABLE_KEY, CARD_TAG, CARD_TYPE_KEY } from '../constants/card';
-import { ANCHOR, CURSOR, FOCUS } from '../constants/selection';
+import { ROOT_SELECTOR, EDITABLE_SELECTOR } from '../constants/root';
 import DOMEvent from './event';
 import $ from './parse';
 import {

diff --git a/packages/engine/src/node/utils.ts b/packages/engine/src/node/utils.ts
@@ -1,18 +1,14 @@
 import { getDocument } from '../utils/node';
 import { ElementInterface, NodeInterface, Selector } from '../types';
 import {
-	ANCHOR,
-	CARD_EDITABLE_KEY,
-	CARD_TAG,
-	CARD_TYPE_KEY,
-	CURSOR,
 	DATA_ELEMENT,
 	EDITABLE,
 	EDITABLE_SELECTOR,
-	FOCUS,
 	ROOT,
 	ROOT_SELECTOR,
-} from '../constants';
+} from '../constants/root';
+import { CARD_EDITABLE_KEY, CARD_TAG, CARD_TYPE_KEY } from '../constants/card';
+import { ANCHOR, CURSOR, FOCUS } from '../constants/selection';
 
 export const isNodeEntry = (selector: Selector): selector is NodeInterface => {
 	return !!selector && (selector as NodeInterface).get !== undefined;

diff --git a/packages/engine/src/utils/node.ts b/packages/engine/src/utils/node.ts
@@ -1,4 +1,3 @@
-import { isNodeEntry } from '../node/utils';
 import { DATA_ELEMENT, ROOT } from '../constants/root';
 import { NodeInterface } from '../types/node';
 
@@ -21,7 +20,7 @@ export const getDocument = (node?: Node): Document => {
  * @param node 节点
  */
 export const combinText = (node: NodeInterface | Node) => {
-	if (isNodeEntry(node)) node = node[0];
+	if (!(node instanceof Node)) node = node[0];
 	node.normalize();
 };