Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate duplicate icons #38849

Merged
merged 5 commits into from
Feb 18, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import { Component } from '@wordpress/element';
import { Icon } from '@wordpress/components';
import { withPreferredColorScheme } from '@wordpress/compose';
import { __, sprintf } from '@wordpress/i18n';
import { sparkles } from '@wordpress/icons';
import { BlockIcon } from '@wordpress/block-editor';

/**
* Internal dependencies
*/
import styles from './style.scss';

import sparkles from './sparkles';
class MenuItem extends Component {
constructor() {
super( ...arguments );
Expand Down
12 changes: 6 additions & 6 deletions packages/editor/src/components/editor-help/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import { __ } from '@wordpress/i18n';
import {
helpFilled,
plusCircleFilled,
alignJustifyAlt,
trashFilled,
cogAlt,
alignJustify,
trash,
cog,
} from '@wordpress/icons';
import { useSelect } from '@wordpress/data';
import { store as editorStore } from '@wordpress/editor';
Expand Down Expand Up @@ -53,11 +53,11 @@ const HELP_TOPICS = [
icon: plusCircleFilled,
view: <AddBlocks />,
},
{ label: __( 'Move blocks' ), icon: alignJustifyAlt, view: <MoveBlocks /> },
{ label: __( 'Remove blocks' ), icon: trashFilled, view: <RemoveBlocks /> },
{ label: __( 'Move blocks' ), icon: alignJustify, view: <MoveBlocks /> },
{ label: __( 'Remove blocks' ), icon: trash, view: <RemoveBlocks /> },
{
label: __( 'Customize blocks' ),
icon: cogAlt,
icon: cog,
view: <CustomizeBlocks />,
},
];
Expand Down
4 changes: 4 additions & 0 deletions packages/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

## Breaking Change

- Removed icons that were added by mistake: `alignJustifyAlt`, `cogAlt`, `sparkles`, `trashFilled`. ([#38849](https://github.com/WordPress/gutenberg/pull/38849))

## 6.3.0 (2022-02-10)

### New Features
Expand Down
4 changes: 0 additions & 4 deletions packages/icons/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export { default as addCard } from './library/add-card';
export { default as addSubmenu } from './library/add-submenu';
export { default as alignCenter } from './library/align-center';
export { default as alignJustify } from './library/align-justify';
export { default as alignJustifyAlt } from './library/align-justify-alt';
export { default as alignLeft } from './library/align-left';
export { default as alignNone } from './library/align-none';
export { default as alignRight } from './library/align-right';
Expand Down Expand Up @@ -44,7 +43,6 @@ export { default as cloudUpload } from './library/cloud-upload';
export { default as cloud } from './library/cloud';
export { default as code } from './library/code';
export { default as cog } from './library/cog';
export { default as cogAlt } from './library/cog-alt';
export { default as color } from './library/color';
export { default as column } from './library/column';
export { default as columns } from './library/columns';
Expand Down Expand Up @@ -195,7 +193,6 @@ export { default as share } from './library/share';
export { default as shield } from './library/shield';
export { default as shortcode } from './library/shortcode';
export { default as siteLogo } from './library/site-logo';
export { default as sparkles } from './library/sparkles';
export { default as stack } from './library/stack';
export { default as starEmpty } from './library/star-empty';
export { default as starFilled } from './library/star-filled';
Expand Down Expand Up @@ -227,7 +224,6 @@ export { default as title } from './library/title';
export { default as tip } from './library/tip';
export { default as tool } from './library/tool';
export { default as trash } from './library/trash';
export { default as trashFilled } from './library/trash-filled';
export { default as trendingDown } from './library/trending-down';
export { default as trendingUp } from './library/trending-up';
export { default as typography } from './library/typography';
Expand Down
16 changes: 0 additions & 16 deletions packages/icons/src/library/align-justify-alt.js

This file was deleted.

16 changes: 0 additions & 16 deletions packages/icons/src/library/cog-alt.js

This file was deleted.

16 changes: 0 additions & 16 deletions packages/icons/src/library/trash-filled.js

This file was deleted.