@streamlayer/sdk-web-notifications 0.13.3 → 0.13.5

package/lib/notifications.d.ts

@@ -11,19 +11,18 @@ export type NotificationData = {
         predictionResult?: boolean;
         correct?: boolean;
         correctAnswerTitle?: string;
+        questionTitle?: string;
     };
     insight?: InstantView;
-    onboarding?: GameSettings;
+    onboarding?: GameSettings & {
+        instantOpen?: boolean;
+    };
     tweet?: {
         title: string;
         image: string;
         body: string;
-        account: {
-            image: string;
-            name: string;
-            userName: string;
-            verified: boolean;
-        };
+        account: string;
+        accountVerified: boolean;
     };
 };
 export declare enum NotificationType {
@@ -41,6 +40,7 @@ export type Notification<M extends Record<string, Function> = never> = {
     methods?: M;
     data: NotificationData;
     id: string;
+    persistent?: boolean;
 };
 /**
  * @description app notifications (inapp)
@@ -50,7 +50,7 @@ export declare class Notifications {
     private storage;
     constructor(options?: Partial<NotificationsQueueOptions>);
     add: (notification: Notification) => void;
-    close: (notificationId: string) => void;
+    close: (notificationId: string, markAsViewed?: boolean) => void;
     getQueueStore: () => import("nanostores").WritableAtom<Map<string, Notification> | undefined>;
     markAsViewed: (notificationId: string) => void;
 }

package/lib/notifications.js

@@ -22,9 +22,11 @@ export class Notifications {
             this.queue.addToQueue(notification);
         }
     };
-    close = (notificationId) => {
+    close = (notificationId, markAsViewed = true) => {
         this.queue.closeNotification(notificationId);
-        this.markAsViewed(notificationId);
+        if (markAsViewed) {
+            this.markAsViewed(notificationId);
+        }
     };
     getQueueStore = () => {
         return this.queue.notificationsList;

package/lib/queue/index.js

@@ -42,8 +42,27 @@ export class NotificationsQueue {
             },
         });
         this.waitingQueue.add(notification.id);
-        this.logger.debug({ notification }, 'notification added to waiting queue');
-        this.tickWaitingQueue();
+        /**
+         * Hide an oldest notification if the active queue is full,
+         * and show a new notification on the next tick
+         */
+        if (this.activeQueue.size === this.options.concurrency) {
+            const [job] = this.activeQueue;
+            const notification = this.store.get(job);
+            if (notification?.persistent !== true) {
+                this.closeNotification(job);
+            }
+            else {
+                const [job] = this.waitingQueue;
+                if (this.waitingQueue.size > 1) {
+                    this.closeNotification(job);
+                }
+                this.tickWaitingQueue();
+            }
+        }
+        else {
+            this.tickWaitingQueue();
+        }
     };
     tickWaitingQueue = () => {
         if (this.activeQueue.size < this.options.concurrency) {
@@ -89,7 +108,9 @@ export class NotificationsQueue {
         const prevQueue = new Map(this.notifications.getValue());
         const notification = prevQueue.get(notificationId);
         if (notification) {
-            notification.hiding = true;
+            // do not hide notification if we have more than one notification in waiting queue,
+            // because we need to show next notification immediately
+            notification.hiding = !(this.waitingQueue.size >= this.options.concurrency);
             this.notifications.setValue(prevQueue);
             const timeout = setTimeout(() => {
                 const prevQueue = new Map(this.notifications.getValue());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamlayer/sdk-web-notifications",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "type": "module",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -9,10 +9,10 @@
     "package.json"
   ],
   "peerDependencies": {
-    "@streamlayer/sdk-web-interfaces": "^0.0.1",
-    "@streamlayer/sdk-web-types": "^0.0.1",
-    "@streamlayer/sdk-web-logger": "^0.0.4",
-    "@streamlayer/sdk-web-storage": "^0.0.4"
+    "@streamlayer/sdk-web-interfaces": "^0.19.0",
+    "@streamlayer/sdk-web-logger": "^0.5.11",
+    "@streamlayer/sdk-web-storage": "^0.3.11",
+    "@streamlayer/sdk-web-types": "^0.21.0"
   },
   "exports": {
     ".": {
@@ -22,10 +22,10 @@
     }
   },
   "devDependencies": {
+    "@nx/playwright": "^17.2.8",
+    "@nx/webpack": "^17.2.8",
+    "@playwright/test": "^1.41.1",
     "tslib": "^2.6.2",
-    "@nx/playwright": "17.1.1",
-    "@playwright/test": "^1.39.0",
-    "@nx/webpack": "17.0.3",
     "webpack": "^5.89.0"
   }
 }