Merge branch 'main' into drag-drop

Author: Saadnajmi

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -614,7 +614,15 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
       [self registerForDraggedTypes:pasteboardTypes];
     }
   }
-#endif // macOS]
+
+  // `tooltip`
+  if (oldViewProps.tooltip != newViewProps.tooltip) {
+    if (newViewProps.tooltip.has_value()) {
+      self.toolTip = RCTNSStringFromStringNilIfEmpty(newViewProps.tooltip.value());
+    } else {
+      self.toolTip = nil;
+    }
+  }
 
   _needsInvalidateLayer = _needsInvalidateLayer || needsInvalidateLayer;
 

packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.cpp

@@ -74,7 +74,16 @@ HostPlatformViewProps::HostPlatformViewProps(
                     rawProps,
                     "draggedTypes",
                     sourceProps.draggedTypes,
-                    {})) {};
+                    {})),
+      tooltip(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.tooltip
+              : convertRawProp(
+                   context,
+                   rawProps,
+                   "tooltip",
+                   sourceProps.tooltip,
+                   {})) {}
 
 #define VIEW_EVENT_CASE_MACOS(eventType)                           \
   case CONSTEXPR_RAW_PROPS_KEY_HASH("on" #eventType): {            \
@@ -112,6 +121,7 @@ void HostPlatformViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyDownEvents);
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyUpEvents);
     RAW_SET_PROP_SWITCH_CASE_BASIC(draggedTypes);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(tooltip);
   }
 }
 

packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.h

@@ -16,6 +16,9 @@
 
 #include <react/renderer/components/view/KeyEvent.h>
 
+#include <optional>
+#include <string>
+
 #include "HostPlatformViewEvents.h"
 
 namespace facebook::react {
@@ -45,5 +48,7 @@ class HostPlatformViewProps : public BaseViewProps {
   std::vector<HandledKey> keyUpEvents{};
 
   std::vector<std::string> draggedTypes{};
+
+  std::optional<std::string> tooltip{};
 };
 } // namespace facebook::react

packages/rn-tester/js/utils/RNTesterList.ios.js

@@ -127,10 +127,6 @@ const Components: Array<RNTesterModuleInfo> = [
     module: require('../examples/TextInput/TextInputExample.ios'),
     category: 'Basic',
   },
-  {
-    key: 'TooltipExample',
-    module: require('../examples/Tooltip/TooltipExample'),
-  },
   {
     key: 'TouchableExample',
     module: require('../examples/Touchable/TouchableExample'),
@@ -186,6 +182,11 @@ const APIs: Array<RNTesterModuleInfo> = ([
     key: 'AccessibilityShowMenu',
     module: require('../examples/AccessibilityShowMenu/AccessibilityShowMenu'),
     category: 'macOS',
+  },
+  {
+    key: 'TooltipExample',
+    module: require('../examples/Tooltip/TooltipExample'),
+    category: 'macOS',
   }, // macOS]
   {
     key: 'AccessibilityExample',