@unitedstatespowersquadrons/components 1.4.0-1 → 1.4.0-3

package/Toasts/GlobalToasts.tsx

@@ -14,10 +14,8 @@ interface BroadcastPayload {
   dismissToast?: number;
 }
 
-const sortBroadcastsFirst = (toasts: ReadonlyArray<ToastProps>): ToastProps[] => (
-  [...toasts].sort((a, b) => (
-    Number(b.kind === "broadcast") - Number(a.kind === "broadcast")
-  ))
+const sortBroadcastsFirst = (toasts: readonly ToastProps[]): ToastProps[] => (
+  [...toasts].sort((a, b) => Number(b.kind === "broadcast") - Number(a.kind === "broadcast"))
 );
 
 const GlobalToasts = ({ allowedDomains }: Props) => {
@@ -29,12 +27,8 @@ const GlobalToasts = ({ allowedDomains }: Props) => {
       { channel: "BroadcastToastChannel" },
       {
         received: (data: BroadcastPayload) => {
-          if (data.toasts) {
-            data.toasts.forEach(t => toastStore.add({ ...t, kind: "broadcast" }));
-          }
-          if (typeof data.dismissToast === "number") {
-            toastStore.remove(data.dismissToast);
-          }
+          if (data.toasts) data.toasts.forEach(t => toastStore.add({ kind: "broadcast", ...t }));
+          if (typeof data.dismissToast === "number") toastStore.remove(data.dismissToast);
         },
       }
     );
@@ -42,19 +36,13 @@ const GlobalToasts = ({ allowedDomains }: Props) => {
 
     return () => {
       sub.unsubscribe();
-      if (broadcastSubscriptionRef.current === sub) {
-        broadcastSubscriptionRef.current = null;
-      }
+      if (broadcastSubscriptionRef.current === sub) broadcastSubscriptionRef.current = null;
     };
   }, []);
 
-  return (
-    <Toasts
-      allowedDomains={allowedDomains}
-      dismiss={dismissToastGlobal}
-      toasts={sortBroadcastsFirst(toasts)}
-    />
-  );
+  const sorted = sortBroadcastsFirst(toasts);
+
+  return <Toasts allowedDomains={allowedDomains} dismiss={dismissToastGlobal} toasts={sorted} />;
 };
 
 export default GlobalToasts;

package/Toasts/Toast.tsx

@@ -155,7 +155,10 @@ const Toast = (props: Props) => {
   const opacityClass = dismissed ? classes.dismissed : classes.visible;
 
   return (
-    <div className={classNames(classes.toast, statusClassName, opacityClass, isBroadcast && classes.broadcast)} key={`toast-${id}`}>
+    <div
+      className={classNames(classes.toast, statusClassName, opacityClass, isBroadcast && classes.broadcast)}
+      key={`toast-${id}`}
+    >
       <div className={classes.toastTitle}>
         <FontAwesomeIcon fa="fw" icon={icon} mode="duotone" />
         {isBroadcast && <span className={classes.broadcastTag}>Broadcast</span>}

package/Toasts/Toasts.tsx

@@ -7,7 +7,7 @@ import { DismissFunc, ToastProps, ToastRemoveAppAction } from "./types";
 import { DispatchFunc } from "../";
 
 interface BaseProps {
-  allowedDomains?: string[];
+  allowedDomains?: string[] | undefined;
   toasts?: ToastProps[];
 }
 

package/Toasts/globalStore.ts

@@ -81,6 +81,6 @@ const subscribe = (listener: Listener): (() => void) => {
   return () => { listeners.delete(listener); };
 };
 
-const getSnapshot = (): ReadonlyArray<ToastProps> => toasts;
+const getSnapshot = (): readonly ToastProps[] => toasts;
 
 export const toastStore = { add, clear, dismiss, getSnapshot, remove, subscribe };

package/Toasts/useBroadcastChannel.ts

@@ -8,6 +8,7 @@ export const useBroadcastChannel = (): BroadcastChannelHandle => ({
   send: (data: object) => {
     const sub = broadcastSubscriptionRef.current;
     if (!sub) {
+      // eslint-disable-next-line no-console
       console.warn("useBroadcastChannel: <GlobalToasts /> is not mounted; broadcast send ignored");
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unitedstatespowersquadrons/components",
-  "version": "1.4.0-1",
+  "version": "1.4.0-3",
   "description": "USPS shared React components library",
   "main": "index.tsx",
   "scripts": {