Match-id-5650edda61e31f38fc56e1f5acc8c472870909f2

libs/horizon/src/dom/DOMExternal.ts

@@ -1,14 +1,9 @@
-import {
+import { asyncUpdates, getFirstCustomDom, syncUpdates, startUpdate, createTreeRootVNode } from '../renderer/Renderer';
-  asyncUpdates, getFirstCustomDom,
+import { createPortal } from '../renderer/components/CreatePortal';
-  syncUpdates, startUpdate,
+import type { Container } from './DOMOperator';
-  createTreeRootVNode,
+import { isElement } from './utils/Common';
-} from '../renderer/Renderer';
+import { findDOMByClassInst } from '../renderer/vnode/VNodeUtils';
-import {createPortal} from '../renderer/components/CreatePortal';
+import { Callback } from '../renderer/UpdateHandler';
-import type {Container} from './DOMOperator';
-import {isElement} from './utils/Common';
-import {listenDelegatedEvents} from '../event/EventBinding';
-import {findDOMByClassInst} from '../renderer/vnode/VNodeUtils';
-import {Callback} from '../renderer/UpdateHandler';
 
 function createRoot(children: any, container: Container, callback?: Callback) {
   // 清空容器
@@ -39,16 +34,13 @@ function createRoot(children: any, container: Container, callback?: Callback) {
   return treeRoot;
 }
 
-function executeRender(
+function executeRender(children: any, container: Container, callback?: Callback) {
-  children: any,
-  container: Container,
-  callback?: Callback,
-) {
   let treeRoot = container._treeRoot;
 
   if (!treeRoot) {
     treeRoot = createRoot(children, container, callback);
-  } else { // container被render过
+  } else {
+    // container被render过
     if (typeof callback === 'function') {
       const cb = callback;
       callback = function () {
@@ -77,11 +69,26 @@ function findDOMNode(domOrEle?: Element): null | Element | Text {
   return findDOMByClassInst(domOrEle);
 }
 
+// 情况根节点监听器
+function removeRootEventLister(container: Container) {
+  const root = container._treeRoot;
+  if (root) {
+    Object.keys(root.delegatedNativeEvents).forEach(event => {
+      const listener = root.delegatedNativeEvents[event];
+
+      if (listener) {
+        container.removeEventListener(event, listener);
+      }
+    });
+  }
+}
+
 // 卸载入口
-function destroy(container: Container) {
+function destroy(container: Container): boolean {
   if (container._treeRoot) {
     syncUpdates(() => {
       executeRender(null, container, () => {
+        removeRootEventLister(container);
         container._treeRoot = null;
       });
     });

libs/horizon/src/dom/DOMOperator.ts

@@ -35,7 +35,7 @@ export type Props = Record<string, any> & {
   style?: { display?: string };
 };
 
-export type Container = (Element & { _treeRoot?: VNode }) | (Document & { _treeRoot?: VNode });
+export type Container = (Element & { _treeRoot?: VNode | null }) | (Document & { _treeRoot?: VNode | null });
 
 let selectionInfo: null | SelectionData = null;
 

libs/horizon/src/event/EventBinding.ts

@@ -35,7 +35,7 @@ function triggerDelegatedEvent(
 }
 
 // 监听委托事件
-function listenToNativeEvent(nativeEvtName: string, delegatedElement: Element, isCapture: boolean): void {
+function listenToNativeEvent(nativeEvtName: string, delegatedElement: Element, isCapture: boolean) {
   let dom: Element | Document = delegatedElement;
   // document层次可能触发selectionchange事件，为了捕获这类事件，selectionchange事件绑定在document节点上
   if (nativeEvtName === 'selectionchange' && !isDocument(delegatedElement)) {
@@ -44,6 +44,8 @@ function listenToNativeEvent(nativeEvtName: string, delegatedElement: Element, i
 
   const listener = triggerDelegatedEvent.bind(null, nativeEvtName, isCapture, dom);
   dom.addEventListener(nativeEvtName, listener, isCapture);
+
+  return listener;
 }
 
 // 监听所有委托事件
@@ -71,9 +73,9 @@ export function lazyDelegateOnRoot(currentRoot: VNode, eventName: string) {
 
   nativeEvents.forEach(nativeEvent => {
     const nativeFullName =  isCapture ? nativeEvent + 'capture' : nativeEvent;
-    if (!currentRoot.delegatedNativeEvents.has(nativeFullName)) {
+    if (!currentRoot.delegatedNativeEvents[nativeFullName]) {
-      listenToNativeEvent(nativeEvent, currentRoot.realNode, isCapture);
+      const listener = listenToNativeEvent(nativeEvent, currentRoot.realNode, isCapture);
-      currentRoot.delegatedNativeEvents.add(nativeFullName);
+      currentRoot.delegatedNativeEvents[nativeFullName] = listener;
     }
   });
 }

libs/horizon/src/renderer/vnode/VNode.ts

@@ -78,7 +78,7 @@ export class VNode {
   // 根节点数据
   toUpdateNodes: Set<VNode> | null; // 保存要更新的节点
   delegatedEvents: Set<string>;
-  delegatedNativeEvents: Set<string>;
+  delegatedNativeEvents: Record<string, () => void>;
 
   belongClassVNode: VNode | null = null; // 记录JSXElement所属class vNode，处理ref的时候使用
 
@@ -100,7 +100,7 @@ export class VNode {
         this.task = null;
         this.toUpdateNodes = new Set<VNode>();
         this.delegatedEvents = new Set<string>();
-        this.delegatedNativeEvents = new Set<string>();
+        this.delegatedNativeEvents = {};
         this.updates = null;
         this.stateCallbacks = null;
         this.state = null;