diff --git a/package-lock.json b/package-lock.json index 6719745eba..6334a7ed3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,6 @@ "dependent-usage-analyzer" ], "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.1.1", - "@fortawesome/react-fontawesome": "^0.1.18", "@popperjs/core": "^2.11.4", "bootstrap": "^4.6.2", "chroma-js": "^2.4.2", @@ -25,7 +23,6 @@ "commander": "^9.4.1", "email-prop-type": "^3.0.0", "file-selector": "^0.6.0", - "font-awesome": "^4.7.0", "glob": "^8.0.3", "lodash.uniqby": "^4.7.0", "mailto-link": "^2.0.0", @@ -4880,6 +4877,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz", "integrity": "sha512-wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA==", "hasInstallScript": true, + "peer": true, "engines": { "node": ">=6" } @@ -4889,6 +4887,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.2.tgz", "integrity": "sha512-853G/Htp0BOdXnPoeCPTjFrVwyrJHpe8MhjB/DYE9XjwhnNDfuBCd3aKc2YUYbEfHEcBws4UAA0kA9dymZKGjA==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.1.2" }, @@ -4896,31 +4895,11 @@ "node": ">=6" } }, - "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", - "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-solid-svg-icons/node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", - "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==", - "hasInstallScript": true, - "engines": { - "node": ">=6" - } - }, "node_modules/@fortawesome/react-fontawesome": { "version": "0.1.19", "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.19.tgz", "integrity": "sha512-Hyb+lB8T18cvLNX0S3llz7PcSOAJMLwiVKBuuzwM/nI5uoBw+gQjnf9il0fR1C3DKOI5Kc79pkJ4/xB0Uw9aFQ==", + "peer": true, "dependencies": { "prop-types": "^15.8.1" }, @@ -20063,6 +20042,7 @@ "version": "4.7.0", "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==", + "peer": true, "engines": { "node": ">=0.10.3" } @@ -44350,7 +44330,6 @@ "dependencies": { "@docsearch/react": "^3.1.0", "@edx/brand-openedx": "^1.1.0", - "@fortawesome/free-solid-svg-icons": "^6.1.1", "@mdx-js/mdx": "^1.6.22", "@mdx-js/react": "^1.6.22", "analytics-node": "^6.0.0", @@ -47860,35 +47839,23 @@ "@fortawesome/fontawesome-common-types": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz", - "integrity": "sha512-wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA==" + "integrity": "sha512-wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA==", + "peer": true }, "@fortawesome/fontawesome-svg-core": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.2.tgz", "integrity": "sha512-853G/Htp0BOdXnPoeCPTjFrVwyrJHpe8MhjB/DYE9XjwhnNDfuBCd3aKc2YUYbEfHEcBws4UAA0kA9dymZKGjA==", + "peer": true, "requires": { "@fortawesome/fontawesome-common-types": "6.1.2" } }, - "@fortawesome/free-solid-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", - "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", - "requires": { - "@fortawesome/fontawesome-common-types": "6.4.0" - }, - "dependencies": { - "@fortawesome/fontawesome-common-types": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", - "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==" - } - } - }, "@fortawesome/react-fontawesome": { "version": "0.1.19", "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.19.tgz", "integrity": "sha512-Hyb+lB8T18cvLNX0S3llz7PcSOAJMLwiVKBuuzwM/nI5uoBw+gQjnf9il0fR1C3DKOI5Kc79pkJ4/xB0Uw9aFQ==", + "peer": true, "requires": { "prop-types": "^15.8.1" } @@ -59508,7 +59475,8 @@ "font-awesome": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", - "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==" + "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==", + "peer": true }, "for-each": { "version": "0.3.3", @@ -69745,7 +69713,6 @@ "@docsearch/react": "^3.1.0", "@edx/brand-openedx": "^1.1.0", "@edx/eslint-config": "^3.1.0", - "@fortawesome/free-solid-svg-icons": "^6.1.1", "@mdx-js/mdx": "^1.6.22", "@mdx-js/react": "^1.6.22", "@svgr/webpack": "6.5.1", diff --git a/package.json b/package.json index f51998ff0f..590c725d73 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,6 @@ "replace-variables-definition-with-css": "node tokens/replace-variables.js -p src -t definition" }, "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.1.1", - "@fortawesome/react-fontawesome": "^0.1.18", "@popperjs/core": "^2.11.4", "bootstrap": "^4.6.2", "chroma-js": "^2.4.2", @@ -60,7 +58,6 @@ "commander": "^9.4.1", "email-prop-type": "^3.0.0", "file-selector": "^0.6.0", - "font-awesome": "^4.7.0", "glob": "^8.0.3", "lodash.uniqby": "^4.7.0", "mailto-link": "^2.0.0", diff --git a/src/IconButton/README.md b/src/IconButton/README.md index 12b4d9d465..8ad71a716d 100644 --- a/src/IconButton/README.md +++ b/src/IconButton/README.md @@ -20,7 +20,7 @@ notes: '' return (
{variants.map((variant) => ( - {}} variant={variant} className="mr-2" /> + {}} variant={variant} className="mr-2" /> ))}
); @@ -40,7 +40,6 @@ notes: '' tooltipPlacement='top' tooltipContent={
a nice tooltip of {variant}!
} src={Close} - iconAs={Icon} alt="Close" onClick={() => {}} variant={variant} @@ -64,7 +63,6 @@ notes: '' isActive key={variant} src={Close} - iconAs={Icon} alt="Close" onClick={() => {}} variant={variant} @@ -89,7 +87,6 @@ notes: '' isActive key={variant} src={Close} - iconAs={Icon} alt="Close" onClick={() => {}} variant={variant} @@ -109,7 +106,6 @@ notes: ''
console.log("You clicked the menu button")} variant="brand" @@ -119,7 +115,6 @@ notes: ''
console.log("You clicked the menu button")} variant="primary" @@ -129,7 +124,6 @@ notes: ''
console.log("You clicked the menu button")} variant="secondary" @@ -139,7 +133,6 @@ notes: ''
console.log("You clicked the menu button")} variant="success" @@ -149,7 +142,6 @@ notes: ''
console.log("You clicked the menu button")} variant="warning" @@ -159,7 +151,6 @@ notes: ''
console.log("You clicked the menu button")} variant="danger" @@ -169,7 +160,6 @@ notes: ''
console.log("You clicked the menu button")} variant="light" @@ -179,7 +169,6 @@ notes: ''
console.log("You clicked the menu button")} variant="black" @@ -197,7 +186,6 @@ notes: '' Small {}} variant="primary" @@ -208,7 +196,6 @@ notes: '' Inline: {}} variant="primary" @@ -220,7 +207,6 @@ notes: '' For example, applying className="x-small" will make the Icon Button look like this: {}} variant="primary" diff --git a/src/IconButton/__snapshots__/IconButton.test.jsx.snap b/src/IconButton/__snapshots__/IconButton.test.jsx.snap index f82a2df7ec..4b6fd9df48 100644 --- a/src/IconButton/__snapshots__/IconButton.test.jsx.snap +++ b/src/IconButton/__snapshots__/IconButton.test.jsx.snap @@ -10,34 +10,11 @@ exports[` renders with required props 1`] = ` - + `; diff --git a/src/IconButton/index.jsx b/src/IconButton/index.jsx index acb22265e8..c83ae97d16 100644 --- a/src/IconButton/index.jsx +++ b/src/IconButton/index.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import Icon from '../Icon'; import { OverlayTrigger } from '../Overlay'; import Tooltip from '../Tooltip'; @@ -22,14 +22,8 @@ const IconButton = React.forwardRef(({ }, ref) => { const invert = invertColors ? 'inverse-' : ''; const activeStyle = isActive ? `${variant}-` : ''; - if (!iconAs && process.env.NODE_ENV === 'development' && console) { - const msg = '[Deprecated] IconButton: you have not provided a value for iconAs prop and ' - + 'are using a default one - FontAwesomeIcon, the default value is going to be changed soon ' - + 'as Paragon is moving away from FontAwesome, please use Paragon\'s icons instead.'; - // eslint-disable-next-line no-console - console.warn(msg); - } - const IconComponent = iconAs || FontAwesomeIcon; + const IconComponent = iconAs; + return (