@tramvai/state 4.19.5 → 4.20.7

package/lib/dispatcher/childDispatcherContext.d.ts

@@ -28,7 +28,9 @@ export declare class ChildDispatcherContext<TContext> extends DispatcherContext<
         optional: true;
     }): InstanceType<T> | null;
     registerStore(store: Reducer<any>): void;
+    unregisterStore(store: Reducer<any>): void;
     _getParentAllowedStore(storeName: string): InstanceType<StoreClass> | null;
+    _unsubscribeFromParentAllowedStore(storeName: string): void;
 }
 export {};
 //# sourceMappingURL=childDispatcherContext.d.ts.map

package/lib/dispatcher/childDispatcherContext.es.js

@@ -45,6 +45,18 @@ class ChildDispatcherContext extends DispatcherContext {
         }
         super.registerStore(store);
     }
+    unregisterStore(store) {
+        const { storeName } = store;
+        if (this.dispatcher.stores[storeName]) {
+            super.unregisterStore(store);
+            return;
+        }
+        if (this.allowedParentStores.has(storeName)) {
+            this._unsubscribeFromParentAllowedStore(storeName);
+            return;
+        }
+        super.unregisterStore(store);
+    }
     _getParentAllowedStore(storeName) {
         // use just storeName to prevent store initialization on the root-app side
         const storeInstance = this.parentDispatcherContext.getStore({
@@ -57,6 +69,19 @@ class ChildDispatcherContext extends DispatcherContext {
         this.storeSubscribe(storeName, storeInstance);
         return storeInstance;
     }
+    _unsubscribeFromParentAllowedStore(storeName) {
+        var _a, _b;
+        const storeInstance = this.parentDispatcherContext.getStore({
+            store: storeName,
+            optional: true,
+        });
+        if (storeInstance) {
+            // in strict mode, unsubscribe callback in `useStore` is fired twice, with same `addedReducerRef.current` value,
+            // and this callback already will be deleted in first call and throw error `is not a function`, so make it optional
+            (_b = (_a = this.storeUnsubscribeCallbacks)[storeName]) === null || _b === void 0 ? void 0 : _b.call(_a);
+            delete this.storeUnsubscribeCallbacks[storeName];
+        }
+    }
 }
 
 export { ChildDispatcherContext };

package/lib/dispatcher/childDispatcherContext.js

@@ -49,6 +49,18 @@ class ChildDispatcherContext extends dispatcherContext.DispatcherContext {
         }
         super.registerStore(store);
     }
+    unregisterStore(store) {
+        const { storeName } = store;
+        if (this.dispatcher.stores[storeName]) {
+            super.unregisterStore(store);
+            return;
+        }
+        if (this.allowedParentStores.has(storeName)) {
+            this._unsubscribeFromParentAllowedStore(storeName);
+            return;
+        }
+        super.unregisterStore(store);
+    }
     _getParentAllowedStore(storeName) {
         // use just storeName to prevent store initialization on the root-app side
         const storeInstance = this.parentDispatcherContext.getStore({
@@ -61,6 +73,19 @@ class ChildDispatcherContext extends dispatcherContext.DispatcherContext {
         this.storeSubscribe(storeName, storeInstance);
         return storeInstance;
     }
+    _unsubscribeFromParentAllowedStore(storeName) {
+        var _a, _b;
+        const storeInstance = this.parentDispatcherContext.getStore({
+            store: storeName,
+            optional: true,
+        });
+        if (storeInstance) {
+            // in strict mode, unsubscribe callback in `useStore` is fired twice, with same `addedReducerRef.current` value,
+            // and this callback already will be deleted in first call and throw error `is not a function`, so make it optional
+            (_b = (_a = this.storeUnsubscribeCallbacks)[storeName]) === null || _b === void 0 ? void 0 : _b.call(_a);
+            delete this.storeUnsubscribeCallbacks[storeName];
+        }
+    }
 }
 
 exports.ChildDispatcherContext = ChildDispatcherContext;

package/lib/dispatcher/dispatcherContext.es.js

@@ -87,6 +87,11 @@ Have you forgot to register reducer or add event handler in existing reducer?
         return dispatch;
     }
     storeSubscribe(storeName, storeInstance) {
+        // prevent multiple subscriptions in internal reducer event emitter,
+        // because only last will be saved here in dispatcher and can be unsubscribed
+        if (this.storeUnsubscribeCallbacks[storeName]) {
+            return;
+        }
         const subscribeHandler = () => {
             const newState = storeInstance.getState();
             if (newState !== this.fullState[storeName]) {

package/lib/dispatcher/dispatcherContext.js

@@ -95,6 +95,11 @@ Have you forgot to register reducer or add event handler in existing reducer?
         return dispatch;
     }
     storeSubscribe(storeName, storeInstance) {
+        // prevent multiple subscriptions in internal reducer event emitter,
+        // because only last will be saved here in dispatcher and can be unsubscribed
+        if (this.storeUnsubscribeCallbacks[storeName]) {
+            return;
+        }
         const subscribeHandler = () => {
             const newState = storeInstance.getState();
             if (newState !== this.fullState[storeName]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/state",
-  "version": "4.19.5",
+  "version": "4.20.7",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@tinkoff/react-hooks": "0.3.1",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/types-actions-state-context": "4.19.5",
+    "@tramvai/types-actions-state-context": "4.20.7",
     "@types/hoist-non-react-statics": "^3.3.1",
     "invariant": "^2.2.4",
     "react-is": ">=17",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@reatom/core": "^1.1.5",
-    "@tramvai/core": "4.19.5",
+    "@tramvai/core": "4.20.7",
     "@types/invariant": "^2.2.31",
     "@types/react-is": "^17.0.0",
     "@types/use-sync-external-store": "^0.0.3",