Skip to content

Add null check for ViewState in SurfaceMountingManager::updateProps #56147

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
bartlomiejbloniarz wants to merge 1 commit into from
+9 −2
Closed

Add null check for ViewState in SurfaceMountingManager::updateProps #56147

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
11 changes: 9 additions & 2 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 @@ -608,7 +608,14 @@ internal constructor(
return
}

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

if (
ReactNativeFeatureFlags.overrideBySynchronousMountPropsAtMountingAndroid() &&
Expand All @@ -624,7 +631,7 @@ internal constructor(
viewState.currentProps = ReactStylesDiffMap(props)
}

val view: View = checkNotNull(viewState.view) { "Unable to find view for tag [$reactTag]" }
val view: View = viewState.view ?: return
checkNotNull(viewState.viewManager).updateProperties(view, viewState.currentProps)
}

Expand Down
Loading