Match-id-eaccaf14e8270ac5998e0095cd79975d0bac76d8

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.13 (2022-08-02)
+- **horizonX**: 修复redux兼容器bug
+
 ## 0.0.12 (2022-07-25)
 - 修复IE兼容性问题，IE环境下Event只读，导致合成事件逻辑报错
 

babel.config.js

@@ -1,39 +1,34 @@
 module.exports = {
-  presets: [
-    '@babel/react',
-    '@babel/preset-typescript',
-    ['@babel/preset-env', { targets: { node: 'current' } }],
-  ],
+  presets: ['@babel/preset-typescript', ['@babel/preset-env', { targets: { node: 'current' } }]],
   plugins: [
-    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    '@babel/plugin-syntax-jsx',
     [
-      '@babel/plugin-proposal-object-rest-spread',
-      { loose: true, useBuiltIns: true },
+      '@babel/plugin-transform-react-jsx',
+      {
+        pragma: 'Horizon.createElement',
+        pragmaFrag: 'Horizon.Fragment',
+      },
     ],
-    ['@babel/plugin-transform-template-literals', { loose: true }],
+    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    ['@babel/plugin-proposal-private-methods', { loose: true }],
+    ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
     '@babel/plugin-transform-object-assign',
-    '@babel/plugin-transform-literals',
-    '@babel/plugin-transform-arrow-functions',
-    '@babel/plugin-transform-block-scoped-functions',
     '@babel/plugin-transform-object-super',
+    ['@babel/plugin-proposal-object-rest-spread', { loose: true, useBuiltIns: true }],
+    ['@babel/plugin-transform-template-literals', { loose: true }],
+    '@babel/plugin-transform-arrow-functions',
+    '@babel/plugin-transform-literals',
+    '@babel/plugin-transform-for-of',
+    '@babel/plugin-transform-block-scoped-functions',
+    '@babel/plugin-transform-classes',
     '@babel/plugin-transform-shorthand-properties',
     '@babel/plugin-transform-computed-properties',
-    '@babel/plugin-transform-for-of',
-    ['@babel/plugin-transform-spread', { loose: true, useBuiltIns: true }],
     '@babel/plugin-transform-parameters',
-    ['@babel/plugin-transform-destructuring', { loose: true, useBuiltIns: true }],
+    ['@babel/plugin-transform-spread', { loose: true, useBuiltIns: true }],
     ['@babel/plugin-transform-block-scoping', { throwIfClosureRequired: false }],
-    '@babel/plugin-transform-classes',
+    ['@babel/plugin-transform-destructuring', { loose: true, useBuiltIns: true }],
     '@babel/plugin-transform-runtime',
     '@babel/plugin-proposal-nullish-coalescing-operator',
     '@babel/plugin-proposal-optional-chaining',
-    ['@babel/plugin-proposal-private-methods', { 'loose': true }],
-    ['@babel/plugin-proposal-private-property-in-object', { 'loose': true }],
-    '@babel/plugin-syntax-jsx',
-    ['@babel/plugin-transform-react-jsx', {
-      pragma: 'Horizon.createElement',
-      pragmaFrag: 'Horizon.Fragment'
-    }],
-    ['@babel/plugin-transform-react-jsx-source'],
   ],
 };

libs/horizon/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "horizon"
   ],
-  "version": "0.0.12",
+  "version": "0.0.13",
   "homepage": "",
   "bugs": "",
   "main": "index.js",

libs/horizon/src/renderer/hooks/UseReducerHook.ts

@@ -1,20 +1,18 @@
 import type { Hook, Reducer, Trigger, Update } from './HookType';
-import {
-  createHook,
-  getCurrentHook,
-  throwNotInFuncError
-} from './BaseHook';
-import {
-  launchUpdateFromVNode
-} from '../TreeBuilder';
+import { createHook, getCurrentHook, throwNotInFuncError } from './BaseHook';
+import { launchUpdateFromVNode } from '../TreeBuilder';
 import { isSame } from '../utils/compare';
 import { setStateChange } from '../render/FunctionComponent';
 import { getHookStage, HookStage } from './HookStage';
 import type { VNode } from '../Types';
-import {getProcessingVNode} from '../GlobalVar';
+import { getProcessingVNode } from '../GlobalVar';
 
