From 22b8b53c77cb2fe87aa54be92d1758a603b7dd35 Mon Sep 17 00:00:00 2001 From: Nolan O'Brien Date: Wed, 2 Jul 2025 16:56:07 -0700 Subject: [PATCH] Fix exhaustive switches (#52383) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/52383 Changelog: [General][Fixed] - Add `default:` case to avoid warnings/errors for targets that compile with `-Wswitch-enum` and `-Wswitch-default` enabled Reviewed By: aary Differential Revision: D77051150 fbshipit-source-id: a4f18bb7e47f027fd64cc42bacd7246263ef2454 --- packages/react-native/Libraries/Image/RCTResizeMode.h | 10 +++------- packages/react-native/React/Base/RCTBridgeMethod.h | 5 +++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/react-native/Libraries/Image/RCTResizeMode.h b/packages/react-native/Libraries/Image/RCTResizeMode.h index e65f113a0dc..c8e782d2079 100644 --- a/packages/react-native/Libraries/Image/RCTResizeMode.h +++ b/packages/react-native/Libraries/Image/RCTResizeMode.h @@ -21,19 +21,12 @@ static inline RCTResizeMode RCTResizeModeFromUIViewContentMode(UIViewContentMode switch (mode) { case UIViewContentModeScaleToFill: return RCTResizeModeStretch; - break; case UIViewContentModeScaleAspectFit: return RCTResizeModeContain; - break; case UIViewContentModeScaleAspectFill: return RCTResizeModeCover; - break; - case UIViewContentModeCenter: - return RCTResizeModeCenter; - break; case UIViewContentModeTopLeft: return RCTResizeModeNone; - break; case UIViewContentModeRedraw: case UIViewContentModeTop: case UIViewContentModeBottom: @@ -43,6 +36,9 @@ static inline RCTResizeMode RCTResizeModeFromUIViewContentMode(UIViewContentMode case UIViewContentModeBottomLeft: case UIViewContentModeBottomRight: return RCTResizeModeRepeat; + case UIViewContentModeCenter: + default: + return RCTResizeModeCenter; } }; diff --git a/packages/react-native/React/Base/RCTBridgeMethod.h b/packages/react-native/React/Base/RCTBridgeMethod.h index 7169aa79771..7cc1ee65ef4 100644 --- a/packages/react-native/React/Base/RCTBridgeMethod.h +++ b/packages/react-native/React/Base/RCTBridgeMethod.h @@ -18,12 +18,13 @@ typedef NS_ENUM(NSInteger, RCTFunctionType) { static inline const char *RCTFunctionDescriptorFromType(RCTFunctionType type) { switch (type) { - case RCTFunctionTypeNormal: - return "async"; case RCTFunctionTypePromise: return "promise"; case RCTFunctionTypeSync: return "sync"; + case RCTFunctionTypeNormal: + default: + return "async"; } };