From 944afbe0ec6abc3c46fa14479dd454641dddf577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E4=BA=91=E9=A3=9E?= Date: Sun, 14 Nov 2021 12:39:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=A0=87=E8=AF=86=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E6=9E=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 ++-- src/editor/core/event/GlobalEvent.ts | 11 ++++++++++- src/editor/dataset/constant/Editor.ts | 1 + src/editor/dataset/enum/Editor.ts | 4 ++++ src/editor/utils/index.ts | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 src/editor/dataset/constant/Editor.ts create mode 100644 src/editor/dataset/enum/Editor.ts diff --git a/index.html b/index.html index d1acbbb..dd4fde4 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
diff --git a/src/editor/core/event/GlobalEvent.ts b/src/editor/core/event/GlobalEvent.ts index a9e9276..9a24bc3 100644 --- a/src/editor/core/event/GlobalEvent.ts +++ b/src/editor/core/event/GlobalEvent.ts @@ -1,3 +1,5 @@ +import { EDITOR_COMPONENT } from "../../dataset/constant/Editor" +import { findParent } from "../../utils" import { Cursor } from "../cursor/Cursor" import { Draw } from "../draw/Draw" import { CanvasEvent } from "./CanvasEvent" @@ -32,8 +34,15 @@ export class GlobalEvent { if (!this.cursor) return const cursorDom = this.cursor.getCursorDom() const agentDom = this.cursor.getAgentDom() - const innerDoms = [this.canvas, cursorDom, agentDom, this.canvas.parentNode, document.body] + const innerDoms = [this.canvas, cursorDom, agentDom, document.body] if (innerDoms.includes(evt.target as any)) return + // 编辑器外部dom + const outerEditorDom = findParent( + evt.target as Element, + (node: Node & Element) => !!node && node.nodeType === 1 && !!node.getAttribute(EDITOR_COMPONENT), + true + ) + if (outerEditorDom) return this.cursor.recoveryCursor() } diff --git a/src/editor/dataset/constant/Editor.ts b/src/editor/dataset/constant/Editor.ts new file mode 100644 index 0000000..2d36111 --- /dev/null +++ b/src/editor/dataset/constant/Editor.ts @@ -0,0 +1 @@ +export const EDITOR_COMPONENT = 'editor-component' diff --git a/src/editor/dataset/enum/Editor.ts b/src/editor/dataset/enum/Editor.ts new file mode 100644 index 0000000..36a7d0e --- /dev/null +++ b/src/editor/dataset/enum/Editor.ts @@ -0,0 +1,4 @@ +export enum EditorComponent { + MENU = 'menu', + MAIN = 'main' +} \ No newline at end of file diff --git a/src/editor/utils/index.ts b/src/editor/utils/index.ts index 03d4c33..628760f 100644 --- a/src/editor/utils/index.ts +++ b/src/editor/utils/index.ts @@ -29,4 +29,23 @@ export function deepClone(obj: any) { }) } return newObj +} + +export function isBody(node: Element): boolean { + return node && node.nodeType === 1 && node.tagName.toLowerCase() === 'body' +} + +export function findParent(node: Element, filterFn: Function, includeSelf: boolean) { + if (node && !isBody(node)) { + node = includeSelf ? node : node.parentNode as Element + while (node) { + if (!filterFn || filterFn(node) || isBody(node)) { + return filterFn && !filterFn(node) && isBody(node) + ? null + : node + } + node = node.parentNode as Element + } + } + return null } \ No newline at end of file