Skip to content

[0.64] [FIX] Cursor resetting in TextInput (#7056) #7114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rectified95 merged 2 commits into from
Feb 22, 2021
Merged

[0.64] [FIX] Cursor resetting in TextInput (#7056) #7114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e75b4
[FIX] Cursor resetting in TextInput (#7056)
rectified95 Feb 12, 2021
1b0222f
Merge branch '0.64-stable' into cherrypick_curos
rectified95 Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-2dead2dd-8acc-4a17-a3f2-7e3091cde5ad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Fix cursor resetting in TextInput.",
"packageName": "react-native-windows",
"email": "igklemen@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions vnext/Microsoft.ReactNative/Views/TextInputViewManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,10 +612,17 @@ void TextInputShadowNode::SetText(const winrt::Microsoft::ReactNative::JSValue &
if (m_mostRecentEventCount == m_nativeEventCount) {
if (textBox) {
if (text.Type() == winrt::Microsoft::ReactNative::JSValueType::String) {
auto oldCursor = textBox.SelectionStart();
auto oldSelectionLength = textBox.SelectionLength();
auto oldValue = textBox.Text();
auto newValue = react::uwp::asHstring(text);
if (oldValue != newValue) {
textBox.Text(newValue);
if (static_cast<uint32_t>(oldCursor) <= newValue.size()) {
textBox.SelectionStart(oldCursor);
} else {
textBox.SelectionStart(newValue.size());
}
}
} else if (text.IsNull())
textBox.ClearValue(xaml::Controls::TextBox::TextProperty());
Expand Down