Skip to content

fix: add null checks for getViewState in SurfaceMountingManager #57283

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

Open
ManasGuptaSprinklr wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −13
Open

fix: add null checks for getViewState in SurfaceMountingManager #57283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 18 additions & 13 deletions ...e/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,9 +756,14 @@ internal constructor(
return
}

val view = getViewState(reactTag).view
val viewState = getNullableViewState(reactTag)
val view = viewState?.view
if (view == null) {
throw RetryableMountingLayerException("Unable to find viewState view for tag $reactTag")
ReactSoftExceptionLogger.logSoftException(
ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
ReactNoCrashSoftException("Unable to find viewState for tag $reactTag for sendAccessibilityEvent"),
)
return
}

view.sendAccessibilityEvent(eventType)
Expand Down Expand Up @@ -1000,16 +1005,22 @@ internal constructor(
return
}

val viewState = getViewState(reactTag)
val view = viewState.view
val viewState = getNullableViewState(reactTag)

val view = viewState?.view
if (view == null) {
ReactSoftExceptionLogger.logSoftException(
ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
ReactNoCrashSoftException("Unable to find viewState for tag $reactTag for setJSResponder"),
)
return
}

if (initialReactTag != reactTag && view is ViewParent) {
// In this case, initialReactTag corresponds to a virtual/layout-only View, and we already
// have a parent of that View in reactTag, so we can use it.
jsResponderHandler.setJSResponder(initialReactTag, view as ViewParent)
return
} else if (view == null) {
SoftAssertions.assertUnreachable("Cannot find view for tag [$reactTag].")
return
}

if (viewState.isRoot) {
Expand Down Expand Up @@ -1118,12 +1129,6 @@ internal constructor(
)
}

private fun getViewState(reactTag: Int): ViewState =
getNullableViewState(reactTag)
?: throw RetryableMountingLayerException(
"Unable to find viewState for tag $reactTag. Surface stopped: $isStopped"
)

private fun getNullableViewState(reactTag: Int): ViewState? = registryLock.read {
tagToViewState[reactTag]
}
Expand Down