@trycourier/courier-react-native 4.1.1 → 5.0.2

package/src/index.tsx

@@ -13,6 +13,8 @@ import { Modules } from './Modules';
 import Broadcaster from './Broadcaster';
 import { CourierClient } from './client/CourierClient';
 import { Events, Utils } from './utils';
+import { InboxMessageFeed } from './models/InboxMessageFeed';
+import { InboxMessageSet } from './models/InboxMessageSet';
 
 export { CourierClient } from './client/CourierClient';
 export { BrandClient } from './client/BrandClient';
@@ -35,6 +37,7 @@ export { CourierButton } from './models/CourierButton';
 export { CourierInfoViewStyle } from './models/CourierInfoViewStyle';
 export { iOS_CourierCell } from './models/iOS_CourierCell';
 export { iOS_CourierSheet } from './models/iOS_CourierSheet';
+export { InboxMessageSet } from './models/InboxMessageSet';
 export { CourierInboxButtonStyle, CourierInboxTextStyle, CourierInboxUnreadIndicatorStyle, CourierInboxTheme } from './models/CourierInboxTheme';
 export { CourierPreferencesTheme, CourierPreferencesMode, CourierPreferencesChannel } from './models/CourierPreferencesTheme';
 export type iOSForegroundPresentationOptions = 'sound' | 'badge' | 'list' | 'banner';
