@mathers101/react-native-render-rich-text 0.1.10 → 0.1.14

package/android/src/main/java/com/renderrichtext/views/CopyGlyph.kt

@@ -1,101 +1,101 @@
-package com.renderrichtext.views
-
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Path
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffXfermode
-
-/**
- * Draws the copy glyph so Android matches the SF Symbol doc.on.doc rendered on
- * iOS: two portrait document pages with a folded (dog-eared) top-right corner,
- * a front page in the lower-left laid over a back page in the upper-right.
- *
- * The back page is punched out where the front page (plus a hairline of
- * clearance) covers it, so the front reads as sitting on top exactly as the SF
- * Symbol does, instead of both outlines crossing. The clear is done inside an
- * offscreen layer so the punched region reveals whatever background the drawable
- * sits on, without the glyph needing to know that color.
- *
- * One instance is held per drawable rather than shared: the paths and clear
- * paint are reused across draws to keep draw() allocation-free, and two drawables
- * of different sizes must not share those buffers. All coordinates use a 24-unit
- * grid scaled to the drawable width, matching the grid the iOS symbol is authored
- * on.
- */
-internal class CopyGlyph {
-  private val back = Path()
-  private val front = Path()
-  private val backFold = Path()
-  private val frontFold = Path()
-
-  // Color and colorFilter are irrelevant under PorterDuff.CLEAR; only the
-  // widened stroke (set per draw) matters, so this is configured once.
-  private val clearPaint =
-    Paint(Paint.ANTI_ALIAS_FLAG).apply {
-      style = Paint.Style.FILL_AND_STROKE
-      strokeJoin = Paint.Join.ROUND
-      strokeCap = Paint.Cap.ROUND
-      xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
-    }
-
-  fun draw(
-    canvas: Canvas,
-    width: Float,
-    stroke: Paint,
-  ) {
-    val u = width / 24f
-    val fold = 4f * u
-    val corner = 2f * u
-
-    buildPage(back, 9 * u, 1 * u, 20 * u, 17 * u, fold, corner)
-    buildPage(front, 3 * u, 7 * u, 14 * u, 23 * u, fold, corner)
-    buildFold(backFold, 20 * u, 1 * u, fold)
-    buildFold(frontFold, 14 * u, 7 * u, fold)
-    clearPaint.strokeWidth = stroke.strokeWidth * 3f
-
-    val saved = canvas.saveLayer(0f, 0f, width, width, null)
-    canvas.drawPath(back, stroke)
-    canvas.drawPath(backFold, stroke)
-    canvas.drawPath(front, clearPaint)
-    canvas.drawPath(front, stroke)
-    canvas.drawPath(frontFold, stroke)
-    canvas.restoreToCount(saved)
-  }
-
-  // A page outline whose top-right corner is cut back by fold, with the other
-  // three corners rounded by corner.
-  private fun buildPage(
-    path: Path,
-    l: Float,
-    t: Float,
-    r: Float,
-    b: Float,
-    fold: Float,
-    corner: Float,
-  ) {
-    path.rewind()
-    path.moveTo(l, t + corner)
-    path.quadTo(l, t, l + corner, t)
-    path.lineTo(r - fold, t)
-    path.lineTo(r, t + fold)
-    path.lineTo(r, b - corner)
-    path.quadTo(r, b, r - corner, b)
-    path.lineTo(l + corner, b)
-    path.quadTo(l, b, l, b - corner)
-    path.close()
-  }
-
-  // The two inner edges of the folded-over corner, at the page's top-right.
-  private fun buildFold(
-    path: Path,
-    r: Float,
-    t: Float,
-    fold: Float,
-  ) {
-    path.rewind()
-    path.moveTo(r - fold, t)
-    path.lineTo(r - fold, t + fold)
-    path.lineTo(r, t + fold)
-  }
-}
+package com.renderrichtext.views
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
+
+/**
+ * Draws the copy glyph so Android matches the SF Symbol doc.on.doc rendered on
+ * iOS: two portrait document pages with a folded (dog-eared) top-right corner,
+ * a front page in the lower-left laid over a back page in the upper-right.
+ *
+ * The back page is punched out where the front page (plus a hairline of
+ * clearance) covers it, so the front reads as sitting on top exactly as the SF
+ * Symbol does, instead of both outlines crossing. The clear is done inside an
+ * offscreen layer so the punched region reveals whatever background the drawable
+ * sits on, without the glyph needing to know that color.
+ *
+ * One instance is held per drawable rather than shared: the paths and clear
+ * paint are reused across draws to keep draw() allocation-free, and two drawables
+ * of different sizes must not share those buffers. All coordinates use a 24-unit
+ * grid scaled to the drawable width, matching the grid the iOS symbol is authored
+ * on.
+ */
+internal class CopyGlyph {
+  private val back = Path()
+  private val front = Path()
+  private val backFold = Path()
+  private val frontFold = Path()
+
+  // Color and colorFilter are irrelevant under PorterDuff.CLEAR; only the
+  // widened stroke (set per draw) matters, so this is configured once.
+  private val clearPaint =
+    Paint(Paint.ANTI_ALIAS_FLAG).apply {
+      style = Paint.Style.FILL_AND_STROKE
+      strokeJoin = Paint.Join.ROUND
+      strokeCap = Paint.Cap.ROUND
+      xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
+    }
+
+  fun draw(
+    canvas: Canvas,
+    width: Float,
+    stroke: Paint,
+  ) {
+    val u = width / 24f
+    val fold = 4f * u
+    val corner = 2f * u
+
+    buildPage(back, 9 * u, 1 * u, 20 * u, 17 * u, fold, corner)
+    buildPage(front, 3 * u, 7 * u, 14 * u, 23 * u, fold, corner)
+    buildFold(backFold, 20 * u, 1 * u, fold)
+    buildFold(frontFold, 14 * u, 7 * u, fold)
+    clearPaint.strokeWidth = stroke.strokeWidth * 3f
+
+    val saved = canvas.saveLayer(0f, 0f, width, width, null)
+    canvas.drawPath(back, stroke)
+    canvas.drawPath(backFold, stroke)
+    canvas.drawPath(front, clearPaint)
+    canvas.drawPath(front, stroke)
+    canvas.drawPath(frontFold, stroke)
+    canvas.restoreToCount(saved)
+  }
+
+  // A page outline whose top-right corner is cut back by fold, with the other
+  // three corners rounded by corner.
+  private fun buildPage(
+    path: Path,
+    l: Float,
+    t: Float,
+    r: Float,
+    b: Float,
+    fold: Float,
+    corner: Float,
+  ) {
+    path.rewind()
+    path.moveTo(l, t + corner)
+    path.quadTo(l, t, l + corner, t)
+    path.lineTo(r - fold, t)
+    path.lineTo(r, t + fold)
+    path.lineTo(r, b - corner)
+    path.quadTo(r, b, r - corner, b)
+    path.lineTo(l + corner, b)
+    path.quadTo(l, b, l, b - corner)
+    path.close()
+  }
+
+  // The two inner edges of the folded-over corner, at the page's top-right.
+  private fun buildFold(
+    path: Path,
+    r: Float,
+    t: Float,
+    fold: Float,
+  ) {
+    path.rewind()
+    path.moveTo(r - fold, t)
+    path.lineTo(r - fold, t + fold)
+    path.lineTo(r, t + fold)
+  }
+}

