react-native-windows 0.73.4 → 0.73.6

package/Common/Common.vcxproj

@@ -64,7 +64,7 @@
       string literals. It prevents code like
         wchar_t* str = L"hello";
       from compiling. -->
-      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings /await</AdditionalOptions>
     </ClCompile>
     <Link>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -78,12 +78,17 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Unicode.cpp" />
+    <ClCompile Include="Utilities.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Unicode.h" />
     <ClInclude Include="Utilities.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ItemGroup>
+    <PackageReference Include="boost" Version="1.76.0.0" />
+    <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
+  </ItemGroup>
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
   <Target Name="Deploy" />

package/Common/Common.vcxproj.filters

@@ -12,6 +12,9 @@
     <ClCompile Include="Unicode.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Utilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Unicode.h">

package/Common/Utilities.cpp

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "Utilities.h"
+
+// Boost Library
+#include <boost/archive/iterators/base64_from_binary.hpp>
+#include <boost/archive/iterators/binary_from_base64.hpp>
+#include <boost/archive/iterators/ostream_iterator.hpp>
+#include <boost/archive/iterators/transform_width.hpp>
+
+// Windows API
+#include <winrt/Windows.Security.Cryptography.h>
+
+// Standard Library
+#include <sstream>
+
+using std::string;
+using std::string_view;
+using std::wstring_view;
+using winrt::array_view;
+
+using winrt::Windows::Security::Cryptography::BinaryStringEncoding;
+using winrt::Windows::Security::Cryptography::CryptographicBuffer;
+
+namespace Microsoft::React::Utilities {
+
+string DecodeBase64(string_view base64) noexcept {
+  typedef array_view<char const> av_t;
+  auto bytes = av_t(base64.data(), static_cast<av_t::size_type>(base64.size()));
+
+  using namespace boost::archive::iterators;
+  typedef transform_width<binary_from_base64<const char *>, 8, 6> decode_base64;
+  std::ostringstream oss;
+  std::copy(decode_base64(bytes.cbegin()), decode_base64(bytes.cend()), ostream_iterator<char>(oss));
+
+  return oss.str();
+}
+
+// https://www.boost.org/doc/libs/1_76_0/libs/serialization/doc/dataflow.html
+string EncodeBase64(string_view text) noexcept {
+  typedef array_view<char const> av_t;
+  auto bytes = av_t(text.data(), static_cast<av_t::size_type>(text.size()));
+
+  using namespace boost::archive::iterators;
+  typedef base64_from_binary<transform_width<const char *, 6, 8>> encode_base64;
+  std::ostringstream oss;
+  std::copy(encode_base64(bytes.cbegin()), encode_base64(bytes.cend()), ostream_iterator<char>(oss));
+
+  // https://unix.stackexchange.com/questions/631501
+  auto padLength = (4 - (oss.tellp() % 4)) % 4;
+  for (auto i = 0; i < padLength; ++i) {
+    oss << '=';
+  }
+
+  return oss.str();
+}
+
+} // namespace Microsoft::React::Utilities

package/Common/packages.lock.json

