react-native-windows 0.0.0-canary.642 → 0.0.0-canary.643

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

@@ -364,9 +364,9 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
   }
 
   //@cmember Get the character to display for password input
-  HRESULT TxGetPasswordChar(_Out_ TCHAR *pch) override {
-    assert(false);
-    return {};
+  HRESULT TxGetPasswordChar(_Out_ wchar_t *pch) override {
+    *pch = L'\u2022';
+    return S_OK;
   }
 
   //@cmember Get the accelerator character
@@ -614,6 +614,20 @@ void WindowsTextInputComponentView::updateProps(
     propBits |= TXTBIT_CHARFORMATCHANGE;
   }
 
+  if (oldTextInputProps.secureTextEntry != newTextInputProps.secureTextEntry) {
+    propBitsMask |= TXTBIT_USEPASSWORD;
+    if (newTextInputProps.secureTextEntry) {
+      propBits |= TXTBIT_USEPASSWORD;
+    }
+  }
+
+  if (oldTextInputProps.multiline != newTextInputProps.multiline) {
+    propBitsMask |= TXTBIT_MULTILINE | TXTBIT_WORDWRAP;
+    if (newTextInputProps.multiline) {
+      propBits |= TXTBIT_MULTILINE | TXTBIT_WORDWRAP;
+    }
+  }
+
   /*
   if (oldTextInputProps.textAttributes.foregroundColor != newTextInputProps.textAttributes.foregroundColor) {
     if (newTextInputProps.textAttributes.foregroundColor)
@@ -658,13 +672,6 @@ void WindowsTextInputComponentView::updateProps(
     m_element.IsReadOnly(!newTextInputProps.editable);
   }
 
-
-    if (oldTextInputProps.multiline != newTextInputProps.multiline) {
-      m_element.TextWrapping(newTextInputProps.multiline ? xaml::TextWrapping::Wrap : xaml::TextWrapping::NoWrap);
-      m_element.AcceptsReturn(newTextInputProps.multiline);
-    }
-
-
   if (oldTextInputProps.selection.start != newTextInputProps.selection.start ||
       oldTextInputProps.selection.end != newTextInputProps.selection.end) {
     m_element.Select(
@@ -831,10 +838,10 @@ std::string WindowsTextInputComponentView::GetTextFromRichEdit() const noexcept
   auto str = BstrToStdString(bstr);
 
   // JS gets confused by the \r\0 ending
-  if (*(str.end() - 1) == '\0') {
+  if (str.size() > 0 && *(str.end() - 1) == '\0') {
     str.pop_back();
   }
-  if (*(str.end() - 1) == '\r') {
+  if (str.size() > 0 && *(str.end() - 1) == '\r') {
     str.pop_back();
   }
   SysFreeString(bstr);

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.642</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.643</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>71ca215e58db4f6b9b79be31b1320ab4c05714f1</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>d1c012c1555d3d9e61083291300219fd5686c33b</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.642",
+  "version": "0.0.0-canary.643",
   "license": "MIT",
   "repository": {
     "type": "git",