package/android/src/main/java/com/renderrichtext/views/WrapGlyph.kt

@@ -1,40 +1,40 @@
-package com.renderrichtext.views
-
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Path
-import android.graphics.RectF
-
-/**
- * Material "wrap_text" glyph as strokes on a 24-unit grid, drawn with the same
- * paint as [CopyGlyph] so the two header buttons match in weight.
- */
-internal class WrapGlyph {
-  private val lines = Path()
-  private val arrow = Path()
-  private val loop = RectF()
-
-  fun draw(
-    canvas: Canvas,
-    width: Float,
-    stroke: Paint,
-  ) {
-    val u = width / 24f
-    lines.rewind()
-    lines.moveTo(4 * u, 6 * u)
-    lines.lineTo(20 * u, 6 * u)
-    lines.moveTo(4 * u, 18 * u)
-    lines.lineTo(10 * u, 18 * u)
-    lines.moveTo(4 * u, 12 * u)
-    lines.lineTo(17 * u, 12 * u)
-    loop.set(15 * u, 12 * u, 19 * u, 16 * u)
-    lines.arcTo(loop, -90f, 180f)
-    lines.lineTo(13 * u, 16 * u)
-    arrow.rewind()
-    arrow.moveTo(15 * u, 14 * u)
-    arrow.lineTo(13 * u, 16 * u)
-    arrow.lineTo(15 * u, 18 * u)
-    canvas.drawPath(lines, stroke)
-    canvas.drawPath(arrow, stroke)
-  }
-}
+package com.renderrichtext.views
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.RectF
+
+/**
+ * Material "wrap_text" glyph as strokes on a 24-unit grid, drawn with the same
+ * paint as [CopyGlyph] so the two header buttons match in weight.
+ */
+internal class WrapGlyph {
+  private val lines = Path()
+  private val arrow = Path()
+  private val loop = RectF()
+
+  fun draw(
+    canvas: Canvas,
+    width: Float,
+    stroke: Paint,
+  ) {
+    val u = width / 24f
+    lines.rewind()
+    lines.moveTo(4 * u, 6 * u)
+    lines.lineTo(20 * u, 6 * u)
+    lines.moveTo(4 * u, 18 * u)
+    lines.lineTo(10 * u, 18 * u)
+    lines.moveTo(4 * u, 12 * u)
+    lines.lineTo(17 * u, 12 * u)
+    loop.set(15 * u, 12 * u, 19 * u, 16 * u)
+    lines.arcTo(loop, -90f, 180f)
+    lines.lineTo(13 * u, 16 * u)
+    arrow.rewind()
+    arrow.moveTo(15 * u, 14 * u)
+    arrow.lineTo(13 * u, 16 * u)
+    arrow.lineTo(15 * u, 18 * u)
+    canvas.drawPath(lines, stroke)
+    canvas.drawPath(arrow, stroke)
+  }
+}

