From 529d567feb4f57ec8b8db2ad3ea8cc8d276c4db5 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 29 Jan 2020 09:14:54 +0100
Subject: [PATCH] Move the insert dashicon to the icons package

---
 package-lock.json                               |  1 +
 packages/block-editor/package.json              |  1 +
 .../src/components/block-list/style.scss        |  3 ++-
 .../components/button-block-appender/index.js   |  5 +++--
 .../src/components/inserter/index.js            |  7 +++----
 .../src/components/inserter/style.scss          |  7 -------
 packages/components/src/button/style.scss       | 17 +++++------------
 .../src/custom-gradient-picker/index.js         |  3 ++-
 packages/icons/src/index.js                     |  1 +
 packages/icons/src/library/plus-circle.js       | 12 ++++++++++++
 10 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 packages/icons/src/library/plus-circle.js

diff --git a/package-lock.json b/package-lock.json
index 8070e078e471c..37784af821c31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10084,6 +10084,7 @@
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
+				"@wordpress/icons": "file:packages/icons",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keyboard-shortcuts": "file:packages/keyboard-shortcuts",
 				"@wordpress/keycodes": "file:packages/keycodes",
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index 6c7718891501d..49b4e4fd8fa59 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -35,6 +35,7 @@
 		"@wordpress/hooks": "file:../hooks",
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
+		"@wordpress/icons": "file:../icons",
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
 		"@wordpress/keycodes": "file:../keycodes",
diff --git a/packages/block-editor/src/components/block-list/style.scss b/packages/block-editor/src/components/block-list/style.scss
index 4fe3262ed024a..739aa957b266d 100644
--- a/packages/block-editor/src/components/block-list/style.scss
+++ b/packages/block-editor/src/components/block-list/style.scss
@@ -418,7 +418,8 @@
 		background: $white;
 		height: $block-padding * 2;
 		width: $block-padding * 2;
-		padding: $grid-size-small;
+		padding: 0;
+		justify-content: center;
 
 		&:not(:disabled):not([aria-disabled="true"]):hover {
 			box-shadow: none;
diff --git a/packages/block-editor/src/components/button-block-appender/index.js b/packages/block-editor/src/components/button-block-appender/index.js
index 04ca29a71079f..abff6aea2d7d4 100644
--- a/packages/block-editor/src/components/button-block-appender/index.js
+++ b/packages/block-editor/src/components/button-block-appender/index.js
@@ -6,8 +6,9 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { Button, Icon, Tooltip } from '@wordpress/components';
+import { Button, Tooltip } from '@wordpress/components';
 import { _x, sprintf } from '@wordpress/i18n';
+import { Icon, plusCircle } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -39,7 +40,7 @@ function ButtonBlockAppender( { rootClientId, className, __experimentalSelectBlo
 							label={ label }
 						>
 							<span className="screen-reader-text">{ label }</span>
-							<Icon icon="insert" />
+							<Icon icon={ plusCircle } />
 						</Button>
 					</Tooltip>
 				);
diff --git a/packages/block-editor/src/components/inserter/index.js b/packages/block-editor/src/components/inserter/index.js
index f06d1d5a360d3..a5a8de9ace816 100644
--- a/packages/block-editor/src/components/inserter/index.js
+++ b/packages/block-editor/src/components/inserter/index.js
@@ -11,9 +11,8 @@ import { Dropdown, Button } from '@wordpress/components';
 import { Component } from '@wordpress/element';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose, ifCondition } from '@wordpress/compose';
-import {
-	createBlock,
-} from '@wordpress/blocks';
+import { createBlock } from '@wordpress/blocks';
+import { plusCircle } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -30,7 +29,7 @@ const defaultRenderToggle = ( { onToggle, disabled, isOpen, blockTitle, hasSingl
 	}
 	return (
 		<Button
-			icon="insert"
+			icon={ plusCircle }
 			label={ label }
 			tooltipPosition="bottom"
 			onClick={ onToggle }
diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 528c46adb87d7..92ae8f762e5a7 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -24,13 +24,6 @@ $block-inserter-search-height: 38px;
 }
 
 .block-editor-inserter__toggle {
-	display: inline-flex;
-	align-items: center;
-	color: $dark-gray-500;
-	background: none;
-	cursor: pointer;
-	border: none;
-	outline: none;
 	transition: color 0.2s ease;
 	@include reduce-motion("transition");
 }
diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss
index 71eb113ea78b1..7ca65b02743c9 100644
--- a/packages/components/src/button/style.scss
+++ b/packages/components/src/button/style.scss
@@ -206,12 +206,6 @@
 			flex: 0 0 auto;
 		}
 
-		// Ensure that even SVG icons that don't include the .dashicon class are colored.
-		svg {
-			fill: currentColor;
-			outline: none;
-		}
-
 		&:not([aria-disabled="true"]):active:focus:enabled {
 			box-shadow: none;
 		}
@@ -227,17 +221,16 @@
 			flex: 0 0 auto;
 		}
 
-		// Ensure that even SVG icons that don't include the .dashicon class are colored.
-		svg {
-			fill: currentColor;
-			outline: none;
-		}
-
 		&.has-text svg {
 			margin-right: 8px;
 		}
 	}
 
+	svg {
+		fill: currentColor;
+		outline: none;
+	}
+
 	// Fixes a Safari+VoiceOver bug, where the screen reader text is announced not respecting the source order.
 	// See https://core.trac.wordpress.org/ticket/42006 and https://github.com/h5bp/html5-boilerplate/issues/1985
 	.screen-reader-text {
diff --git a/packages/components/src/custom-gradient-picker/index.js b/packages/components/src/custom-gradient-picker/index.js
index 7a3afb21e9715..f5d511a730815 100644
--- a/packages/components/src/custom-gradient-picker/index.js
+++ b/packages/components/src/custom-gradient-picker/index.js
@@ -10,6 +10,7 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { useRef, useReducer, useState } from '@wordpress/element';
+import { plusCircle } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -55,7 +56,7 @@ function InsertPoint( {
 						onToggle();
 					} }
 					className="components-custom-gradient-picker__insert-point"
-					icon="insert"
+					icon={ plusCircle }
 					style={ {
 						left: insertPosition !== null ? `${ insertPosition }%` : undefined,
 					} }
diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js
index 35cc1262091a9..8f9e9f62e638e 100644
--- a/packages/icons/src/index.js
+++ b/packages/icons/src/index.js
@@ -27,6 +27,7 @@ export { default as more } from './library/more';
 export { default as navigation } from './library/navigation';
 export { default as pageBreak } from './library/page-break';
 export { default as paragraph } from './library/paragraph';
+export { default as plusCircle } from './library/plus-circle';
 export { default as postList } from './library/post-list';
 export { default as preformatted } from './library/preformatted';
 export { default as pullquote } from './library/pullquote';
diff --git a/packages/icons/src/library/plus-circle.js b/packages/icons/src/library/plus-circle.js
new file mode 100644
index 0000000000000..405fa5803d2ba
--- /dev/null
+++ b/packages/icons/src/library/plus-circle.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const plusCircle = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
+		<Path d="M10 1c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9zm0 16c-3.9 0-7-3.1-7-7s3.1-7 7-7 7 3.1 7 7-3.1 7-7 7zm1-11H9v3H6v2h3v3h2v-3h3V9h-3V6zM10 1c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9zm0 16c-3.9 0-7-3.1-7-7s3.1-7 7-7 7 3.1 7 7-3.1 7-7 7zm1-11H9v3H6v2h3v3h2v-3h3V9h-3V6z" />
+	</SVG>
+);
+
+export default plusCircle;