From b2aa6947d1d99211780efa6501a6974ee5b509ce Mon Sep 17 00:00:00 2001 From: Kevin Gozali Date: Mon, 20 Apr 2026 18:04:20 -0700 Subject: [PATCH] Fix -Wnullable-to-nonnull-conversion for Xcode 26.4 (#56518) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56518 The fix adds null-coalescing fallbacks (`?: ""`) for UTF8String calls that return `const char * _Nullable` but are passed to `std::string` constructors or C++ functions expecting `const char * _Nonnull`. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D101668743 fbshipit-source-id: 80920f25317b0c258387f4b2701b35afe20e3896 --- .../renderer/textlayoutmanager/RCTTextLayoutManager.mm | 3 ++- .../NativeComponentExample/ios/RNTMyNativeViewCommon.mm | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm index 5fed44e18a4..32b0798926d 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm @@ -209,7 +209,8 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y; auto line = LineMeasurement{ - std::string([renderedString UTF8String]), + std::string( + [renderedString UTF8String] != nullptr ? [renderedString UTF8String] : ""), rect, overallRect.size.height - baseline, font.capHeight, diff --git a/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm b/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm index 38e76af812f..ae98c0752cf 100644 --- a/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm +++ b/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm @@ -11,7 +11,8 @@ - (void)setBackgroundColorWithColorString:(NSString *)colorString { - UIColor *color = [UIView UIColorFromHexString:std::string([colorString UTF8String])]; + const char *colorUTF8 = [colorString UTF8String]; + UIColor *color = [UIView UIColorFromHexString:std::string(colorUTF8 != nullptr ? colorUTF8 : "")]; self.backgroundColor = color; } @@ -23,7 +24,8 @@ id colorString = [overlayColors objectAtIndex:i]; CGRect rect = CGRectMake(viewBounds.origin.x + width * i, viewBounds.origin.y, width, viewBounds.size.height); UIView *overlayView = [[UIView alloc] initWithFrame:rect]; - UIColor *color = [UIView UIColorFromHexString:std::string([colorString UTF8String])]; + const char *colorUTF8 = [colorString UTF8String]; + UIColor *color = [UIView UIColorFromHexString:std::string(colorUTF8 != nullptr ? colorUTF8 : "")]; overlayView.backgroundColor = color; [self addSubview:overlayView]; }