Merge pull request #468 from compositive/change-default-font-resolution

Change default font resolution

Author: mathieudutour

examples/styleguide/src/components/AccessibilityBadge.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
 import * as React from 'react';
 import Badge from './Badge';
 

examples/styleguide/src/components/Badge.js

@@ -2,7 +2,7 @@
 import * as React from 'react';
 import { View, Text } from 'react-sketchapp';
 
-const Badge = ({ children, filled }) => (
+const Badge = ({ children, filled = false }) => (
   <View
     style={{
       borderRadius: 4,

src/jsonUtils/sketchImpl/findFontName.ts

@@ -3,7 +3,6 @@
 import hashStyle from '../../utils/hashStyle';
 import { TextStyle } from '../../types';
 import { FONT_STYLES } from '../textLayers';
-import { APPLE_BROKEN_SYSTEM_FONT } from '../../utils/constants';
 
 // this borrows heavily from react-native's RCTFont class
 // thanks y'all
@@ -100,10 +99,8 @@ export const findFont = (style: TextStyle): NSFont => {
   let fontWeight = style.fontWeight
     ? FONT_WEIGHTS[style.fontWeight.toLowerCase()]
     : defaultFontWeight;
-  // Default to Helvetica if fonts are missing
-  // Must use two equals (==) for compatibility with Cocoascript
-  // eslint-disable-next-line eqeqeq
-  let familyName = defaultFontFamily == APPLE_BROKEN_SYSTEM_FONT ? 'Helvetica' : defaultFontFamily;
+
+  let familyName = defaultFontFamily;
   let isItalic = false;
   let isCondensed = false;
 
@@ -156,7 +153,6 @@ export const findFont = (style: TextStyle): NSFont => {
       isItalic = style.fontStyle ? isItalic : isItalicFont(font);
       isCondensed = isCondensedFont(font);
     } else {
-      console.log(`Unrecognized font family '${familyName}'`);
       font = NSFont.systemFontOfSize_weight(fontSize, fontWeight);
     }
 
@@ -198,7 +194,7 @@ export const findFont = (style: TextStyle): NSFont => {
   return font;
 };
 
-export default function findFontName(style: TextStyle) {
+export default function findFontName(style: TextStyle): string {
   const font = findFont(style);
   return font.fontDescriptor().postscriptName();
 }

src/utils/constants.ts

@@ -20,6 +20,3 @@ export const INHERITABLE_FONT_STYLES = [
 
 // Only components that are allowed as children of <Text> components
 export const VALID_TEXT_CHILDREN_TYPES = ['text'];
-
-// Font displayed if San Francisco fonts are not found
-export const APPLE_BROKEN_SYSTEM_FONT = '.AppleSystemUIFont';