Skip to content

Commit f551198

Browse files
chore: Invert accessibilityLabel precedence
1 parent 443143c commit f551198

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Libraries/Image/Image.android.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,16 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
180180
? loadingIndicatorSource.uri
181181
: null,
182182
ref: forwardedRef,
183-
accessibilityLabel: props['aria-label'] ?? props.accessibilityLabel,
183+
accessible: props.alt !== undefined ? true : props.accessible,
184+
accessibilityLabel:
185+
props['aria-label'] ?? props.accessibilityLabel ?? props.alt,
184186
accessibilityState: {
185187
busy: props['aria-busy'] ?? props.accessibilityState?.busy,
186188
checked: props['aria-checked'] ?? props.accessibilityState?.checked,
187189
disabled: props['aria-disabled'] ?? props.accessibilityState?.disabled,
188190
expanded: props['aria-expanded'] ?? props.accessibilityState?.expanded,
189191
selected: props['aria-selected'] ?? props.accessibilityState?.selected,
190192
},
191-
accessible: props.alt !== undefined ? true : props.accessible,
192-
accessibilityLabel: props.alt ?? props.accessibilityLabel,
193193
};
194194

195195
const objectFit =

Libraries/Image/Image.ios.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,14 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
173173
<ImageViewNativeComponent
174174
accessibilityState={_accessibilityState}
175175
{...restProps}
176-
accessibilityLabel={accessibilityLabel}
176+
accessible={props.alt !== undefined ? true : props.accessible}
177+
accessibilityLabel={accessibilityLabel ?? props.alt}
177178
ref={forwardedRef}
178179
style={style}
179180
resizeMode={resizeMode}
180181
tintColor={tintColor}
181182
source={sources}
182183
internal_analyticTag={analyticTag}
183-
accessible={props.alt !== undefined ? true : props.accessible}
184-
accessibilityLabel={props.alt ?? props.accessibilityLabel}
185184
/>
186185
);
187186
}}

0 commit comments

Comments
 (0)