@@ -506,22 +509,50 @@ class Courier {
    * @param {Object} props - The properties object.
    * @param {Function} [props.onInitialLoad] - Callback function called when the inbox is initially loaded.
    * @param {Function} [props.onError] - Callback function called when an error occurs. Receives the error message as a parameter.
-   * @param {Function} [props.onMessagesChanged] - Callback function called when messages change. Receives updated messages, unread count, total count, and pagination status.
+   * @param {Function} [props.onUnreadCountChanged] - Callback function called when the unread count changes.
+   * @param {Function} [props.onFeedChanged] - Callback function called when the feed changes.
+   * @param {Function} [props.onArchiveChanged] - Callback function called when the archive changes.
+   * @param {Function} [props.onPageAdded] - Callback function called when a new page is added.
+   * @param {Function} [props.onMessageChanged] - Callback function called when a message changes.
+   * @param {Function} [props.onMessageAdded] - Callback function called when a new message is added.
+   * @param {Function} [props.onMessageRemoved] - Callback function called when a message is removed.
    * @returns {CourierInboxListener} A listener object that can be used to remove the listener later.
    */
-  public addInboxListener(props: { onInitialLoad?: () => void, onError?: (error: string) => void, onMessagesChanged?: (messages: InboxMessage[], unreadMessageCount: number, totalMessageCount: number, canPaginate: boolean) => void }): CourierInboxListener {
+  public addInboxListener(props: {
+    onInitialLoad?: () => void,
+    onError?: (error: string) => void,
+    onUnreadCountChanged?: (unreadCount: number) => void,
+    onFeedChanged?: (messageSet: InboxMessageSet) => void,
+    onArchiveChanged?: (messageSet: InboxMessageSet) => void,
+    onPageAdded?: (feed: InboxMessageFeed, messageSet: InboxMessageSet) => void,
+    onMessageChanged?: (feed: InboxMessageFeed, index: number, message: InboxMessage) => void,
+    onMessageAdded?: (feed: InboxMessageFeed, index: number, message: InboxMessage) => void,
+    onMessageRemoved?: (feed: InboxMessageFeed, index: number, message: InboxMessage) => void
+  }): CourierInboxListener {
 
     const listenerIds = {
       loading: `inbox_loading_${Utils.generateUUID()}`,
       error: `inbox_error_${Utils.generateUUID()}`,
-      messages: `inbox_messages_${Utils.generateUUID()}`
+      unreadCount: `inbox_unread_count_${Utils.generateUUID()}`,
+      feed: `inbox_feed_${Utils.generateUUID()}`,
+      archive: `inbox_archive_${Utils.generateUUID()}`,
+      pageAdded: `inbox_page_added_${Utils.generateUUID()}`,
+      messageChanged: `inbox_message_changed_${Utils.generateUUID()}`,
+      messageAdded: `inbox_message_added_${Utils.generateUUID()}`,
+      messageRemoved: `inbox_message_removed_${Utils.generateUUID()}`
     }
 
     // Set the listener id
     const id = Modules.Shared.addInboxListener(
       listenerIds.loading,
       listenerIds.error,
-      listenerIds.messages
+      listenerIds.unreadCount,
+      listenerIds.feed,
+      listenerIds.archive,
+      listenerIds.pageAdded,
+      listenerIds.messageChanged,
+      listenerIds.messageAdded,
+      listenerIds.messageRemoved
     );
 
     // Create the initial listeners
@@ -535,32 +566,79 @@ class Courier {
       props.onError?.(event);
     });
 
-    listener.onMessagesChanged = this.sharedBroadcaster.addListener(listenerIds.messages, (event: any) => {
-
-      // Convert JSON strings to InboxMessage objects
-      const convertedMessages: InboxMessage[] = event.messages.map((jsonString: string) => {
-        try {
-          const parsedMessage = JSON.parse(jsonString);
-          return parsedMessage as InboxMessage;
-        } catch (error) {
-          Courier.log(`Error parsing message: ${error}`);
-          return null;
-        }
-      }).filter((message: InboxMessage | null): message is InboxMessage => message !== null);
-
-      props.onMessagesChanged?.(
-        convertedMessages,
-        event.unreadMessageCount,
-        event.totalMessageCount,
-        event.canPaginate,
-      );
+    listener.onUnreadCountChanged = this.sharedBroadcaster.addListener(listenerIds.unreadCount, (event: any) => {
+      props.onUnreadCountChanged?.(event);
+    });
+
+    listener.onFeedChanged = this.sharedBroadcaster.addListener(listenerIds.feed, (event: any) => {
+      const convertedMessages = this.convertMessages(event.messages);
+      const messageSet: InboxMessageSet = {
+        messages: convertedMessages,
+        totalMessageCount: event.totalMessageCount,
+        canPaginate: event.canPaginate
+      }
+      props.onFeedChanged?.(messageSet);
+    });
+
+    listener.onArchiveChanged = this.sharedBroadcaster.addListener(listenerIds.archive, (event: any) => {
+      const convertedMessages = this.convertMessages(event.messages);
+      const messageSet: InboxMessageSet = {
+        messages: convertedMessages,
+        totalMessageCount: event.totalMessageCount,
+        canPaginate: event.canPaginate
+      }
+      props.onArchiveChanged?.(messageSet);
+    });
+
+    listener.onPageAdded = this.sharedBroadcaster.addListener(listenerIds.pageAdded, (event: any) => {
+      const convertedMessages = this.convertMessages(event.messages);
+      const messageSet: InboxMessageSet = {
+        messages: convertedMessages,
+        totalMessageCount: event.totalMessageCount,
+        canPaginate: event.canPaginate
+      }
+      props.onPageAdded?.(event.feed === 'archived' ? 'archived' : 'feed', messageSet);
+    });
+
+    listener.onMessageChanged = this.sharedBroadcaster.addListener(listenerIds.messageChanged, (event: any) => {
+      const convertedMessage = this.convertMessage(event.message);
+      props.onMessageChanged?.(event.feed === 'archived' ? 'archived' : 'feed', event.index, convertedMessage);
+    });
+
+    listener.onMessageAdded = this.sharedBroadcaster.addListener(listenerIds.messageAdded, (event: any) => {
+      const convertedMessage = this.convertMessage(event.message);
+      props.onMessageAdded?.(event.feed === 'archived' ? 'archived' : 'feed', event.index, convertedMessage);
+    });
+
+    listener.onMessageRemoved = this.sharedBroadcaster.addListener(listenerIds.messageRemoved, (event: any) => {
+      const convertedMessage = this.convertMessage(event.message);
+      props.onMessageRemoved?.(event.feed === 'archived' ? 'archived' : 'feed', event.index, convertedMessage);
     });
 
     // Add listener to manager
     this.inboxListeners.set(id, listener);
 
     return listener;
+  }
+
+  private convertMessages(messages: string[]): InboxMessage[] {
+    return messages.map(jsonString => {
+      try {
+        return JSON.parse(jsonString) as InboxMessage;
+      } catch (error) {
+        Courier.log(`Error parsing message: ${error}`);
+        return null;
+      }
+    }).filter((message): message is InboxMessage => message !== null);
+  }
 
+  private convertMessage(message: string): InboxMessage {
+    try {
+      return JSON.parse(message) as InboxMessage;
+    } catch (error) {
+      Courier.log(`Error parsing message: ${error}`);
+      throw error;
+    }
   }
 
   /**
@@ -581,7 +659,13 @@ class Courier {
       const listener = this.inboxListeners.get(props.listenerId);
       listener?.onInitialLoad?.remove();
       listener?.onError?.remove();
-      listener?.onMessagesChanged?.remove();
+      listener?.onUnreadCountChanged?.remove();
+      listener?.onFeedChanged?.remove();
+      listener?.onArchiveChanged?.remove();
+      listener?.onPageAdded?.remove();
+      listener?.onMessageChanged?.remove();
+      listener?.onMessageAdded?.remove();
+      listener?.onMessageRemoved?.remove();
 
       // Remove the listener
       this.inboxListeners.delete(props.listenerId);
@@ -604,7 +688,13 @@ class Courier {
     this.inboxListeners.forEach((listener) => {
       listener?.onInitialLoad?.remove();
       listener?.onError?.remove();
-      listener?.onMessagesChanged?.remove();
+      listener?.onUnreadCountChanged?.remove();
+      listener?.onFeedChanged?.remove();
+      listener?.onArchiveChanged?.remove();
+      listener?.onPageAdded?.remove();
+      listener?.onMessageChanged?.remove();
+      listener?.onMessageAdded?.remove();
+      listener?.onMessageRemoved?.remove();
     });
     this.inboxListeners.clear();
 
@@ -623,11 +713,19 @@ class Courier {
    * Fetches the next page of inbox messages.
    * @returns {Promise<InboxMessage[]>} A promise that resolves with an array of fetched inbox messages.
    */
-  public async fetchNextPageOfMessages(): Promise<InboxMessage[]> {
-    const messages = await Modules.Shared.fetchNextPageOfMessages();
+  public async fetchNextPageOfMessages(props: { inboxMessageFeed: InboxMessageFeed }): Promise<InboxMessage[]> {
+    const messages = await Modules.Shared.fetchNextPageOfMessages(props.inboxMessageFeed);
     return messages.map((message: string) => JSON.parse(message));
   }
   
 }
 
+// Handle Hot Reload cleanup
+if (__DEV__) {
+  console.log('Courier SDK is running in development mode');
+  Courier.shared.removeAllAuthenticationListeners();
+  Courier.shared.removeAllInboxListeners();
+  Courier.shared.removeAllPushNotificationListeners();
+}
+
 export default Courier;

package/src/models/CourierInboxListener.tsx

@@ -7,7 +7,14 @@ export class CourierInboxListener {
   public onInitialLoad?: EmitterSubscription
   public onError?: EmitterSubscription
   public onMessagesChanged?: EmitterSubscription
-
+  public onUnreadCountChanged?: EmitterSubscription
+  public onFeedChanged?: EmitterSubscription
+  public onArchiveChanged?: EmitterSubscription
+  public onPageAdded?: EmitterSubscription
+  public onMessageChanged?: EmitterSubscription
+  public onMessageAdded?: EmitterSubscription
+  public onMessageRemoved?: EmitterSubscription
+  
   constructor(id: string) {
     this.listenerId = id;
   }

package/src/models/CourierInboxTheme.tsx

@@ -17,8 +17,41 @@ export interface CourierInboxUnreadIndicatorStyle {
   color?: string
 }
 
+export interface CourierInboxTabIndicatorStyle {
+  font?: CourierFont
+  color?: string
+}
+
+export interface CourierInboxTabItemStyle {
+  font?: CourierFont
+  indicator?: CourierInboxTabIndicatorStyle
+}
+
+export interface CourierInboxTabStyle {
+  selected?: CourierInboxTabItemStyle
+  unselected?: CourierInboxTabItemStyle
+}
+
+export interface CourierSwipeActionStyle {
+  icon?: string
+  color?: string
+}
+
+export interface CourierReadingSwipeActionStyle {
+  read?: CourierSwipeActionStyle
+  unread?: CourierSwipeActionStyle
+}
+
+export interface CourierArchivingSwipeActionStyle {
+  archive?: CourierSwipeActionStyle
+}
+
 export interface CourierInboxTheme {
   brandId?: string,
+  tabIndicatorColor?: string,
+  tabStyle?: CourierInboxTabStyle,
+  readingSwipeActionStyle?: CourierReadingSwipeActionStyle
+  archivingSwipeActionStyle?: CourierArchivingSwipeActionStyle
   loadingIndicatorColor?: string
   unreadIndicatorStyle?: CourierInboxUnreadIndicatorStyle
   titleStyle?: CourierInboxTextStyle

package/src/models/InboxMessageFeed.tsx

@@ -0,0 +1 @@
+export type InboxMessageFeed = 'feed' | 'archived';

package/src/models/InboxMessageSet.tsx

@@ -0,0 +1,7 @@
+import { InboxMessage } from "./InboxMessage";
+
+export interface InboxMessageSet {
+  messages: InboxMessage[];
+  totalMessageCount: number;
+  canPaginate: boolean;
+}

package/src/views/CourierInboxView.tsx

@@ -6,6 +6,7 @@ import { CourierInboxTheme } from "src/models/CourierInboxTheme";
 import { Modules } from "../Modules";
 
 type CourierInboxViewProps = {
+  canSwipePages?: boolean,
   theme?: { 
     light?: CourierInboxTheme, 
     dark?: CourierInboxTheme 
@@ -107,6 +108,7 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
 
   return (
     <CourierInbox 
+      canSwipePages={props.canSwipePages ?? false}
       theme={props.theme ?? { light: undefined, dark: undefined }} 
       onClickInboxMessageAtIndex={(event: any) => onClickInboxMessageAtIndex(event.nativeEvent)}
       onClickInboxActionForMessageAtIndex={(event: any) => onClickInboxActionForMessageAtIndex(event.nativeEvent)}