[0.84] Fix multiline TextInput crash from TxDrawD2D reentrancy (microsoft#15990) (microsoft#16005)

iamAbhi-916 · gmacmaster · commit f5a744693b74 · 2026-04-16T14:09:11.000-04:00
* Fix multiline TextInput crash from TxDrawD2D reentrancy

* Change files
diff --git a/change/react-native-windows-fd21e9f2-3f90-4b4a-94f5-fbf8802080dc.json b/change/react-native-windows-fd21e9f2-3f90-4b4a-94f5-fbf8802080dc.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fix multiline TextInput crash from TxDrawD2D reentrancy",
+  "packageName": "react-native-windows",
+  "email": "74712637+iamAbhi-916@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp
@@ -1779,7 +1779,10 @@ void WindowsTextInputComponentView::DrawText() noexcept {
       }
 
       // TODO keep track of proper invalid rect
+      // Prevent reentrancy: TxDrawD2D may call TxViewChange -> DrawText
+      m_cDrawBlock++;
       auto hrDraw = m_textServices->TxDrawD2D(d2dDeviceContext, &rc, nullptr, TXTVIEW_ACTIVE);
+      m_cDrawBlock--;
       winrt::check_hresult(hrDraw);
 
       // draw placeholder text if needed

Original file line number	Diff line number	Diff line change
`@@ -1779,7 +1779,10 @@ void WindowsTextInputComponentView::DrawText() noexcept {`
`1779`	`1779`	`}`
`1780`	`1780`
`1781`	`1781`	`// TODO keep track of proper invalid rect`
	`1782`	`+ // Prevent reentrancy: TxDrawD2D may call TxViewChange -> DrawText`
	`1783`	`+ m_cDrawBlock++;`
`1782`	`1784`	`auto hrDraw = m_textServices->TxDrawD2D(d2dDeviceContext, &rc, nullptr, TXTVIEW_ACTIVE);`
	`1785`	`+ m_cDrawBlock--;`
`1783`	`1786`	`winrt::check_hresult(hrDraw);`
`1784`	`1787`
`1785`	`1788`	`// draw placeholder text if needed`