@planningcenter/chat-react-native 3.20.1 → 3.20.2

package/build/hooks/use_conversation_messages_jolt_events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use_conversation_messages_jolt_events.d.ts","sourceRoot":"","sources":["../../src/hooks/use_conversation_messages_jolt_events.ts"],"names":[],"mappings":"AAmBA,UAAU,KAAK;IACb,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,wBAAgB,iCAAiC,CAAC,EAAE,cAAc,EAAE,EAAE,KAAK,QAsF1E"}
+{"version":3,"file":"use_conversation_messages_jolt_events.d.ts","sourceRoot":"","sources":["../../src/hooks/use_conversation_messages_jolt_events.ts"],"names":[],"mappings":"AAyBA,UAAU,KAAK;IACb,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,wBAAgB,iCAAiC,CAAC,EAAE,cAAc,EAAE,EAAE,KAAK,QA+F1E"}

package/build/hooks/use_conversation_messages_jolt_events.js

@@ -5,10 +5,11 @@ import { useCurrentPerson } from './use_current_person';
 import { transformMessageEventDataToMessageResource } from '../utils/jolt/transform_message_event_data_to_message_resource';
 import { getRequestQueryKey } from './use_suspense_api';
 import { getMessagesRequestArgs } from '../utils/request/get_messages';
+import { getMessageQueryKey } from '../utils/request/get_message';
 import { TYPING_TIMEOUT_INTERVAL, useTypingStatusCache } from './use_typing_status_cache';
 import { completeMessageCreationTracking } from '../utils/performance_tracking';
 import { useApiClient } from './use_api_client';
-import { updateCacheWithMessage, updateCacheWithReaction, getThreadedMessagesQueryKey, } from '../utils/cache/messages_cache';
+import { updateCacheWithMessage, updateCacheWithIndividualMessage, updateCacheWithReaction, getThreadedMessagesQueryKey, } from '../utils/cache/messages_cache';
 export function useConversationMessagesJoltEvents({ conversationId }) {
     const queryClient = useQueryClient();
     const currentPerson = useCurrentPerson();
@@ -36,6 +37,14 @@ export function useConversationMessagesJoltEvents({ conversationId }) {
             const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, data.reply_root_id);
             updateCacheWithMessage(queryClient, threadedMessagesQueryKey, message, e.event);
         }
