From 0122cdb0b6e1ad902fb5e66b1e63f5dc3888b043 Mon Sep 17 00:00:00 2001
From: Elijah Wright <elijah@elijahs.space>
Date: Sun, 8 Oct 2023 14:29:20 -0700
Subject: [PATCH 1/3] fix accessibility in AutoSizedImage

---
 src/view/com/util/images/AutoSizedImage.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/view/com/util/images/AutoSizedImage.tsx b/src/view/com/util/images/AutoSizedImage.tsx
index 035e29c2..0f0345ba 100644
--- a/src/view/com/util/images/AutoSizedImage.tsx
+++ b/src/view/com/util/images/AutoSizedImage.tsx
@@ -56,16 +56,14 @@ export function AutoSizedImage({
         onPress={onPress}
         onLongPress={onLongPress}
         onPressIn={onPressIn}
-        style={[styles.container, style]}
-        accessible={true}
-        accessibilityRole="button"
-        accessibilityLabel={alt || 'Image'}
-        accessibilityHint="Tap to view fully">
+        style={[styles.container, style]}>
         <Image
           style={[styles.image, {aspectRatio}]}
           source={uri}
-          accessible={false} // Must set for `accessibilityLabel` to work
+          accessible={true} // Must set for `accessibilityLabel` to work
           accessibilityIgnoresInvertColors
+          accessibilityLabel={alt}
+          accessibilityHint=""
         />
         {children}
       </Pressable>

From c39352f859d5e50d7a354408f7caad3103232683 Mon Sep 17 00:00:00 2001
From: Elijah Wright <elijah@elijahs.space>
Date: Sun, 8 Oct 2023 14:30:57 -0700
Subject: [PATCH 2/3] readd hint

---
 src/view/com/util/images/AutoSizedImage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/com/util/images/AutoSizedImage.tsx b/src/view/com/util/images/AutoSizedImage.tsx
index 0f0345ba..d8ecdec1 100644
--- a/src/view/com/util/images/AutoSizedImage.tsx
+++ b/src/view/com/util/images/AutoSizedImage.tsx
@@ -63,7 +63,7 @@ export function AutoSizedImage({
           accessible={true} // Must set for `accessibilityLabel` to work
           accessibilityIgnoresInvertColors
           accessibilityLabel={alt}
-          accessibilityHint=""
+          accessibilityHint="Tap to view fully"
         />
         {children}
       </Pressable>

From 1acf4969c5493cded6237cfc44ca48486f399286 Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Mon, 30 Oct 2023 17:08:07 -0700
Subject: [PATCH 3/3] Fix lint

---
 src/view/com/util/images/AutoSizedImage.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/view/com/util/images/AutoSizedImage.tsx b/src/view/com/util/images/AutoSizedImage.tsx
index d8ecdec1..6cbcddc3 100644
--- a/src/view/com/util/images/AutoSizedImage.tsx
+++ b/src/view/com/util/images/AutoSizedImage.tsx
@@ -52,6 +52,8 @@ export function AutoSizedImage({
 
   if (onPress || onLongPress || onPressIn) {
     return (
+      // disable a11y rule because in this case we want the tags on the image (#1640)
+      // eslint-disable-next-line react-native-a11y/has-valid-accessibility-descriptors
       <Pressable
         onPress={onPress}
         onLongPress={onLongPress}