react-native-windows 0.0.0-canary.656 → 0.0.0-canary.658

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -217,8 +217,9 @@ void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReac
   SystraceSection s("NativeUIManager::AddRootView");
   auto xamlRootView = static_cast<IXamlRootView *>(pReactRootView);
   XamlView view = xamlRootView->GetXamlView();
+  const auto rootTag = shadowNode.m_tag;
   m_tagsToXamlReactControl.emplace(
-      shadowNode.m_tag,
+      rootTag,
       winrt::weak_ref<winrt::Microsoft::ReactNative::ReactRootView>(
           view.as<winrt::Microsoft::ReactNative::ReactRootView>()));
 
@@ -226,14 +227,16 @@ void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReac
   view.as<xaml::FrameworkElement>().FlowDirection(
       I18nManager::IsRTL(m_context.Properties()) ? xaml::FlowDirection::RightToLeft : xaml::FlowDirection::LeftToRight);
 
-  m_tagsToYogaNodes.emplace(shadowNode.m_tag, make_yoga_node(m_yogaConfig));
+  m_tagsToYogaNodes.emplace(rootTag, make_yoga_node(m_yogaConfig));
 
   auto element = view.as<xaml::FrameworkElement>();
-  Microsoft::ReactNative::SetTag(element, shadowNode.m_tag);
+  Microsoft::ReactNative::SetTag(element, rootTag);
 
   // Add listener to size change so we can redo the layout when that happens
-  m_sizeChangedVector.push_back(
-      view.as<xaml::FrameworkElement>().SizeChanged(winrt::auto_revoke, [this](auto &&, auto &&) { DoLayout(); }));
+  m_sizeChangedVector.push_back(view.as<xaml::FrameworkElement>().SizeChanged(
+      winrt::auto_revoke, [this, rootTag](auto &&, xaml::SizeChangedEventArgs const &args) {
+        ApplyLayout(rootTag, args.NewSize().Width, args.NewSize().Height);
+      }));
 }
 
 void NativeUIManager::removeRootView(Microsoft::ReactNative::ShadowNode &shadow) {

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.656</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.658</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>8e12ccc82efc6d981ffcefecb70a15504fdf0cb2</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>684db1330d1a3e933274bd80e42e684a78f8e7c4</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Scripts/rnw-dependencies.ps1

@@ -81,6 +81,8 @@ $vsWorkloads = @('Microsoft.VisualStudio.Workload.ManagedDesktop',
 $vsAll = ($vsComponents + $vsWorkloads);
 
 # The minimum VS version to check for
+# Note: For install to work, whatever min version you specify here must be met by the current package available on choco.
+# I.E. Do NOT specify a Preview version here because choco doesn't have VS Preview packages.
 $vsver = "17.3";
 
 # The exact .NET SDK version to check for
@@ -177,16 +179,34 @@ function CheckVS {
     return $result;
 }
 
+function GetVSChannelAndProduct {
+    param(
+        [string]$VsWhere
+    )
+    
+    if ($VsWhere -ne $null) {
+        $channelId = & $VsWhere -version $vsver -property channelId;
+        $productId = & $VsWhere -version $vsver -property productId;
+        
+        # Channel/product not found, check one more time for pre-release
+        if (($channelId -eq $null) -or ($productId -eq $null)) {
+            $channelId = & $VsWhere -version $vsver -property channelId -prerelease;
+            $productId = & $VsWhere -version $vsver -property productId -prerelease;
+        }
+        
+        return $channelId, $productId;
+    }
+    
+    return $null, $null;
+}
+
 function InstallVS {
     $vsWhere = Get-VSWhere;
-
-    if ($vsWhere -ne $null) {
-        $channelId = & $vsWhere -version $vsver -property channelId;
-        $productId = & $vsWhere -version $vsver -property productId;
-    }
+    
+    $channelId, $productId = GetVSChannelAndProduct -VsWhere $vsWhere
 
     if (($vsWhere -eq $null) -or ($channelId -eq $null) -or ($productId -eq $null)) {
-        # No VSWhere / VS_Installer
+        # No VSWhere / VS_Installer, try to install
 
         EnsureChocoForInstall;
         
@@ -199,8 +219,12 @@ function InstallVS {
 
         $vsWhere = Get-VSWhere;
 
-        $channelId = & $vsWhere -version $vsver -property channelId;
-        $productId = & $vsWhere -version $vsver -property productId;
+        $channelId, $productId = GetVSChannelAndProduct -VsWhere $vsWhere
+    }
+    
+    # Final check before attempting install
+    if (($vsWhere -eq $null) -or ($channelId -eq $null) -or ($productId -eq $null)) {
+        throw "Unable to find or install a compatible version of Visual Studio >= ($vsver).";
     }
 
     $vsInstaller = Join-Path -Path (Split-Path -Parent $vsWhere) -ChildPath "vs_installer.exe";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.656",
+  "version": "0.0.0-canary.658",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "12.0.0-alpha.3",
     "@react-native-community/cli-platform-android": "12.0.0-alpha.3",
     "@react-native-community/cli-platform-ios": "12.0.0-alpha.3",
-    "@react-native-windows/cli": "0.0.0-canary.170",
+    "@react-native-windows/cli": "0.0.0-canary.171",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.73.0",
     "@react-native/codegen": "^0.73.0",