From 082b61af052c92f8a7be5edac679083499b89475 Mon Sep 17 00:00:00 2001 From: Joen A <1204802+jasmussen@users.noreply.github.com> Date: Fri, 18 Feb 2022 10:11:40 +0100 Subject: [PATCH] Deprecate duplicate icons (#38849) * Remove alignJustifyAlt. * Remove cogAlt. * Remove sparkles, trashFilled. * Move to imported sparkles icon. * Update packages/components/src/mobile/inserter-button/index.native.js Co-authored-by: Carlos Garcia --- .../src/mobile/inserter-button/index.native.js | 3 +-- .../src/mobile/inserter-button}/sparkles.js | 0 .../src/components/editor-help/index.native.js | 12 ++++++------ packages/icons/CHANGELOG.md | 4 ++++ packages/icons/src/index.js | 4 ---- packages/icons/src/library/align-justify-alt.js | 16 ---------------- packages/icons/src/library/cog-alt.js | 16 ---------------- packages/icons/src/library/trash-filled.js | 16 ---------------- 8 files changed, 11 insertions(+), 60 deletions(-) rename packages/{icons/src/library => components/src/mobile/inserter-button}/sparkles.js (100%) delete mode 100644 packages/icons/src/library/align-justify-alt.js delete mode 100644 packages/icons/src/library/cog-alt.js delete mode 100644 packages/icons/src/library/trash-filled.js diff --git a/packages/components/src/mobile/inserter-button/index.native.js b/packages/components/src/mobile/inserter-button/index.native.js index 937f5bdd58f096..ab12aab590938d 100644 --- a/packages/components/src/mobile/inserter-button/index.native.js +++ b/packages/components/src/mobile/inserter-button/index.native.js @@ -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 ); diff --git a/packages/icons/src/library/sparkles.js b/packages/components/src/mobile/inserter-button/sparkles.js similarity index 100% rename from packages/icons/src/library/sparkles.js rename to packages/components/src/mobile/inserter-button/sparkles.js diff --git a/packages/editor/src/components/editor-help/index.native.js b/packages/editor/src/components/editor-help/index.native.js index 9fd43b83c11b90..c667dcef1ddbe8 100644 --- a/packages/editor/src/components/editor-help/index.native.js +++ b/packages/editor/src/components/editor-help/index.native.js @@ -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'; @@ -53,11 +53,11 @@ const HELP_TOPICS = [ icon: plusCircleFilled, view: , }, - { label: __( 'Move blocks' ), icon: alignJustifyAlt, view: }, - { label: __( 'Remove blocks' ), icon: trashFilled, view: }, + { label: __( 'Move blocks' ), icon: alignJustify, view: }, + { label: __( 'Remove blocks' ), icon: trash, view: }, { label: __( 'Customize blocks' ), - icon: cogAlt, + icon: cog, view: , }, ]; diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index 6d90df515dbcc7..56d18d9847cdc1 100644 --- a/packages/icons/CHANGELOG.md +++ b/packages/icons/CHANGELOG.md @@ -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 diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index 3aa9d02d8bebdb..2c780626d4bda1 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -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'; @@ -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'; @@ -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'; @@ -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'; diff --git a/packages/icons/src/library/align-justify-alt.js b/packages/icons/src/library/align-justify-alt.js deleted file mode 100644 index 4ca48fac205f0b..00000000000000 --- a/packages/icons/src/library/align-justify-alt.js +++ /dev/null @@ -1,16 +0,0 @@ -/** - * WordPress dependencies - */ -import { SVG, Path } from '@wordpress/primitives'; - -const alignJustifyAlt = ( - - - -); - -export default alignJustifyAlt; diff --git a/packages/icons/src/library/cog-alt.js b/packages/icons/src/library/cog-alt.js deleted file mode 100644 index 3a8c74886587b9..00000000000000 --- a/packages/icons/src/library/cog-alt.js +++ /dev/null @@ -1,16 +0,0 @@ -/** - * WordPress dependencies - */ -import { SVG, Path } from '@wordpress/primitives'; - -const cogAlt = ( - - - -); - -export default cogAlt; diff --git a/packages/icons/src/library/trash-filled.js b/packages/icons/src/library/trash-filled.js deleted file mode 100644 index f445fa756f9d50..00000000000000 --- a/packages/icons/src/library/trash-filled.js +++ /dev/null @@ -1,16 +0,0 @@ -/** - * WordPress dependencies - */ -import { SVG, Path } from '@wordpress/primitives'; - -const trashFilled = ( - - - -); - -export default trashFilled;