@planningcenter/chat-react-native 3.38.0-rc.9 → 3.38.1-rc.0

package/build/utils/cache/messages_cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages_cache.js","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"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","sourcesContent":["import { InfiniteData, QueryClient } from '@tanstack/react-query'\nimport { getRequestQueryKey } from '../../hooks/use_suspense_api'\nimport { ApiCollection, ApiResource, MessageResource } from '../../types'\nimport { JoltReactionEvent } from '../../types/jolt_events'\nimport { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource'\nimport { getMessagesRequestArgs } from '../request/get_messages'\nimport { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'\nimport { deleteRecordInPagesData } from './page_mutations'\n\nexport function updateCacheWithMessage(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  message: MessageResource,\n  event: 'message.created' | 'message.updated'\n) {\n  queryClient.setQueryData<MessagesQueryData>(queryKey, prev => {\n    if (event === 'message.created') {\n      // Before adding the new message, remove any pending temporary messages\n      // with matching text to prevent duplicates from race conditions\n      let dataAfterTempRemoval = prev\n      if (prev && message.text && message.mine) {\n        dataAfterTempRemoval = deleteRecordInPagesData({\n          data: prev,\n          record: message,\n          matchFn: (existingMessage, _record) => {\n            return (\n              isTemporaryMessageId(existingMessage.id) &&\n              existingMessage.text === message.text &&\n              existingMessage.mine\n            )\n          },\n        })\n      }\n\n      return updateOrCreateRecordInPagesData({\n        data: dataAfterTempRemoval,\n        record: message,\n        processRecord: (record, current) => mergeMessageUpdate(record, current),\n      })\n    } else {\n      return updateRecordInPagesData({\n        data: prev,\n        record: message,\n        processRecord: (record, current) => mergeMessageUpdate(record, current),\n      })\n    }\n  })\n}\n\ntype IndividualMessageQueryData = ApiResource<MessageResource>\n\nexport function updateCacheWithIndividualMessage(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  message: MessageResource\n) {\n  queryClient.setQueryData<IndividualMessageQueryData>(queryKey, prev => {\n    if (!prev) {\n      return {\n        data: message,\n        links: {},\n        meta: {},\n      }\n    }\n\n    return {\n      ...prev,\n      data: mergeMessageUpdate(message, prev.data),\n    }\n  })\n}\n\nexport function updateCacheWithReaction(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  event: JoltReactionEvent,\n  currentPersonId: number\n) {\n  const message = { id: event.data.data.message_sort_key } as MessageResource\n  queryClient.setQueryData<MessagesQueryData>(queryKey, prev =>\n    updateRecordInPagesData({\n      data: prev,\n      record: message,\n      processRecord: (record, oldMessage) => {\n        const reactionCounts = oldMessage.reactionCounts || []\n        let foundMatch = false\n        let newReactionCounts = reactionCounts.map(reactionCount => {\n          if (reactionCount.value === event.data.data.value) {\n            foundMatch = true\n            return transformReactionEventDataToReactionCountResource({\n              data: event.data.data,\n              oldData: reactionCount,\n              event: event.event,\n              currentPersonId,\n            })\n          }\n          return reactionCount\n        })\n\n        if (!foundMatch) {\n          const newReactionCount = transformReactionEventDataToReactionCountResource({\n            data: event.data.data,\n            event: event.event,\n            currentPersonId,\n          })\n\n          if (newReactionCount?.count) {\n            newReactionCounts = [...newReactionCounts, newReactionCount]\n          }\n        }\n\n        return { ...oldMessage, reactionCounts: newReactionCounts }\n      },\n    })\n  )\n}\n\ntype MessagesQueryData = InfiniteData<ApiCollection<MessageResource>>\nexport function isTemporaryMessageId(messageId?: string | null): boolean {\n  return !!messageId && messageId.endsWith('-temp')\n}\nexport function isNewMessage(message?: MessageResource): boolean {\n  return !message?.id || isTemporaryMessageId(message.id)\n}\n\nexport function getThreadedMessagesQueryKey(conversationId: number, replyRootId: string) {\n  const requestArgs = getMessagesRequestArgs({\n    conversation_id: conversationId,\n    reply_root_id: replyRootId,\n  })\n  return getRequestQueryKey(requestArgs)\n}\n\nexport function hasUnloadedNewerPages(queryClient: QueryClient, queryKey: unknown[]): boolean {\n  const data = queryClient.getQueryData<MessagesQueryData>(queryKey)\n  return !!data?.pages?.[0]?.meta?.next?.idGt\n}\n\nexport function mergeMessageUpdate(\n  record: MessageResource,\n  current?: MessageResource\n): MessageResource {\n  if (!current) {\n    return record\n  }\n\n  return {\n    ...current,\n    ...record,\n    // Preserve reactions from cache - they're managed via separate reaction events\n    reactionCounts: current.reactionCounts || [],\n  }\n}\n"]}
+{"version":3,"file":"messages_cache.js","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"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","sourcesContent":["import { InfiniteData, QueryClient } from '@tanstack/react-query'\nimport { getRequestQueryKey } from '../../hooks/use_suspense_api'\nimport { ApiCollection, ApiResource, MessageResource } from '../../types'\nimport { JoltReactionEvent } from '../../types/jolt_events'\nimport { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource'\nimport { getMessagesRequestArgs } from '../request/get_messages'\nimport { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'\nimport { deleteRecordInPagesData } from './page_mutations'\n\nexport function updateCacheWithMessage(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  message: MessageResource,\n  event: 'message.created' | 'message.updated'\n) {\n  queryClient.setQueryData<MessagesQueryData>(queryKey, prev => {\n    if (event === 'message.created') {\n      // Before adding the new message, remove any pending temporary messages\n      // with matching text to prevent duplicates from race conditions\n      let dataAfterTempRemoval = prev\n      if (prev && message.text && message.mine) {\n        dataAfterTempRemoval = deleteRecordInPagesData({\n          data: prev,\n          record: message,\n          matchFn: (existingMessage, _record) => {\n            return (\n              isTemporaryMessageId(existingMessage.id) &&\n              existingMessage.text === message.text &&\n              existingMessage.mine\n            )\n          },\n        })\n      }\n\n      return updateOrCreateRecordInPagesData({\n        data: dataAfterTempRemoval,\n        record: message,\n        processRecord: (record, current) => mergeMessageUpdate(record, current),\n      })\n    } else {\n      return updateRecordInPagesData({\n        data: prev,\n        record: message,\n        processRecord: (record, current) => mergeMessageUpdate(record, current),\n      })\n    }\n  })\n}\n\ntype IndividualMessageQueryData = ApiResource<MessageResource>\n\nexport function updateCacheWithIndividualMessage(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  message: MessageResource\n) {\n  queryClient.setQueryData<IndividualMessageQueryData>(queryKey, prev => {\n    if (!prev) {\n      return {\n        data: message,\n        links: {},\n        meta: {},\n      }\n    }\n\n    return {\n      ...prev,\n      data: mergeMessageUpdate(message, prev.data),\n    }\n  })\n}\n\nexport function updateCacheWithReaction(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  event: JoltReactionEvent,\n  currentPersonId: number\n) {\n  const message = { id: event.data.data.message_sort_key } as MessageResource\n  queryClient.setQueryData<MessagesQueryData>(queryKey, prev =>\n    updateRecordInPagesData({\n      data: prev,\n      record: message,\n      processRecord: (record, oldMessage) => {\n        const reactionCounts = oldMessage.reactionCounts || []\n        let foundMatch = false\n        let newReactionCounts = reactionCounts.map(reactionCount => {\n          if (reactionCount.value === event.data.data.value) {\n            foundMatch = true\n            return transformReactionEventDataToReactionCountResource({\n              data: event.data.data,\n              oldData: reactionCount,\n              event: event.event,\n              currentPersonId,\n            })\n          }\n          return reactionCount\n        })\n\n        if (!foundMatch) {\n          const newReactionCount = transformReactionEventDataToReactionCountResource({\n            data: event.data.data,\n            event: event.event,\n            currentPersonId,\n          })\n\n          if (newReactionCount?.count) {\n            newReactionCounts = [...newReactionCounts, newReactionCount]\n          }\n        }\n\n        return { ...oldMessage, reactionCounts: newReactionCounts }\n      },\n    })\n  )\n}\n\ntype MessagesQueryData = InfiniteData<ApiCollection<MessageResource>>\nexport function isTemporaryMessageId(messageId?: string | null): boolean {\n  return !!messageId && messageId.endsWith('-temp')\n}\nexport function isNewMessage(message?: MessageResource): boolean {\n  return !message?.id || isTemporaryMessageId(message.id)\n}\n\nexport function getThreadedMessagesQueryKey(conversationId: number, replyRootId: string) {\n  const requestArgs = getMessagesRequestArgs({\n    conversation_id: conversationId,\n    reply_root_id: replyRootId,\n  })\n  return getRequestQueryKey(requestArgs)\n}\n\nexport function mergeMessageUpdate(\n  record: MessageResource,\n  current?: MessageResource\n): MessageResource {\n  if (!current) {\n    return record\n  }\n\n  return {\n    ...current,\n    ...record,\n    // Preserve reactions from cache - they're managed via separate reaction events\n    reactionCounts: current.reactionCounts || [],\n  }\n}\n"]}

package/build/utils/group_messages.d.ts

@@ -1,14 +1,9 @@
 import type { MessageResource } from '../types/resources/message';
-export declare const UNREAD_DIVIDER_KEY = "unread-divider";
 export type DateSeparator = {
     type: 'DateSeparator';
     id: string;
     date: string;
 };
-export type UnreadDividerItem = {
-    type: 'UnreadDivider';
-    id: typeof UNREAD_DIVIDER_KEY;
-};
 export type ReplyShadowMessage = {
     type: 'ReplyShadowMessage';
     id: string;
@@ -16,13 +11,11 @@ export type ReplyShadowMessage = {
     isReplyShadowMessage: boolean;
     nextRendersAuthor: boolean;
 };
-export type EnrichedMessage = MessageResource | DateSeparator | UnreadDividerItem | ReplyShadowMessage;
+export type EnrichedMessage = MessageResource | DateSeparator | ReplyShadowMessage;
 interface GroupMessagesProps {
     ms: MessageResource[];
     inReplyScreen?: boolean;
-    jumpToUnreadActive?: boolean;
-    initialMessageId?: string | null;
 }
-export declare function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMessageId, }: GroupMessagesProps): EnrichedMessage[];
+export declare function groupMessages({ ms, inReplyScreen }: GroupMessagesProps): EnrichedMessage[];
 export {};
 //# sourceMappingURL=group_messages.d.ts.map

package/build/utils/group_messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"group_messages.d.ts","sourceRoot":"","sources":["../../src/utils/group_messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAMjE,eAAO,MAAM,kBAAkB,mBAAmB,CAAA;AAElD,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/E,MAAM,MAAM,iBAAiB,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,EAAE,EAAE,OAAO,kBAAkB,CAAA;CAAE,CAAA;AAExF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,oBAAoB,CAAA;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,OAAO,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,iBAAiB,GACjB,kBAAkB,CAAA;AAEtB,UAAU,kBAAkB;IAC1B,EAAE,EAAE,eAAe,EAAE,CAAA;IACrB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC;AAED,wBAAgB,aAAa,CAAC,EAC5B,EAAE,EACF,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GACjB,EAAE,kBAAkB,GAAG,eAAe,EAAE,CAyCxC"}
+{"version":3,"file":"group_messages.d.ts","sourceRoot":"","sources":["../../src/utils/group_messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAMjE,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/E,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,oBAAoB,CAAA;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,OAAO,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG,aAAa,GAAG,kBAAkB,CAAA;AAElF,UAAU,kBAAkB;IAC1B,EAAE,EAAE,eAAe,EAAE,CAAA;IACrB,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,kBAAkB,GAAG,eAAe,EAAE,CAkC1F"}

package/build/utils/group_messages.js

@@ -1,8 +1,7 @@
 import dayjs from './dayjs';
 import { isSystemMessage } from './system_messages';
 const FIVE_MINUTES_MS = 5 * 60 * 1000;
-export const UNREAD_DIVIDER_KEY = 'unread-divider';
-export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMessageId, }) {
+export function groupMessages({ ms, inReplyScreen }) {
     const items = [];
     let myLatestSeen = false;
     let nextNeighborEnriched;
@@ -12,9 +11,6 @@ export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMe
         if (isSystemMessage(message)) {
             const enriched = enrichSystemMessage(message, next);
             items.push(enriched);
-            if (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {
-                items.push(unreadDivider());
-            }
             if (datesDifferBetween(message, prev))
                 items.push(dateSeparator(message));
             nextNeighborEnriched = enriched;
@@ -25,9 +21,6 @@ export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMe
             myLatestSeen = true;
         const enriched = enrichRegularMessage(message, prev, next, isMyLatest, !!inReplyScreen);
         items.push(enriched);
-        if (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {
-            items.push(unreadDivider());
-        }
         const shadow = replyShadowFor(enriched, prev);
         if (shadow)
             items.push(shadow);
@@ -38,18 +31,6 @@ export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMe
     });
     return items;
 }
-function crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId) {
-    if (!jumpToUnreadActive)
-        return false;
-    if (!initialMessageId)
-        return false;
-    if (!prev)
-        return false;
-    return (prev.id.localeCompare(initialMessageId) <= 0 && message.id.localeCompare(initialMessageId) > 0);
-}
-function unreadDivider() {
-    return { type: 'UnreadDivider', id: UNREAD_DIVIDER_KEY };
-}
 function neighborsOf(arr, i) {
     return { prev: arr[i + 1], next: arr[i - 1] };
 }

package/build/utils/group_messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"group_messages.js","sourceRoot":"","sources":["../../src/utils/group_messages.ts"],"names":[],"mappings":"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","sourcesContent":["import type { MessageResource } from '../types/resources/message'\nimport dayjs from './dayjs'\nimport { isSystemMessage } from './system_messages'\n\nconst FIVE_MINUTES_MS = 5 * 60 * 1000\n\nexport const UNREAD_DIVIDER_KEY = 'unread-divider'\n\nexport type DateSeparator = { type: 'DateSeparator'; id: string; date: string }\n\nexport type UnreadDividerItem = { type: 'UnreadDivider'; id: typeof UNREAD_DIVIDER_KEY }\n\nexport type ReplyShadowMessage = {\n  type: 'ReplyShadowMessage'\n  id: string\n  messageId: string\n  isReplyShadowMessage: boolean\n  nextRendersAuthor: boolean\n}\n\nexport type EnrichedMessage =\n  | MessageResource\n  | DateSeparator\n  | UnreadDividerItem\n  | ReplyShadowMessage\n\ninterface GroupMessagesProps {\n  ms: MessageResource[]\n  inReplyScreen?: boolean\n  jumpToUnreadActive?: boolean\n  initialMessageId?: string | null\n}\n\nexport function groupMessages({\n  ms,\n  inReplyScreen,\n  jumpToUnreadActive,\n  initialMessageId,\n}: GroupMessagesProps): EnrichedMessage[] {\n  const items: EnrichedMessage[] = []\n  let myLatestSeen = false\n  let nextNeighborEnriched: MessageResource | undefined\n\n  ms.forEach((message, i) => {\n    const { prev } = neighborsOf(ms, i)\n    const next = nextNeighborEnriched\n\n    if (isSystemMessage(message)) {\n      const enriched = enrichSystemMessage(message, next)\n      items.push(enriched)\n      if (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {\n        items.push(unreadDivider())\n      }\n      if (datesDifferBetween(message, prev)) items.push(dateSeparator(message))\n      nextNeighborEnriched = enriched\n      return\n    }\n\n    const isMyLatest = !myLatestSeen && message.mine\n    if (isMyLatest) myLatestSeen = true\n\n    const enriched = enrichRegularMessage(message, prev, next, isMyLatest, !!inReplyScreen)\n    items.push(enriched)\n\n    if (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {\n      items.push(unreadDivider())\n    }\n\n    const shadow = replyShadowFor(enriched, prev)\n    if (shadow) items.push(shadow)\n\n    if (!prev || datesDifferBetween(message, prev)) {\n      items.push(dateSeparator(message))\n    }\n\n    nextNeighborEnriched = enriched\n  })\n\n  return items\n}\n\nfunction crossesUnreadBoundary(\n  message: MessageResource,\n  prev: MessageResource | undefined,\n  jumpToUnreadActive: boolean | undefined,\n  initialMessageId: string | null | undefined\n): boolean {\n  if (!jumpToUnreadActive) return false\n  if (!initialMessageId) return false\n  if (!prev) return false\n  return (\n    prev.id.localeCompare(initialMessageId) <= 0 && message.id.localeCompare(initialMessageId) > 0\n  )\n}\n\nfunction unreadDivider(): UnreadDividerItem {\n  return { type: 'UnreadDivider', id: UNREAD_DIVIDER_KEY }\n}\n\nfunction neighborsOf<T>(arr: T[], i: number): { prev: T | undefined; next: T | undefined } {\n  return { prev: arr[i + 1], next: arr[i - 1] }\n}\n\nfunction enrichSystemMessage(\n  message: MessageResource,\n  next: MessageResource | undefined\n): MessageResource {\n  return {\n    ...message,\n    myLatestInConversation: false,\n    lastInGroup: true,\n    renderAuthor: false,\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: false,\n    threadPosition: null,\n  }\n}\n\nfunction enrichRegularMessage(\n  message: MessageResource,\n  prev: MessageResource | undefined,\n  next: MessageResource | undefined,\n  isMyLatest: boolean,\n  inReplyScreen: boolean\n): MessageResource {\n  const inThread = message.replyRootId !== null\n  const showThreadDetails = !inReplyScreen && inThread\n\n  return {\n    ...message,\n    myLatestInConversation: isMyLatest,\n    lastInGroup: !next || startsNewGroup(next, message),\n    renderAuthor: !message.mine && (!prev || startsNewGroup(message, prev)),\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: nextIntroducesReplyShadow(next, message),\n    threadPosition: showThreadDetails ? threadPositionFor(message, next) : null,\n    prevIsMyReply: showThreadDetails ? prev?.mine : undefined,\n    nextIsMyReply: showThreadDetails ? next?.mine : undefined,\n  }\n}\n\nfunction startsNewGroup(a: MessageResource, b: MessageResource): boolean {\n  return (\n    a.author?.id !== b.author?.id ||\n    differsByMoreThan5Min(a, b) ||\n    a.replyRootId !== b.replyRootId ||\n    datesDifferBetween(a, b)\n  )\n}\n\nfunction differsByMoreThan5Min(a: MessageResource, b: MessageResource): boolean {\n  return Math.abs(toMillis(a.createdAt) - toMillis(b.createdAt)) > FIVE_MINUTES_MS\n}\n\nfunction toMillis(iso: string): number {\n  return new Date(iso).getTime()\n}\n\nfunction datesDifferBetween(a: MessageResource, b: MessageResource | undefined): boolean {\n  if (!b) return false\n  return dateKey(a) !== dateKey(b)\n}\n\nfunction dateKey(message: MessageResource): string {\n  return dayjs(message.createdAt).format('YYYY-MM-DD')\n}\n\nfunction dateSeparator(message: MessageResource): DateSeparator {\n  return { type: 'DateSeparator', id: `day-divider-${message.id}`, date: dateKey(message) }\n}\n\nfunction threadPositionFor(\n  message: MessageResource,\n  next: MessageResource | undefined\n): 'first' | 'center' | 'last' | null {\n  const isThreadRoot = message.replyRootId === message.id\n  const isLast =\n    !next || next.replyRootId !== message.replyRootId || datesDifferBetween(next, message)\n\n  if (isThreadRoot && isLast) return null\n  if (isThreadRoot) return 'first'\n  if (isLast) return 'last'\n  return 'center'\n}\n\nfunction nextIntroducesReplyShadow(\n  next: MessageResource | undefined,\n  current: MessageResource\n): boolean {\n  if (!next) return false\n  const nextInThread = next.replyRootId !== null\n  const nextIsThreadRoot = next.replyRootId === next.id\n  const differentThread = next.replyRootId !== current.replyRootId\n  return nextInThread && !nextIsThreadRoot && (differentThread || datesDifferBetween(next, current))\n}\n\nfunction replyShadowFor(\n  message: MessageResource,\n  prev: MessageResource | undefined\n): ReplyShadowMessage | undefined {\n  if (!message.replyRootId) return undefined\n  if (message.replyRootId === message.id) return undefined\n\n  const enteringNewThread =\n    !prev || prev.replyRootId !== message.replyRootId || datesDifferBetween(prev, message)\n  if (!enteringNewThread) return undefined\n\n  return {\n    type: 'ReplyShadowMessage',\n    id: `${message.id}-${message.replyRootId}`,\n    messageId: message.replyRootId,\n    isReplyShadowMessage: true,\n    nextRendersAuthor: message.renderAuthor ?? false,\n  }\n}\n"]}
+{"version":3,"file":"group_messages.js","sourceRoot":"","sources":["../../src/utils/group_messages.ts"],"names":[],"mappings":"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","sourcesContent":["import type { MessageResource } from '../types/resources/message'\nimport dayjs from './dayjs'\nimport { isSystemMessage } from './system_messages'\n\nconst FIVE_MINUTES_MS = 5 * 60 * 1000\n\nexport type DateSeparator = { type: 'DateSeparator'; id: string; date: string }\n\nexport type ReplyShadowMessage = {\n  type: 'ReplyShadowMessage'\n  id: string\n  messageId: string\n  isReplyShadowMessage: boolean\n  nextRendersAuthor: boolean\n}\n\nexport type EnrichedMessage = MessageResource | DateSeparator | ReplyShadowMessage\n\ninterface GroupMessagesProps {\n  ms: MessageResource[]\n  inReplyScreen?: boolean\n}\n\nexport function groupMessages({ ms, inReplyScreen }: GroupMessagesProps): EnrichedMessage[] {\n  const items: EnrichedMessage[] = []\n  let myLatestSeen = false\n  let nextNeighborEnriched: MessageResource | undefined\n\n  ms.forEach((message, i) => {\n    const { prev } = neighborsOf(ms, i)\n    const next = nextNeighborEnriched\n\n    if (isSystemMessage(message)) {\n      const enriched = enrichSystemMessage(message, next)\n      items.push(enriched)\n      if (datesDifferBetween(message, prev)) items.push(dateSeparator(message))\n      nextNeighborEnriched = enriched\n      return\n    }\n\n    const isMyLatest = !myLatestSeen && message.mine\n    if (isMyLatest) myLatestSeen = true\n\n    const enriched = enrichRegularMessage(message, prev, next, isMyLatest, !!inReplyScreen)\n    items.push(enriched)\n\n    const shadow = replyShadowFor(enriched, prev)\n    if (shadow) items.push(shadow)\n\n    if (!prev || datesDifferBetween(message, prev)) {\n      items.push(dateSeparator(message))\n    }\n\n    nextNeighborEnriched = enriched\n  })\n\n  return items\n}\n\nfunction neighborsOf<T>(arr: T[], i: number): { prev: T | undefined; next: T | undefined } {\n  return { prev: arr[i + 1], next: arr[i - 1] }\n}\n\nfunction enrichSystemMessage(\n  message: MessageResource,\n  next: MessageResource | undefined\n): MessageResource {\n  return {\n    ...message,\n    myLatestInConversation: false,\n    lastInGroup: true,\n    renderAuthor: false,\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: false,\n    threadPosition: null,\n  }\n}\n\nfunction enrichRegularMessage(\n  message: MessageResource,\n  prev: MessageResource | undefined,\n  next: MessageResource | undefined,\n  isMyLatest: boolean,\n  inReplyScreen: boolean\n): MessageResource {\n  const inThread = message.replyRootId !== null\n  const showThreadDetails = !inReplyScreen && inThread\n\n  return {\n    ...message,\n    myLatestInConversation: isMyLatest,\n    lastInGroup: !next || startsNewGroup(next, message),\n    renderAuthor: !message.mine && (!prev || startsNewGroup(message, prev)),\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: nextIntroducesReplyShadow(next, message),\n    threadPosition: showThreadDetails ? threadPositionFor(message, next) : null,\n    prevIsMyReply: showThreadDetails ? prev?.mine : undefined,\n    nextIsMyReply: showThreadDetails ? next?.mine : undefined,\n  }\n}\n\nfunction startsNewGroup(a: MessageResource, b: MessageResource): boolean {\n  return (\n    a.author?.id !== b.author?.id ||\n    differsByMoreThan5Min(a, b) ||\n    a.replyRootId !== b.replyRootId ||\n    datesDifferBetween(a, b)\n  )\n}\n\nfunction differsByMoreThan5Min(a: MessageResource, b: MessageResource): boolean {\n  return Math.abs(toMillis(a.createdAt) - toMillis(b.createdAt)) > FIVE_MINUTES_MS\n}\n\nfunction toMillis(iso: string): number {\n  return new Date(iso).getTime()\n}\n\nfunction datesDifferBetween(a: MessageResource, b: MessageResource | undefined): boolean {\n  if (!b) return false\n  return dateKey(a) !== dateKey(b)\n}\n\nfunction dateKey(message: MessageResource): string {\n  return dayjs(message.createdAt).format('YYYY-MM-DD')\n}\n\nfunction dateSeparator(message: MessageResource): DateSeparator {\n  return { type: 'DateSeparator', id: `day-divider-${message.id}`, date: dateKey(message) }\n}\n\nfunction threadPositionFor(\n  message: MessageResource,\n  next: MessageResource | undefined\n): 'first' | 'center' | 'last' | null {\n  const isThreadRoot = message.replyRootId === message.id\n  const isLast =\n    !next || next.replyRootId !== message.replyRootId || datesDifferBetween(next, message)\n\n  if (isThreadRoot && isLast) return null\n  if (isThreadRoot) return 'first'\n  if (isLast) return 'last'\n  return 'center'\n}\n\nfunction nextIntroducesReplyShadow(\n  next: MessageResource | undefined,\n  current: MessageResource\n): boolean {\n  if (!next) return false\n  const nextInThread = next.replyRootId !== null\n  const nextIsThreadRoot = next.replyRootId === next.id\n  const differentThread = next.replyRootId !== current.replyRootId\n  return nextInThread && !nextIsThreadRoot && (differentThread || datesDifferBetween(next, current))\n}\n\nfunction replyShadowFor(\n  message: MessageResource,\n  prev: MessageResource | undefined\n): ReplyShadowMessage | undefined {\n  if (!message.replyRootId) return undefined\n  if (message.replyRootId === message.id) return undefined\n\n  const enteringNewThread =\n    !prev || prev.replyRootId !== message.replyRootId || datesDifferBetween(prev, message)\n  if (!enteringNewThread) return undefined\n\n  return {\n    type: 'ReplyShadowMessage',\n    id: `${message.id}-${message.replyRootId}`,\n    messageId: message.replyRootId,\n    isReplyShadowMessage: true,\n    nextRendersAuthor: message.renderAuthor ?? false,\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.38.0-rc.9",
+  "version": "3.38.1-rc.0",
   "description": "",
   "main": "build/index.js",
   "react-native": "./src/index.tsx",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^7.2.0",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@planningcenter/emoji-keyboard": "3.38.0-rc.9",
+    "@planningcenter/emoji-keyboard": "3.38.0",
     "lodash-inflection": "^1.5.0",
     "react-compiler-runtime": "^1.0.0"
   },
@@ -72,5 +72,5 @@
     "react-native-url-polyfill": "^2.0.0",
     "typescript": "~5.9.2"
   },
-  "gitHead": "b823f9b053cad4fbf7e0efafd6e30cc37e16ab80"
+  "gitHead": "3268ac630db7e7d7c9d1af4ce152ffc08fa1679c"
 }

package/src/__tests__/hooks/use_api.test.tsx

@@ -0,0 +1,53 @@
+import { QueryClientProvider } from '@tanstack/react-query'
+import { renderHook, waitFor } from '@testing-library/react-native'
+import React from 'react'
+import { buildTestQueryClient } from '../../__utils__/query_client'
+import { ChatContext, ChatContextValue } from '../../contexts/chat_context'
+import { useApiGet } from '../../hooks/use_api'
+import { ApiClient, useApiClient } from '../../hooks/use_api_client'
+import { Session } from '../../utils'
+
+jest.mock('../../hooks/use_api_client')
+
+const mockedUseApiClient = useApiClient as jest.MockedFunction<typeof useApiClient>
+
+let get: jest.Mock
+
+const renderUseApiGet = (session: Session) => {
+  const queryClient = buildTestQueryClient()
+  const wrapper = ({ children }: { children: React.ReactNode }) => (
+    <QueryClientProvider client={queryClient}>
+      <ChatContext.Provider value={{ session } as unknown as ChatContextValue}>
+        {children}
+      </ChatContext.Provider>
+    </QueryClientProvider>
+  )
+
+  return renderHook(() => useApiGet({ url: '/me', data: { fields: { Person: ['id'] } } }), {
+    wrapper,
+  })
+}
+
+beforeEach(() => {
+  get = jest.fn().mockResolvedValue({ data: { id: 1 } })
+  mockedUseApiClient.mockReturnValue({ chat: { get } } as unknown as ApiClient)
+})
+
+afterEach(() => {
+  jest.clearAllMocks()
+})
+
+describe('useApiGet', () => {
+  it('does not fetch while the session has no access token', () => {
+    const { result } = renderUseApiGet(new Session())
+
+    expect(result.current.fetchStatus).toBe('idle')
+    expect(get).not.toHaveBeenCalled()
+  })
+
+  it('fetches once the session carries an access token', async () => {
+    renderUseApiGet(new Session({ token: { access_token: 'a-real-token' } }))
+
+    await waitFor(() => expect(get).toHaveBeenCalledTimes(1))
+  })
+})

package/src/components/conversation/jump_to_bottom_button.tsx

@@ -1,13 +1,12 @@
 import { useEffect } from 'react'
-import { ActivityIndicator, Pressable, StyleSheet, View } from 'react-native'
+import { View, Pressable, StyleSheet } from 'react-native'
 import Animated, {
-  Extrapolation,
+  useSharedValue,
+  useAnimatedStyle,
   interpolate,
+  Extrapolation,
   ReduceMotion,
-  useAnimatedStyle,
-  useSharedValue,
   withSpring,
-  withTiming,
 } from 'react-native-reanimated'
 import { useTheme } from '../../hooks'
 import { platformFontWeightMedium } from '../../utils'
@@ -16,17 +15,11 @@ import { Icon, Text } from '../display'
 interface JumpToBottomButtonProps {
   onPress: () => void
   visible: boolean
-  loading?: boolean
 }
 
-export const JumpToBottomButton = ({
-  onPress,
-  visible,
-  loading = false,
-}: JumpToBottomButtonProps) => {
+export const JumpToBottomButton = ({ onPress, visible }: JumpToBottomButtonProps) => {
   const styles = useStyles()
   const progress = useSharedValue(0)
-  const loadingProgress = useSharedValue(0)
 
   useEffect(() => {
     progress.value = withSpring(visible ? 1 : 0, {
@@ -38,13 +31,6 @@ export const JumpToBottomButton = ({
     })
   }, [visible, progress])
 
-  useEffect(() => {
-    loadingProgress.value = withTiming(loading ? 1 : 0, {
-      duration: 750,
-      reduceMotion: ReduceMotion.System,
-    })
-  }, [loading, loadingProgress])
-
   const animatedStyle = useAnimatedStyle(() => {
     return {
       opacity: progress.value,
@@ -59,34 +45,16 @@ export const JumpToBottomButton = ({
     }
   })
 
-  const iconStyle = useAnimatedStyle(() => ({ opacity: 1 - loadingProgress.value }))
-  const spinnerStyle = useAnimatedStyle(() => ({ opacity: loadingProgress.value }))
-
   return (
     <View>
-      <Animated.View
-        style={[styles.container, animatedStyle]}
-        pointerEvents={visible ? 'auto' : 'none'}
-      >
+      <Animated.View style={[styles.container, animatedStyle]}>
         <Pressable
           onPress={onPress}
-          disabled={loading}
-          accessibilityRole="button"
-          accessibilityLabel="Jump to most recent message"
-          accessibilityState={{ busy: loading }}
-          hitSlop={hitSlop}
           style={({ pressed }) => [styles.button, pressed && styles.pressed]}
         >
-          <View style={styles.glyph}>
-            <Animated.View style={[styles.glyphLayer, iconStyle]}>
-              <Icon name="general.downArrow" style={styles.icon} />
-            </Animated.View>
-            <Animated.View style={[styles.glyphLayer, spinnerStyle]}>
-              <ActivityIndicator size="small" color={styles.icon.color} style={styles.spinner} />
-            </Animated.View>
-          </View>
+          <Icon name="general.downArrow" style={styles.icon} />
           <Text variant="tertiary" style={styles.text}>
-            {loading ? 'Jumping to latest…' : 'Jump to bottom'}
+            Jump to bottom
           </Text>
         </Pressable>
       </Animated.View>
@@ -94,8 +62,6 @@ export const JumpToBottomButton = ({
   )
 }
 
-const hitSlop = { top: 12, bottom: 12, left: 12, right: 12 }
-
 const useStyles = () => {
   const { colors } = useTheme()
 
@@ -127,25 +93,10 @@ const useStyles = () => {
       color: colors.fillColorNeutral100Inverted,
       fontWeight: platformFontWeightMedium,
     },
-    glyph: {
-      width: 14,
-      height: 14,
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
-    glyphLayer: {
-      position: 'absolute',
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
     icon: {
       color: colors.fillColorNeutral100Inverted,
       fontSize: 14,
     },
-    spinner: {
-      width: 14,
-      height: 14,
-    },
     pressed: {
       transform: [{ scale: 0.95 }],
     },

package/src/components/conversation/reply_shadow_message.tsx

@@ -28,7 +28,7 @@ import {
 import { Avatar, Icon, IconProps, Image, Text } from '../display'
 import { TheirReplyConnector, MyReplyConnector } from './reply_connectors'
 
-interface ReplyShadowMessageProps {
+interface ReplyShadowMessageProps extends MessageResource {
   messageId: string
   conversation_id: number
   inReplyScreen?: boolean

package/src/contexts/conversation_context.tsx

@@ -1,59 +1,31 @@
-import React, { createContext, PropsWithChildren, useContext, useMemo, useState } from 'react'
+import React, { createContext, PropsWithChildren, useContext, useMemo } from 'react'
 
 interface ConversationContextValue {
   conversationId: number
   currentPageReplyRootId: string | null
-  initialMessageId: string | null
-  setInitialMessageId: (id: string | null) => void
-  initialMessageIdIsAnchor: boolean
-  atEndOfMessageHistory: boolean
-  setAtEndOfMessageHistory: (atEnd: boolean) => void
 }
 
 interface ConversationContextProviderProps extends PropsWithChildren {
   conversationId: number
   currentPageReplyRootId: string | null
-  initialMessageId?: string | null
-  initialMessageIdIsAnchor?: boolean
 }
 
 const ConversationContext = createContext<ConversationContextValue>({
   conversationId: 0,
   currentPageReplyRootId: null,
-  initialMessageId: null,
-  setInitialMessageId: () => {},
-  initialMessageIdIsAnchor: false,
-  atEndOfMessageHistory: false,
-  setAtEndOfMessageHistory: () => {},
 })
 
 export const ConversationContextProvider = ({
   children,
   conversationId,
   currentPageReplyRootId,
-  initialMessageId: initialMessageIdProp = null,
-  initialMessageIdIsAnchor = false,
 }: ConversationContextProviderProps) => {
-  const [initialMessageId, setInitialMessageId] = useState(initialMessageIdProp)
-  const [atEndOfMessageHistory, setAtEndOfMessageHistory] = useState(false)
-
   const value = useMemo(
     () => ({
       conversationId,
       currentPageReplyRootId,
-      initialMessageId,
-      setInitialMessageId,
-      initialMessageIdIsAnchor,
-      atEndOfMessageHistory,
-      setAtEndOfMessageHistory,
     }),
-    [
-      conversationId,
-      currentPageReplyRootId,
-      initialMessageId,
-      initialMessageIdIsAnchor,
-      atEndOfMessageHistory,
-    ]
+    [conversationId, currentPageReplyRootId]
   )
 
   return <ConversationContext.Provider value={value}>{children}</ConversationContext.Provider>

package/src/hooks/use_api.ts

@@ -4,6 +4,8 @@ import {
   useInfiniteQuery,
   useQuery,
 } from '@tanstack/react-query'
+import { useContext } from 'react'
+import { ChatContext } from '../contexts/chat_context'
 import { ApiCollection, ApiResource, FailedResponse, ResourceObject } from '../types'
 import { GetRequest, RequestData } from '../utils/client'
 import { getNextPageParamFromMeta } from './paginator_meta'
@@ -17,8 +19,11 @@ interface ApiGetOptions extends GetRequest {
 
 export const useApiGet = <T extends ResourceObject | ResourceObject[]>(args: ApiGetOptions) => {
   type Resource = ApiResource<T>
+  const { session } = useContext(ChatContext)
   const apiClient = useApiClient()
 
+  const enabled = !!session.token?.access_token && (args.enabled ?? true)
+
   const { data, ...query } = useQuery<Resource, FailedResponse>({
     queryKey: getRequestQueryKey(args),
     queryFn: ({ queryKey }) => {
@@ -26,7 +31,7 @@ export const useApiGet = <T extends ResourceObject | ResourceObject[]>(args: Api
 
       return apiClient[app].get({ url, data: d, headers }) as Promise<Resource>
     },
-    enabled: args.enabled,
+    enabled,
   })
 
   return { ...data, ...query }
@@ -41,7 +46,9 @@ export const useApiPaginator = <T extends ResourceObject>(
   args: ApiGetOptions,
   opts?: PaginatorOptions
 ) => {
+  const { session } = useContext(ChatContext)
   const apiClient = useApiClient()
+  const enabled = !!session.token?.access_token && (args.enabled ?? true)
   const query = useInfiniteQuery<
     ApiCollection<T>,
     FailedResponse,
@@ -65,7 +72,7 @@ export const useApiPaginator = <T extends ResourceObject>(
     },
     initialPageParam: {} as Partial<RequestData>,
     getNextPageParam: lastPage => getNextPageParamFromMeta(lastPage.meta?.next),
-    enabled: args.enabled,
+    enabled,
     ...(opts || {}),
   })
 

package/src/hooks/use_conversation_messages.ts

@@ -1,128 +1,28 @@
-import {
-  AnyUseSuspenseInfiniteQueryOptions,
-  InfiniteData,
-  useQueryClient,
-  useSuspenseInfiniteQuery,
-  useSuspenseQueries,
-} from '@tanstack/react-query'
-import { useCallback, useMemo } from 'react'
-import { useConversationContext } from '../contexts/conversation_context'
-import { ApiCollection, MessageResource } from '../types'
-import {
-  anchoredSeedPageParams,
-  MessagesPageParam,
-  newerPageParam,
-  olderPageParam,
-  sortAndFilterMessages,
-} from '../utils/conversation_messages'
+import { useMemo } from 'react'
+import { MessageResource } from '../types'
 import { getMessagesQueryKey, getMessagesRequestArgs } from '../utils/request/get_messages'
-import { useApiClient } from './use_api_client'
-import { throwResponseError } from './use_suspense_api'
-
-type Args = { conversation_id: number; reply_root_id?: string | null }
-
-export type ConversationMessagesOptions = Omit<
-  AnyUseSuspenseInfiniteQueryOptions,
-  | 'getNextPageParam'
-  | 'getPreviousPageParam'
-  | 'initialData'
-  | 'initialPageParam'
-  | 'queryFn'
-  | 'queryKey'
->
+import { SuspensePaginatorOptions, useSuspensePaginator } from './use_suspense_api'
 
 export const useConversationMessages = (
-  { conversation_id, reply_root_id }: Args,
-  opts?: ConversationMessagesOptions
+  { conversation_id, reply_root_id }: { conversation_id: number; reply_root_id?: string | null },
+  opts?: SuspensePaginatorOptions
 ) => {
-  const apiClient = useApiClient()
-  const { initialMessageId } = useConversationContext()
-  const anchored = !reply_root_id && !!initialMessageId
-
-  const requestArgs = useMemo(
-    () => getMessagesRequestArgs({ conversation_id, reply_root_id }),
-    [conversation_id, reply_root_id]
+  const { data, refetch, isRefetching, fetchNextPage } = useSuspensePaginator<MessageResource>(
+    getMessagesRequestArgs({ conversation_id, reply_root_id }),
+    opts
   )
-  const queryKey = useMemo(
-    () => getMessagesQueryKey({ conversation_id, reply_root_id }),
-    [conversation_id, reply_root_id]
-  )
-
-  const fetchPage = (pageParam: MessagesPageParam) => {
-    const data = {
-      ...requestArgs.data,
-      ...(pageParam.where ? { where: pageParam.where } : {}),
-      ...(pageParam.order ? { order: pageParam.order } : {}),
-    }
-    return apiClient.chat
-      .get<ApiCollection<MessageResource>>({ url: requestArgs.url, data })
-      .catch(throwResponseError)
-  }
-
-  const seedPageParams = anchored ? anchoredSeedPageParams(initialMessageId) : []
-  const seedQueries = useSuspenseQueries({
-    queries: seedPageParams.map((pageParam, index) => ({
-      queryKey: [...queryKey, 'seed', index],
-      queryFn: () => fetchPage(pageParam),
-      staleTime: Infinity,
-      gcTime: 0,
-    })),
-  })
-
-  const initialData: InfiniteData<ApiCollection<MessageResource>, MessagesPageParam> | undefined =
-    anchored
-      ? {
-          pages: seedQueries.map(q => q.data),
-          pageParams: seedPageParams,
-        }
-      : undefined
-
-  const initialPageParam: MessagesPageParam = anchored ? seedPageParams[0] : {}
-
-  const {
-    data,
-    refetch,
-    isRefetching,
-    fetchNextPage,
-    hasNextPage,
-    fetchPreviousPage,
-    hasPreviousPage,
-    isFetchingPreviousPage,
-  } = useSuspenseInfiniteQuery<
-    ApiCollection<MessageResource>,
-    Response,
-    InfiniteData<ApiCollection<MessageResource>, MessagesPageParam>,
-    typeof queryKey,
-    MessagesPageParam
-  >({
-    queryKey,
-    queryFn: ({ pageParam }) => fetchPage(pageParam),
-    initialPageParam,
-    initialData,
-    getNextPageParam: olderPageParam,
-    getPreviousPageParam: anchored ? newerPageParam : () => undefined,
-    ...(opts || {}),
-    ...(anchored ? { staleTime: Infinity, refetchOnMount: false } : {}),
-  })
-
-  const messages = useMemo(() => sortAndFilterMessages(data.pages), [data.pages])
-
-  const queryClient = useQueryClient()
-  const cancelFetchNewerMessages = useCallback(
-    () => queryClient.cancelQueries({ queryKey }),
-    [queryClient, queryKey]
+  const queryKey = getMessagesQueryKey({ conversation_id, reply_root_id })
+  const messages = useMemo(
+    () =>
+      data
+        .filter(
+          message =>
+            (!message.deletedAt || message.replyRootId) &&
+            (message.attachments?.length || message.text?.length)
+        )
+        .sort((a, b) => -a.id.localeCompare(b.id)),
+    [data]
   )
 
-  return {
-    messages,
-    refetch,
-    isRefetching,
-    fetchOlderMessages: fetchNextPage,
-    hasMoreOlderMessages: hasNextPage,
-    fetchNewerMessages: fetchPreviousPage,
-    hasMoreNewerMessages: hasPreviousPage,
-    isFetchingNewerMessages: isFetchingPreviousPage,
-    cancelFetchNewerMessages,
-    queryKey,
-  }
+  return { messages, refetch, isRefetching, fetchNextPage, queryKey }
 }