@planningcenter/chat-react-native 4.3.0-rc.0 → 4.3.0-rc.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (144) hide show
  1. package/build/components/conversation/message_form.d.ts +2 -1
  2. package/build/components/conversation/message_form.d.ts.map +1 -1
  3. package/build/components/conversation/message_form.js +167 -370
  4. package/build/components/conversation/message_form.js.map +1 -1
  5. package/build/components/conversation/message_list.d.ts +5 -2
  6. package/build/components/conversation/message_list.d.ts.map +1 -1
  7. package/build/components/conversation/message_list.js +187 -67
  8. package/build/components/conversation/message_list.js.map +1 -1
  9. package/build/components/conversation/missing_message.d.ts +2 -0
  10. package/build/components/conversation/missing_message.d.ts.map +1 -0
  11. package/build/components/conversation/missing_message.js +139 -0
  12. package/build/components/conversation/missing_message.js.map +1 -0
  13. package/build/components/display/conversation_avatar.d.ts +1 -2
  14. package/build/components/display/conversation_avatar.d.ts.map +1 -1
  15. package/build/components/display/conversation_avatar.js.map +1 -1
  16. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts +4 -3
  17. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts.map +1 -1
  18. package/build/hooks/use_conversation_messages.d.ts +14 -5
  19. package/build/hooks/use_conversation_messages.d.ts.map +1 -1
  20. package/build/hooks/use_conversation_messages.js +218 -42
  21. package/build/hooks/use_conversation_messages.js.map +1 -1
  22. package/build/hooks/use_conversation_messages_jolt_events.d.ts.map +1 -1
  23. package/build/hooks/use_conversation_messages_jolt_events.js +58 -42
  24. package/build/hooks/use_conversation_messages_jolt_events.js.map +1 -1
  25. package/build/hooks/use_features.d.ts +2 -1
  26. package/build/hooks/use_features.d.ts.map +1 -1
  27. package/build/hooks/use_features.js +2 -1
  28. package/build/hooks/use_features.js.map +1 -1
  29. package/build/hooks/use_mark_latest_message_read.d.ts +2 -1
  30. package/build/hooks/use_mark_latest_message_read.d.ts.map +1 -1
  31. package/build/hooks/use_mark_latest_message_read.js +4 -3
  32. package/build/hooks/use_mark_latest_message_read.js.map +1 -1
  33. package/build/hooks/use_read_receipts.d.ts +4 -3
  34. package/build/hooks/use_read_receipts.d.ts.map +1 -1
  35. package/build/hooks/use_search_results.d.ts +19 -0
  36. package/build/hooks/use_search_results.d.ts.map +1 -0
  37. package/build/hooks/use_search_results.js +145 -0
  38. package/build/hooks/use_search_results.js.map +1 -0
  39. package/build/hooks/use_suspense_api.d.ts +10 -6
  40. package/build/hooks/use_suspense_api.d.ts.map +1 -1
  41. package/build/hooks/use_suspense_api.js +83 -63
  42. package/build/hooks/use_suspense_api.js.map +1 -1
  43. package/build/navigation/index.d.ts +5 -0
  44. package/build/navigation/index.d.ts.map +1 -1
  45. package/build/navigation/index.js +5 -0
  46. package/build/navigation/index.js.map +1 -1
  47. package/build/screens/conversation_new/components/services_form.js +9 -8
  48. package/build/screens/conversation_new/components/services_form.js.map +1 -1
  49. package/build/screens/conversation_screen.d.ts +1 -0
  50. package/build/screens/conversation_screen.d.ts.map +1 -1
  51. package/build/screens/conversation_screen.js +305 -203
  52. package/build/screens/conversation_screen.js.map +1 -1
  53. package/build/screens/conversations/components/search_list_header_component.d.ts.map +1 -1
  54. package/build/screens/conversations/components/search_list_header_component.js +159 -133
  55. package/build/screens/conversations/components/search_list_header_component.js.map +1 -1
  56. package/build/screens/message_actions_screen.d.ts.map +1 -1
  57. package/build/screens/message_actions_screen.js +103 -92
  58. package/build/screens/message_actions_screen.js.map +1 -1
  59. package/build/screens/notification_settings/hooks/groups.d.ts +4 -3
  60. package/build/screens/notification_settings/hooks/groups.d.ts.map +1 -1
  61. package/build/screens/search/components/search_blank_states.d.ts +7 -0
  62. package/build/screens/search/components/search_blank_states.d.ts.map +1 -0
  63. package/build/screens/search/components/search_blank_states.js +72 -0
  64. package/build/screens/search/components/search_blank_states.js.map +1 -0
  65. package/build/screens/search/components/search_field.d.ts +7 -0
  66. package/build/screens/search/components/search_field.d.ts.map +1 -0
  67. package/build/screens/search/components/search_field.js +152 -0
  68. package/build/screens/search/components/search_field.js.map +1 -0
  69. package/build/screens/search/search_screen.d.ts +5 -0
  70. package/build/screens/search/search_screen.d.ts.map +1 -0
  71. package/build/screens/search/search_screen.js +59 -0
  72. package/build/screens/search/search_screen.js.map +1 -0
  73. package/build/types/api_primitives.d.ts +1 -0
  74. package/build/types/api_primitives.d.ts.map +1 -1
  75. package/build/types/api_primitives.js.map +1 -1
  76. package/build/types/resources/conversation.d.ts +1 -0
  77. package/build/types/resources/conversation.d.ts.map +1 -1
  78. package/build/types/resources/conversation.js.map +1 -1
  79. package/build/types/resources/index.d.ts +1 -0
  80. package/build/types/resources/index.d.ts.map +1 -1
  81. package/build/types/resources/index.js +1 -0
  82. package/build/types/resources/index.js.map +1 -1
  83. package/build/types/resources/search_result.d.ts +29 -0
  84. package/build/types/resources/search_result.d.ts.map +1 -0
  85. package/build/types/resources/search_result.js +2 -0
  86. package/build/types/resources/search_result.js.map +1 -0
  87. package/build/utils/cache/messages_cache.d.ts +1 -0
  88. package/build/utils/cache/messages_cache.d.ts.map +1 -1
  89. package/build/utils/cache/messages_cache.js +37 -1
  90. package/build/utils/cache/messages_cache.js.map +1 -1
  91. package/build/utils/cache/messages_window.d.ts +11 -0
  92. package/build/utils/cache/messages_window.d.ts.map +1 -0
  93. package/build/utils/cache/messages_window.js +51 -0
  94. package/build/utils/cache/messages_window.js.map +1 -0
  95. package/build/utils/client/types.d.ts +1 -0
  96. package/build/utils/client/types.d.ts.map +1 -1
  97. package/build/utils/client/types.js.map +1 -1
  98. package/build/utils/request/get_search_results.d.ts +13 -0
  99. package/build/utils/request/get_search_results.d.ts.map +1 -0
  100. package/build/utils/request/get_search_results.js +20 -0
  101. package/build/utils/request/get_search_results.js.map +1 -0
  102. package/package.json +2 -2
  103. package/src/__tests__/hooks/use_features.test.ts +10 -2
  104. package/src/__tests__/screens/conversation_new/components/services_form.test.tsx +91 -0
  105. package/src/__utils__/query_client.ts +3 -0
  106. package/src/components/conversation/message_form.tsx +31 -3
  107. package/src/components/conversation/message_list.tsx +88 -4
  108. package/src/components/conversation/missing_message.tsx +66 -0
  109. package/src/components/display/conversation_avatar.tsx +1 -10
  110. package/src/hooks/__tests__/use_conversation_messages.test.tsx +333 -0
  111. package/src/hooks/__tests__/use_conversation_messages_jolt_events.test.tsx +87 -0
  112. package/src/hooks/__tests__/use_mark_latest_message_read.test.tsx +33 -0
  113. package/src/hooks/__tests__/use_message_create_or_update.test.tsx +2 -7
  114. package/src/hooks/__tests__/use_search_results.test.tsx +76 -0
  115. package/src/hooks/use_conversation_messages.ts +103 -17
  116. package/src/hooks/use_conversation_messages_jolt_events.ts +12 -2
  117. package/src/hooks/use_features.ts +3 -2
  118. package/src/hooks/use_mark_latest_message_read.ts +4 -3
  119. package/src/hooks/use_search_results.ts +77 -0
  120. package/src/hooks/use_suspense_api.ts +14 -6
  121. package/src/navigation/index.tsx +5 -0
  122. package/src/screens/conversation_new/components/services_form.tsx +5 -5
  123. package/src/screens/conversation_screen.tsx +62 -13
  124. package/src/screens/conversations/components/__tests__/search_list_header_component.test.tsx +62 -0
  125. package/src/screens/conversations/components/search_list_header_component.tsx +11 -0
  126. package/src/screens/message_actions_screen.tsx +12 -1
  127. package/src/screens/search/components/__tests__/search_blank_states.test.tsx +20 -0
  128. package/src/screens/search/components/__tests__/search_field.test.tsx +29 -0
  129. package/src/screens/search/components/search_blank_states.tsx +34 -0
  130. package/src/screens/search/components/search_field.tsx +81 -0
  131. package/src/screens/search/search_screen.tsx +41 -0
  132. package/src/types/api_primitives.ts +1 -0
  133. package/src/types/resources/conversation.ts +9 -0
  134. package/src/types/resources/index.ts +1 -0
  135. package/src/types/resources/search_result.ts +32 -0
  136. package/src/utils/__tests__/get_search_results.test.ts +24 -0
  137. package/src/utils/cache/__tests__/messages_cache.test.ts +2 -1
  138. package/src/utils/cache/__tests__/messages_cache_deletion.test.ts +97 -0
  139. package/src/utils/cache/__tests__/messages_cache_reply_roots.test.ts +3 -2
  140. package/src/utils/cache/__tests__/messages_window.test.ts +78 -0
  141. package/src/utils/cache/messages_cache.ts +45 -1
  142. package/src/utils/cache/messages_window.ts +55 -0
  143. package/src/utils/client/types.ts +1 -0
  144. package/src/utils/request/get_search_results.ts +23 -0