package/android/src/main/jni/CMakeLists.txt

@@ -1,52 +1,52 @@
-cmake_minimum_required(VERSION 3.13)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-set(LIB_LITERAL RichTextSpec)
-set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
-
-set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
-set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
-set(CPP_ROOT ${LIB_ANDROID_DIR}/../cpp)
-
-file(GLOB PARSER_SOURCES "${CPP_ROOT}/parser/*.cpp")
-file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS
-  ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp
-  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
-file(GLOB LIB_CUSTOM_JNI_SRCS CONFIGURE_DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
-
-add_library(
-  ${LIB_TARGET_NAME}
-  SHARED
-  ${LIB_CODEGEN_SRCS}
-  ${LIB_CUSTOM_JNI_SRCS}
-  ${PARSER_SOURCES}
-  ${LIB_ANDROID_DIR}/src/main/cpp/jni-adapter.cpp
-)
-
-target_include_directories(
-  ${LIB_TARGET_NAME}
-  PUBLIC
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/react/renderer/components/${LIB_LITERAL}
-  ${LIB_ANDROID_GENERATED_JNI_DIR}
-  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
-  ${CPP_ROOT}/parser
-  ${CPP_ROOT}/vendor
-)
-
-find_package(fbjni REQUIRED CONFIG)
-find_package(ReactAndroid REQUIRED CONFIG)
-find_library(LOG_LIB log)
-
-target_link_libraries(
-  ${LIB_TARGET_NAME}
-  ${LOG_LIB}
-  fbjni::fbjni
-  ReactAndroid::jsi
-  ReactAndroid::reactnative
-)
-
-target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+set(LIB_LITERAL RichTextSpec)
+set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
+
+set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
+set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
+set(CPP_ROOT ${LIB_ANDROID_DIR}/../cpp)
+
+file(GLOB PARSER_SOURCES "${CPP_ROOT}/parser/*.cpp")
+file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS
+  ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp
+  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
+file(GLOB LIB_CUSTOM_JNI_SRCS CONFIGURE_DEPENDS
+  ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
+
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED
+  ${LIB_CODEGEN_SRCS}
+  ${LIB_CUSTOM_JNI_SRCS}
+  ${PARSER_SOURCES}
+  ${LIB_ANDROID_DIR}/src/main/cpp/jni-adapter.cpp
+)
+
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/react/renderer/components/${LIB_LITERAL}
+  ${LIB_ANDROID_GENERATED_JNI_DIR}
+  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
+  ${CPP_ROOT}/parser
+  ${CPP_ROOT}/vendor
+)
+
+find_package(fbjni REQUIRED CONFIG)
+find_package(ReactAndroid REQUIRED CONFIG)
+find_library(LOG_LIB log)
+
+target_link_libraries(
+  ${LIB_TARGET_NAME}
+  ${LOG_LIB}
+  fbjni::fbjni
+  ReactAndroid::jsi
+  ReactAndroid::reactnative
+)
+
+target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)

