@planningcenter/chat-react-native 4.8.0-qa-staging.4 → 4.8.0-qa-staging.6

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 (29) hide show
  1. package/build/components/conversations/bulk_conversation_actions_bar.d.ts.map +1 -1
  2. package/build/components/conversations/bulk_conversation_actions_bar.js +137 -45
  3. package/build/components/conversations/bulk_conversation_actions_bar.js.map +1 -1
  4. package/build/components/conversations/conversation_actions.d.ts.map +1 -1
  5. package/build/components/conversations/conversation_actions.js +120 -113
  6. package/build/components/conversations/conversation_actions.js.map +1 -1
  7. package/build/components/conversations/conversation_preview.d.ts.map +1 -1
  8. package/build/components/conversations/conversation_preview.js +129 -115
  9. package/build/components/conversations/conversation_preview.js.map +1 -1
  10. package/build/components/display/button.js +0 -1
  11. package/build/components/display/button.js.map +1 -1
  12. package/build/screens/conversation_actions_screen.d.ts +2 -0
  13. package/build/screens/conversation_actions_screen.d.ts.map +1 -1
  14. package/build/screens/conversation_actions_screen.js +380 -46
  15. package/build/screens/conversation_actions_screen.js.map +1 -1
  16. package/build/screens/conversations/conversations_screen.d.ts +1 -0
  17. package/build/screens/conversations/conversations_screen.d.ts.map +1 -1
  18. package/build/screens/conversations/conversations_screen.js +94 -48
  19. package/build/screens/conversations/conversations_screen.js.map +1 -1
  20. package/package.json +3 -3
  21. package/src/components/conversations/__tests__/conversation_actions.test.tsx +13 -6
  22. package/src/components/conversations/bulk_conversation_actions_bar.tsx +62 -33
  23. package/src/components/conversations/conversation_actions.tsx +7 -5
  24. package/src/components/conversations/conversation_preview.tsx +8 -1
  25. package/src/components/display/button.tsx +0 -1
  26. package/src/screens/__tests__/conversation_actions_screen.test.tsx +48 -6
  27. package/src/screens/conversation_actions_screen.tsx +145 -12
  28. package/src/screens/conversations/__tests__/conversations_screen.test.tsx +29 -5
  29. package/src/screens/conversations/conversations_screen.tsx +17 -1
@@ -1,6 +1,6 @@
1
1
  import { c as _c } from "react/compiler-runtime";
2
2
  import { useNavigation } from '@react-navigation/native';
3
- import React, { useLayoutEffect, useRef } from 'react';
3
+ import React, { useEffect, useLayoutEffect, useRef } from 'react';
4
4
  import { StyleSheet, View } from 'react-native';
5
5
  import { Conversations } from '../../components';
6
6
  import { AppUpdateBanner } from '../../components/conversations/app_update_banner';
@@ -25,7 +25,7 @@ export const conversationsScreenOptions = ({
25
25
  onPress: onClose
26
26
  }));
