Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
### Code quality

- Replaced all occurrences of `_.pick` with a custom pick function ([#1020](https://github.com/Shopify/polaris-react/pull/1020))
- Deleted the icons index file that would re-export icons, and replaced it with direct imports ([#1195](https://github.com/Shopify/polaris-react/pull/1195))

### Deprecations
15 changes: 7 additions & 8 deletions src/components/Banner/Banner.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import * as React from 'react';
import {classNames, variationName} from '@shopify/react-utilities/styles';
import {
CircleTickMajorTwotone,
FlagMajorTwotone,
CircleAlertMajorTwotone,
CircleDisabledMajorTwotone,
CircleInformationMajorTwotone,
} from '@shopify/polaris-icons';

import {
Action,
Expand All @@ -13,14 +20,6 @@ import ButtonGroup from '../ButtonGroup';
import UnstyledLink from '../UnstyledLink';
import Icon, {Props as IconProps} from '../Icon';

import {
CircleTickMajorTwotone,
FlagMajorTwotone,
CircleAlertMajorTwotone,
CircleDisabledMajorTwotone,
CircleInformationMajorTwotone,
} from '../../icons';

import styles from './Banner.scss';

export type Status = 'success' | 'info' | 'warning' | 'critical';
Expand Down
8 changes: 4 additions & 4 deletions src/components/Banner/tests/Banner.test.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import * as React from 'react';
import {mountWithAppProvider} from 'test-utilities';
import {Button, Icon, UnstyledLink, Heading} from 'components';
import Banner from '..';

import {
CircleAlertMajorTwotone,
CircleDisabledMajorTwotone,
CircleTickMajorTwotone,
CircleInformationMajorTwotone,
FlagMajorTwotone,
} from '../../../icons';
} from '@shopify/polaris-icons';

import {Button, Icon, UnstyledLink, Heading} from 'components';
import Banner from '..';

describe('<Banner />', () => {
it('renders a title', () => {
Expand Down
8 changes: 5 additions & 3 deletions src/components/DropZone/DropZone.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ import {
addEventListener,
removeEventListener,
} from '@shopify/javascript-utilities/events';
import capitalize from '../../utilities/capitalize';
import {
DragDropMajorMonotone,
CircleAlertMajorMonotone,
} from '@shopify/polaris-icons';

import capitalize from '../../utilities/capitalize';
import Icon from '../Icon';
import Stack from '../Stack';
import Caption from '../Caption';
Expand All @@ -16,8 +20,6 @@ import VisuallyHidden from '../VisuallyHidden';
import Labelled, {Action} from '../Labelled';
import {withAppProvider, WithAppProviderProps} from '../AppProvider';

import {DragDropMajorMonotone, CircleAlertMajorMonotone} from '../../icons';

import {FileUpload, Provider} from './components';

import {fileAccepted, getDataTransferFiles} from './utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import {classNames} from '@shopify/react-utilities/styles';
import {DragDropMajorMonotone} from '@shopify/polaris-icons';

import {WithContextTypes} from '../../../../types';
import compose from '../../../../utilities/react-compose';
Expand All @@ -16,7 +17,6 @@ import withContext from '../../../WithContext';
import withRef from '../../../WithRef';

import {DropZoneContext} from '../../types';
import {DragDropMajorMonotone} from '../../../../icons';
import {fileUpload, imageUpload} from '../../images';

import {Consumer} from '../Context';
Expand Down
6 changes: 3 additions & 3 deletions src/components/Icon/Icon.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import * as React from 'react';
import {SVGSource} from '@shopify/images';
import {classNames, variationName} from '@shopify/react-utilities/styles';
import {withAppProvider, WithAppProviderProps} from '../AppProvider';

import {
PlusMinor,
AlertMinor,
Expand Down Expand Up @@ -56,7 +54,9 @@ import {
SaveMinor,
SearchMinor,
ViewMinor,
} from '../../icons';
} from '@shopify/polaris-icons';

import {withAppProvider, WithAppProviderProps} from '../AppProvider';

import styles from './Icon.scss';

Expand Down
3 changes: 2 additions & 1 deletion src/components/ResourceList/ResourceList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ import * as React from 'react';
import {autobind, debounce} from '@shopify/javascript-utilities/decorators';
import {classNames} from '@shopify/react-utilities/styles';
import {createUniqueIDFactory} from '@shopify/javascript-utilities/other';
import {EnableSelectionMinor} from '@shopify/polaris-icons';

import Button from '../Button';
import EventListener from '../EventListener';
import Sticky from '../Sticky';
import Spinner from '../Spinner';
import {withAppProvider, WithAppProviderProps} from '../AppProvider';
import Select, {SelectOption} from '../Select';
import EmptySearchResult from '../EmptySearchResult';
import {EnableSelectionMinor} from '../../icons';

import {
BulkActions,
Expand Down
61 changes: 0 additions & 61 deletions src/icons/index.ts

This file was deleted.