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

Move the insert dashicon to the icons package #19943

Merged
merged 1 commit into from
Jan 30, 2020
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
1 change: 1 addition & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/block-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion packages/block-editor/src/components/block-list/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>
);
Expand Down
7 changes: 3 additions & 4 deletions packages/block-editor/src/components/inserter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,7 +29,7 @@ const defaultRenderToggle = ( { onToggle, disabled, isOpen, blockTitle, hasSingl
}
return (
<Button
icon="insert"
icon={ plusCircle }
label={ label }
tooltipPosition="bottom"
onClick={ onToggle }
Expand Down
7 changes: 0 additions & 7 deletions packages/block-editor/src/components/inserter/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
17 changes: 5 additions & 12 deletions packages/components/src/button/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/custom-gradient-picker/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { useRef, useReducer, useState } from '@wordpress/element';
import { plusCircle } from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -55,7 +56,7 @@ function InsertPoint( {
onToggle();
} }
className="components-custom-gradient-picker__insert-point"
icon="insert"
icon={ plusCircle }
style={ {
left: insertPosition !== null ? `${ insertPosition }%` : undefined,
} }
Expand Down
1 change: 1 addition & 0 deletions packages/icons/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
12 changes: 12 additions & 0 deletions packages/icons/src/library/plus-circle.js
Original file line number Diff line number Diff line change
@@ -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;