Skip to content

[Android] Modal: Setting resource-id from testID prop #48313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mateoguzmana wants to merge 2 commits into from
Closed

[Android] Modal: Setting resource-id from testID prop #48313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3898846
feat(modal): [android] setting resource-id from testID
mateoguzmana Dec 15, 2024
2f677e2
refactor(modal): [android] simplifying approach to call onInitializeA…
mateoguzmana Dec 15, 2024
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
6 changes: 6 additions & 0 deletions ...native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ public class ReactModalHostManager :
@ReactProp(name = "identifier")
public override fun setIdentifier(view: ReactModalHostView, value: Int): Unit = Unit

@ReactProp(name = "testID")
public override fun setTestId(view: ReactModalHostView, value: String?) {
super.setTestId(view, value)
view.setDialogRootViewGroupTestId(value)
}

protected override fun addEventEmitters(
reactContext: ThemedReactContext,
view: ReactModalHostView
Expand Down
19 changes: 19 additions & 0 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import android.view.Window
import android.view.WindowInsetsController
import android.view.WindowManager
import android.view.accessibility.AccessibilityEvent
import android.view.accessibility.AccessibilityNodeInfo
import android.widget.FrameLayout
import androidx.annotation.UiThread
import com.facebook.common.logging.FLog
Expand Down Expand Up @@ -386,6 +387,15 @@ public class ReactModalHostView(context: ThemedReactContext) :
}
}

/**
* Sets the testID on the DialogRootViewGroup. Since the accessibility events
* are not triggered on the on the ReactModalHostView, the testID is forwarded
* to the DialogRootViewGroup to set the resource-id.
*/
public fun setDialogRootViewGroupTestId(testId: String?) {
dialogRootViewGroup.setTag(R.id.react_test_id, testId)
}

// This listener is called when the user presses KeyEvent.KEYCODE_BACK
// An event is then passed to JS which can either close or not close the Modal by setting the
// visible property
Expand Down Expand Up @@ -427,6 +437,15 @@ public class ReactModalHostView(context: ThemedReactContext) :
}
}

override fun onInitializeAccessibilityNodeInfo(info: AccessibilityNodeInfo) {
super.onInitializeAccessibilityNodeInfo(info)

val testId = getTag(R.id.react_test_id) as String?
if (testId != null) {
info.viewIdResourceName = testId
}
}

override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
super.onSizeChanged(w, h, oldw, oldh)
viewWidth = w
Expand Down
Loading