@@ -1,7 +1,20 @@
 {
   "version": 1,
   "dependencies": {
-    "native,Version=v0.0": {},
+    "native,Version=v0.0": {
+      "boost": {
+        "type": "Direct",
+        "requested": "[1.76.0, )",
+        "resolved": "1.76.0",
+        "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
+      },
+      "Microsoft.Windows.CppWinRT": {
+        "type": "Direct",
+        "requested": "[2.0.211028.7, )",
+        "resolved": "2.0.211028.7",
+        "contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
+      }
+    },
     "native,Version=v0.0/win10-arm": {},
     "native,Version=v0.0/win10-arm-aot": {},
     "native,Version=v0.0/win10-arm64-aot": {},

package/Common/utilities.h

@@ -2,6 +2,9 @@
 // Licensed under the MIT License.
 
 #pragma once
+
+// Standard Library
+#include <string>
 #include <type_traits>
 #include <utility>
 
@@ -37,3 +40,11 @@ constexpr std::size_t ArraySize(T (&)[N]) noexcept {
 }
 
 } // namespace Microsoft::Common::Utilities
+
+namespace Microsoft::React::Utilities {
+
+std::string DecodeBase64(std::string_view text) noexcept;
+
+std::string EncodeBase64(std::string_view text) noexcept;
+
+} // namespace Microsoft::React::Utilities

package/Libraries/Components/Touchable/TouchableBounce.js

@@ -203,6 +203,10 @@ class TouchableBounce extends React.Component<Props, State> {
     this.state.pressability.configure(this._createPressabilityConfig());
   }
 
+  componentDidMount(): mixed {
+    this.state.pressability.configure(this._createPressabilityConfig());
+  }
+
   componentWillUnmount(): void {
     this.state.pressability.reset();
   }

package/Libraries/Components/Touchable/TouchableHighlight.js

@@ -363,6 +363,7 @@ class TouchableHighlight extends React.Component<Props, State> {
 
   componentDidMount(): void {
     this._isMounted = true;
+    this.state.pressability.configure(this._createPressabilityConfig());
   }
 
   componentDidUpdate(prevProps: Props, prevState: State) {

package/Libraries/Components/Touchable/TouchableHighlight.windows.js

@@ -378,6 +378,7 @@ class TouchableHighlight extends React.Component<Props, State> {
 
   componentDidMount(): void {
     this._isMounted = true;
+    this.state.pressability.configure(this._createPressabilityConfig());
   }
 
   componentDidUpdate(prevProps: Props, prevState: State) {

package/Libraries/Components/Touchable/TouchableNativeFeedback.js

@@ -339,6 +339,10 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
     this.state.pressability.configure(this._createPressabilityConfig());
   }
 
+  componentDidMount(): mixed {
+    this.state.pressability.configure(this._createPressabilityConfig());
+  }
+
   componentWillUnmount(): void {
     this.state.pressability.reset();
   }

package/Libraries/Components/Touchable/TouchableOpacity.js

@@ -314,6 +314,10 @@ class TouchableOpacity extends React.Component<Props, State> {
     }
   }
 
+  componentDidMount(): void {
+    this.state.pressability.configure(this._createPressabilityConfig());
+  }
+
   componentWillUnmount(): void {
     this.state.pressability.reset();
   }

package/Libraries/Components/Touchable/TouchableOpacity.windows.js

@@ -329,6 +329,10 @@ class TouchableOpacity extends React.Component<Props, State> {
     }
   }
 
+  componentDidMount(): void {
+    this.state.pressability.configure(this._createPressabilityConfig());
+  }
+
   componentWillUnmount(): void {
     this.state.pressability.reset();
   }

package/Libraries/Components/Touchable/TouchableWithoutFeedback.js

@@ -189,6 +189,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
     this.state.pressability.configure(createPressabilityConfig(this.props));
   }
 
+  componentDidMount(): mixed {
+    this.state.pressability.configure(createPressabilityConfig(this.props));
+  }
+
   componentWillUnmount(): void {
     this.state.pressability.reset();
   }

package/Libraries/Components/Touchable/TouchableWithoutFeedback.windows.js

@@ -204,6 +204,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
     this.state.pressability.configure(createPressabilityConfig(this.props));
   }
 
+  componentDidMount(): mixed {
+    this.state.pressability.configure(createPressabilityConfig(this.props));
+  }
+
   componentWillUnmount(): void {
     this.state.pressability.reset();
   }

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 73,
-  patch: 0,
+  patch: 4,
   prerelease: null,
 };

package/Libraries/promiseRejectionTrackingOptions.js

@@ -34,6 +34,11 @@ let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
             ? rejection
             : JSON.stringify((rejection: $FlowFixMe));
       }
