From 8693f0ae405aa6ed1198be5fb5d5697b7fd960f1 Mon Sep 17 00:00:00 2001 From: jasmussen Date: Wed, 16 Feb 2022 10:42:33 +0100 Subject: [PATCH 1/5] Remove alignJustifyAlt. --- .../src/components/editor-help/index.native.js | 4 ++-- packages/icons/CHANGELOG.md | 4 ++++ packages/icons/src/index.js | 1 - packages/icons/src/library/align-justify-alt.js | 16 ---------------- 4 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 packages/icons/src/library/align-justify-alt.js diff --git a/packages/editor/src/components/editor-help/index.native.js b/packages/editor/src/components/editor-help/index.native.js index 9fd43b83c11b9..f3f964822b2a4 100644 --- a/packages/editor/src/components/editor-help/index.native.js +++ b/packages/editor/src/components/editor-help/index.native.js @@ -17,7 +17,7 @@ import { __ } from '@wordpress/i18n'; import { helpFilled, plusCircleFilled, - alignJustifyAlt, + alignJustify, trashFilled, cogAlt, } from '@wordpress/icons'; @@ -53,7 +53,7 @@ const HELP_TOPICS = [ icon: plusCircleFilled, view: , }, - { label: __( 'Move blocks' ), icon: alignJustifyAlt, view: }, + { label: __( 'Move blocks' ), icon: alignJustify, view: }, { label: __( 'Remove blocks' ), icon: trashFilled, view: }, { label: __( 'Customize blocks' ), diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index 6d90df515dbcc..faf10d004e4b6 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`. + ## 6.3.0 (2022-02-10) ### New Features diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index 3aa9d02d8bebd..f28b871012f4d 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'; 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 4ca48fac205f0..0000000000000 --- 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; From 6e3f2ffeb327700695da199b9fc763f6397cd79b Mon Sep 17 00:00:00 2001 From: jasmussen Date: Wed, 16 Feb 2022 10:43:45 +0100 Subject: [PATCH 2/5] Remove cogAlt. --- .../src/components/editor-help/index.native.js | 4 ++-- packages/icons/CHANGELOG.md | 2 +- packages/icons/src/index.js | 1 - packages/icons/src/library/cog-alt.js | 16 ---------------- 4 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 packages/icons/src/library/cog-alt.js diff --git a/packages/editor/src/components/editor-help/index.native.js b/packages/editor/src/components/editor-help/index.native.js index f3f964822b2a4..0865f871c8dc4 100644 --- a/packages/editor/src/components/editor-help/index.native.js +++ b/packages/editor/src/components/editor-help/index.native.js @@ -19,7 +19,7 @@ import { plusCircleFilled, alignJustify, trashFilled, - cogAlt, + cog, } from '@wordpress/icons'; import { useSelect } from '@wordpress/data'; import { store as editorStore } from '@wordpress/editor'; @@ -57,7 +57,7 @@ const HELP_TOPICS = [ { label: __( 'Remove blocks' ), icon: trashFilled, view: }, { label: __( 'Customize blocks' ), - icon: cogAlt, + icon: cog, view: , }, ]; diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index faf10d004e4b6..124ba2c083d0d 100644 --- a/packages/icons/CHANGELOG.md +++ b/packages/icons/CHANGELOG.md @@ -4,7 +4,7 @@ ## Breaking Change -- Removed icons that were added by mistake: `alignJustifyAlt`. +- Removed icons that were added by mistake: `alignJustifyAlt`, `cogAlt`. ## 6.3.0 (2022-02-10) diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index f28b871012f4d..7a015c022e8b8 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -43,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'; diff --git a/packages/icons/src/library/cog-alt.js b/packages/icons/src/library/cog-alt.js deleted file mode 100644 index 3a8c74886587b..0000000000000 --- 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; From 26b75fe2b720552408c10db324f98caafda7f709 Mon Sep 17 00:00:00 2001 From: jasmussen Date: Wed, 16 Feb 2022 10:49:49 +0100 Subject: [PATCH 3/5] Remove sparkles, trashFilled. --- .../src/mobile/inserter-button/index.native.js | 15 ++++++++++++++- .../src/components/editor-help/index.native.js | 4 ++-- packages/icons/CHANGELOG.md | 2 +- packages/icons/src/index.js | 2 -- packages/icons/src/library/sparkles.js | 15 --------------- packages/icons/src/library/trash-filled.js | 16 ---------------- 6 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 packages/icons/src/library/sparkles.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 937f5bdd58f09..f6e18c09924fe 100644 --- a/packages/components/src/mobile/inserter-button/index.native.js +++ b/packages/components/src/mobile/inserter-button/index.native.js @@ -10,8 +10,8 @@ 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'; +import { SVG, Path } from '@wordpress/primitives'; /** * Internal dependencies @@ -66,6 +66,19 @@ class MenuItem extends Component { item.title ); + const sparkles = ( + + + + ); + return ( , }, { label: __( 'Move blocks' ), icon: alignJustify, view: }, - { label: __( 'Remove blocks' ), icon: trashFilled, view: }, + { label: __( 'Remove blocks' ), icon: trash, view: }, { label: __( 'Customize blocks' ), icon: cog, diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index 124ba2c083d0d..c6b4668f9017c 100644 --- a/packages/icons/CHANGELOG.md +++ b/packages/icons/CHANGELOG.md @@ -4,7 +4,7 @@ ## Breaking Change -- Removed icons that were added by mistake: `alignJustifyAlt`, `cogAlt`. +- Removed icons that were added by mistake: `alignJustifyAlt`, `cogAlt`, `sparkles`, `trashFilled`. ## 6.3.0 (2022-02-10) diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index 7a015c022e8b8..2c780626d4bda 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -193,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'; @@ -225,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/sparkles.js b/packages/icons/src/library/sparkles.js deleted file mode 100644 index 663824e11a1d6..0000000000000 --- a/packages/icons/src/library/sparkles.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * WordPress dependencies - */ -import { SVG, Path } from '@wordpress/primitives'; - -const sparkles = ( - - - -); - -export default sparkles; diff --git a/packages/icons/src/library/trash-filled.js b/packages/icons/src/library/trash-filled.js deleted file mode 100644 index f445fa756f9d5..0000000000000 --- 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; From 499d4dcb64b6824812fdf4149f95c00a9d65d6b3 Mon Sep 17 00:00:00 2001 From: jasmussen Date: Thu, 17 Feb 2022 08:58:41 +0100 Subject: [PATCH 4/5] Move to imported sparkles icon. --- .../src/mobile/inserter-button/index.native.js | 16 +--------------- .../src/mobile/inserter-button/sparkles.js | 15 +++++++++++++++ packages/icons/CHANGELOG.md | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 packages/components/src/mobile/inserter-button/sparkles.js diff --git a/packages/components/src/mobile/inserter-button/index.native.js b/packages/components/src/mobile/inserter-button/index.native.js index f6e18c09924fe..ca38fbe18dfc9 100644 --- a/packages/components/src/mobile/inserter-button/index.native.js +++ b/packages/components/src/mobile/inserter-button/index.native.js @@ -11,13 +11,12 @@ import { Icon } from '@wordpress/components'; import { withPreferredColorScheme } from '@wordpress/compose'; import { __, sprintf } from '@wordpress/i18n'; import { BlockIcon } from '@wordpress/block-editor'; -import { SVG, Path } from '@wordpress/primitives'; /** * Internal dependencies */ import styles from './style.scss'; - +import { sparkles } from './sparkles'; class MenuItem extends Component { constructor() { super( ...arguments ); @@ -66,19 +65,6 @@ class MenuItem extends Component { item.title ); - const sparkles = ( - - - - ); - return ( + + +); + +export default sparkles; diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index c6b4668f9017c..56d18d9847cdc 100644 --- a/packages/icons/CHANGELOG.md +++ b/packages/icons/CHANGELOG.md @@ -4,7 +4,7 @@ ## Breaking Change -- Removed icons that were added by mistake: `alignJustifyAlt`, `cogAlt`, `sparkles`, `trashFilled`. +- 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) From 5223e333f0e6e10c60183b45b5958df493615380 Mon Sep 17 00:00:00 2001 From: Joen A <1204802+jasmussen@users.noreply.github.com> Date: Fri, 18 Feb 2022 09:13:07 +0100 Subject: [PATCH 5/5] Update packages/components/src/mobile/inserter-button/index.native.js Co-authored-by: Carlos Garcia --- packages/components/src/mobile/inserter-button/index.native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/mobile/inserter-button/index.native.js b/packages/components/src/mobile/inserter-button/index.native.js index ca38fbe18dfc9..ab12aab590938 100644 --- a/packages/components/src/mobile/inserter-button/index.native.js +++ b/packages/components/src/mobile/inserter-button/index.native.js @@ -16,7 +16,7 @@ import { BlockIcon } from '@wordpress/block-editor'; * Internal dependencies */ import styles from './style.scss'; -import { sparkles } from './sparkles'; +import sparkles from './sparkles'; class MenuItem extends Component { constructor() { super( ...arguments );