Merge pull request #590 from Shopify/fix/useFont-remove-unused-code-path

Removed unused code path from useFont
Shopify · Jun 14, 2022 · 94eac28 · 94eac28
2 parents b61b364 + 97bdc4c
commit 94eac28
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/package/src/skia/core/Font.ts b/package/src/skia/core/Font.ts
@@ -16,14 +16,12 @@ export const useFont = (
 ): SkFont | null => {
   const typeface = useTypeface(font, onError);
   return useMemo(() => {
-    if (typeface === null) {
-      return null;
-    } else if (typeface && size) {
+    if (typeface && size) {
       return Skia.Font(typeface, size);
     } else if (typeface && !size) {
       return Skia.Font(typeface);
     } else {
-      return Skia.Font();
+      return null;
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [typeface]);