Fix some issues

microsoft · Aug 23, 2023 · b24027b · b24027b
1 parent 9bb85c9
commit b24027b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
@@ -1579,8 +1579,6 @@ function InternalTextInput(props: Props): React.Node {
 
   let style = flattenStyle(props.style);
 
-  let style = flattenStyle(props.style);
-
   if (Platform.OS === 'ios' || Platform.OS === 'macos') {
     // [macOS]
     const RCTTextInputView =

diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h
@@ -22,7 +22,11 @@ RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
 #endif
 
-extern NSString *const kRCTPlatformName; // [macOS]
+#if !TARGET_OS_OSX // [macOS]
+static NSString *const kRCTPlatformName = @"ios";
+#else // [macOS
+static NSString *const kRCTPlatformName = @"macos";
+#endif // macOS] // [macOS]
 
 @interface RCTBundleURLProvider : NSObject
 

diff --git a/React/Base/RCTBundleURLProvider.mm b/React/Base/RCTBundleURLProvider.mm
@@ -22,11 +22,7 @@ void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
   kRCTAllowPackagerAccess = allowed;
 }
 #endif
-#if !TARGET_OS_OSX // [macOS]
-static NSString *const kRCTPlatformName = @"ios";
-#else // [macOS
-static NSString *const kRCTPlatformName = @"macos";
-#endif // macOS]
+
 static NSString *const kRCTPackagerSchemeKey = @"RCT_packager_scheme";
 static NSString *const kRCTJsLocationKey = @"RCT_jsLocation";
 static NSString *const kRCTEnableDevKey = @"RCT_enableDev";

diff --git a/yarn.lock b/yarn.lock
@@ -1684,7 +1684,7 @@
     serve-static "^1.13.1"
     ws "^7.5.1"
 
-"@react-native-community/cli-tools@10.1.1", "@react-native-community/cli-tools@^10.1.1":
+"@react-native-community/cli-tools@^10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-10.1.1.tgz#fa66e509c0d3faa31f7bb87ed7d42ad63f368ddd"
   integrity sha512-+FlwOnZBV+ailEzXjcD8afY2ogFEBeHOw/8+XXzMgPaquU2Zly9B+8W089tnnohO3yfiQiZqkQlElP423MY74g==