From 238e438a749288931aac0c5f7d176596ecfad280 Mon Sep 17 00:00:00 2001
From: * <8>
Date: Fri, 1 Apr 2022 17:46:58 +0800
Subject: [PATCH] Match-id-ade86cdcab051f0fa0d646c659870f6823ac1a97

---
 libs/horizon/index.ts                         | 49 ++++++++-----
 .../dom/valueHandler/OptionValueHandler.ts    |  6 +-
 libs/horizon/src/external/Horizon.ts          | 71 -------------------
 3 files changed, 33 insertions(+), 93 deletions(-)
 delete mode 100644 libs/horizon/src/external/Horizon.ts

diff --git a/libs/horizon/index.ts b/libs/horizon/index.ts
index cc37e0d0..a7df0d8b 100644
--- a/libs/horizon/index.ts
+++ b/libs/horizon/index.ts
@@ -1,12 +1,20 @@
 import {
-  Children,
-  createRef,
-  Component,
-  PureComponent,
-  createContext,
-  forwardRef,
-  lazy,
-  memo,
+  TYPE_FRAGMENT as Fragment,
+  TYPE_PROFILER as Profiler,
+  TYPE_STRICT_MODE as StrictMode,
+  TYPE_SUSPENSE as Suspense,
+} from './src/external/JSXElementType';
+
+import { Component, PureComponent } from './src/renderer/components/BaseClassComponent';
+import { createRef } from './src/renderer/components/CreateRef';
+import { Children } from './src/external/ChildrenUtil';
+import { createElement, cloneElement, isValidElement } from './src/external/JSXElement';
+import { createContext } from './src/renderer/components/context/CreateContext';
+import { lazy } from './src/renderer/components/Lazy';
+import { forwardRef } from './src/renderer/components/ForwardRef';
+import { memo } from './src/renderer/components/Memo';
+
+import {
   useCallback,
   useContext,
   useEffect,
@@ -16,17 +24,18 @@ import {
   useReducer,
   useRef,
   useState,
-  Fragment,
-  Profiler,
-  StrictMode,
-  Suspense,
-  createElement,
-  cloneElement,
-  isValidElement,
-  act,
-  launchUpdateFromVNode as _launchUpdateFromVNode,
-  getProcessingVNode as _getProcessingVNode,
-} from './src/external/Horizon';
+} from './src/renderer/hooks/HookExternal';
+import { launchUpdateFromVNode as _launchUpdateFromVNode, asyncUpdates } from './src/renderer/TreeBuilder';
+import { callRenderQueueImmediate } from './src/renderer/taskExecutor/RenderQueue';
+import { runAsyncEffects } from './src/renderer/submit/HookEffectHandler';
+import { getProcessingVNode as _getProcessingVNode } from './src/renderer/hooks/BaseHook';
+
+// act用于测试，作用是：如果fun触发了刷新（包含了异步刷新），可以保证在act后面的代码是在刷新完成后才执行。
+const act = fun => {
+  asyncUpdates(fun);
+  callRenderQueueImmediate();
+  runAsyncEffects();
+};
 
 import {
   render,
@@ -102,6 +111,8 @@ export {
   findDOMNode,
   unmountComponentAtNode,
   act,
+
+  // 暂时给HorizonX使用
   _launchUpdateFromVNode,
   _getProcessingVNode,
 };
diff --git a/libs/horizon/src/dom/valueHandler/OptionValueHandler.ts b/libs/horizon/src/dom/valueHandler/OptionValueHandler.ts
index bd487d4e..12cc6e9a 100644
--- a/libs/horizon/src/dom/valueHandler/OptionValueHandler.ts
+++ b/libs/horizon/src/dom/valueHandler/OptionValueHandler.ts
@@ -1,10 +1,10 @@
-import * as Horizon from '../../external/Horizon';
-import {IProperty} from '../utils/Interface';
+import { Children } from '../../external/ChildrenUtil';
+import { IProperty } from '../utils/Interface';
 
 // 把 const a = 'a'; <option>gir{a}ffe</option> 转成 giraffe
 function concatChildren(children) {
   let content = '';
-  Horizon.Children.forEach(children, function(child) {
+  Children.forEach(children, function(child) {
     content += child;
   });
 
diff --git a/libs/horizon/src/external/Horizon.ts b/libs/horizon/src/external/Horizon.ts
deleted file mode 100644
index 6644f2a0..00000000
--- a/libs/horizon/src/external/Horizon.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import {
-  TYPE_FRAGMENT,
-  TYPE_PROFILER,
-  TYPE_STRICT_MODE,
-  TYPE_SUSPENSE,
-} from './JSXElementType';
-
-import {Component, PureComponent} from '../renderer/components/BaseClassComponent';
-import {createRef} from '../renderer/components/CreateRef';
-import {Children} from './ChildrenUtil';
-import {
-  createElement,
-  cloneElement,
-  isValidElement,
-} from './JSXElement';
-import {createContext} from '../renderer/components/context/CreateContext';
-import {lazy} from '../renderer/components/Lazy';
-import {forwardRef} from '../renderer/components/ForwardRef';
-import {memo} from '../renderer/components/Memo';
-
-import {
-  useCallback,
-  useContext,
-  useEffect,
-  useImperativeHandle,
-  useLayoutEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from '../renderer/hooks/HookExternal';
-import {launchUpdateFromVNode, asyncUpdates} from '../renderer/TreeBuilder';
-import {callRenderQueueImmediate} from '../renderer/taskExecutor/RenderQueue';
-import {runAsyncEffects} from '../renderer/submit/HookEffectHandler';
-import { getProcessingVNode } from '../renderer/hooks/BaseHook';
-
-const act = (fun) => {
-  asyncUpdates(fun);
-  callRenderQueueImmediate();
-  runAsyncEffects();
-}
-
-export {
-  Children,
-  createRef,
-  Component,
-  PureComponent,
-  createContext,
-  forwardRef,
-  lazy,
-  memo,
-  useCallback,
-  useContext,
-  useEffect,
-  useImperativeHandle,
-  useLayoutEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-  TYPE_FRAGMENT as Fragment,
-  TYPE_PROFILER as Profiler,
-  TYPE_STRICT_MODE as StrictMode,
-  TYPE_SUSPENSE as Suspense,
-  createElement,
-  cloneElement,
-  isValidElement,
-  act,
-  launchUpdateFromVNode,
-  getProcessingVNode,
-};