@unitedstatespowersquadrons/components 1.4.0-2 → 1.4.0-3

package/Toasts/GlobalToasts.tsx

@@ -15,9 +15,7 @@ interface BroadcastPayload {
 }
 
 const sortBroadcastsFirst = (toasts: readonly ToastProps[]): ToastProps[] => (
-  [...toasts].sort((a, b) => (
-    Number(b.kind === "broadcast") - Number(a.kind === "broadcast")
-  ))
+  [...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,17 +36,13 @@ const GlobalToasts = ({ allowedDomains }: Props) => {
 
     return () => {
       sub.unsubscribe();
-      if (broadcastSubscriptionRef.current === sub) {
-        broadcastSubscriptionRef.current = null;
-      }
+      if (broadcastSubscriptionRef.current === sub) broadcastSubscriptionRef.current = null;
     };
   }, []);
 
   const sorted = sortBroadcastsFirst(toasts);
 
-  return allowedDomains
-    ? <Toasts allowedDomains={allowedDomains} dismiss={dismissToastGlobal} toasts={sorted} />
-    : <Toasts dismiss={dismissToastGlobal} toasts={sorted} />;
+  return <Toasts allowedDomains={allowedDomains} dismiss={dismissToastGlobal} toasts={sorted} />;
 };
 
 export default GlobalToasts;

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/package.json

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