@react-navigation/native 8.0.0-alpha.16 → 8.0.0-alpha.17

package/android/src/main/java/org/reactnavigation/MaterialSymbolModule.kt

@@ -1,5 +1,6 @@
 package org.reactnavigation
 
+import android.net.Uri
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -15,6 +16,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import java.io.File
 import java.io.FileOutputStream
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.roundToInt
 
 class MaterialSymbolModule(reactContext: ReactApplicationContext) :
@@ -24,6 +26,7 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
     const val NAME = NativeMaterialSymbolModuleSpec.NAME
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val cleanedCacheDirs = ConcurrentHashMap.newKeySet<String>()
   }
 
   private val fontHash: String by lazy {
@@ -42,8 +45,9 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       }
     }
 
-    val resolvedColor = ColorPropConverter.getColor(colorValue, reactApplicationContext)
-      ?: throw IllegalArgumentException("Could not resolve color")
+    val resolvedColor = ColorPropConverter.getColor(
+      colorValue, currentActivity ?: reactApplicationContext
+    ) ?: throw IllegalArgumentException("Could not resolve color")
 
     val density = reactApplicationContext.resources.displayMetrics.density
     val scaledSize = (size * density).roundToInt().coerceAtLeast(1)
@@ -57,16 +61,23 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       "react_navigation/material_symbols/$typefaceSuffix/$fontHash"
     )
 
-    val cacheKey = "${name.hashCode()}_${scaledSize}_$resolvedColor"
-    val cacheFile = File(cacheDir, "$cacheKey.png")
+    val cacheFile = File(
+      cacheDir, "${Uri.encode(name)}_${scaledSize}_$resolvedColor.png"
+    )
+
+    val cacheUri = cacheFile.toUri().toString()
 
     if (cacheFile.exists()) {
-      return cacheFile.toUri().toString()
+      return cacheUri
     }
 
-    scope.launch {
-      cacheDir.parentFile?.listFiles { it.isDirectory && it.name != fontHash }
-        ?.forEach { it.deleteRecursively() }
+    val cacheParent = cacheDir.parentFile
+
+    if (cacheParent != null && cleanedCacheDirs.add(cacheParent.absolutePath)) {
+      scope.launch {
+        cacheParent.listFiles { it.isDirectory && it.name != fontHash }
+          ?.forEach { it.deleteRecursively() }
+      }
     }
 
     cacheDir.mkdirs()
@@ -95,6 +106,6 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       bitmap.recycle()
     }
 
-    return cacheFile.toUri().toString()
+    return cacheUri
   }
 }

package/android/src/main/java/org/reactnavigation/MaterialSymbolTypeface.kt

@@ -2,11 +2,12 @@ package org.reactnavigation
 
 import android.content.Context
 import android.graphics.Typeface
