@notificationapi/react 0.0.23 → 0.0.25

package/dist/components/Provider/index.js

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

package/dist/main.d.ts

@@ -1,3 +1,3 @@
-export { NotificationFeed, NotificationPopup, NotificationLauncher, NotificationCounter, } from './components/Notifications';
-export { NotificationPreferencesInline, NotificationPreferencesPopup, } from './components/Preferences';
+export { NotificationFeed, NotificationPopup, NotificationLauncher, NotificationCounter } from './components/Notifications';
+export { NotificationPreferencesInline, NotificationPreferencesPopup } from './components/Preferences';
 export { NotificationAPIProvider } from './components/Provider';

package/dist/main.js

@@ -1,16 +1,16 @@
 import { NotificationFeed as r } from "./components/Notifications/NotificationFeed.js";
-import { N as e } from "./assets/Inbox.js";
+import { NotificationPopup as e } from "./components/Notifications/NotificationPopup.js";
 import { NotificationLauncher as n } from "./components/Notifications/NotificationLauncher.js";
-import { NotificationCounter as a } from "./components/Notifications/NotificationCounter.js";
-import { N } from "./assets/NotificationPreferencesPopup.js";
-import { NotificationPreferencesInline as x } from "./components/Preferences/NotificationPreferencesInline.js";
-import { NotificationAPIProvider as s } from "./components/Provider/index.js";
+import { NotificationCounter as c } from "./components/Notifications/NotificationCounter.js";
+import { NotificationPreferencesPopup as m } from "./components/Preferences/NotificationPreferencesPopup.js";
+import { NotificationPreferencesInline as N } from "./components/Preferences/NotificationPreferencesInline.js";
+import { NotificationAPIProvider as u } from "./components/Provider/index.js";
 export {
-  s as NotificationAPIProvider,
-  a as NotificationCounter,
+  u as NotificationAPIProvider,
+  c as NotificationCounter,
   r as NotificationFeed,
   n as NotificationLauncher,
   e as NotificationPopup,
-  x as NotificationPreferencesInline,
-  N as NotificationPreferencesPopup
+  N as NotificationPreferencesInline,
+  m as NotificationPreferencesPopup
 };

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@notificationapi/react",
   "private": false,
-  "version": "0.0.23",
+  "version": "0.0.25",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "tsc --p ./tsconfig.build.json && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "format": "prettier --write \"{src,lib}/**/*.{ts,tsx,js,jsx,json,css,md,html}\"",
+    "prettier-check": "prettier --check \"{src,lib}/**/*.{ts,tsx,js,jsx,json,css,md,html}\"",
     "preview": "vite preview",
     "prepublishOnly": "npm run build"
   },
@@ -25,6 +27,7 @@
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
+    "prettier": "^3.3.3",
     "glob": "^10.4.1",
     "typescript": "^5.2.2",
     "vite": "^5.2.0",
@@ -40,7 +43,7 @@
     "**/*.css"
   ],
   "dependencies": {
-    "@notificationapi/core": "^0.0.7",
+    "@notificationapi/core": "^0.0.8",
     "antd": "^5.17.4",
     "javascript-time-ago": "^2.5.10",
     "liquidjs": "^10.14.0",