package/android/src/main/jni/react/renderer/components/RichTextSpec/ComponentDescriptors.h

@@ -1,30 +1,30 @@
-#pragma once
-
-#include "TiptapTextMeasurementManager.h"
-#include "TiptapTextShadowNode.h"
-
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-
-namespace facebook::react {
-
-class EnrichedTiptapTextComponentDescriptor final : public ConcreteComponentDescriptor<TiptapTextShadowNode> {
-public:
-  EnrichedTiptapTextComponentDescriptor(const ComponentDescriptorParameters &parameters)
-      : ConcreteComponentDescriptor(parameters),
-        measurementsManager_(std::make_shared<TiptapTextMeasurementManager>(contextContainer_)) {}
-
-  void adopt(ShadowNode &shadowNode) const override {
-    ConcreteComponentDescriptor::adopt(shadowNode);
-    auto &tiptapTextShadowNode = static_cast<TiptapTextShadowNode &>(shadowNode);
-    tiptapTextShadowNode.setMeasurementsManager(measurementsManager_);
-  }
-
-private:
-  const std::shared_ptr<TiptapTextMeasurementManager> measurementsManager_;
-};
-
-void RichTextSpec_registerComponentDescriptorsFromCodegen(
-    std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
-
-} // namespace facebook::react
+#pragma once
+
+#include "TiptapTextMeasurementManager.h"
+#include "TiptapTextShadowNode.h"
+
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+class EnrichedTiptapTextComponentDescriptor final : public ConcreteComponentDescriptor<TiptapTextShadowNode> {
+public:
+  EnrichedTiptapTextComponentDescriptor(const ComponentDescriptorParameters &parameters)
+      : ConcreteComponentDescriptor(parameters),
+        measurementsManager_(std::make_shared<TiptapTextMeasurementManager>(contextContainer_)) {}
+
+  void adopt(ShadowNode &shadowNode) const override {
+    ConcreteComponentDescriptor::adopt(shadowNode);
+    auto &tiptapTextShadowNode = static_cast<TiptapTextShadowNode &>(shadowNode);
+    tiptapTextShadowNode.setMeasurementsManager(measurementsManager_);
+  }
+
+private:
+  const std::shared_ptr<TiptapTextMeasurementManager> measurementsManager_;
+};
+
+void RichTextSpec_registerComponentDescriptorsFromCodegen(
+    std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
+
+} // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RichTextSpec/TiptapTextComponentDescriptor.h

@@ -1,29 +1,29 @@
-#pragma once
-
-#include "TiptapTextMeasurementManager.h"
-#include "TiptapTextShadowNode.h"
-
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-
-namespace facebook::react {
-
-class TiptapTextComponentDescriptor final : public ConcreteComponentDescriptor<TiptapTextShadowNode> {
-public:
-  TiptapTextComponentDescriptor(const ComponentDescriptorParameters &parameters)
-      : ConcreteComponentDescriptor(parameters),
-        measurementsManager_(std::make_shared<TiptapTextMeasurementManager>(contextContainer_)) {}
-
-  void adopt(ShadowNode &shadowNode) const override {
-    ConcreteComponentDescriptor::adopt(shadowNode);
-    auto &tiptapTextShadowNode = static_cast<TiptapTextShadowNode &>(shadowNode);
-
-    // TiptapTextShadowNode uses TiptapTextMeasurementManager
-    // to provide measurements to Yoga.
-    tiptapTextShadowNode.setMeasurementsManager(measurementsManager_);
-  }
-
-private:
-  const std::shared_ptr<TiptapTextMeasurementManager> measurementsManager_;
-};
-
-} // namespace facebook::react
+#pragma once
+
+#include "TiptapTextMeasurementManager.h"
+#include "TiptapTextShadowNode.h"
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+class TiptapTextComponentDescriptor final : public ConcreteComponentDescriptor<TiptapTextShadowNode> {
+public:
+  TiptapTextComponentDescriptor(const ComponentDescriptorParameters &parameters)
+      : ConcreteComponentDescriptor(parameters),
+        measurementsManager_(std::make_shared<TiptapTextMeasurementManager>(contextContainer_)) {}
+
+  void adopt(ShadowNode &shadowNode) const override {
+    ConcreteComponentDescriptor::adopt(shadowNode);
+    auto &tiptapTextShadowNode = static_cast<TiptapTextShadowNode &>(shadowNode);
+
+    // TiptapTextShadowNode uses TiptapTextMeasurementManager
+    // to provide measurements to Yoga.
+    tiptapTextShadowNode.setMeasurementsManager(measurementsManager_);
+  }
+
+private:
+  const std::shared_ptr<TiptapTextMeasurementManager> measurementsManager_;
+};
+
+} // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RichTextSpec/TiptapTextMeasurementManager.cpp

