Build files

Author: jakewtaylor

build/index.d.ts

@@ -3,11 +3,11 @@ import * as React from 'react';
 export interface Font {
     font: string;
     weights?: (string|number)[];
-    subsets?: string[];
 }
 
 export interface GoogleFontLoaderProps {
     fonts: Font[];
+    subsets?: string[];
 }
 
 declare class GoogleFontLoader extends React.PureComponent<GoogleFontLoaderProps> {};

build/index.js

@@ -37,15 +37,16 @@ var GoogleFontLoader = function (_React$PureComponent) {
         }
 
         return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = GoogleFontLoader.__proto__ || Object.getPrototypeOf(GoogleFontLoader)).call.apply(_ref, [this].concat(args))), _this), _this.link = null, _this.createLink = function () {
-            var fonts = _this.props.fonts;
+            var _this$props = _this.props,
+                fonts = _this$props.fonts,
+                subsets = _this$props.subsets;
 
 
             var families = fonts.reduce(function (acc, font) {
                 var family = font.font.replace(/ +/g, '+');
                 var weights = (font.weights || []).join(',');
-                var subsets = (font.subsets || []).join(',');
 
-                acc.push(family + (weights && ':' + weights) + (subsets && '&subset=' + subsets));
+                acc.push(family + (weights && ':' + weights));
 
                 return acc;
             }, []).join('|');
@@ -54,6 +55,10 @@ var GoogleFontLoader = function (_React$PureComponent) {
             link.rel = 'stylesheet';
             link.href = 'https://fonts.googleapis.com/css?family=' + families;
 
+            if (subsets && Array.isArray(subsets) && subsets.length > 0) {
+                link.href += '&subset=' + subsets.join(',');
+            }
+
             return link;
         }, _this.appendLink = function () {
             return document.head.appendChild(_this.link);
@@ -94,9 +99,9 @@ var GoogleFontLoader = function (_React$PureComponent) {
 GoogleFontLoader.propTypes = {
     fonts: _propTypes2.default.arrayOf(_propTypes2.default.shape({
         font: _propTypes2.default.string.isRequired,
-        weights: _propTypes2.default.arrayOf(_propTypes2.default.oneOf([_propTypes2.default.string, _propTypes2.default.number])),
-        subsets: _propTypes2.default.arrayOf(_propTypes2.default.string)
-    })).isRequired
+        weights: _propTypes2.default.arrayOf(_propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.number]))
+    })).isRequired,
+    subsets: _propTypes2.default.arrayOf(_propTypes2.default.string)
 };
 
 exports.default = GoogleFontLoader;