react-native-windows 0.0.0-canary.710 → 0.0.0-canary.712

package/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp

@@ -285,7 +285,9 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
 
     case UIA_HelpTextPropertyId: {
       pRetVal->vt = VT_BSTR;
-      auto helpText = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityHint);
+      auto helpText = props->accessibilityHint.empty()
+          ? ::Microsoft::Common::Unicode::Utf8ToUtf16(baseView->DefaultHelpText())
+          : ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityHint);
       pRetVal->bstrVal = SysAllocString(helpText.c_str());
       hr = pRetVal->bstrVal != nullptr ? S_OK : E_OUTOFMEMORY;
       break;

package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp

@@ -1284,6 +1284,10 @@ std::string CompositionBaseComponentView::DefaultAccessibleName() const noexcept
   return "";
 }
 
+std::string CompositionBaseComponentView::DefaultHelpText() const noexcept {
+  return "";
+}
+
 CompositionViewComponentView::CompositionViewComponentView(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
     facebook::react::Tag tag)

package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.h

@@ -82,6 +82,7 @@ struct CompositionBaseComponentView : public IComponentView,
 
   virtual std::string DefaultControlType() const noexcept;
   virtual std::string DefaultAccessibleName() const noexcept;
+  virtual std::string DefaultHelpText() const noexcept;
 
  protected:
   std::array<winrt::Microsoft::ReactNative::Composition::ISpriteVisual, SpecialBorderLayerCount>

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -660,6 +660,14 @@ std::string WindowsTextInputComponentView::DefaultControlType() const noexcept {
   return "textinput";
 }
 
+std::string WindowsTextInputComponentView::DefaultAccessibleName() const noexcept {
+  return m_props->placeholder;
+}
+
+std::string WindowsTextInputComponentView::DefaultHelpText() const noexcept {
+  return m_props->placeholder;
+}
+
 void WindowsTextInputComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h

@@ -53,6 +53,8 @@ struct WindowsTextInputComponentView : CompositionBaseComponentView {
   void onFocusGained() noexcept override;
   bool focusable() const noexcept override;
   std::string DefaultControlType() const noexcept override;
+  std::string DefaultAccessibleName() const noexcept override;
+  std::string DefaultHelpText() const noexcept override;
   void onKeyDown(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;

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.710</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.712</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>97b160fb3dee36d012e652c67effdba067ba0288</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>d64dc2a331ecda6f1df921285a0087f417950e15</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.710",
+  "version": "0.0.0-canary.712",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "12.0.0-alpha.7",
     "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
     "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
-    "@react-native-windows/cli": "0.0.0-canary.189",
+    "@react-native-windows/cli": "0.0.0-canary.190",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.73.0-nightly-20230622-0201e51bb",
     "@react-native/codegen": "0.73.0-nightly-20230711-f396067cc",

package/templates/cpp-app/template.config.js

@@ -8,10 +8,12 @@
 
 const chalk = require('chalk');
 const existsSync = require('fs').existsSync;
-const fs = require('fs').promises;
 const path = require('path');
 const username = require('username');
 const uuid = require('uuid');
+const util = require('util');
+
+const glob = util.promisify(require('glob'));
 
 async function preInstall(config = {}, options = {}) {}
 
@@ -21,7 +23,7 @@ async function getFileMappings(config = {}, options = {}) {
   );
   const rnwVersion = require(path.join(rnwPath, 'package.json')).version;
 
-  const devMode = await existsSync(path.join(rnwPath, 'src'));
+  const devMode = existsSync(path.join(rnwPath, 'src'));
 
   const projectName =
     config?.project?.windows?.project?.projectName ?? options?.name ?? 'MyApp';
@@ -66,31 +68,30 @@ async function getFileMappings(config = {}, options = {}) {
 
   let fileMappings = [];
 
-  const templateFiles = await fs.readdir(__dirname, {recursive: true});
+  const templateFiles = await glob('**/*', {
+    cwd: __dirname,
+    ignore: 'template.config.js',
+    nodir: true,
+  });
 
   for (const file of templateFiles) {
     const fileMapping = {
-      from: path.resolve(__dirname, file),
-      to: file,
+      from: path.resolve(__dirname, path.normalize(file)),
+      to: path.normalize(file),
       replacements,
     };
 
-    // Don't include this file nor directories
-    if (
-      file === 'template.config.js' ||
-      (await fs.stat(fileMapping.from)).isDirectory()
-    ) {
-      continue;
-    }
-
     // Perform simple file renames
     const fileName = path.basename(fileMapping.to);
     switch (fileName) {
       case '_gitignore':
-        fileMapping.to = path.join(path.dirname(file), '.gitignore');
+        fileMapping.to = path.join(path.dirname(fileMapping.to), '.gitignore');
         break;
       case 'NuGet_Config':
-        fileMapping.to = path.join(path.dirname(file), 'NuGet.config');
+        fileMapping.to = path.join(
+          path.dirname(fileMapping.to),
+          'NuGet.config',
+        );
         break;
     }
 
@@ -104,7 +105,7 @@ async function getFileMappings(config = {}, options = {}) {
 }
 
 function postInstall(config = {}, options = {}) {
-  console.log(chalk.white.bold('To run your app on UWP:'));
+  console.log(chalk.white.bold('To run your new windows app:'));
   console.log(chalk.white('   npx react-native run-windows'));
 }