@fluid-topics/ft-wc-utils 1.2.2 → 1.2.3

package/build/redux/FtLitElementRedux.js

@@ -70,8 +70,8 @@ class FtLitElementRedux extends FtLitElement {
             (_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.eventBus.addEventListener(init.eventName, callback);
-                    this[internalReduxEventsUnsubscribers].push(() => store.eventBus.removeEventListener(init.eventName, callback));
+                    store.addEventListener(init.eventName, callback);
+                    this[internalReduxEventsUnsubscribers].push(() => store.removeEventListener(init.eventName, callback));
                 }
             });
         }

package/build/redux/FtReduxStore.d.ts

@@ -1,18 +1,18 @@
 import { Action, AnyAction, CaseReducerActions, Dispatch, Observable, Reducer, Slice, SliceCaseReducers, Store, Unsubscribe } from "@reduxjs/toolkit";
 import { DefaultStateReducer, FtCreateReduxStoreOptions, FtReduxStoreActions } from "./models";
 import { FtCommandQueue } from "./FtCommandQueue";
+import { WithEventBus } from "../events";
 declare global {
     interface Window {
         ftReduxStores: Record<string, Store<any, any>>;
     }
 }
-export declare class FtReduxStore<State = any, CR extends SliceCaseReducers<State> = SliceCaseReducers<State>, A extends Action = AnyAction> implements Store<State, FtReduxStoreActions<A>>, Slice<State, CR, string> {
+export declare class FtReduxStore<State = any, CR extends SliceCaseReducers<State> = SliceCaseReducers<State>, A extends Action = AnyAction> extends WithEventBus implements Store<State, FtReduxStoreActions<A>>, Slice<State, CR, string> {
     private readonly reduxSlice;
     private readonly reduxStore;
     readonly isFtReduxStore = true;
     static get<State = any, CR extends SliceCaseReducers<State> = SliceCaseReducers<State>, A extends Action = AnyAction>(name: string): FtReduxStore<State, CR, A> | undefined;
     static get<State = any, CR extends SliceCaseReducers<State> = SliceCaseReducers<State>, A extends Action = AnyAction>(options: FtCreateReduxStoreOptions<State, CR>): FtReduxStore<State, CR, A>;
-    readonly eventBus: EventTarget;
     readonly commands: FtCommandQueue;
     private constructor();
     clear(): void;

package/build/redux/FtReduxStore.js

@@ -1,10 +1,11 @@
 import { configureStore, createSlice } from "@reduxjs/toolkit";
 import { isFtReduxStore } from "./models";
 import { FtCommandQueue } from "./FtCommandQueue";
+import { WithEventBus } from "../events";
 if (!window.ftReduxStores) {
     window.ftReduxStores = {};
 }
-export class FtReduxStore {
+export class FtReduxStore extends WithEventBus {
     static get(nameOrOptions) {
         var _a;
         const name = typeof nameOrOptions === "string" ? nameOrOptions : nameOrOptions.name;
@@ -34,10 +35,10 @@ export class FtReduxStore {
         return window.ftReduxStores[options.name] = new FtReduxStore(reduxSlice, reduxStore);
     }
     constructor(reduxSlice, reduxStore) {
+        super();
         this.reduxSlice = reduxSlice;
         this.reduxStore = reduxStore;
         this.isFtReduxStore = true;
-        this.eventBus = document.createElement("event-bus");
         this.commands = new FtCommandQueue();
         // Add proxy to automatically dispatch changes
         this.actions = new Proxy(this.reduxSlice.actions, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-wc-utils",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Internal web components tools",
   "author": "Fluid Topics <devtopics@antidot.net>",
   "license": "ISC",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@floating-ui/dom": "1.5.3",
     "@fluid-topics/design-system-variables": "0.1.5",
-    "@fluid-topics/public-api": "1.0.77",
+    "@fluid-topics/public-api": "1.0.78",
     "@reduxjs/toolkit": "1.9.5",
     "@types/mark.js": "8.11.12",
     "@webcomponents/scoped-custom-element-registry": "0.0.9",
@@ -24,5 +24,5 @@
     "mark.js": "8.11.1",
     "moment": "2.29.4"
   },
-  "gitHead": "b12fa278dd5bc8a5b9d027ed52dae60b4c821ec4"
+  "gitHead": "31c1696257f82afca00cddf81033e8984f665c43"
 }