[iOS] Remove an early return to suppress a deprecated API warning for…

… `UIMenuController`
facebook · Jan 15, 2024 · c597c62 · c597c62
1 parent f30acc6
commit c597c62
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/packages/react-native/Libraries/Text/Text/RCTTextView.mm b/packages/react-native/Libraries/Text/Text/RCTTextView.mm
@@ -241,27 +241,26 @@ - (void)disableContextMenu
 - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
 {
 #if !TARGET_OS_UIKITFORMAC
-  if (@available(iOS 16.0, *)) {
+  if (@available(iOS 16.0, macCatalyst 16.0, *)) {
     CGPoint location = [gesture locationInView:self];
     UIEditMenuConfiguration *config = [UIEditMenuConfiguration configurationWithIdentifier:nil sourcePoint:location];
     if (_editMenuInteraction) {
       [_editMenuInteraction presentEditMenuWithConfiguration:config];
     }
-    return;
-  }
-  // TODO: Adopt showMenuFromRect (necessary for UIKitForMac)
-  UIMenuController *menuController = [UIMenuController sharedMenuController];
-
-  if (menuController.isMenuVisible) {
-    return;
-  }
+  } else {
+    UIMenuController *menuController = [UIMenuController sharedMenuController];
 
-  if (!self.isFirstResponder) {
-    [self becomeFirstResponder];
-  }
+    if (menuController.isMenuVisible) {
+      return;
+    }
 
+    if (!self.isFirstResponder) {
+      [self becomeFirstResponder];
+    }
+
   [menuController setTargetRect:self.bounds inView:self];
   [menuController setMenuVisible:YES animated:YES];
+  }
 #endif
 }
 

diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -237,27 +237,26 @@ - (void)disableContextMenu
 - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
 {
 #if !TARGET_OS_UIKITFORMAC
-  if (@available(iOS 16.0, *)) {
+  if (@available(iOS 16.0, macCatalyst 16.0, *)) {
     CGPoint location = [gesture locationInView:self];
     UIEditMenuConfiguration *config = [UIEditMenuConfiguration configurationWithIdentifier:nil sourcePoint:location];
     if (_editMenuInteraction) {
       [_editMenuInteraction presentEditMenuWithConfiguration:config];
     }
-    return;
-  }
-  // TODO: Adopt showMenuFromRect (necessary for UIKitForMac)
-  UIMenuController *menuController = [UIMenuController sharedMenuController];
-
-  if (menuController.isMenuVisible) {
-    return;
-  }
+  } else {
+    UIMenuController *menuController = [UIMenuController sharedMenuController];
 
-  if (!self.isFirstResponder) {
-    [self becomeFirstResponder];
-  }
+    if (menuController.isMenuVisible) {
+      return;
+    }
 
+    if (!self.isFirstResponder) {
+      [self becomeFirstResponder];
+    }
+
   [menuController setTargetRect:self.bounds inView:self];
   [menuController setMenuVisible:YES animated:YES];
+  }
 #endif
 }