@@ -14,4 +14,5 @@ export * from './services';
14
14
  export * from './organization';
15
15
  export * from './group_membership';
16
16
  export * from './group_resource';
17
+ export * from './search_result';
17
18
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/resources/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,gBAAgB,CAAA;AAC9B,cAAc,2BAA2B,CAAA;AACzC,cAAc,yBAAyB,CAAA;AACvC,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/resources/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,gBAAgB,CAAA;AAC9B,cAAc,2BAA2B,CAAA;AACzC,cAAc,yBAAyB,CAAA;AACvC,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA"}
@@ -14,4 +14,5 @@ export * from './services';
14
14
  export * from './organization';
15
15
  export * from './group_membership';
16
16
  export * from './group_resource';
17
+ export * from './search_result';
17
18
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","names":[],"sources":["../../../src/types/resources/index.ts"],"sourcesContent":["export * from './analytics_metadata'\nexport * from './direct_message_affiliations'\nexport * from './direct_message_candidate'\nexport * from './conversation'\nexport * from './conversation_membership'\nexport * from './conversation_validate'\nexport * from './member'\nexport * from './message'\nexport * from './oauth_token'\nexport * from './person'\nexport * from './groups'\nexport * from './app_grant'\nexport * from './services'\nexport * from './organization'\nexport * from './group_membership'\nexport * from './group_resource'\n"],"mappings":"AAAA,cAAc,sBAAsB;AACpC,cAAc,+BAA+B;AAC7C,cAAc,4BAA4B;AAC1C,cAAc,gBAAgB;AAC9B,cAAc,2BAA2B;AACzC,cAAc,yBAAyB;AACvC,cAAc,UAAU;AACxB,cAAc,WAAW;AACzB,cAAc,eAAe;AAC7B,cAAc,UAAU;AACxB,cAAc,UAAU;AACxB,cAAc,aAAa;AAC3B,cAAc,YAAY;AAC1B,cAAc,gBAAgB;AAC9B,cAAc,oBAAoB;AAClC,cAAc,kBAAkB","ignoreList":[]}
1
+ {"version":3,"file":"index.js","names":[],"sources":["../../../src/types/resources/index.ts"],"sourcesContent":["export * from './analytics_metadata'\nexport * from './direct_message_affiliations'\nexport * from './direct_message_candidate'\nexport * from './conversation'\nexport * from './conversation_membership'\nexport * from './conversation_validate'\nexport * from './member'\nexport * from './message'\nexport * from './oauth_token'\nexport * from './person'\nexport * from './groups'\nexport * from './app_grant'\nexport * from './services'\nexport * from './organization'\nexport * from './group_membership'\nexport * from './group_resource'\nexport * from './search_result'\n"],"mappings":"AAAA,cAAc,sBAAsB;AACpC,cAAc,+BAA+B;AAC7C,cAAc,4BAA4B;AAC1C,cAAc,gBAAgB;AAC9B,cAAc,2BAA2B;AACzC,cAAc,yBAAyB;AACvC,cAAc,UAAU;AACxB,cAAc,WAAW;AACzB,cAAc,eAAe;AAC7B,cAAc,UAAU;AACxB,cAAc,UAAU;AACxB,cAAc,aAAa;AAC3B,cAAc,YAAY;AAC1B,cAAc,gBAAgB;AAC9B,cAAc,oBAAoB;AAClC,cAAc,kBAAkB;AAChC,cAAc,iBAAiB","ignoreList":[]}
@@ -0,0 +1,29 @@
1
+ import type { ConversationAvatarData } from './conversation';
2
+ interface BaseSearchResultResource {
3
+ id: string;
4
+ title: string;
5
+ url: string;
6
+ }
7
+ export interface SnippetSegment {
8
+ text: string;
9
+ match: boolean;
10
+ }
11
+ export interface ConversationSearchResultResource extends BaseSearchResultResource {
12
+ type: 'conversation';
13
+ extra: {
14
+ avatar: ConversationAvatarData;
15
+ };
16
+ }
17
+ export interface MessageSearchResultResource extends BaseSearchResultResource {
18
+ type: 'message';
19
+ extra: {
20
+ conversationId: number;
21
+ authorName: string;
22
+ snippet: SnippetSegment[];
23
+ createdAt: string;
24
+ avatar: ConversationAvatarData;
25
+ };
26
+ }
27
+ export type SearchResultResource = ConversationSearchResultResource | MessageSearchResultResource;
28
+ export {};
29
+ //# sourceMappingURL=search_result.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"search_result.d.ts","sourceRoot":"","sources":["../../../src/types/resources/search_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAE5D,UAAU,wBAAwB;IAChC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,gCAAiC,SAAQ,wBAAwB;IAChF,IAAI,EAAE,cAAc,CAAA;IACpB,KAAK,EAAE;QACL,MAAM,EAAE,sBAAsB,CAAA;KAC/B,CAAA;CACF;AAED,MAAM,WAAW,2BAA4B,SAAQ,wBAAwB;IAC3E,IAAI,EAAE,SAAS,CAAA;IACf,KAAK,EAAE;QACL,cAAc,EAAE,MAAM,CAAA;QACtB,UAAU,EAAE,MAAM,CAAA;QAClB,OAAO,EAAE,cAAc,EAAE,CAAA;QACzB,SAAS,EAAE,MAAM,CAAA;QACjB,MAAM,EAAE,sBAAsB,CAAA;KAC/B,CAAA;CACF;AAED,MAAM,MAAM,oBAAoB,GAAG,gCAAgC,GAAG,2BAA2B,CAAA"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=search_result.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"search_result.js","names":[],"sources":["../../../src/types/resources/search_result.ts"],"sourcesContent":["import type { ConversationAvatarData } from './conversation'\n\ninterface BaseSearchResultResource {\n id: string\n title: string\n url: string\n}\n\nexport interface SnippetSegment {\n text: string\n match: boolean\n}\n\nexport interface ConversationSearchResultResource extends BaseSearchResultResource {\n type: 'conversation'\n extra: {\n avatar: ConversationAvatarData\n }\n}\n\nexport interface MessageSearchResultResource extends BaseSearchResultResource {\n type: 'message'\n extra: {\n conversationId: number\n authorName: string\n snippet: SnippetSegment[]\n createdAt: string\n avatar: ConversationAvatarData\n }\n}\n\nexport type SearchResultResource = ConversationSearchResultResource | MessageSearchResultResource\n"],"mappings":"","ignoreList":[]}
@@ -8,5 +8,6 @@ export declare function updateCacheWithReaction(queryClient: QueryClient, queryK
8
8
  export declare function isTemporaryMessageId(messageId?: string | null): boolean;
9
9
  export declare function isNewMessage(message?: MessageResource): boolean;
10
10
  export declare function getThreadedMessagesQueryKey(conversationId: number, replyRootId: string): import("../..").RequestQueryKey;
11
+ export declare function applyMessageDeletionToCaches(queryClient: QueryClient, conversationId: number, message: MessageResource): void;
11
12
  export declare function mergeMessageUpdate(record: MessageResource, current?: MessageResource): MessageResource;
12
13
  //# sourceMappingURL=messages_cache.d.ts.map
@@ -1 +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;AAEjE,OAAO,EAA8B,eAAe,EAAE,MAAM,aAAa,CAAA;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAU3D,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,QA8B7C;AAID,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,QAgBzB;AAED,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,IAAI,EAAE,eAAe,QAWtB;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,mCAMtF;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,eAAe,GACxB,eAAe,CAWjB"}
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;AAEjE,OAAO,EAA8B,eAAe,EAAE,MAAM,aAAa,CAAA;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAW3D,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,QA8B7C;AAID,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,QAgBzB;AAED,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,IAAI,EAAE,eAAe,QAWtB;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,mCAMtF;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,eAAe,QAsCzB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,eAAe,GACxB,eAAe,CAWjB"}
@@ -1,6 +1,7 @@
1
1
  import { getRequestQueryKey } from '../../hooks/use_suspense_api';
2
2
  import { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource';
3
- import { getMessagesRequestArgs } from '../request/get_messages';
3
+ import { getMessageQueryKey } from '../request/get_message';
4
+ import { getMessagesQueryKey, getMessagesRequestArgs } from '../request/get_messages';
4
5
  import { updateAllRecordsInPagesData, updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations';
5
6
  import { deleteRecordInPagesData } from './page_mutations';
6
7
  export function updateCacheWithMessage(queryClient, queryKey, message, event) {
@@ -106,6 +107,41 @@ export function getThreadedMessagesQueryKey(conversationId, replyRootId) {
106
107
  });
107
108
  return getRequestQueryKey(requestArgs);
108
109
  }
110
+ export function applyMessageDeletionToCaches(queryClient, conversationId, message) {
111
+ const messagesQueryKey = getMessagesQueryKey({
112
+ conversation_id: conversationId
113
+ });
114
+ const isReplyRoot = message.replyRootId === message.id;
115
+ if (isReplyRoot) {
116
+ const deletedRoot = {
117
+ ...message,
118
+ deletedAt: message.deletedAt ?? new Date().toISOString(),
119
+ attachments: []
120
+ };
121
+ const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, message.id);
122
+ const individualMessageQueryKey = getMessageQueryKey({
123
+ conversation_id: conversationId,
124
+ messageId: message.id
125
+ });
126
+ updateCacheWithMessage(queryClient, messagesQueryKey, deletedRoot, 'message.updated');
127
+ updateCacheWithMessage(queryClient, threadedMessagesQueryKey, deletedRoot, 'message.updated');
128
+ updateCacheReplyRoots(queryClient, messagesQueryKey, deletedRoot);
129
+ updateCacheReplyRoots(queryClient, threadedMessagesQueryKey, deletedRoot);
130
+ updateCacheWithIndividualMessage(queryClient, individualMessageQueryKey, deletedRoot);
131
+ return;
132
+ }
133
+ queryClient.setQueryData(messagesQueryKey, prev => deleteRecordInPagesData({
134
+ data: prev,
135
+ record: message
136
+ }));
137
+ if (message.replyRootId) {
138
+ const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, message.replyRootId);
139
+ queryClient.setQueryData(threadedMessagesQueryKey, prev => deleteRecordInPagesData({
140
+ data: prev,
141
+ record: message
142
+ }));
143
+ }
144
+ }
109
145
  export function mergeMessageUpdate(record, current) {
110
146
  if (!current) {
111
147
  return record;
@@ -1 +1 @@
1
- {"version":3,"file":"messages_cache.js","names":["getRequestQueryKey","transformReactionEventDataToReactionCountResource","getMessagesRequestArgs","updateAllRecordsInPagesData","updateOrCreateRecordInPagesData","updateRecordInPagesData","deleteRecordInPagesData","updateCacheWithMessage","queryClient","queryKey","message","event","setQueryData","prev","dataAfterTempRemoval","mine","idempotentKey","data","record","matchFn","existingMessage","isTemporaryMessageId","id","processRecord","current","mergeMessageUpdate","updateCacheWithIndividualMessage","links","meta","updateCacheReplyRoots","root","replyRoot","updateCacheWithReaction","currentPersonId","message_sort_key","oldMessage","reactionCounts","foundMatch","newReactionCounts","map","reactionCount","value","oldData","newReactionCount","count","messageId","endsWith","isNewMessage","getThreadedMessagesQueryKey","conversationId","replyRootId","requestArgs","conversation_id","reply_root_id"],"sources":["../../../src/utils/cache/messages_cache.ts"],"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 {\n updateAllRecordsInPagesData,\n updateOrCreateRecordInPagesData,\n updateRecordInPagesData,\n} 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 its pending temporary counterpart.\n // The Jolt echo can arrive before the HTTP response has swapped it out.\n let dataAfterTempRemoval = prev\n if (prev && message.mine && message.idempotentKey) {\n dataAfterTempRemoval = deleteRecordInPagesData({\n data: prev,\n record: message,\n matchFn: existingMessage =>\n isTemporaryMessageId(existingMessage.id) &&\n existingMessage.idempotentKey === message.idempotentKey,\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 updateCacheReplyRoots(\n queryClient: QueryClient,\n queryKey: unknown[],\n root: MessageResource\n) {\n queryClient.setQueryData<MessagesQueryData>(queryKey, prev =>\n updateAllRecordsInPagesData({\n data: prev,\n processRecord: message =>\n message.replyRoot?.id === root.id\n ? { ...message, replyRoot: mergeMessageUpdate(root, message.replyRoot) }\n : message,\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"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"messages_cache.js","names":["getRequestQueryKey","transformReactionEventDataToReactionCountResource","getMessageQueryKey","getMessagesQueryKey","getMessagesRequestArgs","updateAllRecordsInPagesData","updateOrCreateRecordInPagesData","updateRecordInPagesData","deleteRecordInPagesData","updateCacheWithMessage","queryClient","queryKey","message","event","setQueryData","prev","dataAfterTempRemoval","mine","idempotentKey","data","record","matchFn","existingMessage","isTemporaryMessageId","id","processRecord","current","mergeMessageUpdate","updateCacheWithIndividualMessage","links","meta","updateCacheReplyRoots","root","replyRoot","updateCacheWithReaction","currentPersonId","message_sort_key","oldMessage","reactionCounts","foundMatch","newReactionCounts","map","reactionCount","value","oldData","newReactionCount","count","messageId","endsWith","isNewMessage","getThreadedMessagesQueryKey","conversationId","replyRootId","requestArgs","conversation_id","reply_root_id","applyMessageDeletionToCaches","messagesQueryKey","isReplyRoot","deletedRoot","deletedAt","Date","toISOString","attachments","threadedMessagesQueryKey","individualMessageQueryKey"],"sources":["../../../src/utils/cache/messages_cache.ts"],"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 { getMessageQueryKey } from '../request/get_message'\nimport { getMessagesQueryKey, getMessagesRequestArgs } from '../request/get_messages'\nimport {\n updateAllRecordsInPagesData,\n updateOrCreateRecordInPagesData,\n updateRecordInPagesData,\n} 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 its pending temporary counterpart.\n // The Jolt echo can arrive before the HTTP response has swapped it out.\n let dataAfterTempRemoval = prev\n if (prev && message.mine && message.idempotentKey) {\n dataAfterTempRemoval = deleteRecordInPagesData({\n data: prev,\n record: message,\n matchFn: existingMessage =>\n isTemporaryMessageId(existingMessage.id) &&\n existingMessage.idempotentKey === message.idempotentKey,\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 updateCacheReplyRoots(\n queryClient: QueryClient,\n queryKey: unknown[],\n root: MessageResource\n) {\n queryClient.setQueryData<MessagesQueryData>(queryKey, prev =>\n updateAllRecordsInPagesData({\n data: prev,\n processRecord: message =>\n message.replyRoot?.id === root.id\n ? { ...message, replyRoot: mergeMessageUpdate(root, message.replyRoot) }\n : message,\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 applyMessageDeletionToCaches(\n queryClient: QueryClient,\n conversationId: number,\n message: MessageResource\n) {\n const messagesQueryKey = getMessagesQueryKey({ conversation_id: conversationId })\n const isReplyRoot = message.replyRootId === message.id\n\n if (isReplyRoot) {\n const deletedRoot: MessageResource = {\n ...message,\n deletedAt: message.deletedAt ?? new Date().toISOString(),\n attachments: [],\n }\n const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, message.id)\n const individualMessageQueryKey = getMessageQueryKey({\n conversation_id: conversationId,\n messageId: message.id,\n })\n\n updateCacheWithMessage(queryClient, messagesQueryKey, deletedRoot, 'message.updated')\n updateCacheWithMessage(queryClient, threadedMessagesQueryKey, deletedRoot, 'message.updated')\n updateCacheReplyRoots(queryClient, messagesQueryKey, deletedRoot)\n updateCacheReplyRoots(queryClient, threadedMessagesQueryKey, deletedRoot)\n updateCacheWithIndividualMessage(queryClient, individualMessageQueryKey, deletedRoot)\n return\n }\n\n queryClient.setQueryData<MessagesQueryData>(messagesQueryKey, prev =>\n deleteRecordInPagesData({ data: prev, record: message })\n )\n\n if (message.replyRootId) {\n const threadedMessagesQueryKey = getThreadedMessagesQueryKey(\n conversationId,\n message.replyRootId\n )\n queryClient.setQueryData<MessagesQueryData>(threadedMessagesQueryKey, prev =>\n deleteRecordInPagesData({ data: prev, record: message })\n )\n }\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"],"mappings":"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","ignoreList":[]}
@@ -0,0 +1,11 @@
1
+ import { InfiniteData } from '@tanstack/react-query';
2
+ import { ApiCollection, MessageResource } from '../../types';
3
+ import { RequestData } from '../client';
4
+ export type MessagesWindow = InfiniteData<ApiCollection<MessageResource>, Partial<RequestData> | undefined>;
5
+ export declare const livePageParam: Partial<RequestData>;
6
+ export declare const anchoredPageParam: (anchor: string) => Partial<RequestData>;
7
+ export declare function isBehindLiveEdge(data: MessagesWindow | undefined): boolean;
8
+ export declare function newerPageParam(firstPage: ApiCollection<MessageResource>): Partial<RequestData> | undefined;
9
+ export declare function newestFirst<Page extends ApiCollection<MessageResource>>(page: Page, pageParam: Partial<RequestData> | undefined): Page;
10
+ export declare function markLiveIfCaughtUp(data: MessagesWindow | undefined): MessagesWindow | undefined;
11
+ //# sourceMappingURL=messages_window.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messages_window.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/messages_window.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAEvC,MAAM,MAAM,cAAc,GAAG,YAAY,CACvC,aAAa,CAAC,eAAe,CAAC,EAC9B,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,CACjC,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,OAAO,CAAC,WAAW,CAAM,CAAA;AAErD,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,KAAG,OAAO,CAAC,WAAW,CAEpE,CAAA;AAEF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAE1E;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,aAAa,CAAC,eAAe,CAAC,GACxC,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,CAMlC;AAKD,wBAAgB,WAAW,CAAC,IAAI,SAAS,aAAa,CAAC,eAAe,CAAC,EACrE,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,GAC1C,IAAI,CAUN;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAO/F"}
@@ -0,0 +1,51 @@
1
+ export const livePageParam = {};
2
+ export const anchoredPageParam = anchor => ({
3
+ where: {
4
+ id_around: anchor
5
+ }
6
+ });
7
+ export function isBehindLiveEdge(data) {
8
+ return !!data?.pages[0]?.meta?.prev;
9
+ }
10
+ export function newerPageParam(firstPage) {
11
+ const newestId = firstPage.meta?.prev?.idGt;
12
+ if (!newestId) return undefined;
13
+
14
+ // Without asc the server hands back the newest page instead, leaving a gap.
15
+ return {
16
+ where: {
17
+ id_gt: newestId
18
+ },
19
+ order: 'asc'
20
+ };
21
+ }
22
+
23
+ // The server returns newer pages oldest first, linking only to the next newer page.
24
+ // Storing them newest first with an older link lets a refetch replay the window
25
+ // forward from its top page like any other.
26
+ export function newestFirst(page, pageParam) {
27
+ if (pageParam?.order !== 'asc') return page;
28
+ const data = [...page.data].reverse();
29
+ const oldest = data[data.length - 1];
30
+ return {
31
+ ...page,
32
+ data,
33
+ meta: {
34
+ ...page.meta,
35
+ prev: page.meta?.next,
36
+ next: oldest && {
37
+ idLt: oldest.id
38
+ }
39
+ }
40
+ };
41
+ }
42
+ export function markLiveIfCaughtUp(data) {
43
+ if (!data) return data;
44
+ const topIsLive = !data.pageParams[0]?.where;
45
+ if (topIsLive || isBehindLiveEdge(data)) return data;
46
+ return {
47
+ ...data,
48
+ pageParams: [livePageParam, ...data.pageParams.slice(1)]
49
+ };
50
+ }
51
+ //# sourceMappingURL=messages_window.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messages_window.js","names":["livePageParam","anchoredPageParam","anchor","where","id_around","isBehindLiveEdge","data","pages","meta","prev","newerPageParam","firstPage","newestId","idGt","undefined","id_gt","order","newestFirst","page","pageParam","reverse","oldest","length","next","idLt","id","markLiveIfCaughtUp","topIsLive","pageParams","slice"],"sources":["../../../src/utils/cache/messages_window.ts"],"sourcesContent":["import { InfiniteData } from '@tanstack/react-query'\nimport { ApiCollection, MessageResource } from '../../types'\nimport { RequestData } from '../client'\n\nexport type MessagesWindow = InfiniteData<\n ApiCollection<MessageResource>,\n Partial<RequestData> | undefined\n>\n\nexport const livePageParam: Partial<RequestData> = {}\n\nexport const anchoredPageParam = (anchor: string): Partial<RequestData> => ({\n where: { id_around: anchor },\n})\n\nexport function isBehindLiveEdge(data: MessagesWindow | undefined): boolean {\n return !!data?.pages[0]?.meta?.prev\n}\n\nexport function newerPageParam(\n firstPage: ApiCollection<MessageResource>\n): Partial<RequestData> | undefined {\n const newestId = firstPage.meta?.prev?.idGt\n if (!newestId) return undefined\n\n // Without asc the server hands back the newest page instead, leaving a gap.\n return { where: { id_gt: newestId }, order: 'asc' }\n}\n\n// The server returns newer pages oldest first, linking only to the next newer page.\n// Storing them newest first with an older link lets a refetch replay the window\n// forward from its top page like any other.\nexport function newestFirst<Page extends ApiCollection<MessageResource>>(\n page: Page,\n pageParam: Partial<RequestData> | undefined\n): Page {\n if (pageParam?.order !== 'asc') return page\n\n const data = [...page.data].reverse()\n const oldest = data[data.length - 1]\n return {\n ...page,\n data,\n meta: { ...page.meta, prev: page.meta?.next, next: oldest && { idLt: oldest.id } },\n }\n}\n\nexport function markLiveIfCaughtUp(data: MessagesWindow | undefined): MessagesWindow | undefined {\n if (!data) return data\n\n const topIsLive = !data.pageParams[0]?.where\n if (topIsLive || isBehindLiveEdge(data)) return data\n\n return { ...data, pageParams: [livePageParam, ...data.pageParams.slice(1)] }\n}\n"],"mappings":"AASA,OAAO,MAAMA,aAAmC,GAAG,CAAC,CAAC;AAErD,OAAO,MAAMC,iBAAiB,GAAIC,MAAc,KAA4B;EAC1EC,KAAK,EAAE;IAAEC,SAAS,EAAEF;EAAO;AAC7B,CAAC,CAAC;AAEF,OAAO,SAASG,gBAAgBA,CAACC,IAAgC,EAAW;EAC1E,OAAO,CAAC,CAACA,IAAI,EAAEC,KAAK,CAAC,CAAC,CAAC,EAAEC,IAAI,EAAEC,IAAI;AACrC;AAEA,OAAO,SAASC,cAAcA,CAC5BC,SAAyC,EACP;EAClC,MAAMC,QAAQ,GAAGD,SAAS,CAACH,IAAI,EAAEC,IAAI,EAAEI,IAAI;EAC3C,IAAI,CAACD,QAAQ,EAAE,OAAOE,SAAS;;EAE/B;EACA,OAAO;IAAEX,KAAK,EAAE;MAAEY,KAAK,EAAEH;IAAS,CAAC;IAAEI,KAAK,EAAE;EAAM,CAAC;AACrD;;AAEA;AACA;AACA;AACA,OAAO,SAASC,WAAWA,CACzBC,IAAU,EACVC,SAA2C,EACrC;EACN,IAAIA,SAAS,EAAEH,KAAK,KAAK,KAAK,EAAE,OAAOE,IAAI;EAE3C,MAAMZ,IAAI,GAAG,CAAC,GAAGY,IAAI,CAACZ,IAAI,CAAC,CAACc,OAAO,CAAC,CAAC;EACrC,MAAMC,MAAM,GAAGf,IAAI,CAACA,IAAI,CAACgB,MAAM,GAAG,CAAC,CAAC;EACpC,OAAO;IACL,GAAGJ,IAAI;IACPZ,IAAI;IACJE,IAAI,EAAE;MAAE,GAAGU,IAAI,CAACV,IAAI;MAAEC,IAAI,EAAES,IAAI,CAACV,IAAI,EAAEe,IAAI;MAAEA,IAAI,EAAEF,MAAM,IAAI;QAAEG,IAAI,EAAEH,MAAM,CAACI;MAAG;IAAE;EACnF,CAAC;AACH;AAEA,OAAO,SAASC,kBAAkBA,CAACpB,IAAgC,EAA8B;EAC/F,IAAI,CAACA,IAAI,EAAE,OAAOA,IAAI;EAEtB,MAAMqB,SAAS,GAAG,CAACrB,IAAI,CAACsB,UAAU,CAAC,CAAC,CAAC,EAAEzB,KAAK;EAC5C,IAAIwB,SAAS,IAAItB,gBAAgB,CAACC,IAAI,CAAC,EAAE,OAAOA,IAAI;EAEpD,OAAO;IAAE,GAAGA,IAAI;IAAEsB,UAAU,EAAE,CAAC5B,aAAa,EAAE,GAAGM,IAAI,CAACsB,UAAU,CAACC,KAAK,CAAC,CAAC,CAAC;EAAE,CAAC;AAC9E","ignoreList":[]}
@@ -57,5 +57,6 @@ export type RequestData = {
57
57
  data: Record<string, unknown>;
58
58
  perPage: number;
59
59
  offset: number;
60
+ order: string;
60
61
  };
61
62
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/client/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/client/types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","names":[],"sources":["../../../src/utils/client/types.ts"],"sourcesContent":["export interface Accumulator {\n data: Record<string, unknown>[]\n included: Record<string, unknown>[]\n meta: Record<string, unknown>\n links: Record<string, unknown>\n}\n\nexport interface WalkRequest extends GetRequest {\n acc?: Accumulator\n}\n\nexport interface GenericRequest {\n headers?: Record<string, string>\n url: string\n}\n\nexport interface GetRequest extends GenericRequest {\n data: {\n filter?: string\n fields: Record<string, string[]>\n where?: Record<string, string | number | (string | number)[]>\n include?: string[]\n order?: string\n perPage?: number\n offset?: number\n walk?: boolean\n } & Record<string, unknown>\n}\n\nexport interface Relationship {\n data: {\n type: string\n id: string\n }\n}\n\nexport type Relationships = Record<string, Relationship | Relationship[]>\nexport interface PostRequest extends GenericRequest {\n data?: {\n fields?: Record<string, string> // value should be comma separated string\n include?: string[]\n data?: {\n type: string\n attributes: Record<string, unknown>\n relationships?: Relationships\n }\n }\n}\n\nexport type PatchRequest = PostRequest\n\nexport interface DeleteRequest extends GenericRequest {}\n\nexport interface ApiClient<T = unknown> {\n get(_request: GetRequest): Promise<T>\n post(_request: PostRequest): Promise<T>\n patch(_request: PatchRequest): Promise<T>\n delete(_request: DeleteRequest): Promise<T>\n}\n\nexport type RequestData = {\n fields: Record<string, string[] | string>\n where: Record<string, string | number | (string | number)[]>\n include: string[]\n data: Record<string, unknown>\n perPage: number\n offset: number\n}\n"],"mappings":"","ignoreList":[]}
1
+ {"version":3,"file":"types.js","names":[],"sources":["../../../src/utils/client/types.ts"],"sourcesContent":["export interface Accumulator {\n data: Record<string, unknown>[]\n included: Record<string, unknown>[]\n meta: Record<string, unknown>\n links: Record<string, unknown>\n}\n\nexport interface WalkRequest extends GetRequest {\n acc?: Accumulator\n}\n\nexport interface GenericRequest {\n headers?: Record<string, string>\n url: string\n}\n\nexport interface GetRequest extends GenericRequest {\n data: {\n filter?: string\n fields: Record<string, string[]>\n where?: Record<string, string | number | (string | number)[]>\n include?: string[]\n order?: string\n perPage?: number\n offset?: number\n walk?: boolean\n } & Record<string, unknown>\n}\n\nexport interface Relationship {\n data: {\n type: string\n id: string\n }\n}\n\nexport type Relationships = Record<string, Relationship | Relationship[]>\nexport interface PostRequest extends GenericRequest {\n data?: {\n fields?: Record<string, string> // value should be comma separated string\n include?: string[]\n data?: {\n type: string\n attributes: Record<string, unknown>\n relationships?: Relationships\n }\n }\n}\n\nexport type PatchRequest = PostRequest\n\nexport interface DeleteRequest extends GenericRequest {}\n\nexport interface ApiClient<T = unknown> {\n get(_request: GetRequest): Promise<T>\n post(_request: PostRequest): Promise<T>\n patch(_request: PatchRequest): Promise<T>\n delete(_request: DeleteRequest): Promise<T>\n}\n\nexport type RequestData = {\n fields: Record<string, string[] | string>\n where: Record<string, string | number | (string | number)[]>\n include: string[]\n data: Record<string, unknown>\n perPage: number\n offset: number\n order: string\n}\n"],"mappings":"","ignoreList":[]}
@@ -0,0 +1,13 @@
1
+ export declare const SEARCH_RESULTS_PAGE_SIZE = 20;
2
+ export declare const getSearchResultsRequestArgs: (term: string) => {
3
+ url: string;
4
+ data: {
5
+ q: string;
6
+ perPage: number;
7
+ fields: {
8
+ SearchResult: string[];
9
+ };
10
+ };
11
+ };
12
+ export declare const getSearchResultsQueryKey: (term: string) => import("../..").RequestQueryKey;
13
+ //# sourceMappingURL=get_search_results.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get_search_results.d.ts","sourceRoot":"","sources":["../../../src/utils/request/get_search_results.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAE1C,eAAO,MAAM,2BAA2B,GAAI,MAAM,MAAM;;;;;;;;;CAavD,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,MAAM,MAAM,oCAGpD,CAAA"}
@@ -0,0 +1,20 @@
1
+ import { getRequestQueryKey } from '../../hooks/use_suspense_api';
2
+ export const SEARCH_RESULTS_PAGE_SIZE = 20;
3
+ export const getSearchResultsRequestArgs = term => {
4
+ const url = '/search_results';
5
+ return {
6
+ url,
7
+ data: {
8
+ q: term,
9
+ perPage: SEARCH_RESULTS_PAGE_SIZE,
10
+ fields: {
11
+ SearchResult: ['type', 'title', 'url', 'extra']
12
+ }
13
+ }
14
+ };
15
+ };
16
+ export const getSearchResultsQueryKey = term => {
17
+ const requestArgs = getSearchResultsRequestArgs(term);
18
+ return getRequestQueryKey(requestArgs);
19
+ };
20
+ //# sourceMappingURL=get_search_results.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get_search_results.js","names":["getRequestQueryKey","SEARCH_RESULTS_PAGE_SIZE","getSearchResultsRequestArgs","term","url","data","q","perPage","fields","SearchResult","getSearchResultsQueryKey","requestArgs"],"sources":["../../../src/utils/request/get_search_results.ts"],"sourcesContent":["import { getRequestQueryKey } from '../../hooks/use_suspense_api'\n\nexport const SEARCH_RESULTS_PAGE_SIZE = 20\n\nexport const getSearchResultsRequestArgs = (term: string) => {\n const url = '/search_results'\n\n return {\n url,\n data: {\n q: term,\n perPage: SEARCH_RESULTS_PAGE_SIZE,\n fields: {\n SearchResult: ['type', 'title', 'url', 'extra'],\n },\n },\n }\n}\n\nexport const getSearchResultsQueryKey = (term: string) => {\n const requestArgs = getSearchResultsRequestArgs(term)\n return getRequestQueryKey(requestArgs)\n}\n"],"mappings":"AAAA,SAASA,kBAAkB,QAAQ,8BAA8B;AAEjE,OAAO,MAAMC,wBAAwB,GAAG,EAAE;AAE1C,OAAO,MAAMC,2BAA2B,GAAIC,IAAY,IAAK;EAC3D,MAAMC,GAAG,GAAG,iBAAiB;EAE7B,OAAO;IACLA,GAAG;IACHC,IAAI,EAAE;MACJC,CAAC,EAAEH,IAAI;MACPI,OAAO,EAAEN,wBAAwB;MACjCO,MAAM,EAAE;QACNC,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO;MAChD;IACF;EACF,CAAC;AACH,CAAC;AAED,OAAO,MAAMC,wBAAwB,GAAIP,IAAY,IAAK;EACxD,MAAMQ,WAAW,GAAGT,2BAA2B,CAACC,IAAI,CAAC;EACrD,OAAOH,kBAAkB,CAACW,WAAW,CAAC;AACxC,CAAC","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@planningcenter/chat-react-native",
3
- "version": "4.3.0-rc.0",
3
+ "version": "4.3.0-rc.10",
4
4
  "description": "",
5
5
  "repository": {
6
6
  "type": "git",
@@ -84,5 +84,5 @@
84
84
  "sf-symbols-typescript": "^2.2.0",
85
85
  "typescript": "~6.0.3"
86
86
  },
87
- "gitHead": "2d5f97948a3f69f26435fa88e8cbfdd264270022"
87
+ "gitHead": "b8b4e3752edfd1c664bca97ea33a24e640532be3"
88
88
  }
@@ -1,9 +1,9 @@
1
1
  import { buildTestQueryClient } from '../../__utils__/query_client'
2
2
  import type { ApiClient } from '../../hooks/use_api_client'
3
- import { featuresQueryOptions } from '../../hooks/use_features'
3
+ import { availableFeatures, featuresQueryOptions } from '../../hooks/use_features'
4
4
 
5
5
  const features = {
6
- data: [{ type: 'Feature', id: '1', name: 'ROLLOUT_search', enabled: true }],
6
+ data: [{ type: 'Feature', id: '1', name: 'QA_MOBILE_search', enabled: true }],
7
7
  links: {},
8
8
  meta: { count: 1, totalCount: 1 },
9
9
  }
@@ -19,6 +19,14 @@ const fetchTwice = async (get: jest.Mock, secondsBetween: number) => {
19
19
  await queryClient.fetchQuery(options)
20
20
  }
21
21
 
22
+ describe('availableFeatures', () => {
23
+ it('never reads a web-only flag', () => {
24
+ Object.values(availableFeatures).forEach(name => {
25
+ expect(name).not.toMatch(/_WEB_/)
26
+ })
27
+ })
28
+ })
29
+
22
30
  describe('featuresQueryOptions', () => {
23
31
  beforeEach(() => {
24
32
  jest.useFakeTimers()
@@ -0,0 +1,91 @@
1
+ import { DefaultTheme, ThemeProvider } from '@react-navigation/native'
2
+ import { render } from '@testing-library/react-native'
3
+ import React from 'react'
4
+ import { SafeAreaProvider } from 'react-native-safe-area-context'
5
+ import { useFindOrCreateServicesConversation } from '../../../../hooks/services/use_find_or_create_services_conversation'
6
+ import { useTeamMembersForNewConversation } from '../../../../hooks/services/use_team_members_for_new_conversation'
7
+ import { ServicesForm } from '../../../../screens/conversation_new/components/services_form'
8
+
9
+ jest.mock('react-native-reanimated', () => ({
10
+ ...jest.requireActual('react-native-reanimated/mock'),
11
+ LayoutAnimationConfig: ({ children }: { children: React.ReactNode }) => children,
12
+ }))
13
+ jest.mock('@react-navigation/native', () => ({
14
+ ...jest.requireActual('@react-navigation/native'),
15
+ useNavigation: () => ({ navigate: jest.fn(), dispatch: jest.fn(), getParent: () => undefined }),
16
+ }))
17
+ jest.mock('../../../../hooks/use_api_client', () => ({ useApiClient: () => ({}) }))
18
+ jest.mock('../../../../hooks/use_upload_client', () => ({ useUploadClient: () => ({}) }))
19
+ jest.mock('../../../../hooks/use_features', () => ({
20
+ ...jest.requireActual('../../../../hooks/use_features'),
21
+ useFeatures: () => ({ features: [], featureEnabled: () => false }),
22
+ }))
23
+ jest.mock('../../../../hooks/use_conversation_validate', () => ({
24
+ useConversationValidate: () => ({ warnings: [], validationPending: false }),
25
+ }))
26
+ jest.mock('../../../../hooks/services/use_services_chat_conversation_payload', () => ({
27
+ useServicesChatConversationPayload: () => ({ payload: undefined, isLoading: false }),
28
+ }))
29
+ jest.mock('../../../../hooks/services/use_services_team', () => ({
30
+ useServicesTeams: () => [],
31
+ }))
32
+ jest.mock('../../../../hooks/services/use_team_plans', () => ({
33
+ useTeamPlans: () => ({
34
+ planOptions: [],
35
+ isFetching: false,
36
+ isError: false,
37
+ findPlan: () => undefined,
38
+ }),
39
+ }))
40
+ jest.mock('../../../../hooks/services/use_team_members_for_new_conversation', () => ({
41
+ useTeamMembersForNewConversation: jest.fn(() => ({ members: [], isError: false })),
42
+ }))
43
+ jest.mock('../../../../hooks/services/use_find_or_create_services_conversation', () => ({
44
+ useFindOrCreateServicesConversation: jest.fn(() => ({
45
+ mutate: jest.fn(),
46
+ isPending: false,
47
+ selectionHasConversation: false,
48
+ isLoadingConversationCheck: false,
49
+ })),
50
+ }))
51
+
52
+ const mockedFindOrCreate = jest.mocked(useFindOrCreateServicesConversation)
53
+ const mockedTeamMembers = jest.mocked(useTeamMembersForNewConversation)
54
+
55
+ const latestArgs = <T extends jest.Mock>(mock: T) => mock.mock.calls.at(-1)?.[0]
56
+
57
+ const safeAreaMetrics = {
58
+ frame: { x: 0, y: 0, width: 390, height: 844 },
59
+ insets: { top: 0, right: 0, bottom: 0, left: 0 },
60
+ }
61
+
62
+ const renderForm = (props: { initialPlanId?: number } = {}) =>
63
+ render(
64
+ <SafeAreaProvider initialMetrics={safeAreaMetrics}>
65
+ <ThemeProvider value={DefaultTheme}>
66
+ <ServicesForm initialTeamIds={[1, 2]} {...props} />
67
+ </ThemeProvider>
68
+ </SafeAreaProvider>
69
+ )
70
+
71
+ describe('ServicesForm', () => {
72
+ beforeEach(() => {
73
+ jest.clearAllMocks()
74
+ })
75
+
76
+ it('filters by plan when opened from a plan', () => {
77
+ const { getByRole } = renderForm({ initialPlanId: 42 })
78
+
79
+ expect(getByRole('switch').props.value).toBe(true)
80
+ expect(latestArgs(mockedFindOrCreate)).toMatchObject({ teamIds: [1, 2], planId: 42 })
81
+ expect(latestArgs(mockedTeamMembers)).toMatchObject({ teamIds: [1, 2], planId: 42 })
82
+ })
83
+
84
+ it('does not filter by plan when opened without a plan', () => {
85
+ const { getByRole } = renderForm()
86
+
87
+ expect(getByRole('switch').props.value).toBe(false)
88
+ expect(latestArgs(mockedFindOrCreate)).toMatchObject({ teamIds: [1, 2], planId: undefined })
89
+ expect(latestArgs(mockedTeamMembers)).toMatchObject({ teamIds: [1, 2], planId: undefined })
90
+ })
91
+ })
@@ -7,6 +7,9 @@ const baseConfig: QueryClientConfig = {
7
7
  retry: false,
8
8
  gcTime: 0,
9
9
  },
10
+ mutations: {
11
+ gcTime: 0,
12
+ },
10
13
  },
11
14
  }
12
15
 
@@ -1,5 +1,5 @@
1
1
  import { useNavigation, useTheme as useNavigationTheme, useRoute } from '@react-navigation/native'
2
- import React, { useCallback, useContext, useEffect, useState } from 'react'
2
+ import React, { useCallback, useContext, useEffect, useRef, useState } from 'react'
3
3
  import {
4
4
  Linking,
5
5
  Platform,
@@ -34,6 +34,7 @@ import {
34
34
  FileAttachment,
35
35
  } from '../../types/resources/denormalized_attachment_resource_for_create'
36
36
  import {
37
+ Log,
37
38
  MAX_FONT_SIZE_MULTIPLIER_LANDMARK,
38
39
  platformFontWeightMedium,
39
40
  platformPressedOpacityStyle,
@@ -71,6 +72,7 @@ interface MessagesFormRootProps extends ViewProps {
71
72
  replyRootId?: string | null
72
73
  replyRootAuthorFirstName?: string | null
73
74
  onFlaggedInMessageForm?: (id: string) => void
75
+ onBeforeSubmit?: () => void | Promise<void>
74
76
  }
75
77
 
76
78
  const MessageFormContext = React.createContext<{
@@ -113,6 +115,7 @@ function MessageFormRoot({
113
115
  replyRootId,
114
116
  replyRootAuthorFirstName,
115
117
  onFlaggedInMessageForm,
118
+ onBeforeSubmit,
116
119
  }: MessagesFormRootProps) {
117
120
  const { giphyApiKey } = useContext(ChatContext)
118
121
  const canGiphy = !!giphyApiKey && !currentlyEditingMessage
@@ -224,10 +227,31 @@ function MessageFormRoot({
224
227
  }
225
228
  }, [conversation.id, navigation, text])
226
229
 
227
- const handleSubmit = () => {
230
+ const catchingUp = useRef(false)
231
+
232
+ // A send from a window behind the live edge would leave a gap above it, so a failed
233
+ // catch-up stops the send and keeps what was typed.
234
+ const catchUpBeforeSend = async () => {
235
+ if (catchingUp.current) return false
236
+
237
+ catchingUp.current = true
238
+ try {
239
+ await onBeforeSubmit?.()
240
+ return true
241
+ } catch (error) {
242
+ Log.error('send stopped: live window fetch failed', error)
243
+ return false
244
+ } finally {
245
+ catchingUp.current = false
246
+ }
247
+ }
248
+
249
+ const handleSubmit = async () => {
228
250
  if (!canSubmit) return
229
251
 
230
252
  if (canGiphy && usingGiphy) {
253
+ if (!(await catchUpBeforeSend())) return
254
+
231
255
  TextInput.State.blurTextInput(TextInput.State.currentlyFocusedInput())
232
256
  Haptic.impactLight()
233
257
  navigateToSendGiphyAfterKeyboardHides()
@@ -248,8 +272,12 @@ function MessageFormRoot({
248
272
  mutateAsync({ text: messageText })
249
273
  reset()
250
274
  } else {
251
- mutateAsync({ text: messageText, attachments: attachmentsForSubmit })
275
+ // The live-window fetch replaces the cache, which would wipe an optimistic row
276
+ // added earlier.
277
+ if (!(await catchUpBeforeSend())) return
278
+
252
279
  reset()
280
+ mutateAsync({ text: messageText, attachments: attachmentsForSubmit })
253
281
  }
254
282
  }
255
283
  }