@@ -1,45 +1,45 @@
-#include "TiptapTextMeasurementManager.h"
-#include "conversions.h"
-
-#include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
-#include <react/renderer/core/conversions.h>
-
-using namespace facebook::jni;
-
-namespace facebook::react {
-
-Size TiptapTextMeasurementManager::measure(SurfaceId surfaceId, int viewTag, const EnrichedTiptapTextProps &props,
-                                             LayoutConstraints layoutConstraints) const {
-  const jni::global_ref<jobject> &fabricUIManager = contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-
-  static const auto measure =
-      facebook::jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-          ->getMethod<jlong(jint, jstring, ReadableMap::javaobject, ReadableMap::javaobject, ReadableMap::javaobject,
-                            jfloat, jfloat, jfloat, jfloat)>("measure");
-
-  auto minimumSize = layoutConstraints.minimumSize;
-  auto maximumSize = layoutConstraints.maximumSize;
-
-  local_ref<JString> componentName = make_jstring("EnrichedTiptapText");
-
-  // Prepare extraData map with viewTag
-  folly::dynamic extraData = folly::dynamic::object();
-  extraData["viewTag"] = viewTag;
-  local_ref<ReadableNativeMap::javaobject> extraDataRNM = ReadableNativeMap::newObjectCxxArgs(extraData);
-  local_ref<ReadableMap::javaobject> extraDataRM =
-      make_local(reinterpret_cast<ReadableMap::javaobject>(extraDataRNM.get()));
-
-  // Prepare layout metrics affecting props
-  auto serializedProps = toDynamic(props);
-  local_ref<ReadableNativeMap::javaobject> propsRNM = ReadableNativeMap::newObjectCxxArgs(serializedProps);
-  local_ref<ReadableMap::javaobject> propsRM = make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
-
-  auto measurement = yogaMeassureToSize(measure(fabricUIManager, surfaceId, componentName.get(), extraDataRM.get(),
-                                                propsRM.get(), nullptr, minimumSize.width, maximumSize.width,
-                                                minimumSize.height, maximumSize.height));
-
-  return measurement;
-}
-
-} // namespace facebook::react
+#include "TiptapTextMeasurementManager.h"
+#include "conversions.h"
+
+#include <fbjni/fbjni.h>
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/core/conversions.h>
+
+using namespace facebook::jni;
+
+namespace facebook::react {
+
+Size TiptapTextMeasurementManager::measure(SurfaceId surfaceId, int viewTag, const EnrichedTiptapTextProps &props,
+                                             LayoutConstraints layoutConstraints) const {
+  const jni::global_ref<jobject> &fabricUIManager = contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+
+  static const auto measure =
+      facebook::jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<jlong(jint, jstring, ReadableMap::javaobject, ReadableMap::javaobject, ReadableMap::javaobject,
+                            jfloat, jfloat, jfloat, jfloat)>("measure");
+
+  auto minimumSize = layoutConstraints.minimumSize;
+  auto maximumSize = layoutConstraints.maximumSize;
+
+  local_ref<JString> componentName = make_jstring("EnrichedTiptapText");
+
+  // Prepare extraData map with viewTag
+  folly::dynamic extraData = folly::dynamic::object();
+  extraData["viewTag"] = viewTag;
+  local_ref<ReadableNativeMap::javaobject> extraDataRNM = ReadableNativeMap::newObjectCxxArgs(extraData);
+  local_ref<ReadableMap::javaobject> extraDataRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(extraDataRNM.get()));
+
+  // Prepare layout metrics affecting props
+  auto serializedProps = toDynamic(props);
+  local_ref<ReadableNativeMap::javaobject> propsRNM = ReadableNativeMap::newObjectCxxArgs(serializedProps);
+  local_ref<ReadableMap::javaobject> propsRM = make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
+
+  auto measurement = yogaMeassureToSize(measure(fabricUIManager, surfaceId, componentName.get(), extraDataRM.get(),
+                                                propsRM.get(), nullptr, minimumSize.width, maximumSize.width,
+                                                minimumSize.height, maximumSize.height));
+
+  return measurement;
+}
+
+} // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RichTextSpec/TiptapTextMeasurementManager.h

