Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/react-native/Libraries/Image/Image.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ let BaseImage: AbstractImageAndroid = ({
width,
height,
resizeMode,
tabIndex,
...restProps
}: {
ref?: React.RefSetter<ImageInstance>,
Expand Down Expand Up @@ -299,6 +300,10 @@ let BaseImage: AbstractImageAndroid = ({
nativeProps.importantForAccessibility = 'no-hide-descendants';
}

if (tabIndex !== undefined) {
nativeProps.focusable = !tabIndex;
}

const flattenedStyle_ = flattenStyle<ImageStyleProp>(style);
const objectFit_ = convertObjectFitToResizeMode(flattenedStyle_?.objectFit);
const resizeMode_ =
Expand Down
3 changes: 3 additions & 0 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
Original file line number Diff line number Diff line change
Expand Up @@ -5309,6 +5309,7 @@ public final class com/facebook/react/views/image/ReactImageManager : com/facebo
public final fun setDefaultSource (Lcom/facebook/react/views/image/ReactImageView;Lcom/facebook/react/bridge/Dynamic;)V
public final fun setDefaultSource (Lcom/facebook/react/views/image/ReactImageView;Ljava/lang/String;)V
public final fun setFadeDuration (Lcom/facebook/react/views/image/ReactImageView;I)V
public final fun setFocusable (Lcom/facebook/react/views/image/ReactImageView;Z)V
public final fun setHeaders (Lcom/facebook/react/views/image/ReactImageView;Lcom/facebook/react/bridge/ReadableMap;)V
public final fun setInternal_AnalyticsTag (Lcom/facebook/react/views/image/ReactImageView;Ljava/lang/String;)V
public final fun setLoadHandlersRegistered (Lcom/facebook/react/views/image/ReactImageView;Z)V
Expand All @@ -5331,9 +5332,11 @@ public final class com/facebook/react/views/image/ReactImageView : com/facebook/
public static final field Companion Lcom/facebook/react/views/image/ReactImageView$Companion;
public static final field REMOTE_IMAGE_FADE_DURATION_MS I
public fun <init> (Landroid/content/Context;Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;Lcom/facebook/react/views/image/GlobalImageLoadListener;Ljava/lang/Object;)V
public fun addFocusables (Ljava/util/ArrayList;II)V
public fun hasOverlappingRendering ()Z
public final fun maybeUpdateView ()V
public fun onDraw (Landroid/graphics/Canvas;)V
public fun requestFocus (ILandroid/graphics/Rect;)Z
public fun setBackgroundColor (I)V
public final fun setBlurRadius (F)V
public final fun setBorderColor (I)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ public constructor(
view.isFocusable = accessible
}

@ReactProp(name = "focusable", defaultBoolean = true)
public fun setFocusable(view: ReactImageView, focusable: Boolean) {
view.excludedFromKeyboardFocus = !focusable
}

// In JS this is Image.props.source
@ReactProp(name = "src")
public fun setSrc(view: ReactImageView, sources: ReadableArray?) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import android.graphics.Shader.TileMode
import android.graphics.drawable.Animatable
import android.graphics.drawable.Drawable
import android.net.Uri
import android.view.View
import com.facebook.common.internal.Supplier
import com.facebook.common.references.CloseableReference
import com.facebook.common.util.UriUtil
Expand Down Expand Up @@ -114,6 +115,7 @@ public class ReactImageView(
private var headers: ReadableMap? = null
private var resizeMultiplier = 1.0f
private var resizeMethod = ImageResizeMethod.AUTO
internal var excludedFromKeyboardFocus = false

init {
// Workaround Android bug where ImageView visibility is not propagated to the Drawable, so you
Expand Down Expand Up @@ -381,6 +383,22 @@ public class ReactImageView(
// or outline which may draw outside of bounds.
public override fun hasOverlappingRendering(): Boolean = false

public override fun addFocusables(views: ArrayList<View>, direction: Int, focusableMode: Int) {
// `accessible` sets isFocusable for accessibility services, `focusable={false}` only drops the
// view from keyboard navigation. A focused view stays a candidate so focus can move on from it.
if (excludedFromKeyboardFocus && !isFocused) {
return
}
super.addFocusables(views, direction, focusableMode)
}

public override fun requestFocus(direction: Int, previouslyFocusedRect: Rect?): Boolean {
if (excludedFromKeyboardFocus) {
return false
}
return super.requestFocus(direction, previouslyFocusedRect)
}

public override fun onDraw(canvas: Canvas) {
BackgroundStyleApplicator.clipToPaddingBoxWithAntiAliasing(this, canvas) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package com.facebook.react.views.image

import android.graphics.Color
import android.util.DisplayMetrics
import android.view.View
import com.facebook.common.logging.FLog
import com.facebook.drawee.backends.pipeline.Fresco
import com.facebook.drawee.backends.pipeline.PipelineDraweeControllerBuilder
Expand Down Expand Up @@ -100,6 +101,23 @@ class ReactImagePropertyTest {
assertThat(view.isFocusable).isTrue()
}

@Test
fun testFocusableFalseKeepsAccessibleImageOutOfKeyboardFocus() {
val viewManager = ReactImageManager()
val view = viewManager.createViewInstance(themeContext)
viewManager.updateProperties(view, buildStyles("accessible", true, "focusable", false))

val focusables = ArrayList<View>()
view.addFocusables(focusables, View.FOCUS_FORWARD, View.FOCUSABLES_ALL)
assertThat(focusables).isEmpty()
assertThat(view.requestFocus(View.FOCUS_DOWN, null)).isFalse()
assertThat(view.isFocusable).isTrue()

viewManager.updateProperties(view, buildStyles("focusable", true))
view.addFocusables(focusables, View.FOCUS_FORWARD, View.FOCUSABLES_ALL)
assertThat(focusables).containsExactly(view)
}

@Test
fun testOverlayColor() {
val viewManager = ReactImageManager()
Expand Down
Loading