@domir/react-native-measure-text 0.1.8 → 0.1.10

package/android/build.gradle

@@ -1,29 +1,44 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+
+// Expo's Gradle helpers. This has to run after `com.android.library` and outside the
+// `buildscript {}` block (which Gradle evaluates before line 1): since Expo SDK 50 the
+// helper tries to apply `kotlin-android` itself, and applying the Kotlin plugin before
+// AGP breaks AGP 9's built-in Kotlin support.
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+if (expoModulesCorePlugin.exists()) {
+  apply from: expoModulesCorePlugin
+  applyKotlinExpoModulesCorePlugin()
+}
+
+// AGP 9 ships built-in Kotlin support and registers the `kotlin` extension
+// itself. Applying the Kotlin plugin on top of it fails configuration with
+// "Cannot add extension with name 'kotlin'". Only apply it when nothing has
+// registered that extension yet.
+if (project.extensions.findByName('kotlin') == null) {
+  apply plugin: 'kotlin-android'
+}
+
 apply plugin: 'maven-publish'
 
 group = 'expo.modules.measuretext'
 version = '0.1.0'
 
 buildscript {
-  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-  if (expoModulesCorePlugin.exists()) {
-    apply from: expoModulesCorePlugin
-    applyKotlinExpoModulesCorePlugin()
-  }
-
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
-  // Ensures backward compatibility
+  // Kotlin version. Expo's helper (applied above, but only after this block has already
+  // run) defines `ext.kotlinVersion` as a closure; a `kotlinVersion` Gradle property
+  // (-P or gradle.properties) shows up here as a plain string. Accept both and fall
+  // back to the root project's `ext.kotlinVersion`.
   ext.getKotlinVersion = {
-    if (ext.has("kotlinVersion")) {
-      ext.kotlinVersion()
-    } else {
-      ext.safeExtGet("kotlinVersion", "1.6.10")
+    def kotlinVersion = ext.has("kotlinVersion") ? ext.get("kotlinVersion") : null
+    if (kotlinVersion instanceof Closure) {
+      kotlinVersion = kotlinVersion()
     }
+    kotlinVersion ?: ext.safeExtGet("kotlinVersion", "1.6.10")
   }
 
   repositories {

package/android/src/main/java/expo/modules/measuretext/ReactNativeMeasureTextModule.kt

@@ -41,7 +41,7 @@ class ReactNativeMeasureTextModule : Module() {
     val paint = TextPaint(TextPaint.ANTI_ALIAS_FLAG);
     val fontScale = appContext.reactContext?.resources?.configuration?.fontScale ?: 1.0f;
     val allowScaledFont = allowFontScaling ?: true;
-    val usedFontSize = (fontSize ?: 0) * fontScale;
+    val usedFontSize = (fontSize ?: 0) * if (allowScaledFont) fontScale else 1.0f;
     paint.textSize = usedFontSize;
     val letterSpacingPixels = if (allowScaledFont)  PixelUtil.toPixelFromSP(letterSpacing ?: 0f) else PixelUtil.toPixelFromDIP(letterSpacing ?: 0f);
     val mFontSize = if (allowScaledFont) Math.ceil(PixelUtil.toPixelFromSP(usedFontSize).toDouble()).toInt() else Math.ceil(PixelUtil.toPixelFromDIP(usedFontSize).toDouble()).toInt();

package/build/ReactNativeMeasureText.d.ts

@@ -2,5 +2,7 @@ export declare function measureWidth(text: string, style?: {
     fontSize?: number;
     fontFamily?: string;
     fontWeight?: string;
+    letterSpacing?: number;
+    allowFontScaling?: boolean;
 }): number;
 //# sourceMappingURL=ReactNativeMeasureText.d.ts.map

package/build/ReactNativeMeasureText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeMeasureText.d.ts","sourceRoot":"","sources":["../src/ReactNativeMeasureText.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1E,MAAM,CAER"}
+{"version":3,"file":"ReactNativeMeasureText.d.ts","sourceRoot":"","sources":["../src/ReactNativeMeasureText.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9H,MAAM,CAER"}

package/build/ReactNativeMeasureText.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeMeasureText.js","sourceRoot":"","sources":["../src/ReactNativeMeasureText.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,MAAM,gCAAgC,CAAC;AAEpE,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,QAAyE,EAAE;IAE3E,OAAO,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC1D,CAAC","sourcesContent":["import ReactNativeMeasureText from \"./ReactNativeMeasureTextModule\";\n\nexport function measureWidth(\n  text: string,\n  style: { fontSize?: number; fontFamily?: string; fontWeight?: string } = {}\n): number {\n  return ReactNativeMeasureText.measureWidth(text, style);\n}\n"]}
+{"version":3,"file":"ReactNativeMeasureText.js","sourceRoot":"","sources":["../src/ReactNativeMeasureText.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,MAAM,gCAAgC,CAAC;AAEpE,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,QAA6H,EAAE;IAE/H,OAAO,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC1D,CAAC","sourcesContent":["import ReactNativeMeasureText from \"./ReactNativeMeasureTextModule\";\n\nexport function measureWidth(\n  text: string,\n  style: { fontSize?: number; fontFamily?: string; fontWeight?: string, letterSpacing?: number, allowFontScaling?: boolean } = {}\n): number {\n  return ReactNativeMeasureText.measureWidth(text, style);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domir/react-native-measure-text",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Measure text width synchronously using JSI",
   "main": "build/ReactNativeMeasureText.js",
   "types": "build/ReactNativeMeasureText.d.ts",