## v4.5.2 2022-05-24

* [bug] resolve the problem about switch `weakSharing` usages, the cache is still remains.

Author: wangyi

docs/changes.md

@@ -101,3 +101,7 @@
 ## v4.5.1 2022-05-23
 
 * [optimize] use the feature of agent-reducer connecting update.
+
+## v4.5.2 2022-05-24
+
+* [bug] resolve the problem about switch `weakSharing` usages, the cache is still remains.

docs/zh/changes.md

@@ -100,4 +100,8 @@
 
 ## v4.5.1 2022-05-23
 
-* [optimize] 使用 agent-reducer 自动 connect 同步更新功能
+* [optimize] 使用 agent-reducer 自动 connect 同步更新功能
+
+## v4.5.2 2022-05-24
+
+* [bug] 修复切换 `weakSharing` 共享组件时，state 依然留存的问题。

example/package.json

@@ -13,14 +13,14 @@
     "@types/classnames": "^2.2.7",
     "@types/react": "16.14.21",
     "@types/react-dom": "16.9.14",
-    "agent-reducer": "4.5.0",
+    "agent-reducer": "4.5.3",
     "antd": "^4.16.13",
     "babel-polyfill": "^6.26.0",
     "classnames": "^2.2.6",
     "moment": "^2.24.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "use-agent-reducer": "4.2.0"
+    "use-agent-reducer": "4.5.1"
   },
   "devDependencies": {
     "@babel/core": "7.15.8",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "use-agent-reducer",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "main": "dist/use-agent-reducer.mini.js",
   "module": "esm/use-agent-reducer.js",
   "typings": "index.d.ts",
@@ -43,7 +43,7 @@
   "peerDependencies": {
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
-    "agent-reducer": ">=4.5.0"
+    "agent-reducer": ">=4.5.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.13.16",
@@ -88,7 +88,7 @@
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "react-test-renderer": "^16.7.0",
-    "agent-reducer": "4.5.0",
+    "agent-reducer": "4.5.3",
     "ts-jest": "^24.0.2",
     "ts-loader": "^6.0.4",
     "tsconfig-paths-webpack-plugin": "^3.2.0",

src/index.ts

@@ -6,7 +6,7 @@ import React, {
   useLayoutEffect,
   useMemo,
   useReducer,
-  useRef,
+  useRef, useState,
 } from 'react';
 import {
   create,
@@ -15,7 +15,6 @@ import {
   LifecycleMiddleWare,
   Action,
   AgentReducer,
-  DefaultActionType,
   Model,
   weakSharing,
   Factory,
@@ -32,12 +31,19 @@ export function useAgentReducer<T extends Model<S>, S>(
   entry: T | { new(): T },
   ...mdws: MiddleWare[]
 ): T {
+  const [version, setVersion] = useState(0);
   const reducerRef = useRef<null | AgentReducer<S, T>>(null);
 
   const initialed = reducerRef.current !== null;
 
   if (!initialed) {
-    reducerRef.current = create(entry, ...mdws);
+    const reducerFn = create<S, T>(entry, ...mdws);
+    reducerRef.current = reducerFn;
+    reducerFn.recreate(() => {
+      reducerFn.disconnect();
+      reducerRef.current = null;
+      setVersion((v) => v + 1);
+    });
   }
 
   const reducer = reducerRef.current as Reducer<S, Action>&ReducerPadding<S, T>;
@@ -61,7 +67,7 @@ export function useAgentReducer<T extends Model<S>, S>(
         red.disconnect();
       };
     },
-    [],
+    [version],
   );
 
   return reducer.agent;
@@ -80,12 +86,20 @@ export function useAgentSelector<T extends Model<S>, S, R>(
   mapStateCallback: (state: T['state']) => R,
   equalityFn?: (prev: R, current: R) => boolean,
 ): R {
+  const [version, setVersion] = useState(0);
+
   const reducerRef = useRef<null | AgentReducer<S, T>>(null);
 
   const initialed = reducerRef.current !== null;
 
   if (!initialed) {
-    reducerRef.current = create(entry);
+    const reducerFn = create<S, T>(entry);
+    reducerRef.current = reducerFn;
+    reducerFn.recreate(() => {
+      reducerFn.disconnect();
+      reducerRef.current = null;
+      setVersion((v) => v + 1);
+    });
   }
 
   const reducer = reducerRef.current as Reducer<S, Action>&ReducerPadding<S, T>;
@@ -124,7 +138,7 @@ export function useAgentSelector<T extends Model<S>, S, R>(
         red.disconnect();
       };
     },
-    [],
+    [version],
   );
 
   return current;
@@ -134,12 +148,20 @@ export function useAgentMethods<T extends Model<S>, S>(
   entry: T,
   ...middleWares: MiddleWare[]
 ): Omit<T, 'state'> {
+  const [version, setVersion] = useState(0);
+
   const reducerRef = useRef<null | AgentReducer<S, T>>(null);
 
   const initialed = reducerRef.current !== null;
 
   if (!initialed) {
-    reducerRef.current = create(entry, ...middleWares);
+    const reducerFn = create<S, T>(entry, ...middleWares);
+    reducerRef.current = reducerFn;
+    reducerFn.recreate(() => {
+      reducerFn.disconnect();
+      reducerRef.current = null;
+      setVersion((v) => v + 1);
+    });
   }
 
   const reducer = reducerRef.current as Reducer<S, Action>&ReducerPadding<S, T>;
@@ -157,7 +179,7 @@ export function useAgentMethods<T extends Model<S>, S>(
         red.disconnect();
       };
     },
-    [],
+    [version],
   );
 
   return reducer.agent;