Skip to content

Commit

Permalink
chore(react): update to use new icon imports
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblack committed Jun 20, 2019
1 parent 5ba3c40 commit 2822e90
Show file tree
Hide file tree
Showing 95 changed files with 840 additions and 1,149 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import PropTypes from 'prop-types';
import React from 'react';
import SkeletonText from '../SkeletonText';
import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
import { ChevronRight16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';

const { prefix } = settings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React from 'react';
import AccordionItem from '../AccordionItem';
import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
import { ChevronRight16 } from '@carbon/icons-react';
import { shallow, mount } from 'enzyme';
import { settings } from 'carbon-components';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classnames from 'classnames';
import { settings } from 'carbon-components';
import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
import { ChevronRight16 } from '@carbon/icons-react';
import { match, keys } from '../../tools/key';

const { prefix } = settings;
Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/components/Button/Button-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import { action } from '@storybook/addon-actions';
import { withKnobs, boolean, select, text } from '@storybook/addon-knobs';
import { settings } from 'carbon-components';
import { iconAddSolid, iconSearch } from 'carbon-icons';
import AddFilled16 from '@carbon/icons-react/lib/add--filled/16';
import Search16 from '@carbon/icons-react/lib/search/16';
import { AddFilled16, Search16 } from '@carbon/icons-react';
import Button from '../Button';
import ButtonSkeleton from '../Button/Button.Skeleton';

Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Button/Button-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import React from 'react';
import Search16 from '@carbon/icons-react/lib/search/16';
import { Search16 } from '@carbon/icons-react';
import Button from '../Button';
import Link from '../Link';
import ButtonSkeleton from '../Button/Button.Skeleton';
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/CodeSnippet/CodeSnippet.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classNames from 'classnames';
import ChevronDown16 from '@carbon/icons-react/lib/chevron--down/16';
import { ChevronDown16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';
import Copy from '../Copy';
import CopyButton from '../CopyButton';
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/ComboBox/ComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Downshift from 'downshift';
import PropTypes from 'prop-types';
import React from 'react';
import { settings } from 'carbon-components';
import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
import { WarningFilled16 } from '@carbon/icons-react';
import ListBox, { PropTypes as ListBoxPropTypes } from '../ListBox';

const { prefix } = settings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
import Button from '../Button';
import classNames from 'classnames';
import { settings } from 'carbon-components';
import Close20 from '@carbon/icons-react/lib/close/20';
import { Close20 } from '@carbon/icons-react';

const { prefix } = settings;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React from 'react';
import CopyButton from '../CopyButton';
import Copy16 from '@carbon/icons-react/lib/copy/16';
import { Copy16 } from '@carbon/icons-react';
import { shallow, mount } from 'enzyme';
import { settings } from 'carbon-components';

Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/CopyButton/CopyButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classnames from 'classnames';
import { settings } from 'carbon-components';
import Copy16 from '@carbon/icons-react/lib/copy/16';
import { Copy16 } from '@carbon/icons-react';

const { prefix } = settings;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import DangerButton from '../DangerButton';
import { shallow, mount } from 'enzyme';
import Search16 from '@carbon/icons-react/lib/search/16';
import { Search16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';

const { prefix } = settings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import PropTypes from 'prop-types';
import React from 'react';
import iconAddSolid from '@carbon/icons-react/lib/add--filled/16';
import { AddFilled16 as iconAddSolid } from '@carbon/icons-react';
import Button from '../Button';

const TableBatchAction = props => <Button {...props} />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import cx from 'classnames';
import React from 'react';
import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
import { ChevronRight16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';

const { prefix } = settings;
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/DataTable/TableExpandRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import cx from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
import { ChevronRight16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';
import TableCell from './TableCell';

Expand Down
6 changes: 4 additions & 2 deletions packages/react/src/components/DataTable/TableHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import cx from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import { settings } from 'carbon-components';
import Arrow from '@carbon/icons-react/lib/arrow--up/20';
import Arrows from '@carbon/icons-react/lib/arrows--vertical/20';
import {
ArrowUp20 as Arrow,
ArrowsVertical20 as Arrows,
} from '@carbon/icons-react';
import { sortStates } from './state/sorting';

const { prefix } = settings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import { settings } from 'carbon-components';
import OverflowMenu from '../OverflowMenu';
import Settings16 from '@carbon/icons-react/lib/settings/16';
import { Settings16 } from '@carbon/icons-react';

const { prefix } = settings;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React from 'react';
import { mount } from 'enzyme';
import Download16 from '@carbon/icons-react/lib/download/16';
import { Download16 } from '@carbon/icons-react';
import { TableToolbarMenu } from '..';

describe('DataTable.TableToolbarMenu', () => {
Expand Down
Loading

0 comments on commit 2822e90

Please sign in to comment.