fix strict mode

MrWangJustToDo · Oct 12, 2024 · 451f0e8 · 451f0e8
1 parent fb19109
commit 451f0e8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/app/.vitepress/theme/components/example.vue b/app/.vitepress/theme/components/example.vue
@@ -21,6 +21,7 @@ import { createElement } from 'react';
 
 import { useData } from 'vitepress'
 import { StrictMode } from 'react';
+import { Fragment } from 'react';
 
 const styleTag = ref<HTMLStyleElement>()
 
@@ -38,15 +39,15 @@ onMounted(() => {
   const App = () => {
     const { count, add } = useCount(s => s);
 
-    return createElement(StrictMode, null,
+    return createElement(Fragment, null,
       createElement('p', { className: 'text' }, 'Reactive count component: '),
       createElement('button', {
         className: 'button',
         onClick: add
       }, `Counter is: ${count}`))
   }
 
-  app = hydrateRoot(wrapperRef.value!, createElement(App));
+  app = hydrateRoot(wrapperRef.value!, createElement(StrictMode, null, createElement(App)));
 })
 
 onMounted(() => {

diff --git a/packages/r-store/package.json b/packages/r-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactivity-store",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "author": "MrWangJustToDo",
   "license": "MIT",
   "description": "a reactive store, make you write reactive logic in react app just like zustand",

diff --git a/packages/r-store/src/shared/controller.ts b/packages/r-store/src/shared/controller.ts
@@ -93,12 +93,7 @@ export class Controller<T = any> {
     this._effect = new ControllerEffect(this._getStateSafe, () => {
       this.run();
 
-      if (!this._isActive) {
-        if (__DEV__) {
-          console.error(`[reactivity-store] unexpected update for reactivity-store, current store have been inactivated`);
-        }
-        return;
-      }
+      if (!this._isActive) return;
 
       if (this._lifeCycle.canUpdateComponent) {
         if (this._lifeCycle.syncUpdateComponent) {
@@ -125,6 +120,8 @@ export class Controller<T = any> {
   }
 
   notify = () => {
+    if (!this._isActive) return;
+
     // TODO implement server side initialState
     if (__DEV__ && isServer) {
       console.error(`[reactivity-store] unexpected update for reactivity-store, should not update a state on the server`);
@@ -181,4 +178,12 @@ export class Controller<T = any> {
 
     this._isActive = false;
   }
+
+  inactive() {
+    this._isActive = false;
+  }
+
+  active() {
+    this._isActive = true;
+  }
 }
diff --git a/packages/r-store/src/shared/hook.ts b/packages/r-store/src/shared/hook.ts
@@ -13,8 +13,6 @@ import { traverse, traverseShallow } from "./tools";
 import type { LifeCycle } from "./lifeCycle";
 import type { DeepReadonly, UnwrapNestedRefs } from "@vue/reactivity";
 
-const temp = new Set<Controller>();
-
 /**
  * @internal
  */
@@ -125,15 +123,14 @@ export const createHook = <T extends Record<string, unknown>, C extends Record<s
 
       // initial
       useMemo(() => {
-        if (!active) return;
         ControllerInstance.run();
         getSelected();
       }, [ControllerInstance, getSelected]);
 
       // !TODO try to improve the performance
       // rerun when the 'selector' change
       useMemo(() => {
-        if (active && prevSelector !== selector) {
+        if (prevSelector !== selector) {
           ControllerInstance.run();
           getSelected();
         }
@@ -154,19 +151,21 @@ export const createHook = <T extends Record<string, unknown>, C extends Record<s
 
         ControllerInstance._devResult = ref.current;
 
-        if (!active) {
-          console.error("current `useSelector` have been inactivated, check your code first");
-        }
-
         useEffect(() => {
           setDevController(ControllerInstance, initialState);
+
           return () => {
             delDevController(ControllerInstance, initialState);
           };
-        }, []);
+        }, [ControllerInstance]);
       }
 
-      useEffect(() => () => ControllerInstance.stop(), [ControllerInstance]);
+      useEffect(() => {
+        ControllerInstance.active();
+        return () => {
+          ControllerInstance.inactive();
+        };
+      }, [ControllerInstance]);
 
       return ref.current;
     };
@@ -239,17 +238,11 @@ export const createHook = <T extends Record<string, unknown>, C extends Record<s
       }
     };
 
-    const controller = new Controller(subscribeSelector, lifeCycle, temp, InternalNameSpace.$$__subscribe__$$, () => cb());
+    const controller = new Controller(subscribeSelector, lifeCycle, controllerList, InternalNameSpace.$$__subscribe__$$, () => cb());
 
-    if (active) {
-      controller.run();
-    }
+    controller.run();
 
     if (__DEV__) {
-      if (!active) {
-        console.error("can not subscribe an inactivated hook, check your code first");
-      }
-
       setDevController(controller, initialState);
     }