Update useFont to have the same default size than matchFont (#1889)

Shopify · Oct 2, 2023 · 2dfac22 · 2dfac22
1 parent d6b4a6a
commit 2dfac22
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/package/src/skia/core/Font.ts b/package/src/skia/core/Font.ts
@@ -9,20 +9,20 @@ import type { SkTypefaceFontProvider } from "../types/Paragraph/TypefaceFontProv
 
 import { useTypeface } from "./Typeface";
 
+const defaultFontSize = 14;
+
 /**
  * Returns a Skia Font object
  * */
 export const useFont = (
  font: DataSourceParam,
- size?: number,
+ size = defaultFontSize,
  onError?: (err: Error) => void
 ) => {
  const typeface = useTypeface(font, onError);
  return useMemo(() => {
- if (typeface && size) {
+ if (typeface) {
  return Skia.Font(typeface, size);
- } else if (typeface && !size) {
- return Skia.Font(typeface);
  } else {
  return null;
  }
@@ -52,7 +52,7 @@ interface RNFontStyle {
 
 const defaultFontStyle: RNFontStyle = {
  fontFamily: "System",
- fontSize: 14,
+ fontSize: defaultFontSize,
  fontStyle: "normal",
  fontWeight: "normal",
 };