From b6d3a8f5fe742650429a1ad81c1d9315d61c0aa0 Mon Sep 17 00:00:00 2001
From: * <8>
Date: Tue, 25 Jan 2022 14:53:48 +0800
Subject: [PATCH] Match-id-f0e7424b75b18470293cc3ef4a49bbe02d65caf4

---
 libs/horizon/src/dom/DOMExternal.ts                       | 4 ++--
 libs/horizon/src/dom/DOMInternalKeys.ts                   | 2 +-
 .../horizon/src/event/customEvents/CustomKeyboardEvent.ts | 2 +-
 .../event/simulatedEvtHandler/BeforeInputEventHandler.ts  | 2 +-
 libs/horizon/src/renderer/render/LazyComponent.ts         | 2 +-
 libs/horizon/src/renderer/render/SuspenseComponent.ts     | 4 ++--
 .../src/renderer/render/class/ClassLifeCycleProcessor.ts  | 8 +++-----
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/libs/horizon/src/dom/DOMExternal.ts b/libs/horizon/src/dom/DOMExternal.ts
index 02742120..e9404cb7 100644
--- a/libs/horizon/src/dom/DOMExternal.ts
+++ b/libs/horizon/src/dom/DOMExternal.ts
@@ -66,8 +66,8 @@ function executeRender(
   return getFirstCustomDom(treeRoot);
 }
 
-function findDOMNode(domOrEle: Element): null | Element | Text {
-  if (!domOrEle) {
+function findDOMNode(domOrEle?: Element): null | Element | Text {
+  if (domOrEle == null) {
     return null;
   }
 
diff --git a/libs/horizon/src/dom/DOMInternalKeys.ts b/libs/horizon/src/dom/DOMInternalKeys.ts
index 55621aae..309fd09b 100644
--- a/libs/horizon/src/dom/DOMInternalKeys.ts
+++ b/libs/horizon/src/dom/DOMInternalKeys.ts
@@ -94,7 +94,7 @@ export function getEventToListenerMap(target: EventTarget): Map<string, EventLis
   let eventsMap = target[internalKeys.nonDelegatedEvents];
   if (!eventsMap) {
     eventsMap = new Map();
-    target[internalKeys.nonDelegatedEvents] = new Map();
+    target[internalKeys.nonDelegatedEvents] = eventsMap;
   }
   return eventsMap;
 }
diff --git a/libs/horizon/src/event/customEvents/CustomKeyboardEvent.ts b/libs/horizon/src/event/customEvents/CustomKeyboardEvent.ts
index f4d0ae89..33c6d13c 100644
--- a/libs/horizon/src/event/customEvents/CustomKeyboardEvent.ts
+++ b/libs/horizon/src/event/customEvents/CustomKeyboardEvent.ts
@@ -72,7 +72,7 @@ export class CustomKeyboardEvent extends CustomBaseEvent {
     super(customEvtName, nativeEvtName, nativeEvt, vNode, target);
     this.key = getKey(nativeEvt);
     this.charCode = nativeEvtName === 'keypress' ? uniqueCharCode(nativeEvt) : 0;
-    this.keyCode = nativeEvtName === 'keydown' || nativeEvtName === 'keyup' ? nativeEvt.keyCode : 0;
+    this.keyCode = (nativeEvtName === 'keydown' || nativeEvtName === 'keyup') ? nativeEvt.keyCode : 0;
     this.which = this.charCode || this.keyCode;
   }
 }
diff --git a/libs/horizon/src/event/simulatedEvtHandler/BeforeInputEventHandler.ts b/libs/horizon/src/event/simulatedEvtHandler/BeforeInputEventHandler.ts
index 1a18ba27..ccbe450a 100644
--- a/libs/horizon/src/event/simulatedEvtHandler/BeforeInputEventHandler.ts
+++ b/libs/horizon/src/event/simulatedEvtHandler/BeforeInputEventHandler.ts
@@ -9,7 +9,7 @@ const SPACE_CHAR = String.fromCharCode(CHAR_CODE_SPACE);
 function getInputCharsByNative(
   eventName: string,
   nativeEvent: any,
-): string | null | void {
+): string | null {
   if (eventName === 'compositionend') {
     return (nativeEvent.detail && nativeEvent.detail.data) || null;
   }
diff --git a/libs/horizon/src/renderer/render/LazyComponent.ts b/libs/horizon/src/renderer/render/LazyComponent.ts
index 5277c1d1..a1f911ad 100644
--- a/libs/horizon/src/renderer/render/LazyComponent.ts
+++ b/libs/horizon/src/renderer/render/LazyComponent.ts
@@ -54,7 +54,7 @@ function captureLazyComponent(
   processing.type = Component;
 
   const lazyVNodeTag = getLazyVNodeTag(Component);
-  processing.tag = getLazyVNodeTag(Component);
+  processing.tag = lazyVNodeTag;
   const lazyVNodeProps = mergeDefaultProps(Component, processing.props);
 
   const lazyRender = LazyRendererMap[lazyVNodeTag];
diff --git a/libs/horizon/src/renderer/render/SuspenseComponent.ts b/libs/horizon/src/renderer/render/SuspenseComponent.ts
index 200c0c3d..b84b1582 100644
--- a/libs/horizon/src/renderer/render/SuspenseComponent.ts
+++ b/libs/horizon/src/renderer/render/SuspenseComponent.ts
@@ -157,12 +157,12 @@ function canCapturePromise(vNode: VNode | null): boolean {
 }
 
 // 处理Suspense子组件抛出的promise
-export function handleSuspenseChildThrowError(parent: VNode | null, processing: VNode, error: any): boolean {
+export function handleSuspenseChildThrowError(parent: VNode, processing: VNode, error: any): boolean {
   let vNode = parent;
 
   // 向上找到最近的不在fallback状态的Suspense，并触发重新渲染
   do {
-    if (vNode?.tag === SuspenseComponent && canCapturePromise(vNode)) {
+    if (vNode.tag === SuspenseComponent && canCapturePromise(vNode)) {
       if (vNode.suspensePromises === null) {
         vNode.suspensePromises = new Set();
       }
diff --git a/libs/horizon/src/renderer/render/class/ClassLifeCycleProcessor.ts b/libs/horizon/src/renderer/render/class/ClassLifeCycleProcessor.ts
index db796eb5..40fbbf40 100644
--- a/libs/horizon/src/renderer/render/class/ClassLifeCycleProcessor.ts
+++ b/libs/horizon/src/renderer/render/class/ClassLifeCycleProcessor.ts
@@ -25,11 +25,9 @@ export function callDerivedStateFromProps(
     const newState = getDerivedStateFromProps(nextProps, oldState);
 
     // 组件未返回state,需要返回旧的preState
-    if (newState) {
-      processing.state = { ...oldState, ...newState };
-      return;
-    }
-    processing.state = oldState;
+    processing.state = newState === null || newState === undefined
+      ? oldState
+      : { ...oldState, ...newState };
   }
 }