@notificationapi/react 0.0.25 → 0.0.27

package/dist/components/Preferences/Preferences.js

@@ -523,59 +523,57 @@ function Le() {
   const e = ie(oe);
   if (!e || !e.preferences)
     return null;
-  const n = e.preferences.notifications.map(
-    (t) => {
-      var f, r, s;
-      const o = (f = e.preferences) == null ? void 0 : f.preferences.filter(
-        (a) => a.notificationId === t.notificationId && !a.subNotificationId
-      ), i = (r = e.preferences) == null ? void 0 : r.preferences.filter(
-        (a) => a.notificationId === t.notificationId && a.subNotificationId
-      ), c = (s = e.preferences) == null ? void 0 : s.subNotifications.filter(
-        (a) => i == null ? void 0 : i.find(
-          (v) => v.subNotificationId === a.subNotificationId
-        )
-      );
-      return {
-        label: t.title,
-        key: t.notificationId,
-        children: /* @__PURE__ */ ae(G, { children: [
-          /* @__PURE__ */ B(
-            L,
-            {
-              notification: t,
-              preferences: o || [],
-              updateDelivery: e.updateDelivery
-            },
-            t.notificationId
-          ),
-          c == null ? void 0 : c.map((a) => /* @__PURE__ */ B(
-            q,
-            {
-              bordered: !1,
-              items: [
-                {
-                  label: a.title,
-                  key: a.subNotificationId,
-                  children: /* @__PURE__ */ B(
-                    L,
-                    {
-                      notification: t,
-                      preferences: i || [],
-                      updateDelivery: e.updateDelivery,
-                      subNotificationId: a.subNotificationId
-                    },
-                    a.subNotificationId
-                  )
-                }
-              ],
-              defaultActiveKey: []
-            },
-            a.subNotificationId
-          ))
-        ] })
-      };
-    }
-  );
+  const n = e.preferences.notifications.sort((t, o) => t.title.localeCompare(o.title)).map((t) => {
+    var f, r, s;
+    const o = (f = e.preferences) == null ? void 0 : f.preferences.filter(
+      (a) => a.notificationId === t.notificationId && !a.subNotificationId
+    ), i = (r = e.preferences) == null ? void 0 : r.preferences.filter(
+      (a) => a.notificationId === t.notificationId && a.subNotificationId
+    ), c = (s = e.preferences) == null ? void 0 : s.subNotifications.filter(
+      (a) => i == null ? void 0 : i.find(
+        (v) => v.subNotificationId === a.subNotificationId
+      )
+    );
+    return {
+      label: t.title,
+      key: t.notificationId,
+      children: /* @__PURE__ */ ae(G, { children: [
+        /* @__PURE__ */ B(
+          L,
+          {
+            notification: t,
+            preferences: o || [],
+            updateDelivery: e.updateDelivery
+          },
+          t.notificationId
+        ),
+        c == null ? void 0 : c.map((a) => /* @__PURE__ */ B(
+          q,
+          {
+            bordered: !1,
+            items: [
+              {
+                label: a.title,
+                key: a.subNotificationId,
+                children: /* @__PURE__ */ B(
+                  L,
+                  {
+                    notification: t,
+                    preferences: i || [],
+                    updateDelivery: e.updateDelivery,
+                    subNotificationId: a.subNotificationId
+                  },
+                  a.subNotificationId
+                )
+              }
+            ],
+            defaultActiveKey: []
+          },
+          a.subNotificationId
+        ))
+      ] })
+    };
+  });
   return /* @__PURE__ */ B(G, { children: /* @__PURE__ */ B(q, { items: n, defaultActiveKey: [] }) });
 }
 export {

package/dist/components/Provider/index.d.ts

@@ -10,6 +10,12 @@ export type Context = {
     markAsUnarchived: (ids: string[] | 'ALL') => void;
     markAsClicked: (ids: string[]) => void;
     updateDelivery: (notificationId: string, channel: Channels, delivery: DeliveryOptionsForEmail | DeliveryOptionsForInappWeb | BaseDeliveryOptions, subNotificationId?: string) => void;
+    updateDeliveries: (params: {
+        notificationId: string;
+        channel: Channels;
+        delivery: DeliveryOptionsForEmail | DeliveryOptionsForInappWeb | BaseDeliveryOptions;
+        subNotificationId?: string;
+    }[]) => void;
 };
 export declare const NotificationAPIContext: import('react').Context<Context | undefined>;
 type Props = {
@@ -20,6 +26,8 @@ type Props = {
     wsURL?: string;
     initialLoadMaxCount?: number;
     initialLoadMaxAge?: Date;
+    playSoundOnNewNotification?: boolean;
+    newNotificationSoundPath?: string;
 };
 export declare const NotificationAPIProvider: React.FunctionComponent<PropsWithChildren<Props>> & {
     useNotificationAPIContext: typeof useNotificationAPIContext;

package/dist/components/Provider/index.js

@@ -1,15 +1,15 @@
-import { jsx as W } from "react/jsx-runtime";
-import { createContext as H, useState as N, useCallback as A, useMemo as B, useRef as m, useEffect as x, useContext as G } from "react";
-const J = async (e, c, d, r, f, I, h) => {
-  const g = _(r, f, I), l = await fetch(
-    `https://${c}/${r}/users/${encodeURIComponent(
+import { jsx as B } from "react/jsx-runtime";
+import { createContext as F, useState as N, useCallback as b, useMemo as G, useRef as m, useEffect as M, useContext as J } from "react";
+const _ = async (e, c, r, a, f, w, p) => {
+  const h = z(a, f, w), l = await fetch(
+    `https://${c}/${a}/users/${encodeURIComponent(
       f
-    )}/${d}`,
+    )}/${r}`,
     {
       method: e,
-      body: JSON.stringify(h),
+      body: JSON.stringify(p),
       headers: {
-        Authorization: `Basic ${g}`
+        Authorization: `Basic ${h}`
       }
     }
   );
@@ -18,7 +18,7 @@ const J = async (e, c, d, r, f, I, h) => {
   } catch {
     return;
   }
-}, _ = (e, c, d) => btoa(d ? e + ":" + c + ":" + d : e + ":" + c), L = {
+}, z = (e, c, r) => btoa(r ? e + ":" + c + ":" + r : e + ":" + c), U = {
   host: "api.notificationapi.com",
   websocketHost: "ws.notificationapi.com",
   userId: "",
@@ -31,43 +31,43 @@ const J = async (e, c, d, r, f, I, h) => {
   onNewInAppNotifications: void 0,
   keepWebSocketAliveForSeconds: 86400
   // 24 hours
-}, i = {
-  config: L,
+}, o = {
+  config: U,
   init: function(e) {
-    return this.config = { ...L, ...e }, {
+    return this.config = { ...U, ...e }, {
       ...this
     };
   },
   rest: {
-    generic: function(e, c, d) {
-      return J(
+    generic: function(e, c, r) {
+      return _(
         e,
-        i.config.host,
+        o.config.host,
         c,
-        i.config.clientId,
-        i.config.userId,
-        i.config.hashedUserId,
-        d
+        o.config.clientId,
+        o.config.userId,
+        o.config.hashedUserId,
+        r
       );
     },
     getNotifications: function(e, c) {
-      return i.rest.generic(
+      return o.rest.generic(
         "GET",
         `notifications/INAPP_WEB?count=${c}&before=${e}`
       );
     },
     patchNotifications: function(e) {
-      return i.rest.generic(
+      return o.rest.generic(
         "PATCH",
         "notifications/INAPP_WEB",
         e
       );
     },
     getPreferences: function() {
-      return i.rest.generic("GET", "preferences");
+      return o.rest.generic("GET", "preferences");
     },
     postPreferences: function(e) {
-      return i.rest.generic(
+      return o.rest.generic(
         "POST",
         "preferences",
         e
@@ -77,24 +77,24 @@ const J = async (e, c, d, r, f, I, h) => {
   websocket: {
     object: void 0,
     connect: function() {
-      let e = `wss://${i.config.websocketHost}?userId=${encodeURIComponent(i.config.userId)}&envId=${i.config.clientId}`;
-      return i.config.hashedUserId && (e += `&userIdHash=${encodeURIComponent(i.config.hashedUserId)}`), i.websocket.object = new WebSocket(e), i.websocket.object.onmessage = (c) => {
-        const d = JSON.parse(c.data);
-        if (!(!d || !d.route) && d.route === "inapp_web/new_notifications") {
-          const r = d;
-          i.config.onNewInAppNotifications && i.config.onNewInAppNotifications(
-            r.payload.notifications
+      let e = `wss://${o.config.websocketHost}?userId=${encodeURIComponent(o.config.userId)}&envId=${o.config.clientId}`;
+      return o.config.hashedUserId && (e += `&userIdHash=${encodeURIComponent(o.config.hashedUserId)}`), o.websocket.object = new WebSocket(e), o.websocket.object.onmessage = (c) => {
+        const r = JSON.parse(c.data);
+        if (!(!r || !r.route) && r.route === "inapp_web/new_notifications") {
+          const a = r;
+          o.config.onNewInAppNotifications && o.config.onNewInAppNotifications(
+            a.payload.notifications
           );
         }
-      }, i.websocket.object;
+      }, o.websocket.object;
     },
     disconnect: function(e) {
       var c;
-      i.websocket.object && ((c = i.websocket.object) == null || c.close(), e && e(i.websocket.object));
+      o.websocket.object && ((c = o.websocket.object) == null || c.close(), e && e(o.websocket.object));
     }
   },
   openWebSocket: function() {
-    return i.websocket.connect(() => {
+    return o.websocket.connect(() => {
       setTimeout(
         () => {
           this.websocket.disconnect(() => {
@@ -106,23 +106,23 @@ const J = async (e, c, d, r, f, I, h) => {
     });
   },
   getInAppNotifications: async (e) => {
-    const c = e.maxCountNeeded || i.config.getInAppDefaultCount, d = e.oldestNeeded || i.config.getInAppDefaultOldest;
-    let r = [], f = e.before, I = !0, h = !0;
-    for (; h; ) {
-      const g = (await i.rest.getNotifications(
+    const c = e.maxCountNeeded || o.config.getInAppDefaultCount, r = e.oldestNeeded || o.config.getInAppDefaultOldest;
+    let a = [], f = e.before, w = !0, p = !0;
+    for (; p; ) {
+      const h = (await o.rest.getNotifications(
         f,
         c
       )).notifications.filter(
-        (l) => !r.find((p) => p.id === l.id)
+        (l) => !a.find((g) => g.id === l.id)
       );
-      f = g.reduce(
-        (l, p) => l < p.date ? l : p.date,
+      f = h.reduce(
+        (l, g) => l < g.date ? l : g.date,
         e.before
-      ), r = [...r, ...g], I = g.length > 0, h = !0, (!I || r.length >= c || f < d) && (h = !1);
+      ), a = [...a, ...h], w = h.length > 0, p = !0, (!w || a.length >= c || f < r) && (p = !1);
     }
     return {
-      items: r,
-      hasMore: I,
+      items: a,
+      hasMore: w,
       oldestReceived: f
     };
   },
@@ -130,154 +130,164 @@ const J = async (e, c, d, r, f, I, h) => {
     const c = {
       trackingIds: e.ids
     };
-    return e.archived === !0 ? c.archived = (/* @__PURE__ */ new Date()).toISOString() : e.archived === !1 && (c.archived = null), e.clicked === !0 ? c.clicked = (/* @__PURE__ */ new Date()).toISOString() : e.clicked === !1 && (c.clicked = null), e.opened === !0 ? c.opened = (/* @__PURE__ */ new Date()).toISOString() : e.opened === !1 && (c.opened = null), i.rest.patchNotifications(c);
+    return e.archived === !0 ? c.archived = (/* @__PURE__ */ new Date()).toISOString() : e.archived === !1 && (c.archived = null), e.clicked === !0 ? c.clicked = (/* @__PURE__ */ new Date()).toISOString() : e.clicked === !1 && (c.clicked = null), e.opened === !0 ? c.opened = (/* @__PURE__ */ new Date()).toISOString() : e.opened === !1 && (c.opened = null), o.rest.patchNotifications(c);
   },
-  getPreferences: async () => i.rest.getPreferences(),
-  updateDeliveryOption: async (e) => i.rest.postPreferences([e])
-}, M = H(
+  getPreferences: async () => o.rest.getPreferences(),
+  updateDeliveryOption: async (e) => o.rest.postPreferences([e])
+}, R = F(
   void 0
-), z = (e) => {
-  const d = {
+), q = (e) => {
+  const r = {
     ...{
       apiURL: "https://api.notificationapi.com",
       wsURL: "wss://ws.notificationapi.com",
       initialLoadMaxCount: 1e3,
-      initialLoadMaxAge: new Date((/* @__PURE__ */ new Date()).setMonth((/* @__PURE__ */ new Date()).getMonth() - 3))
+      initialLoadMaxAge: new Date((/* @__PURE__ */ new Date()).setMonth((/* @__PURE__ */ new Date()).getMonth() - 3)),
+      playSoundOnNewNotification: !1,
+      newNotificationSoundPath: "https://proxy.notificationsounds.com/notification-sounds/elegant-notification-sound/download/file-sounds-1233-elegant.mp3"
     },
     ...e
-  }, [r, f] = N(), [I, h] = N(), [g, l] = N(!1), [p, D] = N((/* @__PURE__ */ new Date()).toISOString()), [b, v] = N(!0), S = A((o) => {
+  }, [a, f] = N(), [w, p] = N(), [h, l] = N(!1), [g, y] = N((/* @__PURE__ */ new Date()).toISOString()), [A, D] = N(!0), P = b(() => {
+    r.playSoundOnNewNotification && new Audio(r.newNotificationSoundPath).play().catch((s) => {
+      console.log("Failed to play new notification sound:", s);
+    });
+  }, [r.newNotificationSoundPath, r.playSoundOnNewNotification]), S = b((n) => {
     const s = (/* @__PURE__ */ new Date()).toISOString();
-    f((t) => (o = o.filter((n) => !(n.expDate && new Date(n.expDate * 1e3).toISOString() > s || n.date > s)), t ? [
-      ...o.filter((n) => !t.find((a) => a.id === n.id)),
+    f((t) => (n = n.filter((i) => !(i.expDate && new Date(i.expDate * 1e3).toISOString() > s || i.date > s)), t ? [
+      ...n.filter((i) => !t.find((d) => d.id === i.id)),
       ...t
-    ] : o));
-  }, []), u = B(() => i.init({
+    ] : n));
+  }, []), u = G(() => o.init({
     clientId: e.clientId,
     userId: e.userId,
     hashedUserId: e.hashedUserId,
-    onNewInAppNotifications: (o) => {
-      S(o);
+    onNewInAppNotifications: (n) => {
+      P(), S(n);
     }
   }), [
     e.clientId,
     e.userId,
     e.hashedUserId,
-    S
-  ]), y = A(
-    async (o, s) => {
-      const t = await u.rest.getNotifications(o, s);
-      D(t.oldestReceived), v(t.couldLoadMore), S(t.notifications);
+    S,
+    P
+  ]), v = b(
+    async (n, s) => {
+      const t = await u.rest.getNotifications(n, s);
+      y(t.oldestReceived), D(t.couldLoadMore), S(t.notifications);
     },
     [S, u.rest]
-  ), O = m(b), P = m(g), C = m(p);
-  x(() => {
-    O.current = b, P.current = g, C.current = p;
-  }, [b, g, p]);
-  const k = A(
-    async (o) => {
-      if (!(!o && (!O.current || P.current))) {
+  ), O = m(A), C = m(h), x = m(g);
+  M(() => {
+    O.current = A, C.current = h, x.current = g;
+  }, [A, h, g]);
+  const k = b(
+    async (n) => {
+      if (!(!n && (!O.current || C.current))) {
         l(!0);
         try {
-          await y(
-            o ? (/* @__PURE__ */ new Date()).toISOString() : C.current,
-            o ? d.initialLoadMaxCount : 1e3
+          await v(
+            n ? (/* @__PURE__ */ new Date()).toISOString() : x.current,
+            n ? r.initialLoadMaxCount : 1e3
           );
         } finally {
           l(!1);
         }
       }
     },
-    [d.initialLoadMaxCount, y]
-  ), U = async (o) => {
-    if (!r)
+    [r.initialLoadMaxCount, v]
+  ), $ = async (n) => {
+    if (!a)
       return;
-    const s = (/* @__PURE__ */ new Date()).toISOString(), t = r.filter((n) => o.includes(n.id) && !n.clicked).map((n) => n.id);
-    u.updateInAppNotifications({ ids: t, clicked: !0 }), f((n) => {
-      if (!n)
+    const s = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((i) => n.includes(i.id) && !i.clicked).map((i) => i.id);
+    u.updateInAppNotifications({ ids: t, clicked: !0 }), f((i) => {
+      if (!i)
         return [];
-      const a = [...n];
-      return a.filter((w) => t.includes(w.id)).forEach((w) => {
-        w.clicked = s;
-      }), a;
+      const d = [...i];
+      return d.filter((I) => t.includes(I.id)).forEach((I) => {
+        I.clicked = s;
+      }), d;
     });
-  }, R = async () => {
-    if (!r)
+  }, E = async () => {
+    if (!a)
       return;
-    const o = (/* @__PURE__ */ new Date()).toISOString(), s = r.filter((t) => !t.opened || !t.seen).map((t) => t.id);
+    const n = (/* @__PURE__ */ new Date()).toISOString(), s = a.filter((t) => !t.opened || !t.seen).map((t) => t.id);
     s.length !== 0 && (u.updateInAppNotifications({
       ids: s,
       opened: !0
     }), f((t) => {
       if (!t)
         return [];
-      const n = [...t];
-      return n.filter((a) => s.includes(a.id)).forEach((a) => {
-        a.opened = o, a.seen = !0;
-      }), n;
+      const i = [...t];
+      return i.filter((d) => s.includes(d.id)).forEach((d) => {
+        d.opened = n, d.seen = !0;
+      }), i;
     }));
-  }, $ = async (o) => {
-    if (!r)
+  }, j = async (n) => {
+    if (!a)
       return;
-    const s = r.filter((t) => t.archived && (o === "ALL" || o.includes(t.id))).map((t) => t.id);
+    const s = a.filter((t) => t.archived && (n === "ALL" || n.includes(t.id))).map((t) => t.id);
     s.length !== 0 && (u.updateInAppNotifications({
       ids: s,
       archived: !1
     }), f((t) => {
       if (!t)
         return [];
-      const n = [...t];
-      return n.filter((a) => s.includes(a.id)).forEach((a) => {
-        a.archived = void 0;
-      }), n;
+      const i = [...t];
+      return i.filter((d) => s.includes(d.id)).forEach((d) => {
+        d.archived = void 0;
+      }), i;
     }));
-  }, E = async (o) => {
-    if (!r)
+  }, T = async (n) => {
+    if (!a)
       return;
-    const s = (/* @__PURE__ */ new Date()).toISOString(), t = r.filter((n) => !n.archived && (o === "ALL" || o.includes(n.id))).map((n) => n.id);
-    t.length !== 0 && (u.updateInAppNotifications({ ids: t, archived: !0 }), f((n) => {
-      if (!n)
+    const s = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((i) => !i.archived && (n === "ALL" || n.includes(i.id))).map((i) => i.id);
+    t.length !== 0 && (u.updateInAppNotifications({ ids: t, archived: !0 }), f((i) => {
+      if (!i)
         return [];
-      const a = [...n];
-      return a.filter((w) => t.includes(w.id)).forEach((w) => {
-        w.archived = s;
-      }), a;
+      const d = [...i];
+      return d.filter((I) => t.includes(I.id)).forEach((I) => {
+        I.archived = s;
+      }), d;
     }));
-  }, j = (o, s, t, n) => {
-    u.updateDeliveryOption({
-      notificationId: o,
+  }, W = (n, s, t, i) => L([
+    {
+      notificationId: n,
       channel: s,
       delivery: t,
-      subNotificationId: n
-    }).then(() => {
-      u.getPreferences().then((a) => {
-        h(a);
+      subNotificationId: i
+    }
+  ]), L = (n) => {
+    u.rest.postPreferences(n).then(() => {
+      u.getPreferences().then((s) => {
+        p(s);
       });
     });
   };
-  x(() => {
-    f([]), l(!1), h(void 0), D((/* @__PURE__ */ new Date()).toISOString()), v(!0), k(!0), u.openWebSocket(), u.getPreferences().then((o) => {
-      h(o);
+  M(() => {
+    f([]), l(!1), p(void 0), y((/* @__PURE__ */ new Date()).toISOString()), D(!0), k(!0), u.openWebSocket(), u.getPreferences().then((n) => {
+      p(n);
     });
   }, [u, k]);
-  const T = {
-    notifications: r,
-    preferences: I,
+  const H = {
+    notifications: a,
+    preferences: w,
     loadNotifications: k,
-    markAsOpened: R,
-    markAsArchived: E,
-    markAsUnarchived: $,
-    markAsClicked: U,
-    updateDelivery: j
+    markAsOpened: E,
+    markAsArchived: T,
+    markAsUnarchived: j,
+    markAsClicked: $,
+    updateDelivery: W,
+    updateDeliveries: L
   };
-  return /* @__PURE__ */ W(M.Provider, { value: T, children: e.children });
-}, F = () => {
-  const e = G(M);
+  return /* @__PURE__ */ B(R.Provider, { value: H, children: e.children });
+}, K = () => {
+  const e = J(R);
   if (!e)
     throw new Error("useMyContext must be used within a MyProvider");
   return e;
 };
-z.useNotificationAPIContext = F;
+q.useNotificationAPIContext = K;
 export {
-  M as NotificationAPIContext,
-  z as NotificationAPIProvider
+  R as NotificationAPIContext,
+  q as NotificationAPIProvider
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notificationapi/react",
   "private": false,
-  "version": "0.0.25",
+  "version": "0.0.27",
   "type": "module",
   "scripts": {
     "dev": "vite",