feat(a11y): directory search result announcement

app/containers/Avatar/Avatar.tsx

@@ -34,7 +34,8 @@ const Avatar = React.memo(
 		avatarExternalProviderUrl,
 		roomAvatarExternalProviderUrl,
 		cdnPrefix,
-		accessibilityLabel
+		accessibilityLabel,
+		accessible = true
 	}: IAvatar) => {
 		if ((!text && !avatar && !emoji && !rid) || !server) {
 			return null;
@@ -96,15 +97,15 @@ const Avatar = React.memo(
 
 		if (onPress) {
 			image = (
-				<Touchable accessibilityLabel={avatarAccessibilityLabel} onPress={onPress}>
+				<Touchable accessible={accessible} accessibilityLabel={avatarAccessibilityLabel} onPress={onPress}>
 					{image}
 				</Touchable>
 			);
 		}
 
 		return (
 			<View
-				accessible
+				accessible={accessible}
 				accessibilityLabel={!onPress ? avatarAccessibilityLabel : undefined}
 				style={[avatarStyle, style]}
 				testID='avatar'>

app/containers/Avatar/AvatarContainer.tsx

@@ -20,7 +20,8 @@ const AvatarContainer = ({
 	getCustomEmoji,
 	isStatic,
 	rid,
-	accessibilityLabel
+	accessibilityLabel,
+	accessible
 }: IAvatar): React.ReactElement => {
 	const server = useAppSelector(state => state.server.server);
 	const serverVersion = useAppSelector(state => state.server.version);
@@ -71,6 +72,7 @@ const AvatarContainer = ({
 			serverVersion={serverVersion}
 			cdnPrefix={cdnPrefix}
 			accessibilityLabel={accessibilityLabel}
+			accessible={accessible}
 		/>
 	);
 };

app/containers/Avatar/interfaces.ts

@@ -26,4 +26,5 @@ export interface IAvatar {
 	roomAvatarExternalProviderUrl?: string;
 	cdnPrefix?: string;
 	accessibilityLabel?: string;
+	accessible?: boolean;
 }

app/containers/DirectoryItem/__snapshots__/DirectoryItem.test.tsx.snap

@@ -10,8 +10,9 @@ exports[`Story Snapshots: CustomStyle should match snapshot 1`] = `
 >
   <View>
     <View
-      accessibilityLabel="Styled Room undefined"
+      accessibilityLabel="Styled Room "
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -91,7 +92,7 @@ exports[`Story Snapshots: CustomStyle should match snapshot 1`] = `
           >
             <View
               accessibilityLabel="S's avatar"
-              accessible={true}
+              accessible={false}
               style={
                 [
                   {
@@ -266,8 +267,9 @@ exports[`Story Snapshots: Default should match snapshot 1`] = `
 >
   <View>
     <View
-      accessibilityLabel="General undefined"
+      accessibilityLabel="General "
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -345,7 +347,7 @@ exports[`Story Snapshots: Default should match snapshot 1`] = `
           >
             <View
               accessibilityLabel="G's avatar"
-              accessible={true}
+              accessible={false}
               style={
                 [
                   {
@@ -520,8 +522,9 @@ exports[`Story Snapshots: DirectMessage should match snapshot 1`] = `
 >
   <View>
     <View
-      accessibilityLabel="Alice Johnson undefined"
+      accessibilityLabel="Alice Johnson "
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -599,7 +602,7 @@ exports[`Story Snapshots: DirectMessage should match snapshot 1`] = `
           >
             <View
               accessibilityLabel="A's avatar"
-              accessible={true}
+              accessible={false}
               style={
                 [
                   {
@@ -745,6 +748,7 @@ exports[`Story Snapshots: LongRoomName should match snapshot 1`] = `
     <View
       accessibilityLabel="This is a very very very very very very very long room name that should be truncated 9999 members"
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -822,7 +826,7 @@ exports[`Story Snapshots: LongRoomName should match snapshot 1`] = `
           >
             <View
               accessibilityLabel="L's avatar"
-              accessible={true}
+              accessible={false}
               style={
                 [
                   {
@@ -1016,8 +1020,9 @@ exports[`Story Snapshots: OnlyTitle should match snapshot 1`] = `
 >
   <View>
     <View
-      accessibilityLabel="Just a title undefined"
+      accessibilityLabel="Just a title "
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -1181,8 +1186,9 @@ exports[`Story Snapshots: TeamMain should match snapshot 1`] = `
 >
   <View>
     <View
-      accessibilityLabel="Engineering Team undefined"
+      accessibilityLabel="Engineering Team "
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -1260,7 +1266,7 @@ exports[`Story Snapshots: TeamMain should match snapshot 1`] = `
           >
             <View
               accessibilityLabel="E's avatar"
-              accessible={true}
+              accessible={false}
               style={
                 [
                   {
@@ -1437,6 +1443,7 @@ exports[`Story Snapshots: WithRightLabel should match snapshot 1`] = `
     <View
       accessibilityLabel="General 123 members"
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -1514,7 +1521,7 @@ exports[`Story Snapshots: WithRightLabel should match snapshot 1`] = `
           >
             <View
               accessibilityLabel="G's avatar"
-              accessible={true}
+              accessible={false}
               style={
                 [
                   {
@@ -1708,8 +1715,9 @@ exports[`Story Snapshots: WithoutDescription should match snapshot 1`] = `
 >
   <View>
     <View
-      accessibilityLabel="No description room undefined"
+      accessibilityLabel="No description room "
       accessible={true}
+      importantForAccessibility="yes"
     >
       <RNGestureHandlerButton
         activeOpacity={1}
@@ -1787,7 +1795,7 @@ exports[`Story Snapshots: WithoutDescription should match snapshot 1`] = `
           >
             <View
               accessibilityLabel="N's avatar"
-              accessible={true}
+              accessible={false}
               style={
                 [
                   {

app/containers/DirectoryItem/index.tsx

@@ -52,10 +52,10 @@ const DirectoryItem = ({
 	const height = ROW_HEIGHT * fontScale;
 
 	return (
-		<View accessible accessibilityLabel={`${title} ${rightLabel}`}>
+		<View accessible accessibilityLabel={`${title || ''} ${rightLabel || ''}`} importantForAccessibility='yes'>
 			<Touch onPress={onPress} style={{ backgroundColor: colors.surfaceRoom }} testID={testID}>
 				<View style={[styles.directoryItemContainer, { height }, style]}>
-					<Avatar text={avatar} size={30} type={type} rid={rid} style={styles.directoryItemAvatar} />
+					<Avatar accessible={false} text={avatar} size={30} type={type} rid={rid} style={styles.directoryItemAvatar} />
 					<View style={styles.directoryItemTextContainer}>
 						<View style={styles.directoryItemTextTitle}>
 							{type !== 'd' ? <RoomTypeIcon type={type} teamMain={teamMain} /> : null}

app/definitions/rest/v1/directory.ts

@@ -8,6 +8,6 @@ export type DirectoryEndpoint = {
 			count: number;
 			offset: number;
 			sort: { [key: string]: number };
-		}) => PaginatedResult<{ result: IServerRoom[] }>;
+		}) => PaginatedResult<{ result: IServerRoom[]; count: number }>;
 	};
 };

app/i18n/locales/ar.json

@@ -381,6 +381,7 @@
   "Onboarding_less_options": "خيارات أقل",
   "Onboarding_more_options": "خيارات أكثر",
   "Onboarding_subtitle": "ما بعد بيئة فريق تعاونية",
+  "One_result_found": "نتيجة واحدة وُجدت.",
   "Online": "متصل",
   "Only_authorized_users_can_write_new_messages": "يمكن للمستخدمين المصرح لهم فقط كتابة رسائل جديدة",
   "Oops": "عفوًا!",
@@ -492,6 +493,7 @@
   "Search_global_users_description": "إذا قمت بالتفعيل، فسيمكنك البحث عن أي مستخدم في شركات أو خوادم أخرى",
   "Search_Messages": "بحث الرسائل",
   "Search_messages": "رسائل البحث",
+  "Search_Results_found": "{{count}} تم العثور على نتائج.",
   "Security_and_privacy": "الأمن والخصوصية",
   "Select_a_Channel": "حدد قناة",
   "Select_a_Department": "حدد قسم",

app/i18n/locales/bn-IN.json

@@ -549,6 +549,7 @@
   "Onboarding_less_options": "কম বিকল্প",
   "Onboarding_more_options": "আরও বিকল্প",
   "Onboarding_subtitle": "দল সহযোগিতা বাদ দিন",
+  "One_result_found": "একটি ফলাফল পাওয়া গেছে।",
   "Online": "অনলাইন",
   "Only_authorized_users_can_write_new_messages": "কেবল অনুমোদিত ব্যবহারকারীরা নতুন বার্তা লিখতে পারবেন",
   "Oops": "ওহ!",
@@ -692,6 +693,7 @@
   "Search_global_users_description": "আপনি এটি চালু করলে, আপনি অন্যান্য কোম্পানি বা ওয়ার্কস্পেস থেকে যেকোনো ব্যবহারকারীকে সন্ধান করতে পারবেন।",
   "Search_Messages": "মেসেজ খুঁজুন",
   "Search_messages": "বার্তা অনুসন্ধান করুন",
+  "Search_Results_found": "{{count}} ফলাফল পাওয়া গেছে।",
   "Searching": "অনুসন্ধান করা হচ্ছে",
   "Security_and_privacy": "নিরাপত্তা এবং গোপনীয়তা",
   "Select": "নির্বাচন করুন",

app/i18n/locales/cs.json

@@ -588,6 +588,7 @@
   "Onboarding_less_options": "Méně možností",
   "Onboarding_more_options": "Více možností",
   "Onboarding_subtitle": "Mimo týmovou spolupráci",
+  "One_result_found": "Jeden výsledek nalezen.",
   "Online": "Online",
   "Only_authorized_users_can_write_new_messages": "Pouze oprávnění uživatelé mohou psát nové zprávy",
   "Oops": "Jejda!",
@@ -741,6 +742,7 @@
   "Search_global_users_description": "Pokud zapnete, můžete vyhledat libovolného uživatele z jiných společností nebo pracovních prostorů.",
   "Search_Messages": "Hledat zprávy",
   "Search_messages": "Hledat zprávy",
+  "Search_Results_found": "{{count}} výsledků nalezeno.",
   "Searching": "Hledání",
   "Security_and_privacy": "Bezpečnost a soukromí",
   "Select": "Vybrat",

app/i18n/locales/de.json

@@ -538,6 +538,7 @@
   "Onboarding_less_options": "Weniger Optionen",
   "Onboarding_more_options": "Mehr Optionen",
   "Onboarding_subtitle": "Mehr als Team-Zusammenarbeit",
+  "One_result_found": "Ein Ergebnis gefunden.",
   "Online": "Online",
   "Only_authorized_users_can_write_new_messages": "Nur autorisierte Benutzer können neue Nachrichten schreiben",
   "Oops": "Hoppla!",
@@ -679,6 +680,7 @@
   "Search_global_users_description": "Wenn aktiviert, Können Sie nach Benutzern von anderen Unternehmen oder Servern suchen.",
   "Search_Messages": "Nachrichten suchen",
   "Search_messages": "Nachrichten durchsuchen",
+  "Search_Results_found": "{{count}} Ergebnisse gefunden.",
   "Searching": "Suche",
   "Security_and_privacy": "Sicherheit und Datenschutz",
   "Select_a_Channel": "Channel auswählen",

app/i18n/locales/en.json

@@ -609,6 +609,7 @@
   "Onboarding_less_options": "Less options",
   "Onboarding_more_options": "More options",
   "Onboarding_subtitle": "Beyond team collaboration",
+  "One_result_found": "One result found.",
   "Online": "Online",
   "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages",
   "Oops": "Oops!",
@@ -768,6 +769,7 @@
   "Search_global_users_description": "If you turn-on, you can search for any user from others companies or workspacess.",
   "Search_Messages": "Search messages",
   "Search_messages": "Search messages",
+  "Search_Results_found": "{{count}} results found.",
   "Searching": "Searching",
   "Security_and_privacy": "Security and privacy",
   "Select": "Select",

app/i18n/locales/es.json

@@ -275,6 +275,7 @@
   "Notify_all_in_this_room": "Notificar a todos en esta sala",
   "Objects": "Objetos",
   "Offline": "Desconectado",
+  "One_result_found": "Un resultado encontrado.",
   "Online": "Conectado",
   "Only_authorized_users_can_write_new_messages": "Sólo pueden escribir mensajes usuarios autorizados",
   "Oops": "Oops!",
@@ -350,6 +351,7 @@
   "Search_global_users_description": "Si lo activas, puedes buscar cualquier usuario de otras empresas o servidores.",
   "Search_Messages": "Buscar mensajes",
   "Search_messages": "Buscar mensajes",
+  "Search_Results_found": "{{count}} resultados encontrados.",
   "Select_emoji_reaction": "Seleccionar reacción de emoji",
   "Select_Server": "Selecciona servidor",
   "Select_Uploaded_Image": "Seleccionar imagen cargada",

app/i18n/locales/fi.json

@@ -515,6 +515,7 @@
   "Onboarding_less_options": "Vähemmän vaihtoehtoja",
   "Onboarding_more_options": "Enemmän vaihtoehtoja",
   "Onboarding_subtitle": "Enemmän kuin ryhmäyhteistyötä",
+  "One_result_found": "Yksi tulos löytyi.",
   "Online": "Online",
   "Only_authorized_users_can_write_new_messages": "Vain valtuutetut käyttäjät voivat kirjoittaa uusia viestejä",
   "Oops": "Oho!",
@@ -654,6 +655,7 @@
   "Search_global_users_description": "Jos otat tämän käyttöön, voit etsiä käyttäjiä muista yrityksistä tai palvelimista.",
   "Search_Messages": "Hae viestejä",
   "Search_messages": "Hae viestejä",
+  "Search_Results_found": "{{count}} hakutulosta löytyi.",
   "Searching": "Haetaan",
   "Security_and_privacy": "Turvallisuus ja yksityisyys",
   "Select_a_Channel": "Valitse kanava",

app/i18n/locales/fr.json

@@ -475,6 +475,7 @@
   "Onboarding_less_options": "Moins d'options",
   "Onboarding_more_options": "Plus d'options",
   "Onboarding_subtitle": "Au-delà de la collaboration d'équipe",
+  "One_result_found": "Un résultat trouvé.",
   "Online": "En ligne",
   "Only_authorized_users_can_write_new_messages": "Seuls les utilisateurs autorisés peuvent écrire de nouveaux messages.",
   "Oops": "Oups !",
@@ -598,6 +599,7 @@
   "Search_global_users_description": "Si vous activez, vous pouvez rechercher n'importe quel utilisateur d'autres sociétés ou serveurs.",
   "Search_Messages": "Rechercher des messages",
   "Search_messages": "Rechercher des messages",
+  "Search_Results_found": "{{count}} résultats trouvés.",
   "Searching": "Recherche",
   "Security_and_privacy": "Sécurité et vie privée",
   "Select_a_Channel": "Sélectionnez un canal",

app/i18n/locales/hi-IN.json

@@ -549,6 +549,7 @@
   "Onboarding_less_options": "कम विकल्प",
   "Onboarding_more_options": "अधिक विकल्प",
   "Onboarding_subtitle": "टीम सहयोग के पार",
+  "One_result_found": "एक परिणाम मिला।",
   "Online": "ऑनलाइन",
   "Only_authorized_users_can_write_new_messages": "केवल अधिकृत उपयोगकर्ताएँ नए संदेश लिख सकती हैं",
   "Oops": "ऊपस!",
@@ -692,6 +693,7 @@
   "Search_global_users_description": "आप इसे ऑन करते हैं, तो आप अन्य कंपनियों या कार्यस्थानों से किसी भी उपयोगकर्ता की खोज कर सकते हैं।",
   "Search_Messages": "संदेश खोजें",
   "Search_messages": "संदेश खोजें",
+  "Search_Results_found": "{{count}} परिणाम मिले।",
   "Searching": "खोज रहा है",
   "Security_and_privacy": "सुरक्षा और गोपनीयता",
   "Select": "चयन करें",

app/i18n/locales/hu.json

@@ -550,6 +550,7 @@
   "Onboarding_less_options": "Kevesebb beállítás",
   "Onboarding_more_options": "Több beállítás",
   "Onboarding_subtitle": "A csoportos együttműködésen túl",
+  "One_result_found": "Egy eredmény található.",
   "Online": "Elérhető",
   "Only_authorized_users_can_write_new_messages": "Csak az engedélyezett felhasználók írhatnak új üzeneteket",
   "Oops": "Hoppá!",
@@ -693,6 +694,7 @@
   "Search_global_users_description": "Ha bekapcsolja, kereshet bármelyik felhasználót más cégekből vagy munkaterületekről.",
   "Search_Messages": "Üzenetek keresése",
   "Search_messages": "Üzenetek keresése",
+  "Search_Results_found": "{{count}} eredmény található.",
   "Searching": "Keresés",
   "Security_and_privacy": "Biztonság és adatvédelem",
   "Select": "Kiválasztás",

app/i18n/locales/it.json

@@ -415,6 +415,7 @@
   "Onboarding_less_options": "Meno opzioni",
   "Onboarding_more_options": "Più opzioni",
   "Onboarding_subtitle": "Oltre la collaborazione di gruppo",
+  "One_result_found": "Un risultato trovato.",
   "Online": "Online",
   "Only_authorized_users_can_write_new_messages": "Solo gli utenti autorizzati possono scrivere nuovi messaggi",
   "Oops": "Oops!",
@@ -527,6 +528,7 @@
   "Search_global_users_description": "Se attivi questa opzione, puoi cercare qualsiasi utente da altre aziende o server.",
   "Search_Messages": "Cerca messaggi",
   "Search_messages": "Cerca messaggi",
+  "Search_Results_found": "{{count}} risultati trovati.",
   "Security_and_privacy": "Sicurezza e privacy",
   "Select_a_Channel": "Seleziona un Canale",
   "Select_a_Department": "Seleziona un Dipartimento",