+      // It could although this object is not a standard error, it still has stack information to unwind
+      // $FlowFixMe ignore types just check if stack is there
+      if (rejection.stack && typeof rejection.stack === 'string') {
+        stack = rejection.stack;
+      }
     }
 
     const warning = `Possible unhandled promise rejection (id: ${id}):\n${

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.73.4</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.73.6</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>73</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>4</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>6</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>6461c7c30f8307c43dc78bb95aa2dbf913e75e0a</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>d1b6abda55649a09a35f36da61b5b184089b0db9</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/YogaLayoutableShadowNode.cpp

@@ -991,7 +991,7 @@ void YogaLayoutableShadowNode::ensureConsistency() const {
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
-#ifdef REACT_NATIVE_DEBUG
+#if defined(REACT_NATIVE_DEBUG) && defined(WITH_FBSYSTRACE)
   // Checking that the shapes of Yoga node children object look fine.
   // This is the only heuristic that might produce false-positive results
   // (really broken dangled nodes might look fine). This is useful as an early
@@ -1009,7 +1009,7 @@ void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenAlignment() const {
-#ifdef REACT_NATIVE_DEBUG
+#if defined(REACT_NATIVE_DEBUG) && defined(WITH_FBSYSTRACE)
   // If the node is not a leaf node, checking that:
   // - All children are `YogaLayoutableShadowNode` subclasses.
   // - All Yoga children are owned/connected to corresponding children of

package/Shared/BaseFileReaderResource.cpp

@@ -3,10 +3,7 @@
 
 #include "BaseFileReaderResource.h"
 
-// Boost Library
-#include <boost/archive/iterators/base64_from_binary.hpp>
-#include <boost/archive/iterators/ostream_iterator.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
+#include <utilities.h>
 
 // Windows API
 #include <winrt/base.h>
@@ -73,18 +70,9 @@ void BaseFileReaderResource::ReadAsDataUrl(
   result += type;
   result += ";base64,";
 
-  // https://www.boost.org/doc/libs/1_76_0/libs/serialization/doc/dataflow.html
-  using namespace boost::archive::iterators;
-  typedef base64_from_binary<transform_width<const char *, 6, 8>> encode_base64;
-  std::ostringstream oss;
-  std::copy(encode_base64(bytes.cbegin()), encode_base64(bytes.cend()), ostream_iterator<char>(oss));
-  result += oss.str();
-
-  // https://unix.stackexchange.com/questions/631501
-  auto padLength = 4 - (oss.tellp() % 4);
-  for (auto i = 0; i < padLength; ++i) {
-    result += '=';
-  }
+  auto chars = reinterpret_cast<const char *>(bytes.data());
+  auto view = std::string_view(chars, bytes.size());
+  result += Utilities::EncodeBase64(view);
 
   resolver(std::move(result));
 }

package/Shared/Modules/FileReaderModule.cpp

@@ -5,12 +5,6 @@
 
 #include <CreateModules.h>
 #include <ReactPropertyBag.h>
-#include <sstream>
-
-// Boost Library
-#include <boost/archive/iterators/base64_from_binary.hpp>
-#include <boost/archive/iterators/ostream_iterator.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
 
 // React Native
 #include <cxxreact/JsArgumentHelpers.h>

package/Shared/Networking/DefaultBlobResource.cpp

@@ -5,6 +5,7 @@
 
 #include <Modules/IHttpModuleProxy.h>
 #include <Modules/IWebSocketModuleProxy.h>
+#include <utilities.h>
 
 // Boost Libraries
 #include <boost/uuid/uuid_io.hpp>
@@ -95,11 +96,9 @@ void DefaultBlobResource::SendOverSocket(string &&blobId, int64_t offset, int64_
     return m_callbacks.OnError(e.what());
   }
 
-  auto buffer = CryptographicBuffer::CreateFromByteArray(data);
-  auto base64Hstring = CryptographicBuffer::EncodeToBase64String(std::move(buffer));
-  auto base64String = winrt::to_string(base64Hstring);
-
-  wsProxy->SendBinary(std::move(base64String), socketId);
+  auto chars = reinterpret_cast<const char *>(data.data());
+  auto view = std::string_view(chars, data.size());
+  wsProxy->SendBinary(Utilities::EncodeBase64(view), socketId);
 }
 
 void DefaultBlobResource::CreateFromParts(msrn::JSValueArray &&parts, string &&blobId) noexcept /*override*/ {

package/Shared/Networking/WinRTWebSocketResource.cpp

@@ -7,6 +7,9 @@
 #include <Utils/CppWinrtLessExceptions.h>
 #include <Utils/WinRTConversions.h>
 
+// Boost Libraries
+#include <boost/algorithm/string.hpp>
+
 // MSO
 #include <dispatchQueue/dispatchQueue.h>
 
@@ -16,9 +19,6 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Security.Cryptography.h>
 
-// Standard Library
-#include <sstream>
-
 using Microsoft::Common::Utilities::CheckedReinterpretCast;
 
 using std::function;
@@ -352,8 +352,12 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
 
   m_readyState = ReadyState::Connecting;
 
+  bool hasOriginHeader = false;
   for (const auto &header : options) {
     m_socket.SetRequestHeader(header.first, winrt::to_hstring(header.second));
+    if (boost::iequals(header.first, L"Origin")) {
+      hasOriginHeader = true;
+    }
   }
 
   winrt::Windows::Foundation::Collections::IVector<winrt::hstring> supportedProtocols =
@@ -362,11 +366,26 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
     supportedProtocols.Append(winrt::to_hstring(protocol));
   }
 
-  m_connectRequested = true;
-
   Uri uri{nullptr};
   try {
     uri = Uri{winrt::to_hstring(url)};
+
+    // #12626 - If Origin header is not provided, set to connect endpoint.
+    if (!hasOriginHeader) {
+      auto scheme = uri.SchemeName();
+      auto host = uri.Host();
+      auto port = uri.Port();
+
+      if (scheme == L"ws") {
+        scheme = L"http";
+      } else if (scheme == L"wss") {
+        scheme = L"https";
+      }
+
+      auto origin = winrt::hstring{scheme + L"://" + host + L":" + winrt::to_hstring(port)};
+      m_socket.SetRequestHeader(L"Origin", std::move(origin));
+    }
+
   } catch (hresult_error const &e) {
     if (m_errorHandler) {
       m_errorHandler({Utilities::HResultToString(e), ErrorType::Connection});
@@ -380,6 +399,8 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
     return;
   }
 
+  m_connectRequested = true;
+
   PerformConnect(std::move(uri));
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.73.4",
+  "version": "0.73.6",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,22 +23,22 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "12.1.1",
-    "@react-native-community/cli-platform-android": "12.1.1",
-    "@react-native-community/cli-platform-ios": "12.1.1",
-    "@react-native-windows/cli": "0.73.1",
-    "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "^0.73.1",
-    "@react-native/codegen": "^0.73.2",
-    "@react-native/community-cli-plugin": "^0.73.10",
-    "@react-native/gradle-plugin": "^0.73.4",
-    "@react-native/js-polyfills": "^0.73.1",
-    "@react-native/normalize-colors": "^0.73.2",
-    "@react-native/virtualized-lists": "^0.73.3",
+    "@react-native-community/cli": "12.3.2",
+    "@react-native-community/cli-platform-android": "12.3.2",
+    "@react-native-community/cli-platform-ios": "12.3.2",
+    "@react-native-windows/cli": "0.73.2",
+    "@react-native/assets-registry": "0.73.1",
+    "@react-native/codegen": "0.73.3",
+    "@react-native/community-cli-plugin": "0.73.16",
+    "@react-native/gradle-plugin": "0.73.4",
+    "@react-native/js-polyfills": "0.73.1",
+    "@react-native/normalize-colors": "0.73.2",
+    "@react-native/virtualized-lists": "0.73.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "base64-js": "^1.5.1",
+    "chalk": "^4.0.0",
     "deprecated-react-native-prop-types": "^5.0.0",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.6",
@@ -46,8 +46,8 @@
     "jest-environment-node": "^29.6.3",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.80.0",
-    "metro-source-map": "^0.80.0",
+    "metro-runtime": "^0.80.3",
+    "metro-source-map": "^0.80.3",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
@@ -81,7 +81,7 @@
     "just-scripts": "^1.3.3",
     "prettier": "^2.4.1",
     "react": "18.2.0",
-    "react-native": "0.73.0",
+    "react-native": "0.73.4",
     "react-native-platform-override": "^1.9.16",
     "react-refresh": "^0.4.0",
     "typescript": "^4.9.5"