Fix key mismatch in text layout

Summary:
Changelog: [Internal]

There was a key mismatch between what Java and C++.
cacheIdMap was incorrectly initialised.

Differential Revision: D23652342

fbshipit-source-id: 66f54dc887a011afeead9420bda093e9a0c9a8ca

ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp

@@ -45,8 +45,9 @@ AndroidTextInputState::AndroidTextInputState(
                                    "mostRecentEventCount",
                                    previousState.mostRecentEventCount)
                                .getInt()),
-      cachedAttributedStringId(
+      cachedAttributedStringId(data.getDefault(
-          data.getDefault("cacheId", previousState.cachedAttributedStringId)
+                                       "opaqueCacheId",
+                                       previousState.cachedAttributedStringId)
                                    .getInt()),
       attributedString(previousState.attributedString),
       reactTreeAttributedString(previousState.reactTreeAttributedString),

ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h

@@ -29,7 +29,7 @@ class AndroidTextInputState final {
    * Stores an opaque cache ID used on the Java side to refer to a specific
    * AttributedString for measurement purposes only.
    */
-  int cachedAttributedStringId{0};
+  int64_t cachedAttributedStringId{0};
 
   /*
    * All content of <TextInput> component represented as an `AttributedString`.

ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -37,7 +37,7 @@ TextMeasurement TextLayoutManager::measure(
 }
 
 TextMeasurement TextLayoutManager::measureCachedSpannableById(
-    int cacheId,
+    int64_t cacheId,
     ParagraphAttributes paragraphAttributes,
     LayoutConstraints layoutConstraints) const {
   const jni::global_ref<jobject> &fabricUIManager =
@@ -64,7 +64,7 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById(
   auto maximumSize = layoutConstraints.maximumSize;
 
   local_ref<JString> componentName = make_jstring("RCTText");
-  folly::dynamic cacheIdMap;
+  folly::dynamic cacheIdMap = folly::dynamic::object;
   cacheIdMap["cacheId"] = cacheId;
   local_ref<ReadableNativeMap::javaobject> attributedStringRNM =
       ReadableNativeMap::newObjectCxxArgs(cacheIdMap);

ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h

@@ -42,7 +42,7 @@ class TextLayoutManager {
    * opaque cache ID.
    */
   TextMeasurement measureCachedSpannableById(
-      int cacheId,
+      int64_t cacheId,
       ParagraphAttributes paragraphAttributes,
       LayoutConstraints layoutConstraints) const;