@@ -1,21 +1,21 @@
-#pragma once
-
-#include <react/renderer/components/RichTextSpec/Props.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/utils/ContextContainer.h>
-
-namespace facebook::react {
-
-class TiptapTextMeasurementManager {
-public:
-  TiptapTextMeasurementManager(const std::shared_ptr<const ContextContainer> &contextContainer)
-      : contextContainer_(contextContainer) {}
-
-  Size measure(SurfaceId surfaceId, int viewTag, const EnrichedTiptapTextProps &props,
-               LayoutConstraints layoutConstraints) const;
-
-private:
-  const std::shared_ptr<const ContextContainer> contextContainer_;
-};
-
-} // namespace facebook::react
+#pragma once
+
+#include <react/renderer/components/RichTextSpec/Props.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/utils/ContextContainer.h>
+
+namespace facebook::react {
+
+class TiptapTextMeasurementManager {
+public:
+  TiptapTextMeasurementManager(const std::shared_ptr<const ContextContainer> &contextContainer)
+      : contextContainer_(contextContainer) {}
+
+  Size measure(SurfaceId surfaceId, int viewTag, const EnrichedTiptapTextProps &props,
+               LayoutConstraints layoutConstraints) const;
+
+private:
+  const std::shared_ptr<const ContextContainer> contextContainer_;
+};
+
+} // namespace facebook::react