react-native-windows 0.72.2 → 0.72.3

package/Microsoft.ReactNative.Cxx/JSValueReader.h

@@ -409,7 +409,7 @@ inline void ReadValue(IJSValueReader const &reader, /*out*/ JSValueArray &value)
 template <class T, std::enable_if_t<!std::is_void_v<decltype(GetStructInfo(static_cast<T *>(nullptr)))>, int>>
 inline void ReadValue(IJSValueReader const &reader, /*out*/ T &value) noexcept {
   if (reader.ValueType() == JSValueType::Object) {
-    const auto &fieldMap = StructInfo<T>::FieldMap;
+    const auto &fieldMap = StructInfo<T>::GetFieldMap();
     hstring propertyName;
     while (reader.GetNextObjectProperty(/*out*/ propertyName)) {
       auto it = fieldMap.find(std::wstring_view(propertyName));

package/Microsoft.ReactNative.Cxx/JSValueWriter.h

@@ -234,7 +234,7 @@ inline void WriteCustomDirectEventTypeConstant(IJSValueWriter const &writer, std
 template <class T, std::enable_if_t<!std::is_void_v<decltype(GetStructInfo(static_cast<T *>(nullptr)))>, int>>
 inline void WriteValue(IJSValueWriter const &writer, T const &value) noexcept {
   writer.WriteObjectBegin();
-  for (const auto &fieldEntry : StructInfo<T>::FieldMap) {
+  for (const auto &fieldEntry : StructInfo<T>::GetFieldMap()) {
     writer.WritePropertyName(fieldEntry.first);
     fieldEntry.second.WriteField(writer, &value);
   }

package/Microsoft.ReactNative.Cxx/ModuleRegistration.h

@@ -51,6 +51,28 @@
   INTERNAL_REACT_RECOMPOSER_4(     \
       (__VA_ARGS__, INTERNAL_REACT_MODULE_3_ARGS, INTERNAL_REACT_MODULE_2_ARGS, INTERNAL_REACT_MODULE_1_ARG, ))
 
+// Another version of REACT_MODULE but does not do auto registration
+#define INTERNAL_REACT_MODULE_NOREG_3_ARGS(moduleStruct, moduleName, eventEmitterName)                 \
+  struct moduleStruct;                                                                                 \
+  template <class TRegistry>                                                                           \
+  constexpr void GetReactModuleInfo(moduleStruct *, TRegistry &registry) noexcept {                    \
+    registry.RegisterModule(                                                                           \
+        moduleName, eventEmitterName, winrt::Microsoft::ReactNative::ReactAttributeId<__COUNTER__>{}); \
+  }
+
+#define INTERNAL_REACT_MODULE_NOREG_2_ARGS(moduleStruct, moduleName) \
+  INTERNAL_REACT_MODULE_NOREG_3_ARGS(moduleStruct, moduleName, L"")
+
+#define INTERNAL_REACT_MODULE_NOREG_1_ARG(moduleStruct) \
+  INTERNAL_REACT_MODULE_NOREG_2_ARGS(moduleStruct, L## #moduleStruct)
+
+#define INTERNAL_REACT_MODULE_NOREG(...)   \
+  INTERNAL_REACT_RECOMPOSER_4(             \
+      (__VA_ARGS__,                        \
+       INTERNAL_REACT_MODULE_NOREG_3_ARGS, \
+       INTERNAL_REACT_MODULE_NOREG_2_ARGS, \
+       INTERNAL_REACT_MODULE_NOREG_1_ARG, ))
+
 // Provide meta data information about struct member.
 // For each member with a 'custom attribute' macro we create a static method to provide meta data.
 // The member Id is generated as a ReactMemberId<__COUNTER__> type.

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -30,6 +30,11 @@
 #define REACT_MODULE(/* moduleStruct, [opt] moduleName, [opt] eventEmitterName */...) \
   INTERNAL_REACT_MODULE(__VA_ARGS__)(__VA_ARGS__)
 
+// REACT_MODULE_NOREG is REACT_MODULE without auto registration
+// they have the same arguments
+#define REACT_MODULE_NOREG(/* moduleStruct, [opt] moduleName, [opt] eventEmitterName */...) \
+  INTERNAL_REACT_MODULE_NOREG(__VA_ARGS__)(__VA_ARGS__)
+
 // REACT_INIT(method)
 // Arguments:
 // - method (required) - the method name the macro is attached to.

package/Microsoft.ReactNative.Cxx/StructInfo.h

@@ -113,12 +113,12 @@ void FieldWriter(IJSValueWriter const &writer, const void *obj, const uintptr_t
 
 template <class T>
 struct StructInfo {
-  static const FieldMap FieldMap;
+  static const FieldMap &GetFieldMap() {
+    static const FieldMap fieldMap = GetStructInfo(static_cast<T *>(nullptr));
+    return fieldMap;
+  }
 };
 
-template <class T>
-/*static*/ const FieldMap StructInfo<T>::FieldMap = GetStructInfo(static_cast<T *>(nullptr));
-
 template <int I>
 using ReactFieldId = std::integral_constant<int, I>;
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.72.2</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.72.3</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>72</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>2</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>3</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>5e9afa8863e83a46610cc49c82e80c1c02cfcf0e</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>6485abeed82accde1b46f002e7701b6e630a12b6</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.72.2",
+  "version": "0.72.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "11.3.5",
     "@react-native-community/cli-platform-android": "11.3.5",
     "@react-native-community/cli-platform-ios": "11.3.5",
-    "@react-native-windows/cli": "0.72.0",
+    "@react-native-windows/cli": "0.72.1",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.6",
@@ -63,7 +63,7 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.72.0",
+    "@react-native-windows/codegen": "0.72.1",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.1.15",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.1",