From 498231a45ccac9c0530d1e63d85e4796cad2d942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= Date: Tue, 31 Mar 2026 15:23:43 +0200 Subject: [PATCH 1/2] fix(android): fix bad_optional_access when Index changes to undefined with props 2.0 --- .../renderer/components/view/HostPlatformViewProps.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp index 7f5f4d3523e6..6f15d303582f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp @@ -623,7 +623,11 @@ folly::dynamic HostPlatformViewProps::getDiffProps( } if (zIndex != oldProps->zIndex) { - result["zIndex"] = zIndex.value(); + if (zIndex.has_value()) { + result["zIndex"] = zIndex.value(); + } else { + result["zIndex"] = folly::dynamic(nullptr); + } } if (boxShadow != oldProps->boxShadow) { From 9b94b7432515de7b20c2227c15cef6cd2b21408d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= Date: Tue, 31 Mar 2026 19:28:25 +0200 Subject: [PATCH 2/2] Update packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp Co-authored-by: Pieter De Baets --- .../renderer/components/view/HostPlatformViewProps.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp index 6f15d303582f..f171d7aefef4 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp @@ -623,11 +623,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps( } if (zIndex != oldProps->zIndex) { - if (zIndex.has_value()) { - result["zIndex"] = zIndex.value(); - } else { - result["zIndex"] = folly::dynamic(nullptr); - } + result["zIndex"] = zIndex.has_value() ? zIndex.value() : folly::dynamic(nullptr); } if (boxShadow != oldProps->boxShadow) {