+        // Update individual message query cache so reply shadow messages update immediately
+        if (e.event === 'message.updated') {
+            const individualMessageQueryKey = getMessageQueryKey({
+                conversation_id: conversationId,
+                messageId: data.sort_key,
+            });
+            updateCacheWithIndividualMessage(queryClient, individualMessageQueryKey, message);
+        }
     };
     const handleMessageDeleted = async (e) => {
         const { data } = e.data;

package/build/hooks/use_conversation_messages_jolt_events.js.map

@@ -1 +1 @@
-{"version":3,"file":"use_conversation_messages_jolt_events.js","sourceRoot":"","sources":["../../src/hooks/use_conversation_messages_jolt_events.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApiCollection, MessageResource } from '../types'\nimport { useJoltChannel, useJoltEvent } from './use_jolt'\nimport { deleteRecordInPagesData } from '../utils'\nimport { MessageCreatedEvent, MessageDeletedEvent } from '../types/jolt_events/message_events'\nimport { InfiniteData, useQueryClient } from '@tanstack/react-query'\nimport { useCurrentPerson } from './use_current_person'\nimport { transformMessageEventDataToMessageResource } from '../utils/jolt/transform_message_event_data_to_message_resource'\nimport { getRequestQueryKey } from './use_suspense_api'\nimport { JoltReactionEvent, JoltTypingEvent } from '../types/jolt_events'\nimport { getMessagesRequestArgs } from '../utils/request/get_messages'\nimport { TYPING_TIMEOUT_INTERVAL, useTypingStatusCache } from './use_typing_status_cache'\nimport { completeMessageCreationTracking } from '../utils/performance_tracking'\nimport { useApiClient } from './use_api_client'\nimport {\n  updateCacheWithMessage,\n  updateCacheWithReaction,\n  getThreadedMessagesQueryKey,\n} from '../utils/cache/messages_cache'\n\ninterface Props {\n  conversationId: number\n}\n\nexport function useConversationMessagesJoltEvents({ conversationId }: Props) {\n  const queryClient = useQueryClient()\n  const currentPerson = useCurrentPerson()\n  const joltChannel = useJoltChannel(`chat.conversations.${conversationId}`)\n  const messagesRequestArgs = getMessagesRequestArgs({ conversation_id: conversationId })\n  const messagesQueryKey = getRequestQueryKey(messagesRequestArgs)\n  const apiClient = useApiClient()\n\n  const { addTypingEvent, removeTypingEventById, removeAllTypingEventsByAuthorId } =\n    useTypingStatusCache(conversationId)\n\n  const handleMessageUpdateOrCreate = async (e: MessageCreatedEvent) => {\n    const { data } = e.data\n    const message = transformMessageEventDataToMessageResource({\n      data,\n      currentPersonId: currentPerson.id,\n    })\n\n    if (e.event === 'message.created' && data.author_id) {\n      removeAllTypingEventsByAuthorId(data.author_id)\n      if (data.idempotent_key && data.author_id === currentPerson.id) {\n        completeMessageCreationTracking({ apiClient, idempotentKey: data.idempotent_key })\n      }\n    }\n\n    // Update the main conversation cache\n    updateCacheWithMessage(queryClient, messagesQueryKey, message, e.event)\n\n    // If message has a reply_root_id, also update the threaded cache\n    if (data.reply_root_id) {\n      const threadedMessagesQueryKey = getThreadedMessagesQueryKey(\n        conversationId,\n        data.reply_root_id\n      )\n      updateCacheWithMessage(queryClient, threadedMessagesQueryKey, message, e.event)\n    }\n  }\n\n  const handleMessageDeleted = async (e: MessageDeletedEvent) => {\n    const { data } = e.data\n    const message = transformMessageEventDataToMessageResource({\n      data,\n      currentPersonId: currentPerson.id,\n    })\n\n    // Update the main conversation cache\n    queryClient.setQueryData<QueryData>(messagesQueryKey, prev =>\n      deleteRecordInPagesData({ data: prev, record: message })\n    )\n\n    // If message has a reply_root_id, also update the threaded cache\n    if (data.reply_root_id) {\n      const threadedMessagesQueryKey = getThreadedMessagesQueryKey(\n        conversationId,\n        data.reply_root_id\n      )\n      queryClient.setQueryData<QueryData>(threadedMessagesQueryKey, prev =>\n        deleteRecordInPagesData({ data: prev, record: message })\n      )\n    }\n  }\n\n  const handleReactionJoltEvent = async (e: JoltReactionEvent) => {\n    // Update the main conversation cache and capture the reply_root_id if present\n    updateCacheWithReaction(queryClient, messagesQueryKey, e, currentPerson.id)\n\n    const replyRootId = e.data.data.reply_root_id\n\n    // If the message has a reply_root_id, also update the threaded cache\n    if (replyRootId) {\n      const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, replyRootId)\n      updateCacheWithReaction(queryClient, threadedMessagesQueryKey, e, currentPerson.id)\n    }\n  }\n\n  const handleTypingEvent = async (e: JoltTypingEvent) => {\n    const { data } = e.data\n    addTypingEvent(data)\n    setTimeout(() => removeTypingEventById(data.id), TYPING_TIMEOUT_INTERVAL)\n  }\n\n  useJoltEvent(joltChannel, 'message.created', handleMessageUpdateOrCreate)\n  useJoltEvent(joltChannel, 'message.updated', handleMessageUpdateOrCreate)\n  useJoltEvent(joltChannel, 'message.destroyed', handleMessageDeleted)\n  useJoltEvent(joltChannel, 'reaction.*', handleReactionJoltEvent)\n  useJoltEvent(joltChannel, 'typing.broadcast', handleTypingEvent)\n}\n\ntype QueryData = InfiniteData<ApiCollection<MessageResource>>\n"]}
+{"version":3,"file":"use_conversation_messages_jolt_events.js","sourceRoot":"","sources":["../../src/hooks/use_conversation_messages_jolt_events.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApiCollection, MessageResource } from '../types'\nimport { useJoltChannel, useJoltEvent } from './use_jolt'\nimport { deleteRecordInPagesData } from '../utils'\nimport {\n  MessageCreatedEvent,\n  MessageUpdatedEvent,\n  MessageDeletedEvent,\n} from '../types/jolt_events/message_events'\nimport { InfiniteData, useQueryClient } from '@tanstack/react-query'\nimport { useCurrentPerson } from './use_current_person'\nimport { transformMessageEventDataToMessageResource } from '../utils/jolt/transform_message_event_data_to_message_resource'\nimport { getRequestQueryKey } from './use_suspense_api'\nimport { JoltReactionEvent, JoltTypingEvent } from '../types/jolt_events'\nimport { getMessagesRequestArgs } from '../utils/request/get_messages'\nimport { getMessageQueryKey } from '../utils/request/get_message'\nimport { TYPING_TIMEOUT_INTERVAL, useTypingStatusCache } from './use_typing_status_cache'\nimport { completeMessageCreationTracking } from '../utils/performance_tracking'\nimport { useApiClient } from './use_api_client'\nimport {\n  updateCacheWithMessage,\n  updateCacheWithIndividualMessage,\n  updateCacheWithReaction,\n  getThreadedMessagesQueryKey,\n} from '../utils/cache/messages_cache'\n\ninterface Props {\n  conversationId: number\n}\n\nexport function useConversationMessagesJoltEvents({ conversationId }: Props) {\n  const queryClient = useQueryClient()\n  const currentPerson = useCurrentPerson()\n  const joltChannel = useJoltChannel(`chat.conversations.${conversationId}`)\n  const messagesRequestArgs = getMessagesRequestArgs({ conversation_id: conversationId })\n  const messagesQueryKey = getRequestQueryKey(messagesRequestArgs)\n  const apiClient = useApiClient()\n\n  const { addTypingEvent, removeTypingEventById, removeAllTypingEventsByAuthorId } =\n    useTypingStatusCache(conversationId)\n\n  const handleMessageUpdateOrCreate = async (e: MessageCreatedEvent | MessageUpdatedEvent) => {\n    const { data } = e.data\n    const message = transformMessageEventDataToMessageResource({\n      data,\n      currentPersonId: currentPerson.id,\n    })\n\n    if (e.event === 'message.created' && data.author_id) {\n      removeAllTypingEventsByAuthorId(data.author_id)\n      if (data.idempotent_key && data.author_id === currentPerson.id) {\n        completeMessageCreationTracking({ apiClient, idempotentKey: data.idempotent_key })\n      }\n    }\n\n    // Update the main conversation cache\n    updateCacheWithMessage(queryClient, messagesQueryKey, message, e.event)\n\n    // If message has a reply_root_id, also update the threaded cache\n    if (data.reply_root_id) {\n      const threadedMessagesQueryKey = getThreadedMessagesQueryKey(\n        conversationId,\n        data.reply_root_id\n      )\n      updateCacheWithMessage(queryClient, threadedMessagesQueryKey, message, e.event)\n    }\n\n    // Update individual message query cache so reply shadow messages update immediately\n    if (e.event === 'message.updated') {\n      const individualMessageQueryKey = getMessageQueryKey({\n        conversation_id: conversationId,\n        messageId: data.sort_key,\n      })\n      updateCacheWithIndividualMessage(queryClient, individualMessageQueryKey, message)\n    }\n  }\n\n  const handleMessageDeleted = async (e: MessageDeletedEvent) => {\n    const { data } = e.data\n    const message = transformMessageEventDataToMessageResource({\n      data,\n      currentPersonId: currentPerson.id,\n    })\n\n    // Update the main conversation cache\n    queryClient.setQueryData<QueryData>(messagesQueryKey, prev =>\n      deleteRecordInPagesData({ data: prev, record: message })\n    )\n\n    // If message has a reply_root_id, also update the threaded cache\n    if (data.reply_root_id) {\n      const threadedMessagesQueryKey = getThreadedMessagesQueryKey(\n        conversationId,\n        data.reply_root_id\n      )\n      queryClient.setQueryData<QueryData>(threadedMessagesQueryKey, prev =>\n        deleteRecordInPagesData({ data: prev, record: message })\n      )\n    }\n  }\n\n  const handleReactionJoltEvent = async (e: JoltReactionEvent) => {\n    // Update the main conversation cache and capture the reply_root_id if present\n    updateCacheWithReaction(queryClient, messagesQueryKey, e, currentPerson.id)\n\n    const replyRootId = e.data.data.reply_root_id\n\n    // If the message has a reply_root_id, also update the threaded cache\n    if (replyRootId) {\n      const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, replyRootId)\n      updateCacheWithReaction(queryClient, threadedMessagesQueryKey, e, currentPerson.id)\n    }\n  }\n\n  const handleTypingEvent = async (e: JoltTypingEvent) => {\n    const { data } = e.data\n    addTypingEvent(data)\n    setTimeout(() => removeTypingEventById(data.id), TYPING_TIMEOUT_INTERVAL)\n  }\n\n  useJoltEvent(joltChannel, 'message.created', handleMessageUpdateOrCreate)\n  useJoltEvent(joltChannel, 'message.updated', handleMessageUpdateOrCreate)\n  useJoltEvent(joltChannel, 'message.destroyed', handleMessageDeleted)\n  useJoltEvent(joltChannel, 'reaction.*', handleReactionJoltEvent)\n  useJoltEvent(joltChannel, 'typing.broadcast', handleTypingEvent)\n}\n\ntype QueryData = InfiniteData<ApiCollection<MessageResource>>\n"]}

package/build/utils/cache/messages_cache.d.ts

@@ -2,6 +2,7 @@ import { QueryClient } from '@tanstack/react-query';
 import { MessageResource } from '../../types';
 import { JoltReactionEvent } from '../../types/jolt_events';
 export declare function updateCacheWithMessage(queryClient: QueryClient, queryKey: unknown[], message: MessageResource, event: 'message.created' | 'message.updated'): void;
+export declare function updateCacheWithIndividualMessage(queryClient: QueryClient, queryKey: unknown[], message: MessageResource): void;
 export declare function updateCacheWithReaction(queryClient: QueryClient, queryKey: unknown[], event: JoltReactionEvent, currentPersonId: number): void;
 export declare function isTemporaryMessageId(messageId?: string | null): boolean;
 export declare function isNewMessage(message?: MessageResource): boolean;

package/build/utils/cache/messages_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages_cache.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,EAAiB,eAAe,EAAE,MAAM,aAAa,CAAA;AAG5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAK3D,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,QAkC7C;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,iBAAiB,EACxB,eAAe,EAAE,MAAM,QAuCxB;AAGD,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAEvE;AACD,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAE/D;AAED,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,0DAMtF;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,eAAe,GACxB,eAAe,CAWjB"}
+{"version":3,"file":"messages_cache.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,EAA8B,eAAe,EAAE,MAAM,aAAa,CAAA;AAGzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAK3D,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,QAkC7C;AAID,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,QAgBzB;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,iBAAiB,EACxB,eAAe,EAAE,MAAM,QAuCxB;AAGD,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAEvE;AACD,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAE/D;AAED,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,0DAMtF;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,eAAe,GACxB,eAAe,CAWjB"}

package/build/utils/cache/messages_cache.js

@@ -35,6 +35,21 @@ export function updateCacheWithMessage(queryClient, queryKey, message, event) {
         }
     });
 }
