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

Expensify · Apr 26, 2024 · 5404e93 · 5404e93
1 parent 306d6f5
commit 5404e93
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/android/src/main/new_arch/MarkdownCommitHook.cpp b/android/src/main/new_arch/MarkdownCommitHook.cpp
@@ -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 =

diff --git a/android/src/main/new_arch/MarkdownCommitHook.h b/android/src/main/new_arch/MarkdownCommitHook.h
@@ -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