@notificationapi/react 0.0.10 → 0.0.12

package/dist/components/Notifications/Notification.d.ts

@@ -1,10 +1,11 @@
-/// <reference types="react" />
+import { InAppNotification } from '../../interface';
+
 export declare enum ImageShape {
     square = "square",
     circle = "circle"
 }
 export declare const Notification: (props: {
-    notification: any;
+    notification: InAppNotification;
     markAsArchived: (ids: string[] | "ALL") => void;
     markAsClicked: (id: string) => void;
     imageShape: keyof typeof ImageShape;

package/dist/components/Notifications/NotificationFeed.d.ts

@@ -1,6 +1,7 @@
 import { Pagination } from './Inbox';
 import { ImageShape } from './Notification';
 import { Filter } from './NotificationPopup';
+import { InAppNotification } from '../../interface';
 
 export type NotificationFeedProps = {
     imageShape?: keyof typeof ImageShape;
@@ -9,6 +10,6 @@ export type NotificationFeedProps = {
     pagePosition?: "top" | "bottom";
     infiniteScrollHeight?: number;
     style?: React.CSSProperties;
-    filter?: keyof typeof Filter | ((n: any) => boolean);
+    filter?: keyof typeof Filter | ((n: InAppNotification) => boolean);
 };
 export declare const NotificationFeed: React.FC<NotificationFeedProps>;

package/dist/components/Notifications/NotificationPopup.d.ts

@@ -1,6 +1,7 @@
 import { Pagination } from './Inbox';
 import { UnreadBadgeProps } from './UnreadBadge';
 import { ImageShape } from './Notification';
+import { InAppNotification } from '../../interface';
 
 export declare enum Filter {
     ALL = "ALL",
@@ -19,6 +20,6 @@ export type NotificationPopupProps = {
     style?: React.CSSProperties;
     unreadBadgeProps?: UnreadBadgeProps;
     count?: UnreadBadgeProps["count"];
-    filter?: keyof typeof Filter | ((n: any) => boolean);
+    filter?: keyof typeof Filter | ((n: InAppNotification) => boolean);
 };
 export declare const NotificationPopup: React.FC<NotificationPopupProps>;

package/dist/components/Notifications/UnreadBadge.js

@@ -9,7 +9,7 @@ const d = (e) => {
     I,
     {
       count: ((n) => e.count === "COUNT_UNOPENED_NOTIFICATIONS" || e.count === void 0 ? n.filter((t) => !t.opened && !t.seen).length : e.count === "COUNT_UNARCHIVED_NOTIFICATIONS" ? n.filter(
-        (t) => !t.archived && !t.clicked && !t.replied && !t.actioned1 && !t.actioned2
+        (t) => !t.archived && !t.clicked && !t.replies && !t.actioned1 && !t.actioned2
       ).length : n.filter(e.count).length)((o == null ? void 0 : o.notifications) || []),
       color: e.color,
       overflowCount: e.overflowCount,

package/dist/components/Preferences/NotificationPreferencesInline.d.ts

@@ -1,2 +1,4 @@
 /// <reference types="react" />
-export declare function NotificationPreferencesInline(props: React.HTMLAttributes<HTMLElement>): JSX.Element;
+type NotificationPreferencesInlineProps = {};
+export declare function NotificationPreferencesInline(props: NotificationPreferencesInlineProps): JSX.Element;
+export {};

package/dist/components/Preferences/NotificationPreferencesInline.js

@@ -1,7 +1,8 @@
-import { jsx as e } from "react/jsx-runtime";
-function r(i) {
-  return /* @__PURE__ */ e("div", { ...i, children: "hi" });
+import { jsx as r } from "react/jsx-runtime";
+import { P as e } from "../../assets/Preferences.js";
+function t(o) {
+  return /* @__PURE__ */ r(e, {});
 }
 export {
-  r as NotificationPreferencesInline
+  t as NotificationPreferencesInline
 };

package/dist/components/Preferences/NotificationPreferencesPopup.d.ts

@@ -2,6 +2,7 @@
 type NotificationPreferencesPopupProps = {
     open?: boolean;
     onClose?: () => void;
+    collapse?: boolean;
 };
 export declare function NotificationPreferencesPopup(props: NotificationPreferencesPopupProps): JSX.Element;
 export {};

package/dist/components/Preferences/NotificationPreferencesPopup.js

@@ -1481,7 +1481,8 @@ function Vt(e) {
   const n = {
     open: e.open === void 0 ? !0 : e.open,
     onClose: e.onClose || (() => {
-    })
+    }),
+    collapse: e.collapse === void 0 ? !1 : e.collapse
   };
   return /* @__PURE__ */ ye(
     B,

package/dist/components/Preferences/PreferenceInput.d.ts

@@ -0,0 +1,10 @@
+import { Channels, DeliveryOptions, Preferences } from '../Provider';
+
+type Props = {
+    preferences: Preferences["preferences"];
+    notification: Preferences["notifications"][0];
+    updateDelivery: (notificationId: string, channel: Channels, delivery: DeliveryOptions, subNotificationId?: string) => void;
+    subNotificationId?: string;
+};
+export declare const PreferenceInput: ({ notification, preferences, updateDelivery, subNotificationId, }: Props) => JSX.Element;
+export {};

package/dist/components/Preferences/{PreferenceGroup.js → PreferenceInput.js}

@@ -1,8 +1,7 @@
 import "react/jsx-runtime";
 import "../Provider/index.js";
-import { a as i } from "../../assets/Preferences.js";
-import "react";
+import { a as m } from "../../assets/Preferences.js";
 import "../../assets/index3.js";
 export {
-  i as PreferenceGroup
+  m as PreferenceInput
 };

package/dist/components/Preferences/Preferences.js

@@ -2,11 +2,10 @@ import "react/jsx-runtime";
 import "../Provider/index.js";
 import "react";
 import "../../assets/colors.js";
-import { P as n, b as s, g } from "../../assets/Preferences.js";
-import "../../assets/index3.js";
+import { P as p, b as i, g as s } from "../../assets/Preferences.js";
 import "../../assets/BellOutlined.js";
 export {
-  n as Preferences,
-  s as getChannelIcon,
-  g as getChannelLabel
+  p as Preferences,
+  i as getChannelIcon,
+  s as getChannelLabel
 };

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

@@ -1,4 +1,5 @@
 import { PropsWithChildren } from 'react';
+import { InAppNotification } from '../../interface';
 
 type Props = {
     clientId: string;
@@ -79,25 +80,6 @@ export interface Notification {
         };
     };
 }
-export interface InappNotification {
-    id: string;
-    seen: boolean;
-    title: string;
-    redirectURL?: string;
-    imageURL?: string;
-    date: Date;
-    parameters?: Record<string, unknown>;
-    expDate?: Date;
-    opened?: string;
-    clicked?: string;
-    archived?: string;
-    actioned1?: string;
-    actioned2?: string;
-    replies?: {
-        date: string;
-        message: string;
-    }[];
-}
 export interface Preferences {
     preferences: {
         notificationId: string;
@@ -118,7 +100,7 @@ export interface Preferences {
     }[];
 }
 export type Context = {
-    notifications?: InappNotification[];
+    notifications?: InAppNotification[];
     preferences?: Preferences;
     loadNotifications: (initial?: boolean) => void;
     markAsOpened: () => void;

package/dist/components/Provider/index.js

@@ -1,6 +1,6 @@
-import { jsx as y } from "react/jsx-runtime";
-import { createContext as B, useState as f, useEffect as O } from "react";
-import { api as u } from "../../api.js";
+import { jsx as _ } from "react/jsx-runtime";
+import { createContext as x, useState as f, useEffect as B } from "react";
+import { api as r } from "../../api.js";
 const j = {
   opened: "opened",
   clicked: "clicked",
@@ -9,8 +9,8 @@ const j = {
   actioned1: "actioned1",
   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))($ || {}), C = /* @__PURE__ */ ((e) => (e.OFF = "off", e.INSTANT = "instant", e.HOURLY = "hourly", e.DAILY = "daily", e.WEEKLY = "weekly", e.MONTHLY = "monthly", e))(C || {});
-const x = B(
+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))($ || {}), v = /* @__PURE__ */ ((e) => (e.OFF = "off", e.INSTANT = "instant", e.HOURLY = "hourly", e.DAILY = "daily", e.WEEKLY = "weekly", e.MONTHLY = "monthly", e))(v || {});
+const y = x(
   void 0
 ), J = (e) => {
   const c = {
@@ -21,50 +21,51 @@ const x = B(
       initialLoadMaxAge: new Date((/* @__PURE__ */ new Date()).setMonth((/* @__PURE__ */ new Date()).getMonth() - 3))
     },
     ...e
-  }, [r, l] = f(), [L, w] = f(), [S, A] = f(!1), [U, E] = f((/* @__PURE__ */ new Date()).toISOString()), [m, M] = f(!0), P = (o) => {
-    l((t) => t ? [
-      ...o.filter((i) => !t.find((n) => n.id === i.id)),
+  }, [s, u] = f(), [P, S] = f(), [U, w] = f(!1), [N, E] = f((/* @__PURE__ */ new Date()).toISOString()), [m, M] = f(!0), g = (a) => {
+    const n = (/* @__PURE__ */ new Date()).toISOString();
+    u((t) => (a = a.filter((i) => !(i.expDate && new Date(i.expDate * 1e3).toISOString() > n || i.date > n)), t ? [
+      ...a.filter((i) => !t.find((o) => o.id === i.id)),
       ...t
-    ] : o);
-  }, k = async (o, t) => (await u(
+    ] : a));
+  }, T = async (a, n) => (await r(
     c.apiURL,
     "GET",
-    `notifications/INAPP_WEB?count=${o}&before=${t}`,
+    `notifications/INAPP_WEB?count=${a}&before=${n}`,
     e.clientId,
     e.userId,
     e.hashedUserId
-  )).notifications, T = async (o, t, i) => {
-    let n = [], a = o, s = !0, d = !0;
-    for (; d; ) {
-      const g = (await k(
-        t,
-        new Date(a).getTime()
+  )).notifications, k = async (a, n, t) => {
+    let i = [], o = a, d = !0, h = !0;
+    for (; h; ) {
+      const L = (await T(
+        n,
+        new Date(o).getTime()
       )).filter(
-        (I) => !n.find((h) => h.id === I.id)
+        (I) => !i.find((l) => l.id === I.id)
       );
-      a = g.reduce(
-        (I, h) => I < h.date ? I : h.date,
-        o
-      ), n = [...n, ...g], s = g.length > 0, d = !0, (!s || n.length >= t || i && a < i) && (d = !1);
+      o = L.reduce(
+        (I, l) => I < l.date ? I : l.date,
+        a
+      ), i = [...i, ...L], d = L.length > 0, h = !0, (!d || i.length >= n || t && o < t) && (h = !1);
     }
-    return console.log(n.length, s, a), {
-      notifications: n,
-      couldLoadMore: s,
-      oldestReceived: a
+    return {
+      notifications: i,
+      couldLoadMore: d,
+      oldestReceived: o
     };
-  }, N = async (o) => {
-    if (!m || S)
+  }, A = async (a) => {
+    if (!m || U)
       return;
-    A(!0);
-    const t = await T(
-      U,
-      o ? c.initialLoadMaxCount : 1e3,
-      o ? c.initialLoadMaxAge.toISOString() : void 0
+    w(!0);
+    const n = await k(
+      N,
+      a ? c.initialLoadMaxCount : 1e3,
+      a ? c.initialLoadMaxAge.toISOString() : void 0
     );
-    E(t.oldestReceived), M(t.couldLoadMore), P(t.notifications), A(!1);
-  }, R = async (o) => {
-    const t = (/* @__PURE__ */ new Date()).toISOString();
-    u(
+    E(n.oldestReceived), M(n.couldLoadMore), g(n.notifications), w(!1);
+  }, R = async (a) => {
+    const n = (/* @__PURE__ */ new Date()).toISOString();
+    r(
       c.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
@@ -72,20 +73,20 @@ const x = B(
       e.userId,
       e.hashedUserId,
       {
-        trackingIds: [o],
-        clicked: t
+        trackingIds: [a],
+        clicked: n
       }
-    ), l((i) => {
-      if (!i)
+    ), u((t) => {
+      if (!t)
         return [];
-      const n = [...i], a = n.find((s) => s.id === o);
-      return a && (a.clicked = t), n;
+      const i = [...t], o = i.find((d) => d.id === a);
+      return o && (o.clicked = n), i;
     });
-  }, H = async () => {
-    if (!r)
+  }, O = async () => {
+    if (!s)
       return;
-    const o = (/* @__PURE__ */ new Date()).toISOString(), t = r.filter((i) => !i.opened || !i.seen).map((i) => i.id);
-    t.length !== 0 && (u(
+    const a = (/* @__PURE__ */ new Date()).toISOString(), n = s.filter((t) => !t.opened || !t.seen).map((t) => t.id);
+    n.length !== 0 && (r(
       c.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
@@ -93,22 +94,22 @@ const x = B(
       e.userId,
       e.hashedUserId,
       {
-        trackingIds: t,
-        opened: o
+        trackingIds: n,
+        opened: a
       }
-    ), l((i) => {
-      if (!i)
+    ), u((t) => {
+      if (!t)
         return [];
-      const n = [...i];
-      return n.filter((a) => t.includes(a.id)).forEach((a) => {
-        a.opened = o, a.seen = !0;
-      }), n;
+      const i = [...t];
+      return i.filter((o) => n.includes(o.id)).forEach((o) => {
+        o.opened = a, o.seen = !0;
+      }), i;
     }));
-  }, W = async (o) => {
-    if (!r)
+  }, D = async (a) => {
+    if (!s)
       return;
-    const t = (/* @__PURE__ */ new Date()).toISOString(), i = r.filter((n) => !n.archived && (o === "ALL" || o.includes(n.id))).map((n) => n.id);
-    i.length !== 0 && (u(
+    const n = (/* @__PURE__ */ new Date()).toISOString(), t = s.filter((i) => !i.archived && (a === "ALL" || a.includes(i.id))).map((i) => i.id);
+    t.length !== 0 && (r(
       c.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
@@ -116,59 +117,80 @@ const x = B(
       e.userId,
       e.hashedUserId,
       {
-        trackingIds: i,
-        archived: t
+        trackingIds: t,
+        archived: n
       }
-    ), l((n) => {
-      if (!n)
+    ), u((i) => {
+      if (!i)
         return [];
-      const a = [...n];
-      return a.filter((s) => i.includes(s.id)).forEach((s) => {
-        s.archived = t;
-      }), a;
+      const o = [...i];
+      return o.filter((d) => t.includes(d.id)).forEach((d) => {
+        d.archived = n;
+      }), o;
     }));
-  }, _ = (o, t, i, n) => {
-    if (!L)
-      return;
-    const a = { ...L }, s = a.preferences.find(
-      (d) => d.notificationId === o && d.subNotificationId === n && d.channel === t
-    );
-    s && (s.delivery = i), w(a);
+  }, H = (a, n, t, i) => {
+    r(
+      c.apiURL,
+      "POST",
+      "preferences",
+      e.clientId,
+      e.userId,
+      e.hashedUserId,
+      [
+        {
+          notificationId: a,
+          subNotificationId: i,
+          channel: n,
+          delivery: t
+        }
+      ]
+    ).then(() => {
+      r(
+        c.apiURL,
+        "GET",
+        "preferences",
+        e.clientId,
+        e.userId,
+        e.hashedUserId
+      ).then((o) => {
+        S(o);
+      });
+    });
   };
-  O(() => {
-    N(!0);
-    const o = new WebSocket(
+  B(() => {
+    A(!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}`
     );
-    o.onmessage = (t) => {
-      const i = JSON.parse(t.data);
-      !i || !i.route || i.route === "inapp_web/new_notifications" && P(i.payload.notifications);
-    }, u(
+    a.onmessage = (n) => {
+      const t = JSON.parse(n.data);
+      !t || !t.route || t.route === "inapp_web/new_notifications" && g(t.payload.notifications);
+    }, r(
       c.apiURL,
       "GET",
       "preferences",
       e.clientId,
       e.userId,
       e.hashedUserId
-    ).then((t) => {
-      w(t);
+    ).then((n) => {
+      S(n);
     });
   }, []);
-  const v = {
-    notifications: r,
-    preferences: L,
-    loadNotifications: N,
-    markAsOpened: H,
-    markAsArchived: W,
+  const W = {
+    notifications: s,
+    preferences: P,
+    loadNotifications: A,
+    markAsOpened: O,
+    markAsArchived: D,
     markAsClicked: R,
-    updateDelivery: _
+    updateDelivery: H
   };
-  return /* @__PURE__ */ y(x.Provider, { value: v, children: e.children });
+  return /* @__PURE__ */ _(y.Provider, { value: W, children: e.children });
 };
 export {
   $ as Channels,
-  C as DeliveryOptions,
+  v as DeliveryOptions,
   j as NOTIFICATION_ACTIONS,
-  x as NotificationAPIContext,
+  y as NotificationAPIContext,
   J as NotificationAPIProvider
 };

package/dist/interface.d.ts

@@ -0,0 +1,19 @@
+export interface InAppNotification {
+    id: string;
+    seen: boolean;
+    title: string;
+    redirectURL?: string;
+    imageURL?: string;
+    date: string;
+    parameters?: Record<string, unknown>;
+    expDate?: number;
+    opened?: string;
+    clicked?: string;
+    archived?: string;
+    actioned1?: string;
+    actioned2?: string;
+    replies?: {
+        date: string;
+        message: string;
+    }[];
+}

package/dist/interface.js

@@ -0,0 +1 @@
+

package/package.json

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

package/dist/components/Preferences/PreferenceGroup.d.ts

@@ -1,7 +0,0 @@
-/// <reference types="react" />
-type PreferenceGroupProps = {
-    subNotificationId?: string;
-    title: string;
-};
-export declare const PreferenceGroup: React.FC<PreferenceGroupProps>;
-export {};