From 43023ca26afb48263eae3bf78ce0913aca1fdfe9 Mon Sep 17 00:00:00 2001 From: * <*> Date: Thu, 25 May 2023 09:40:45 +0800 Subject: [PATCH] Match-id-315cebc9891bb15a1e6cf5d419fd71f880796f3a --- libs/horizon/src/dom/DOMExternal.ts | 4 ++-- libs/horizon/src/event/EventBinding.ts | 4 ++-- libs/horizon/src/event/EventHub.ts | 2 +- libs/horizon/src/event/HorizonEventMain.ts | 4 ++-- libs/horizon/src/event/ListenerGetter.ts | 5 +---- libs/horizon/src/event/MouseEvent.ts | 14 +++++++------- libs/horizon/src/event/utils.ts | 6 +++--- libs/horizon/src/renderer/render/DomPortal.ts | 4 ++-- 8 files changed, 20 insertions(+), 23 deletions(-) diff --git a/libs/horizon/src/dom/DOMExternal.ts b/libs/horizon/src/dom/DOMExternal.ts index 8a04a66a..dbd78da4 100644 --- a/libs/horizon/src/dom/DOMExternal.ts +++ b/libs/horizon/src/dom/DOMExternal.ts @@ -18,8 +18,8 @@ import { createPortal } from '../renderer/components/CreatePortal'; import type { Container } from './DOMOperator'; import { isElement } from './utils/Common'; import { findDOMByClassInst } from '../renderer/vnode/VNodeUtils'; -import {Callback} from '../renderer/UpdateHandler'; -import {listenSimulatedDelegatedEvents} from '../event/EventBinding'; +import { Callback } from '../renderer/UpdateHandler'; +import { listenSimulatedDelegatedEvents } from '../event/EventBinding'; function createRoot(children: any, container: Container, callback?: Callback) { // 清空容器 diff --git a/libs/horizon/src/event/EventBinding.ts b/libs/horizon/src/event/EventBinding.ts index ddfb016c..e4e0f59d 100644 --- a/libs/horizon/src/event/EventBinding.ts +++ b/libs/horizon/src/event/EventBinding.ts @@ -16,8 +16,8 @@ /** * 事件绑定实现，分为绑定委托事件和非委托事件 */ -import {allDelegatedHorizonEvents, simulatedDelegatedEvents} from './EventHub'; -import {isDocument} from '../dom/utils/Common'; +import { allDelegatedHorizonEvents, simulatedDelegatedEvents } from './EventHub'; +import { isDocument } from '../dom/utils/Common'; import { getNearestVNode, getNonDelegatedListenerMap } from '../dom/DOMInternalKeys'; import { asyncUpdates, runDiscreteUpdates } from '../renderer/TreeBuilder'; import { handleEventMain } from './HorizonEventMain'; diff --git a/libs/horizon/src/event/EventHub.ts b/libs/horizon/src/event/EventHub.ts index e1a80969..51d9ced6 100644 --- a/libs/horizon/src/event/EventHub.ts +++ b/libs/horizon/src/event/EventHub.ts @@ -16,7 +16,7 @@ // 需要委托的horizon事件和原生事件对应关系 export const allDelegatedHorizonEvents = new Map(); -// 模拟委托事件，事件本事不冒泡，需要其他事件来触发冒泡过程 +// 模拟委托事件，不冒泡事件需要利用其他事件来触发冒泡过程 export const simulatedDelegatedEvents = ['onMouseEnter', 'onMouseLeave']; // 所有委托的原生事件集合 export const allDelegatedNativeEvents = new Set(); diff --git a/libs/horizon/src/event/HorizonEventMain.ts b/libs/horizon/src/event/HorizonEventMain.ts index ad0e8326..a2a20d5e 100644 --- a/libs/horizon/src/event/HorizonEventMain.ts +++ b/libs/horizon/src/event/HorizonEventMain.ts @@ -30,8 +30,8 @@ import { import { getDomTag } from '../dom/utils/Common'; import { updateInputHandlerIfChanged } from '../dom/valueHandler/ValueChangeHandler'; import { getDom } from '../dom/DOMInternalKeys'; -import {recordChangeEventTargets, shouldControlValue, tryControlValue} from './FormValueController'; -import {getMouseEnterListeners} from './MouseEvent'; +import { recordChangeEventTargets, shouldControlValue, tryControlValue } from './FormValueController'; +import { getMouseEnterListeners } from './MouseEvent'; // web规范，鼠标右键key值 const RIGHT_MOUSE_BUTTON = 2; diff --git a/libs/horizon/src/event/ListenerGetter.ts b/libs/horizon/src/event/ListenerGetter.ts index cda9c3e1..3b19cf2a 100644 --- a/libs/horizon/src/event/ListenerGetter.ts +++ b/libs/horizon/src/event/ListenerGetter.ts @@ -171,8 +171,5 @@ function getParent(inst: VNode | null): VNode | null { do { inst = inst.parent; } while (inst && inst.tag !== DomComponent); - if (inst) { - return inst; - } - return null; + return inst || null; } diff --git a/libs/horizon/src/event/MouseEvent.ts b/libs/horizon/src/event/MouseEvent.ts index e947a98f..3eb38123 100644 --- a/libs/horizon/src/event/MouseEvent.ts +++ b/libs/horizon/src/event/MouseEvent.ts @@ -13,13 +13,13 @@ * See the Mulan PSL v2 for more details. */ -import {getNearestVNode} from '../dom/DOMInternalKeys'; -import {WrappedEvent} from './EventWrapper'; -import {VNode} from '../renderer/vnode/VNode'; -import {AnyNativeEvent, ListenerUnitList} from './Types'; -import {DomComponent, DomText} from '../renderer/vnode/VNodeTags'; -import {collectMouseListeners} from './ListenerGetter'; -import {getNearestMountedVNode} from './utils'; +import { getNearestVNode } from '../dom/DOMInternalKeys'; +import { WrappedEvent } from './EventWrapper'; +import { VNode } from '../renderer/vnode/VNode'; +import { AnyNativeEvent, ListenerUnitList } from './Types'; +import { DomComponent, DomText } from '../renderer/vnode/VNodeTags'; +import { collectMouseListeners } from './ListenerGetter'; +import { getNearestMountedVNode } from './utils'; /** * 背景： mouseEnter和mouseLeave事件不冒泡，所以无法直接委托给根节点进行代理 diff --git a/libs/horizon/src/event/utils.ts b/libs/horizon/src/event/utils.ts index 484d98b4..46feae8a 100644 --- a/libs/horizon/src/event/utils.ts +++ b/libs/horizon/src/event/utils.ts @@ -13,9 +13,9 @@ * See the Mulan PSL v2 for more details. */ -import {VNode} from '../renderer/vnode/VNode'; -import {Addition, FlagUtils} from '../renderer/vnode/VNodeFlags'; -import {TreeRoot} from '../renderer/vnode/VNodeTags'; +import { VNode } from '../renderer/vnode/VNode'; +import { Addition, FlagUtils } from '../renderer/vnode/VNodeFlags'; +import { TreeRoot } from '../renderer/vnode/VNodeTags'; export function isInputElement(dom?: HTMLElement): boolean { return dom instanceof HTMLInputElement || dom instanceof HTMLTextAreaElement; diff --git a/libs/horizon/src/renderer/render/DomPortal.ts b/libs/horizon/src/renderer/render/DomPortal.ts index 65188f0a..df0e3e30 100644 --- a/libs/horizon/src/renderer/render/DomPortal.ts +++ b/libs/horizon/src/renderer/render/DomPortal.ts @@ -16,8 +16,8 @@ import type { VNode } from '../Types'; import { resetNamespaceCtx, setNamespaceCtx } from '../ContextSaver'; import { createChildrenByDiff } from '../diff/nodeDiffComparator'; -import {popCurrentRoot, pushCurrentRoot} from '../RootStack'; -import {listenSimulatedDelegatedEvents} from '../../event/EventBinding'; +import { popCurrentRoot, pushCurrentRoot } from '../RootStack'; +import { listenSimulatedDelegatedEvents } from '../../event/EventBinding'; export function bubbleRender(processing: VNode) { resetNamespaceCtx(processing);