Skip to content
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

Fix selection getting lost on Android on the new arch #335

Merged
merged 2 commits into from
Apr 26, 2024
Merged

Fix selection getting lost on Android on the new arch #335

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
b88877e
Don't cause state updated on the native component
j-piasecki Apr 26, 2024
b0f9784
Update the native component sometimes
j-piasecki Apr 26, 2024
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
9 changes: 9 additions & 0 deletions android/src/main/new_arch/MarkdownCommitHook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ RootShadowNode::Unshared MarkdownCommitHook::shadowTreeWillCommit(
// force measurement of a map buffer
newStateData->cachedAttributedStringId = 0;

// setting -1 as the event counter makes sure that the update will be ignored by the java
// part of the code, which is what we want as we don't change the attributed string here
if (previousEventCount_.contains(nodes.textInput->getTag()) &&
previousEventCount_[nodes.textInput->getTag()] == stateData.mostRecentEventCount) {
newStateData->mostRecentEventCount = -1;
} else {
previousEventCount_[nodes.textInput->getTag()] = stateData.mostRecentEventCount;
}

// clone the text input with the new state
auto newNode = node.clone({
.state =
Expand Down
2 changes: 2 additions & 0 deletions android/src/main/new_arch/MarkdownCommitHook.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ class MarkdownCommitHook : public UIManagerCommitHook {
textLayoutManagers_;
std::unordered_map<facebook::react::Tag, folly::dynamic>
previousDecoratorProps_;
std::unordered_map<facebook::react::Tag, int64_t>
previousEventCount_;
};

} // namespace livemarkdown
Loading