-export function useReducerImpl<S, P, A>(reducer: (S, A) =>
-  S, initArg: P, init?: (P) => S, isUseState?: boolean): [S, Trigger<A>] | void {
+export function useReducerImpl<S, P, A>(
+  reducer: (S, A) => S,
+  initArg: P,
+  init?: (P) => S,
+  isUseState?: boolean
+): [S, Trigger<A>] | void {
   const stage = getHookStage();
   if (stage === null) {
     throwNotInFuncError();
@@ -53,16 +51,19 @@ function insertUpdate<S, A>(action: A, hook: Hook<S, A>): Update<S, A> {
 }
 
 // setState, setReducer触发函数
-export function TriggerAction<S, A, T>(vNode: VNode, hook: Hook<S, A>, action: A) {
+export function TriggerAction<S, A>(vNode: VNode, hook: Hook<S, A>, isUseState: boolean, action: A): void {
   const newUpdate = insertUpdate(action, hook);
 
   // 判断是否需要刷新
-  if (!vNode.shouldUpdate) {
-    const reducerObj = hook.state as Reducer<S, A>;
-    const { stateValue, reducer } = reducerObj;
+  if (!vNode.shouldUpdate && isUseState) {
+    const { stateValue, reducer } = hook.state as Reducer<S, A>;
 
+    if (reducer === null) {
+      return;
+    }
     // 在进入render阶段前reducer没有变化，可以复用state值，提升性能
     newUpdate.state = reducer(stateValue, action);
+
     // 标记为已经计算过，不需要重新计算了
     newUpdate.didCalculated = true;
 
@@ -87,16 +88,17 @@ export function useReducerForInit<S, A>(reducer, initArg, init, isUseState?: boo
   }
 
   const hook = createHook();
+  const trigger = TriggerAction.bind(null, getProcessingVNode(), hook, isUseState);
   // 为hook.state赋值{状态值, 触发函数, reducer, updates更新数组, 是否是useState}
   hook.state = {
     stateValue: stateValue,
-    trigger: TriggerAction.bind(null, getProcessingVNode(), hook),
+    trigger,
     reducer,
     updates: null,
-    isUseState
+    isUseState,
   } as Reducer<S, A>;
 
-  return [hook.state.stateValue, hook.state.trigger];
+  return [hook.state.stateValue, trigger];
 }
 
 // 更新hook.state
@@ -136,5 +138,3 @@ function calculateNewState<S, A>(currentHookUpdates: Array<Update<S, A>>, curren
 
   return state;
 }
-
-

package.json

@@ -33,13 +33,13 @@
     "@babel/plugin-transform-object-assign": "7.16.7",
     "@babel/plugin-transform-object-super": "7.16.7",
     "@babel/plugin-transform-parameters": "7.16.7",
+    "@babel/plugin-transform-react-jsx": "7.16.7",
     "@babel/plugin-transform-runtime": "7.16.7",
     "@babel/plugin-transform-shorthand-properties": "7.16.7",
     "@babel/plugin-transform-spread": "7.16.7",
     "@babel/plugin-transform-template-literals": "7.16.7",
     "@babel/plugin-transform-react-jsx-source": "^7.16.7",
     "@babel/preset-env": "7.16.7",
-    "@babel/preset-react": "7.16.7",
     "@babel/preset-typescript": "7.16.7",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-node-resolve": "^13.3.0",

scripts/__tests__/ComponentTest/HookTest/UseReducer.test.js

@@ -13,25 +13,25 @@ describe('useReducer Hook Test', () => {
             return {
               ...intlCar,
               logo: 'ford',
-              price: 76
+              price: 76,
             };
           case 'bmw':
             return {
               ...intlCar,
               logo: 'bmw',
-              price: 100
+              price: 100,
             };
           case 'benz':
             return {
               ...intlCar,
               logo: 'benz',
-              price: 80
+              price: 80,
             };
           default:
             return {
               ...intlCar,
               logo: 'audi',
-              price: 88
+              price: 88,
             };
         }
       };
@@ -56,4 +56,34 @@ describe('useReducer Hook Test', () => {
     expect(container.querySelector('p').innerHTML).toBe('audi');
     expect(container.querySelector('#senP').innerHTML).toBe('88');
   });
+
+  it('dispatch只触发一次', () => {
+    let nextId = 1;
+    const reducer = () => {
+      return { data: nextId++ };
+    };
+    const btnRef = Horizon.createRef();
+    const Main = () => {
+      const [{ data }, dispatch] = useReducer(reducer, { data: 0 });
+      const dispatchLogging = () => {
+        console.log('dispatch is called once');
+        dispatch();
+      };
+
+      return (
+        <div>
+          <button ref={btnRef} onClick={() => dispatchLogging()}>
+            increment
+          </button>
+          <div>{data}</div>
+        </div>
+      );
+    };
+
+    Horizon.render(<Main />, container);
+    Horizon.act(() => {
+      btnRef.current.click();
+    });
+    expect(nextId).toBe(2);
+  });
 });