@fluid-topics/ft-wc-utils 1.2.15 → 1.2.17

package/build/redux/FtLitElementRedux.d.ts

@@ -13,7 +13,7 @@ export declare class FtLitElementRedux extends FtLitElement {
     static reduxEventListeners: Map<string, ReduxEventListenerInit>;
     private readonly [internalStoresUnsubscribers];
     private readonly [internalStores];
-    private [internalReduxEventsUnsubscribers];
+    private readonly [internalReduxEventsUnsubscribers];
     private get reduxConstructor();
     protected update(props: PropertyValues): void;
     private getUnnamedStore;
@@ -21,9 +21,11 @@ export declare class FtLitElementRedux extends FtLitElement {
     protected addStore(store: FtReduxStore, name?: string): void;
     protected addStore(store: Store, name: string): void;
     protected removeStore(storeOrName: FtReduxStore | string): void;
-    private setupStore;
     private setupStores;
     private updateFromStores;
+    /**
+     * Only call after unsubscribeFromStores or unsubscribeFromStore with same name
+     */
     private subscribeToStore;
     private unsubscribeFromStores;
     private unsubscribeFromStore;

package/build/redux/FtLitElementRedux.js

@@ -9,7 +9,7 @@ class FtLitElementRedux extends FtLitElement {
         super(...arguments);
         this[_a] = new Map();
         this[_b] = new Map();
-        this[_c] = [];
+        this[_c] = new Map();
     }
     get reduxConstructor() {
         return this.constructor;
@@ -35,18 +35,15 @@ class FtLitElementRedux extends FtLitElement {
         var _d;
         name = (_d = name !== null && name !== void 0 ? name : (isFtReduxStore(store) ? store.name : undefined)) !== null && _d !== void 0 ? _d : "default-store";
         this.unsubscribeFromStore(name);
-        this.setupStore(name, store);
+        this[internalStores].set(name, store);
+        this.subscribeToStore(name, store);
+        this.updateFromStores();
     }
     removeStore(storeOrName) {
         const name = typeof storeOrName === "string" ? storeOrName : storeOrName.name;
         this.unsubscribeFromStore(name);
         this[internalStores].delete(name);
     }
-    setupStore(name, store) {
-        this[internalStores].set(name, store);
-        this.subscribeToStore(name, store);
-        this.updateFromStores();
-    }
     setupStores() {
         this.unsubscribeFromStores();
         this[internalStores].forEach((store, name) => this.subscribeToStore(name, store));
@@ -63,15 +60,19 @@ class FtLitElementRedux extends FtLitElement {
             }
         });
     }
+    /**
+     * Only call after unsubscribeFromStores or unsubscribeFromStore with same name
+     */
     subscribeToStore(name, store) {
         var _d;
         this[internalStoresUnsubscribers].set(name, store.subscribe(() => this.updateFromStores()));
+        this[internalReduxEventsUnsubscribers].set(name, []);
         if (isFtReduxStore(store) && store.eventBus) {
             (_d = this.reduxConstructor.reduxEventListeners) === null || _d === void 0 ? void 0 : _d.forEach((init, methodName) => {
                 if (typeof this[methodName] === "function" && (!init.store || store.name === init.store)) {
                     const callback = (e) => this[methodName](e);
                     store.addEventListener(init.eventName, callback);
-                    this[internalReduxEventsUnsubscribers].push(() => store.removeEventListener(init.eventName, callback));
+                    this[internalReduxEventsUnsubscribers].get(name).push(() => store.removeEventListener(init.eventName, callback));
                 }
             });
         }
@@ -79,14 +80,15 @@ class FtLitElementRedux extends FtLitElement {
     }
     unsubscribeFromStores() {
         this[internalStoresUnsubscribers].forEach((_, key) => this.unsubscribeFromStore(key));
-        this[internalReduxEventsUnsubscribers].forEach(unsub => unsub());
-        this[internalReduxEventsUnsubscribers] = [];
     }
     unsubscribeFromStore(name) {
+        var _d;
         if (this[internalStoresUnsubscribers].has(name)) {
             this[internalStoresUnsubscribers].get(name)();
         }
         this[internalStoresUnsubscribers].delete(name);
+        (_d = this[internalReduxEventsUnsubscribers].get(name)) === null || _d === void 0 ? void 0 : _d.forEach(unsub => unsub());
+        this[internalReduxEventsUnsubscribers].delete(name);
     }
     onStoreAvailable(name) {
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-wc-utils",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "description": "Internal web components tools",
   "author": "Fluid Topics <devtopics@antidot.net>",
   "license": "ISC",
@@ -24,5 +24,5 @@
     "mark.js": "8.11.1",
     "moment": "2.29.4"
   },
-  "gitHead": "158c47a3701bd302f5e9ed9103d9709158596371"
+  "gitHead": "fa3e6380c9989244a572de9d0067913ee624e09b"
 }