+export function updateCacheWithIndividualMessage(queryClient, queryKey, message) {
+    queryClient.setQueryData(queryKey, prev => {
+        if (!prev) {
+            return {
+                data: message,
+                links: {},
+                meta: {},
+            };
+        }
+        return {
+            ...prev,
+            data: mergeMessageUpdate(message, prev.data),
+        };
+    });
+}
 export function updateCacheWithReaction(queryClient, queryKey, event, currentPersonId) {
     const message = { id: event.data.data.message_sort_key };
     queryClient.setQueryData(queryKey, prev => updateRecordInPagesData({

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 { ApiCollection, MessageResource } from '../../types'\nimport { deleteRecordInPagesData } from './page_mutations'\nimport { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'\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 { getRequestQueryKey } from '../../hooks/use_suspense_api'\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\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"]}
+{"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 { ApiCollection, ApiResource, MessageResource } from '../../types'\nimport { deleteRecordInPagesData } from './page_mutations'\nimport { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'\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 { getRequestQueryKey } from '../../hooks/use_suspense_api'\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.20.1",
+  "version": "3.20.2",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -58,5 +58,5 @@
     "react-native-url-polyfill": "^2.0.0",
     "typescript": "<5.6.0"
   },
-  "gitHead": "151ffec397578fc048961f8aa834112d121cfaff"
+  "gitHead": "33fd86ec91367a40159def8417553c0792a15f4f"
 }

package/src/hooks/use_conversation_messages_jolt_events.ts

@@ -1,18 +1,24 @@
 import { ApiCollection, MessageResource } from '../types'
 import { useJoltChannel, useJoltEvent } from './use_jolt'
 import { deleteRecordInPagesData } from '../utils'
-import { MessageCreatedEvent, MessageDeletedEvent } from '../types/jolt_events/message_events'
+import {
+  MessageCreatedEvent,
+  MessageUpdatedEvent,
+  MessageDeletedEvent,
+} from '../types/jolt_events/message_events'
 import { InfiniteData, useQueryClient } from '@tanstack/react-query'
 import { useCurrentPerson } from './use_current_person'
 import { transformMessageEventDataToMessageResource } from '../utils/jolt/transform_message_event_data_to_message_resource'
 import { getRequestQueryKey } from './use_suspense_api'
 import { JoltReactionEvent, JoltTypingEvent } from '../types/jolt_events'
 import { getMessagesRequestArgs } from '../utils/request/get_messages'
+import { getMessageQueryKey } from '../utils/request/get_message'
 import { TYPING_TIMEOUT_INTERVAL, useTypingStatusCache } from './use_typing_status_cache'
 import { completeMessageCreationTracking } from '../utils/performance_tracking'
 import { useApiClient } from './use_api_client'
 import {
   updateCacheWithMessage,
+  updateCacheWithIndividualMessage,
   updateCacheWithReaction,
   getThreadedMessagesQueryKey,
 } from '../utils/cache/messages_cache'
@@ -32,7 +38,7 @@ export function useConversationMessagesJoltEvents({ conversationId }: Props) {
   const { addTypingEvent, removeTypingEventById, removeAllTypingEventsByAuthorId } =
     useTypingStatusCache(conversationId)
 
-  const handleMessageUpdateOrCreate = async (e: MessageCreatedEvent) => {
+  const handleMessageUpdateOrCreate = async (e: MessageCreatedEvent | MessageUpdatedEvent) => {
     const { data } = e.data
     const message = transformMessageEventDataToMessageResource({
       data,
@@ -57,6 +63,15 @@ export function useConversationMessagesJoltEvents({ conversationId }: Props) {
       )
       updateCacheWithMessage(queryClient, threadedMessagesQueryKey, message, e.event)
     }
+
+    // Update individual message query cache so reply shadow messages update immediately
+    if (e.event === 'message.updated') {
+      const individualMessageQueryKey = getMessageQueryKey({
+        conversation_id: conversationId,
+        messageId: data.sort_key,
+      })
+      updateCacheWithIndividualMessage(queryClient, individualMessageQueryKey, message)
+    }
   }
 
   const handleMessageDeleted = async (e: MessageDeletedEvent) => {

package/src/utils/cache/messages_cache.ts

@@ -1,5 +1,5 @@
 import { InfiniteData, QueryClient } from '@tanstack/react-query'
-import { ApiCollection, MessageResource } from '../../types'
+import { ApiCollection, ApiResource, MessageResource } from '../../types'
 import { deleteRecordInPagesData } from './page_mutations'
 import { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'
 import { JoltReactionEvent } from '../../types/jolt_events'
@@ -47,6 +47,29 @@ export function updateCacheWithMessage(
   })
 }
 
+type IndividualMessageQueryData = ApiResource<MessageResource>
+
+export function updateCacheWithIndividualMessage(
+  queryClient: QueryClient,
+  queryKey: unknown[],
+  message: MessageResource
+) {
+  queryClient.setQueryData<IndividualMessageQueryData>(queryKey, prev => {
+    if (!prev) {
+      return {
+        data: message,
+        links: {},
+        meta: {},
+      }
+    }
+
+    return {
+      ...prev,
+      data: mergeMessageUpdate(message, prev.data),
+    }
+  })
+}
+
 export function updateCacheWithReaction(
   queryClient: QueryClient,
   queryKey: unknown[],