[fabric] Refactor MacOS view props & emitters

microsoft · May 1, 2024 · cc052f5 · cc052f5
1 parent a430e28
commit cc052f5
Show file tree

Hide file tree

Showing 23 changed files with 378 additions and 481 deletions.
diff --git a/ReactCommon/react/renderer/components/view/macOS/MacOSViewProps.cpp b/ReactCommon/react/renderer/components/view/macOS/MacOSViewProps.cpp
diff --git a/ReactCommon/react/renderer/components/view/macOS/MacOSViewProps.h b/ReactCommon/react/renderer/components/view/macOS/MacOSViewProps.h
diff --git a/ReactCommon/react/renderer/components/view/macOS/conversions.h b/ReactCommon/react/renderer/components/view/macOS/conversions.h
diff --git a/ReactCommon/react/renderer/components/view/macOS/primitives.h b/ReactCommon/react/renderer/components/view/macOS/primitives.h
diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -219,7 +219,7 @@ Pod::Spec.new do |s|
       sss.dependency             "Yoga"
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "react/renderer/components/view/tests", "react/renderer/components/view/platform/android"
+      sss.exclude_files        = "react/renderer/components/view/tests", "react/renderer/components/view/platform/android", "react/renderer/components/view/platform/cxx"
       sss.header_dir           = "react/renderer/components/view"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
     end

diff --git a/...nts/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h b/...nts/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h
@@ -12,7 +12,7 @@
 
 namespace facebook::react {
 #if TARGET_OS_OSX // [macOS
-#include <react/renderer/components/view/macOS/MouseEvent.h>
+#include <react/renderer/components/view/MouseEvent.h>
 #endif // macOS]
 
 class TextInputMetrics {

diff --git a/...rer/components/textinput/iostextinput/react/renderer/components/iostextinput/primitives.h b/...rer/components/textinput/iostextinput/react/renderer/components/iostextinput/primitives.h
@@ -9,6 +9,7 @@
 
 #include <optional>
 #include <string>
+#include <vector>
 
 namespace facebook::react {
 

diff --git a/...mponents/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h b/...mponents/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h
@@ -198,12 +198,13 @@ inline void fromRawValue(
   } else {
     LOG(ERROR) << "Unsupported Selection type";
   }
+}
 
 #if TARGET_OS_OSX // [macOS
 static inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    SubmitKeyEvent &result) {
+    const PropsParserContext& context,
+    const RawValue& value,
+    SubmitKeyEvent& result) {
   auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto tmp_key = map.find("key");
@@ -233,9 +234,9 @@ static inline void fromRawValue(
 }
 
 static inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    std::vector<SubmitKeyEvent> &result) {
+    const PropsParserContext& context,
+    const RawValue& value,
+    std::vector<SubmitKeyEvent>& result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
     SubmitKeyEvent newItem;