@react-navigation/native 8.0.0-alpha.46 → 8.0.0-alpha.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/android/build.gradle +4 -1
  2. package/android/src/main/java/org/reactnavigation/MaterialSymbolModule.kt +5 -1
  3. package/android/src/main/java/org/reactnavigation/MaterialSymbolTypeface.kt +17 -13
  4. package/lib/module/createStaticNavigation.js +2 -1
  5. package/lib/module/createStaticNavigation.js.map +1 -1
  6. package/lib/typescript/src/createStaticNavigation.d.ts.map +1 -1
  7. package/package.json +3 -3
  8. package/src/createStaticNavigation.tsx +2 -1
package/android/build.gradle CHANGED
@@ -29,7 +29,10 @@ buildscript {
29
29
 
30
30
 
31
31
  apply plugin: "com.android.library"
32
- apply plugin: "kotlin-android"
32
+
33
+ if (project.extensions.findByName("kotlin") == null) {
34
+ apply plugin: "kotlin-android"
35
+ }
33
36
 
34
37
  apply plugin: "com.facebook.react"
35
38
 
package/android/src/main/java/org/reactnavigation/MaterialSymbolModule.kt CHANGED
@@ -52,7 +52,7 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
52
52
  val density = reactApplicationContext.resources.displayMetrics.density
53
53
  val scaledSize = (size * density).roundToInt().coerceAtLeast(1)
54
54
 
55
- val (resolvedTypeface, typefaceSuffix) = MaterialSymbolTypeface.get(
55
+ val typefaceSuffix = MaterialSymbolTypeface.getSuffix(
56
56
  reactApplicationContext, variant, weight?.toInt()
57
57
  )
58
58
 
@@ -82,6 +82,10 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
82
82
 
83
83
  cacheDir.mkdirs()
84
84
 
85
+ val resolvedTypeface = MaterialSymbolTypeface.get(
86
+ reactApplicationContext, variant, weight?.toInt()
87
+ ).typeface
88
+
85
89
  val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
86
90
  typeface = resolvedTypeface
87
91
  textSize = scaledSize.toFloat()
package/android/src/main/java/org/reactnavigation/MaterialSymbolTypeface.kt CHANGED
@@ -11,6 +11,22 @@ object MaterialSymbolTypeface {
11
11
  private var availableFonts: Map<String, Set<Int>>? = null
12
12
 
13
13
  fun get(context: Context, variant: String?, weight: Int?): MaterialSymbolTypefaceResult {
14
+ val suffix = getSuffix(context, variant, weight)
15
+
16
+ val typeface = typefaces.getOrPut(suffix) {
17
+ val path = "fonts/MaterialSymbols${suffix}.ttf"
18
+
19
+ try {
20
+ Typeface.createFromAsset(context.assets, path)
21
+ } catch (e: Exception) {
22
+ throw RuntimeException("$path not found.", e)
23
+ }
24
+ }
25
+
26
+ return MaterialSymbolTypefaceResult(typeface, suffix)
27
+ }
28
+
29
+ fun getSuffix(context: Context, variant: String?, weight: Int?): String {
14
30
  val fonts = getAvailableFonts(context)
15
31
 
16
32
  val resolvedVariant = if (variant != null) {
@@ -25,19 +41,7 @@ object MaterialSymbolTypeface {
25
41
 
26
42
  val resolvedWeight = weight ?: resolveDefaultWeight(fonts, resolvedVariant)
27
43
 
28
- val suffix = "${resolvedVariant}_$resolvedWeight"
29
-
30
- val typeface = typefaces.getOrPut(suffix) {
31
- val path = "fonts/MaterialSymbols${suffix}.ttf"
32
-
33
- try {
34
- Typeface.createFromAsset(context.assets, path)
35
- } catch (e: Exception) {
36
- throw RuntimeException("$path not found.", e)
37
- }
38
- }
39
-
40
- return MaterialSymbolTypefaceResult(typeface, suffix)
44
+ return "${resolvedVariant}_$resolvedWeight"
41
45
  }
42
46
 
43
47
  private fun getAvailableFonts(context: Context): Map<String, Set<Int>> {
package/lib/module/createStaticNavigation.js CHANGED
@@ -13,6 +13,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
13
13
  */
14
14
  export function createStaticNavigation(tree) {
15
15
  const Component = tree.getComponent();
16
+ const element = /*#__PURE__*/_jsx(Component, {});
16
17
  function Navigation({
17
18
  linking,
18
19
  ref,
@@ -44,7 +45,7 @@ export function createStaticNavigation(tree) {
44
45
  ...rest,
45
46
  ref: ref,
46
47
  linking: memoizedLinking,
47
- children: /*#__PURE__*/_jsx(Component, {})
48
+ children: element
48
49
  });
49
50
  }
50
51
  return Navigation;
package/lib/module/createStaticNavigation.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["createPathConfigForStaticNavigation","React","NavigationContainer","jsx","_jsx","createStaticNavigation","tree","Component","getComponent","Navigation","linking","ref","rest","linkingConfig","useMemo","screens","initialRouteName","config","enabled","path","memoizedLinking","Error","children"],"sourceRoot":"../../src","sources":["createStaticNavigation.tsx"],"mappings":";;AAAA,SACEA,mCAAmC,QAG9B,wBAAwB;AAC/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,mBAAmB,QAAQ,0BAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AA2B5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,IAA2B,EAAE;EAClE,MAAMC,SAAS,GAAGD,IAAI,CAACE,YAAY,CAAC,CAAC;EAErC,SAASC,UAAUA,CAAuC;IACxDC,OAAO;IACPC,GAAG;IACH,GAAGC;EACa,CAAC,EAAE;IACnB,MAAMC,aAAa,GAAGZ,KAAK,CAACa,OAAO,CAAC,MAAM;MACxC,MAAMC,OAAO,GAAGf,mCAAmC,CACjDM,IAAI,EACJ;QAAEU,gBAAgB,EAAEN,OAAO,EAAEO,MAAM,EAAED;MAAiB,CAAC,EACvDN,OAAO,EAAEQ,OAAO,IAAI,IAAI,IAAIR,OAAO,CAACQ,OAAO,KAAK,MAClD,CAAC;MAED,IAAI,CAACH,OAAO,EAAE;MAEd,OAAO;QACLI,IAAI,EAAET,OAAO,EAAEO,MAAM,EAAEE,IAAI;QAC3BH,gBAAgB,EAAEN,OAAO,EAAEO,MAAM,EAAED,gBAAgB;QACnDD;MACF,CAAC;IACH,CAAC,EAAE,CACDL,OAAO,EAAEQ,OAAO,EAChBR,OAAO,EAAEO,MAAM,EAAEE,IAAI,EACrBT,OAAO,EAAEO,MAAM,EAAED,gBAAgB,CAClC,CAAC;IAEF,MAAMI,eAAe,GAAGnB,KAAK,CAACa,OAAO,CAAC,MAAM;MAC1C,MAAMI,OAAO,GACXR,OAAO,EAAEQ,OAAO,IAAI,IAAI,IAAIR,OAAO,CAACQ,OAAO,KAAK,MAAM,GAClD,IAAI,GACJR,OAAO,CAACQ,OAAO;MAErB,OAAO;QACL,GAAGR,OAAO;QACVQ,OAAO;QACPD,MAAM,EAAEJ;MACV,CAAC;IACH,CAAC,EAAE,CAACH,OAAO,EAAEG,aAAa,CAAC,CAAC;IAE5B,IAAIH,OAAO,EAAEQ,OAAO,KAAK,IAAI,IAAIL,aAAa,EAAEE,OAAO,IAAI,IAAI,EAAE;MAC/D,MAAM,IAAIM,KAAK,CACb,gFAAgF,GAC9E,kBAAkB,GAClB,0FAA0F,GAC1F,2EAA2E,GAC3E,gFACJ,CAAC;IACH;IAEA,oBACEjB,IAAA,CAACF,mBAAmB;MAAA,GAAKU,IAAI;MAAED,GAAG,EAAEA,GAAI;MAACD,OAAO,EAAEU,eAAgB;MAAAE,QAAA,eAChElB,IAAA,CAACG,SAAS,IAAE;IAAC,CACM,CAAC;EAE1B;EAEA,OAAOE,UAAU;AACnB","ignoreList":[]}
1
+ {"version":3,"names":["createPathConfigForStaticNavigation","React","NavigationContainer","jsx","_jsx","createStaticNavigation","tree","Component","getComponent","element","Navigation","linking","ref","rest","linkingConfig","useMemo","screens","initialRouteName","config","enabled","path","memoizedLinking","Error","children"],"sourceRoot":"../../src","sources":["createStaticNavigation.tsx"],"mappings":";;AAAA,SACEA,mCAAmC,QAG9B,wBAAwB;AAC/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,mBAAmB,QAAQ,0BAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AA2B5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,IAA2B,EAAE;EAClE,MAAMC,SAAS,GAAGD,IAAI,CAACE,YAAY,CAAC,CAAC;EACrC,MAAMC,OAAO,gBAAGL,IAAA,CAACG,SAAS,IAAE,CAAC;EAE7B,SAASG,UAAUA,CAAuC;IACxDC,OAAO;IACPC,GAAG;IACH,GAAGC;EACa,CAAC,EAAE;IACnB,MAAMC,aAAa,GAAGb,KAAK,CAACc,OAAO,CAAC,MAAM;MACxC,MAAMC,OAAO,GAAGhB,mCAAmC,CACjDM,IAAI,EACJ;QAAEW,gBAAgB,EAAEN,OAAO,EAAEO,MAAM,EAAED;MAAiB,CAAC,EACvDN,OAAO,EAAEQ,OAAO,IAAI,IAAI,IAAIR,OAAO,CAACQ,OAAO,KAAK,MAClD,CAAC;MAED,IAAI,CAACH,OAAO,EAAE;MAEd,OAAO;QACLI,IAAI,EAAET,OAAO,EAAEO,MAAM,EAAEE,IAAI;QAC3BH,gBAAgB,EAAEN,OAAO,EAAEO,MAAM,EAAED,gBAAgB;QACnDD;MACF,CAAC;IACH,CAAC,EAAE,CACDL,OAAO,EAAEQ,OAAO,EAChBR,OAAO,EAAEO,MAAM,EAAEE,IAAI,EACrBT,OAAO,EAAEO,MAAM,EAAED,gBAAgB,CAClC,CAAC;IAEF,MAAMI,eAAe,GAAGpB,KAAK,CAACc,OAAO,CAAC,MAAM;MAC1C,MAAMI,OAAO,GACXR,OAAO,EAAEQ,OAAO,IAAI,IAAI,IAAIR,OAAO,CAACQ,OAAO,KAAK,MAAM,GAClD,IAAI,GACJR,OAAO,CAACQ,OAAO;MAErB,OAAO;QACL,GAAGR,OAAO;QACVQ,OAAO;QACPD,MAAM,EAAEJ;MACV,CAAC;IACH,CAAC,EAAE,CAACH,OAAO,EAAEG,aAAa,CAAC,CAAC;IAE5B,IAAIH,OAAO,EAAEQ,OAAO,KAAK,IAAI,IAAIL,aAAa,EAAEE,OAAO,IAAI,IAAI,EAAE;MAC/D,MAAM,IAAIM,KAAK,CACb,gFAAgF,GAC9E,kBAAkB,GAClB,0FAA0F,GAC1F,2EAA2E,GAC3E,gFACJ,CAAC;IACH;IAEA,oBACElB,IAAA,CAACF,mBAAmB;MAAA,GAAKW,IAAI;MAAED,GAAG,EAAEA,GAAI;MAACD,OAAO,EAAEU,eAAgB;MAAAE,QAAA,EAC/Dd;IAAO,CACW,CAAC;EAE1B;EAEA,OAAOC,UAAU;AACnB","ignoreList":[]}
package/lib/typescript/src/createStaticNavigation.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createStaticNavigation.d.ts","sourceRoot":"","sources":["../../../src/createStaticNavigation.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAS,CAAC;AAE9C,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,IAAI,CACrC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAC3D,SAAS,GAAG,UAAU,CACvB,GAAG;IACF;;OAEG;IACH,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG;QAChE;;;;;;;WAOG;QACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;QAChC;;WAEG;QACH,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;KAC5E,CAAC;CACH,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC,IAG5C,SAAS,SAAS,EAAE,kCAIrC,KAAK,CAAC,SAAS,CAAC,uBAoDpB"}
1
+ {"version":3,"file":"createStaticNavigation.d.ts","sourceRoot":"","sources":["../../../src/createStaticNavigation.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAS,CAAC;AAE9C,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,IAAI,CACrC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAC3D,SAAS,GAAG,UAAU,CACvB,GAAG;IACF;;OAEG;IACH,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG;QAChE;;;;;;;WAOG;QACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;QAChC;;WAEG;QACH,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;KAC5E,CAAC;CACH,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC,IAI5C,SAAS,SAAS,EAAE,kCAIrC,KAAK,CAAC,SAAS,CAAC,uBAoDpB"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@react-navigation/native",
3
3
  "description": "React Native integration for React Navigation",
4
- "version": "8.0.0-alpha.46",
4
+ "version": "8.0.0-alpha.47",
5
5
  "keywords": [
6
6
  "react-native",
7
7
  "react-navigation",
@@ -62,7 +62,7 @@
62
62
  "clean": "del lib"
63
63
  },
64
64
  "dependencies": {
65
- "@react-navigation/core": "^8.0.0-alpha.36",
65
+ "@react-navigation/core": "^8.0.0-alpha.37",
66
66
  "escape-string-regexp": "^5.0.0",
67
67
  "fast-deep-equal": "^3.1.3",
68
68
  "nanoid": "^5.1.11",
@@ -132,5 +132,5 @@
132
132
  }
133
133
  }
134
134
  },
135
- "gitHead": "ac6baf188f7a456429a87b644053e765233f0151"
135
+ "gitHead": "e83cb9a88ab92d24caad272442c338de046cfac2"
136
136
  }
package/src/createStaticNavigation.tsx CHANGED
@@ -41,6 +41,7 @@ type Props<ParamList extends {}> = Omit<
41
41
  */
42
42
  export function createStaticNavigation(tree: StaticNavigation<any>) {
43
43
  const Component = tree.getComponent();
44
+ const element = <Component />;
44
45
 
45
46
  function Navigation<ParamList extends {} = RootParamList>({
46
47
  linking,
@@ -92,7 +93,7 @@ export function createStaticNavigation(tree: StaticNavigation<any>) {
92
93
 
93
94
  return (
94
95
  <NavigationContainer {...rest} ref={ref} linking={memoizedLinking}>
95
- <Component />
96
+ {element}
96
97
  </NavigationContainer>
97
98
  );
98
99
  }