@fortawesome/react-fontawesome
Advanced tools
Comparing version 0.1.0-3 to 0.1.0-4
16
index.js
(function (global, factory) { | ||
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@fortawesome/fontawesome'), require('prop-types'), require('react')) : | ||
typeof define === 'function' && define.amd ? define(['exports', '@fortawesome/fontawesome', 'prop-types', 'react'], factory) : | ||
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@fortawesome/fontawesome-svg-core'), require('prop-types'), require('react')) : | ||
typeof define === 'function' && define.amd ? define(['exports', '@fortawesome/fontawesome-svg-core', 'prop-types', 'react'], factory) : | ||
(factory((global['react-fontawesome'] = {}),global.FontAwesome,global.PropTypes,global.React)); | ||
}(this, (function (exports,fontawesome,PropTypes,React) { 'use strict'; | ||
}(this, (function (exports,fontawesomeSvgCore,PropTypes,React) { 'use strict'; | ||
@@ -505,6 +505,6 @@ PropTypes = PropTypes && PropTypes.hasOwnProperty('default') ? PropTypes['default'] : PropTypes; | ||
var classes = objectWithKey('classes', [].concat(toConsumableArray(classList(props)), toConsumableArray(className.split(' ')))); | ||
var transform = objectWithKey('transform', typeof props.transform === 'string' ? fontawesome.parse.transform(props.transform) : props.transform); | ||
var transform = objectWithKey('transform', typeof props.transform === 'string' ? fontawesomeSvgCore.parse.transform(props.transform) : props.transform); | ||
var mask = objectWithKey('mask', normalizeIconArgs(maskArgs)); | ||
var renderedIcon = fontawesome.icon(iconLookup, _extends({}, classes, transform, mask, { | ||
var renderedIcon = fontawesomeSvgCore.icon(iconLookup, _extends({}, classes, transform, mask, { | ||
symbol: symbol | ||
@@ -523,3 +523,5 @@ })); | ||
Object.keys(props).forEach(function (key) { | ||
if (!FontAwesomeIcon.defaultProps.hasOwnProperty(key)) extraProps[key] = props[key]; | ||
if (!FontAwesomeIcon.defaultProps.hasOwnProperty(key)) { | ||
extraProps[key] = props[key]; | ||
} | ||
}); | ||
@@ -582,4 +584,2 @@ | ||
fontawesome.noAuto(); | ||
exports.FontAwesomeIcon = FontAwesomeIcon; | ||
@@ -586,0 +586,0 @@ |
{ | ||
"name": "@fortawesome/react-fontawesome", | ||
"description": "Official React component for Font Awesome 5", | ||
"version": "0.1.0-3", | ||
"version": "0.1.0-4", | ||
"main": "index.js", | ||
"module": "index.es.js", | ||
"jsnext:main": "index.es.js", | ||
"types": "index.d.ts", | ||
@@ -21,2 +23,6 @@ "homepage": "https://github.com/FortAwesome/react-fontawesome", | ||
"dist": "cross-env NODE_ENV=production npm run build", | ||
"lint": "eslint src", | ||
"prettier": "pretty-quick src --staged", | ||
"precommit": "npm run lint && npm run prettier", | ||
"prepack": "npm run dist", | ||
"test": "jest", | ||
@@ -26,3 +32,3 @@ "clean": "rm -f index.js" | ||
"peerDependencies": { | ||
"@fortawesome/fontawesome": "^1.2.0-2", | ||
"@fortawesome/fontawesome-svg-core": "^1.2.0-7", | ||
"prop-types": "^15.5.10", | ||
@@ -32,4 +38,5 @@ "react": "^16.0.0" | ||
"devDependencies": { | ||
"@fortawesome/fontawesome": "^1.2.0-2", | ||
"@fortawesome/fontawesome-svg-core": "^1.2.0-7", | ||
"@types/react": "^16.0.31", | ||
"babel-eslint": "^8.2.1", | ||
"babel-core": "^6.26.0", | ||
@@ -42,3 +49,14 @@ "babel-jest": "^21.0.0", | ||
"cross-env": "^5.1.1", | ||
"eslint": "^4.16.0", | ||
"eslint-config-standard": "^11.0.0-beta.0", | ||
"eslint-plugin-import": "^2.8.0", | ||
"eslint-plugin-jest": "^21.7.0", | ||
"eslint-plugin-node": "^5.2.1", | ||
"eslint-plugin-promise": "^3.6.0", | ||
"eslint-plugin-react": "^7.5.1", | ||
"eslint-plugin-standard": "^3.0.1", | ||
"husky": "^0.14.3", | ||
"jest": "^21.0.1", | ||
"prettier": "1.10.2", | ||
"pretty-quick": "^1.2.2", | ||
"prop-types": "^15.5.10", | ||
@@ -55,6 +73,3 @@ "react": "16.0.0", | ||
}, | ||
"files": [ | ||
"index.js", | ||
"index.d.ts" | ||
] | ||
"files": ["index.js", "index.es.js", "index.d.ts"] | ||
} |
@@ -361,2 +361,12 @@ # react-fontawesome | ||
Layering: | ||
```javascript | ||
<span className="fa-layers fa-fw"> | ||
<FontAwesomeIcon icon="square" color="green"/> | ||
<FontAwesomeIcon icon="check" inverse transform="shrink-6"/> | ||
</span> | ||
``` | ||
### TypeScript | ||
@@ -414,2 +424,3 @@ | ||
some cases. | ||
Refer to the `index.d.ts` in any module to see which types it exports. | ||
Refer to the `index.d.ts` in any module to see which types it exports. | ||
>>>>>>> add more documentation and more verbose example for TypeScript (#55) |
45543
7
874
425
29
2