27
27
  export function ConversationsScreen(t0) {
28
- const $ = _c(17);
28
+ const $ = _c(20);
29
29
  const {
30
30
  route
31
31
  } = t0;
@@ -52,74 +52,86 @@ export function ConversationsScreen(t0) {
52
52
  } else {
53
53
  t3 = $[2];
54
54
  }
55
- let t4;
56
- if ($[3] !== Header) {
57
- t4 = /*#__PURE__*/_jsx(Header, {});
58
- $[3] = Header;
59
- $[4] = t4;
60
- } else {
61
- t4 = $[4];
62
- }
55
+ const t4 = route.params?.select_conversation_id;
63
56
  let t5;
64
- if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
65
- t5 = /*#__PURE__*/_jsx(AppUpdateBanner, {});
66
- $[5] = t5;
57
+ if ($[3] !== t4) {
58
+ t5 = /*#__PURE__*/_jsx(SelectModeRequest, {
59
+ conversationId: t4
60
+ });
61
+ $[3] = t4;
62
+ $[4] = t5;
67
63
  } else {
68
- t5 = $[5];
64
+ t5 = $[4];
69
65
  }
70
66
  let t6;
71
- if ($[6] !== t4) {
72
- t6 = /*#__PURE__*/_jsx(Conversations, {
67
+ if ($[5] !== Header) {
68
+ t6 = /*#__PURE__*/_jsx(Header, {});
69
+ $[5] = Header;
70
+ $[6] = t6;
71
+ } else {
72
+ t6 = $[6];
73
+ }
74
+ let t7;
75
+ if ($[7] === Symbol.for("react.memo_cache_sentinel")) {
76
+ t7 = /*#__PURE__*/_jsx(AppUpdateBanner, {});
77
+ $[7] = t7;
78
+ } else {
79
+ t7 = $[7];
80
+ }
81
+ let t8;
82
+ if ($[8] !== t6) {
83
+ t8 = /*#__PURE__*/_jsx(Conversations, {
73
84
  ListHeaderComponent: /*#__PURE__*/_jsxs(_Fragment, {
74
- children: [t4, t5]
85
+ children: [t6, t7]
75
86
  })
76
87
  });
77
- $[6] = t4;
78
- $[7] = t6;
88
+ $[8] = t6;
89
+ $[9] = t8;
79
90
  } else {
80
- t6 = $[7];
91
+ t8 = $[9];
81
92
  }
82
- let t7;
83
- if ($[8] === Symbol.for("react.memo_cache_sentinel")) {
84
- t7 = /*#__PURE__*/_jsx(BulkConversationActionsBar, {});
85
- $[8] = t7;
93
+ let t9;
94
+ if ($[10] === Symbol.for("react.memo_cache_sentinel")) {
95
+ t9 = /*#__PURE__*/_jsx(BulkConversationActionsBar, {});
96
+ $[10] = t9;
86
97
  } else {
87
- t7 = $[8];
98
+ t9 = $[10];
88
99
  }
89
- let t8;
90
- if ($[9] !== route.params || $[10] !== t3 || $[11] !== t6) {
91
- t8 = /*#__PURE__*/_jsxs(ConversationsContextProvider, {
100
+ let t10;
101
+ if ($[11] !== route.params || $[12] !== t3 || $[13] !== t5 || $[14] !== t8) {
102
+ t10 = /*#__PURE__*/_jsxs(ConversationsContextProvider, {
92
103
  args: route.params,
93
104
  opts: t1,
94
- children: [t3, t6, t7]
105
+ children: [t3, t5, t8, t9]
95
106
  });
96
- $[9] = route.params;
97
- $[10] = t3;
98
- $[11] = t6;
99
- $[12] = t8;
107
+ $[11] = route.params;
108
+ $[12] = t3;
109
+ $[13] = t5;
110
+ $[14] = t8;
111
+ $[15] = t10;
100
112
  } else {
101
- t8 = $[12];
113
+ t10 = $[15];
102
114
  }
103
- let t9;
104
- if ($[13] === Symbol.for("react.memo_cache_sentinel")) {
105
- t9 = /*#__PURE__*/_jsx(Toast, {});
106
- $[13] = t9;
115
+ let t11;
116
+ if ($[16] === Symbol.for("react.memo_cache_sentinel")) {
117
+ t11 = /*#__PURE__*/_jsx(Toast, {});
118
+ $[16] = t11;
107
119
  } else {
108
- t9 = $[13];
120
+ t11 = $[16];
109
121
  }
110
- let t10;
111
- if ($[14] !== styles.container || $[15] !== t8) {
112
- t10 = /*#__PURE__*/_jsxs(View, {
122
+ let t12;
123
+ if ($[17] !== styles.container || $[18] !== t10) {
124
+ t12 = /*#__PURE__*/_jsxs(View, {
113
125
  style: styles.container,
114
- children: [t8, t9]
126
+ children: [t10, t11]
115
127
  });
116
- $[14] = styles.container;
117
- $[15] = t8;
118
- $[16] = t10;
128
+ $[17] = styles.container;
129
+ $[18] = t10;
130
+ $[19] = t12;
119
131
  } else {
120
- t10 = $[16];
132
+ t12 = $[19];
121
133
  }
122
- return t10;
134
+ return t12;
123
135
  }
124
136
  function SelectModeHeader(t0) {
125
137
  const $ = _c(7);
@@ -169,6 +181,40 @@ function SelectModeHeader(t0) {
169
181
  useLayoutEffect(t1, t2);
170
182
  return null;
171
183
  }
184
+ function SelectModeRequest(t0) {
185
+ const $ = _c(5);
186
+ const {
187
+ conversationId
188
+ } = t0;
189
+ const navigation = useNavigation();
190
+ const {
191
+ enterSelectMode
192
+ } = useConversationsContext();
193
+ let t1;
194
+ let t2;
195
+ if ($[0] !== conversationId || $[1] !== enterSelectMode || $[2] !== navigation) {
196
+ t1 = () => {
197
+ if (conversationId === undefined) {
198
+ return;
199
+ }
200
+ enterSelectMode(conversationId);
201
+ navigation.setParams({
202
+ select_conversation_id: undefined
203
+ });
204
+ };
205
+ t2 = [conversationId, enterSelectMode, navigation];
206
+ $[0] = conversationId;
207
+ $[1] = enterSelectMode;
208
+ $[2] = navigation;
209
+ $[3] = t1;
210
+ $[4] = t2;
211
+ } else {
212
+ t1 = $[3];
213
+ t2 = $[4];
214
+ }
215
+ useEffect(t1, t2);
216
+ return null;
217
+ }
172
218
  const useListHeaderComponent = () => {
173
219
  const filterDropdownEnabled = useFilterDropdownEnabled();
174
220
  const searchEnabled = useSearchEnabled();
@@ -1 +1 @@
1
- {"version":3,"file":"conversations_screen.js","names":["useNavigation","React","useLayoutEffect","useRef","StyleSheet","View","Conversations","AppUpdateBanner","BulkConversationActionsBar","composeOptions","withRightClose","withRightText","Toast","ConversationsContextProvider","useConversationsContext","useFilterDropdownEnabled","analyticsEvents","usePublishProductAnalyticsEvent","useSearchEnabled","FilterDropdownListHeaderComponent","ListHeaderComponent","SearchListHeaderComponent","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","conversationsScreenOptions","title","onClose","headerTitle","headerBackVisible","onPress","ConversationsScreen","t0","$","_c","route","styles","useStyles","Header","useListHeaderComponent","conversation_index_opened","t1","Symbol","for","throwOnError","t2","params","t3","SelectModeHeader","t4","t5","t6","children","t7","t8","args","opts","t9","t10","container","style","navigation","selectMode","selectedIds","clearSelection","hasEnteredSelectMode","selectedCount","length","current","setOptions","text","goBack","filterDropdownEnabled","searchEnabled","create","flex","justifyContent"],"sources":["../../../src/screens/conversations/conversations_screen.tsx"],"sourcesContent":["import { StaticScreenProps, useNavigation } from '@react-navigation/native'\nimport React, { useLayoutEffect, useRef } from 'react'\nimport { StyleSheet, View } from 'react-native'\nimport { Conversations } from '../../components'\nimport { AppUpdateBanner } from '../../components/conversations/app_update_banner'\nimport { BulkConversationActionsBar } from '../../components/conversations/bulk_conversation_actions_bar'\nimport {\n composeOptions,\n withRightClose,\n withRightText,\n} from '../../components/display/platform_modal_header_buttons'\nimport { Toast } from '../../components/display/toast'\nimport {\n ConversationsContextProvider,\n useConversationsContext,\n} from '../../contexts/conversations_context'\nimport { useFilterDropdownEnabled } from '../../hooks/use_filter_dropdown_enabled'\nimport { analyticsEvents, usePublishProductAnalyticsEvent } from '../../hooks/use_product_analytics'\nimport { useSearchEnabled } from '../../hooks/use_search_enabled'\nimport { AppName } from '../../types/resources/app_name'\nimport { GraphId } from '../../types/resources/group_resource'\nimport { FilterDropdownListHeaderComponent } from './components/filter_dropdown_list_header_component'\nimport { ListHeaderComponent } from './components/list_header_component'\nimport { SearchListHeaderComponent } from './components/search_list_header_component'\n\nexport type ConversationsScreenProps = StaticScreenProps<{\n title?: string\n chat_group_graph_id?: GraphId\n group_source_app_name?: AppName\n show_direct_messages?: boolean\n show_archived?: boolean\n show_hidden?: boolean\n show_unread?: boolean\n}>\n\nexport const conversationsScreenOptions = ({\n title,\n onClose,\n}: {\n title?: string\n onClose: () => void\n}) =>\n composeOptions(\n { headerTitle: title ?? 'Chat', headerBackVisible: false },\n withRightClose({ onPress: onClose })\n )\n\nexport function ConversationsScreen({ route }: ConversationsScreenProps) {\n const styles = useStyles()\n const Header = useListHeaderComponent()\n\n usePublishProductAnalyticsEvent(analyticsEvents.conversation_index_opened)\n\n return (\n <View style={styles.container}>\n <ConversationsContextProvider args={route.params} opts={{ throwOnError: true }}>\n <SelectModeHeader title={route.params?.title} />\n <Conversations\n ListHeaderComponent={\n <>\n <Header />\n <AppUpdateBanner />\n </>\n }\n />\n <BulkConversationActionsBar />\n </ConversationsContextProvider>\n <Toast />\n </View>\n )\n}\n\nfunction SelectModeHeader({ title }: { title?: string }) {\n const navigation = useNavigation()\n const { selectMode, selectedIds, clearSelection } = useConversationsContext()\n const hasEnteredSelectMode = useRef(false)\n const selectedCount = selectedIds.length\n\n useLayoutEffect(() => {\n if (selectMode) hasEnteredSelectMode.current = true\n if (!hasEnteredSelectMode.current) return\n\n navigation.setOptions(\n selectMode\n ? composeOptions(\n {\n headerTitle: selectedCount > 0 ? `${selectedCount} selected` : 'Select conversations',\n },\n withRightText({ text: 'Cancel', onPress: clearSelection })\n )\n : conversationsScreenOptions({ title, onClose: navigation.goBack })\n )\n }, [navigation, selectMode, selectedCount, clearSelection, title])\n\n return null\n}\n\nconst useListHeaderComponent = () => {\n const filterDropdownEnabled = useFilterDropdownEnabled()\n const searchEnabled = useSearchEnabled()\n\n if (filterDropdownEnabled) return FilterDropdownListHeaderComponent\n if (searchEnabled) return SearchListHeaderComponent\n\n return ListHeaderComponent\n}\n\nconst useStyles = () => {\n return StyleSheet.create({\n container: {\n flex: 1,\n justifyContent: 'center',\n },\n })\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"conversations_screen.js","names":["useNavigation","React","useEffect","useLayoutEffect","useRef","StyleSheet","View","Conversations","AppUpdateBanner","BulkConversationActionsBar","composeOptions","withRightClose","withRightText","Toast","ConversationsContextProvider","useConversationsContext","useFilterDropdownEnabled","analyticsEvents","usePublishProductAnalyticsEvent","useSearchEnabled","FilterDropdownListHeaderComponent","ListHeaderComponent","SearchListHeaderComponent","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","conversationsScreenOptions","title","onClose","headerTitle","headerBackVisible","onPress","ConversationsScreen","t0","$","_c","route","styles","useStyles","Header","useListHeaderComponent","conversation_index_opened","t1","Symbol","for","throwOnError","t2","params","t3","SelectModeHeader","t4","select_conversation_id","t5","SelectModeRequest","conversationId","t6","t7","t8","children","t9","t10","args","opts","t11","t12","container","style","navigation","selectMode","selectedIds","clearSelection","hasEnteredSelectMode","selectedCount","length","current","setOptions","text","goBack","enterSelectMode","undefined","setParams","filterDropdownEnabled","searchEnabled","create","flex","justifyContent"],"sources":["../../../src/screens/conversations/conversations_screen.tsx"],"sourcesContent":["import { StaticScreenProps, useNavigation } from '@react-navigation/native'\nimport React, { useEffect, useLayoutEffect, useRef } from 'react'\nimport { StyleSheet, View } from 'react-native'\nimport { Conversations } from '../../components'\nimport { AppUpdateBanner } from '../../components/conversations/app_update_banner'\nimport { BulkConversationActionsBar } from '../../components/conversations/bulk_conversation_actions_bar'\nimport {\n composeOptions,\n withRightClose,\n withRightText,\n} from '../../components/display/platform_modal_header_buttons'\nimport { Toast } from '../../components/display/toast'\nimport {\n ConversationsContextProvider,\n useConversationsContext,\n} from '../../contexts/conversations_context'\nimport { useFilterDropdownEnabled } from '../../hooks/use_filter_dropdown_enabled'\nimport { analyticsEvents, usePublishProductAnalyticsEvent } from '../../hooks/use_product_analytics'\nimport { useSearchEnabled } from '../../hooks/use_search_enabled'\nimport { AppName } from '../../types/resources/app_name'\nimport { GraphId } from '../../types/resources/group_resource'\nimport { FilterDropdownListHeaderComponent } from './components/filter_dropdown_list_header_component'\nimport { ListHeaderComponent } from './components/list_header_component'\nimport { SearchListHeaderComponent } from './components/search_list_header_component'\n\nexport type ConversationsScreenProps = StaticScreenProps<{\n title?: string\n chat_group_graph_id?: GraphId\n group_source_app_name?: AppName\n show_direct_messages?: boolean\n show_archived?: boolean\n show_hidden?: boolean\n show_unread?: boolean\n select_conversation_id?: number\n}>\n\nexport const conversationsScreenOptions = ({\n title,\n onClose,\n}: {\n title?: string\n onClose: () => void\n}) =>\n composeOptions(\n { headerTitle: title ?? 'Chat', headerBackVisible: false },\n withRightClose({ onPress: onClose })\n )\n\nexport function ConversationsScreen({ route }: ConversationsScreenProps) {\n const styles = useStyles()\n const Header = useListHeaderComponent()\n\n usePublishProductAnalyticsEvent(analyticsEvents.conversation_index_opened)\n\n return (\n <View style={styles.container}>\n <ConversationsContextProvider args={route.params} opts={{ throwOnError: true }}>\n <SelectModeHeader title={route.params?.title} />\n <SelectModeRequest conversationId={route.params?.select_conversation_id} />\n <Conversations\n ListHeaderComponent={\n <>\n <Header />\n <AppUpdateBanner />\n </>\n }\n />\n <BulkConversationActionsBar />\n </ConversationsContextProvider>\n <Toast />\n </View>\n )\n}\n\nfunction SelectModeHeader({ title }: { title?: string }) {\n const navigation = useNavigation()\n const { selectMode, selectedIds, clearSelection } = useConversationsContext()\n const hasEnteredSelectMode = useRef(false)\n const selectedCount = selectedIds.length\n\n useLayoutEffect(() => {\n if (selectMode) hasEnteredSelectMode.current = true\n if (!hasEnteredSelectMode.current) return\n\n navigation.setOptions(\n selectMode\n ? composeOptions(\n {\n headerTitle: selectedCount > 0 ? `${selectedCount} selected` : 'Select conversations',\n },\n withRightText({ text: 'Cancel', onPress: clearSelection })\n )\n : conversationsScreenOptions({ title, onClose: navigation.goBack })\n )\n }, [navigation, selectMode, selectedCount, clearSelection, title])\n\n return null\n}\n\nfunction SelectModeRequest({ conversationId }: { conversationId?: number }) {\n const navigation = useNavigation()\n const { enterSelectMode } = useConversationsContext()\n\n useEffect(() => {\n if (conversationId === undefined) return\n\n enterSelectMode(conversationId)\n navigation.setParams({ select_conversation_id: undefined })\n }, [conversationId, enterSelectMode, navigation])\n\n return null\n}\n\nconst useListHeaderComponent = () => {\n const filterDropdownEnabled = useFilterDropdownEnabled()\n const searchEnabled = useSearchEnabled()\n\n if (filterDropdownEnabled) return FilterDropdownListHeaderComponent\n if (searchEnabled) return SearchListHeaderComponent\n\n return ListHeaderComponent\n}\n\nconst useStyles = () => {\n return StyleSheet.create({\n container: {\n flex: 1,\n justifyContent: 'center',\n },\n })\n}\n"],"mappings":";AAAA,SAA4BA,aAAa,QAAQ,0BAA0B;AAC3E,OAAOC,KAAK,IAAIC,SAAS,EAAEC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AACjE,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,aAAa,QAAQ,kBAAkB;AAChD,SAASC,eAAe,QAAQ,kDAAkD;AAClF,SAASC,0BAA0B,QAAQ,8DAA8D;AACzG,SACEC,cAAc,EACdC,cAAc,EACdC,aAAa,QACR,wDAAwD;AAC/D,SAASC,KAAK,QAAQ,gCAAgC;AACtD,SACEC,4BAA4B,EAC5BC,uBAAuB,QAClB,sCAAsC;AAC7C,SAASC,wBAAwB,QAAQ,yCAAyC;AAClF,SAASC,eAAe,EAAEC,+BAA+B,QAAQ,mCAAmC;AACpG,SAASC,gBAAgB,QAAQ,gCAAgC;AAGjE,SAASC,iCAAiC,QAAQ,oDAAoD;AACtG,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,yBAAyB,QAAQ,2CAA2C;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAarF,OAAO,MAAMC,0BAA0B,GAAGA,CAAC;EACzCC,KAAK;EACLC;AAIF,CAAC,KACCrB,cAAc,CACZ;EAAEsB,WAAW,EAAEF,KAAK,IAAI,MAAM;EAAEG,iBAAiB,EAAE;AAAM,CAAC,EAC1DtB,cAAc,CAAC;EAAEuB,OAAO,EAAEH;AAAQ,CAAC,CACrC,CAAC;AAEH,OAAO,SAAAI,oBAAAC,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAA6B;IAAAC;EAAA,IAAAH,EAAmC;EACrE,MAAAI,MAAA,GAAeC,SAAS,CAAC,CAAC;EAC1B,MAAAC,MAAA,GAAeC,sBAAsB,CAAC,CAAC;EAEvCzB,+BAA+B,CAACD,eAAe,CAAA2B,yBAA0B,CAAC;EAAA,IAAAC,EAAA;EAAA,IAAAR,CAAA,QAAAS,MAAA,CAAAC,GAAA;IAIdF,EAAA;MAAAG,YAAA,EAAgB;IAAK,CAAC;IAAAX,CAAA,MAAAQ,EAAA;EAAA;IAAAA,EAAA,GAAAR,CAAA;EAAA;EACnD,MAAAY,EAAA,GAAAV,KAAK,CAAAW,MAAc,EAAApB,KAAA;EAAA,IAAAqB,EAAA;EAAA,IAAAd,CAAA,QAAAY,EAAA;IAA5CE,EAAA,gBAAA3B,IAAA,CAAC4B,gBAAgB;MAAQtB,KAAmB,EAAnBmB;IAAmB,CAAG,CAAC;IAAAZ,CAAA,MAAAY,EAAA;IAAAZ,CAAA,MAAAc,EAAA;EAAA;IAAAA,EAAA,GAAAd,CAAA;EAAA;EACb,MAAAgB,EAAA,GAAAd,KAAK,CAAAW,MAA+B,EAAAI,sBAAA;EAAA,IAAAC,EAAA;EAAA,IAAAlB,CAAA,QAAAgB,EAAA;IAAvEE,EAAA,gBAAA/B,IAAA,CAACgC,iBAAiB;MAAiBC,cAAoC,EAApCJ;IAAoC,CAAG,CAAC;IAAAhB,CAAA,MAAAgB,EAAA;IAAAhB,CAAA,MAAAkB,EAAA;EAAA;IAAAA,EAAA,GAAAlB,CAAA;EAAA;EAAA,IAAAqB,EAAA;EAAA,IAAArB,CAAA,QAAAK,MAAA;IAIrEgB,EAAA,gBAAAlC,IAAA,CAACkB,MAAM,IAAE,CAAC;IAAAL,CAAA,MAAAK,MAAA;IAAAL,CAAA,MAAAqB,EAAA;EAAA;IAAAA,EAAA,GAAArB,CAAA;EAAA;EAAA,IAAAsB,EAAA;EAAA,IAAAtB,CAAA,QAAAS,MAAA,CAAAC,GAAA;IACVY,EAAA,gBAAAnC,IAAA,CAAChB,eAAe,IAAE,CAAC;IAAA6B,CAAA,MAAAsB,EAAA;EAAA;IAAAA,EAAA,GAAAtB,CAAA;EAAA;EAAA,IAAAuB,EAAA;EAAA,IAAAvB,CAAA,QAAAqB,EAAA;IAJzBE,EAAA,gBAAApC,IAAA,CAACjB,aAAa;MAEVc,mBAGG,eAHHO,KAAA,CAAAF,SAAA;QAAAmC,QAAA,GACEH,EAAU,EACVC,EAAmB;MAAA,CACnB;IAAC,CAEN,CAAC;IAAAtB,CAAA,MAAAqB,EAAA;IAAArB,CAAA,MAAAuB,EAAA;EAAA;IAAAA,EAAA,GAAAvB,CAAA;EAAA;EAAA,IAAAyB,EAAA;EAAA,IAAAzB,CAAA,SAAAS,MAAA,CAAAC,GAAA;IACFe,EAAA,gBAAAtC,IAAA,CAACf,0BAA0B,IAAE,CAAC;IAAA4B,CAAA,OAAAyB,EAAA;EAAA;IAAAA,EAAA,GAAAzB,CAAA;EAAA;EAAA,IAAA0B,GAAA;EAAA,IAAA1B,CAAA,SAAAE,KAAA,CAAAW,MAAA,IAAAb,CAAA,SAAAc,EAAA,IAAAd,CAAA,SAAAkB,EAAA,IAAAlB,CAAA,SAAAuB,EAAA;IAXhCG,GAAA,gBAAAnC,KAAA,CAACd,4BAA4B;MAAOkD,IAAY,EAAZzB,KAAK,CAAAW,MAAO;MAAQe,IAAsB,EAAtBpB,EAAsB;MAAAgB,QAAA,GAC5EV,EAAgD,EAChDI,EAA2E,EAC3EK,EAOE,EACFE,EAA8B;IAAA,CACF,CAAC;IAAAzB,CAAA,OAAAE,KAAA,CAAAW,MAAA;IAAAb,CAAA,OAAAc,EAAA;IAAAd,CAAA,OAAAkB,EAAA;IAAAlB,CAAA,OAAAuB,EAAA;IAAAvB,CAAA,OAAA0B,GAAA;EAAA;IAAAA,GAAA,GAAA1B,CAAA;EAAA;EAAA,IAAA6B,GAAA;EAAA,IAAA7B,CAAA,SAAAS,MAAA,CAAAC,GAAA;IAC/BmB,GAAA,gBAAA1C,IAAA,CAACX,KAAK,IAAE,CAAC;IAAAwB,CAAA,OAAA6B,GAAA;EAAA;IAAAA,GAAA,GAAA7B,CAAA;EAAA;EAAA,IAAA8B,GAAA;EAAA,IAAA9B,CAAA,SAAAG,MAAA,CAAA4B,SAAA,IAAA/B,CAAA,SAAA0B,GAAA;IAdXI,GAAA,gBAAAvC,KAAA,CAACtB,IAAI;MAAQ+D,KAAgB,EAAhB7B,MAAM,CAAA4B,SAAU;MAAAP,QAAA,GAC3BE,GAY+B,EAC/BG,GAAS;IAAA,CACL,CAAC;IAAA7B,CAAA,OAAAG,MAAA,CAAA4B,SAAA;IAAA/B,CAAA,OAAA0B,GAAA;IAAA1B,CAAA,OAAA8B,GAAA;EAAA;IAAAA,GAAA,GAAA9B,CAAA;EAAA;EAAA,OAfP8B,GAeO;AAAA;AAIX,SAAAf,iBAAAhB,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAA0B;IAAAR;EAAA,IAAAM,EAA6B;EACrD,MAAAkC,UAAA,GAAmBtE,aAAa,CAAC,CAAC;EAClC;IAAAuE,UAAA;IAAAC,WAAA;IAAAC;EAAA,IAAoD1D,uBAAuB,CAAC,CAAC;EAC7E,MAAA2D,oBAAA,GAA6BtE,MAAM,CAAC,KAAK,CAAC;EAC1C,MAAAuE,aAAA,GAAsBH,WAAW,CAAAI,MAAO;EAAA,IAAA/B,EAAA;EAAA,IAAAI,EAAA;EAAA,IAAAZ,CAAA,QAAAoC,cAAA,IAAApC,CAAA,QAAAiC,UAAA,IAAAjC,CAAA,QAAAkC,UAAA,IAAAlC,CAAA,QAAAsC,aAAA,IAAAtC,CAAA,QAAAP,KAAA;IAExBe,EAAA,GAAAA,CAAA;MACd,IAAI0B,UAAU;QAAEG,oBAAoB,CAAAG,OAAA,GAAW,IAAH;MAAA;MAC5C,IAAI,CAACH,oBAAoB,CAAAG,OAAQ;QAAA;MAAA;MAEjCP,UAAU,CAAAQ,UAAW,CACnBP,UAAU,GACN7D,cAAc,CACZ;QAAAsB,WAAA,EACe2C,aAAa,GAAG,CAAwD,GAAxE,GAAuBA,aAAa,WAAoC,GAAxE;MACf,CAAC,EACD/D,aAAa,CAAC;QAAAmE,IAAA,EAAQ,QAAQ;QAAA7C,OAAA,EAAWuC;MAAe,CAAC,CAEK,CAAC,GAAjE5C,0BAA0B,CAAC;QAAAC,KAAA;QAAAC,OAAA,EAAkBuC,UAAU,CAAAU;MAAQ,CAAC,CACtE,CAAC;IAAA,CACF;IAAE/B,EAAA,IAACqB,UAAU,EAAEC,UAAU,EAAEI,aAAa,EAAEF,cAAc,EAAE3C,KAAK,CAAC;IAAAO,CAAA,MAAAoC,cAAA;IAAApC,CAAA,MAAAiC,UAAA;IAAAjC,CAAA,MAAAkC,UAAA;IAAAlC,CAAA,MAAAsC,aAAA;IAAAtC,CAAA,MAAAP,KAAA;IAAAO,CAAA,MAAAQ,EAAA;IAAAR,CAAA,MAAAY,EAAA;EAAA;IAAAJ,EAAA,GAAAR,CAAA;IAAAY,EAAA,GAAAZ,CAAA;EAAA;EAdjElC,eAAe,CAAC0C,EAcf,EAAEI,EAA8D,CAAC;EAAA,OAE3D,IAAI;AAAA;AAGb,SAAAO,kBAAApB,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAA2B;IAAAmB;EAAA,IAAArB,EAA+C;EACxE,MAAAkC,UAAA,GAAmBtE,aAAa,CAAC,CAAC;EAClC;IAAAiF;EAAA,IAA4BlE,uBAAuB,CAAC,CAAC;EAAA,IAAA8B,EAAA;EAAA,IAAAI,EAAA;EAAA,IAAAZ,CAAA,QAAAoB,cAAA,IAAApB,CAAA,QAAA4C,eAAA,IAAA5C,CAAA,QAAAiC,UAAA;IAE3CzB,EAAA,GAAAA,CAAA;MACR,IAAIY,cAAc,KAAKyB,SAAS;QAAA;MAAA;MAEhCD,eAAe,CAACxB,cAAc,CAAC;MAC/Ba,UAAU,CAAAa,SAAU,CAAC;QAAA7B,sBAAA,EAA0B4B;MAAU,CAAC,CAAC;IAAA,CAC5D;IAAEjC,EAAA,IAACQ,cAAc,EAAEwB,eAAe,EAAEX,UAAU,CAAC;IAAAjC,CAAA,MAAAoB,cAAA;IAAApB,CAAA,MAAA4C,eAAA;IAAA5C,CAAA,MAAAiC,UAAA;IAAAjC,CAAA,MAAAQ,EAAA;IAAAR,CAAA,MAAAY,EAAA;EAAA;IAAAJ,EAAA,GAAAR,CAAA;IAAAY,EAAA,GAAAZ,CAAA;EAAA;EALhDnC,SAAS,CAAC2C,EAKT,EAAEI,EAA6C,CAAC;EAAA,OAE1C,IAAI;AAAA;AAGb,MAAMN,sBAAsB,GAAGA,CAAA;EAC7B,MAAAyC,qBAAA,GAA8BpE,wBAAwB,CAAC,CAAC;EACxD,MAAAqE,aAAA,GAAsBlE,gBAAgB,CAAC,CAAC;EAExC,IAAIiE,qBAAqB;IAAA,OAAShE,iCAAiC;EAAA;EACnE,IAAIiE,aAAa;IAAA,OAAS/D,yBAAyB;EAAA;EAAA,OAE5CD,mBAAmB;AAAA,CAC3B;AAED,MAAMoB,SAAS,GAAGA,CAAA,KAAM;EACtB,OAAOpC,UAAU,CAACiF,MAAM,CAAC;IACvBlB,SAAS,EAAE;MACTmB,IAAI,EAAE,CAAC;MACPC,cAAc,EAAE;IAClB;EACF,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@planningcenter/chat-react-native",
3
- "version": "4.8.0-qa-staging.4",
3
+ "version": "4.8.0-qa-staging.6",
4
4
  "description": "",
5
5
  "repository": {
6
6
  "type": "git",
@@ -33,7 +33,7 @@
33
33
  "dependencies": {
34
34
  "@fortawesome/fontawesome-svg-core": "^7.2.0",
35
35
  "@fortawesome/react-native-fontawesome": "^0.3.2",
36
- "@planningcenter/emoji-keyboard": "4.8.0-qa-staging.4",
36
+ "@planningcenter/emoji-keyboard": "4.8.0-qa-staging.6",
37
37
  "lodash-inflection": "^1.5.0"
38
38
  },
39
39
  "peerDependencies": {
@@ -84,5 +84,5 @@
84
84
  "sf-symbols-typescript": "^2.2.0",
85
85
  "typescript": "~6.0.3"
86
86
  },
87
- "gitHead": "4130daee5dfe8319e9f49fc81ceea1b69e5c1a1a"
87
+ "gitHead": "239dd0ee1bd78091f107e0adf477391f736a4855"
88
88
  }
@@ -27,6 +27,11 @@ jest.mock('../../../hooks/use_conversations_actions', () => ({
27
27
  useConversationsMarkRead: () => ({ read: false, markRead: jest.fn(), isPending: false }),
28
28
  }))
29
29
 
30
+ const mockNavigate = jest.fn()
31
+ jest.mock('@react-navigation/native', () => ({
32
+ ...jest.requireActual('@react-navigation/native'),
33
+ useNavigation: () => ({ navigate: mockNavigate }),
34
+ }))
30
35
  const mockSetHidden = jest.fn()
31
36
  jest.mock('../../../hooks/use_hide_conversation', () => ({
32
37
  useHideConversation: () => ({ hidden: false, setHidden: mockSetHidden, isPending: false }),
@@ -36,14 +41,12 @@ jest.mock('../../../hooks/use_hide_conversations_enabled', () => ({
36
41
  useHideConversationsEnabled: () => mockHideEnabled,
37
42
  }))
38
43
  let mockHideable = true
39
- const mockEnterSelectMode = jest.fn()
40
44
  jest.mock('../../../contexts/conversations_context', () => ({
41
45
  useConversationsContext: () => ({
42
46
  activeConversationId: undefined,
43
47
  setActiveConversationId: jest.fn(),
44
48
  hideable: mockHideable,
45
49
  args: {},
46
- enterSelectMode: mockEnterSelectMode,
47
50
  }),
48
51
  }))
49
52
 
@@ -112,7 +115,7 @@ describe('ConversationActions hide', () => {
112
115
 
113
116
  expect(view.queryByText('Hide')).toBeNull()
114
117
  expect(view.getByText('Silence')).toBeTruthy()
115
- expect(mockEnterSelectMode).not.toHaveBeenCalled()
118
+ expect(mockNavigate).not.toHaveBeenCalled()
116
119
  })
117
120
 
118
121
  it('offers no hide action or long press when the flag is off', () => {
@@ -122,7 +125,7 @@ describe('ConversationActions hide', () => {
122
125
  fireEvent(view.getByTestId('conversation-7'), 'longPress')
123
126
 
124
127
  expect(view.queryByText('Hide')).toBeNull()
125
- expect(mockEnterSelectMode).not.toHaveBeenCalled()
128
+ expect(mockNavigate).not.toHaveBeenCalled()
126
129
  })
127
130
 
128
131
  it('hides from the swipe action', () => {
@@ -133,12 +136,16 @@ describe('ConversationActions hide', () => {
133
136
  expect(mockSetHidden).toHaveBeenCalledWith(true)
134
137
  })
135
138
 
136
- it('enters select mode with the pressed row checked on long press', () => {
139
+ it('opens the conversation actions sheet on long press', () => {
137
140
  const view = renderActions({})
138
141
 
139
142
  fireEvent(view.getByTestId('conversation-7'), 'longPress')
140
143
 
141
- expect(mockEnterSelectMode).toHaveBeenCalledWith(7)
144
+ expect(mockNavigate).toHaveBeenCalledWith('ConversationActions', {
145
+ conversation_id: 7,
146
+ read: false,
147
+ muted: false,
148
+ })
142
149
  })
143
150
  })
144
151
 
@@ -1,14 +1,18 @@
1
1
  import React, { useEffect, useState } from 'react'
2
- import { StyleSheet } from 'react-native'
2
+ import { Pressable, StyleSheet } from 'react-native'
3
3
  import Animated, { FadeIn, LayoutAnimationConfig, ReduceMotion } from 'react-native-reanimated'
4
4
  import { useSafeAreaInsets } from 'react-native-safe-area-context'
5
5
  import { useConversationsContext } from '../../contexts/conversations_context'
6
6
  import { useReduceMotion, useTheme } from '../../hooks'
7
7
  import { useBulkConversationActions } from '../../hooks/use_bulk_conversation_actions'
8
8
  import { ConversationResource } from '../../types'
9
- import { MAX_FONT_SIZE_MULTIPLIER_LANDMARK, isArchivedConversation } from '../../utils'
9
+ import {
10
+ MAX_FONT_SIZE_MULTIPLIER_LANDMARK,
11
+ isArchivedConversation,
12
+ platformPressedOpacityStyle,
13
+ } from '../../utils'
10
14
  import { dismissToast } from '../../utils/toast_store'
11
- import { Button } from '../display'
15
+ import { Icon, IconString, Text } from '../display'
12
16
 
13
17
  export function BulkConversationActionsBar() {
14
18
  const styles = useStyles()
@@ -51,35 +55,23 @@ export function BulkConversationActionsBar() {
51
55
  style={styles.container}
52
56
  testID="bulk-conversation-actions-bar"
53
57
  >
54
- <Button
55
- variant="outline"
56
- size="lg"
57
- title={hiddenView ? 'Unhide' : 'Hide'}
58
- iconNameLeft={hiddenView ? 'general.showEye' : 'general.hideEye'}
59
- disabled={!canHide}
60
- onPress={run(hiddenView ? unhide : hide)}
61
- style={styles.button}
62
- maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
58
+ <BulkAction
59
+ title="Mark read"
60
+ iconName="general.check"
61
+ disabled={disabled}
62
+ onPress={run(markRead)}
63
63
  />
64
- <Button
65
- variant="outline"
66
- size="lg"
64
+ <BulkAction
67
65
  title="Silence"
68
- iconNameLeft="general.bellMuted"
66
+ iconName="general.bellMuted"
69
67
  disabled={!canSilence}
70
68
  onPress={run(silence)}
71
- style={styles.button}
72
- maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
73
69
  />
74
- <Button
75
- variant="outline"
76
- size="lg"
77
- title="Mark read"
78
- iconNameLeft="general.outlinedTextMessage"
79
- disabled={disabled}
80
- onPress={run(markRead)}
81
- style={styles.button}
82
- maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
70
+ <BulkAction
71
+ title={hiddenView ? 'Unhide' : 'Hide'}
72
+ iconName={hiddenView ? 'general.showEye' : 'general.hideEye'}
73
+ disabled={!canHide}
74
+ onPress={run(hiddenView ? unhide : hide)}
83
75
  />
84
76
  </Animated.View>
85
77
  )}
@@ -87,16 +79,44 @@ export function BulkConversationActionsBar() {
87
79
  )
88
80
  }
89
81
 
90
- const useStyles = () => {
82
+ function BulkAction({
83
+ title,
84
+ iconName,
85
+ disabled,
86
+ onPress,
87
+ }: {
88
+ title: string
89
+ iconName: IconString
90
+ disabled: boolean
91
+ onPress: () => void
92
+ }) {
93
+ const styles = useStyles({ disabled })
94
+
95
+ return (
96
+ <Pressable
97
+ onPress={onPress}
98
+ disabled={disabled}
99
+ accessibilityRole="button"
100
+ accessibilityState={{ disabled }}
101
+ style={({ pressed }) => [styles.action, pressed && platformPressedOpacityStyle]}
102
+ >
103
+ <Icon name={iconName} size={20} style={styles.actionIcon} accessibilityElementsHidden />
104
+ <Text style={styles.actionTitle} maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}>
105
+ {title}
106
+ </Text>
107
+ </Pressable>
108
+ )
109
+ }
110
+
111
+ const useStyles = ({ disabled = false }: { disabled?: boolean } = {}) => {
91
112
  const { bottom } = useSafeAreaInsets()
92
113
  const { colors } = useTheme()
93
- const containerVerticalPadding = 16
114
+ const containerVerticalPadding = 12
115
+ const actionColor = disabled ? colors.textColorDefaultDisabled : colors.textColorDefaultPrimary
94
116
 
95
117
  return StyleSheet.create({
96
118
  container: {
97
119
  flexDirection: 'row',
98
- flexWrap: 'wrap',
99
- gap: 8,
100
120
  backgroundColor: colors.surfaceColor090,
101
121
  paddingHorizontal: 16,
102
122
  paddingTop: containerVerticalPadding,
@@ -104,8 +124,17 @@ const useStyles = () => {
104
124
  borderTopWidth: 1,
105
125
  borderTopColor: colors.borderColorDefaultDim,
106
126
  },
107
- button: {
108
- flexGrow: 1,
127
+ action: {
128
+ flex: 1,
129
+ alignItems: 'center',
130
+ gap: 4,
131
+ },
132
+ actionIcon: {
133
+ color: actionColor,
134
+ },
135
+ actionTitle: {
136
+ color: actionColor,
137
+ fontWeight: '600',
109
138
  },
110
139
  })
111
140
  }
@@ -1,3 +1,4 @@
1
+ import { useNavigation } from '@react-navigation/native'
1
2
  import React, { ReactNode, useCallback, useEffect, useRef, useState } from 'react'
2
3
  import {
3
4
  AccessibilityActionEvent,
@@ -41,8 +42,9 @@ export function ConversationActions({
41
42
  selected?: boolean
42
43
  }) {
43
44
  const swipeableRef = useRef<SwipeableMethods>(null)
45
+ const navigation = useNavigation()
44
46
  const styles = useStyles()
45
- const { activeConversationId, setActiveConversationId, hideable, args, enterSelectMode } =
47
+ const { activeConversationId, setActiveConversationId, hideable, args } =
46
48
  useConversationsContext()
47
49
  const [disabled, setDisabled] = useState(false)
48
50
  const overshootLeft = Platform.OS === 'ios'
@@ -68,7 +70,7 @@ export function ConversationActions({
68
70
  const canMute = !isArchivedConversation(conversation)
69
71
  const canHide = hideable && hideConversationsEnabled && !isArchivedConversation(conversation)
70
72
  const selectMode = selected !== undefined
71
- const canEnterSelectMode = hideable && hideConversationsEnabled && !selectMode
73
+ const canOpenActions = hideable && hideConversationsEnabled && !selectMode
72
74
 
73
75
  const handleSwipeableClose = useCallback(() => {
74
76
  setDisabled(false)
@@ -99,8 +101,8 @@ export function ConversationActions({
99
101
  if (disabled) return
100
102
 
101
103
  Haptic.impactLight()
102
- enterSelectMode(conversation.id)
103
- }, [disabled, enterSelectMode, conversation.id])
104
+ navigation.navigate('ConversationActions', { conversation_id: conversation.id, read, muted })
105
+ }, [disabled, navigation, conversation.id, read, muted])
104
106
 
105
107
  const handleLatestMessageUnread = useCallback(() => {
106
108
  markRead(!read)
@@ -204,7 +206,7 @@ export function ConversationActions({
204
206
  <Pressable
205
207
  testID={`conversation-${conversation.id}`}
206
208
  onPress={handlePress}
207
- onLongPress={canEnterSelectMode ? handleLongPress : undefined}
209
+ onLongPress={canOpenActions ? handleLongPress : undefined}
208
210
  style={({ pressed }) => [style, pressed && platformPressedOpacityStyle]}
209
211
  android_ripple={{ color: androidRippleColor, borderless: false, foreground: true }}
210
212
  accessibilityLabel={accessibilityLabel}
@@ -7,6 +7,7 @@ import {
7
7
  useFontScale,
8
8
  useScalableNumberOfLines,
9
9
  } from '../../hooks'
10
+ import { useSelectedChipBackgroundColor } from '../../hooks/use_selected_chip_background_color'
10
11
  import { ConversationPreviewData, ConversationResource } from '../../types'
11
12
  import { REACTION_EMOJIS, isArchivedConversation, platformFontWeightBold } from '../../utils'
12
13
  import { formatDatePreview } from '../../utils/date'
@@ -67,6 +68,7 @@ export const ConversationPreview = ({
67
68
  const hasMetaContent = lastMessageCreatedAt || unreadCount > 0 || muted || hidden
68
69
  const isUnread = unreadCount > 0 || unreadReaction
69
70
  const selected = selectMode ? selectedIds.includes(id) : undefined
71
+ const selectedBackgroundColor = useSelectedChipBackgroundColor()
70
72
 
71
73
  const numberOfLinesScaledTitle = useScalableNumberOfLines(1)
72
74
  const numberOfLinesScaledPreviewText = useScalableNumberOfLines(2)
@@ -85,7 +87,12 @@ export const ConversationPreview = ({
85
87
  return (
86
88
  <ConversationActions
87
89
  conversation={conversation}
88
- style={[styles.previewRow, disabled && !archived && styles.disabled, style]}
90
+ style={[
91
+ styles.previewRow,
92
+ disabled && !archived && styles.disabled,
93
+ selected && { backgroundColor: selectedBackgroundColor },
94
+ style,
95
+ ]}
89
96
  onPress={selectMode ? () => toggleSelected(id) : onPress}
90
97
  accessibilityLabel={conversationAccessibilityLabel}
91
98
  selected={selected}
@@ -257,7 +257,6 @@ const useStyles = ({
257
257
  flexDirection: 'row',
258
258
  justifyContent: 'center',
259
259
  alignItems: 'center',
260
- flexGrow: 1,
261
260
  margin: outlineMarginOffset,
262
261
  gap: sizeStyleMap[size].gap,
263
262
  borderRadius: sizeStyleMap[size].borderRadius - outlineMarginOffset,
@@ -1,11 +1,11 @@
1
- import { DefaultTheme, ThemeProvider } from '@react-navigation/native'
1
+ import { DefaultTheme, StackActions, ThemeProvider } from '@react-navigation/native'
2
2
  import { fireEvent, render } from '@testing-library/react-native'
3
3
  import React from 'react'
4
4
  import { SafeAreaProvider } from 'react-native-safe-area-context'
5
5
  import type { ConversationResource } from '../../types'
6
6
  import { ConversationActionsScreen } from '../conversation_actions_screen'
7
7
 
8
- const mockNavigation = { goBack: jest.fn() }
8
+ const mockNavigation = { goBack: jest.fn(), dispatch: jest.fn(), navigate: jest.fn() }
9
9
  jest.mock('@react-navigation/native', () => ({
10
10
  ...jest.requireActual('@react-navigation/native'),
11
11
  useNavigation: () => mockNavigation,
@@ -15,9 +15,20 @@ jest.mock('@react-navigation/elements', () => ({
15
15
  useHeaderHeight: () => 0,
16
16
  }))
17
17
 
18
- const conversation = { type: 'Conversation', id: 7, title: 'Youth Group' } as ConversationResource
18
+ let mockConversation = { type: 'Conversation', id: 7, title: 'Youth Group' } as ConversationResource
19
+ const mockSetMuted = jest.fn()
19
20
  jest.mock('../../hooks/use_conversation', () => ({
20
- useConversation: () => ({ data: conversation }),
21
+ useConversation: () => ({ data: mockConversation }),
22
+ useConversationMute: () => ({ muted: false, setMuted: mockSetMuted, isPending: false }),
23
+ }))
24
+
25
+ const mockMarkRead = jest.fn()
26
+ jest.mock('../../hooks/use_conversations_actions', () => ({
27
+ useConversationsMarkRead: () => ({ read: true, markRead: mockMarkRead, isPending: false }),
28
+ }))
29
+ jest.mock('../../components/display', () => ({
30
+ ...jest.requireActual('../../components/display'),
31
+ ConversationAvatar: () => null,
21
32
  }))
22
33
 
23
34
  let mockHidden = false
@@ -36,11 +47,11 @@ const safeAreaMetrics = {
36
47
  insets: { top: 0, right: 0, bottom: 0, left: 0 },
37
48
  }
38
49
 
39
- const renderScreen = () =>
50
+ const renderScreen = (params: { read?: boolean; muted?: boolean } = {}) =>
40
51
  render(
41
52
  <SafeAreaProvider initialMetrics={safeAreaMetrics}>
42
53
  <ThemeProvider value={DefaultTheme}>
43
- <ConversationActionsScreen route={{ params: { conversation_id: 7 } }} />
54
+ <ConversationActionsScreen route={{ params: { conversation_id: 7, ...params } }} />
44
55
  </ThemeProvider>
45
56
  </SafeAreaProvider>
46
57
  )
@@ -49,6 +60,7 @@ describe('ConversationActionsScreen', () => {
49
60
  beforeEach(() => {
50
61
  mockHidden = false
51
62
  mockHideEnabled = true
63
+ mockConversation = { type: 'Conversation', id: 7, title: 'Youth Group' } as ConversationResource
52
64
  jest.clearAllMocks()
53
65
  })
54
66
 
@@ -57,6 +69,17 @@ describe('ConversationActionsScreen', () => {
57
69
  const { queryByText } = renderScreen()
58
70
 
59
71
  expect(queryByText('Hide conversation')).toBeNull()
72
+ expect(queryByText('Select conversations')).toBeNull()
73
+ })
74
+
75
+ it('asks the conversation list to enter select mode with this conversation', () => {
76
+ const { getByText } = renderScreen()
77
+
78
+ fireEvent.press(getByText('Select conversations'))
79
+
80
+ expect(mockNavigation.dispatch).toHaveBeenCalledWith(
81
+ StackActions.popTo('Conversations', { select_conversation_id: 7 }, { merge: true })
82
+ )
60
83
  })
61
84
 
62
85
  it('hides the conversation and closes the sheet', () => {
@@ -76,4 +99,23 @@ describe('ConversationActionsScreen', () => {
76
99
 
77
100
  expect(mockSetHidden).toHaveBeenCalledWith(false)
78
101
  })
102
+
103
+ it('toggles read and silenced from the state the list row passed in', () => {
104
+ const { getByText } = renderScreen({ read: false, muted: true })
105
+
106
+ fireEvent.press(getByText('Mark as read'))
107
+ fireEvent.press(getByText('Enable'))
108
+
109
+ expect(mockMarkRead).toHaveBeenCalledWith(true)
110
+ expect(mockSetMuted).toHaveBeenCalledWith(false)
111
+ })
112
+
113
+ it('offers neither silence nor hide on an archived conversation', () => {
114
+ mockConversation = { ...mockConversation, disabled: true, disabledReason: 'archived' }
115
+ const { queryByText, getByText } = renderScreen()
116
+
117
+ expect(queryByText('Silence')).toBeNull()
118
+ expect(queryByText('Hide conversation')).toBeNull()
119
+ expect(getByText('Select conversations')).toBeTruthy()
120
+ })
79
121
  })