@react-navigation/native 8.0.0-alpha.13 → 8.0.0-alpha.14

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

@@ -7,21 +7,25 @@ data class MaterialSymbolTypefaceResult(val typeface: Typeface, val suffix: Stri
 
 object MaterialSymbolTypeface {
   private val typefaces = mutableMapOf<String, Typeface>()
-  private var defaultSuffix: String? = null
+  private var availableFonts: Map<String, Set<Int>>? = null
 
   fun get(context: Context, variant: String?, weight: Int?): MaterialSymbolTypefaceResult {
-    val suffix = if (variant != null && weight != null) {
-      val resolvedVariant = when (variant) {
+    val fonts = getAvailableFonts(context)
+
+    val resolvedVariant = if (variant != null) {
+      when (variant) {
         "rounded" -> "Rounded"
         "sharp" -> "Sharp"
         else -> "Outlined"
       }
-
-      "${resolvedVariant}_$weight"
     } else {
-      getDefaultSuffix(context)
+      resolveDefaultVariant(fonts)
     }
 
+    val resolvedWeight = weight ?: resolveDefaultWeight(fonts, resolvedVariant)
+
+    val suffix = "${resolvedVariant}_$resolvedWeight"
+
     val typeface = typefaces.getOrPut(suffix) {
       val path = "fonts/MaterialSymbols${suffix}.ttf"
 
@@ -35,43 +39,64 @@ object MaterialSymbolTypeface {
     return MaterialSymbolTypefaceResult(typeface, suffix)
   }
 
-  private fun getDefaultSuffix(context: Context): String {
-    defaultSuffix?.let { return it }
+  private fun getAvailableFonts(context: Context): Map<String, Set<Int>> {
+    availableFonts?.let { return it }
 
-    val fonts = context.assets.list("fonts")
+    val files = context.assets.list("fonts")
       ?.filter { it.startsWith("MaterialSymbols") && it.endsWith(".ttf") } ?: emptyList()
 
-    if (fonts.isEmpty()) {
+    if (files.isEmpty()) {
       throw RuntimeException("No MaterialSymbols font found in assets.")
     }
 
-    if (fonts.size > 1) {
-      val outlinedFonts = fonts.filter { it.startsWith("MaterialSymbolsOutlined") }
-      val outlinedFont = when {
-        outlinedFonts.isEmpty() -> null
-        outlinedFonts.size == 1 -> outlinedFonts[0]
-        else -> outlinedFonts.firstOrNull {
-          it.removePrefix("MaterialSymbols").removeSuffix(".ttf") == "Outlined_400"
-        }
-      }
+    val fonts = mutableMapOf<String, MutableSet<Int>>()
 
-      if (outlinedFont == null) {
-        throw RuntimeException(
-          "Multiple MaterialSymbols fonts found in assets: ${fonts.joinToString()}. " + "Please specify a variant and weight explicitly."
-        )
-      }
+    for (file in files) {
+      val suffix = file.removePrefix("MaterialSymbols").removeSuffix(".ttf")
+      val variant = suffix.substringBefore("_")
+      val weight = suffix.substringAfter("_").toIntOrNull() ?: continue
+
+      fonts.getOrPut(variant) { mutableSetOf() }.add(weight)
+    }
 
-      val outlinedSuffix = outlinedFont.removePrefix("MaterialSymbols").removeSuffix(".ttf")
+    availableFonts = fonts
+
+    return fonts
+  }
 
-      defaultSuffix = outlinedSuffix
+  private fun resolveDefaultVariant(fonts: Map<String, Set<Int>>): String {
+    val variants = fonts.keys
 
-      return outlinedSuffix
+    if (variants.size == 1) {
+      return variants.first()
     }
 
-    val suffix = fonts[0].removePrefix("MaterialSymbols").removeSuffix(".ttf")
+    if (variants.contains("Outlined")) {
+      return "Outlined"
+    }
+
+    throw RuntimeException(
+      "Multiple MaterialSymbols variants found: ${variants.joinToString()}. " + "Please specify a variant explicitly."
+    )
+  }
 
-    defaultSuffix = suffix
+  private fun resolveDefaultWeight(fonts: Map<String, Set<Int>>, variant: String): Int {
+    val weights = fonts[variant]
+
+    if (weights.isNullOrEmpty()) {
+      throw RuntimeException("No MaterialSymbols font found for variant: $variant")
+    }
+
+    if (weights.size == 1) {
+      return weights.first()
+    }
+
+    if (weights.contains(400)) {
+      return 400
+    }
 
-    return suffix
+    throw RuntimeException(
+      "Multiple MaterialSymbols weights found for variant $variant: ${weights.joinToString()}. " + "Please specify a weight explicitly."
+    )
   }
 }

package/lib/module/native/CornerInset.ios.js

@@ -26,6 +26,7 @@ function CornerInsetIOS(props, ref) {
     // This is to avoid the insets getting out of sync during transitions
     // We trigger a relayout explicitly on window resize and transition end
     const unsubscribeWindowResize = Dimensions.addEventListener('change', () => {
+      relayout();
       if (animationFrameHandle) {
         cancelAnimationFrame(animationFrameHandle);
       }
@@ -33,7 +34,9 @@ function CornerInsetIOS(props, ref) {
       // When window is unmaximized, calling relayout immediately doesn't work
       // So we delay it to the next frame as a workaround
       animationFrameHandle = requestAnimationFrame(() => {
-        relayout();
+        animationFrameHandle = requestAnimationFrame(() => {
+          relayout();
+        });
       });
     });
     const unsubscribeTransition = root.addListener('__unsafe_event__', e => {

package/lib/module/native/CornerInset.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["NavigationContainerRefContext","React","Dimensions","ReactNavigationCornerInsetViewNativeComponent","Commands","jsx","_jsx","CornerInsetIOS","props","ref","root","use","nativeRef","useRef","relayout","useCallback","current","useEffect","animationFrameHandle","unsubscribeWindowResize","addEventListener","cancelAnimationFrame","requestAnimationFrame","unsubscribeTransition","addListener","e","data","type","remove","useImperativeHandle","CornerInset","forwardRef"],"sourceRoot":"../../../src","sources":["native/CornerInset.ios.tsx"],"mappings":";;AAAA,SAASA,6BAA6B,QAAQ,wBAAwB;AACtE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,QAAQ,cAAc;;AAEzC;;AAEA,OAAOC,6CAA6C,IAClDC,QAAQ,QACH,iDAAiD;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEzD,SAASC,cAAcA,CACrBC,KAAuB,EACvBC,GAA8B,EAC9B;EACA,MAAMC,IAAI,GAAGT,KAAK,CAACU,GAAG,CAACX,6BAA6B,CAAC;EAErD,MAAMY,SAAS,GACbX,KAAK,CAACY,MAAM,CAEV,IAAI,CAAC;EAET,MAAMC,QAAQ,GAAGb,KAAK,CAACc,WAAW,CAAC,MAAM;IACvC,IAAIH,SAAS,CAACI,OAAO,EAAE;MACrBZ,QAAQ,CAACU,QAAQ,CAACF,SAAS,CAACI,OAAO,CAAC;IACtC;EACF,CAAC,EAAE,EAAE,CAAC;EAENf,KAAK,CAACgB,SAAS,CAAC,MAAM;IACpB,IAAIP,IAAI,IAAI,IAAI,EAAE;MAChB;IACF;IAEA,IAAIQ,oBAAmC,GAAG,IAAI;;IAE9C;IACA;IACA;IACA,MAAMC,uBAAuB,GAAGjB,UAAU,CAACkB,gBAAgB,CACzD,QAAQ,EACR,MAAM;MACJ,IAAIF,oBAAoB,EAAE;QACxBG,oBAAoB,CAACH,oBAAoB,CAAC;MAC5C;;MAEA;MACA;MACAA,oBAAoB,GAAGI,qBAAqB,CAAC,MAAM;QACjDR,QAAQ,CAAC,CAAC;MACZ,CAAC,CAAC;IACJ,CACF,CAAC;IAED,MAAMS,qBAAqB,GAAGb,IAAI,CAACc,WAAW,CAAC,kBAAkB,EAAGC,CAAC,IAAK;MACxE,IAAIA,CAAC,CAACC,IAAI,CAACC,IAAI,KAAK,eAAe,EAAE;QACnCb,QAAQ,CAAC,CAAC;MACZ;IACF,CAAC,CAAC;IAEF,OAAO,MAAM;MACX,IAAII,oBAAoB,EAAE;QACxBG,oBAAoB,CAACH,oBAAoB,CAAC;MAC5C;MAEAC,uBAAuB,CAACS,MAAM,CAAC,CAAC;MAChCL,qBAAqB,CAAC,CAAC;IACzB,CAAC;EACH,CAAC,EAAE,CAACb,IAAI,EAAEI,QAAQ,CAAC,CAAC;EAEpBb,KAAK,CAAC4B,mBAAmB,CACvBpB,GAAG,EACH,OAAO;IACLK;EACF,CAAC,CAAC,EACF,CAACA,QAAQ,CACX,CAAC;EAED,oBACER,IAAA,CAACH,6CAA6C;IAAA,GAAKK,KAAK;IAAEC,GAAG,EAAEG;EAAU,CAAE,CAAC;AAEhF;AAEA,OAAO,MAAMkB,WAAW,gBAAG7B,KAAK,CAAC8B,UAAU,CAACxB,cAAc,CAAC","ignoreList":[]}
+{"version":3,"names":["NavigationContainerRefContext","React","Dimensions","ReactNavigationCornerInsetViewNativeComponent","Commands","jsx","_jsx","CornerInsetIOS","props","ref","root","use","nativeRef","useRef","relayout","useCallback","current","useEffect","animationFrameHandle","unsubscribeWindowResize","addEventListener","cancelAnimationFrame","requestAnimationFrame","unsubscribeTransition","addListener","e","data","type","remove","useImperativeHandle","CornerInset","forwardRef"],"sourceRoot":"../../../src","sources":["native/CornerInset.ios.tsx"],"mappings":";;AAAA,SAASA,6BAA6B,QAAQ,wBAAwB;AACtE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,QAAQ,cAAc;;AAEzC;;AAEA,OAAOC,6CAA6C,IAClDC,QAAQ,QACH,iDAAiD;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEzD,SAASC,cAAcA,CACrBC,KAAuB,EACvBC,GAA8B,EAC9B;EACA,MAAMC,IAAI,GAAGT,KAAK,CAACU,GAAG,CAACX,6BAA6B,CAAC;EAErD,MAAMY,SAAS,GACbX,KAAK,CAACY,MAAM,CAEV,IAAI,CAAC;EAET,MAAMC,QAAQ,GAAGb,KAAK,CAACc,WAAW,CAAC,MAAM;IACvC,IAAIH,SAAS,CAACI,OAAO,EAAE;MACrBZ,QAAQ,CAACU,QAAQ,CAACF,SAAS,CAACI,OAAO,CAAC;IACtC;EACF,CAAC,EAAE,EAAE,CAAC;EAENf,KAAK,CAACgB,SAAS,CAAC,MAAM;IACpB,IAAIP,IAAI,IAAI,IAAI,EAAE;MAChB;IACF;IAEA,IAAIQ,oBAAmC,GAAG,IAAI;;IAE9C;IACA;IACA;IACA,MAAMC,uBAAuB,GAAGjB,UAAU,CAACkB,gBAAgB,CACzD,QAAQ,EACR,MAAM;MACJN,QAAQ,CAAC,CAAC;MAEV,IAAII,oBAAoB,EAAE;QACxBG,oBAAoB,CAACH,oBAAoB,CAAC;MAC5C;;MAEA;MACA;MACAA,oBAAoB,GAAGI,qBAAqB,CAAC,MAAM;QACjDJ,oBAAoB,GAAGI,qBAAqB,CAAC,MAAM;UACjDR,QAAQ,CAAC,CAAC;QACZ,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CACF,CAAC;IAED,MAAMS,qBAAqB,GAAGb,IAAI,CAACc,WAAW,CAAC,kBAAkB,EAAGC,CAAC,IAAK;MACxE,IAAIA,CAAC,CAACC,IAAI,CAACC,IAAI,KAAK,eAAe,EAAE;QACnCb,QAAQ,CAAC,CAAC;MACZ;IACF,CAAC,CAAC;IAEF,OAAO,MAAM;MACX,IAAII,oBAAoB,EAAE;QACxBG,oBAAoB,CAACH,oBAAoB,CAAC;MAC5C;MAEAC,uBAAuB,CAACS,MAAM,CAAC,CAAC;MAChCL,qBAAqB,CAAC,CAAC;IACzB,CAAC;EACH,CAAC,EAAE,CAACb,IAAI,EAAEI,QAAQ,CAAC,CAAC;EAEpBb,KAAK,CAAC4B,mBAAmB,CACvBpB,GAAG,EACH,OAAO;IACLK;EACF,CAAC,CAAC,EACF,CAACA,QAAQ,CACX,CAAC;EAED,oBACER,IAAA,CAACH,6CAA6C;IAAA,GAAKK,KAAK;IAAEC,GAAG,EAAEG;EAAU,CAAE,CAAC;AAEhF;AAEA,OAAO,MAAMkB,WAAW,gBAAG7B,KAAK,CAAC8B,UAAU,CAACxB,cAAc,CAAC","ignoreList":[]}

package/lib/typescript/src/native/CornerInset.ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CornerInset.ios.d.ts","sourceRoot":"","sources":["../../../../src/native/CornerInset.ios.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AA4E1E,eAAO,MAAM,WAAW;;;;2EAAmC,CAAC"}
+{"version":3,"file":"CornerInset.ios.d.ts","sourceRoot":"","sources":["../../../../src/native/CornerInset.ios.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAgF1E,eAAO,MAAM,WAAW;;;;2EAAmC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/native",
   "description": "React Native integration for React Navigation",
-  "version": "8.0.0-alpha.13",
+  "version": "8.0.0-alpha.14",
   "keywords": [
     "react-native",
     "react-navigation",
@@ -121,5 +121,5 @@
       }
     }
   },
-  "gitHead": "abfe1e2e9af550937c3f06d1ada393696c92fa8b"
+  "gitHead": "20476fe1fdc272f4d3c4ffc90a95d7adab98ff3c"
 }

package/src/native/CornerInset.ios.tsx

@@ -38,6 +38,8 @@ function CornerInsetIOS(
     const unsubscribeWindowResize = Dimensions.addEventListener(
       'change',
       () => {
+        relayout();
+
         if (animationFrameHandle) {
           cancelAnimationFrame(animationFrameHandle);
         }
@@ -45,7 +47,9 @@ function CornerInsetIOS(
         // When window is unmaximized, calling relayout immediately doesn't work
         // So we delay it to the next frame as a workaround
         animationFrameHandle = requestAnimationFrame(() => {
-          relayout();
+          animationFrameHandle = requestAnimationFrame(() => {
+            relayout();
+          });
         });
       }
     );