Move more block SVGs to the icons package (#19834)

WordPress · Jan 23, 2020 · 26b8015 · 26b8015
1 parent 4ae2c15
commit 26b8015
Show file tree

Hide file tree

Showing 48 changed files with 228 additions and 104 deletions.
diff --git a/packages/block-library/src/column/icon.js b/packages/block-library/src/column/icon.js
diff --git a/packages/block-library/src/column/index.js b/packages/block-library/src/column/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { column as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 

diff --git a/packages/block-library/src/columns/icon.js b/packages/block-library/src/columns/icon.js
diff --git a/packages/block-library/src/columns/index.js b/packages/block-library/src/columns/index.js
@@ -2,13 +2,13 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { columns as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import deprecated from './deprecated';
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import patterns from './patterns';
 import save from './save';

diff --git a/packages/block-library/src/cover/edit.js b/packages/block-library/src/cover/edit.js
@@ -39,11 +39,11 @@ import {
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 import { withDispatch } from '@wordpress/data';
+import { cover as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
-import icon from './icon';
 import {
 	IMAGE_BACKGROUND_TYPE,
 	VIDEO_BACKGROUND_TYPE,

diff --git a/packages/block-library/src/cover/icon.js b/packages/block-library/src/cover/icon.js
diff --git a/packages/block-library/src/cover/index.js b/packages/block-library/src/cover/index.js
@@ -2,13 +2,13 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { cover as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import deprecated from './deprecated';
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/file/edit.js b/packages/block-library/src/file/edit.js
@@ -27,11 +27,11 @@ import {
 } from '@wordpress/block-editor';
 import { Component } from '@wordpress/element';
 import { __, _x } from '@wordpress/i18n';
+import { file as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
-import icon from './icon';
 import FileBlockInspector from './inspector';
 
 class FileEdit extends Component {

diff --git a/packages/block-library/src/file/icon.js b/packages/block-library/src/file/icon.js
diff --git a/packages/block-library/src/file/index.js b/packages/block-library/src/file/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { file as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/gallery/icons.js b/packages/block-library/src/gallery/icons.js
@@ -1,14 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { G, Path, SVG } from '@wordpress/components';
-
-export const icon = (
-	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-		<Path fill="none" d="M0 0h24v24H0V0z" />
-		<G><Path d="M20 4v12H8V4h12m0-2H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-8.5 9.67l1.69 2.26 2.48-3.1L19 15H9zM2 6v14c0 1.1.9 2 2 2h14v-2H4V6H2z" /></G>
-	</SVG>
-);
+import { Path, SVG } from '@wordpress/components';
 
 export const leftArrow = (
 	<SVG width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">

diff --git a/packages/block-library/src/gallery/index.js b/packages/block-library/src/gallery/index.js
@@ -2,13 +2,13 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { gallery as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import deprecated from './deprecated';
 import edit from './edit';
-import { icon } from './icons';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/gallery/shared-icon.js b/packages/block-library/src/gallery/shared-icon.js
@@ -2,10 +2,6 @@
  * WordPress dependencies
  */
 import { BlockIcon } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
-import { icon } from './icons.js';
+import { gallery as icon } from '@wordpress/icons';
 
 export const sharedIcon = <BlockIcon icon={ icon } />;
diff --git a/packages/block-library/src/gallery/shared-icon.native.js b/packages/block-library/src/gallery/shared-icon.native.js
@@ -3,11 +3,11 @@
  */
 import { Icon } from '@wordpress/components';
 import { withPreferredColorScheme } from '@wordpress/compose';
+import { gallery as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
-import { icon } from './icons.js';
 import styles from './styles.scss';
 
 const IconWithColorScheme = withPreferredColorScheme( ( { getStylesFromColorScheme } ) => {

diff --git a/packages/block-library/src/group/index.js b/packages/block-library/src/group/index.js
@@ -3,13 +3,13 @@
  */
 import { __ } from '@wordpress/i18n';
 import { createBlock } from '@wordpress/blocks';
+import { group as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import deprecated from './deprecated';
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 

diff --git a/packages/block-library/src/html/index.js b/packages/block-library/src/html/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { html as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
@@ -45,12 +45,12 @@ import {
 import { __, sprintf } from '@wordpress/i18n';
 import { getPath } from '@wordpress/url';
 import { withViewportMatch } from '@wordpress/viewport';
+import { image as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import { createUpgradedEmbedBlock } from '../embed/util';
-import icon from './icon';
 import ImageSize from './image-size';
 /**
  * Module constants

diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
@@ -25,7 +25,6 @@ import {
 	ToolbarButton,
 	ToolbarGroup,
 } from '@wordpress/components';
-
 import {
 	BlockCaption,
 	MediaPlaceholder,
@@ -41,12 +40,13 @@ import { isURL } from '@wordpress/url';
 import { doAction, hasAction } from '@wordpress/hooks';
 import { compose, withPreferredColorScheme } from '@wordpress/compose';
 import { withSelect } from '@wordpress/data';
+import { image as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import styles from './styles.scss';
-import SvgIcon, { editImageIcon } from './icon';
+import { editImageIcon } from './icon';
 import SvgIconRetry from './icon-retry';
 import { getUpdatedLinkTargetSettings } from './utils';
 
@@ -303,7 +303,7 @@ export class ImageEdit extends React.Component {
 				iconStyle = this.props.getStylesFromColorScheme( styles.iconUpload, styles.iconUploadDark );
 				break;
 		}
-		return <Icon icon={ SvgIcon } { ...iconStyle } />;
+		return <Icon icon={ icon } { ...iconStyle } />;
 	}
 
 	render() {

diff --git a/packages/block-library/src/image/icon.js b/packages/block-library/src/image/icon.js
@@ -3,6 +3,4 @@
  */
 import { Path, Rect, SVG } from '@wordpress/components';
 
-export default <SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><Path d="M0,0h24v24H0V0z" fill="none" /><Path d="m19 5v14h-14v-14h14m0-2h-14c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2v-14c0-1.1-0.9-2-2-2z" /><Path d="m14.14 11.86l-3 3.87-2.14-2.59-3 3.86h12l-3.86-5.14z" /></SVG>;
-
 export const editImageIcon = ( <SVG width={ 20 } height={ 20 } viewBox="0 0 20 20"><Rect x={ 11 } y={ 3 } width={ 7 } height={ 5 } rx={ 1 } /><Rect x={ 2 } y={ 12 } width={ 7 } height={ 5 } rx={ 1 } /><Path d="M13,12h1a3,3,0,0,1-3,3v2a5,5,0,0,0,5-5h1L15,9Z" /><Path d="M4,8H3l2,3L7,8H6A3,3,0,0,1,9,5V3A5,5,0,0,0,4,8Z" /></SVG> );
diff --git a/packages/block-library/src/image/index.js b/packages/block-library/src/image/index.js
@@ -2,13 +2,13 @@
  * WordPress dependencies
  */
 import { __, _x } from '@wordpress/i18n';
+import { image as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import deprecated from './deprecated';
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/latest-comments/icon.js b/packages/block-library/src/latest-comments/icon.js
diff --git a/packages/block-library/src/latest-comments/index.js b/packages/block-library/src/latest-comments/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { comment as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 
 export const name = 'core/latest-comments';
 

diff --git a/packages/block-library/src/latest-posts/index.js b/packages/block-library/src/latest-posts/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { postList as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 
 export const name = 'core/latest-posts';
 

diff --git a/packages/block-library/src/legacy-widget/icon.js b/packages/block-library/src/legacy-widget/icon.js
diff --git a/packages/block-library/src/legacy-widget/index.js b/packages/block-library/src/legacy-widget/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { widget as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 
 export const name = 'core/legacy-widget';
 

diff --git a/packages/block-library/src/list/icon.js b/packages/block-library/src/list/icon.js
diff --git a/packages/block-library/src/list/index.js b/packages/block-library/src/list/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { list as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/media-text/icon.js b/packages/block-library/src/media-text/icon.js
diff --git a/packages/block-library/src/media-text/index.js b/packages/block-library/src/media-text/index.js
@@ -2,13 +2,13 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { mediaAndText as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import deprecated from './deprecated';
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/more/index.js b/packages/block-library/src/more/index.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __, _x } from '@wordpress/i18n';
+import { more as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
-import icon from './icon';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';

diff --git a/packages/block-library/src/nextpage/icon.js b/packages/block-library/src/nextpage/icon.js