react-native-livechart 4.22.0 → 4.22.1

package/dist/hooks/useChartSkiaFont.d.ts

@@ -4,6 +4,8 @@ import type { FontConfig } from "../types";
  * Resolves Skia text for charts: optional bundled `typeface` via `useFont`, otherwise
  * `matchFont` with optional custom `fontManager`. System-font matches are cached
  * module-wide, so many charts sharing a family/size/weight resolve it once.
+ * Custom-manager matches are reused while the manager and resolved inputs stay
+ * unchanged, even if the caller passes a new font config object each render.
  */
 export declare function useChartSkiaFont(fontProp: FontConfig | undefined, defaultFamily: string, defaultSize: number): SkFont;
 //# sourceMappingURL=useChartSkiaFont.d.ts.map

package/dist/hooks/useChartSkiaFont.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChartSkiaFont.d.ts","sourceRoot":"","sources":["../../src/hooks/useChartSkiaFont.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,MAAM,EAEZ,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AA2B3C;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,UAAU,GAAG,SAAS,EAChC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,MAAM,CAcR"}
+{"version":3,"file":"useChartSkiaFont.d.ts","sourceRoot":"","sources":["../../src/hooks/useChartSkiaFont.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,MAAM,EAEZ,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AA2B3C;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,UAAU,GAAG,SAAS,EAChC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,MAAM,CAcR"}

package/package.json

@@ -67,5 +67,5 @@
   },
   "sideEffects": false,
   "types": "./dist/index.d.ts",
-  "version": "4.22.0"
+  "version": "4.22.1"
 }

package/src/hooks/useChartSkiaFont.ts

@@ -5,6 +5,7 @@ import {
   type SkFont,
   type SkFontMgr,
 } from "@shopify/react-native-skia";
+import { useMemo } from "react";
 
 import { resolveFontConfig } from "../core/resolveConfig";
 import type { FontConfig } from "../types";
@@ -15,7 +16,7 @@ import type { FontConfig } from "../types";
  * fonts per render, so a screen full of sparklines would otherwise re-match
  * the same `{family, size, weight}` dozens of times. `SkFont` instances are
  * immutable and safe to share across canvases. Custom `fontManager`s bypass
- * the cache (their identity isn't part of the key).
+ * this module-wide cache; their fonts are memoized per hook instead.
  */
 const systemFontCache = new Map<string, SkFont>();
 let systemFontMgr: SkFontMgr | null = null;
@@ -38,6 +39,8 @@ function matchSystemFont(
  * Resolves Skia text for charts: optional bundled `typeface` via `useFont`, otherwise
  * `matchFont` with optional custom `fontManager`. System-font matches are cached
  * module-wide, so many charts sharing a family/size/weight resolve it once.
+ * Custom-manager matches are reused while the manager and resolved inputs stay
+ * unchanged, even if the caller passes a new font config object each render.
  */
 export function useChartSkiaFont(
   fontProp: FontConfig | undefined,
@@ -49,12 +52,12 @@ export function useChartSkiaFont(
   const typefaceSource = fontProp?.typeface ?? null;
   const customFont = useFont(typefaceSource, fontSize);
 
-  const fallbackFont = fontProp?.fontManager
-    ? matchFont({ fontFamily, fontSize, fontWeight }, fontProp.fontManager)
-    : matchSystemFont(fontFamily, fontSize, fontWeight);
-
-  if (typefaceSource != null) {
-    return customFont ?? fallbackFont;
-  }
-  return fallbackFont;
+  const fontManager = fontProp?.fontManager;
+  return useMemo(() => {
+    // A loaded typeface needs no fallback, so avoid matching an unused font.
+    if (typefaceSource != null && customFont) return customFont;
+    return fontManager
+      ? matchFont({ fontFamily, fontSize, fontWeight }, fontManager)
+      : matchSystemFont(fontFamily, fontSize, fontWeight);
+  }, [typefaceSource, customFont, fontManager, fontFamily, fontSize, fontWeight]);
 }