+import java.util.concurrent.ConcurrentHashMap
 
 data class MaterialSymbolTypefaceResult(val typeface: Typeface, val suffix: String)
 
 object MaterialSymbolTypeface {
-  private val typefaces = mutableMapOf<String, Typeface>()
+  private val typefaces = ConcurrentHashMap<String, Typeface>()
   private var availableFonts: Map<String, Set<Int>>? = null
 
   fun get(context: Context, variant: String?, weight: Int?): MaterialSymbolTypefaceResult {

package/lib/module/native/MaterialSymbol.android.js

@@ -5,7 +5,6 @@ import { FONT_WEIGHTS } from "./constants.js";
 import MaterialSymbolViewNativeComponent from './MaterialSymbolViewNativeComponent';
 import NativeMaterialSymbolModule from "./NativeMaterialSymbolModule.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-const imageSourceCache = new Map();
 export function MaterialSymbol({
   name,
   weight,
@@ -37,22 +36,15 @@ MaterialSymbol.getImageSource = ({
   if (processedColor == null) {
     throw new Error(`Invalid color value: ${String(color)}`);
   }
-  const scale = PixelRatio.get();
-  const cacheKey = `${name}:${variant}:${weight}:${size}:${scale}:${JSON.stringify(processedColor)}`;
-  const cached = imageSourceCache.get(cacheKey);
-  if (cached !== undefined) {
-    return cached;
-  }
   const uri = NativeMaterialSymbolModule.getImageSource(name, variant, typeof weight === 'string' ? FONT_WEIGHTS[weight] : weight, size, {
     value: processedColor
   });
   const source = {
     uri,
-    scale,
+    scale: PixelRatio.get(),
     width: size,
     height: size
   };
-  imageSourceCache.set(cacheKey, source);
   return source;
 };
 //# sourceMappingURL=MaterialSymbol.android.js.map

package/lib/module/native/MaterialSymbol.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["PixelRatio","processColor","FONT_WEIGHTS","MaterialSymbolViewNativeComponent","NativeMaterialSymbolModule","jsx","_jsx","imageSourceCache","Map","MaterialSymbol","name","weight","size","color","style","rest","width","height","getImageSource","variant","processedColor","Error","String","scale","get","cacheKey","JSON","stringify","cached","undefined","uri","value","source","set"],"sourceRoot":"../../../src","sources":["native/MaterialSymbol.android.tsx"],"mappings":";;AAAA,SAEEA,UAAU,EACVC,YAAY,QAEP,cAAc;AAErB,SAASC,YAAY,QAAQ,gBAAa;AAC1C,OAAOC,iCAAiC,MAAM,qCAAqC;AACnF,OAAOC,0BAA0B,MAAM,iCAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAKtE,MAAMC,gBAAgB,GAAG,IAAIC,GAAG,CAA8B,CAAC;AAE/D,OAAO,SAASC,cAAcA,CAAC;EAC7BC,IAAI;EACJC,MAAM;EACNC,IAAI,GAAG,EAAE;EACTC,KAAK;EACLC,KAAK;EACL,GAAGC;AACgB,CAAC,EAAsB;EAC1C,oBACET,IAAA,CAACH,iCAAiC;IAChCO,IAAI,EAAEA,IAAK;IACXC,MAAM,EAAE,OAAOA,MAAM,KAAK,QAAQ,GAAGT,YAAY,CAACS,MAAM,CAAC,GAAIA,MAAM,IAAI,CAAG;IAC1EC,IAAI,EAAEA,IAAK;IACXC,KAAK,EAAEA,KAAM;IACbC,KAAK,EAAE,CACL;MACEE,KAAK,EAAEJ,IAAI;MACXK,MAAM,EAAEL;IACV,CAAC,EACDE,KAAK,CACL;IAAA,GACEC;EAAI,CACT,CAAC;AAEN;AAEAN,cAAc,CAACS,cAAc,GAAG,CAAC;EAC/BR,IAAI;EACJS,OAAO;EACPR,MAAM;EACNC,IAAI,GAAG,EAAE;EACTC,KAAK,GAAG;AACa,CAAC,KAA0B;EAChD,MAAMO,cAAc,GAAGnB,YAAY,CAACY,KAAK,CAAC;EAE1C,IAAIO,cAAc,IAAI,IAAI,EAAE;IAC1B,MAAM,IAAIC,KAAK,CAAC,wBAAwBC,MAAM,CAACT,KAAK,CAAC,EAAE,CAAC;EAC1D;EAEA,MAAMU,KAAK,GAAGvB,UAAU,CAACwB,GAAG,CAAC,CAAC;EAE9B,MAAMC,QAAQ,GAAG,GAAGf,IAAI,IAAIS,OAAO,IAAIR,MAAM,IAAIC,IAAI,IAAIW,KAAK,IAAIG,IAAI,CAACC,SAAS,CAACP,cAAc,CAAC,EAAE;EAClG,MAAMQ,MAAM,GAAGrB,gBAAgB,CAACiB,GAAG,CAACC,QAAQ,CAAC;EAE7C,IAAIG,MAAM,KAAKC,SAAS,EAAE;IACxB,OAAOD,MAAM;EACf;EAEA,MAAME,GAAG,GAAG1B,0BAA0B,CAACc,cAAc,CACnDR,IAAI,EACJS,OAAO,EACP,OAAOR,MAAM,KAAK,QAAQ,GAAGT,YAAY,CAACS,MAAM,CAAC,GAAGA,MAAM,EAC1DC,IAAI,EACJ;IAAEmB,KAAK,EAAEX;EAAe,CAC1B,CAAC;EAED,MAAMY,MAA2B,GAAG;IAClCF,GAAG;IACHP,KAAK;IACLP,KAAK,EAAEJ,IAAI;IACXK,MAAM,EAAEL;EACV,CAAC;EAEDL,gBAAgB,CAAC0B,GAAG,CAACR,QAAQ,EAAEO,MAAM,CAAC;EAEtC,OAAOA,MAAM;AACf,CAAC","ignoreList":[]}
+{"version":3,"names":["PixelRatio","processColor","FONT_WEIGHTS","MaterialSymbolViewNativeComponent","NativeMaterialSymbolModule","jsx","_jsx","MaterialSymbol","name","weight","size","color","style","rest","width","height","getImageSource","variant","processedColor","Error","String","uri","value","source","scale","get"],"sourceRoot":"../../../src","sources":["native/MaterialSymbol.android.tsx"],"mappings":";;AAAA,SAEEA,UAAU,EACVC,YAAY,QAEP,cAAc;AAErB,SAASC,YAAY,QAAQ,gBAAa;AAC1C,OAAOC,iCAAiC,MAAM,qCAAqC;AACnF,OAAOC,0BAA0B,MAAM,iCAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAKtE,OAAO,SAASC,cAAcA,CAAC;EAC7BC,IAAI;EACJC,MAAM;EACNC,IAAI,GAAG,EAAE;EACTC,KAAK;EACLC,KAAK;EACL,GAAGC;AACgB,CAAC,EAAsB;EAC1C,oBACEP,IAAA,CAACH,iCAAiC;IAChCK,IAAI,EAAEA,IAAK;IACXC,MAAM,EAAE,OAAOA,MAAM,KAAK,QAAQ,GAAGP,YAAY,CAACO,MAAM,CAAC,GAAIA,MAAM,IAAI,CAAG;IAC1EC,IAAI,EAAEA,IAAK;IACXC,KAAK,EAAEA,KAAM;IACbC,KAAK,EAAE,CACL;MACEE,KAAK,EAAEJ,IAAI;MACXK,MAAM,EAAEL;IACV,CAAC,EACDE,KAAK,CACL;IAAA,GACEC;EAAI,CACT,CAAC;AAEN;AAEAN,cAAc,CAACS,cAAc,GAAG,CAAC;EAC/BR,IAAI;EACJS,OAAO;EACPR,MAAM;EACNC,IAAI,GAAG,EAAE;EACTC,KAAK,GAAG;AACa,CAAC,KAA0B;EAChD,MAAMO,cAAc,GAAGjB,YAAY,CAACU,KAAK,CAAC;EAE1C,IAAIO,cAAc,IAAI,IAAI,EAAE;IAC1B,MAAM,IAAIC,KAAK,CAAC,wBAAwBC,MAAM,CAACT,KAAK,CAAC,EAAE,CAAC;EAC1D;EAEA,MAAMU,GAAG,GAAGjB,0BAA0B,CAACY,cAAc,CACnDR,IAAI,EACJS,OAAO,EACP,OAAOR,MAAM,KAAK,QAAQ,GAAGP,YAAY,CAACO,MAAM,CAAC,GAAGA,MAAM,EAC1DC,IAAI,EACJ;IAAEY,KAAK,EAAEJ;EAAe,CAC1B,CAAC;EAED,MAAMK,MAA2B,GAAG;IAClCF,GAAG;IACHG,KAAK,EAAExB,UAAU,CAACyB,GAAG,CAAC,CAAC;IACvBX,KAAK,EAAEJ,IAAI;IACXK,MAAM,EAAEL;EACV,CAAC;EAED,OAAOa,MAAM;AACf,CAAC","ignoreList":[]}

package/lib/typescript/src/native/MaterialSymbol.android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MaterialSymbol.android.d.ts","sourceRoot":"","sources":["../../../../src/native/MaterialSymbol.android.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EAGxB,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAKtB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,GAAG,SAAS,CAAC;AAIpE,wBAAgB,cAAc,CAAC,EAC7B,IAAI,EACJ,MAAM,EACN,IAAS,EACT,KAAK,EACL,KAAK,EACL,GAAG,IAAI,EACR,EAAE,mBAAmB,GAAG,KAAK,CAAC,YAAY,CAiB1C;yBAxBe,cAAc;kEAgC3B,qBAAqB,KAAG,mBAAmB"}
+{"version":3,"file":"MaterialSymbol.android.d.ts","sourceRoot":"","sources":["../../../../src/native/MaterialSymbol.android.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EAGxB,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAKtB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,GAAG,SAAS,CAAC;AAEpE,wBAAgB,cAAc,CAAC,EAC7B,IAAI,EACJ,MAAM,EACN,IAAS,EACT,KAAK,EACL,KAAK,EACL,GAAG,IAAI,EACR,EAAE,mBAAmB,GAAG,KAAK,CAAC,YAAY,CAiB1C;yBAxBe,cAAc;kEAgC3B,qBAAqB,KAAG,mBAAmB"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/native",
   "description": "React Native integration for React Navigation",
-  "version": "8.0.0-alpha.16",
+  "version": "8.0.0-alpha.17",
   "keywords": [
     "react-native",
     "react-navigation",
@@ -57,7 +57,7 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/core": "^8.0.0-alpha.8",
+    "@react-navigation/core": "^8.0.0-alpha.9",
     "escape-string-regexp": "^4.0.0",
     "fast-deep-equal": "^3.1.3",
     "nanoid": "^3.3.11",
@@ -75,7 +75,7 @@
     "react-native": "0.83.2",
     "react-native-builder-bob": "^0.40.12",
     "react-test-renderer": "19.2.0",
-    "typescript": "^5.9.2"
+    "typescript": "^6.0.2"
   },
   "peerDependencies": {
     "react": ">= 19.2.0",
@@ -121,5 +121,5 @@
       }
     }
   },
-  "gitHead": "ad19d4f8a1197038efa52c70416bcb369e370daf"
+  "gitHead": "2e3c1f2571a3fdfcb47245e963633cd34a42ccff"
 }

package/src/native/MaterialSymbol.android.tsx

@@ -12,8 +12,6 @@ import type { MaterialSymbolOptions } from './types';
 
 export type MaterialSymbolProps = MaterialSymbolOptions & ViewProps;
 
-const imageSourceCache = new Map<string, ImageSourcePropType>();
-
 export function MaterialSymbol({
   name,
   weight,
@@ -53,15 +51,6 @@ MaterialSymbol.getImageSource = ({
     throw new Error(`Invalid color value: ${String(color)}`);
   }
 
-  const scale = PixelRatio.get();
-
-  const cacheKey = `${name}:${variant}:${weight}:${size}:${scale}:${JSON.stringify(processedColor)}`;
-  const cached = imageSourceCache.get(cacheKey);
-
-  if (cached !== undefined) {
-    return cached;
-  }
-
   const uri = NativeMaterialSymbolModule.getImageSource(
     name,
     variant,
@@ -72,12 +61,10 @@ MaterialSymbol.getImageSource = ({
 
   const source: ImageSourcePropType = {
     uri,
-    scale,
+    scale: PixelRatio.get(),
     width: size,
     height: size,
   };
 
-  imageSourceCache.set(cacheKey, source);
-
   return source;
 };