@openeditor/react-native-prose-editor 0.0.7 → 0.0.9

package/android/build.gradle

@@ -62,8 +62,43 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.robolectric:robolectric:4.14.1"
+    // JVM unit tests execute UniFFI through JNA on the host. The Android AAR
+    // above only contains device .so files, so Robolectric also needs JNA's
+    // host JAR (including the macOS native dispatcher).
+    testRuntimeOnly "net.java.dev.jna:jna:5.18.1@jar"
 
     androidTestImplementation "androidx.test:core-ktx:1.6.1"
     androidTestImplementation "androidx.test:runner:1.6.2"
     androidTestImplementation "androidx.test.ext:junit:1.2.1"
 }
+
+// Android's Gradle artifact transform strips the desktop dispatch library from
+// JNA's JAR. Restore that host-only resource for Robolectric/UniFFI tests.
+def hostJnaRuntime = configurations.detachedConfiguration(
+    dependencies.create("net.java.dev.jna:jna:5.18.1@jar")
+)
+def buildHostEditorCore = tasks.register("buildHostEditorCore", Exec) {
+    workingDir file("../rust/editor-core")
+    commandLine "cargo", "build", "--release"
+}
+tasks.withType(org.gradle.api.tasks.testing.Test).configureEach { test ->
+    def osName = System.getProperty("os.name").toLowerCase(Locale.ROOT)
+    def architecture = System.getProperty("os.arch").toLowerCase(Locale.ROOT)
+    def jnaPlatform = osName.contains("mac")
+        ? (architecture.contains("aarch64") || architecture.contains("arm64") ? "darwin-aarch64" : "darwin-x86-64")
+        : (architecture.contains("aarch64") || architecture.contains("arm64") ? "linux-aarch64" : "linux-x86-64")
+    def hostLibraryDir = layout.buildDirectory.dir("jna-host/${jnaPlatform}")
+
+    systemProperty "jna.boot.library.path", hostLibraryDir.get().asFile.absolutePath
+    systemProperty "jna.library.path", file("../rust/editor-core/target/release").absolutePath
+    dependsOn buildHostEditorCore
+    doFirst {
+        copy {
+            from zipTree(hostJnaRuntime.singleFile)
+            include "com/sun/jna/${jnaPlatform}/*"
+            eachFile { details -> details.path = details.name }
+            includeEmptyDirs = false
+            into hostLibraryDir
+        }
+    }
+}

package/android/src/main/java/com/apollohg/editor/CaretGeometry.kt

@@ -8,8 +8,8 @@ import android.text.Layout
  *
  * Android's [android.widget.Editor] draws the native caret from
  * `Layout.getLineTop(line)` to `Layout.getLineBottom(line)`. When a
- * [ParagraphSpacerSpan] inflates a line's descent to create inter-block
- * spacing, `getLineBottom` includes that gap and the caret stretches into it.
+ * line-height span inflates a line's descent, `getLineBottom` includes that
+ * extra space and the caret stretches into it.
  * `getLineBottomWithoutSpacing` cannot help: the inflation lives in the line's
  * DESCENT column, not the line-spacing EXTRA column it subtracts.
  *