[RN][macos] Remove irrelevant context menu items for single/multiline…

… text input Summary: **Context** Strip out irrelevant menu items from TextInput context menu for single & multi line inputs. **Change** - Expose public static method on RCTTextView.h for determining submenu - Add delegate methods for single/multi line inputs - Filter the menu items with block Test Plan: ## Singleline input |before|after| |{F743226674}|{F743226745}| ## Multiline input |before|after| |{F743226792}|{F743226809}| Reviewers: lyahdav, ericroz, #seller_expansion Reviewed By: lyahdav Subscribers: alexhenry Differential Revision: https://phabricator.intern.facebook.com/D37199687 Tasks: T114066390 Tags: marketplace, oncall, oncallteam-react-native-desktop, marketplace_seller_expansion
shwanton · Nov 21, 2022 · 99b53c5 · 99b53c5
1 parent 0f7d8f2
commit 99b53c5
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 22 deletions.
diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m
@@ -480,38 +480,23 @@ - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
 
 - (NSMenu *)textView:(NSTextView *)view menu:(NSMenu *)menu forEvent:(NSEvent *)event atIndex:(NSUInteger)charIndex
 {
-  // Remove items not applicable for readonly text.
-  for (NSMenuItem *item in menu.itemArray) {
-    if (item.action == @selector(cut:) || item.action == @selector(paste:) || [RCTTextView item:item hasSubmenuItemWithAction:@selector(checkSpelling:)] || [RCTTextView item:item hasSubmenuItemWithAction:@selector(orderFrontSubstitutionsPanel:)]) {
-      item.hidden = YES;
-    }
-  }
+  [[RCTTouchHandler touchHandlerForView:self] willShowMenuWithEvent:event];
 
+  RCTHideMenuItemsWithFilterPredicate(menu, ^bool(NSMenuItem *item) {
+    // Remove items not applicable for readonly text.
+    return (item.action == @selector(cut:) || item.action == @selector(paste:) || RCTMenuItemHasSubmenuItemWithAction(item, @selector(checkSpelling:)) || RCTMenuItemHasSubmenuItemWithAction(item, @selector(orderFrontSubstitutionsPanel:)));
+  });
+
   if (_additionalMenuItems.count > 0) {
     [menu insertItem:[NSMenuItem separatorItem] atIndex:0];
     for (NSMenuItem* item in [_additionalMenuItems reverseObjectEnumerator]) {
       [menu insertItem:item atIndex:0];
     }
   }
-
-  [[RCTTouchHandler touchHandlerForView:self] willShowMenuWithEvent:event];
-
+
   return menu;
 }
 
-+ (BOOL)item:(NSMenuItem *)item hasSubmenuItemWithAction:(SEL)action
-{
-  if (!item.hasSubmenu) {
-    return NO;
-  }
-  for (NSMenuItem *submenuItem in item.submenu.itemArray) {
-    if (submenuItem.action == action) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
 - (void)textDidEndEditing:(NSNotification *)notification
 {
   _textView.selectedRange = NSMakeRange(NSNotFound, 0);

diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -126,6 +126,12 @@ - (NSMenu *)menuForEvent:(NSEvent *)event
   if (menu) {
     [[RCTTouchHandler touchHandlerForView:self] willShowMenuWithEvent:event];
   }
+
+  RCTHideMenuItemsWithFilterPredicate(menu, ^bool(NSMenuItem *item) {
+    // hide font & layout orientation menu options
+    return (RCTMenuItemHasSubmenuItemWithAction(item, @selector(orderFrontFontPanel:)) || RCTMenuItemHasSubmenuItemWithAction(item, @selector(changeLayoutOrientation:)));
+  });
+
   return menu;
 }
 #endif // ]TODO(macOS ISS#2323203)

diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -475,6 +475,12 @@ - (NSMenu *)textView:(NSTextView *)view menu:(NSMenu *)menu forEvent:(NSEvent *)
   if (menu) {
     [[RCTTouchHandler touchHandlerForView:self] willShowMenuWithEvent:event];
   }
+
+  RCTHideMenuItemsWithFilterPredicate(menu, ^bool(NSMenuItem *item) {
+    // hide font menu option
+    return RCTMenuItemHasSubmenuItemWithAction(item, @selector(orderFrontFontPanel:));
+  });
+
   return menu;
 } 
 #endif // ]TODO(macOS GH#774)

diff --git a/React/Base/RCTUtils.h b/React/Base/RCTUtils.h
@@ -201,4 +201,10 @@ RCT_EXTERN BOOL RCTValidateTypeOfViewCommandArgument(
     NSString const *commandName,
     NSString const *argPos);
 
+#if TARGET_OS_OSX
+typedef bool (^RCTMenuItemFilterPredicate)(NSMenuItem *_Nonnull item);
+RCT_EXTERN void RCTHideMenuItemsWithFilterPredicate(NSMenu *_Nonnull menu, RCTMenuItemFilterPredicate shouldFilter);
+RCT_EXTERN BOOL RCTMenuItemHasSubmenuItemWithAction(NSMenuItem *_Nonnull item, SEL action);
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
@@ -1159,3 +1159,27 @@ RCT_EXTERN BOOL RCTValidateTypeOfViewCommandArgument(
 
   return true;
 }
+
+#if TARGET_OS_OSX
+void RCTHideMenuItemsWithFilterPredicate(NSMenu *menu, RCTMenuItemFilterPredicate shouldFilter)
+{
+  for (NSMenuItem *item in menu.itemArray) {
+      if (shouldFilter(item)) {
+          item.hidden = YES;
+      }
+  }
+}
+
+BOOL RCTMenuItemHasSubmenuItemWithAction(NSMenuItem *item, SEL action)
+{
+  if (!item.hasSubmenu) {
+    return NO;
+  }
+  for (NSMenuItem *submenuItem in item.submenu.itemArray) {
+    if (submenuItem.action == action) {
+      return YES;
+    }
+  }
+  return NO;
+}
+#endif