@notificationapi/react 0.0.19 → 0.0.20

package/dist/components/Provider/index.js

@@ -1,5 +1,5 @@
-import { jsx as _ } from "react/jsx-runtime";
-import { createContext as y, useState as u, useEffect as D, useContext as B } from "react";
+import { jsx as W } from "react/jsx-runtime";
+import { createContext as _, useState as u, useEffect as y, useContext as B } from "react";
 import { api as d } from "../../api.js";
 const z = {
   opened: "opened",
@@ -10,10 +10,10 @@ const z = {
   actioned2: "actioned2"
 };
 var $ = /* @__PURE__ */ ((e) => (e.EMAIL = "EMAIL", e.INAPP_WEB = "INAPP_WEB", e.SMS = "SMS", e.CALL = "CALL", e.PUSH = "PUSH", e.WEB_PUSH = "WEB_PUSH", e))($ || {}), b = /* @__PURE__ */ ((e) => (e.OFF = "off", e.INSTANT = "instant", e.HOURLY = "hourly", e.DAILY = "daily", e.WEEKLY = "weekly", e.MONTHLY = "monthly", e))(b || {});
-const S = y(
+const N = _(
   void 0
 ), Y = (e) => {
-  const c = {
+  const r = {
     ...{
       apiURL: "https://api.notificationapi.com",
       wsURL: "wss://ws.notificationapi.com",
@@ -21,119 +21,119 @@ const S = y(
       initialLoadMaxAge: new Date((/* @__PURE__ */ new Date()).setMonth((/* @__PURE__ */ new Date()).getMonth() - 3))
     },
     ...e
-  }, [s, f] = u(), [U, w] = u(), [N, A] = u(!1), [E, m] = u((/* @__PURE__ */ new Date()).toISOString()), [M, k] = u(!0), P = (a) => {
-    const i = (/* @__PURE__ */ new Date()).toISOString();
-    f((t) => (a = a.filter((n) => !(n.expDate && new Date(n.expDate * 1e3).toISOString() > i || n.date > i)), t ? [
-      ...a.filter((n) => !t.find((o) => o.id === n.id)),
+  }, [s, f] = u(), [E, h] = u(), [m, L] = u(!1), [M, A] = u((/* @__PURE__ */ new Date()).toISOString()), [k, g] = u(!0), P = (i) => {
+    const n = (/* @__PURE__ */ new Date()).toISOString();
+    f((t) => (i = i.filter((o) => !(o.expDate && new Date(o.expDate * 1e3).toISOString() > n || o.date > n)), t ? [
+      ...i.filter((o) => !t.find((a) => a.id === o.id)),
       ...t
-    ] : a));
-  }, T = async (a, i) => (await d(
-    c.apiURL,
+    ] : i));
+  }, T = async (i, n) => (await d(
+    r.apiURL,
     "GET",
-    `notifications/INAPP_WEB?count=${a}&before=${i}`,
+    `notifications/INAPP_WEB?count=${i}&before=${n}`,
     e.clientId,
     e.userId,
     e.hashedUserId
-  )).notifications, R = async (a, i, t) => {
-    let n = [], o = a, r = !0, h = !0;
-    for (; h; ) {
-      const L = (await T(
-        i,
-        new Date(o).getTime()
+  )).notifications, R = async (i, n, t) => {
+    let o = [], a = i, c = !0, w = !0;
+    for (; w; ) {
+      const S = (await T(
+        n,
+        new Date(a).getTime()
       )).filter(
-        (I) => !n.find((l) => l.id === I.id)
+        (I) => !o.find((l) => l.id === I.id)
       );
-      o = L.reduce(
+      a = S.reduce(
         (I, l) => I < l.date ? I : l.date,
-        a
-      ), n = [...n, ...L], r = L.length > 0, h = !0, (!r || n.length >= i || t && o < t) && (h = !1);
+        i
+      ), o = [...o, ...S], c = S.length > 0, w = !0, (!c || o.length >= n || t && a < t) && (w = !1);
     }
     return {
-      notifications: n,
-      couldLoadMore: r,
-      oldestReceived: o
+      notifications: o,
+      couldLoadMore: c,
+      oldestReceived: a
     };
-  }, g = async (a) => {
-    if (!M || N)
+  }, U = async (i) => {
+    if (!i && !k || !i && m)
       return;
-    A(!0);
-    const i = await R(
-      E,
-      a ? c.initialLoadMaxCount : 1e3,
-      a ? c.initialLoadMaxAge.toISOString() : void 0
+    L(!0);
+    const n = await R(
+      i ? (/* @__PURE__ */ new Date()).toISOString() : M,
+      i ? r.initialLoadMaxCount : 1e3,
+      i ? r.initialLoadMaxAge.toISOString() : void 0
     );
-    m(i.oldestReceived), k(i.couldLoadMore), P(i.notifications), A(!1);
-  }, x = async (a) => {
-    const i = (/* @__PURE__ */ new Date()).toISOString();
+    A(n.oldestReceived), g(n.couldLoadMore), P(n.notifications), L(!1);
+  }, v = async (i) => {
+    const n = (/* @__PURE__ */ new Date()).toISOString();
     d(
-      c.apiURL,
+      r.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
       e.clientId,
       e.userId,
       e.hashedUserId,
       {
-        trackingIds: [a],
-        clicked: i
+        trackingIds: [i],
+        clicked: n
       }
     ), f((t) => {
       if (!t)
         return [];
-      const n = [...t], o = n.find((r) => r.id === a);
-      return o && (o.clicked = i), n;
+      const o = [...t], a = o.find((c) => c.id === i);
+      return a && (a.clicked = n), o;
     });
-  }, v = async () => {
+  }, x = async () => {
     if (!s)
       return;
-    const a = (/* @__PURE__ */ new Date()).toISOString(), i = s.filter((t) => !t.opened || !t.seen).map((t) => t.id);
-    i.length !== 0 && (d(
-      c.apiURL,
+    const i = (/* @__PURE__ */ new Date()).toISOString(), n = s.filter((t) => !t.opened || !t.seen).map((t) => t.id);
+    n.length !== 0 && (d(
+      r.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
       e.clientId,
       e.userId,
       e.hashedUserId,
       {
-        trackingIds: i,
-        opened: a
+        trackingIds: n,
+        opened: i
       }
     ), f((t) => {
       if (!t)
         return [];
-      const n = [...t];
-      return n.filter((o) => i.includes(o.id)).forEach((o) => {
-        o.opened = a, o.seen = !0;
-      }), n;
+      const o = [...t];
+      return o.filter((a) => n.includes(a.id)).forEach((a) => {
+        a.opened = i, a.seen = !0;
+      }), o;
     }));
-  }, C = async (a) => {
+  }, O = async (i) => {
     if (!s)
       return;
-    const i = s.filter((t) => t.archived && (a === "ALL" || a.includes(t.id))).map((t) => t.id);
-    i.length !== 0 && (d(
-      c.apiURL,
+    const n = s.filter((t) => t.archived && (i === "ALL" || i.includes(t.id))).map((t) => t.id);
+    n.length !== 0 && (d(
+      r.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
       e.clientId,
       e.userId,
       e.hashedUserId,
       {
-        trackingIds: i,
+        trackingIds: n,
         archived: null
       }
     ), f((t) => {
       if (!t)
         return [];
-      const n = [...t];
-      return n.filter((o) => i.includes(o.id)).forEach((o) => {
-        o.archived = void 0;
-      }), n;
+      const o = [...t];
+      return o.filter((a) => n.includes(a.id)).forEach((a) => {
+        a.archived = void 0;
+      }), o;
     }));
-  }, H = async (a) => {
+  }, C = async (i) => {
     if (!s)
       return;
-    const i = (/* @__PURE__ */ new Date()).toISOString(), t = s.filter((n) => !n.archived && (a === "ALL" || a.includes(n.id))).map((n) => n.id);
+    const n = (/* @__PURE__ */ new Date()).toISOString(), t = s.filter((o) => !o.archived && (i === "ALL" || i.includes(o.id))).map((o) => o.id);
     t.length !== 0 && (d(
-      c.apiURL,
+      r.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
       e.clientId,
@@ -141,19 +141,19 @@ const S = y(
       e.hashedUserId,
       {
         trackingIds: t,
-        archived: i
+        archived: n
       }
-    ), f((n) => {
-      if (!n)
+    ), f((o) => {
+      if (!o)
         return [];
-      const o = [...n];
-      return o.filter((r) => t.includes(r.id)).forEach((r) => {
-        r.archived = i;
-      }), o;
+      const a = [...o];
+      return a.filter((c) => t.includes(c.id)).forEach((c) => {
+        c.archived = n;
+      }), a;
     }));
-  }, O = (a, i, t, n) => {
+  }, D = (i, n, t, o) => {
     d(
-      c.apiURL,
+      r.apiURL,
       "POST",
       "preferences",
       e.clientId,
@@ -161,57 +161,57 @@ const S = y(
       e.hashedUserId,
       [
         {
-          notificationId: a,
-          subNotificationId: n,
-          channel: i,
+          notificationId: i,
+          subNotificationId: o,
+          channel: n,
           delivery: t
         }
       ]
     ).then(() => {
       d(
-        c.apiURL,
+        r.apiURL,
         "GET",
         "preferences",
         e.clientId,
         e.userId,
         e.hashedUserId
-      ).then((o) => {
-        w(o);
+      ).then((a) => {
+        h(a);
       });
     });
   };
-  D(() => {
-    g(!0);
-    const a = new WebSocket(
-      c.hashedUserId ? `${c.wsURL}?userId=${c.userId}&envId=${c.clientId}&userIdHash=${c.hashedUserId}` : `${c.wsURL}?userId=${c.userId}&envId=${c.clientId}`
+  y(() => {
+    f([]), L(!1), h(void 0), A((/* @__PURE__ */ new Date()).toISOString()), g(!0), U(!0);
+    const i = new WebSocket(
+      r.hashedUserId ? `${r.wsURL}?userId=${r.userId}&envId=${r.clientId}&userIdHash=${r.hashedUserId}` : `${r.wsURL}?userId=${r.userId}&envId=${r.clientId}`
     );
-    a.onmessage = (i) => {
-      const t = JSON.parse(i.data);
+    i.onmessage = (n) => {
+      const t = JSON.parse(n.data);
       !t || !t.route || t.route === "inapp_web/new_notifications" && P(t.payload.notifications);
     }, d(
-      c.apiURL,
+      r.apiURL,
       "GET",
       "preferences",
       e.clientId,
       e.userId,
       e.hashedUserId
-    ).then((i) => {
-      w(i);
+    ).then((n) => {
+      h(n);
     });
-  }, []);
-  const W = {
+  }, [e]);
+  const H = {
     notifications: s,
-    preferences: U,
-    loadNotifications: g,
-    markAsOpened: v,
-    markAsArchived: H,
-    markAsUnarchived: C,
-    markAsClicked: x,
-    updateDelivery: O
+    preferences: E,
+    loadNotifications: U,
+    markAsOpened: x,
+    markAsArchived: C,
+    markAsUnarchived: O,
+    markAsClicked: v,
+    updateDelivery: D
   };
-  return /* @__PURE__ */ _(S.Provider, { value: W, children: e.children });
+  return /* @__PURE__ */ W(N.Provider, { value: H, children: e.children });
 }, F = () => {
-  const e = B(S);
+  const e = B(N);
   if (!e)
     throw new Error("useMyContext must be used within a MyProvider");
   return e;
@@ -221,6 +221,6 @@ export {
   $ as Channels,
   b as DeliveryOptions,
   z as NOTIFICATION_ACTIONS,
-  S as NotificationAPIContext,
+  N as NotificationAPIContext,
   Y as NotificationAPIProvider
 };

package/package.json

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