tags.
diff --git a/packages/autop/src/test/index.test.js b/packages/autop/src/test/index.test.js
index 8fc73f4e039651..02bffeab830dde 100644
--- a/packages/autop/src/test/index.test.js
+++ b/packages/autop/src/test/index.test.js
@@ -1,10 +1,7 @@
/**
* Internal dependencies
*/
-import {
- autop,
- removep,
-} from '../';
+import { autop, removep } from '../';
test( 'empty string', () => {
expect( autop( '' ) ).toBe( '' );
@@ -81,13 +78,16 @@ done = 0;
expect( autop( str ).trim() ).toBe( expected );
// Make sure HTML breaks are maintained if manually inserted
- str = 'Look at this code\n\nLine1 \n\nCool, huh?';
- expected = 'Look at this code
\nLine1 \nCool, huh?
';
+ str =
+ 'Look at this code\n\nLine1 \n\nCool, huh?';
+ expected =
+ 'Look at this code
\nLine1 \nCool, huh?
';
expect( autop( str ).trim() ).toBe( expected );
} );
test( 'skip input elements', () => {
- const str = 'Username: ' + str + '
' );
} );
@@ -133,7 +133,8 @@ Paragraph two.`;
Paragraph two.`;
- const expected = 'Paragraph one.
\n' + // line breaks only after
+ const expected =
+ '
Paragraph one.
\n' + // line breaks only after
'
' +
'Paragraph one.
\n' + // line breaks only after
+ const shortcodeExpected =
+ '
Paragraph one.
\n' + // line breaks only after
'
[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]' +
'
Paragraph one.
\n' + // line breaks only after
+ const expected1 =
+ '
Paragraph one.
\n' + // line breaks only after
'
' +
'Paragraph one.
\n' + // line breaks only after block tags
+ const expected2 =
+ 'Paragraph one.
\n' + // line breaks only after block tags
'\n' +
'
' +
'Alabama Alaska Arizona Arkansas California Alabama Alaska Arizona Arkansas California ' + str + '
' );
} );
@@ -399,14 +404,8 @@ test( 'that autop treats inline elements as inline', () => {
test( 'element sanity', () => {
[
- [
- 'Hello ',
- 'Hello
\n',
- ],
- [
- 'Hello ',
- 'Hello
\n',
- ],
+ [ 'Hello ', 'Hello
\n' ],
+ [ 'Hello ', 'Hello
\n' ],
[
'Hello ',
'Hello
\n',
diff --git a/packages/babel-plugin-makepot/src/index.js b/packages/babel-plugin-makepot/src/index.js
index ad0cde941aecb8..6764c1ff822946 100644
--- a/packages/babel-plugin-makepot/src/index.js
+++ b/packages/babel-plugin-makepot/src/index.js
@@ -93,10 +93,7 @@ const REGEXP_TRANSLATOR_COMMENT = /^\s*translators:\s*([\s\S]+)/im;
function getNodeAsString( node ) {
switch ( node.type ) {
case 'BinaryExpression':
- return (
- getNodeAsString( node.left ) +
- getNodeAsString( node.right )
- );
+ return getNodeAsString( node.left ) + getNodeAsString( node.right );
case 'StringLiteral':
return node.value;
@@ -134,7 +131,10 @@ function getExtractedComment( path, _originalNodeLine ) {
const match = commentNode.value.match( REGEXP_TRANSLATOR_COMMENT );
if ( match ) {
// Extract text from matched translator prefix
- comment = match[ 1 ].split( '\n' ).map( ( text ) => text.trim() ).join( ' ' );
+ comment = match[ 1 ]
+ .split( '\n' )
+ .map( ( text ) => text.trim() )
+ .join( ' ' );
// False return indicates to Lodash to break iteration
return false;
@@ -178,10 +178,7 @@ function isValidTranslationKey( key ) {
* @return {boolean} Whether valid translation keys match.
*/
function isSameTranslation( a, b ) {
- return isEqual(
- pick( a, VALID_TRANSLATION_KEYS ),
- pick( b, VALID_TRANSLATION_KEYS )
- );
+ return isEqual( pick( a, VALID_TRANSLATION_KEYS ), pick( b, VALID_TRANSLATION_KEYS ) );
}
module.exports = function() {
@@ -240,11 +237,15 @@ module.exports = function() {
};
for ( const key in baseData.headers ) {
- baseData.translations[ '' ][ '' ].msgstr.push( `${ key }: ${ baseData.headers[ key ] };\n` );
+ baseData.translations[ '' ][ '' ].msgstr.push(
+ `${ key }: ${ baseData.headers[ key ] };\n`
+ );
}
// Attempt to exract nplurals from header
- const pluralsMatch = ( baseData.headers[ 'plural-forms' ] || '' ).match( /nplurals\s*=\s*(\d+);/ );
+ const pluralsMatch = ( baseData.headers[ 'plural-forms' ] || '' ).match(
+ /nplurals\s*=\s*(\d+);/
+ );
if ( pluralsMatch ) {
nplurals = parseInt( pluralsMatch[ 1 ], 10 );
}
@@ -260,7 +261,9 @@ module.exports = function() {
// Assign file reference comment, ensuring consistent pathname
// reference between Win32 and POSIX
const { filename } = this.file.opts;
- const pathname = relative( '.', filename ).split( sep ).join( '/' );
+ const pathname = relative( '.', filename )
+ .split( sep )
+ .join( '/' );
translation.comments = {
reference: pathname + ':' + path.node.loc.start.line,
};
@@ -294,34 +297,42 @@ module.exports = function() {
const files = Object.keys( strings ).sort();
// Combine translations from each file grouped by context
- const translations = reduce( files, ( memo, file ) => {
- for ( const context in strings[ file ] ) {
- // Within the same file, sort translations by line
- const sortedTranslations = sortBy(
- strings[ file ][ context ],
- 'comments.reference'
- );
-
- forEach( sortedTranslations, ( translation ) => {
- const { msgctxt = '', msgid } = translation;
- if ( ! memo.hasOwnProperty( msgctxt ) ) {
- memo[ msgctxt ] = {};
- }
-
- // Merge references if translation already exists
- if ( isSameTranslation( translation, memo[ msgctxt ][ msgid ] ) ) {
- translation.comments.reference = uniq( [
- memo[ msgctxt ][ msgid ].comments.reference,
- translation.comments.reference,
- ].join( '\n' ).split( '\n' ) ).join( '\n' );
- }
-
- memo[ msgctxt ][ msgid ] = translation;
- } );
- }
-
- return memo;
- }, {} );
+ const translations = reduce(
+ files,
+ ( memo, file ) => {
+ for ( const context in strings[ file ] ) {
+ // Within the same file, sort translations by line
+ const sortedTranslations = sortBy(
+ strings[ file ][ context ],
+ 'comments.reference'
+ );
+
+ forEach( sortedTranslations, ( translation ) => {
+ const { msgctxt = '', msgid } = translation;
+ if ( ! memo.hasOwnProperty( msgctxt ) ) {
+ memo[ msgctxt ] = {};
+ }
+
+ // Merge references if translation already exists
+ if ( isSameTranslation( translation, memo[ msgctxt ][ msgid ] ) ) {
+ translation.comments.reference = uniq(
+ [
+ memo[ msgctxt ][ msgid ].comments.reference,
+ translation.comments.reference,
+ ]
+ .join( '\n' )
+ .split( '\n' )
+ ).join( '\n' );
+ }
+
+ memo[ msgctxt ][ msgid ] = translation;
+ } );
+ }
+
+ return memo;
+ },
+ {}
+ );
// Merge translations from individual files into headers
const data = merge( {}, baseData, { translations } );
diff --git a/packages/babel-plugin-makepot/test/index.js b/packages/babel-plugin-makepot/test/index.js
index 52ae1dcc5b9134..32554aa0656939 100644
--- a/packages/babel-plugin-makepot/test/index.js
+++ b/packages/babel-plugin-makepot/test/index.js
@@ -74,7 +74,9 @@ describe( 'babel-plugin', () => {
} );
it( 'should traverse up parents until it encounters comment', () => {
- const comment = getCommentFromString( "// translators: Greeting\nconst string = __( 'Hello world' );" );
+ const comment = getCommentFromString(
+ "// translators: Greeting\nconst string = __( 'Hello world' );"
+ );
expect( comment ).toBe( 'Greeting' );
} );
@@ -86,7 +88,9 @@ describe( 'babel-plugin', () => {
} );
it( 'should use multi-line comment starting many lines previous', () => {
- const comment = getCommentFromString( "/* translators: Long comment\nspanning multiple \nlines */\nconst string = __( 'Hello world' );" );
+ const comment = getCommentFromString(
+ "/* translators: Long comment\nspanning multiple \nlines */\nconst string = __( 'Hello world' );"
+ );
expect( comment ).toBe( 'Long comment spanning multiple lines' );
} );
diff --git a/packages/babel-preset-default/index.js b/packages/babel-preset-default/index.js
index a1343706b03b8b..d7b198ec4d45c1 100644
--- a/packages/babel-preset-default/index.js
+++ b/packages/babel-preset-default/index.js
@@ -1,8 +1,7 @@
module.exports = function( api ) {
let wpBuildOpts = {};
- const isWPBuild = ( name ) => [ 'WP_BUILD_MAIN', 'WP_BUILD_MODULE' ].some(
- ( buildName ) => name === buildName
- );
+ const isWPBuild = ( name ) =>
+ [ 'WP_BUILD_MAIN', 'WP_BUILD_MODULE' ].some( ( buildName ) => name === buildName );
const isTestEnv = api.env() === 'test';
@@ -65,10 +64,13 @@ module.exports = function( api ) {
isDefault: false,
},
],
- [ require.resolve( '@babel/plugin-transform-react-jsx' ), {
- pragma: 'createElement',
- pragmaFrag: 'Fragment',
- } ],
+ [
+ require.resolve( '@babel/plugin-transform-react-jsx' ),
+ {
+ pragma: 'createElement',
+ pragmaFrag: 'Fragment',
+ },
+ ],
require.resolve( '@babel/plugin-proposal-async-generator-functions' ),
maybeGetPluginTransformRuntime(),
].filter( Boolean ),
diff --git a/packages/blob/src/test/index.js b/packages/blob/src/test/index.js
index 7604e3956b6d26..110340e13639e2 100644
--- a/packages/blob/src/test/index.js
+++ b/packages/blob/src/test/index.js
@@ -1,9 +1,7 @@
/**
* Internal dependencies
*/
-import {
- isBlobURL,
-} from '../';
+import { isBlobURL } from '../';
describe( 'isBlobURL', () => {
it( 'returns true if the url starts with "blob:"', () => {
diff --git a/packages/block-directory/src/components/block-ratings/stars.js b/packages/block-directory/src/components/block-ratings/stars.js
index 577c3cb15e0dc2..9b78e608dae7ba 100644
--- a/packages/block-directory/src/components/block-ratings/stars.js
+++ b/packages/block-directory/src/components/block-ratings/stars.js
@@ -9,9 +9,7 @@ import { times } from 'lodash';
import { __, sprintf } from '@wordpress/i18n';
import { Icon } from '@wordpress/components';
-function Stars( {
- rating,
-} ) {
+function Stars( { rating } ) {
const stars = Math.round( rating / 0.5 ) * 0.5;
const fullStarCount = Math.floor( rating );
@@ -20,9 +18,15 @@ function Stars( {
return (
- { times( fullStarCount, ( i ) =>
);
}
diff --git a/packages/block-directory/src/components/downloadable-block-header/index.js b/packages/block-directory/src/components/downloadable-block-header/index.js
index 7a9225d57f0cff..474a519c001705 100644
--- a/packages/block-directory/src/components/downloadable-block-header/index.js
+++ b/packages/block-directory/src/components/downloadable-block-header/index.js
@@ -13,16 +13,16 @@ import BlockRatings from '../block-ratings';
function DownloadableBlockHeader( { icon, title, rating, ratingCount, onClick } ) {
return (
- {
- icon.match( /\.(jpeg|jpg|gif|png)$/ ) !== null ?
-
:
-
-
- }
+ { icon.match( /\.(jpeg|jpg|gif|png)$/ ) !== null ? (
+
+ ) : (
+
+
+ ) }
-
+
{ title }
-
- { description }
-
+ { description }
-
- { humanizedUpdated }
+
+ { humanizedUpdated }
+
diff --git a/packages/block-directory/src/components/downloadable-block-list-item/index.js b/packages/block-directory/src/components/downloadable-block-list-item/index.js
index c5bd8b8f0244e0..3eb69eba7d2d70 100644
--- a/packages/block-directory/src/components/downloadable-block-list-item/index.js
+++ b/packages/block-directory/src/components/downloadable-block-list-item/index.js
@@ -5,10 +5,7 @@ import DownloadableBlockHeader from '../downloadable-block-header';
import DownloadableBlockAuthorInfo from '../downloadable-block-author-info';
import DownloadableBlockInfo from '../downloadable-block-info';
-function DownloadableBlockListItem( {
- item,
- onClick,
-} ) {
+function DownloadableBlockListItem( { item, onClick } ) {
const {
icon,
title,
diff --git a/packages/block-directory/src/components/downloadable-blocks-list/index.js b/packages/block-directory/src/components/downloadable-blocks-list/index.js
index 315403267a56c3..36b952f3ecc5da 100644
--- a/packages/block-directory/src/components/downloadable-blocks-list/index.js
+++ b/packages/block-directory/src/components/downloadable-blocks-list/index.js
@@ -27,22 +27,23 @@ function DownloadableBlocksList( { items, onHover = noop, children, downloadAndI
*/
/* eslint-disable jsx-a11y/no-redundant-roles */
- { items && items.map( ( item ) =>
- {
- downloadAndInstallBlock( item );
- onHover( null );
- } }
- onFocus={ () => onHover( item ) }
- onMouseEnter={ () => onHover( item ) }
- onMouseLeave={ () => onHover( null ) }
- onBlur={ () => onHover( null ) }
- item={ item }
- />
- ) }
+ { items &&
+ items.map( ( item ) => (
+ {
+ downloadAndInstallBlock( item );
+ onHover( null );
+ } }
+ onFocus={ () => onHover( item ) }
+ onMouseEnter={ () => onHover( item ) }
+ onMouseLeave={ () => onHover( null ) }
+ onBlur={ () => onHover( null ) }
+ item={ item }
+ />
+ ) ) }
{ children }
/* eslint-enable jsx-a11y/no-redundant-roles */
@@ -59,49 +60,44 @@ export default compose(
return {
downloadAndInstallBlock: ( item ) => {
const onDownloadError = () => {
- createErrorNotice(
- __( 'Block previews can’t load.' ),
- {
- id: DOWNLOAD_ERROR_NOTICE_ID,
- actions: [
- {
- label: __( 'Retry' ),
- onClick: () => {
- removeNotice( DOWNLOAD_ERROR_NOTICE_ID );
- downloadBlock( item, onSuccess, onDownloadError );
- },
+ createErrorNotice( __( 'Block previews can’t load.' ), {
+ id: DOWNLOAD_ERROR_NOTICE_ID,
+ actions: [
+ {
+ label: __( 'Retry' ),
+ onClick: () => {
+ removeNotice( DOWNLOAD_ERROR_NOTICE_ID );
+ downloadBlock( item, onSuccess, onDownloadError );
},
- ],
- } );
+ },
+ ],
+ } );
};
const onSuccess = () => {
const createdBlock = onSelect( item );
const onInstallBlockError = () => {
- createErrorNotice(
- __( 'Block previews can\'t install.' ),
- {
- id: INSTALL_ERROR_NOTICE_ID,
- actions: [
- {
- label: __( 'Retry' ),
- onClick: () => {
- removeNotice( INSTALL_ERROR_NOTICE_ID );
- installBlock( item, noop, onInstallBlockError );
- },
+ createErrorNotice( __( "Block previews can't install." ), {
+ id: INSTALL_ERROR_NOTICE_ID,
+ actions: [
+ {
+ label: __( 'Retry' ),
+ onClick: () => {
+ removeNotice( INSTALL_ERROR_NOTICE_ID );
+ installBlock( item, noop, onInstallBlockError );
},
- {
- label: __( 'Remove' ),
- onClick: () => {
- removeNotice( INSTALL_ERROR_NOTICE_ID );
- removeBlocks( createdBlock.clientId );
- unregisterBlockType( item.name );
- },
+ },
+ {
+ label: __( 'Remove' ),
+ onClick: () => {
+ removeNotice( INSTALL_ERROR_NOTICE_ID );
+ removeBlocks( createdBlock.clientId );
+ unregisterBlockType( item.name );
},
- ],
- }
- );
+ },
+ ],
+ } );
};
installBlock( item, noop, onInstallBlockError );
@@ -110,5 +106,5 @@ export default compose(
downloadBlock( item, onSuccess, onDownloadError );
},
};
- } ),
+ } )
)( DownloadableBlocksList );
diff --git a/packages/block-directory/src/components/downloadable-blocks-panel/index.js b/packages/block-directory/src/components/downloadable-blocks-panel/index.js
index 0936ee3eea6f23..f49e96654acc27 100644
--- a/packages/block-directory/src/components/downloadable-blocks-panel/index.js
+++ b/packages/block-directory/src/components/downloadable-blocks-panel/index.js
@@ -12,9 +12,21 @@ import { Spinner, withSpokenMessages } from '@wordpress/components';
*/
import DownloadableBlocksList from '../downloadable-blocks-list';
-function DownloadableBlocksPanel( { downloadableItems, onSelect, onHover, hasPermission, isLoading, isWaiting, debouncedSpeak } ) {
+function DownloadableBlocksPanel( {
+ downloadableItems,
+ onSelect,
+ onHover,
+ hasPermission,
+ isLoading,
+ isWaiting,
+ debouncedSpeak,
+} ) {
if ( ! hasPermission ) {
- debouncedSpeak( __( 'No blocks found in your library. Please contact your site administrator to install new blocks.' ) );
+ debouncedSpeak(
+ __(
+ 'No blocks found in your library. Please contact your site administrator to install new blocks.'
+ )
+ );
return (
{ __( 'No blocks found in your library.' ) }
@@ -41,7 +53,11 @@ function DownloadableBlocksPanel( { downloadableItems, onSelect, onHover, hasPer
}
const resultsFoundMessage = sprintf(
- _n( 'No blocks found in your library. We did find %d block available for download.', 'No blocks found in your library. We did find %d blocks available for download.', downloadableItems.length ),
+ _n(
+ 'No blocks found in your library. We did find %d block available for download.',
+ 'No blocks found in your library. We did find %d blocks available for download.',
+ downloadableItems.length
+ ),
downloadableItems.length
);
@@ -51,7 +67,11 @@ function DownloadableBlocksPanel( { downloadableItems, onSelect, onHover, hasPer
{ __( 'No blocks found in your library. These blocks can be downloaded and installed:' ) }
-
-
{ title }
+
+ { title }
+
{ rawContent }
@@ -19,7 +21,9 @@ const BlockView = ( { title, rawContent, renderedContent, action, actionText, cl
- { actionText }
+
+ { actionText }
+
);
diff --git a/packages/block-editor/src/components/block-compare/index.js b/packages/block-editor/src/components/block-compare/index.js
index 1b294649e9c627..9706c358026813 100644
--- a/packages/block-editor/src/components/block-compare/index.js
+++ b/packages/block-editor/src/components/block-compare/index.js
@@ -27,7 +27,11 @@ class BlockCompare extends Component {
'editor-block-compare__removed block-editor-block-compare__removed': item.removed,
} );
- return
{ item.value } ;
+ return (
+
+ { item.value }
+
+ );
} );
}
@@ -43,8 +47,12 @@ class BlockCompare extends Component {
const newBlocks = castArray( block );
// Get converted block details
- const newContent = newBlocks.map( ( item ) => getSaveContent( item.name, item.attributes, item.innerBlocks ) );
- const renderedContent = newBlocks.map( ( item ) => getSaveElement( item.name, item.attributes, item.innerBlocks ) );
+ const newContent = newBlocks.map( ( item ) =>
+ getSaveContent( item.name, item.attributes, item.innerBlocks )
+ );
+ const renderedContent = newBlocks.map( ( item ) =>
+ getSaveElement( item.name, item.attributes, item.innerBlocks )
+ );
return {
rawContent: newContent.join( '' ),
diff --git a/packages/block-editor/src/components/block-compare/test/block-view.js b/packages/block-editor/src/components/block-compare/test/block-view.js
index 657f326f44ce9b..755722983351b4 100644
--- a/packages/block-editor/src/components/block-compare/test/block-view.js
+++ b/packages/block-editor/src/components/block-compare/test/block-view.js
@@ -11,7 +11,16 @@ import BlockView from '../block-view';
describe( 'BlockView', () => {
test( 'should match snapshot', () => {
- const wrapper = shallow(
);
+ const wrapper = shallow(
+
+ );
expect( wrapper ).toMatchSnapshot();
} );
diff --git a/packages/block-editor/src/components/block-draggable/index.js b/packages/block-editor/src/components/block-draggable/index.js
index 8818d58be9c2d2..9e78ccf99a231f 100644
--- a/packages/block-editor/src/components/block-draggable/index.js
+++ b/packages/block-editor/src/components/block-draggable/index.js
@@ -4,7 +4,15 @@
import { Draggable } from '@wordpress/components';
import { withSelect } from '@wordpress/data';
-const BlockDraggable = ( { children, clientId, rootClientId, blockElementId, index, onDragStart, onDragEnd } ) => {
+const BlockDraggable = ( {
+ children,
+ clientId,
+ rootClientId,
+ blockElementId,
+ index,
+ onDragStart,
+ onDragEnd,
+} ) => {
const transferData = {
type: 'block',
srcIndex: index,
@@ -19,14 +27,12 @@ const BlockDraggable = ( { children, clientId, rootClientId, blockElementId, ind
onDragStart={ onDragStart }
onDragEnd={ onDragEnd }
>
- {
- ( { onDraggableStart, onDraggableEnd } ) => {
- return children( {
- onDraggableStart,
- onDraggableEnd,
- } );
- }
- }
+ { ( { onDraggableStart, onDraggableEnd } ) => {
+ return children( {
+ onDraggableStart,
+ onDraggableEnd,
+ } );
+ } }
);
};
diff --git a/packages/block-editor/src/components/block-drop-zone/index.js b/packages/block-editor/src/components/block-drop-zone/index.js
index adac488e4c3d7f..a34422523919af 100644
--- a/packages/block-editor/src/components/block-drop-zone/index.js
+++ b/packages/block-editor/src/components/block-drop-zone/index.js
@@ -6,15 +6,8 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- DropZone,
- withFilters,
-} from '@wordpress/components';
-import {
- pasteHandler,
- getBlockTransforms,
- findTransform,
-} from '@wordpress/blocks';
+import { DropZone, withFilters } from '@wordpress/components';
+import { pasteHandler, getBlockTransforms, findTransform } from '@wordpress/blocks';
import { Component } from '@wordpress/element';
import { withDispatch, withSelect } from '@wordpress/data';
import { compose } from '@wordpress/compose';
@@ -58,7 +51,7 @@ class BlockDropZone extends Component {
const { clientId, rootClientId, getBlockIndex } = this.props;
if ( clientId !== undefined ) {
const index = getBlockIndex( clientId, rootClientId );
- return ( position && position.y === 'top' ) ? index : index + 1;
+ return position && position.y === 'top' ? index : index + 1;
}
}
@@ -84,21 +77,29 @@ class BlockDropZone extends Component {
}
onDrop( event, position ) {
- const { rootClientId: dstRootClientId, clientId: dstClientId, getClientIdsOfDescendants, getBlockIndex } = this.props;
+ const {
+ rootClientId: dstRootClientId,
+ clientId: dstClientId,
+ getClientIdsOfDescendants,
+ getBlockIndex,
+ } = this.props;
const { srcRootClientId, srcClientId, srcIndex, type } = parseDropEvent( event );
const isBlockDropType = ( dropType ) => dropType === 'block';
const isSameLevel = ( srcRoot, dstRoot ) => {
// Note that rootClientId of top-level blocks will be undefined OR a void string,
// so we also need to account for that case separately.
- return ( srcRoot === dstRoot ) || ( ! srcRoot === true && ! dstRoot === true );
+ return srcRoot === dstRoot || ( ! srcRoot === true && ! dstRoot === true );
};
const isSameBlock = ( src, dst ) => src === dst;
- const isSrcBlockAnAncestorOfDstBlock = ( src, dst ) => getClientIdsOfDescendants( [ src ] ).some( ( id ) => id === dst );
+ const isSrcBlockAnAncestorOfDstBlock = ( src, dst ) =>
+ getClientIdsOfDescendants( [ src ] ).some( ( id ) => id === dst );
- if ( ! isBlockDropType( type ) ||
+ if (
+ ! isBlockDropType( type ) ||
isSameBlock( srcClientId, dstClientId ) ||
- isSrcBlockAnAncestorOfDstBlock( srcClientId, dstClientId || dstRootClientId ) ) {
+ isSrcBlockAnAncestorOfDstBlock( srcClientId, dstClientId || dstRootClientId )
+ ) {
return;
}
@@ -106,7 +107,10 @@ class BlockDropZone extends Component {
const positionIndex = this.getInsertIndex( position );
// If the block is kept at the same level and moved downwards,
// subtract to account for blocks shifting upward to occupy its old position.
- const insertIndex = dstIndex && srcIndex < dstIndex && isSameLevel( srcRootClientId, dstRootClientId ) ? positionIndex - 1 : positionIndex;
+ const insertIndex =
+ dstIndex && srcIndex < dstIndex && isSameLevel( srcRootClientId, dstRootClientId )
+ ? positionIndex - 1
+ : positionIndex;
this.props.moveBlockToPosition( srcClientId, srcRootClientId, insertIndex );
}
@@ -136,11 +140,9 @@ class BlockDropZone extends Component {
export default compose(
withDispatch( ( dispatch, ownProps ) => {
- const {
- insertBlocks,
- updateBlockAttributes,
- moveBlockToPosition,
- } = dispatch( 'core/block-editor' );
+ const { insertBlocks, updateBlockAttributes, moveBlockToPosition } = dispatch(
+ 'core/block-editor'
+ );
return {
insertBlocks( blocks, index ) {
@@ -158,7 +160,9 @@ export default compose(
};
} ),
withSelect( ( select, { rootClientId } ) => {
- const { getClientIdsOfDescendants, getTemplateLock, getBlockIndex } = select( 'core/block-editor' );
+ const { getClientIdsOfDescendants, getTemplateLock, getBlockIndex } = select(
+ 'core/block-editor'
+ );
return {
isLockedAll: getTemplateLock( rootClientId ) === 'all',
getClientIdsOfDescendants,
diff --git a/packages/block-editor/src/components/block-edit/context.js b/packages/block-editor/src/components/block-edit/context.js
index 863cdc3e5d6fa5..443624522e2146 100644
--- a/packages/block-editor/src/components/block-edit/context.js
+++ b/packages/block-editor/src/components/block-edit/context.js
@@ -29,18 +29,16 @@ export { Provider as BlockEditContextProvider };
*
* @return {Component} Enhanced component with injected context as props.
*/
-export const withBlockEditContext = ( mapContextToProps ) => createHigherOrderComponent( ( OriginalComponent ) => {
- return ( props ) => (
-
- { ( context ) => (
-
- );
-}, 'withBlockEditContext' );
+export const withBlockEditContext = ( mapContextToProps ) =>
+ createHigherOrderComponent( ( OriginalComponent ) => {
+ return ( props ) => (
+
+ { ( context ) => (
+
+ );
+ }, 'withBlockEditContext' );
/**
* A Higher Order Component used to render conditionally the wrapped
@@ -52,10 +50,6 @@ export const withBlockEditContext = ( mapContextToProps ) => createHigherOrderCo
*/
export const ifBlockEditSelected = createHigherOrderComponent( ( OriginalComponent ) => {
return ( props ) => (
-
- { ( { isSelected } ) => isSelected && (
-
+
{ ( { isSelected } ) => isSelected &&
);
}, 'ifBlockEditSelected' );
diff --git a/packages/block-editor/src/components/block-edit/edit.js b/packages/block-editor/src/components/block-edit/edit.js
index c7e0ba97e305ed..9ee82889bd89ed 100644
--- a/packages/block-editor/src/components/block-edit/edit.js
+++ b/packages/block-editor/src/components/block-edit/edit.js
@@ -18,9 +18,9 @@ export const Edit = ( props ) => {
}
// Generate a class name for the block's editable form
- const generatedClassName = hasBlockSupport( blockType, 'className', true ) ?
- getBlockDefaultClassName( name ) :
- null;
+ const generatedClassName = hasBlockSupport( blockType, 'className', true )
+ ? getBlockDefaultClassName( name )
+ : null;
const className = classnames( generatedClassName, attributes.className );
// `edit` and `save` are functions or components describing the markup
diff --git a/packages/block-editor/src/components/block-edit/edit.native.js b/packages/block-editor/src/components/block-edit/edit.native.js
index 8a4d0ad8350e99..2577ad3e0733e7 100644
--- a/packages/block-editor/src/components/block-edit/edit.native.js
+++ b/packages/block-editor/src/components/block-edit/edit.native.js
@@ -14,9 +14,7 @@ export const Edit = ( props ) => {
const Component = blockType.edit;
- return (
-
- );
+ return
;
};
export default withFilters( 'editor.BlockEdit' )( Edit );
diff --git a/packages/block-editor/src/components/block-edit/index.js b/packages/block-editor/src/components/block-edit/index.js
index 63c475a50692ff..59c4df9e3543f4 100644
--- a/packages/block-editor/src/components/block-edit/index.js
+++ b/packages/block-editor/src/components/block-edit/index.js
@@ -21,10 +21,7 @@ class BlockEdit extends Component {
// It is important to return the same object if props haven't changed
// to avoid unnecessary rerenders.
// See https://reactjs.org/docs/context.html#caveats.
- this.propsToContext = memize(
- this.propsToContext.bind( this ),
- { maxSize: 1 }
- );
+ this.propsToContext = memize( this.propsToContext.bind( this ), { maxSize: 1 } );
}
propsToContext( name, isSelected, clientId, onFocus, onCaretVerticalPositionChange ) {
@@ -33,7 +30,13 @@ class BlockEdit extends Component {
render() {
const { name, isSelected, clientId, onFocus, onCaretVerticalPositionChange } = this.props;
- const value = this.propsToContext( name, isSelected, clientId, onFocus, onCaretVerticalPositionChange );
+ const value = this.propsToContext(
+ name,
+ isSelected,
+ clientId,
+ onFocus,
+ onCaretVerticalPositionChange
+ );
return (
diff --git a/packages/block-editor/src/components/block-edit/test/edit.js b/packages/block-editor/src/components/block-edit/test/edit.js
index d09ce608cc14bf..0a24f55ce2471e 100644
--- a/packages/block-editor/src/components/block-edit/test/edit.js
+++ b/packages/block-editor/src/components/block-edit/test/edit.js
@@ -7,11 +7,7 @@ import { noop } from 'lodash';
/**
* WordPress dependencies
*/
-import {
- registerBlockType,
- unregisterBlockType,
- getBlockTypes,
-} from '@wordpress/blocks';
+import { registerBlockType, unregisterBlockType, getBlockTypes } from '@wordpress/blocks';
/**
* Internal dependencies
@@ -70,9 +66,7 @@ describe( 'Edit', () => {
title: 'block title',
} );
- const wrapper = shallow(
-
+
+ ),
};
}
const renderedIcon =
{ renderedIcon }
diff --git a/packages/block-editor/src/components/block-icon/index.native.js b/packages/block-editor/src/components/block-icon/index.native.js
index 4dddda5ecce8f0..5708c21d863189 100644
--- a/packages/block-editor/src/components/block-icon/index.native.js
+++ b/packages/block-editor/src/components/block-icon/index.native.js
@@ -12,19 +12,21 @@ import { Path, Icon, SVG } from '@wordpress/components';
export default function BlockIcon( { icon, showColors = false } ) {
if ( get( icon, [ 'src' ] ) === 'block-default' ) {
icon = {
- src:
+
+ ),
};
}
const renderedIcon =
- { renderedIcon }
-
- );
+ return { renderedIcon } ;
}
diff --git a/packages/block-editor/src/components/block-icon/test/index.js b/packages/block-editor/src/components/block-icon/test/index.js
index 8c74330ad34d49..36b01445309776 100644
--- a/packages/block-editor/src/components/block-icon/test/index.js
+++ b/packages/block-editor/src/components/block-icon/test/index.js
@@ -39,7 +39,9 @@ describe( 'BlockIcon', () => {
} );
it( 'adds background and foreground styles when colors are enabled', () => {
- const wrapper = shallow(
+
+
- { ( fills ) => ! isEmpty( fills ) && (
-
- { fills }
-
- ) }
+ { ( fills ) =>
+ ! isEmpty( fills ) && (
+
+ { fills }
+
+ )
+ }
-
);
}
export default withSelect( ( select, { rootClientId } ) => {
- const {
- getBlockOrder,
- canInsertBlockType,
- getTemplateLock,
- } = select( 'core/block-editor' );
+ const { getBlockOrder, canInsertBlockType, getTemplateLock } = select( 'core/block-editor' );
return {
isLocked: !! getTemplateLock( rootClientId ),
diff --git a/packages/block-editor/src/components/block-list-appender/index.native.js b/packages/block-editor/src/components/block-list-appender/index.native.js
index 6d8fb4e6cee976..b5dff1b57b0437 100644
--- a/packages/block-editor/src/components/block-list-appender/index.native.js
+++ b/packages/block-editor/src/components/block-list-appender/index.native.js
@@ -27,9 +27,7 @@ function BlockListAppender( {
}
if ( CustomAppender ) {
- return (
-
- { children }
-
- );
+ return { children } ;
};
export default BlockAsyncModeProvider;
diff --git a/packages/block-editor/src/components/block-list/block-html.js b/packages/block-editor/src/components/block-list/block-html.js
index ce70122701828e..d9f0bd7f8f9483 100644
--- a/packages/block-editor/src/components/block-list/block-html.js
+++ b/packages/block-editor/src/components/block-list/block-html.js
@@ -1,4 +1,3 @@
-
/**
* External dependencies
*/
@@ -10,7 +9,13 @@ import { isEqual } from 'lodash';
*/
import { Component } from '@wordpress/element';
import { compose } from '@wordpress/compose';
-import { getBlockAttributes, getBlockContent, getBlockType, isValidBlockContent, getSaveContent } from '@wordpress/blocks';
+import {
+ getBlockAttributes,
+ getBlockContent,
+ getBlockType,
+ isValidBlockContent,
+ getSaveContent,
+} from '@wordpress/blocks';
import { withSelect, withDispatch } from '@wordpress/data';
export class BlockHTML extends Component {
@@ -71,7 +76,11 @@ export default compose( [
} ) ),
withDispatch( ( dispatch ) => ( {
onChange( clientId, attributes, originalContent, isValid ) {
- dispatch( 'core/block-editor' ).updateBlock( clientId, { attributes, originalContent, isValid } );
+ dispatch( 'core/block-editor' ).updateBlock( clientId, {
+ attributes,
+ originalContent,
+ isValid,
+ } );
},
} ) ),
] )( BlockHTML );
diff --git a/packages/block-editor/src/components/block-list/block-invalid-warning.js b/packages/block-editor/src/components/block-list/block-invalid-warning.js
index f28c4224058356..8ce9fcf8d03d32 100644
--- a/packages/block-editor/src/components/block-list/block-invalid-warning.js
+++ b/packages/block-editor/src/components/block-list/block-invalid-warning.js
@@ -4,11 +4,7 @@
import { __, _x } from '@wordpress/i18n';
import { Button, Modal } from '@wordpress/components';
import { Component } from '@wordpress/element';
-import {
- getBlockType,
- createBlock,
- rawHandler,
-} from '@wordpress/blocks';
+import { getBlockType, createBlock, rawHandler } from '@wordpress/blocks';
import { compose } from '@wordpress/compose';
import { withDispatch, withSelect } from '@wordpress/data';
@@ -36,7 +32,13 @@ export class BlockInvalidWarning extends Component {
}
render() {
- const { convertToHTML, convertToBlocks, convertToClassic, attemptBlockRecovery, block } = this.props;
+ const {
+ convertToHTML,
+ convertToBlocks,
+ convertToClassic,
+ attemptBlockRecovery,
+ block,
+ } = this.props;
const hasHTMLBlock = !! getBlockType( 'core/html' );
const { compare } = this.state;
const hiddenActions = [
@@ -49,10 +51,8 @@ export class BlockInvalidWarning extends Component {
- {
- // translators: Button to fix block content
- _x( 'Resolve', 'imperative verb' )
- }
+ { // translators: Button to fix block content
+ _x( 'Resolve', 'imperative verb' ) }
,
hasHTMLBlock && (
@@ -87,16 +87,20 @@ export class BlockInvalidWarning extends Component {
}
}
-const blockToClassic = ( block ) => createBlock( 'core/freeform', {
- content: block.originalContent,
-} );
-const blockToHTML = ( block ) => createBlock( 'core/html', {
- content: block.originalContent,
-} );
-const blockToBlocks = ( block ) => rawHandler( {
- HTML: block.originalContent,
-} );
-const recoverBlock = ( { name, attributes, innerBlocks } ) => createBlock( name, attributes, innerBlocks );
+const blockToClassic = ( block ) =>
+ createBlock( 'core/freeform', {
+ content: block.originalContent,
+ } );
+const blockToHTML = ( block ) =>
+ createBlock( 'core/html', {
+ content: block.originalContent,
+ } );
+const blockToBlocks = ( block ) =>
+ rawHandler( {
+ HTML: block.originalContent,
+ } );
+const recoverBlock = ( { name, attributes, innerBlocks } ) =>
+ createBlock( name, attributes, innerBlocks );
export default compose( [
withSelect( ( select, { clientId } ) => ( {
diff --git a/packages/block-editor/src/components/block-list/block-mobile-floating-toolbar.native.js b/packages/block-editor/src/components/block-list/block-mobile-floating-toolbar.native.js
index cdd54ffdcaca1b..cd2d43f56162d5 100644
--- a/packages/block-editor/src/components/block-list/block-mobile-floating-toolbar.native.js
+++ b/packages/block-editor/src/components/block-list/block-mobile-floating-toolbar.native.js
@@ -21,16 +21,16 @@ function FloatingToolbar( { children } ) {
return (
{ children }
+ >
+ { children }
);
} }
-
);
}
diff --git a/packages/block-editor/src/components/block-list/block-mobile-toolbar.native.js b/packages/block-editor/src/components/block-list/block-mobile-toolbar.native.js
index b6fbfd0e49febb..d40c5f19783509 100644
--- a/packages/block-editor/src/components/block-list/block-mobile-toolbar.native.js
+++ b/packages/block-editor/src/components/block-list/block-mobile-toolbar.native.js
@@ -18,11 +18,7 @@ import styles from './block-mobile-toolbar.scss';
import BlockMover from '../block-mover';
import { BlockSettingsButton } from '../block-settings';
-const BlockMobileToolbar = ( {
- clientId,
- onDelete,
- order,
-} ) => (
+const BlockMobileToolbar = ( { clientId, onDelete, order } ) => (
{
- const {
- getBlockIndex,
- } = select( 'core/block-editor' );
+ const { getBlockIndex } = select( 'core/block-editor' );
return {
order: getBlockIndex( clientId ),
@@ -63,5 +55,5 @@ export default compose(
removeBlock( clientId, rootClientId );
},
};
- } ),
+ } )
)( BlockMobileToolbar );
diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
index 777cb54933a80b..daf86ca3b0819b 100644
--- a/packages/block-editor/src/components/block-list/block.js
+++ b/packages/block-editor/src/components/block-list/block.js
@@ -9,11 +9,7 @@ import { animated } from 'react-spring/web.cjs';
* WordPress dependencies
*/
import { useRef, useEffect, useLayoutEffect, useState } from '@wordpress/element';
-import {
- focus,
- isTextField,
- placeCaretAtHorizontalEdge,
-} from '@wordpress/dom';
+import { focus, isTextField, placeCaretAtHorizontalEdge } from '@wordpress/dom';
import { BACKSPACE, DELETE, ENTER, ESCAPE } from '@wordpress/keycodes';
import {
getBlockType,
@@ -24,10 +20,7 @@ import {
} from '@wordpress/blocks';
import { KeyboardShortcuts, withFilters } from '@wordpress/components';
import { __, sprintf } from '@wordpress/i18n';
-import {
- withDispatch,
- withSelect,
-} from '@wordpress/data';
+import { withDispatch, withSelect } from '@wordpress/data';
import { withViewportMatch } from '@wordpress/viewport';
import { compose, pure, ifCondition } from '@wordpress/compose';
@@ -152,12 +145,7 @@ function BlockListBlock( {
* @see https://developer.mozilla.org/en-US/docs/Web/Events/mouseenter
*/
const maybeHover = () => {
- if (
- isBlockHovered ||
- isPartOfMultiSelection ||
- isSelected ||
- hadTouchStart.current
- ) {
+ if ( isBlockHovered || isPartOfMultiSelection || isSelected || hadTouchStart.current ) {
return;
}
setBlockHoveredState( true );
@@ -256,7 +244,13 @@ function BlockListBlock( {
}, [ isFirstMultiSelected ] );
// Block Reordering animation
- const animationStyle = useMovingAnimation( wrapper, isSelected || isPartOfMultiSelection, isSelected || isFirstMultiSelected, enableAnimation, animateOnChange );
+ const animationStyle = useMovingAnimation(
+ wrapper,
+ isSelected || isPartOfMultiSelection,
+ isSelected || isFirstMultiSelected,
+ enableAnimation,
+ animateOnChange
+ );
// Focus the breadcrumb if the wrapper is focused on navigation mode.
// Focus the first editable or the wrapper if edit mode.
@@ -296,11 +290,8 @@ function BlockListBlock( {
// ENTER/BACKSPACE Shortcuts are only available if the wrapper is focused
// and the block is not locked.
- const canUseShortcuts = (
- isSelected &&
- ! isLocked &&
- ( target === wrapper.current || target === breadcrumb.current )
- );
+ const canUseShortcuts =
+ isSelected && ! isLocked && ( target === wrapper.current || target === breadcrumb.current );
const isEditMode = ! isNavigationMode;
switch ( keyCode ) {
@@ -321,10 +312,7 @@ function BlockListBlock( {
}
break;
case ESCAPE:
- if (
- isSelected &&
- isEditMode
- ) {
+ if ( isSelected && isEditMode ) {
enableNavigationMode();
wrapper.current.focus();
}
@@ -350,8 +338,8 @@ function BlockListBlock( {
event.preventDefault();
}
- // Avoid triggering multi-selection if we click toolbars/inspectors
- // and all elements that are outside the Block Edit DOM tree.
+ // Avoid triggering multi-selection if we click toolbars/inspectors
+ // and all elements that are outside the Block Edit DOM tree.
} else if ( blockNodeRef.current.contains( event.target ) ) {
onSelectionStart( clientId );
@@ -384,18 +372,14 @@ function BlockListBlock( {
// If the block is selected and we're typing the block should not appear.
// Empty paragraph blocks should always show up as unselected.
- const showInserterShortcuts = ! isNavigationMode && ( isSelected || isHovered ) && isEmptyDefaultBlock && isValid;
- const showEmptyBlockSideInserter = ! isNavigationMode && ( isSelected || isHovered || isLast ) && isEmptyDefaultBlock && isValid;
+ const showInserterShortcuts =
+ ! isNavigationMode && ( isSelected || isHovered ) && isEmptyDefaultBlock && isValid;
+ const showEmptyBlockSideInserter =
+ ! isNavigationMode && ( isSelected || isHovered || isLast ) && isEmptyDefaultBlock && isValid;
const shouldAppearSelected =
- ! isFocusMode &&
- ! showEmptyBlockSideInserter &&
- isSelected &&
- ! isTypingWithinBlock;
+ ! isFocusMode && ! showEmptyBlockSideInserter && isSelected && ! isTypingWithinBlock;
const shouldAppearHovered =
- ! isFocusMode &&
- ! hasFixedToolbar &&
- isHovered &&
- ! isEmptyDefaultBlock;
+ ! isFocusMode && ! hasFixedToolbar && isHovered && ! isEmptyDefaultBlock;
// We render block movers and block settings to keep them tabbale even if hidden
const shouldRenderMovers =
! isNavigationMode &&
@@ -410,17 +394,14 @@ function BlockListBlock( {
! isNavigationMode &&
! hasFixedToolbar &&
! showEmptyBlockSideInserter &&
- (
- ( isSelected && ( ! isTypingWithinBlock || isCaretWithinFormattedText ) ) ||
- isFirstMultiSelected
- );
+ ( ( isSelected && ( ! isTypingWithinBlock || isCaretWithinFormattedText ) ) ||
+ isFirstMultiSelected );
const shouldShowMobileToolbar = ! isNavigationMode && shouldAppearSelected;
// Insertion point can only be made visible if the block is at the
// the extent of a multi-selection, or not in a multi-selection.
const shouldShowInsertionPoint =
- ( isPartOfMultiSelection && isFirstMultiSelected ) ||
- ! isPartOfMultiSelection;
+ ( isPartOfMultiSelection && isFirstMultiSelected ) || ! isPartOfMultiSelection;
// The wp-block className is important for editor styles.
// Generate the wrapper class names handling the different states of the block.
@@ -492,47 +473,31 @@ function BlockListBlock( {
tagName={ animated.div }
{ ...wrapperProps }
style={
- wrapperProps && wrapperProps.style ?
- {
- ...wrapperProps.style,
- ...animationStyle,
- } :
- animationStyle
+ wrapperProps && wrapperProps.style
+ ? {
+ ...wrapperProps.style,
+ ...animationStyle,
+ }
+ : animationStyle
}
>
{ shouldShowInsertionPoint && (
-
{ shouldRenderMovers && (
) }
- { shouldShowBreadcrumb && (
-
- ) }
+ { shouldShowBreadcrumb &&
}
{ ( shouldShowContextualToolbar || isForcingContextualToolbar.current ) && (
) }
- {
- ! isNavigationMode &&
+ { ! isNavigationMode &&
! shouldShowContextualToolbar &&
isSelected &&
! hasFixedToolbar &&
@@ -553,8 +517,7 @@ function BlockListBlock( {
'alt+f10': forceFocusedContextualToolbar,
} }
/>
- )
- }
+ ) }
{ isValid && blockEdit }
- { isValid && mode === 'html' && (
-
- { getSaveElement( blockType, attributes ) }
-
,
+ { getSaveElement( blockType, attributes ) }
,
] }
{ !! hasError &&
+ { showFloatingToolbar && (
+
- ) }
+ ) }
{ isValid && this.getBlockForType() }
- { ! isValid &&
-
{ isSelected &&
+ ) }
+ >
{ blockClientIds.map( ( clientId, index ) => {
- const isBlockInSelection = hasMultiSelection ?
- multiSelectedBlockClientIds.includes( clientId ) :
- selectedBlockClientId === clientId;
+ const isBlockInSelection = hasMultiSelection
+ ? multiSelectedBlockClientIds.includes( clientId )
+ : selectedBlockClientId === clientId;
return (
);
}
@@ -277,18 +269,11 @@ export default compose( [
selectedBlockClientId: getSelectedBlockClientId(),
multiSelectedBlockClientIds: getMultiSelectedBlockClientIds(),
hasMultiSelection: hasMultiSelection(),
- enableAnimation: (
- ! isTyping() &&
- getGlobalBlockCount() <= BLOCK_ANIMATION_THRESHOLD
- ),
+ enableAnimation: ! isTyping() && getGlobalBlockCount() <= BLOCK_ANIMATION_THRESHOLD,
};
} ),
withDispatch( ( dispatch ) => {
- const {
- startMultiSelect,
- stopMultiSelect,
- multiSelect,
- } = dispatch( 'core/block-editor' );
+ const { startMultiSelect, stopMultiSelect, multiSelect } = dispatch( 'core/block-editor' );
return {
onStartMultiSelect: startMultiSelect,
diff --git a/packages/block-editor/src/components/block-list/index.native.js b/packages/block-editor/src/components/block-list/index.native.js
index 05c2898899ca39..2680248aac6aa9 100644
--- a/packages/block-editor/src/components/block-list/index.native.js
+++ b/packages/block-editor/src/components/block-list/index.native.js
@@ -35,7 +35,9 @@ export class BlockList extends Component {
this.onCaretVerticalPositionChange = this.onCaretVerticalPositionChange.bind( this );
this.scrollViewInnerRef = this.scrollViewInnerRef.bind( this );
this.addBlockToEndOfPost = this.addBlockToEndOfPost.bind( this );
- this.shouldFlatListPreventAutomaticScroll = this.shouldFlatListPreventAutomaticScroll.bind( this );
+ this.shouldFlatListPreventAutomaticScroll = this.shouldFlatListPreventAutomaticScroll.bind(
+ this
+ );
}
addBlockToEndOfPost( newBlock ) {
@@ -43,11 +45,18 @@ export class BlockList extends Component {
}
blockHolderBorderStyle() {
- return this.props.isFullyBordered ? styles.blockHolderFullBordered : styles.blockHolderSemiBordered;
+ return this.props.isFullyBordered
+ ? styles.blockHolderFullBordered
+ : styles.blockHolderSemiBordered;
}
onCaretVerticalPositionChange( targetId, caretY, previousCaretY ) {
- KeyboardAwareFlatList.handleCaretVerticalPositionChange( this.scrollViewRef, targetId, caretY, previousCaretY );
+ KeyboardAwareFlatList.handleCaretVerticalPositionChange(
+ this.scrollViewRef,
+ targetId,
+ caretY,
+ previousCaretY
+ );
}
scrollViewInnerRef( ref ) {
@@ -70,15 +79,24 @@ export class BlockList extends Component {
}
render() {
- const { clearSelectedBlock, blockClientIds, isFullyBordered, title, header, withFooter = true, renderAppender, isFirstBlock, selectedBlockParentId } = this.props;
+ const {
+ clearSelectedBlock,
+ blockClientIds,
+ isFullyBordered,
+ title,
+ header,
+ withFooter = true,
+ renderAppender,
+ isFirstBlock,
+ selectedBlockParentId,
+ } = this.props;
const showFloatingToolbar = isFirstBlock && selectedBlockParentId !== '';
return (
-
- { showFloatingToolbar &&
+ { showFloatingToolbar && (
+
);
}
@@ -119,7 +137,10 @@ export class BlockList extends Component {
}
renderItem( { item: clientId, index } ) {
- const blockHolderFocusedStyle = this.props.getStylesFromColorScheme( styles.blockHolderFocused, styles.blockHolderFocusedDark );
+ const blockHolderFocusedStyle = this.props.getStylesFromColorScheme(
+ styles.blockHolderFocused,
+ styles.blockHolderFocusedDark
+ );
const { shouldShowBlockAtIndex, shouldShowInsertionPoint } = this.props;
return (
@@ -133,18 +154,25 @@ export class BlockList extends Component {
onCaretVerticalPositionChange={ this.onCaretVerticalPositionChange }
borderStyle={ this.blockHolderBorderStyle() }
focusedBorderColor={ blockHolderFocusedStyle.borderColor }
- /> ) }
+ />
+ ) }
);
}
renderAddBlockSeparator() {
- const lineStyle = this.props.getStylesFromColorScheme( styles.lineStyleAddHere, styles.lineStyleAddHereDark );
- const labelStyle = this.props.getStylesFromColorScheme( styles.labelStyleAddHere, styles.labelStyleAddHereDark );
+ const lineStyle = this.props.getStylesFromColorScheme(
+ styles.lineStyleAddHere,
+ styles.lineStyleAddHereDark
+ );
+ const labelStyle = this.props.getStylesFromColorScheme(
+ styles.labelStyleAddHere,
+ styles.labelStyleAddHereDark
+ );
return (
-
+
{ __( 'ADD BLOCK HERE' ) }
+ { __( 'ADD BLOCK HERE' ) }
);
@@ -153,9 +181,11 @@ export class BlockList extends Component {
renderBlockListFooter() {
const paragraphBlock = createBlock( 'core/paragraph' );
return (
- {
- this.addBlockToEndOfPost( paragraphBlock );
- } } >
+ {
+ this.addBlockToEndOfPost( paragraphBlock );
+ } }
+ >
);
@@ -196,13 +226,13 @@ export default compose( [
const selectedBlockParentId = getBlockRootClientId( selectedBlockClientId );
const shouldShowBlockAtIndex = ( index ) => {
- const shouldHideBlockAtIndex = (
- ! isSelectedGroup && blockInsertionPointIsVisible &&
+ const shouldHideBlockAtIndex =
+ ! isSelectedGroup &&
+ blockInsertionPointIsVisible &&
// if `index` === `insertionPoint.index`, then block is replaceable
index === insertionPoint.index &&
// only hide selected block
- index === selectedBlockIndex
- );
+ index === selectedBlockIndex;
return ! shouldHideBlockAtIndex;
};
@@ -218,11 +248,7 @@ export default compose( [
};
} ),
withDispatch( ( dispatch ) => {
- const {
- insertBlock,
- replaceBlock,
- clearSelectedBlock,
- } = dispatch( 'core/block-editor' );
+ const { insertBlock, replaceBlock, clearSelectedBlock } = dispatch( 'core/block-editor' );
return {
clearSelectedBlock,
diff --git a/packages/block-editor/src/components/block-list/insertion-point.js b/packages/block-editor/src/components/block-list/insertion-point.js
index daa1a0f408f4e9..cf137edaee7021 100644
--- a/packages/block-editor/src/components/block-list/insertion-point.js
+++ b/packages/block-editor/src/components/block-list/insertion-point.js
@@ -44,11 +44,7 @@ class BlockInsertionPoint extends Component {
render() {
const { isInserterFocused } = this.state;
- const {
- showInsertionPoint,
- rootClientId,
- clientId,
- } = this.props;
+ const { showInsertionPoint, rootClientId, clientId } = this.props;
return (
@@ -65,34 +61,29 @@ class BlockInsertionPoint extends Component {
//
// See: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus
tabIndex={ -1 }
- className={
- classnames( 'editor-block-list__insertion-point-inserter block-editor-block-list__insertion-point-inserter', {
+ className={ classnames(
+ 'editor-block-list__insertion-point-inserter block-editor-block-list__insertion-point-inserter',
+ {
'is-visible': isInserterFocused,
- } )
- }
+ }
+ ) }
>
-
);
}
}
export default withSelect( ( select, { clientId, rootClientId } ) => {
- const {
- getBlockIndex,
- getBlockInsertionPoint,
- isBlockInsertionPointVisible,
- } = select( 'core/block-editor' );
+ const { getBlockIndex, getBlockInsertionPoint, isBlockInsertionPointVisible } = select(
+ 'core/block-editor'
+ );
const blockIndex = getBlockIndex( clientId, rootClientId );
const insertionPoint = getBlockInsertionPoint();
- const showInsertionPoint = (
+ const showInsertionPoint =
isBlockInsertionPointVisible() &&
insertionPoint.index === blockIndex &&
- insertionPoint.rootClientId === rootClientId
- );
+ insertionPoint.rootClientId === rootClientId;
return { showInsertionPoint };
} )( BlockInsertionPoint );
diff --git a/packages/block-editor/src/components/block-list/insertion-point.native.js b/packages/block-editor/src/components/block-list/insertion-point.native.js
index d6caa88f407fba..caa7ec96ff1c05 100644
--- a/packages/block-editor/src/components/block-list/insertion-point.native.js
+++ b/packages/block-editor/src/components/block-list/insertion-point.native.js
@@ -20,27 +20,24 @@ const BlockInsertionPoint = ( { showInsertionPoint } ) => {
}
return (
-
+
{ __( 'ADD BLOCK HERE' ) }
+ { __( 'ADD BLOCK HERE' ) }
);
};
export default withSelect( ( select, { clientId, rootClientId } ) => {
- const {
- getBlockIndex,
- getBlockInsertionPoint,
- isBlockInsertionPointVisible,
- } = select( 'core/block-editor' );
+ const { getBlockIndex, getBlockInsertionPoint, isBlockInsertionPointVisible } = select(
+ 'core/block-editor'
+ );
const blockIndex = getBlockIndex( clientId, rootClientId );
const insertionPoint = getBlockInsertionPoint();
- const showInsertionPoint = (
+ const showInsertionPoint =
isBlockInsertionPointVisible() &&
insertionPoint.index === blockIndex &&
- insertionPoint.rootClientId === rootClientId
- );
+ insertionPoint.rootClientId === rootClientId;
return { showInsertionPoint };
} )( BlockInsertionPoint );
diff --git a/packages/block-editor/src/components/block-list/moving-animation.js b/packages/block-editor/src/components/block-list/moving-animation.js
index afa36bb40304d2..8c538277725753 100644
--- a/packages/block-editor/src/components/block-list/moving-animation.js
+++ b/packages/block-editor/src/components/block-list/moving-animation.js
@@ -44,7 +44,13 @@ const getAbsolutePosition = ( element ) => {
*
* @return {Object} Style object.
*/
-function useMovingAnimation( ref, isSelected, adjustScrolling, enableAnimation, triggerAnimationOnChange ) {
+function useMovingAnimation(
+ ref,
+ isSelected,
+ adjustScrolling,
+ enableAnimation,
+ triggerAnimationOnChange
+) {
const prefersReducedMotion = useReducedMotion() || ! enableAnimation;
const [ triggeredAnimation, triggerAnimation ] = useReducer( counterReducer, 0 );
const [ finishedAnimation, endAnimation ] = useReducer( counterReducer, 0 );
@@ -80,11 +86,15 @@ function useMovingAnimation( ref, isSelected, adjustScrolling, enableAnimation,
const newTransform = {
x: previous ? previous.left - destination.left : 0,
y: previous ? previous.top - destination.top : 0,
- scrollTop: previous && scrollContainer ? scrollContainer.scrollTop - previous.top + destination.top : 0,
+ scrollTop:
+ previous && scrollContainer
+ ? scrollContainer.scrollTop - previous.top + destination.top
+ : 0,
};
- ref.current.style.transform = newTransform.x === 0 && newTransform.y === 0 ?
- undefined :
- `translate3d(${ newTransform.x }px,${ newTransform.y }px,0)`;
+ ref.current.style.transform =
+ newTransform.x === 0 && newTransform.y === 0
+ ? undefined
+ : `translate3d(${ newTransform.x }px,${ newTransform.y }px,0)`;
triggerAnimation();
setTransform( newTransform );
}, [ triggerAnimationOnChange ] );
@@ -109,25 +119,17 @@ function useMovingAnimation( ref, isSelected, adjustScrolling, enableAnimation,
} );
// Dismiss animations if disabled.
- return prefersReducedMotion ?
- {} :
- {
- transformOrigin: 'center',
- transform: interpolate(
- [
- animationProps.x,
- animationProps.y,
- ],
- ( x, y ) => x === 0 && y === 0 ? undefined : `translate3d(${ x }px,${ y }px,0)`
- ),
- zIndex: interpolate(
- [
- animationProps.x,
- animationProps.y,
- ],
- ( x, y ) => ! isSelected || ( x === 0 && y === 0 ) ? undefined : `1`
- ),
- };
+ return prefersReducedMotion
+ ? {}
+ : {
+ transformOrigin: 'center',
+ transform: interpolate( [ animationProps.x, animationProps.y ], ( x, y ) =>
+ x === 0 && y === 0 ? undefined : `translate3d(${ x }px,${ y }px,0)`
+ ),
+ zIndex: interpolate( [ animationProps.x, animationProps.y ], ( x, y ) =>
+ ! isSelected || ( x === 0 && y === 0 ) ? undefined : `1`
+ ),
+ };
}
export default useMovingAnimation;
diff --git a/packages/block-editor/src/components/block-list/multi-controls.js b/packages/block-editor/src/components/block-list/multi-controls.js
index e4dd88aeda030f..2cee3e43d8ed7c 100644
--- a/packages/block-editor/src/components/block-list/multi-controls.js
+++ b/packages/block-editor/src/components/block-list/multi-controls.js
@@ -8,26 +8,16 @@ import { withSelect } from '@wordpress/data';
*/
import BlockMover from '../block-mover';
-function BlockListMultiControls( {
- multiSelectedBlockClientIds,
- isSelecting,
-} ) {
+function BlockListMultiControls( { multiSelectedBlockClientIds, isSelecting } ) {
if ( isSelecting ) {
return null;
}
- return (
-
+
+);
export default NavigateUp;
diff --git a/packages/block-editor/src/components/block-list/test/block-html.js b/packages/block-editor/src/components/block-list/test/block-html.js
index 442e55de3f5bba..e3d876382585c6 100644
--- a/packages/block-editor/src/components/block-list/test/block-html.js
+++ b/packages/block-editor/src/components/block-list/test/block-html.js
@@ -27,7 +27,9 @@ describe( 'BlockHTML', () => {
describe( 'block content', () => {
it( 'use originalContent for an invalid block', () => {
- const wrapper = shallow(
- {
- ( { onDraggableStart, onDraggableEnd } ) => (
-
- { icon }
-
- ) }
+ { ( { onDraggableStart, onDraggableEnd } ) => (
+
+ { icon }
+
+ ) }
);
};
diff --git a/packages/block-editor/src/components/block-mover/icons.js b/packages/block-editor/src/components/block-mover/icons.js
index 06bf5601f439db..dd1d0ca06d3120 100644
--- a/packages/block-editor/src/components/block-mover/icons.js
+++ b/packages/block-editor/src/components/block-mover/icons.js
@@ -17,8 +17,10 @@ export const downArrow = (
export const dragHandle = (
-
);
diff --git a/packages/block-editor/src/components/block-mover/index.js b/packages/block-editor/src/components/block-mover/index.js
index dd09dc1c86b7c5..9575485d3d6547 100644
--- a/packages/block-editor/src/components/block-mover/index.js
+++ b/packages/block-editor/src/components/block-mover/index.js
@@ -44,7 +44,23 @@ export class BlockMover extends Component {
}
render() {
- const { onMoveUp, onMoveDown, isFirst, isLast, isDraggable, onDragStart, onDragEnd, clientIds, blockElementId, blockType, firstIndex, isLocked, instanceId, isHidden, rootClientId } = this.props;
+ const {
+ onMoveUp,
+ onMoveDown,
+ isFirst,
+ isLast,
+ isDraggable,
+ onDragStart,
+ onDragEnd,
+ clientIds,
+ blockElementId,
+ blockType,
+ firstIndex,
+ isLocked,
+ instanceId,
+ isHidden,
+ rootClientId,
+ } = this.props;
const { isFocused } = this.state;
const blocksCount = castArray( clientIds ).length;
if ( isLocked || ( isFirst && isLast && ! rootClientId ) ) {
@@ -56,7 +72,11 @@ export class BlockMover extends Component {
// to an unfocused state (body as active element) without firing blur on,
// the rendering parent, leaving it unable to react to focus out.
return (
-
+
- {
- getBlockMoverDescription(
- blocksCount,
- blockType && blockType.title,
- firstIndex,
- isFirst,
- isLast,
- -1,
- )
- }
+
+ { getBlockMoverDescription(
+ blocksCount,
+ blockType && blockType.title,
+ firstIndex,
+ isFirst,
+ isLast,
+ -1
+ ) }
-
- {
- getBlockMoverDescription(
- blocksCount,
- blockType && blockType.title,
- firstIndex,
- isFirst,
- isLast,
- 1,
- )
- }
+
+ { getBlockMoverDescription(
+ blocksCount,
+ blockType && blockType.title,
+ firstIndex,
+ isFirst,
+ isLast,
+ 1
+ ) }
);
@@ -117,7 +139,13 @@ export class BlockMover extends Component {
export default compose(
withSelect( ( select, { clientIds } ) => {
- const { getBlock, getBlockIndex, getTemplateLock, getBlockRootClientId, getBlockOrder } = select( 'core/block-editor' );
+ const {
+ getBlock,
+ getBlockIndex,
+ getTemplateLock,
+ getBlockRootClientId,
+ getBlockOrder,
+ } = select( 'core/block-editor' );
const normalizedClientIds = castArray( clientIds );
const firstClientId = first( normalizedClientIds );
const block = getBlock( firstClientId );
@@ -142,5 +170,5 @@ export default compose(
onMoveUp: partial( moveBlocksUp, clientIds, rootClientId ),
};
} ),
- withInstanceId,
+ withInstanceId
)( BlockMover );
diff --git a/packages/block-editor/src/components/block-mover/index.native.js b/packages/block-editor/src/components/block-mover/index.native.js
index 40bc4d550b7ab6..1e0cf94fc99949 100644
--- a/packages/block-editor/src/components/block-mover/index.native.js
+++ b/packages/block-editor/src/components/block-mover/index.native.js
@@ -27,14 +27,15 @@ const BlockMover = ( {
return (
<>
{
- const { getBlockIndex, getTemplateLock, getBlockRootClientId, getBlockOrder } = select( 'core/block-editor' );
+ const { getBlockIndex, getTemplateLock, getBlockRootClientId, getBlockOrder } = select(
+ 'core/block-editor'
+ );
const normalizedClientIds = castArray( clientIds );
const firstClientId = first( normalizedClientIds );
const rootClientId = getBlockRootClientId( firstClientId );
@@ -86,5 +90,5 @@ export default compose(
onMoveUp: partial( moveBlocksUp, clientIds, rootClientId ),
};
} ),
- withInstanceId,
+ withInstanceId
)( BlockMover );
diff --git a/packages/block-editor/src/components/block-mover/mover-description.js b/packages/block-editor/src/components/block-mover/mover-description.js
index 44174ce85534ca..a663fddfe79eea 100644
--- a/packages/block-editor/src/components/block-mover/mover-description.js
+++ b/packages/block-editor/src/components/block-mover/mover-description.js
@@ -18,7 +18,7 @@ import { __, _n, sprintf } from '@wordpress/i18n';
* @return {string} Label for the block movement controls.
*/
export function getBlockMoverDescription( selectedCount, type, firstIndex, isFirst, isLast, dir ) {
- const position = ( firstIndex + 1 );
+ const position = firstIndex + 1;
if ( selectedCount > 1 ) {
return getMultiBlockMoverDescription( selectedCount, firstIndex, isFirst, isLast, dir );
@@ -36,7 +36,7 @@ export function getBlockMoverDescription( selectedCount, type, firstIndex, isFir
__( 'Move %1$s block from position %2$d down to position %3$d' ),
type,
position,
- ( position + 1 )
+ position + 1
);
}
@@ -53,14 +53,17 @@ export function getBlockMoverDescription( selectedCount, type, firstIndex, isFir
__( 'Move %1$s block from position %2$d up to position %3$d' ),
type,
position,
- ( position - 1 )
+ position - 1
);
}
if ( dir < 0 && isFirst ) {
// moving up, and is the first item
// translators: %s: Type of block (i.e. Text, Image etc)
- return sprintf( __( 'Block %s is at the beginning of the content and can’t be moved up' ), type );
+ return sprintf(
+ __( 'Block %s is at the beginning of the content and can’t be moved up' ),
+ type
+ );
}
}
@@ -77,7 +80,7 @@ export function getBlockMoverDescription( selectedCount, type, firstIndex, isFir
* @return {string} Label for the block movement controls.
*/
export function getMultiBlockMoverDescription( selectedCount, firstIndex, isFirst, isLast, dir ) {
- const position = ( firstIndex + 1 );
+ const position = firstIndex + 1;
if ( dir < 0 && isFirst ) {
return __( 'Blocks cannot be moved up as they are already at the top' );
diff --git a/packages/block-editor/src/components/block-mover/test/index.js b/packages/block-editor/src/components/block-mover/test/index.js
index 48809ae7905669..c7496763b1084c 100644
--- a/packages/block-editor/src/components/block-mover/test/index.js
+++ b/packages/block-editor/src/components/block-mover/test/index.js
@@ -28,7 +28,8 @@ describe( 'BlockMover', () => {
clientIds={ selectedClientIds }
blockType={ blockType }
firstIndex={ 0 }
- instanceId={ 1 } />
+ instanceId={ 1 }
+ />
);
expect( blockMover.hasClass( 'block-editor-block-mover' ) ).toBe( true );
@@ -111,11 +112,7 @@ describe( 'BlockMover', () => {
it( 'should not render the drag handle if block is not draggable', () => {
const blockMover = shallow(
- (
<>
- { isEnabled &&
- { __( 'Block navigation' ) }
+
+ { __( 'Block navigation' ) }
+
{ hasHierarchy && (
{
- const {
- getSelectedBlockClientId,
- getBlockHierarchyRootClientId,
- getBlock,
- getBlocks,
- } = select( 'core/block-editor' );
+ const { getSelectedBlockClientId, getBlockHierarchyRootClientId, getBlock, getBlocks } = select(
+ 'core/block-editor'
+ );
const selectedBlockClientId = getSelectedBlockClientId();
return {
rootBlocks: getBlocks(),
- rootBlock: selectedBlockClientId ? getBlock( getBlockHierarchyRootClientId( selectedBlockClientId ) ) : null,
+ rootBlock: selectedBlockClientId
+ ? getBlock( getBlockHierarchyRootClientId( selectedBlockClientId ) )
+ : null,
selectedBlockClientId,
};
} ),
diff --git a/packages/block-editor/src/components/block-navigation/list.js b/packages/block-editor/src/components/block-navigation/list.js
index a0910caf5b41cc..546fc41eeaa5c0 100644
--- a/packages/block-editor/src/components/block-navigation/list.js
+++ b/packages/block-editor/src/components/block-navigation/list.js
@@ -60,14 +60,19 @@ export default function BlockNavigationList( {
selectBlock( block.clientId ) }
>
{ __( '(selected block)' ) } }
+ { isSelected && (
+ { __( '(selected block)' ) }
+ ) }
{ showNestedBlocks && !! block.innerBlocks && !! block.innerBlocks.length && (
diff --git a/packages/block-editor/src/components/block-preview/index.js b/packages/block-editor/src/components/block-preview/index.js
index 8a6692a422a6f7..05ac9ce4748890 100644
--- a/packages/block-editor/src/components/block-preview/index.js
+++ b/packages/block-editor/src/components/block-preview/index.js
@@ -44,17 +44,19 @@ function ScaledBlockPreview( { blocks, viewportWidth, padding = 0 } ) {
let containerElementRect = containerElement.getBoundingClientRect();
containerElementRect = {
- width: containerElementRect.width - ( padding * 2 ),
- height: containerElementRect.height - ( padding * 2 ),
+ width: containerElementRect.width - padding * 2,
+ height: containerElementRect.height - padding * 2,
left: containerElementRect.left,
top: containerElementRect.top,
};
const scaledElementRect = previewElement.getBoundingClientRect();
const scale = containerElementRect.width / scaledElementRect.width || 1;
- const offsetX = ( -( scaledElementRect.left - containerElementRect.left ) * scale ) + padding;
- const offsetY = ( containerElementRect.height > scaledElementRect.height * scale ) ?
- ( ( containerElementRect.height - ( scaledElementRect.height * scale ) ) / 2 ) + padding : 0;
+ const offsetX = -( scaledElementRect.left - containerElementRect.left ) * scale + padding;
+ const offsetY =
+ containerElementRect.height > scaledElementRect.height * scale
+ ? ( containerElementRect.height - scaledElementRect.height * scale ) / 2 + padding
+ : 0;
setPreviewScale( scale );
setPosition( { x: offsetX, y: offsetY } );
@@ -109,17 +111,12 @@ export function BlockPreview( { blocks, viewportWidth = 700, padding, settings }
const [ recompute, triggerRecompute ] = useReducer( ( state ) => state + 1, 0 );
useLayoutEffect( triggerRecompute, [ blocks ] );
return (
-
- {
- /*
- * The key prop is used to force recomputing the preview
- * by remounting the component, ScaledBlockPreview is not meant to
- * be rerendered.
- */
- }
+
+ { /*
+ * The key prop is used to force recomputing the preview
+ * by remounting the component, ScaledBlockPreview is not meant to
+ * be rerendered.
+ */ }
( {
- onClick: () => dispatch( 'core/block-editor' ).replaceBlocks(
- block.clientId,
- rawHandler( { HTML: serialize( block ) } )
- ),
- } ) ),
+ onClick: () =>
+ dispatch( 'core/block-editor' ).replaceBlocks(
+ block.clientId,
+ rawHandler( { HTML: serialize( block ) } )
+ ),
+ } ) )
)( BlockConvertButton );
diff --git a/packages/block-editor/src/components/block-settings-menu/index.js b/packages/block-editor/src/components/block-settings-menu/index.js
index e4f7219d1a3803..41798d33d88ca8 100644
--- a/packages/block-editor/src/components/block-settings-menu/index.js
+++ b/packages/block-editor/src/components/block-settings-menu/index.js
@@ -7,12 +7,7 @@ import { castArray, flow } from 'lodash';
* WordPress dependencies
*/
import { __, _n } from '@wordpress/i18n';
-import {
- Toolbar,
- DropdownMenu,
- MenuGroup,
- MenuItem,
-} from '@wordpress/components';
+import { Toolbar, DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
/**
* Internal dependencies
@@ -56,23 +51,16 @@ export function BlockSettingsMenu( { clientIds } ) {
{ ( { onClose } ) => (
<>
- <__experimentalBlockSettingsMenuFirstItem.Slot
- fillProps={ { onClose } }
- />
- { count === 1 && (
-
@@ -83,7 +71,10 @@ export function BlockSettingsMenu( { clientIds } ) {
<>
@@ -91,7 +82,10 @@ export function BlockSettingsMenu( { clientIds } ) {
@@ -100,10 +94,7 @@ export function BlockSettingsMenu( { clientIds } ) {
) }
{ count === 1 && (
-
diff --git a/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js b/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js
index d8bfef8771b878..f789f7c4066f78 100644
--- a/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js
+++ b/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js
@@ -25,10 +25,7 @@ describe( 'BlockModeToggle', () => {
it( 'should render the HTML mode button', () => {
const wrapper = getShallowRenderOutput(
-
diff --git a/packages/block-editor/src/components/block-settings/container.native.js b/packages/block-editor/src/components/block-settings/container.native.js
index 1b59377f29161c..d91c8aa9c129c8 100644
--- a/packages/block-editor/src/components/block-settings/container.native.js
+++ b/packages/block-editor/src/components/block-settings/container.native.js
@@ -20,16 +20,14 @@ function BottomSheetSettings( { editorSidebarOpened, closeGeneralSidebar, ...pro
contentStyle={ styles.content }
{ ...props }
>
- updateClassName( style ) }
onKeyDown={ ( event ) => {
if ( ENTER === event.keyCode || SPACE === event.keyCode ) {
@@ -125,12 +123,12 @@ function BlockStyles( {
diff --git a/packages/block-editor/src/components/block-styles/test/index.js b/packages/block-editor/src/components/block-styles/test/index.js
index 639d92ed4aeaa3..b2e26781d6becd 100644
--- a/packages/block-editor/src/components/block-styles/test/index.js
+++ b/packages/block-editor/src/components/block-styles/test/index.js
@@ -5,40 +5,28 @@ import { getActiveStyle, replaceActiveStyle } from '../';
describe( 'getActiveStyle', () => {
it( 'Should return the undefined if no active style', () => {
- const styles = [
- { name: 'small' },
- { name: 'big' },
- ];
+ const styles = [ { name: 'small' }, { name: 'big' } ];
const className = 'custom-className';
expect( getActiveStyle( styles, className ) ).toBeUndefined();
} );
it( 'Should return the default style if no active style', () => {
- const styles = [
- { name: 'small' },
- { name: 'big', isDefault: true },
- ];
+ const styles = [ { name: 'small' }, { name: 'big', isDefault: true } ];
const className = 'custom-className';
expect( getActiveStyle( styles, className ).name ).toBe( 'big' );
} );
it( 'Should return the active style', () => {
- const styles = [
- { name: 'small' },
- { name: 'big', isDefault: true },
- ];
+ const styles = [ { name: 'small' }, { name: 'big', isDefault: true } ];
const className = 'this-is-custom is-style-small';
expect( getActiveStyle( styles, className ).name ).toBe( 'small' );
} );
it( 'Should return the first active style', () => {
- const styles = [
- { name: 'small' },
- { name: 'big', isDefault: true },
- ];
+ const styles = [ { name: 'small' }, { name: 'big', isDefault: true } ];
const className = 'this-is-custom is-style-small is-style-big';
expect( getActiveStyle( styles, className ).name ).toBe( 'small' );
@@ -51,8 +39,9 @@ describe( 'replaceActiveStyle', () => {
const newStyle = { name: 'small' };
const className = 'custom-class';
- expect( replaceActiveStyle( className, activeStyle, newStyle ) )
- .toBe( 'custom-class is-style-small' );
+ expect( replaceActiveStyle( className, activeStyle, newStyle ) ).toBe(
+ 'custom-class is-style-small'
+ );
} );
it( 'Should add the new style if no active style (no existing class)', () => {
@@ -60,8 +49,7 @@ describe( 'replaceActiveStyle', () => {
const newStyle = { name: 'small' };
const className = '';
- expect( replaceActiveStyle( className, activeStyle, newStyle ) )
- .toBe( 'is-style-small' );
+ expect( replaceActiveStyle( className, activeStyle, newStyle ) ).toBe( 'is-style-small' );
} );
it( 'Should add the new style if no active style (unassigned default)', () => {
@@ -69,8 +57,7 @@ describe( 'replaceActiveStyle', () => {
const newStyle = { name: 'small' };
const className = '';
- expect( replaceActiveStyle( className, activeStyle, newStyle ) )
- .toBe( 'is-style-small' );
+ expect( replaceActiveStyle( className, activeStyle, newStyle ) ).toBe( 'is-style-small' );
} );
it( 'Should replace the previous active style', () => {
@@ -78,7 +65,8 @@ describe( 'replaceActiveStyle', () => {
const newStyle = { name: 'small' };
const className = 'custom-class is-style-large';
- expect( replaceActiveStyle( className, activeStyle, newStyle ) )
- .toBe( 'custom-class is-style-small' );
+ expect( replaceActiveStyle( className, activeStyle, newStyle ) ).toBe(
+ 'custom-class is-style-small'
+ );
} );
} );
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
index 4f3510e4ebbb2e..3995aaab564e47 100644
--- a/packages/block-editor/src/components/block-switcher/index.js
+++ b/packages/block-editor/src/components/block-switcher/index.js
@@ -8,7 +8,13 @@ import { castArray, filter, first, mapKeys, orderBy, uniq, map } from 'lodash';
*/
import { __, _n, sprintf } from '@wordpress/i18n';
import { Dropdown, IconButton, Toolbar, PanelBody, Path, SVG } from '@wordpress/components';
-import { getBlockType, getPossibleBlockTransformations, switchToBlockType, cloneBlock, getBlockFromExample } from '@wordpress/blocks';
+import {
+ getBlockType,
+ getPossibleBlockTransformations,
+ switchToBlockType,
+ cloneBlock,
+ getBlockFromExample,
+} from '@wordpress/blocks';
import { Component } from '@wordpress/element';
import { DOWN } from '@wordpress/keycodes';
import { withSelect, withDispatch } from '@wordpress/data';
@@ -95,18 +101,13 @@ export class BlockSwitcher extends Component {
onToggle();
}
};
- const label = (
- 1 === blocks.length ?
- __( 'Change block type or style' ) :
- sprintf(
- _n(
- 'Change type of %d block',
- 'Change type of %d blocks',
+ const label =
+ 1 === blocks.length
+ ? __( 'Change block type or style' )
+ : sprintf(
+ _n( 'Change type of %d block', 'Change type of %d blocks', blocks.length ),
blocks.length
- ),
- blocks.length
- )
- );
+ );
return (
@@ -118,37 +119,37 @@ export class BlockSwitcher extends Component {
label={ label }
tooltip={ label }
onKeyDown={ openOnArrowDown }
- icon={ (
+ icon={
<>
+
- ) }
+ }
/>
);
} }
renderContent={ ( { onClose } ) => (
<>
- { ( hasBlockStyles || possibleBlockTransformations.length !== 0 ) &&
+ { ( hasBlockStyles || possibleBlockTransformations.length !== 0 ) && (
- { hasBlockStyles &&
-
+ { hasBlockStyles && (
+
- }
- { possibleBlockTransformations.length !== 0 &&
-
+ ) }
+ { possibleBlockTransformations.length !== 0 && (
+
( {
id: destinationBlockType.name,
@@ -161,25 +162,30 @@ export class BlockSwitcher extends Component {
} }
/>
- }
+ ) }
-
{ __( 'Preview' ) }
+
+ { __( 'Preview' ) }
+
{ getDropdown().props().renderContent( { onClose: onCloseStub } ) }
);
+ const content = shallow(
+
+ { getDropdown()
+ .props()
+ .renderContent( { onClose: onCloseStub } ) }
+
+ );
const blockList = content.find( 'BlockTypesList' );
expect( blockList.prop( 'items' ) ).toHaveLength( 1 );
} );
diff --git a/packages/block-editor/src/components/block-switcher/test/multi-blocks-switcher.js b/packages/block-editor/src/components/block-switcher/test/multi-blocks-switcher.js
index 30199f6c598529..5e99eaba7f675d 100644
--- a/packages/block-editor/src/components/block-switcher/test/multi-blocks-switcher.js
+++ b/packages/block-editor/src/components/block-switcher/test/multi-blocks-switcher.js
@@ -11,9 +11,7 @@ import { MultiBlocksSwitcher } from '../multi-blocks-switcher';
describe( 'MultiBlocksSwitcher', () => {
test( 'should return null when the selection is not a multi block selection.', () => {
const isMultiBlockSelection = false;
- const selectedBlockClientIds = [
- 'clientid',
- ];
+ const selectedBlockClientIds = [ 'clientid' ];
const wrapper = shallow(
{
test( 'should return a BlockSwitcher element matching the snapshot.', () => {
const isMultiBlockSelection = true;
- const selectedBlockClientIds = [
- 'clientid-1',
- 'clientid-2',
- ];
+ const selectedBlockClientIds = [ 'clientid-1', 'clientid-2' ];
const wrapper = shallow(
{
- const {
- getBlockMode,
- getSelectedBlockClientIds,
- isBlockValid,
- } = select( 'core/block-editor' );
+ const { getBlockMode, getSelectedBlockClientIds, isBlockValid } = select( 'core/block-editor' );
const blockClientIds = getSelectedBlockClientIds();
return {
diff --git a/packages/block-editor/src/components/block-toolbar/index.native.js b/packages/block-editor/src/components/block-toolbar/index.native.js
index 7442025c276521..37de9105d89ff7 100644
--- a/packages/block-editor/src/components/block-toolbar/index.native.js
+++ b/packages/block-editor/src/components/block-toolbar/index.native.js
@@ -33,11 +33,7 @@ export const BlockToolbar = ( { blockClientIds, isValid, mode } ) => {
};
export default withSelect( ( select ) => {
- const {
- getBlockMode,
- getSelectedBlockClientIds,
- isBlockValid,
- } = select( 'core/block-editor' );
+ const { getBlockMode, getSelectedBlockClientIds, isBlockValid } = select( 'core/block-editor' );
const blockClientIds = getSelectedBlockClientIds();
return {
diff --git a/packages/block-editor/src/components/block-types-list/index.js b/packages/block-editor/src/components/block-types-list/index.js
index 8c2de6772dd8ef..aef0d28da01bb5 100644
--- a/packages/block-editor/src/components/block-types-list/index.js
+++ b/packages/block-editor/src/components/block-types-list/index.js
@@ -16,23 +16,24 @@ function BlockTypesList( { items, onSelect, onHover = () => {}, children } ) {
*/
/* eslint-disable jsx-a11y/no-redundant-roles */
- { items && items.map( ( item ) =>
- {
- onSelect( item );
- onHover( null );
- } }
- onFocus={ () => onHover( item ) }
- onMouseEnter={ () => onHover( item ) }
- onMouseLeave={ () => onHover( null ) }
- onBlur={ () => onHover( null ) }
- isDisabled={ item.isDisabled }
- title={ item.title }
- />
- ) }
+ { items &&
+ items.map( ( item ) => (
+ {
+ onSelect( item );
+ onHover( null );
+ } }
+ onFocus={ () => onHover( item ) }
+ onMouseEnter={ () => onHover( item ) }
+ onMouseLeave={ () => onHover( null ) }
+ onBlur={ () => onHover( null ) }
+ isDisabled={ item.isDisabled }
+ title={ item.title }
+ />
+ ) ) }
{ children }
/* eslint-enable jsx-a11y/no-redundant-roles */
diff --git a/packages/block-editor/src/components/block-vertical-alignment-toolbar/icons.js b/packages/block-editor/src/components/block-vertical-alignment-toolbar/icons.js
index 4642eddb367c71..f71194c254d898 100644
--- a/packages/block-editor/src/components/block-vertical-alignment-toolbar/icons.js
+++ b/packages/block-editor/src/components/block-vertical-alignment-toolbar/icons.js
@@ -13,8 +13,7 @@ export const alignBottom = (
export const alignCenter = (
);
diff --git a/packages/block-editor/src/components/block-vertical-alignment-toolbar/index.js b/packages/block-editor/src/components/block-vertical-alignment-toolbar/index.js
index 22206984dc2706..530b4bb70a42be 100644
--- a/packages/block-editor/src/components/block-vertical-alignment-toolbar/index.js
+++ b/packages/block-editor/src/components/block-vertical-alignment-toolbar/index.js
@@ -27,7 +27,12 @@ const BLOCK_ALIGNMENTS_CONTROLS = {
const DEFAULT_CONTROLS = [ 'top', 'center', 'bottom' ];
const DEFAULT_CONTROL = 'top';
-export function BlockVerticalAlignmentToolbar( { value, onChange, controls = DEFAULT_CONTROLS, isCollapsed = true } ) {
+export function BlockVerticalAlignmentToolbar( {
+ value,
+ onChange,
+ controls = DEFAULT_CONTROLS,
+ isCollapsed = true,
+} ) {
function applyOrUnset( align ) {
return () => onChange( value === align ? undefined : align );
}
@@ -40,15 +45,13 @@ export function BlockVerticalAlignmentToolbar( { value, onChange, controls = DEF
isCollapsed={ isCollapsed }
icon={ activeAlignment ? activeAlignment.icon : defaultAlignmentControl.icon }
label={ _x( 'Change vertical alignment', 'Block vertical alignment setting label' ) }
- controls={
- controls.map( ( control ) => {
- return {
- ...BLOCK_ALIGNMENTS_CONTROLS[ control ],
- isActive: value === control,
- onClick: applyOrUnset( control ),
- };
- } )
- }
+ controls={ controls.map( ( control ) => {
+ return {
+ ...BLOCK_ALIGNMENTS_CONTROLS[ control ],
+ isActive: value === control,
+ onClick: applyOrUnset( control ),
+ };
+ } ) }
/>
);
}
diff --git a/packages/block-editor/src/components/block-vertical-alignment-toolbar/test/index.js b/packages/block-editor/src/components/block-vertical-alignment-toolbar/test/index.js
index 6840e35ba6331c..aadcfd991d1e39 100644
--- a/packages/block-editor/src/components/block-vertical-alignment-toolbar/test/index.js
+++ b/packages/block-editor/src/components/block-vertical-alignment-toolbar/test/index.js
@@ -12,7 +12,9 @@ describe( 'BlockVerticalAlignmentToolbar', () => {
const alignment = 'top';
const onChange = jest.fn();
- const wrapper = shallow( (
+ {
- const {
- getBlockAttributes,
- getSelectedBlockClientId,
- } = select( 'core/block-editor' );
+ const { getBlockAttributes, getSelectedBlockClientId } = select( 'core/block-editor' );
const { caption } = getBlockAttributes( clientId );
- const accessibilityLabel = accessibilityLabelCreator ? accessibilityLabelCreator( caption ) : undefined;
+ const accessibilityLabel = accessibilityLabelCreator
+ ? accessibilityLabelCreator( caption )
+ : undefined;
const isBlockSelected = getSelectedBlockClientId() === clientId;
// We'll render the caption so that the soft keyboard is not forced to close on Android
diff --git a/packages/block-editor/src/components/color-palette/control.js b/packages/block-editor/src/components/color-palette/control.js
index 6a2da23b527c67..3eda95753ed2f9 100644
--- a/packages/block-editor/src/components/color-palette/control.js
+++ b/packages/block-editor/src/components/color-palette/control.js
@@ -15,35 +15,22 @@ import { getColorObjectByColorValue } from '../colors';
// translators: first %s: The type of color (e.g. background color), second %s: the color name or value (e.g. red or #ff0000)
const colorIndicatorAriaLabel = __( '(current %s: %s)' );
-export function ColorPaletteControl( {
- colors,
- disableCustomColors,
- label,
- onChange,
- value,
-} ) {
+export function ColorPaletteControl( { colors, disableCustomColors, label, onChange, value } ) {
const colorObject = getColorObjectByColorValue( colors, value );
const colorName = colorObject && colorObject.name;
const ariaLabel = sprintf( colorIndicatorAriaLabel, label.toLowerCase(), colorName || value );
return (
-
+
{ label }
- { value && (
-
);
diff --git a/packages/block-editor/src/components/color-palette/with-color-context.js b/packages/block-editor/src/components/color-palette/with-color-context.js
index 1c32141f2a3f13..7b9f7c613f2bc5 100644
--- a/packages/block-editor/src/components/color-palette/with-color-context.js
+++ b/packages/block-editor/src/components/color-palette/with-color-context.js
@@ -1,4 +1,3 @@
-
/**
* External dependencies
*/
@@ -11,20 +10,19 @@ import { createHigherOrderComponent } from '@wordpress/compose';
import { withSelect } from '@wordpress/data';
export default createHigherOrderComponent(
- withSelect(
- ( select, ownProps ) => {
- const settings = select( 'core/block-editor' ).getSettings();
- const colors = ownProps.colors === undefined ?
- settings.colors : ownProps.colors;
+ withSelect( ( select, ownProps ) => {
+ const settings = select( 'core/block-editor' ).getSettings();
+ const colors = ownProps.colors === undefined ? settings.colors : ownProps.colors;
- const disableCustomColors = ownProps.disableCustomColors === undefined ?
- settings.disableCustomColors : ownProps.disableCustomColors;
- return {
- colors,
- disableCustomColors,
- hasColorsToChoose: ! isEmpty( colors ) || ! disableCustomColors,
- };
- }
- ),
+ const disableCustomColors =
+ ownProps.disableCustomColors === undefined
+ ? settings.disableCustomColors
+ : ownProps.disableCustomColors;
+ return {
+ colors,
+ disableCustomColors,
+ hasColorsToChoose: ! isEmpty( colors ) || ! disableCustomColors,
+ };
+ } ),
'withColorContext'
);
diff --git a/packages/block-editor/src/components/colors/index.js b/packages/block-editor/src/components/colors/index.js
index f6b6fac984db89..2172d3e13be655 100644
--- a/packages/block-editor/src/components/colors/index.js
+++ b/packages/block-editor/src/components/colors/index.js
@@ -3,7 +3,4 @@ export {
getColorObjectByAttributeValues,
getColorObjectByColorValue,
} from './utils';
-export {
- createCustomColorsHOC,
- default as withColors,
-} from './with-colors';
+export { createCustomColorsHOC, default as withColors } from './with-colors';
diff --git a/packages/block-editor/src/components/colors/test/utils.js b/packages/block-editor/src/components/colors/test/utils.js
index 8eb370394aae83..2402a6b9ddd9c6 100644
--- a/packages/block-editor/src/components/colors/test/utils.js
+++ b/packages/block-editor/src/components/colors/test/utils.js
@@ -10,38 +10,32 @@ import {
describe( 'color utils', () => {
describe( 'getColorObjectByAttributeValues', () => {
it( 'should return the custom color object when there is no definedColor', () => {
- const colors = [
- { slug: 'red' },
- { slug: 'green' },
- { slug: 'blue' },
- ];
+ const colors = [ { slug: 'red' }, { slug: 'green' }, { slug: 'blue' } ];
const customColor = '#ffffff';
- expect( getColorObjectByAttributeValues( colors, undefined, customColor ) ).toEqual( { color: customColor } );
+ expect( getColorObjectByAttributeValues( colors, undefined, customColor ) ).toEqual( {
+ color: customColor,
+ } );
} );
it( 'should return the custom color object when definedColor was not found', () => {
- const colors = [
- { slug: 'red' },
- { slug: 'green' },
- { slug: 'blue' },
- ];
+ const colors = [ { slug: 'red' }, { slug: 'green' }, { slug: 'blue' } ];
const definedColor = 'purple';
const customColor = '#ffffff';
- expect( getColorObjectByAttributeValues( colors, definedColor, customColor ) ).toEqual( { color: customColor } );
+ expect( getColorObjectByAttributeValues( colors, definedColor, customColor ) ).toEqual( {
+ color: customColor,
+ } );
} );
it( 'should return the found color object', () => {
- const colors = [
- { slug: 'red' },
- { slug: 'green' },
- { slug: 'blue' },
- ];
+ const colors = [ { slug: 'red' }, { slug: 'green' }, { slug: 'blue' } ];
const definedColor = 'blue';
const customColor = '#ffffff';
- expect( getColorObjectByAttributeValues( colors, definedColor, customColor ) ).toEqual( { slug: 'blue' } );
+ expect( getColorObjectByAttributeValues( colors, definedColor, customColor ) ).toEqual( {
+ slug: 'blue',
+ } );
} );
} );
@@ -63,7 +57,10 @@ describe( 'color utils', () => {
{ slug: 'blue', color: '#0000ff' },
];
- expect( getColorObjectByColorValue( colors, '#00ff00' ) ).toEqual( { slug: 'green', color: '#00ff00' } );
+ expect( getColorObjectByColorValue( colors, '#00ff00' ) ).toEqual( {
+ slug: 'green',
+ color: '#00ff00',
+ } );
} );
} );
@@ -77,7 +74,9 @@ describe( 'color utils', () => {
} );
it( 'should return a class name with the color slug in kebab case', () => {
- expect( getColorClassName( 'background', 'Light Purple' ) ).toBe( 'has-light-purple-background' );
+ expect( getColorClassName( 'background', 'Light Purple' ) ).toBe(
+ 'has-light-purple-background'
+ );
} );
} );
} );
diff --git a/packages/block-editor/src/components/colors/test/with-colors.js b/packages/block-editor/src/components/colors/test/with-colors.js
index 07c19ce0c11e7a..779ae78d64210a 100644
--- a/packages/block-editor/src/components/colors/test/with-colors.js
+++ b/packages/block-editor/src/components/colors/test/with-colors.js
@@ -10,20 +10,20 @@ import { createCustomColorsHOC } from '../with-colors';
describe( 'createCustomColorsHOC', () => {
it( 'provides the the wrapped component with color values and setter functions as props', () => {
- const withCustomColors = createCustomColorsHOC( [ { name: 'Red', slug: 'red', color: 'ff0000' } ] );
- const EnhancedComponent = withCustomColors( 'backgroundColor' )( () => (
-
- ) );
+ const withCustomColors = createCustomColorsHOC( [
+ { name: 'Red', slug: 'red', color: 'ff0000' },
+ ] );
+ const EnhancedComponent = withCustomColors( 'backgroundColor' )( () =>
);
- const wrapper = shallow(
- props.setBackgroundColor( 'ff0000' ) }>Test Me
) );
@@ -35,11 +35,16 @@ describe( 'createCustomColorsHOC', () => {
);
wrapper.find( 'button' ).simulate( 'click' );
- expect( setAttributes ).toHaveBeenCalledWith( { backgroundColor: 'red', customBackgroundColor: undefined } );
+ expect( setAttributes ).toHaveBeenCalledWith( {
+ backgroundColor: 'red',
+ customBackgroundColor: undefined,
+ } );
} );
it( 'setting the color to a value not in the provided custom color array updates customBackgroundColor attribute', () => {
- const withCustomColors = createCustomColorsHOC( [ { name: 'Red', slug: 'red', color: 'ff0000' } ] );
+ const withCustomColors = createCustomColorsHOC( [
+ { name: 'Red', slug: 'red', color: 'ff0000' },
+ ] );
const EnhancedComponent = withCustomColors( 'backgroundColor' )( ( props ) => (
props.setBackgroundColor( '000000' ) }>Test Me
) );
@@ -51,6 +56,9 @@ describe( 'createCustomColorsHOC', () => {
);
wrapper.find( 'button' ).simulate( 'click' );
- expect( setAttributes ).toHaveBeenCalledWith( { backgroundColor: undefined, customBackgroundColor: '000000' } );
+ expect( setAttributes ).toHaveBeenCalledWith( {
+ backgroundColor: undefined,
+ customBackgroundColor: '000000',
+ } );
} );
} );
diff --git a/packages/block-editor/src/components/colors/utils.js b/packages/block-editor/src/components/colors/utils.js
index 764b02acde2822..f32f23da79c558 100644
--- a/packages/block-editor/src/components/colors/utils.js
+++ b/packages/block-editor/src/components/colors/utils.js
@@ -68,8 +68,5 @@ export function getColorClassName( colorContextName, colorSlug ) {
* @return {string} String with the color value of the most readable color.
*/
export function getMostReadableColor( colors, colorValue ) {
- return tinycolor.mostReadable(
- colorValue,
- map( colors, 'color' )
- ).toHexString();
+ return tinycolor.mostReadable( colorValue, map( colors, 'color' ) ).toHexString();
}
diff --git a/packages/block-editor/src/components/colors/with-colors.js b/packages/block-editor/src/components/colors/with-colors.js
index b6f33b1b8590f7..e33a1b59bee552 100644
--- a/packages/block-editor/src/components/colors/with-colors.js
+++ b/packages/block-editor/src/components/colors/with-colors.js
@@ -13,7 +13,12 @@ import { compose, createHigherOrderComponent } from '@wordpress/compose';
/**
* Internal dependencies
*/
-import { getColorClassName, getColorObjectByColorValue, getColorObjectByAttributeValues, getMostReadableColor } from './utils';
+import {
+ getColorClassName,
+ getColorObjectByColorValue,
+ getColorObjectByAttributeValues,
+ getMostReadableColor,
+} from './utils';
const DEFAULT_COLORS = [];
@@ -25,9 +30,11 @@ const DEFAULT_COLORS = [];
*
* @return {Function} The higher order component.
*/
-const withCustomColorPalette = ( colorsArray ) => createHigherOrderComponent( ( WrappedComponent ) => ( props ) => (
-
+
- {} }
- />
+ {} } />
);
@@ -47,7 +43,9 @@ export function DefaultBlockAppender( {
export default compose(
withSelect( ( select, ownProps ) => {
- const { getBlockCount, getBlockName, isBlockValid, getTemplateLock } = select( 'core/block-editor' );
+ const { getBlockCount, getBlockName, isBlockValid, getTemplateLock } = select(
+ 'core/block-editor'
+ );
const isEmpty = ! getBlockCount( ownProps.rootClientId );
const isLastBlockDefault = getBlockName( ownProps.lastBlockClientId ) === getDefaultBlockName();
@@ -59,10 +57,7 @@ export default compose(
};
} ),
withDispatch( ( dispatch, ownProps ) => {
- const {
- insertDefaultBlock,
- startTyping,
- } = dispatch( 'core/block-editor' );
+ const { insertDefaultBlock, startTyping } = dispatch( 'core/block-editor' );
return {
onAppend() {
@@ -72,5 +67,5 @@ export default compose(
startTyping();
},
};
- } ),
+ } )
)( DefaultBlockAppender );
diff --git a/packages/block-editor/src/components/default-block-appender/test/index.js b/packages/block-editor/src/components/default-block-appender/test/index.js
index 80517843ee661e..4035827b2d2d13 100644
--- a/packages/block-editor/src/components/default-block-appender/test/index.js
+++ b/packages/block-editor/src/components/default-block-appender/test/index.js
@@ -40,7 +40,9 @@ describe( 'DefaultBlockAppender', () => {
it( 'should optionally show without prompt', () => {
const onAppend = jest.fn();
- const wrapper = shallow(
-
- { __( 'Gradient Presets' ) }
-
+
+ { __( 'Gradient Presets' ) }
(
- select( 'core/block-editor' ).getSettings().gradients
- ) );
- return (
- <__experimentalGradientPicker
- { ...props }
- gradients={ gradients }
- />
+ const gradients = useSelect(
+ ( select ) => select( 'core/block-editor' ).getSettings().gradients
);
+ return <__experimentalGradientPicker { ...props } gradients={ gradients } />;
}
export default function( props ) {
- const ComponentToUse = props.gradients ?
- __experimentalGradientPicker :
- GradientPickerWithGradients;
- return (
-
);
};
@@ -30,9 +27,7 @@ export const DefaultBlockAppender = ( { clientId, lastBlockClientId } ) => {
export default compose( [
withClientId,
withSelect( ( select, { clientId } ) => {
- const {
- getBlockOrder,
- } = select( 'core/block-editor' );
+ const { getBlockOrder } = select( 'core/block-editor' );
const blockClientIds = getBlockOrder( clientId );
diff --git a/packages/block-editor/src/components/inner-blocks/index.js b/packages/block-editor/src/components/inner-blocks/index.js
index 35e1bf10b47ca2..6280fd153fdf8d 100644
--- a/packages/block-editor/src/components/inner-blocks/index.js
+++ b/packages/block-editor/src/components/inner-blocks/index.js
@@ -76,7 +76,7 @@ class InnerBlocks extends Component {
// Synchronize with templates. If the next set differs, replace.
const nextBlocks = synchronizeBlocksWithTemplate( innerBlocks, template );
- if ( ! isEqual( nextBlocks, innerBlocks ) ) {
+ if ( ! isEqual( nextBlocks, innerBlocks ) ) {
replaceInnerBlocks( nextBlocks );
}
}
@@ -121,18 +121,16 @@ class InnerBlocks extends Component {
return (
- { ! templateInProcess && (
- isPlaceholder ?
+ { ! templateInProcess &&
+ ( isPlaceholder ? (
);
}
@@ -157,20 +155,24 @@ InnerBlocks = compose( [
return {
block,
blockListSettings: getBlockListSettings( clientId ),
- hasOverlay: block.name !== 'core/template' && ! isBlockSelected( clientId ) && ! hasSelectedInnerBlock( clientId, true ),
+ hasOverlay:
+ block.name !== 'core/template' &&
+ ! isBlockSelected( clientId ) &&
+ ! hasSelectedInnerBlock( clientId, true ),
parentLock: getTemplateLock( rootClientId ),
};
} ),
withDispatch( ( dispatch, ownProps ) => {
- const {
- replaceInnerBlocks,
- updateBlockListSettings,
- } = dispatch( 'core/block-editor' );
+ const { replaceInnerBlocks, updateBlockListSettings } = dispatch( 'core/block-editor' );
const { block, clientId, templateInsertUpdatesSelection = true } = ownProps;
return {
replaceInnerBlocks( blocks ) {
- replaceInnerBlocks( clientId, blocks, block.innerBlocks.length === 0 && templateInsertUpdatesSelection );
+ replaceInnerBlocks(
+ clientId,
+ blocks,
+ block.innerBlocks.length === 0 && templateInsertUpdatesSelection
+ );
},
updateNestedSettings( settings ) {
dispatch( updateBlockListSettings( clientId, settings ) );
@@ -183,9 +185,7 @@ InnerBlocks = compose( [
InnerBlocks.DefaultBlockAppender = DefaultBlockAppender;
InnerBlocks.ButtonBlockAppender = ButtonBlockAppender;
-InnerBlocks.Content = withBlockContentContext(
- ( { BlockContent } ) =>
- {
- /*
- * Disable reason: The `list` ARIA role is redundant but
- * Safari+VoiceOver won't announce the list otherwise.
- */
- /* eslint-disable jsx-a11y/no-redundant-roles */
- }
+ { /*
+ * Disable reason: The `list` ARIA role is redundant but
+ * Safari+VoiceOver won't announce the list otherwise.
+ */
+ /* eslint-disable jsx-a11y/no-redundant-roles */ }
-
+
{ __( 'Search for a block' ) }
-
- }
+ ) }
{ map( getCategories(), ( category ) => {
const categoryItems = itemsPerCategory[ category.slug ];
@@ -338,7 +343,11 @@ export class InserterMenu extends Component {
onToggle={ this.onTogglePanel( category.slug ) }
ref={ this.bindPanel( category.slug ) }
>
- { __( 'No blocks found.' ) }
+
+ { __( 'No blocks found.' ) }
+
);
}
return null;
@@ -393,15 +408,15 @@ export class InserterMenu extends Component {
- { ( isReusableBlock( hoveredItem ) || hoveredItemBlockType.example ) ? (
+ { isReusableBlock( hoveredItem ) || hoveredItemBlockType.example ? (
@@ -416,7 +431,9 @@ export class InserterMenu extends Component {
{ ! hoveredItem && (
-
{ __( 'Content Blocks' ) }
+
+ { __( 'Content Blocks' ) }
+
{ __(
'Welcome to the wonderful world of blocks! Blocks are the basis of all content within the editor.'
@@ -428,15 +445,11 @@ export class InserterMenu extends Component {
) }
- { __(
- 'Browse through the library to learn more about what each block does.'
- ) }
+ { __( 'Browse through the library to learn more about what each block does.' ) }
- { __(
- 'While writing, you can press "/" to quickly insert new blocks.'
- ) }
+ { __( 'While writing, you can press "/" to quickly insert new blocks.' ) }
) }
@@ -457,9 +470,7 @@ export default compose(
getBlockSelectionEnd,
getSettings,
} = select( 'core/block-editor' );
- const {
- getChildBlockNames,
- } = select( 'core/blocks' );
+ const { getChildBlockNames } = select( 'core/blocks' );
let destinationRootClientId = rootClientId;
if ( ! destinationRootClientId && ! clientId && ! isAppender ) {
@@ -478,15 +489,10 @@ export default compose(
};
} ),
withDispatch( ( dispatch, ownProps, { select } ) => {
- const {
- showInsertionPoint,
- hideInsertionPoint,
- } = dispatch( 'core/block-editor' );
+ const { showInsertionPoint, hideInsertionPoint } = dispatch( 'core/block-editor' );
// This should be an external action provided in the editor settings.
- const {
- __experimentalFetchReusableBlocks: fetchReusableBlocks,
- } = dispatch( 'core/editor' );
+ const { __experimentalFetchReusableBlocks: fetchReusableBlocks } = dispatch( 'core/editor' );
// To avoid duplication, getInsertionIndex is extracted and used in two event handlers
// This breaks the withDispatch not containing any logic rule.
@@ -494,11 +500,7 @@ export default compose(
// it's fine to extract it.
// eslint-disable-next-line no-restricted-syntax
function getInsertionIndex() {
- const {
- getBlockIndex,
- getBlockSelectionEnd,
- getBlockOrder,
- } = select( 'core/block-editor' );
+ const { getBlockIndex, getBlockSelectionEnd, getBlockOrder } = select( 'core/block-editor' );
const { clientId, destinationRootClientId, isAppender } = ownProps;
// If the clientId is defined, we insert at the position of the block.
@@ -524,13 +526,8 @@ export default compose(
},
hideInsertionPoint,
onSelect( item ) {
- const {
- replaceBlocks,
- insertBlock,
- } = dispatch( 'core/block-editor' );
- const {
- getSelectedBlock,
- } = select( 'core/block-editor' );
+ const { replaceBlocks, insertBlock } = dispatch( 'core/block-editor' );
+ const { getSelectedBlock } = select( 'core/block-editor' );
const { isAppender } = ownProps;
const { name, initialAttributes } = item;
const selectedBlock = getSelectedBlock();
@@ -538,11 +535,7 @@ export default compose(
if ( ! isAppender && selectedBlock && isUnmodifiedDefaultBlock( selectedBlock ) ) {
replaceBlocks( selectedBlock.clientId, insertedBlock );
} else {
- insertBlock(
- insertedBlock,
- getInsertionIndex(),
- ownProps.destinationRootClientId
- );
+ insertBlock( insertedBlock, getInsertionIndex(), ownProps.destinationRootClientId );
}
ownProps.onSelect();
diff --git a/packages/block-editor/src/components/inserter/menu.native.js b/packages/block-editor/src/components/inserter/menu.native.js
index a03e5f818540c6..61e621df339cd1 100644
--- a/packages/block-editor/src/components/inserter/menu.native.js
+++ b/packages/block-editor/src/components/inserter/menu.native.js
@@ -7,10 +7,7 @@ import { FlatList, View, Text, TouchableHighlight } from 'react-native';
* WordPress dependencies
*/
import { Component } from '@wordpress/element';
-import {
- createBlock,
- isUnmodifiedDefaultBlock,
-} from '@wordpress/blocks';
+import { createBlock, isUnmodifiedDefaultBlock } from '@wordpress/blocks';
import { withDispatch, withSelect } from '@wordpress/data';
import { withInstanceId, compose, withPreferredColorScheme } from '@wordpress/compose';
import { BottomSheet, Icon } from '@wordpress/components';
@@ -32,7 +29,10 @@ export class InserterMenu extends Component {
calculateNumberOfColumns() {
const bottomSheetWidth = BottomSheet.getWidth();
const { paddingLeft: itemPaddingLeft, paddingRight: itemPaddingRight } = styles.modalItem;
- const { paddingLeft: containerPaddingLeft, paddingRight: containerPaddingRight } = styles.content;
+ const {
+ paddingLeft: containerPaddingLeft,
+ paddingRight: containerPaddingRight,
+ } = styles.content;
const { width: itemWidth } = styles.modalIconWrapper;
const itemTotalWidth = itemWidth + itemPaddingLeft + itemPaddingRight;
const containerTotalWidth = bottomSheetWidth - ( containerPaddingLeft + containerPaddingRight );
@@ -51,9 +51,15 @@ export class InserterMenu extends Component {
const { getStylesFromColorScheme } = this.props;
const numberOfColumns = this.calculateNumberOfColumns();
const bottomPadding = styles.contentBottomPadding;
- const modalIconWrapperStyle = getStylesFromColorScheme( styles.modalIconWrapper, styles.modalIconWrapperDark );
+ const modalIconWrapperStyle = getStylesFromColorScheme(
+ styles.modalIconWrapper,
+ styles.modalIconWrapperDark
+ );
const modalIconStyle = getStylesFromColorScheme( styles.modalIcon, styles.modalIconDark );
- const modalItemLabelStyle = getStylesFromColorScheme( styles.modalItemLabel, styles.modalItemLabelDark );
+ const modalItemLabelStyle = getStylesFromColorScheme(
+ styles.modalItemLabel,
+ styles.modalItemLabelDark
+ );
return (
- this.props.onSelect( item ) }>
+ onPress={ () => this.props.onSelect( item ) }
+ >
-
{ item.title }
- }
+ ) }
/>
);
@@ -97,15 +106,10 @@ export class InserterMenu extends Component {
export default compose(
withSelect( ( select, { clientId, isAppender, rootClientId } ) => {
- const {
- getInserterItems,
- getBlockName,
- getBlockRootClientId,
- getBlockSelectionEnd,
- } = select( 'core/block-editor' );
- const {
- getChildBlockNames,
- } = select( 'core/blocks' );
+ const { getInserterItems, getBlockName, getBlockRootClientId, getBlockSelectionEnd } = select(
+ 'core/block-editor'
+ );
+ const { getChildBlockNames } = select( 'core/blocks' );
let destinationRootClientId = rootClientId;
if ( ! destinationRootClientId && ! clientId && ! isAppender ) {
@@ -123,10 +127,7 @@ export default compose(
};
} ),
withDispatch( ( dispatch, ownProps, { select } ) => {
- const {
- showInsertionPoint,
- hideInsertionPoint,
- } = dispatch( 'core/block-editor' );
+ const { showInsertionPoint, hideInsertionPoint } = dispatch( 'core/block-editor' );
// To avoid duplication, getInsertionIndex is extracted and used in two event handlers
// This breaks the withDispatch not containing any logic rule.
@@ -134,15 +135,10 @@ export default compose(
// it's fine to extract it.
// eslint-disable-next-line no-restricted-syntax
function getInsertionIndex() {
- const {
- getBlock,
- getBlockIndex,
- getBlockSelectionEnd,
- getBlockOrder,
- } = select( 'core/block-editor' );
- const {
- isPostTitleSelected,
- } = select( 'core/editor' );
+ const { getBlock, getBlockIndex, getBlockSelectionEnd, getBlockOrder } = select(
+ 'core/block-editor'
+ );
+ const { isPostTitleSelected } = select( 'core/editor' );
const { clientId, destinationRootClientId, isAppender } = ownProps;
// if post title is selected insert as first block
@@ -178,13 +174,8 @@ export default compose(
},
hideInsertionPoint,
onSelect( item ) {
- const {
- replaceBlocks,
- insertBlock,
- } = dispatch( 'core/block-editor' );
- const {
- getSelectedBlock,
- } = select( 'core/block-editor' );
+ const { replaceBlocks, insertBlock } = dispatch( 'core/block-editor' );
+ const { getSelectedBlock } = select( 'core/block-editor' );
const { isAppender } = ownProps;
const { name, initialAttributes } = item;
const selectedBlock = getSelectedBlock();
@@ -192,11 +183,7 @@ export default compose(
if ( ! isAppender && selectedBlock && isUnmodifiedDefaultBlock( selectedBlock ) ) {
replaceBlocks( selectedBlock.clientId, insertedBlock );
} else {
- insertBlock(
- insertedBlock,
- getInsertionIndex(),
- ownProps.destinationRootClientId
- );
+ insertBlock( insertedBlock, getInsertionIndex(), ownProps.destinationRootClientId );
}
ownProps.onSelect();
@@ -204,5 +191,5 @@ export default compose(
};
} ),
withInstanceId,
- withPreferredColorScheme,
+ withPreferredColorScheme
)( InserterMenu );
diff --git a/packages/block-editor/src/components/inserter/test/menu.js b/packages/block-editor/src/components/inserter/test/menu.js
index ef9d2b10214a98..feb50961fa6f23 100644
--- a/packages/block-editor/src/components/inserter/test/menu.js
+++ b/packages/block-editor/src/components/inserter/test/menu.js
@@ -100,9 +100,7 @@ const DEFAULT_PROPS = {
};
const getWrapperForProps = ( propOverrides ) => {
- return TestUtils.renderIntoDocument(
-
- );
+ return TestUtils.renderIntoDocument(
);
};
const initializeMenuDefaultStateAndReturnElement = ( propOverrides ) => {
@@ -123,22 +121,19 @@ const initializeAllClosedMenuStateAndReturnElement = ( propOverrides ) => {
};
const assertNoResultsMessageToBePresent = ( element ) => {
- const noResultsMessage = element.querySelector(
- '.block-editor-inserter__no-results'
- );
+ const noResultsMessage = element.querySelector( '.block-editor-inserter__no-results' );
expect( noResultsMessage.textContent ).toEqual( 'No blocks found.' );
};
const assertNoResultsMessageNotToBePresent = ( element ) => {
- const noResultsMessage = element.querySelector(
- '.block-editor-inserter__no-results'
- );
+ const noResultsMessage = element.querySelector( '.block-editor-inserter__no-results' );
expect( noResultsMessage ).toBe( null );
};
const assertOpenedPanels = ( element, expectedOpen = 0 ) => {
- expect( element.querySelectorAll( '.components-panel__body.is-opened ' ) )
- .toHaveLength( expectedOpen );
+ expect( element.querySelectorAll( '.components-panel__body.is-opened ' ) ).toHaveLength(
+ expectedOpen
+ );
};
const getTabButtonWithContent = ( element, content ) => {
@@ -167,12 +162,8 @@ describe( 'InserterMenu', () => {
} );
it( 'should show nothing if there are no items', () => {
- const element = initializeMenuDefaultStateAndReturnElement(
- { items: [] }
- );
- const visibleBlocks = element.querySelector(
- '.block-editor-block-types-list__item'
- );
+ const element = initializeMenuDefaultStateAndReturnElement( { items: [] } );
+ const visibleBlocks = element.querySelector( '.block-editor-block-types-list__item' );
expect( visibleBlocks ).toBe( null );
@@ -181,9 +172,7 @@ describe( 'InserterMenu', () => {
it( 'should show only high utility items in the suggested tab', () => {
const element = initializeMenuDefaultStateAndReturnElement();
- const visibleBlocks = element.querySelectorAll(
- '.block-editor-block-types-list__item-title'
- );
+ const visibleBlocks = element.querySelectorAll( '.block-editor-block-types-list__item-title' );
expect( visibleBlocks ).toHaveLength( 3 );
expect( visibleBlocks[ 0 ].textContent ).toEqual( 'Text' );
expect( visibleBlocks[ 1 ].textContent ).toEqual( 'Advanced Text' );
@@ -191,12 +180,8 @@ describe( 'InserterMenu', () => {
} );
it( 'should limit the number of items shown in the suggested tab', () => {
- const element = initializeMenuDefaultStateAndReturnElement(
- { maxSuggestedItems: 2 }
- );
- const visibleBlocks = element.querySelectorAll(
- '.block-editor-block-types-list__list-item'
- );
+ const element = initializeMenuDefaultStateAndReturnElement( { maxSuggestedItems: 2 } );
+ const visibleBlocks = element.querySelectorAll( '.block-editor-block-types-list__list-item' );
expect( visibleBlocks ).toHaveLength( 2 );
} );
@@ -208,9 +193,7 @@ describe( 'InserterMenu', () => {
assertOpenedPanels( element, 1 );
- const visibleBlocks = element.querySelectorAll(
- '.block-editor-block-types-list__item-title'
- );
+ const visibleBlocks = element.querySelectorAll( '.block-editor-block-types-list__item-title' );
expect( visibleBlocks ).toHaveLength( 2 );
expect( visibleBlocks[ 0 ].textContent ).toBe( 'YouTube' );
@@ -227,9 +210,7 @@ describe( 'InserterMenu', () => {
assertOpenedPanels( element, 1 );
- const visibleBlocks = element.querySelectorAll(
- '.block-editor-block-types-list__item-title'
- );
+ const visibleBlocks = element.querySelectorAll( '.block-editor-block-types-list__item-title' );
expect( visibleBlocks ).toHaveLength( 1 );
expect( visibleBlocks[ 0 ].textContent ).toBe( 'My reusable block' );
@@ -245,9 +226,7 @@ describe( 'InserterMenu', () => {
assertOpenedPanels( element, 1 );
- const visibleBlocks = element.querySelectorAll(
- '.block-editor-block-types-list__item-title'
- );
+ const visibleBlocks = element.querySelectorAll( '.block-editor-block-types-list__item-title' );
expect( visibleBlocks ).toHaveLength( 3 );
expect( visibleBlocks[ 0 ].textContent ).toBe( 'Text' );
@@ -277,17 +256,13 @@ describe( 'InserterMenu', () => {
assertOpenedPanels( element, 2 );
- const matchingCategories = element.querySelectorAll(
- '.components-panel__body-toggle'
- );
+ const matchingCategories = element.querySelectorAll( '.components-panel__body-toggle' );
expect( matchingCategories ).toHaveLength( 2 );
expect( matchingCategories[ 0 ].textContent ).toBe( 'Common Blocks' );
expect( matchingCategories[ 1 ].textContent ).toBe( 'Embeds' );
- const visibleBlocks = element.querySelectorAll(
- '.block-editor-block-types-list__item-title'
- );
+ const visibleBlocks = element.querySelectorAll( '.block-editor-block-types-list__item-title' );
expect( visibleBlocks ).toHaveLength( 3 );
expect( visibleBlocks[ 0 ].textContent ).toBe( 'Text' );
@@ -303,17 +278,13 @@ describe( 'InserterMenu', () => {
assertOpenedPanels( element, 2 );
- const matchingCategories = element.querySelectorAll(
- '.components-panel__body-toggle'
- );
+ const matchingCategories = element.querySelectorAll( '.components-panel__body-toggle' );
expect( matchingCategories ).toHaveLength( 2 );
expect( matchingCategories[ 0 ].textContent ).toBe( 'Common Blocks' );
expect( matchingCategories[ 1 ].textContent ).toBe( 'Embeds' );
- const visibleBlocks = element.querySelectorAll(
- '.block-editor-block-types-list__item-title'
- );
+ const visibleBlocks = element.querySelectorAll( '.block-editor-block-types-list__item-title' );
expect( visibleBlocks ).toHaveLength( 3 );
expect( visibleBlocks[ 0 ].textContent ).toBe( 'Text' );
@@ -326,46 +297,32 @@ describe( 'InserterMenu', () => {
describe( 'searchItems', () => {
it( 'should search items using the title ignoring case', () => {
- expect( searchItems( items, 'TEXT' ) ).toEqual(
- [ textItem, advancedTextItem, textEmbedItem ]
- );
+ expect( searchItems( items, 'TEXT' ) ).toEqual( [ textItem, advancedTextItem, textEmbedItem ] );
} );
it( 'should search items using the keywords', () => {
- expect( searchItems( items, 'GOOGL' ) ).toEqual(
- [ youtubeItem ]
- );
+ expect( searchItems( items, 'GOOGL' ) ).toEqual( [ youtubeItem ] );
} );
it( 'should search items using the categories', () => {
- expect( searchItems( items, 'LAYOUT' ) ).toEqual(
- [ moreItem ]
- );
+ expect( searchItems( items, 'LAYOUT' ) ).toEqual( [ moreItem ] );
} );
it( 'should ignore a leading slash on a search term', () => {
- expect( searchItems( items, '/GOOGL' ) ).toEqual(
- [ youtubeItem ]
- );
+ expect( searchItems( items, '/GOOGL' ) ).toEqual( [ youtubeItem ] );
} );
} );
describe( 'normalizeTerm', () => {
it( 'should remove diacritics', () => {
- expect( normalizeTerm( 'média' ) ).toEqual(
- 'media'
- );
+ expect( normalizeTerm( 'média' ) ).toEqual( 'media' );
} );
it( 'should trim whitespace', () => {
- expect( normalizeTerm( ' média ' ) ).toEqual(
- 'media'
- );
+ expect( normalizeTerm( ' média ' ) ).toEqual( 'media' );
} );
it( 'should convert to lowercase', () => {
- expect( normalizeTerm( ' Média ' ) ).toEqual(
- 'media'
- );
+ expect( normalizeTerm( ' Média ' ) ).toEqual( 'media' );
} );
} );
diff --git a/packages/block-editor/src/components/inspector-controls/index.native.js b/packages/block-editor/src/components/inspector-controls/index.native.js
index 341a7bcc049e7a..730dfaba5b37d3 100644
--- a/packages/block-editor/src/components/inspector-controls/index.native.js
+++ b/packages/block-editor/src/components/inspector-controls/index.native.js
@@ -20,7 +20,7 @@ const FillWithSettingsButton = ( { children, ...props } ) => {
return (
<>
{ children }
- { React.Children.count( children ) > 0 && (
) }
+ { React.Children.count( children ) > 0 &&
}
);
};
@@ -33,4 +33,3 @@ InspectorControls.Slot = Slot;
* @see https://github.com/WordPress/gutenberg/blob/master/packages/block-editor/src/components/inspector-controls/README.md
*/
export default InspectorControls;
-
diff --git a/packages/block-editor/src/components/media-placeholder/index.js b/packages/block-editor/src/components/media-placeholder/index.js
index d142d6d6c70008..6e00cb50af6916 100644
--- a/packages/block-editor/src/components/media-placeholder/index.js
+++ b/packages/block-editor/src/components/media-placeholder/index.js
@@ -1,13 +1,7 @@
/**
* External dependencies
*/
-import {
- every,
- get,
- isArray,
- noop,
- startsWith,
-} from 'lodash';
+import { every, get, isArray, noop, startsWith } from 'lodash';
import classnames from 'classnames';
/**
@@ -180,11 +174,17 @@ export class MediaPlaceholder extends Component {
instructions = __( 'Upload a media file or pick one from your media library.' );
if ( isAudio ) {
- instructions = __( 'Upload an audio file, pick one from your media library, or add one with a URL.' );
+ instructions = __(
+ 'Upload an audio file, pick one from your media library, or add one with a URL.'
+ );
} else if ( isImage ) {
- instructions = __( 'Upload an image file, pick one from your media library, or add one with a URL.' );
+ instructions = __(
+ 'Upload an image file, pick one from your media library, or add one with a URL.'
+ );
} else if ( isVideo ) {
- instructions = __( 'Upload a video file, pick one from your media library, or add one with a URL.' );
+ instructions = __(
+ 'Upload a video file, pick one from your media library, or add one with a URL.'
+ );
}
}
@@ -232,41 +232,31 @@ export class MediaPlaceholder extends Component {
return null;
}
- return (
-
- );
+ return
;
}
renderCancelLink() {
- const {
- onCancel,
- } = this.props;
- return ( onCancel &&
-
- { __( 'Cancel' ) }
-
+ const { onCancel } = this.props;
+ return (
+ onCancel && (
+
+ { __( 'Cancel' ) }
+
+ )
);
}
renderUrlSelectionUI() {
- const {
- onSelectURL,
- } = this.props;
+ const { onSelectURL } = this.props;
if ( ! onSelectURL ) {
return null;
}
- const {
- isURLInputVisible,
- src,
- } = this.state;
+ const { isURLInputVisible, src } = this.state;
return (
id ) :
- value.id
- }
+ value={ isArray( value ) ? value.map( ( { id } ) => id ) : value.id }
render={ ( { open } ) => {
return (
- { this.renderDropZone() }
-
- );
+ return { this.renderDropZone() } ;
}
return (
-
+
{ this.renderMediaUploadChecked() }
);
@@ -438,5 +415,5 @@ const applyWithSelect = withSelect( ( select ) => {
*/
export default compose(
applyWithSelect,
- withFilters( 'editor.MediaPlaceholder' ),
+ withFilters( 'editor.MediaPlaceholder' )
)( MediaPlaceholder );
diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js
index 3680401362a4cb..0b23f5b2ffe1d1 100644
--- a/packages/block-editor/src/components/media-placeholder/index.native.js
+++ b/packages/block-editor/src/components/media-placeholder/index.native.js
@@ -7,11 +7,7 @@ import { View, Text, TouchableWithoutFeedback } from 'react-native';
* WordPress dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
-import {
- MediaUpload,
- MEDIA_TYPE_IMAGE,
- MEDIA_TYPE_VIDEO,
-} from '@wordpress/block-editor';
+import { MediaUpload, MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO } from '@wordpress/block-editor';
import { Dashicon } from '@wordpress/components';
import { withPreferredColorScheme } from '@wordpress/compose';
@@ -64,21 +60,18 @@ function MediaPlaceholder( props ) {
accessibilityHint = __( 'Double tap to select a video' );
}
- const emptyStateTitleStyle = getStylesFromColorScheme( styles.emptyStateTitle, styles.emptyStateTitleDark );
+ const emptyStateTitleStyle = getStylesFromColorScheme(
+ styles.emptyStateTitle,
+ styles.emptyStateTitleDark
+ );
const renderContent = () => {
if ( isAppender === undefined || ! isAppender ) {
return (
<>
-
- { icon }
-
-
- { placeholderTitle }
-
-
- { instructions }
-
+ { icon }
+ { placeholderTitle }
+ { instructions }
);
} else if ( isAppender && ! disableMediaButtons ) {
@@ -97,7 +90,10 @@ function MediaPlaceholder( props ) {
return null;
}
- const emptyStateContainerStyle = getStylesFromColorScheme( styles.emptyStateContainer, styles.emptyStateContainerDark );
+ const emptyStateContainerStyle = getStylesFromColorScheme(
+ styles.emptyStateContainer,
+ styles.emptyStateContainerDark
+ );
return (
@@ -118,12 +114,9 @@ function MediaPlaceholder( props ) {
onPress={ ( event ) => {
props.onFocus( event );
open();
- } }>
-
+ } }
+ >
+
{ getMediaOptions() }
{ renderContent() }
diff --git a/packages/block-editor/src/components/media-placeholder/test/index.js b/packages/block-editor/src/components/media-placeholder/test/index.js
index 6d7050eb84f062..9660fe4ef64600 100644
--- a/packages/block-editor/src/components/media-placeholder/test/index.js
+++ b/packages/block-editor/src/components/media-placeholder/test/index.js
@@ -12,8 +12,6 @@ jest.mock( '../../media-upload/check', () => () => null );
describe( 'MediaPlaceholder', () => {
it( 'renders successfully when allowedTypes property is not specified', () => {
- expect( () => mount(
-
- { this.props.children( sizes ) }
-
- );
+ return { this.props.children( sizes ) } ;
}
}
diff --git a/packages/block-editor/src/components/media-upload-progress/index.native.js b/packages/block-editor/src/components/media-upload-progress/index.native.js
index ca13038a2795ed..f702f890b2183c 100644
--- a/packages/block-editor/src/components/media-upload-progress/index.native.js
+++ b/packages/block-editor/src/components/media-upload-progress/index.native.js
@@ -3,16 +3,12 @@
*/
import React from 'react';
import { View } from 'react-native';
-import {
- subscribeMediaUpload,
-} from 'react-native-gutenberg-bridge';
+import { subscribeMediaUpload } from 'react-native-gutenberg-bridge';
/**
* WordPress dependencies
*/
-import {
- Spinner,
-} from '@wordpress/components';
+import { Spinner } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
/**
@@ -71,7 +67,11 @@ export class MediaUploadProgress extends React.Component {
}
updateMediaProgress( payload ) {
- this.setState( { progress: payload.progress, isUploadInProgress: true, isUploadFailed: false } );
+ this.setState( {
+ progress: payload.progress,
+ isUploadInProgress: true,
+ isUploadFailed: false,
+ } );
if ( this.props.onUpdateMediaProgress ) {
this.props.onUpdateMediaProgress( payload );
}
@@ -123,18 +123,15 @@ export class MediaUploadProgress extends React.Component {
return (
- { showSpinner &&
+ { showSpinner && (
- }
- { coverUrl &&
-
+ ) }
+ { coverUrl && (
+
{ ( sizes ) => {
- const {
- imageWidthWithinContainer,
- imageHeightWithinContainer,
- } = sizes;
+ const { imageWidthWithinContainer, imageHeightWithinContainer } = sizes;
let finalHeight = imageHeightWithinContainer;
if ( height > 0 && height < imageHeightWithinContainer ) {
@@ -145,22 +142,23 @@ export class MediaUploadProgress extends React.Component {
if ( width > 0 && width < imageWidthWithinContainer ) {
finalWidth = width;
}
- return ( this.props.renderContent( {
+ return this.props.renderContent( {
isUploadInProgress,
isUploadFailed,
finalWidth,
finalHeight,
imageWidthWithinContainer,
retryMessage,
- } ) );
+ } );
} }
- }
- { ! coverUrl && this.props.renderContent( {
- isUploadInProgress,
- isUploadFailed,
- retryMessage,
- } ) }
+ ) }
+ { ! coverUrl &&
+ this.props.renderContent( {
+ isUploadInProgress,
+ isUploadFailed,
+ retryMessage,
+ } ) }
);
}
diff --git a/packages/block-editor/src/components/media-upload-progress/test/index.native.js b/packages/block-editor/src/components/media-upload-progress/test/index.native.js
index e7c48e80d05df5..2bcb8206e18168 100644
--- a/packages/block-editor/src/components/media-upload-progress/test/index.native.js
+++ b/packages/block-editor/src/components/media-upload-progress/test/index.native.js
@@ -2,9 +2,7 @@
* External dependencies
*/
import { shallow } from 'enzyme';
-import {
- sendMediaUpload,
-} from 'react-native-gutenberg-bridge';
+import { sendMediaUpload } from 'react-native-gutenberg-bridge';
/**
* Internal dependencies
@@ -34,9 +32,7 @@ const MEDIA_ID = 123;
describe( 'MediaUploadProgress component', () => {
it( 'renders without crashing', () => {
- const wrapper = shallow(
- {} } />
- );
+ const wrapper = shallow( {} } /> );
expect( wrapper ).toBeTruthy();
} );
diff --git a/packages/block-editor/src/components/media-upload/index.native.js b/packages/block-editor/src/components/media-upload/index.native.js
index 77f125fb35f91a..b0b25ee3338927 100644
--- a/packages/block-editor/src/components/media-upload/index.native.js
+++ b/packages/block-editor/src/components/media-upload/index.native.js
@@ -43,14 +43,27 @@ export class MediaUpload extends React.Component {
return OPTION_TAKE_PHOTO;
} else if ( isVideo ) {
return OPTION_TAKE_VIDEO;
- } return OPTION_TAKE_PHOTO_OR_VIDEO;
+ }
+ return OPTION_TAKE_PHOTO_OR_VIDEO;
}
getMediaOptionsItems() {
return [
- { icon: this.getChooseFromDeviceIcon(), value: MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_CHOOSE_FROM_DEVICE, label: __( 'Choose from device' ) },
- { icon: this.getTakeMediaIcon(), value: MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_TAKE_MEDIA, label: this.getTakeMediaLabel() },
- { icon: this.getWordPressLibraryIcon(), value: MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_WORD_PRESS_LIBRARY, label: __( 'WordPress Media Library' ) },
+ {
+ icon: this.getChooseFromDeviceIcon(),
+ value: MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_CHOOSE_FROM_DEVICE,
+ label: __( 'Choose from device' ),
+ },
+ {
+ icon: this.getTakeMediaIcon(),
+ value: MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_TAKE_MEDIA,
+ label: this.getTakeMediaLabel(),
+ },
+ {
+ icon: this.getWordPressLibraryIcon(),
+ value: MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_WORD_PRESS_LIBRARY,
+ label: __( 'WordPress Media Library' ),
+ },
];
}
@@ -107,7 +120,7 @@ export class MediaUpload extends React.Component {
const getMediaOptions = () => (
this.picker = instance }
+ ref={ ( instance ) => ( this.picker = instance ) }
options={ mediaOptions }
onChange={ this.onPickerChange }
/>
diff --git a/packages/block-editor/src/components/media-upload/test/index.native.js b/packages/block-editor/src/components/media-upload/test/index.native.js
index 85b63b098ca927..ae7a28c0534a3c 100644
--- a/packages/block-editor/src/components/media-upload/test/index.native.js
+++ b/packages/block-editor/src/components/media-upload/test/index.native.js
@@ -28,21 +28,22 @@ const MEDIA_ID = 123;
describe( 'MediaUpload component', () => {
it( 'renders without crashing', () => {
- const wrapper = shallow(
- {} } />
- );
+ const wrapper = shallow( {} } /> );
expect( wrapper ).toBeTruthy();
} );
it( 'opens media options picker', () => {
const wrapper = shallow(
- {
- return (
-
- { getMediaOptions() }
-
- );
- } } />
+ {
+ return (
+
+ { getMediaOptions() }
+
+ );
+ } }
+ />
);
expect( wrapper.find( 'Picker' ) ).toHaveLength( 1 );
} );
@@ -58,9 +59,15 @@ describe( 'MediaUpload component', () => {
{ getMediaOptions() }
);
- } } />
+ } }
+ />
);
- expect( wrapper.find( 'Picker' ).props().options.filter( ( item ) => item.label === expectedOption ) ).toHaveLength( 1 );
+ expect(
+ wrapper
+ .find( 'Picker' )
+ .props()
+ .options.filter( ( item ) => item.label === expectedOption )
+ ).toHaveLength( 1 );
};
expectOptionForMediaType( MEDIA_TYPE_IMAGE, OPTION_TAKE_PHOTO );
expectOptionForMediaType( MEDIA_TYPE_VIDEO, OPTION_TAKE_VIDEO );
@@ -89,7 +96,8 @@ describe( 'MediaUpload component', () => {
{ getMediaOptions() }
);
- } } />
+ } }
+ />
);
wrapper.find( 'Picker' ).simulate( 'change', option );
const media = { id: MEDIA_ID, url: MEDIA_URL };
@@ -101,22 +109,42 @@ describe( 'MediaUpload component', () => {
};
it( 'can select media from device library', () => {
- expectMediaPickerForOption( MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_CHOOSE_FROM_DEVICE, false, requestMediaPickFromDeviceLibrary );
+ expectMediaPickerForOption(
+ MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_CHOOSE_FROM_DEVICE,
+ false,
+ requestMediaPickFromDeviceLibrary
+ );
} );
it( 'can select media from WP media library', () => {
- expectMediaPickerForOption( MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_WORD_PRESS_LIBRARY, false, requestMediaPickFromMediaLibrary );
+ expectMediaPickerForOption(
+ MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_WORD_PRESS_LIBRARY,
+ false,
+ requestMediaPickFromMediaLibrary
+ );
} );
it( 'can select media by capturig', () => {
- expectMediaPickerForOption( MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_TAKE_MEDIA, false, requestMediaPickFromDeviceCamera );
+ expectMediaPickerForOption(
+ MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_TAKE_MEDIA,
+ false,
+ requestMediaPickFromDeviceCamera
+ );
} );
it( 'can select multiple media from device library', () => {
- expectMediaPickerForOption( MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_CHOOSE_FROM_DEVICE, true, requestMediaPickFromDeviceLibrary );
+ expectMediaPickerForOption(
+ MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_CHOOSE_FROM_DEVICE,
+ true,
+ requestMediaPickFromDeviceLibrary
+ );
} );
it( 'can select multiple media from WP media library', () => {
- expectMediaPickerForOption( MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_WORD_PRESS_LIBRARY, true, requestMediaPickFromMediaLibrary );
+ expectMediaPickerForOption(
+ MEDIA_UPLOAD_BOTTOM_SHEET_VALUE_WORD_PRESS_LIBRARY,
+ true,
+ requestMediaPickFromMediaLibrary
+ );
} );
} );
diff --git a/packages/block-editor/src/components/multi-selection-inspector/index.js b/packages/block-editor/src/components/multi-selection-inspector/index.js
index bc0bcef9558837..e646e53d9977dc 100644
--- a/packages/block-editor/src/components/multi-selection-inspector/index.js
+++ b/packages/block-editor/src/components/multi-selection-inspector/index.js
@@ -5,10 +5,7 @@ import { sprintf, _n } from '@wordpress/i18n';
import { withSelect } from '@wordpress/data';
import { serialize } from '@wordpress/blocks';
import { count as wordCount } from '@wordpress/wordcount';
-import {
- Path,
- SVG,
-} from '@wordpress/components';
+import { Path, SVG } from '@wordpress/components';
/**
* Internal dependencies
@@ -20,21 +17,22 @@ function MultiSelectionInspector( { blocks } ) {
return (
-
+
- {
- /* translators: %d: number of blocks */
- sprintf( _n( '%d block', '%d blocks', blocks.length ), blocks.length )
- }
+ { /* translators: %d: number of blocks */
+ sprintf( _n( '%d block', '%d blocks', blocks.length ), blocks.length ) }
- {
- /* translators: %d: number of words */
- sprintf( _n( '%d word', '%d words', words ), words )
- }
+ { /* translators: %d: number of words */
+ sprintf( _n( '%d word', '%d words', words ), words ) }
{
+const hasColorsToChooseInSetting = ( colors = [], disableCustomColors, colorSetting ) => {
if ( ! hasCustomColorsDisabledForSetting( disableCustomColors, colorSetting ) ) {
return true;
}
@@ -36,11 +33,7 @@ const hasColorsToChooseInSetting = (
const hasColorsToChoose = ( { colors, disableCustomColors, colorSettings } ) => {
return some( colorSettings, ( colorSetting ) => {
- return hasColorsToChooseInSetting(
- colors,
- disableCustomColors,
- colorSetting
- );
+ return hasColorsToChooseInSetting( colors, disableCustomColors, colorSetting );
} );
};
@@ -48,46 +41,24 @@ const hasColorsToChoose = ( { colors, disableCustomColors, colorSettings } ) =>
const colorIndicatorAriaLabel = __( '(%s: %s)' );
const renderColorIndicators = ( colorSettings, colors ) => {
- return colorSettings.map(
- ( { value, label, colors: availableColors }, index ) => {
- if ( ! value ) {
- return null;
- }
+ return colorSettings.map( ( { value, label, colors: availableColors }, index ) => {
+ if ( ! value ) {
+ return null;
+ }
- const colorObject = getColorObjectByColorValue(
- availableColors || colors,
- value
- );
- const colorName = colorObject && colorObject.name;
- const ariaLabel = sprintf(
- colorIndicatorAriaLabel,
- label.toLowerCase(),
- colorName || value
- );
+ const colorObject = getColorObjectByColorValue( availableColors || colors, value );
+ const colorName = colorObject && colorObject.name;
+ const ariaLabel = sprintf( colorIndicatorAriaLabel, label.toLowerCase(), colorName || value );
- return (
-
{ title }
diff --git a/packages/block-editor/src/components/panel-color-settings/test/index.js b/packages/block-editor/src/components/panel-color-settings/test/index.js
index aaa73a0c487da5..3a0bf27040ca24 100644
--- a/packages/block-editor/src/components/panel-color-settings/test/index.js
+++ b/packages/block-editor/src/components/panel-color-settings/test/index.js
@@ -95,11 +95,13 @@ describe( 'PanelColorSettings', () => {
value: '#000',
onChange: noop,
label: 'border color',
- colors: [ {
- slug: 'red',
- name: 'Red',
- color: '#ff0000',
- } ],
+ colors: [
+ {
+ slug: 'red',
+ name: 'Red',
+ color: '#ff0000',
+ },
+ ],
},
{
value: '#111',
diff --git a/packages/block-editor/src/components/plain-text/index.js b/packages/block-editor/src/components/plain-text/index.js
index b05e48ed60b61c..3dc733d8780197 100644
--- a/packages/block-editor/src/components/plain-text/index.js
+++ b/packages/block-editor/src/components/plain-text/index.js
@@ -1,4 +1,3 @@
-
/**
* WordPress dependencies
*/
diff --git a/packages/block-editor/src/components/plain-text/index.native.js b/packages/block-editor/src/components/plain-text/index.native.js
index 9dd7eba3461528..6ffa90e939bab5 100644
--- a/packages/block-editor/src/components/plain-text/index.native.js
+++ b/packages/block-editor/src/components/plain-text/index.native.js
@@ -21,7 +21,7 @@ export default class PlainText extends Component {
componentDidMount() {
// if isSelected is true, we should request the focus on this TextInput
- if ( ( this._input.isFocused() === false ) && ( this._input.props.isSelected === true ) ) {
+ if ( this._input.isFocused() === false && this._input.props.isSelected === true ) {
this.focus();
}
}
@@ -40,14 +40,14 @@ export default class PlainText extends Component {
return (
this._input = x }
+ ref={ ( x ) => ( this._input = x ) }
className={ [ styles[ 'block-editor-plain-text' ], this.props.className ] }
onChange={ ( event ) => {
this.props.onChange( event.nativeEvent.text );
} }
onFocus={ this.props.onFocus } // always assign onFocus as a props
onBlur={ this.props.onBlur } // always assign onBlur as a props
- fontFamily={ this.props.fontFamily || ( styles[ 'block-editor-plain-text' ].fontFamily ) }
+ fontFamily={ this.props.fontFamily || styles[ 'block-editor-plain-text' ].fontFamily }
fontSize={ this.props.fontSize }
fontWeight={ this.props.fontWeight }
fontStyle={ this.props.fontStyle }
diff --git a/packages/block-editor/src/components/provider/index.js b/packages/block-editor/src/components/provider/index.js
index 488dd6244d8c65..c1325e439b68cc 100644
--- a/packages/block-editor/src/components/provider/index.js
+++ b/packages/block-editor/src/components/provider/index.js
@@ -23,13 +23,7 @@ class BlockEditorProvider extends Component {
}
componentDidUpdate( prevProps ) {
- const {
- settings,
- updateSettings,
- value,
- resetBlocks,
- registry,
- } = this.props;
+ const { settings, updateSettings, value, resetBlocks, registry } = this.props;
if ( settings !== prevProps.settings ) {
updateSettings( settings );
@@ -91,19 +85,14 @@ class BlockEditorProvider extends Component {
let isPersistent = isLastBlockChangePersistent();
this.unsubscribe = registry.subscribe( () => {
- const {
- onChange = noop,
- onInput = noop,
- } = this.props;
+ const { onChange = noop, onInput = noop } = this.props;
const newBlocks = getBlocks();
const newIsPersistent = isLastBlockChangePersistent();
if (
- newBlocks !== blocks && (
- this.isSyncingIncomingValue ||
- __unstableIsLastBlockChangeIgnored()
- )
+ newBlocks !== blocks &&
+ ( this.isSyncingIncomingValue || __unstableIsLastBlockChangeIgnored() )
) {
this.isSyncingIncomingValue = null;
blocks = newBlocks;
@@ -144,10 +133,7 @@ class BlockEditorProvider extends Component {
export default compose( [
withRegistryProvider,
withDispatch( ( dispatch ) => {
- const {
- updateSettings,
- resetBlocks,
- } = dispatch( 'core/block-editor' );
+ const { updateSettings, resetBlocks } = dispatch( 'core/block-editor' );
return {
updateSettings,
diff --git a/packages/block-editor/src/components/provider/index.native.js b/packages/block-editor/src/components/provider/index.native.js
index 8e2f2e677397b4..59e6e65432cc12 100644
--- a/packages/block-editor/src/components/provider/index.native.js
+++ b/packages/block-editor/src/components/provider/index.native.js
@@ -17,12 +17,7 @@ import { createHigherOrderComponent, compose } from '@wordpress/compose';
const withRegistry = createHigherOrderComponent(
( OriginalComponent ) => ( props ) => (
- { ( registry ) => (
-
),
'withRegistry'
@@ -36,13 +31,7 @@ class BlockEditorProvider extends Component {
}
componentDidUpdate( prevProps ) {
- const {
- settings,
- updateSettings,
- value,
- resetBlocks,
- registry,
- } = this.props;
+ const { settings, updateSettings, value, resetBlocks, registry } = this.props;
if ( settings !== prevProps.settings ) {
updateSettings( settings );
@@ -83,19 +72,13 @@ class BlockEditorProvider extends Component {
this.unsubscribe();
}
- const {
- getBlocks,
- isLastBlockChangePersistent,
- } = registry.select( 'core/block-editor' );
+ const { getBlocks, isLastBlockChangePersistent } = registry.select( 'core/block-editor' );
let blocks = getBlocks();
let isPersistent = isLastBlockChangePersistent();
this.unsubscribe = registry.subscribe( () => {
- const {
- onChange,
- onInput,
- } = this.props;
+ const { onChange, onInput } = this.props;
const newBlocks = getBlocks();
const newIsPersistent = isLastBlockChangePersistent();
if ( newBlocks !== blocks && this.isSyncingIncomingValue ) {
@@ -126,20 +109,13 @@ class BlockEditorProvider extends Component {
render() {
const { children } = this.props;
- return (
-
- { children }
-
- );
+ return { children } ;
}
}
export default compose( [
withDispatch( ( dispatch ) => {
- const {
- updateSettings,
- resetBlocks,
- } = dispatch( 'core/block-editor' );
+ const { updateSettings, resetBlocks } = dispatch( 'core/block-editor' );
return {
updateSettings,
diff --git a/packages/block-editor/src/components/rich-text/format-toolbar/index.js b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
index 0aed5916c0bc48..525d0e5b5b48d7 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar/index.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
@@ -19,17 +19,19 @@ const FormatToolbar = () => {
return (
- { [ 'bold', 'italic', 'link' ].map( ( format ) =>
+ { [ 'bold', 'italic', 'link' ].map( ( format ) => (
- { ( fills ) => fills.length !== 0 &&
- props ), 'title' ) }
- popoverProps={ POPOVER_PROPS }
- />
+ { ( fills ) =>
+ fills.length !== 0 && (
+ props ), 'title' ) }
+ popoverProps={ POPOVER_PROPS }
+ />
+ )
}
diff --git a/packages/block-editor/src/components/rich-text/format-toolbar/index.native.js b/packages/block-editor/src/components/rich-text/format-toolbar/index.native.js
index d39f9b4668eb44..7faea41fac3c31 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar/index.native.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar/index.native.js
@@ -7,9 +7,9 @@ import { Toolbar, Slot } from '@wordpress/components';
const FormatToolbar = () => {
return (
- { [ 'bold', 'italic', 'link' ].map( ( format ) =>
+ { [ 'bold', 'italic', 'link' ].map( ( format ) => (
);
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
index b78e8c3a46ffc3..ac8ec94336a2b7 100644
--- a/packages/block-editor/src/components/rich-text/index.js
+++ b/packages/block-editor/src/components/rich-text/index.js
@@ -9,7 +9,12 @@ import { omit } from 'lodash';
*/
import { RawHTML, Component, createRef } from '@wordpress/element';
import { withDispatch, withSelect } from '@wordpress/data';
-import { pasteHandler, children as childrenSource, getBlockTransforms, findTransform } from '@wordpress/blocks';
+import {
+ pasteHandler,
+ children as childrenSource,
+ getBlockTransforms,
+ findTransform,
+} from '@wordpress/blocks';
import { withInstanceId, compose } from '@wordpress/compose';
import {
__experimentalRichText as RichText,
@@ -70,25 +75,17 @@ class RichTextWrapper extends Component {
}
onEnter( { value, onChange, shiftKey } ) {
- const {
- onReplace,
- onSplit,
- multiline,
- markAutomaticChange,
- } = this.props;
+ const { onReplace, onSplit, multiline, markAutomaticChange } = this.props;
const canSplit = onReplace && onSplit;
if ( onReplace ) {
- const transforms = getBlockTransforms( 'from' )
- .filter( ( { type } ) => type === 'enter' );
+ const transforms = getBlockTransforms( 'from' ).filter( ( { type } ) => type === 'enter' );
const transformation = findTransform( transforms, ( item ) => {
return item.regExp.test( value.text );
} );
if ( transformation ) {
- onReplace( [
- transformation.transform( { content: value.text } ),
- ] );
+ onReplace( [ transformation.transform( { content: value.text } ) ] );
markAutomaticChange();
}
}
@@ -156,11 +153,7 @@ class RichTextWrapper extends Component {
let mode = onReplace && onSplit ? 'AUTO' : 'INLINE';
- if (
- __unstableEmbedURLOnPaste &&
- isEmpty( value ) &&
- isURL( plainText.trim() )
- ) {
+ if ( __unstableEmbedURLOnPaste && isEmpty( value ) && isURL( plainText.trim() ) ) {
mode = 'BLOCKS';
}
@@ -201,12 +194,7 @@ class RichTextWrapper extends Component {
* @param {Array} pastedBlocks The pasted blocks to insert, if any.
*/
onSplit( record, pastedBlocks = [] ) {
- const {
- onReplace,
- onSplit,
- __unstableOnSplitMiddle: onSplitMiddle,
- multiline,
- } = this.props;
+ const { onReplace, onSplit, __unstableOnSplitMiddle: onSplitMiddle, multiline } = this.props;
if ( ! onReplace || ! onSplit ) {
return;
@@ -222,10 +210,14 @@ class RichTextWrapper extends Component {
// We do not want a leading empty block on paste, but we do if split
// with e.g. the enter key.
if ( ! hasPastedBlocks || ! isEmpty( before ) ) {
- blocks.push( onSplit( toHTMLString( {
- value: before,
- multilineTag,
- } ) ) );
+ blocks.push(
+ onSplit(
+ toHTMLString( {
+ value: before,
+ multilineTag,
+ } )
+ )
+ );
}
if ( hasPastedBlocks ) {
@@ -239,10 +231,14 @@ class RichTextWrapper extends Component {
// `onSplitMiddle` prop, but if there is and the content is empty, the
// middle block is enough to set focus in.
if ( hasPastedBlocks || ! onSplitMiddle || ! isEmpty( after ) ) {
- blocks.push( onSplit( toHTMLString( {
- value: after,
- multilineTag,
- } ) ) );
+ blocks.push(
+ onSplit(
+ toHTMLString( {
+ value: after,
+ multilineTag,
+ } )
+ )
+ );
}
// If there are pasted blocks, set the selection to the last one.
@@ -268,8 +264,9 @@ class RichTextWrapper extends Component {
}
const trimmedTextBefore = text.slice( 0, start ).trim();
- const prefixTransforms = getBlockTransforms( 'from' )
- .filter( ( { type } ) => type === 'prefix' );
+ const prefixTransforms = getBlockTransforms( 'from' ).filter(
+ ( { type } ) => type === 'prefix'
+ );
const transformation = findTransform( prefixTransforms, ( { prefix } ) => {
return trimmedTextBefore === prefix;
} );
@@ -385,9 +382,10 @@ class RichTextWrapper extends Component {
// Handle deprecated format.
if ( Array.isArray( originalValue ) ) {
adjustedValue = childrenSource.toHTML( originalValue );
- adjustedOnChange = ( newValue ) => originalOnChange( childrenSource.fromDOM(
- __unstableCreateElement( document, newValue ).childNodes
- ) );
+ adjustedOnChange = ( newValue ) =>
+ originalOnChange(
+ childrenSource.fromDOM( __unstableCreateElement( document, newValue ).childNodes )
+ );
}
const content = (
@@ -421,7 +419,7 @@ class RichTextWrapper extends Component {
__unstableDidAutomaticChange={ didAutomaticChange }
__unstableUndo={ undo }
>
- { ( { isSelected, value, onChange, Editable } ) =>
+ { ( { isSelected, value, onChange, Editable } ) => (
<>
{ children && children( { value, onChange } ) }
{ isSelected && ! inlineToolbar && hasFormats && (
@@ -448,7 +446,7 @@ class RichTextWrapper extends Component {
onChange={ onChange }
isSelected={ isSelected }
>
- { ( { listBoxId, activeId, onKeyDown } ) =>
+ { ( { listBoxId, activeId, onKeyDown } ) => (
- }
+ ) }
- }
+ ) }
);
@@ -472,23 +470,14 @@ class RichTextWrapper extends Component {
alternative: 'className prop or create your own wrapper div',
} );
- return (
-
- { content }
-
- );
+ return
{ content }
;
}
}
const RichTextContainer = compose( [
withInstanceId,
withBlockEditContext( ( { clientId } ) => ( { clientId } ) ),
- withSelect( ( select, {
- clientId,
- instanceId,
- identifier = instanceId,
- isSelected,
- } ) => {
+ withSelect( ( select, { clientId, instanceId, identifier = instanceId, isSelected } ) => {
const {
isCaretWithinFormattedText,
getSelectionStart,
@@ -501,10 +490,8 @@ const RichTextContainer = compose( [
const selectionEnd = getSelectionEnd();
const { __experimentalCanUserUseUnfilteredHTML } = getSettings();
if ( isSelected === undefined ) {
- isSelected = (
- selectionStart.clientId === clientId &&
- selectionStart.attributeKey === identifier
- );
+ isSelected =
+ selectionStart.clientId === clientId && selectionStart.attributeKey === identifier;
} else if ( isSelected ) {
isSelected = selectionStart.clientId === clientId;
}
@@ -518,11 +505,7 @@ const RichTextContainer = compose( [
didAutomaticChange: didAutomaticChange(),
};
} ),
- withDispatch( ( dispatch, {
- clientId,
- instanceId,
- identifier = instanceId,
- } ) => {
+ withDispatch( ( dispatch, { clientId, instanceId, identifier = instanceId } ) => {
const {
__unstableMarkLastChangeAsPersistent,
enterFormattedText,
diff --git a/packages/block-editor/src/components/rich-text/index.native.js b/packages/block-editor/src/components/rich-text/index.native.js
index feab0f747a9229..de5d11bb4280f9 100644
--- a/packages/block-editor/src/components/rich-text/index.native.js
+++ b/packages/block-editor/src/components/rich-text/index.native.js
@@ -83,7 +83,7 @@ function RichTextWraper( {
__unstableCanUserUseUnfilteredHTML={ canUserUseUnfilteredHTML }
__unstableOnCreateUndoLevel={ onCreateUndoLevel }
>
- { ( { isSelected, value, onChange } ) =>
+ { ( { isSelected, value, onChange } ) => (
{ children && children( { value, onChange } ) }
{ isSelected && ! inlineToolbar && (
@@ -92,7 +92,7 @@ function RichTextWraper( {
) }
- }
+ ) }
);
}
@@ -106,54 +106,41 @@ const RichTextContainer = compose( [
onCaretVerticalPositionChange,
};
} ),
- withSelect( ( select, {
- clientId,
- instanceId,
- identifier = instanceId,
- isSelected,
- blockIsSelected,
- } ) => {
- const { getFormatTypes } = select( 'core/rich-text' );
- const {
- getSelectionStart,
- getSelectionEnd,
- __unstableGetBlockWithoutInnerBlocks,
- } = select( 'core/block-editor' );
-
- const selectionStart = getSelectionStart();
- const selectionEnd = getSelectionEnd();
-
- if ( isSelected === undefined ) {
- isSelected = (
- selectionStart.clientId === clientId &&
- selectionStart.attributeKey === identifier
+ withSelect(
+ ( select, { clientId, instanceId, identifier = instanceId, isSelected, blockIsSelected } ) => {
+ const { getFormatTypes } = select( 'core/rich-text' );
+ const { getSelectionStart, getSelectionEnd, __unstableGetBlockWithoutInnerBlocks } = select(
+ 'core/block-editor'
);
- }
- // If the block of this RichText is unmodified then it's a candidate for replacing when adding a new block.
- // In order to fix https://github.com/wordpress-mobile/gutenberg-mobile/issues/1126, let's blur on unmount in that case.
- // This apparently assumes functionality the BlockHlder actually
- const block = clientId && __unstableGetBlockWithoutInnerBlocks( clientId );
- const shouldBlurOnUnmount = block && isSelected && isUnmodifiedDefaultBlock( block );
+ const selectionStart = getSelectionStart();
+ const selectionEnd = getSelectionEnd();
- return {
- formatTypes: getFormatTypes(),
- selectionStart: isSelected ? selectionStart.offset : undefined,
- selectionEnd: isSelected ? selectionEnd.offset : undefined,
- isSelected,
- blockIsSelected,
- shouldBlurOnUnmount,
- };
- } ),
- withDispatch( ( dispatch, {
- clientId,
- instanceId,
- identifier = instanceId,
- } ) => {
- const {
- __unstableMarkLastChangeAsPersistent,
- selectionChange,
- } = dispatch( 'core/block-editor' );
+ if ( isSelected === undefined ) {
+ isSelected =
+ selectionStart.clientId === clientId && selectionStart.attributeKey === identifier;
+ }
+
+ // If the block of this RichText is unmodified then it's a candidate for replacing when adding a new block.
+ // In order to fix https://github.com/wordpress-mobile/gutenberg-mobile/issues/1126, let's blur on unmount in that case.
+ // This apparently assumes functionality the BlockHlder actually
+ const block = clientId && __unstableGetBlockWithoutInnerBlocks( clientId );
+ const shouldBlurOnUnmount = block && isSelected && isUnmodifiedDefaultBlock( block );
+
+ return {
+ formatTypes: getFormatTypes(),
+ selectionStart: isSelected ? selectionStart.offset : undefined,
+ selectionEnd: isSelected ? selectionEnd.offset : undefined,
+ isSelected,
+ blockIsSelected,
+ shouldBlurOnUnmount,
+ };
+ }
+ ),
+ withDispatch( ( dispatch, { clientId, instanceId, identifier = instanceId } ) => {
+ const { __unstableMarkLastChangeAsPersistent, selectionChange } = dispatch(
+ 'core/block-editor'
+ );
return {
onCreateUndoLevel: __unstableMarkLastChangeAsPersistent,
diff --git a/packages/block-editor/src/components/rich-text/remove-browser-shortcuts.js b/packages/block-editor/src/components/rich-text/remove-browser-shortcuts.js
index 165566a5bbbd16..036f216bca7a51 100644
--- a/packages/block-editor/src/components/rich-text/remove-browser-shortcuts.js
+++ b/packages/block-editor/src/components/rich-text/remove-browser-shortcuts.js
@@ -30,9 +30,11 @@ const HANDLED_SHORTCUTS = [
const SHORTCUTS_ELEMENT = (
{
- return [ shortcut, ( event ) => event.preventDefault() ];
- } ) ) }
+ shortcuts={ fromPairs(
+ HANDLED_SHORTCUTS.map( ( shortcut ) => {
+ return [ shortcut, ( event ) => event.preventDefault() ];
+ } )
+ ) }
/>
);
diff --git a/packages/block-editor/src/components/rich-text/toolbar-button.js b/packages/block-editor/src/components/rich-text/toolbar-button.js
index 2febd82e717c57..911880dd9814e2 100644
--- a/packages/block-editor/src/components/rich-text/toolbar-button.js
+++ b/packages/block-editor/src/components/rich-text/toolbar-button.js
@@ -18,10 +18,7 @@ export function RichTextToolbarButton( { name, shortcutType, shortcutCharacter,
return (
-
);
}
diff --git a/packages/block-editor/src/components/skip-to-selected-block/index.js b/packages/block-editor/src/components/skip-to-selected-block/index.js
index 672baa3920fd82..4e05e86ba036b4 100644
--- a/packages/block-editor/src/components/skip-to-selected-block/index.js
+++ b/packages/block-editor/src/components/skip-to-selected-block/index.js
@@ -17,10 +17,16 @@ const SkipToSelectedBlock = ( { selectedBlockClientId } ) => {
};
return (
- selectedBlockClientId &&
-
- { __( 'Skip to the selected block' ) }
-
+ selectedBlockClientId && (
+
+ { __( 'Skip to the selected block' ) }
+
+ )
);
};
diff --git a/packages/block-editor/src/components/typewriter/index.js b/packages/block-editor/src/components/typewriter/index.js
index 7600b2cd8747cd..877fb6baf1ebb3 100644
--- a/packages/block-editor/src/components/typewriter/index.js
+++ b/packages/block-editor/src/components/typewriter/index.js
@@ -89,9 +89,7 @@ class Typewriter extends Component {
}
isLastEditableNode() {
- const editableNodes = this.ref.current.querySelectorAll(
- '[contenteditable="true"]'
- );
+ const editableNodes = this.ref.current.querySelectorAll( '[contenteditable="true"]' );
const lastEditableNode = editableNodes[ editableNodes.length - 1 ];
return lastEditableNode === document.activeElement;
}
@@ -143,16 +141,11 @@ class Typewriter extends Component {
}
const windowScroll = scrollContainer === document.body;
- const scrollY = windowScroll ?
- window.scrollY :
- scrollContainer.scrollTop;
- const scrollContainerY = windowScroll ?
- 0 :
- scrollContainer.getBoundingClientRect().top;
- const relativeScrollPosition = windowScroll ?
- this.caretRect.top / window.innerHeight :
- ( this.caretRect.top - scrollContainerY ) /
- ( window.innerHeight - scrollContainerY );
+ const scrollY = windowScroll ? window.scrollY : scrollContainer.scrollTop;
+ const scrollContainerY = windowScroll ? 0 : scrollContainer.getBoundingClientRect().top;
+ const relativeScrollPosition = windowScroll
+ ? this.caretRect.top / window.innerHeight
+ : ( this.caretRect.top - scrollContainerY ) / ( window.innerHeight - scrollContainerY );
// If the scroll position is at the start, the active editable element
// is the last one, and the caret is positioned within the initial
@@ -170,16 +163,13 @@ class Typewriter extends Component {
return;
}
- const scrollContainerHeight = windowScroll ?
- window.innerHeight :
- scrollContainer.clientHeight;
+ const scrollContainerHeight = windowScroll ? window.innerHeight : scrollContainer.clientHeight;
// Abort if the target scroll position would scroll the caret out of
// view.
if (
// The caret is under the lower fold.
- this.caretRect.top + this.caretRect.height >
- scrollContainerY + scrollContainerHeight ||
+ this.caretRect.top + this.caretRect.height > scrollContainerY + scrollContainerHeight ||
// The caret is above the upper fold.
this.caretRect.top < scrollContainerY
) {
diff --git a/packages/block-editor/src/components/ungroup-button/icon.js b/packages/block-editor/src/components/ungroup-button/icon.js
index 4ef9e2694bd6ef..18fec5c1c94bfa 100644
--- a/packages/block-editor/src/components/ungroup-button/icon.js
+++ b/packages/block-editor/src/components/ungroup-button/icon.js
@@ -3,6 +3,19 @@
*/
import { SVG, Path } from '@wordpress/components';
-const UngroupSVG =
+
+);
export default UngroupSVG;
diff --git a/packages/block-editor/src/components/ungroup-button/index.native.js b/packages/block-editor/src/components/ungroup-button/index.native.js
index df006897210f97..67dee171955b7e 100644
--- a/packages/block-editor/src/components/ungroup-button/index.native.js
+++ b/packages/block-editor/src/components/ungroup-button/index.native.js
@@ -6,10 +6,7 @@ import { noop } from 'lodash';
/**
* WordPress dependencies
*/
-import {
- Toolbar,
- ToolbarButton,
-} from '@wordpress/components';
+import { Toolbar, ToolbarButton } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { withSelect, withDispatch } from '@wordpress/data';
import { compose } from '@wordpress/compose';
@@ -19,10 +16,7 @@ import { compose } from '@wordpress/compose';
*/
import UngroupIcon from './icon';
-export function UngroupButton( {
- onConvertFromGroup,
- isUngroupable = false,
-} ) {
+export function UngroupButton( { onConvertFromGroup, isUngroupable = false } ) {
if ( ! isUngroupable ) {
return null;
}
@@ -39,21 +33,20 @@ export function UngroupButton( {
export default compose( [
withSelect( ( select ) => {
- const {
- getSelectedBlockClientId,
- getBlock,
- } = select( 'core/block-editor' );
+ const { getSelectedBlockClientId, getBlock } = select( 'core/block-editor' );
- const {
- getGroupingBlockName,
- } = select( 'core/blocks' );
+ const { getGroupingBlockName } = select( 'core/blocks' );
const selectedId = getSelectedBlockClientId();
const selectedBlock = getBlock( selectedId );
const groupingBlockName = getGroupingBlockName();
- const isUngroupable = selectedBlock && selectedBlock.innerBlocks && !! selectedBlock.innerBlocks.length && selectedBlock.name === groupingBlockName;
+ const isUngroupable =
+ selectedBlock &&
+ selectedBlock.innerBlocks &&
+ !! selectedBlock.innerBlocks.length &&
+ selectedBlock.name === groupingBlockName;
const innerBlocks = isUngroupable ? selectedBlock.innerBlocks : [];
return {
@@ -63,9 +56,7 @@ export default compose( [
};
} ),
withDispatch( ( dispatch, { clientId, innerBlocks, onToggle = noop } ) => {
- const {
- replaceBlocks,
- } = dispatch( 'core/block-editor' );
+ const { replaceBlocks } = dispatch( 'core/block-editor' );
return {
onConvertFromGroup() {
@@ -73,10 +64,7 @@ export default compose( [
return;
}
- replaceBlocks(
- clientId,
- innerBlocks
- );
+ replaceBlocks( clientId, innerBlocks );
onToggle();
},
diff --git a/packages/block-editor/src/components/url-input/button.js b/packages/block-editor/src/components/url-input/button.js
index 077decf42d6313..6583cb1ed4c286 100644
--- a/packages/block-editor/src/components/url-input/button.js
+++ b/packages/block-editor/src/components/url-input/button.js
@@ -49,7 +49,7 @@ class URLInputButton extends Component {
'is-active': url,
} ) }
/>
- { expanded &&
+ { expanded && (
- }
+ ) }
);
}
diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 9652df56c9da74..2bbd96f265b8b4 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -91,35 +91,43 @@ class URLInput extends Component {
const request = fetchLinkSuggestions( value );
- request.then( ( suggestions ) => {
- // A fetch Promise doesn't have an abort option. It's mimicked by
- // comparing the request reference in on the instance, which is
- // reset or deleted on subsequent requests or unmounting.
- if ( this.suggestionsRequest !== request ) {
- return;
- }
-
- this.setState( {
- suggestions,
- loading: false,
- } );
+ request
+ .then( ( suggestions ) => {
+ // A fetch Promise doesn't have an abort option. It's mimicked by
+ // comparing the request reference in on the instance, which is
+ // reset or deleted on subsequent requests or unmounting.
+ if ( this.suggestionsRequest !== request ) {
+ return;
+ }
- if ( !! suggestions.length ) {
- this.props.debouncedSpeak( sprintf( _n(
- '%d result found, use up and down arrow keys to navigate.',
- '%d results found, use up and down arrow keys to navigate.',
- suggestions.length
- ), suggestions.length ), 'assertive' );
- } else {
- this.props.debouncedSpeak( __( 'No results.' ), 'assertive' );
- }
- } ).catch( () => {
- if ( this.suggestionsRequest === request ) {
this.setState( {
+ suggestions,
loading: false,
} );
- }
- } );
+
+ if ( !! suggestions.length ) {
+ this.props.debouncedSpeak(
+ sprintf(
+ _n(
+ '%d result found, use up and down arrow keys to navigate.',
+ '%d results found, use up and down arrow keys to navigate.',
+ suggestions.length
+ ),
+ suggestions.length
+ ),
+ 'assertive'
+ );
+ } else {
+ this.props.debouncedSpeak( __( 'No results.' ), 'assertive' );
+ }
+ } )
+ .catch( () => {
+ if ( this.suggestionsRequest === request ) {
+ this.setState( {
+ loading: false,
+ } );
+ }
+ } );
this.suggestionsRequest = request;
}
@@ -176,7 +184,9 @@ class URLInput extends Component {
case UP: {
event.stopPropagation();
event.preventDefault();
- const previousIndex = ! selectedSuggestion ? suggestions.length - 1 : selectedSuggestion - 1;
+ const previousIndex = ! selectedSuggestion
+ ? suggestions.length - 1
+ : selectedSuggestion - 1;
this.setState( {
selectedSuggestion: previousIndex,
} );
@@ -185,7 +195,10 @@ class URLInput extends Component {
case DOWN: {
event.stopPropagation();
event.preventDefault();
- const nextIndex = selectedSuggestion === null || ( selectedSuggestion === suggestions.length - 1 ) ? 0 : selectedSuggestion + 1;
+ const nextIndex =
+ selectedSuggestion === null || selectedSuggestion === suggestions.length - 1
+ ? 0
+ : selectedSuggestion + 1;
this.setState( {
selectedSuggestion: nextIndex,
} );
@@ -230,7 +243,15 @@ class URLInput extends Component {
}
render() {
- const { value = '', autoFocus = true, instanceId, className, id, isFullWidth, hasBorder } = this.props;
+ const {
+ value = '',
+ autoFocus = true,
+ instanceId,
+ className,
+ id,
+ isFullWidth,
+ hasBorder,
+ } = this.props;
const { showSuggestions, suggestions, selectedSuggestion, loading } = this.state;
const suggestionsListboxId = `block-editor-url-input-suggestions-${ instanceId }`;
@@ -238,10 +259,12 @@ class URLInput extends Component {
/* eslint-disable jsx-a11y/no-autofocus */
return (
-
+
- { ( loading ) &&
}
+ { loading &&
}
- { showSuggestions && !! suggestions.length &&
-
+ { showSuggestions && !! suggestions.length && (
+
this.handleOnClick( suggestion ) }
aria-selected={ index === selectedSuggestion }
>
@@ -297,7 +323,7 @@ class URLInput extends Component {
) ) }
- }
+ ) }
);
/* eslint-enable jsx-a11y/no-autofocus */
diff --git a/packages/block-editor/src/components/url-input/test/button.js b/packages/block-editor/src/components/url-input/test/button.js
index 8088d61ea5016e..66d365ff277ed8 100644
--- a/packages/block-editor/src/components/url-input/test/button.js
+++ b/packages/block-editor/src/components/url-input/test/button.js
@@ -14,7 +14,8 @@ import URLInputButton from '../button';
import '../../../store';
describe( 'URLInputButton', () => {
- const clickEditLink = ( wrapper ) => wrapper.find( 'ForwardRef(IconButton).components-toolbar__control' ).simulate( 'click' );
+ const clickEditLink = ( wrapper ) =>
+ wrapper.find( 'ForwardRef(IconButton).components-toolbar__control' ).simulate( 'click' );
it( 'should have a valid class name in the wrapper tag', () => {
const wrapper = shallow(
);
@@ -63,14 +64,9 @@ describe( 'URLInputButton', () => {
} );
it( 'should close the form when user submits it', () => {
const wrapper = TestUtils.renderIntoDocument(
);
- const buttonElement = () => TestUtils.scryRenderedDOMComponentsWithClass(
- wrapper,
- 'components-toolbar__control'
- );
- const formElement = () => TestUtils.scryRenderedDOMComponentsWithTag(
- wrapper,
- 'form'
- );
+ const buttonElement = () =>
+ TestUtils.scryRenderedDOMComponentsWithClass( wrapper, 'components-toolbar__control' );
+ const formElement = () => TestUtils.scryRenderedDOMComponentsWithTag( wrapper, 'form' );
TestUtils.Simulate.click( buttonElement().shift() );
expect( wrapper.state.expanded ).toBe( true );
TestUtils.Simulate.submit( formElement().shift() );
diff --git a/packages/block-editor/src/components/url-popover/index.js b/packages/block-editor/src/components/url-popover/index.js
index e39e4cc478e3e2..6d2a00f96d9960 100644
--- a/packages/block-editor/src/components/url-popover/index.js
+++ b/packages/block-editor/src/components/url-popover/index.js
@@ -3,10 +3,7 @@
*/
import { __ } from '@wordpress/i18n';
import { Component } from '@wordpress/element';
-import {
- IconButton,
- Popover,
-} from '@wordpress/components';
+import { IconButton, Popover } from '@wordpress/components';
/**
* Internal dependencies
@@ -41,9 +38,7 @@ class URLPopover extends Component {
...popoverProps
} = this.props;
- const {
- isSettingsExpanded,
- } = this.state;
+ const { isSettingsExpanded } = this.state;
const showSettings = !! renderSettings && isSettingsExpanded;
@@ -74,9 +69,7 @@ class URLPopover extends Component {
) }
{ additionalControls && ! showSettings && (
-
+
{ additionalControls }
) }
diff --git a/packages/block-editor/src/components/url-popover/link-editor.js b/packages/block-editor/src/components/url-popover/link-editor.js
index ebb96e00a302a0..d14fbd8ca67da0 100644
--- a/packages/block-editor/src/components/url-popover/link-editor.js
+++ b/packages/block-editor/src/components/url-popover/link-editor.js
@@ -7,9 +7,7 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
-import {
- IconButton,
-} from '@wordpress/components';
+import { IconButton } from '@wordpress/components';
/**
* Internal dependencies
@@ -25,10 +23,7 @@ export default function LinkEditor( {
} ) {
return (
';
const blockNode = wrapper.firstChild;
expect( hasInnerBlocksContext( blockNode ) ).toBe( false );
@@ -20,7 +19,7 @@ describe( 'hasInnerBlocksContext()', () => {
it( 'should return true for a block node which contains inner blocks', () => {
const wrapper = document.createElement( 'div' );
- wrapper.innerHTML = (
+ wrapper.innerHTML =
'
' +
'
' +
'
' +
@@ -28,8 +27,7 @@ describe( 'hasInnerBlocksContext()', () => {
'
' +
'
' +
'
' +
- '
'
- );
+ '
+
);
diff --git a/packages/block-library/src/audio/edit.js b/packages/block-library/src/audio/edit.js
index 15387acbd90c7a..03d08ab7cbe887 100644
--- a/packages/block-library/src/audio/edit.js
+++ b/packages/block-library/src/audio/edit.js
@@ -50,12 +50,7 @@ class AudioEdit extends Component {
}
componentDidMount() {
- const {
- attributes,
- mediaUpload,
- noticeOperations,
- setAttributes,
- } = this.props;
+ const { attributes, mediaUpload, noticeOperations, setAttributes } = this.props;
const { id, src = '' } = attributes;
if ( ! id && isBlobURL( src ) ) {
@@ -92,9 +87,7 @@ class AudioEdit extends Component {
// the editing UI.
if ( newSrc !== src ) {
// Check if there's an embed block that handles this URL.
- const embedBlock = createUpgradedEmbedBlock(
- { attributes: { url: newSrc } }
- );
+ const embedBlock = createUpgradedEmbedBlock( { attributes: { url: newSrc } } );
if ( undefined !== embedBlock ) {
this.props.onReplace( embedBlock );
return;
@@ -112,7 +105,9 @@ class AudioEdit extends Component {
}
getAutoplayHelp( checked ) {
- return checked ? __( 'Note: Autoplaying audio may cause usability issues for some visitors.' ) : null;
+ return checked
+ ? __( 'Note: Autoplaying audio may cause usability issues for some visitors.' )
+ : null;
}
render() {
@@ -180,7 +175,9 @@ class AudioEdit extends Component {
label={ __( 'Preload' ) }
value={ undefined !== preload ? preload : 'none' }
// `undefined` is required for the preload attribute to be unset.
- onChange={ ( value ) => setAttributes( { preload: ( 'none' !== value ) ? value : undefined } ) }
+ onChange={ ( value ) =>
+ setAttributes( { preload: 'none' !== value ? value : undefined } )
+ }
options={ [
{ value: 'auto', label: __( 'Auto' ) },
{ value: 'metadata', label: __( 'Metadata' ) },
diff --git a/packages/block-library/src/audio/icon.js b/packages/block-library/src/audio/icon.js
index 4b871506bf4788..d1ebfc6b7fd43b 100644
--- a/packages/block-library/src/audio/icon.js
+++ b/packages/block-library/src/audio/icon.js
@@ -3,4 +3,9 @@
*/
import { Path, SVG } from '@wordpress/components';
-export default
+
+);
diff --git a/packages/block-library/src/audio/save.js b/packages/block-library/src/audio/save.js
index 13b32be648abb5..4704875e58f00e 100644
--- a/packages/block-library/src/audio/save.js
+++ b/packages/block-library/src/audio/save.js
@@ -8,8 +8,16 @@ export default function save( { attributes } ) {
return (
-
);
}
diff --git a/packages/block-library/src/block/edit-panel/index.js b/packages/block-library/src/block/edit-panel/index.js
index 0bc064d25203c7..201e4b5a02cbee 100644
--- a/packages/block-library/src/block/edit-panel/index.js
+++ b/packages/block-library/src/block/edit-panel/index.js
@@ -31,7 +31,11 @@ class ReusableBlockEditPanel extends Component {
this.titleField.current.select();
}
// Move focus back to the Edit button after pressing the Escape key or Save.
- if ( ( prevProps.isEditing || prevProps.isSaving ) && ! this.props.isEditing && ! this.props.isSaving ) {
+ if (
+ ( prevProps.isEditing || prevProps.isSaving ) &&
+ ! this.props.isEditing &&
+ ! this.props.isSaving
+ ) {
this.editButton.current.focus();
}
}
@@ -57,11 +61,9 @@ class ReusableBlockEditPanel extends Component {
return (
<>
- { ( ! isEditing && ! isSaving ) && (
+ { ! isEditing && ! isSaving && (
-
- { title }
-
+
{ title }
+
+ );
}
if ( ! reusableBlock ) {
@@ -162,10 +166,7 @@ export default compose( [
__experimentalIsSavingReusableBlock: isSavingReusableBlock,
} = select( 'core/editor' );
const { canUser } = select( 'core' );
- const {
- __experimentalGetParsedReusableBlock,
- getSettings,
- } = select( 'core/block-editor' );
+ const { __experimentalGetParsedReusableBlock, getSettings } = select( 'core/block-editor' );
const { ref } = ownProps.attributes;
const reusableBlock = getReusableBlock( ref );
@@ -174,7 +175,8 @@ export default compose( [
isFetching: isFetchingReusableBlock( ref ),
isSaving: isSavingReusableBlock( ref ),
blocks: reusableBlock ? __experimentalGetParsedReusableBlock( reusableBlock.id ) : null,
- canUpdateBlock: !! reusableBlock && ! reusableBlock.isTemporary && !! canUser( 'update', 'blocks', ref ),
+ canUpdateBlock:
+ !! reusableBlock && ! reusableBlock.isTemporary && !! canUser( 'update', 'blocks', ref ),
settings: getSettings(),
};
} ),
diff --git a/packages/block-library/src/block/index.js b/packages/block-library/src/block/index.js
index f66fca566f09a7..585333c696a6f5 100644
--- a/packages/block-library/src/block/index.js
+++ b/packages/block-library/src/block/index.js
@@ -13,7 +13,9 @@ export const name = 'core/block';
export const settings = {
title: __( 'Reusable Block' ),
category: 'reusable',
- description: __( 'Create content, and save it for you and other contributors to reuse across your site. Update the block, and the changes apply everywhere it’s used.' ),
+ description: __(
+ 'Create content, and save it for you and other contributors to reuse across your site. Update the block, and the changes apply everywhere it’s used.'
+ ),
supports: {
customClassName: false,
html: false,
diff --git a/packages/block-library/src/button/deprecated.js b/packages/block-library/src/button/deprecated.js
index 5e1951c60ec64c..e7f29b9f50ebc8 100644
--- a/packages/block-library/src/button/deprecated.js
+++ b/packages/block-library/src/button/deprecated.js
@@ -7,17 +7,21 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- RichText,
- getColorClassName,
-} from '@wordpress/block-editor';
+import { RichText, getColorClassName } from '@wordpress/block-editor';
const colorsMigration = ( attributes ) => {
- return omit( {
- ...attributes,
- customTextColor: attributes.textColor && '#' === attributes.textColor[ 0 ] ? attributes.textColor : undefined,
- customBackgroundColor: attributes.color && '#' === attributes.color[ 0 ] ? attributes.color : undefined,
- }, [ 'color', 'textColor' ] );
+ return omit(
+ {
+ ...attributes,
+ customTextColor:
+ attributes.textColor && '#' === attributes.textColor[ 0 ]
+ ? attributes.textColor
+ : undefined,
+ customBackgroundColor:
+ attributes.color && '#' === attributes.color[ 0 ] ? attributes.color : undefined,
+ },
+ [ 'color', 'textColor' ]
+ );
};
const blockAttributes = {
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index 33ebe079c5e892..9cd947e94d0a67 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -7,13 +7,8 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
-import {
- useCallback,
-} from '@wordpress/element';
-import {
- compose,
- withInstanceId,
-} from '@wordpress/compose';
+import { useCallback } from '@wordpress/element';
+import { compose, withInstanceId } from '@wordpress/compose';
import {
BaseControl,
PanelBody,
@@ -39,10 +34,13 @@ const applyFallbackStyles = withFallbackStyles( ( node, ownProps ) => {
const backgroundColorValue = backgroundColor && backgroundColor.color;
const textColorValue = textColor && textColor.color;
//avoid the use of querySelector if textColor color is known and verify if node is available.
- const textNode = ! textColorValue && node ? node.querySelector( '[contenteditable="true"]' ) : null;
+ const textNode =
+ ! textColorValue && node ? node.querySelector( '[contenteditable="true"]' ) : null;
return {
- fallbackBackgroundColor: backgroundColorValue || ! node ? undefined : getComputedStyle( node ).backgroundColor,
- fallbackTextColor: textColorValue || ! textNode ? undefined : getComputedStyle( textNode ).color,
+ fallbackBackgroundColor:
+ backgroundColorValue || ! node ? undefined : getComputedStyle( node ).backgroundColor,
+ fallbackTextColor:
+ textColorValue || ! textNode ? undefined : getComputedStyle( textNode ).color,
};
} );
@@ -130,15 +128,13 @@ function ButtonEdit( {
value={ text }
onChange={ ( value ) => setAttributes( { text: value } ) }
withoutInteractiveFormatting
- className={ classnames(
- 'wp-block-button__link', {
- 'has-background': backgroundColor.color || customGradient,
- [ backgroundColor.class ]: ! customGradient && backgroundColor.class,
- 'has-text-color': textColor.color,
- [ textColor.class ]: textColor.class,
- 'no-border-radius': borderRadius === 0,
- }
- ) }
+ className={ classnames( 'wp-block-button__link', {
+ 'has-background': backgroundColor.color || customGradient,
+ [ backgroundColor.class ]: ! customGradient && backgroundColor.class,
+ 'has-text-color': textColor.color,
+ [ textColor.class ]: textColor.class,
+ 'no-border-radius': borderRadius === 0,
+ } ) }
style={ {
backgroundColor: ! customGradient && backgroundColor.color,
background: customGradient,
@@ -146,10 +142,7 @@ function ButtonEdit( {
borderRadius: borderRadius ? borderRadius + 'px' : undefined,
} }
/>
-
+
<__experimentalGradientPickerControl
- onChange={
- ( newGradient ) => {
- setAttributes( {
- customGradient: newGradient,
- backgroundColor: undefined,
- customBackgroundColor: undefined,
- } );
- }
- }
+ onChange={ ( newGradient ) => {
+ setAttributes( {
+ customGradient: newGradient,
+ backgroundColor: undefined,
+ customBackgroundColor: undefined,
+ } );
+ } }
value={ customGradient }
/>
-
+
+
+
);
diff --git a/packages/block-library/src/button/save.js b/packages/block-library/src/button/save.js
index bcf18ffc293242..716b16ba391f2d 100644
--- a/packages/block-library/src/button/save.js
+++ b/packages/block-library/src/button/save.js
@@ -6,10 +6,7 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- RichText,
- getColorClassName,
-} from '@wordpress/block-editor';
+import { RichText, getColorClassName } from '@wordpress/block-editor';
export default function save( { attributes } ) {
const {
@@ -27,7 +24,8 @@ export default function save( { attributes } ) {
} = attributes;
const textClass = getColorClassName( 'color', textColor );
- const backgroundClass = ! customGradient && getColorClassName( 'background-color', backgroundColor );
+ const backgroundClass =
+ ! customGradient && getColorClassName( 'background-color', backgroundColor );
const buttonClasses = classnames( 'wp-block-button__link', {
'has-text-color': textColor || customTextColor,
diff --git a/packages/block-library/src/calendar/edit.js b/packages/block-library/src/calendar/edit.js
index 243387c6dec399..40591744776ee1 100644
--- a/packages/block-library/src/calendar/edit.js
+++ b/packages/block-library/src/calendar/edit.js
@@ -7,9 +7,7 @@ import memoize from 'memize';
/**
* WordPress dependencies
*/
-import {
- Disabled,
-} from '@wordpress/components';
+import { Disabled } from '@wordpress/components';
import { Component } from '@wordpress/element';
import { withSelect } from '@wordpress/data';
import ServerSideRender from '@wordpress/server-side-render';
@@ -17,14 +15,10 @@ import ServerSideRender from '@wordpress/server-side-render';
class CalendarEdit extends Component {
constructor() {
super( ...arguments );
- this.getYearMonth = memoize(
- this.getYearMonth.bind( this ),
- { maxSize: 1 }
- );
- this.getServerSideAttributes = memoize(
- this.getServerSideAttributes.bind( this ),
- { maxSize: 1 }
- );
+ this.getYearMonth = memoize( this.getYearMonth.bind( this ), { maxSize: 1 } );
+ this.getServerSideAttributes = memoize( this.getServerSideAttributes.bind( this ), {
+ maxSize: 1,
+ } );
}
getYearMonth( date ) {
@@ -50,10 +44,7 @@ class CalendarEdit extends Component {
);
@@ -65,16 +56,12 @@ export default withSelect( ( select ) => {
if ( ! coreEditorSelect ) {
return;
}
- const {
- getEditedPostAttribute,
- } = coreEditorSelect;
+ const { getEditedPostAttribute } = coreEditorSelect;
const postType = getEditedPostAttribute( 'type' );
// Dates are used to overwrite year and month used on the calendar.
// This overwrite should only happen for 'post' post types.
// For other post types the calendar always displays the current month.
return {
- date: postType === 'post' ?
- getEditedPostAttribute( 'date' ) :
- undefined,
+ date: postType === 'post' ? getEditedPostAttribute( 'date' ) : undefined,
};
} )( CalendarEdit );
diff --git a/packages/block-library/src/calendar/icon.js b/packages/block-library/src/calendar/icon.js
index 023a1902171d04..c89c33a333ea53 100644
--- a/packages/block-library/src/calendar/icon.js
+++ b/packages/block-library/src/calendar/icon.js
@@ -4,5 +4,10 @@
import { G, Path, SVG } from '@wordpress/components';
export default (
-
+
+
+
);
diff --git a/packages/block-library/src/categories/edit.js b/packages/block-library/src/categories/edit.js
index 9020c33d484788..d578448cf8bbc1 100644
--- a/packages/block-library/src/categories/edit.js
+++ b/packages/block-library/src/categories/edit.js
@@ -86,21 +86,20 @@ class CategoriesEdit extends Component {
return (
- { this.renderCategoryName( category ) }
- { showPostCounts &&
-
- { ' ' }({ category.count })
-
- }
-
- {
- showHierarchy &&
- !! childCategories.length && (
-
- { childCategories.map( ( childCategory ) => this.renderCategoryListItem( childCategory, level + 1 ) ) }
-
- )
- }
+
+ { this.renderCategoryName( category ) }
+
+ { showPostCounts && (
+ ({ category.count })
+ ) }
+
+ { showHierarchy && !! childCategories.length && (
+
+ { childCategories.map( ( childCategory ) =>
+ this.renderCategoryListItem( childCategory, level + 1 )
+ ) }
+
+ ) }
);
}
@@ -131,16 +130,13 @@ class CategoriesEdit extends Component {
{ times( level * 3, () => '\xa0' ) }
{ this.renderCategoryName( category ) }
- {
- !! showPostCounts ?
- ` (${ category.count })` :
- ''
- }
+ { !! showPostCounts ? ` (${ category.count })` : '' }
,
showHierarchy &&
- !! childCategories.length && (
- childCategories.map( ( childCategory ) => this.renderCategoryDropdownItem( childCategory, level + 1 ) )
- ),
+ !! childCategories.length &&
+ childCategories.map( ( childCategory ) =>
+ this.renderCategoryDropdownItem( childCategory, level + 1 )
+ ),
];
}
@@ -174,10 +170,7 @@ class CategoriesEdit extends Component {
return (
<>
{ inspectorControls }
-
+
@@ -188,11 +181,7 @@ class CategoriesEdit extends Component {
<>
{ inspectorControls }
- {
- displayAsDropdown ?
- this.renderCategoryDropdown() :
- this.renderCategoryList()
- }
+ { displayAsDropdown ? this.renderCategoryDropdown() : this.renderCategoryList() }
);
diff --git a/packages/block-library/src/categories/icon.js b/packages/block-library/src/categories/icon.js
index fb89fbd4ce1a13..fd3b10a6c25486 100644
--- a/packages/block-library/src/categories/icon.js
+++ b/packages/block-library/src/categories/icon.js
@@ -4,5 +4,10 @@
import { SVG, Path } from '@wordpress/components';
export default (
-
+
);
diff --git a/packages/block-library/src/classic/edit.js b/packages/block-library/src/classic/edit.js
index 2ce77409e8e0f3..e273f9a39b6218 100644
--- a/packages/block-library/src/classic/edit.js
+++ b/packages/block-library/src/classic/edit.js
@@ -52,7 +52,10 @@ export default class ClassicEdit extends Component {
}
componentDidUpdate( prevProps ) {
- const { clientId, attributes: { content } } = this.props;
+ const {
+ clientId,
+ attributes: { content },
+ } = this.props;
const editor = window.tinymce.get( `editor-${ clientId }` );
@@ -76,7 +79,10 @@ export default class ClassicEdit extends Component {
}
onSetup( editor ) {
- const { attributes: { content }, setAttributes } = this.props;
+ const {
+ attributes: { content },
+ setAttributes,
+ } = this.props;
const { ref } = this;
let bookmark;
@@ -189,7 +195,7 @@ export default class ClassicEdit extends Component {
this.ref = ref }
+ ref={ ( ref ) => ( this.ref = ref ) }
className="block-library-classic__toolbar"
onClick={ this.focus }
data-placeholder={ __( 'Classic' ) }
diff --git a/packages/block-library/src/classic/icon.js b/packages/block-library/src/classic/icon.js
index 4193982d2aa449..a46f4943b0c600 100644
--- a/packages/block-library/src/classic/icon.js
+++ b/packages/block-library/src/classic/icon.js
@@ -4,5 +4,19 @@
import { Path, Rect, SVG } from '@wordpress/components';
export default (
-
+
+
);
diff --git a/packages/block-library/src/code/edit.native.js b/packages/block-library/src/code/edit.native.js
index d8641b2270d20a..09c2a8f8dd2d55 100644
--- a/packages/block-library/src/code/edit.native.js
+++ b/packages/block-library/src/code/edit.native.js
@@ -40,7 +40,7 @@ export function CodeEdit( props ) {
isSelected={ props.isSelected }
onFocus={ onFocus }
onBlur={ onBlur }
- fontFamily={ ( styles.blockCode.fontFamily ) }
+ fontFamily={ styles.blockCode.fontFamily }
placeholderTextColor={ placeholderStyle.color }
/>
diff --git a/packages/block-library/src/code/icon.js b/packages/block-library/src/code/icon.js
index 35e809693a36ba..9a43a87b75b602 100644
--- a/packages/block-library/src/code/icon.js
+++ b/packages/block-library/src/code/icon.js
@@ -4,5 +4,8 @@
import { Path, SVG } from '@wordpress/components';
export default (
-
+
+
);
diff --git a/packages/block-library/src/code/index.js b/packages/block-library/src/code/index.js
index e23a740b9d5e66..7c551b7462ac0c 100644
--- a/packages/block-library/src/code/index.js
+++ b/packages/block-library/src/code/index.js
@@ -22,11 +22,16 @@ export const settings = {
icon,
example: {
attributes: {
- content: __( '// A "block" is the abstract term used' ) + '\n' +
- __( '// to describe units of markup that,' ) + '\n' +
- __( '// when composed together, form the' ) + '\n' +
- __( '// content or layout of a page.' ) + '\n' +
- __( 'registerBlockType( name, settings );' ),
+ content:
+ __( '// A "block" is the abstract term used' ) +
+ '\n' +
+ __( '// to describe units of markup that,' ) +
+ '\n' +
+ __( '// when composed together, form the' ) +
+ '\n' +
+ __( '// content or layout of a page.' ) +
+ '\n' +
+ __( 'registerBlockType( name, settings );' ),
},
},
supports: {
diff --git a/packages/block-library/src/code/save.js b/packages/block-library/src/code/save.js
index 21d74669c854b9..1438c3174aa1c4 100644
--- a/packages/block-library/src/code/save.js
+++ b/packages/block-library/src/code/save.js
@@ -1,3 +1,7 @@
export default function save( { attributes } ) {
- return
{ attributes.content };
+ return (
+
+ { attributes.content }
+
+ );
}
diff --git a/packages/block-library/src/code/transforms.js b/packages/block-library/src/code/transforms.js
index 180a95bc9b4c54..585df87c0f7fa1 100644
--- a/packages/block-library/src/code/transforms.js
+++ b/packages/block-library/src/code/transforms.js
@@ -12,11 +12,10 @@ const transforms = {
},
{
type: 'raw',
- isMatch: ( node ) => (
+ isMatch: ( node ) =>
node.nodeName === 'PRE' &&
node.children.length === 1 &&
- node.firstChild.nodeName === 'CODE'
- ),
+ node.firstChild.nodeName === 'CODE',
schema: {
pre: {
children: {
diff --git a/packages/block-library/src/column/edit.js b/packages/block-library/src/column/edit.js
index 72f359f33da599..c87588877ef5e8 100644
--- a/packages/block-library/src/column/edit.js
+++ b/packages/block-library/src/column/edit.js
@@ -29,30 +29,17 @@ import {
getRedistributedColumnWidths,
} from '../columns/utils';
-function ColumnEdit( {
- attributes,
- className,
- updateAlignment,
- updateWidth,
- hasChildBlocks,
-} ) {
+function ColumnEdit( { attributes, className, updateAlignment, updateWidth, hasChildBlocks } ) {
const { verticalAlignment, width } = attributes;
- const classes = classnames(
- className,
- 'block-core-columns',
- {
- [ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
- }
- );
+ const classes = classnames( className, 'block-core-columns', {
+ [ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
+ } );
return (
-
@@ -69,11 +56,7 @@ function ColumnEdit( {
);
@@ -114,12 +97,11 @@ export default compose(
// The occupied width is calculated as the sum of the new width
// and the total width of blocks _not_ in the adjacent set.
- const occupiedWidth = width + getTotalColumnsWidth(
- difference( columns, [
- find( columns, { clientId } ),
- ...adjacentColumns,
- ] )
- );
+ const occupiedWidth =
+ width +
+ getTotalColumnsWidth(
+ difference( columns, [ find( columns, { clientId } ), ...adjacentColumns ] )
+ );
// Compute _all_ next column widths, in case the updated column
// is in the middle of a set of columns which don't yet have
diff --git a/packages/block-library/src/column/icon.js b/packages/block-library/src/column/icon.js
index 080d796121d01a..c7d61beb03a1f9 100644
--- a/packages/block-library/src/column/icon.js
+++ b/packages/block-library/src/column/icon.js
@@ -4,5 +4,8 @@
import { Path, SVG } from '@wordpress/components';
export default (
-
+
+
);
diff --git a/packages/block-library/src/column/index.js b/packages/block-library/src/column/index.js
index 250ce0bad65a42..61deb5ffff228f 100644
--- a/packages/block-library/src/column/index.js
+++ b/packages/block-library/src/column/index.js
@@ -38,4 +38,3 @@ export const settings = {
edit,
save,
};
-
diff --git a/packages/block-library/src/columns/deprecated.js b/packages/block-library/src/columns/deprecated.js
index a344f72eaf69f3..10d296df2b34c2 100644
--- a/packages/block-library/src/columns/deprecated.js
+++ b/packages/block-library/src/columns/deprecated.js
@@ -8,9 +8,7 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { createBlock } from '@wordpress/blocks';
-import {
- InnerBlocks,
-} from '@wordpress/block-editor';
+import { InnerBlocks } from '@wordpress/block-editor';
/**
* Given an HTML string for a deprecated columns inner block, returns the
@@ -51,9 +49,9 @@ export default [
// Columns block and a deprecation is the unlikely case due to
// its subsequent migration, optimize for the `false` condition
// by performing a naive, inaccurate pass at inner blocks.
- const isFastPassEligible = innerBlocks.some( ( innerBlock ) => (
+ const isFastPassEligible = innerBlocks.some( ( innerBlock ) =>
/layout-column-\d+/.test( innerBlock.originalContent )
- ) );
+ );
if ( ! isFastPassEligible ) {
return false;
@@ -61,9 +59,9 @@ export default [
// Only if the fast pass is considered eligible is the more
// accurate, durable, slower condition performed.
- return innerBlocks.some( ( innerBlock ) => (
- getDeprecatedLayoutColumn( innerBlock.originalContent ) !== undefined
- ) );
+ return innerBlocks.some(
+ ( innerBlock ) => getDeprecatedLayoutColumn( innerBlock.originalContent ) !== undefined
+ );
},
migrate( attributes, innerBlocks ) {
const columns = innerBlocks.reduce( ( accumulator, innerBlock ) => {
@@ -83,14 +81,11 @@ export default [
return accumulator;
}, [] );
- const migratedInnerBlocks = columns.map( ( columnBlocks ) => (
+ const migratedInnerBlocks = columns.map( ( columnBlocks ) =>
createBlock( 'core/column', {}, columnBlocks )
- ) );
+ );
- return [
- omit( attributes, [ 'columns' ] ),
- migratedInnerBlocks,
- ];
+ return [ omit( attributes, [ 'columns' ] ), migratedInnerBlocks ];
},
save( { attributes } ) {
const { columns } = attributes;
diff --git a/packages/block-library/src/columns/edit.js b/packages/block-library/src/columns/edit.js
index 48f35e90b2d9ce..342e1730924eff 100644
--- a/packages/block-library/src/columns/edit.js
+++ b/packages/block-library/src/columns/edit.js
@@ -8,12 +8,7 @@ import { dropRight, times } from 'lodash';
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
-import {
- PanelBody,
- RangeControl,
- SVG,
- Path,
-} from '@wordpress/components';
+import { PanelBody, RangeControl, SVG, Path } from '@wordpress/components';
import {
InspectorControls,
InnerBlocks,
@@ -55,40 +50,65 @@ const ALLOWED_BLOCKS = [ 'core/column' ];
const TEMPLATE_OPTIONS = [
{
title: __( 'Two columns; equal split' ),
- icon:
,
- template: [
- [ 'core/column' ],
- [ 'core/column' ],
- ],
+ icon: (
+
+
+ ),
+ template: [ [ 'core/column' ], [ 'core/column' ] ],
},
{
title: __( 'Two columns; one-third, two-thirds split' ),
- icon:
,
- template: [
- [ 'core/column', { width: 33.33 } ],
- [ 'core/column', { width: 66.66 } ],
- ],
+ icon: (
+
+
+ ),
+ template: [ [ 'core/column', { width: 33.33 } ], [ 'core/column', { width: 66.66 } ] ],
},
{
title: __( 'Two columns; two-thirds, one-third split' ),
- icon:
,
- template: [
- [ 'core/column', { width: 66.66 } ],
- [ 'core/column', { width: 33.33 } ],
- ],
+ icon: (
+
+
+ ),
+ template: [ [ 'core/column', { width: 66.66 } ], [ 'core/column', { width: 33.33 } ] ],
},
{
title: __( 'Three columns; equal split' ),
- icon:
,
- template: [
- [ 'core/column' ],
- [ 'core/column' ],
- [ 'core/column' ],
- ],
+ icon: (
+
+
+ ),
+ template: [ [ 'core/column' ], [ 'core/column' ], [ 'core/column' ] ],
},
{
title: __( 'Three columns; wide center column' ),
- icon:
,
+ icon: (
+
+
+ ),
template: [
[ 'core/column', { width: 25 } ],
[ 'core/column', { width: 50 } ],
@@ -105,13 +125,7 @@ const TEMPLATE_OPTIONS = [
*/
const DEFAULT_COLUMNS = 2;
-export function ColumnsEdit( {
- attributes,
- className,
- updateAlignment,
- updateColumns,
- clientId,
-} ) {
+export function ColumnsEdit( { attributes, className, updateAlignment, updateColumns, clientId } ) {
const { verticalAlignment } = attributes;
const { count } = useSelect( ( select ) => {
@@ -177,7 +191,8 @@ export function ColumnsEdit( {
__experimentalAllowTemplateOptionSkip
template={ showTemplateSelector ? null : template }
templateLock="all"
- allowedBlocks={ ALLOWED_BLOCKS } />
+ allowedBlocks={ ALLOWED_BLOCKS }
+ />
+
+
+
);
diff --git a/packages/block-library/src/columns/index.js b/packages/block-library/src/columns/index.js
index 990d94d45521cb..ea80c75f2b39ab 100644
--- a/packages/block-library/src/columns/index.js
+++ b/packages/block-library/src/columns/index.js
@@ -19,7 +19,9 @@ export { metadata, name };
export const settings = {
title: __( 'Columns' ),
icon,
- description: __( 'Add a block that displays content in multiple columns, then add whatever content blocks you’d like.' ),
+ description: __(
+ 'Add a block that displays content in multiple columns, then add whatever content blocks you’d like.'
+ ),
supports: {
align: [ 'wide', 'full' ],
html: false,
@@ -32,7 +34,8 @@ export const settings = {
{
name: 'core/paragraph',
attributes: {
- content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent et eros eu felis.',
+ content:
+ 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent et eros eu felis.',
},
},
{
@@ -55,13 +58,17 @@ export const settings = {
{
name: 'core/paragraph',
attributes: {
- content: __( 'Etiam et egestas lorem. Vivamus sagittis sit amet dolor quis lobortis. Integer sed fermentum arcu, id vulputate lacus. Etiam fermentum sem eu quam hendrerit.' ),
+ content: __(
+ 'Etiam et egestas lorem. Vivamus sagittis sit amet dolor quis lobortis. Integer sed fermentum arcu, id vulputate lacus. Etiam fermentum sem eu quam hendrerit.'
+ ),
},
},
{
name: 'core/paragraph',
attributes: {
- content: __( 'Nam risus massa, ullamcorper consectetur eros fermentum, porta aliquet ligula. Sed vel mauris nec enim.' ),
+ content: __(
+ 'Nam risus massa, ullamcorper consectetur eros fermentum, porta aliquet ligula. Sed vel mauris nec enim.'
+ ),
},
},
],
diff --git a/packages/block-library/src/columns/test/utils.js b/packages/block-library/src/columns/test/utils.js
index b89a63e2e01533..b33d9db5fc6ea8 100644
--- a/packages/block-library/src/columns/test/utils.js
+++ b/packages/block-library/src/columns/test/utils.js
@@ -97,10 +97,7 @@ describe( 'getTotalColumnsWidth', () => {
} );
describe( 'implicit width', () => {
- const blocks = [
- { clientId: 'a', attributes: {} },
- { clientId: 'b', attributes: {} },
- ];
+ const blocks = [ { clientId: 'a', attributes: {} }, { clientId: 'b', attributes: {} } ];
it( 'returns the sum total of columns width', () => {
const widths = getTotalColumnsWidth( blocks );
@@ -128,10 +125,7 @@ describe( 'getColumnWidths', () => {
} );
describe( 'implicit width', () => {
- const blocks = [
- { clientId: 'a', attributes: {} },
- { clientId: 'b', attributes: {} },
- ];
+ const blocks = [ { clientId: 'a', attributes: {} }, { clientId: 'b', attributes: {} } ];
it( 'returns the column widths', () => {
const widths = getColumnWidths( blocks );
@@ -171,10 +165,7 @@ describe( 'getRedistributedColumnWidths', () => {
} );
describe( 'implicit width', () => {
- const blocks = [
- { clientId: 'a', attributes: {} },
- { clientId: 'b', attributes: {} },
- ];
+ const blocks = [ { clientId: 'a', attributes: {} }, { clientId: 'b', attributes: {} } ];
it( 'should equally distribute to available width', () => {
const widths = getRedistributedColumnWidths( blocks, 60 );
diff --git a/packages/block-library/src/columns/utils.js b/packages/block-library/src/columns/utils.js
index a6773d469c98f7..3db69d1b82cd8a 100644
--- a/packages/block-library/src/columns/utils.js
+++ b/packages/block-library/src/columns/utils.js
@@ -28,9 +28,7 @@ export const getColumnsTemplate = memoize( ( columns ) => {
* @return {number} Value rounded to standard precision.
*/
export const toWidthPrecision = ( value ) =>
- Number.isFinite( value ) ?
- parseFloat( value.toFixed( 2 ) ) :
- undefined;
+ Number.isFinite( value ) ? parseFloat( value.toFixed( 2 ) ) : undefined;
/**
* Returns the considered adjacent to that of the specified `clientId` for
@@ -105,14 +103,17 @@ export function getColumnWidths( blocks, totalBlockCount = blocks.length ) {
*
* @return {Object} Redistributed column widths.
*/
-export function getRedistributedColumnWidths( blocks, availableWidth, totalBlockCount = blocks.length ) {
+export function getRedistributedColumnWidths(
+ blocks,
+ availableWidth,
+ totalBlockCount = blocks.length
+) {
const totalWidth = getTotalColumnsWidth( blocks, totalBlockCount );
const difference = availableWidth - totalWidth;
const adjustment = difference / blocks.length;
- return mapValues(
- getColumnWidths( blocks, totalBlockCount ),
- ( width ) => toWidthPrecision( width + adjustment ),
+ return mapValues( getColumnWidths( blocks, totalBlockCount ), ( width ) =>
+ toWidthPrecision( width + adjustment )
);
}
@@ -138,9 +139,11 @@ export function hasExplicitColumnWidths( blocks ) {
* @return {WPBlock[]} blocks Mapped block objects.
*/
export function getMappedColumnWidths( blocks, widths ) {
- return blocks.map( ( block ) => merge( {}, block, {
- attributes: {
- width: widths[ block.clientId ],
- },
- } ) );
+ return blocks.map( ( block ) =>
+ merge( {}, block, {
+ attributes: {
+ width: widths[ block.clientId ],
+ },
+ } )
+ );
}
diff --git a/packages/block-library/src/cover/deprecated.js b/packages/block-library/src/cover/deprecated.js
index ef1a854918af14..baa82e425ef6bf 100644
--- a/packages/block-library/src/cover/deprecated.js
+++ b/packages/block-library/src/cover/deprecated.js
@@ -8,10 +8,7 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { createBlock } from '@wordpress/blocks';
-import {
- RichText,
- getColorClassName,
-} from '@wordpress/block-editor';
+import { RichText, getColorClassName } from '@wordpress/block-editor';
import { __ } from '@wordpress/i18n';
/**
@@ -84,9 +81,7 @@ const deprecated = [
url,
} = attributes;
const overlayColorClass = getColorClassName( 'background-color', overlayColor );
- const style = backgroundType === IMAGE_BACKGROUND_TYPE ?
- backgroundImageStyles( url ) :
- {};
+ const style = backgroundType === IMAGE_BACKGROUND_TYPE ? backgroundImageStyles( url ) : {};
if ( ! overlayColorClass ) {
style.backgroundColor = customOverlayColor;
}
@@ -94,25 +89,17 @@ const deprecated = [
style.backgroundPosition = `${ focalPoint.x * 100 }% ${ focalPoint.y * 100 }%`;
}
- const classes = classnames(
- dimRatioToClass( dimRatio ),
- overlayColorClass,
- {
- 'has-background-dim': dimRatio !== 0,
- 'has-parallax': hasParallax,
- [ `has-${ contentAlign }-content` ]: contentAlign !== 'center',
- },
- );
+ const classes = classnames( dimRatioToClass( dimRatio ), overlayColorClass, {
+ 'has-background-dim': dimRatio !== 0,
+ 'has-parallax': hasParallax,
+ [ `has-${ contentAlign }-content` ]: contentAlign !== 'center',
+ } );
return (
- { VIDEO_BACKGROUND_TYPE === backgroundType && url && (
) }
+ { VIDEO_BACKGROUND_TYPE === backgroundType && url && (
+
+ ) }
{ ! RichText.isEmpty( title ) && (
) }
@@ -123,19 +110,17 @@ const deprecated = [
return [
omit( attributes, [ 'title', 'contentAlign' ] ),
[
- createBlock(
- 'core/paragraph',
- {
- content: attributes.title,
- align: attributes.contentAlign,
- fontSize: 'large',
- placeholder: __( 'Write title…' ),
- }
- ),
+ createBlock( 'core/paragraph', {
+ content: attributes.title,
+ align: attributes.contentAlign,
+ fontSize: 'large',
+ placeholder: __( 'Write title…' ),
+ } ),
],
];
},
- }, {
+ },
+ {
attributes: {
...blockAttributes,
title: {
@@ -155,7 +140,16 @@ const deprecated = [
className: false,
},
save( { attributes } ) {
- const { url, title, hasParallax, dimRatio, align, contentAlign, overlayColor, customOverlayColor } = attributes;
+ const {
+ url,
+ title,
+ hasParallax,
+ dimRatio,
+ align,
+ contentAlign,
+ overlayColor,
+ customOverlayColor,
+ } = attributes;
const overlayColorClass = getColorClassName( 'background-color', overlayColor );
const style = backgroundImageStyles( url );
if ( ! overlayColorClass ) {
@@ -171,7 +165,7 @@ const deprecated = [
'has-parallax': hasParallax,
[ `has-${ contentAlign }-content` ]: contentAlign !== 'center',
},
- align ? `align${ align }` : null,
+ align ? `align${ align }` : null
);
return (
@@ -186,19 +180,17 @@ const deprecated = [
return [
omit( attributes, [ 'title', 'contentAlign', 'align' ] ),
[
- createBlock(
- 'core/paragraph',
- {
- content: attributes.title,
- align: attributes.contentAlign,
- fontSize: 'large',
- placeholder: __( 'Write title…' ),
- }
- ),
+ createBlock( 'core/paragraph', {
+ content: attributes.title,
+ align: attributes.contentAlign,
+ fontSize: 'large',
+ placeholder: __( 'Write title…' ),
+ } ),
],
];
},
- }, {
+ },
+ {
attributes: {
...blockAttributes,
title: {
@@ -227,7 +219,7 @@ const deprecated = [
'has-background-dim': dimRatio !== 0,
'has-parallax': hasParallax,
},
- align ? `align${ align }` : null,
+ align ? `align${ align }` : null
);
return (
@@ -240,15 +232,12 @@ const deprecated = [
return [
omit( attributes, [ 'title', 'contentAlign', 'align' ] ),
[
- createBlock(
- 'core/paragraph',
- {
- content: attributes.title,
- align: attributes.contentAlign,
- fontSize: 'large',
- placeholder: __( 'Write title…' ),
- }
- ),
+ createBlock( 'core/paragraph', {
+ content: attributes.title,
+ align: attributes.contentAlign,
+ fontSize: 'large',
+ placeholder: __( 'Write title…' ),
+ } ),
],
];
},
diff --git a/packages/block-library/src/cover/edit.js b/packages/block-library/src/cover/edit.js
index 04d3f61220bbf0..a1ca3f837a27e8 100644
--- a/packages/block-library/src/cover/edit.js
+++ b/packages/block-library/src/cover/edit.js
@@ -8,12 +8,7 @@ import tinycolor from 'tinycolor2';
/**
* WordPress dependencies
*/
-import {
- Component,
- createRef,
- useCallback,
- useState,
-} from '@wordpress/element';
+import { Component, createRef, useCallback, useState } from '@wordpress/element';
import {
FocalPointPicker,
IconButton,
@@ -60,11 +55,14 @@ import {
*/
const ALLOWED_MEDIA_TYPES = [ 'image', 'video' ];
const INNER_BLOCKS_TEMPLATE = [
- [ 'core/paragraph', {
- align: 'center',
- fontSize: 'large',
- placeholder: __( 'Write title…' ),
- } ],
+ [
+ 'core/paragraph',
+ {
+ align: 'center',
+ fontSize: 'large',
+ placeholder: __( 'Write title…' ),
+ },
+ ],
];
function retrieveFastAverageColor() {
@@ -74,48 +72,41 @@ function retrieveFastAverageColor() {
return retrieveFastAverageColor.fastAverageColor;
}
-const CoverHeightInput = withInstanceId(
- function( { value = '', instanceId, onChange } ) {
- const [ temporaryInput, setTemporaryInput ] = useState( null );
- const onChangeEvent = useCallback(
- ( event ) => {
- const unprocessedValue = event.target.value;
- const inputValue = unprocessedValue !== '' ?
- parseInt( event.target.value, 10 ) :
- undefined;
- if ( ( isNaN( inputValue ) || inputValue < COVER_MIN_HEIGHT ) && inputValue !== undefined ) {
- setTemporaryInput( event.target.value );
- return;
- }
- setTemporaryInput( null );
- onChange( inputValue );
- },
- [ onChange, setTemporaryInput ]
- );
- const onBlurEvent = useCallback(
- () => {
- if ( temporaryInput !== null ) {
- setTemporaryInput( null );
- }
- },
- [ temporaryInput, setTemporaryInput ]
- );
- const inputId = `block-cover-height-input-${ instanceId }`;
- return (
-
-
- );
- }
-);
+const CoverHeightInput = withInstanceId( function( { value = '', instanceId, onChange } ) {
+ const [ temporaryInput, setTemporaryInput ] = useState( null );
+ const onChangeEvent = useCallback(
+ ( event ) => {
+ const unprocessedValue = event.target.value;
+ const inputValue = unprocessedValue !== '' ? parseInt( event.target.value, 10 ) : undefined;
+ if ( ( isNaN( inputValue ) || inputValue < COVER_MIN_HEIGHT ) && inputValue !== undefined ) {
+ setTemporaryInput( event.target.value );
+ return;
+ }
+ setTemporaryInput( null );
+ onChange( inputValue );
+ },
+ [ onChange, setTemporaryInput ]
+ );
+ const onBlurEvent = useCallback( () => {
+ if ( temporaryInput !== null ) {
+ setTemporaryInput( null );
+ }
+ }, [ temporaryInput, setTemporaryInput ] );
+ const inputId = `block-cover-height-input-${ instanceId }`;
+ return (
+
+
+ );
+} );
const RESIZABLE_BOX_ENABLE_OPTION = {
top: false,
@@ -128,13 +119,7 @@ const RESIZABLE_BOX_ENABLE_OPTION = {
topLeft: false,
};
-function ResizableCover( {
- className,
- children,
- onResizeStart,
- onResize,
- onResizeStop,
-} ) {
+function ResizableCover( { className, children, onResizeStart, onResize, onResizeStop } ) {
const [ isResizing, setIsResizing ] = useState( false );
const onResizeEvent = useCallback(
( event, direction, elt ) => {
@@ -143,7 +128,7 @@ function ResizableCover( {
setIsResizing( true );
}
},
- [ onResize, setIsResizing ],
+ [ onResize, setIsResizing ]
);
const onResizeStartEvent = useCallback(
( event, direction, elt ) => {
@@ -162,12 +147,9 @@ function ResizableCover( {
return (
{
if ( ! media || ! media.url ) {
setAttributes( { url: undefined, id: undefined } );
@@ -241,11 +215,9 @@ class CoverEdit extends Component {
// Videos contain the media type of 'file' in the object returned from the rest api.
mediaType = VIDEO_BACKGROUND_TYPE;
}
- } else { // for media selections originated from existing files in the media library.
- if (
- media.type !== IMAGE_BACKGROUND_TYPE &&
- media.type !== VIDEO_BACKGROUND_TYPE
- ) {
+ } else {
+ // for media selections originated from existing files in the media library.
+ if ( media.type !== IMAGE_BACKGROUND_TYPE && media.type !== VIDEO_BACKGROUND_TYPE ) {
return;
}
mediaType = media.type;
@@ -255,10 +227,9 @@ class CoverEdit extends Component {
url: media.url,
id: media.id,
backgroundType: mediaType,
- ...( mediaType === VIDEO_BACKGROUND_TYPE ?
- { focalPoint: undefined, hasParallax: undefined } :
- {}
- ),
+ ...( mediaType === VIDEO_BACKGROUND_TYPE
+ ? { focalPoint: undefined, hasParallax: undefined }
+ : {} ),
} );
};
@@ -273,13 +244,9 @@ class CoverEdit extends Component {
const { temporaryMinHeight } = this.state;
const style = {
- ...(
- backgroundType === IMAGE_BACKGROUND_TYPE ?
- backgroundImageStyles( url ) :
- {}
- ),
+ ...( backgroundType === IMAGE_BACKGROUND_TYPE ? backgroundImageStyles( url ) : {} ),
backgroundColor: overlayColor.color,
- minHeight: ( temporaryMinHeight || minHeight ),
+ minHeight: temporaryMinHeight || minHeight,
};
if ( focalPoint ) {
@@ -334,14 +301,16 @@ class CoverEdit extends Component {
isDefault
isSmall
className="block-library-cover__reset-button"
- onClick={ () => setAttributes( {
- url: undefined,
- id: undefined,
- backgroundType: undefined,
- dimRatio: undefined,
- focalPoint: undefined,
- hasParallax: undefined,
- } ) }
+ onClick={ () =>
+ setAttributes( {
+ url: undefined,
+ id: undefined,
+ backgroundType: undefined,
+ dimRatio: undefined,
+ focalPoint: undefined,
+ hasParallax: undefined,
+ } )
+ }
>
{ __( 'Clear Media' ) }
@@ -353,23 +322,23 @@ class CoverEdit extends Component {
{
- setAttributes( {
- minHeight: value,
- } );
- }
- }
+ onChange={ ( value ) => {
+ setAttributes( {
+ minHeight: value,
+ } );
+ } }
/>
{ !! url && (
{ controls }
toggleSelection( false ) }
onResize={ ( newMinHeight ) => {
this.setState( {
temporaryMinHeight: newMinHeight,
} );
} }
- onResizeStop={
- ( newMinHeight ) => {
- toggleSelection( true );
- setAttributes( {
- minHeight: newMinHeight,
- } );
- this.setState( {
- temporaryMinHeight: null,
- } );
- }
- }
+ onResizeStop={ ( newMinHeight ) => {
+ toggleSelection( true );
+ setAttributes( {
+ minHeight: newMinHeight,
+ } );
+ this.setState( {
+ temporaryMinHeight: null,
+ } );
+ } }
>
-
-
+
{ IMAGE_BACKGROUND_TYPE === backgroundType && (
- // Used only to programmatically check if the image is dark or not
+ // Used only to programmatically check if the image is dark or not
) }
-
@@ -516,19 +473,13 @@ class CoverEdit extends Component {
this.changeIsDarkIfRequired( true );
return;
}
- this.changeIsDarkIfRequired(
- tinycolor( overlayColor.color ).isDark()
- );
+ this.changeIsDarkIfRequired( tinycolor( overlayColor.color ).isDark() );
return;
}
// If opacity is lower than 50 the dominant color is the image or video color,
// so use that color for the dark mode computation.
- if (
- prevProps &&
- prevProps.attributes.dimRatio <= 50 &&
- prevProps.attributes.url === url
- ) {
+ if ( prevProps && prevProps.attributes.dimRatio <= 50 && prevProps.attributes.url === url ) {
// No relevant prop changes happened there is no need to apply any change.
return;
}
diff --git a/packages/block-library/src/cover/icon.js b/packages/block-library/src/cover/icon.js
index abd932271d6eb4..e56df56b15ae44 100644
--- a/packages/block-library/src/cover/icon.js
+++ b/packages/block-library/src/cover/icon.js
@@ -3,4 +3,9 @@
*/
import { Path, SVG } from '@wordpress/components';
-export default
;
+export default (
+
+
+);
diff --git a/packages/block-library/src/cover/save.js b/packages/block-library/src/cover/save.js
index de057122a0f7b7..d4020777007979 100644
--- a/packages/block-library/src/cover/save.js
+++ b/packages/block-library/src/cover/save.js
@@ -6,10 +6,7 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- InnerBlocks,
- getColorClassName,
-} from '@wordpress/block-editor';
+import { InnerBlocks, getColorClassName } from '@wordpress/block-editor';
/**
* Internal dependencies
@@ -33,9 +30,7 @@ export default function save( { attributes } ) {
minHeight,
} = attributes;
const overlayColorClass = getColorClassName( 'background-color', overlayColor );
- const style = backgroundType === IMAGE_BACKGROUND_TYPE ?
- backgroundImageStyles( url ) :
- {};
+ const style = backgroundType === IMAGE_BACKGROUND_TYPE ? backgroundImageStyles( url ) : {};
if ( ! overlayColorClass ) {
style.backgroundColor = customOverlayColor;
}
@@ -44,24 +39,16 @@ export default function save( { attributes } ) {
}
style.minHeight = minHeight || undefined;
- const classes = classnames(
- dimRatioToClass( dimRatio ),
- overlayColorClass,
- {
- 'has-background-dim': dimRatio !== 0,
- 'has-parallax': hasParallax,
- },
- );
+ const classes = classnames( dimRatioToClass( dimRatio ), overlayColorClass, {
+ 'has-background-dim': dimRatio !== 0,
+ 'has-parallax': hasParallax,
+ } );
return (
- { VIDEO_BACKGROUND_TYPE === backgroundType && url && (
) }
+ { VIDEO_BACKGROUND_TYPE === backgroundType && url && (
+
+ ) }
diff --git a/packages/block-library/src/cover/shared.js b/packages/block-library/src/cover/shared.js
index af13f2b8f9b18c..bb3b2f5fc094df 100644
--- a/packages/block-library/src/cover/shared.js
+++ b/packages/block-library/src/cover/shared.js
@@ -2,13 +2,9 @@ export const IMAGE_BACKGROUND_TYPE = 'image';
export const VIDEO_BACKGROUND_TYPE = 'video';
export const COVER_MIN_HEIGHT = 50;
export function backgroundImageStyles( url ) {
- return url ?
- { backgroundImage: `url(${ url })` } :
- {};
+ return url ? { backgroundImage: `url(${ url })` } : {};
}
export function dimRatioToClass( ratio ) {
- return ( ratio === 0 || ratio === 50 ) ?
- null :
- 'has-background-dim-' + ( 10 * Math.round( ratio / 10 ) );
+ return ratio === 0 || ratio === 50 ? null : 'has-background-dim-' + 10 * Math.round( ratio / 10 );
}
diff --git a/packages/block-library/src/cover/transforms.js b/packages/block-library/src/cover/transforms.js
index 8b775f73d0040c..301a995a5b99fe 100644
--- a/packages/block-library/src/cover/transforms.js
+++ b/packages/block-library/src/cover/transforms.js
@@ -13,27 +13,25 @@ const transforms = {
{
type: 'block',
blocks: [ 'core/image' ],
- transform: ( { caption, url, align, id } ) => (
+ transform: ( { caption, url, align, id } ) =>
createBlock( 'core/cover', {
title: caption,
url,
align,
id,
- } )
- ),
+ } ),
},
{
type: 'block',
blocks: [ 'core/video' ],
- transform: ( { caption, src, align, id } ) => (
+ transform: ( { caption, src, align, id } ) =>
createBlock( 'core/cover', {
title: caption,
url: src,
align,
id,
backgroundType: VIDEO_BACKGROUND_TYPE,
- } )
- ),
+ } ),
},
],
to: [
@@ -43,14 +41,13 @@ const transforms = {
isMatch: ( { backgroundType, url } ) => {
return ! url || backgroundType === IMAGE_BACKGROUND_TYPE;
},
- transform: ( { title, url, align, id } ) => (
+ transform: ( { title, url, align, id } ) =>
createBlock( 'core/image', {
caption: title,
url,
align,
id,
- } )
- ),
+ } ),
},
{
type: 'block',
@@ -58,14 +55,13 @@ const transforms = {
isMatch: ( { backgroundType, url } ) => {
return ! url || backgroundType === VIDEO_BACKGROUND_TYPE;
},
- transform: ( { title, url, align, id } ) => (
+ transform: ( { title, url, align, id } ) =>
createBlock( 'core/video', {
caption: title,
src: url,
id,
align,
- } )
- ),
+ } ),
},
],
};
diff --git a/packages/block-library/src/embed/core-embeds.js b/packages/block-library/src/embed/core-embeds.js
index 83063ff8a1e9a8..7992d3248d88e0 100644
--- a/packages/block-library/src/embed/core-embeds.js
+++ b/packages/block-library/src/embed/core-embeds.js
@@ -151,15 +151,17 @@ export const others = [
title: 'Crowdsignal',
icon: embedContentIcon,
keywords: [ 'polldaddy' ],
- transform: [ {
- type: 'block',
- blocks: [ 'core-embed/polldaddy' ],
- transform: ( content ) => {
- return createBlock( 'core-embed/crowdsignal', {
- content,
- } );
+ transform: [
+ {
+ type: 'block',
+ blocks: [ 'core-embed/polldaddy' ],
+ transform: ( content ) => {
+ return createBlock( 'core-embed/crowdsignal', {
+ content,
+ } );
+ },
},
- } ],
+ ],
description: __( 'Embed Crowdsignal (formerly Polldaddy) content.' ),
},
patterns: [ /^https?:\/\/((.+\.)?polldaddy\.com|poll\.fm|.+\.survey\.fm)\/.+/i ],
@@ -312,15 +314,17 @@ export const others = [
settings: {
title: 'Speaker Deck',
icon: embedContentIcon,
- transform: [ {
- type: 'block',
- blocks: [ 'core-embed/speaker' ],
- transform: ( content ) => {
- return createBlock( 'core-embed/speaker-deck', {
- content,
- } );
+ transform: [
+ {
+ type: 'block',
+ blocks: [ 'core-embed/speaker' ],
+ transform: ( content ) => {
+ return createBlock( 'core-embed/speaker-deck', {
+ content,
+ } );
+ },
},
- } ],
+ ],
description: __( 'Embed Speaker Deck content.' ),
},
patterns: [ /^https?:\/\/(www\.)?speakerdeck\.com\/.+/i ],
diff --git a/packages/block-library/src/embed/edit.js b/packages/block-library/src/embed/edit.js
index b92d07d2927d30..5162f298d37787 100644
--- a/packages/block-library/src/embed/edit.js
+++ b/packages/block-library/src/embed/edit.js
@@ -1,7 +1,12 @@
/**
* Internal dependencies
*/
-import { createUpgradedEmbedBlock, getClassNames, fallback, getAttributesFromPreview } from './util';
+import {
+ createUpgradedEmbedBlock,
+ getClassNames,
+ fallback,
+ getAttributesFromPreview,
+} from './util';
import EmbedControls from './embed-controls';
import EmbedLoading from './embed-loading';
import EmbedPlaceholder from './embed-placeholder';
@@ -43,10 +48,7 @@ export function getEmbedEditComponent( title, icon, responsive = true ) {
handleIncomingPreview() {
this.setMergedAttributes();
if ( this.props.onReplace ) {
- const upgradedBlock = createUpgradedEmbedBlock(
- this.props,
- this.getMergedAttributes()
- );
+ const upgradedBlock = createUpgradedEmbedBlock( this.props, this.getMergedAttributes() );
if ( upgradedBlock ) {
this.props.onReplace( upgradedBlock );
}
@@ -56,7 +58,10 @@ export function getEmbedEditComponent( title, icon, responsive = true ) {
componentDidUpdate( prevProps ) {
const hasPreview = undefined !== this.props.preview;
const hadPreview = undefined !== prevProps.preview;
- const previewChanged = prevProps.preview && this.props.preview && this.props.preview.html !== prevProps.preview.html;
+ const previewChanged =
+ prevProps.preview &&
+ this.props.preview &&
+ this.props.preview.html !== prevProps.preview.html;
const switchedPreview = previewChanged || ( hasPreview && ! hadPreview );
const switchedURL = this.props.attributes.url !== prevProps.attributes.url;
@@ -75,9 +80,12 @@ export function getEmbedEditComponent( title, icon, responsive = true ) {
}
resubmitWithoutTrailingSlash() {
- this.setState( ( prevState ) => ( {
- url: prevState.url.replace( /\/$/, '' ),
- } ), this.setUrl );
+ this.setState(
+ ( prevState ) => ( {
+ url: prevState.url.replace( /\/$/, '' ),
+ } ),
+ this.setUrl
+ );
}
setUrl( event ) {
@@ -96,7 +104,10 @@ export function getEmbedEditComponent( title, icon, responsive = true ) {
getMergedAttributes() {
const { preview } = this.props;
const { className, allowResponsive } = this.props.attributes;
- return { ...this.props.attributes, ...getAttributesFromPreview( preview, title, className, responsive, allowResponsive ) };
+ return {
+ ...this.props.attributes,
+ ...getAttributesFromPreview( preview, title, className, responsive, allowResponsive ),
+ };
}
/***
@@ -112,7 +123,9 @@ export function getEmbedEditComponent( title, icon, responsive = true ) {
}
getResponsiveHelp( checked ) {
- return checked ? __( 'This embed will preserve its aspect ratio when the browser is resized.' ) : __( 'This embed may not preserve its aspect ratio when the browser is resized.' );
+ return checked
+ ? __( 'This embed will preserve its aspect ratio when the browser is resized.' )
+ : __( 'This embed may not preserve its aspect ratio when the browser is resized.' );
}
toggleResponsive() {
@@ -120,22 +133,26 @@ export function getEmbedEditComponent( title, icon, responsive = true ) {
const { html } = this.props.preview;
const newAllowResponsive = ! allowResponsive;
- this.props.setAttributes(
- {
- allowResponsive: newAllowResponsive,
- className: getClassNames( html, className, responsive && newAllowResponsive ),
- }
- );
+ this.props.setAttributes( {
+ allowResponsive: newAllowResponsive,
+ className: getClassNames( html, className, responsive && newAllowResponsive ),
+ } );
}
render() {
const { url, editingURL } = this.state;
- const { fetching, setAttributes, isSelected, preview, cannotEmbed, themeSupportsResponsive, tryAgain } = this.props;
+ const {
+ fetching,
+ setAttributes,
+ isSelected,
+ preview,
+ cannotEmbed,
+ themeSupportsResponsive,
+ tryAgain,
+ } = this.props;
if ( fetching ) {
- return (
-
- );
+ return
;
}
// translators: %s: type of embed e.g: "YouTube", "Twitter", etc. "Embed" is used when no specific type exists
diff --git a/packages/block-library/src/embed/embed-placeholder.js b/packages/block-library/src/embed/embed-placeholder.js
index 7a2a6f000a01f6..09890f7a184b9a 100644
--- a/packages/block-library/src/embed/embed-placeholder.js
+++ b/packages/block-library/src/embed/embed-placeholder.js
@@ -21,18 +21,23 @@ const EmbedPlaceholder = ( props ) => {
className="components-placeholder__input"
aria-label={ label }
placeholder={ __( 'Enter URL to embed here…' ) }
- onChange={ onChange } />
-
+ onChange={ onChange }
+ />
+
{ _x( 'Embed', 'button label' ) }
- { cannotEmbed &&
+ { cannotEmbed && (
- { __( 'Sorry, this content could not be embedded.' ) }{ _x( 'Try again', 'button label' ) } { _x( 'Convert to link', 'button label' ) }
+ { __( 'Sorry, this content could not be embedded.' ) }
+
+ { _x( 'Try again', 'button label' ) }
+ {' '}
+
+ { _x( 'Convert to link', 'button label' ) }
+
- }
+ ) }
diff --git a/packages/block-library/src/embed/embed-preview.js b/packages/block-library/src/embed/embed-preview.js
index 878c3e7504ccae..4c1147a76925b3 100644
--- a/packages/block-library/src/embed/embed-preview.js
+++ b/packages/block-library/src/embed/embed-preview.js
@@ -54,13 +54,25 @@ class EmbedPreview extends Component {
}
render() {
- const { preview, url, type, caption, onCaptionChange, isSelected, className, icon, label } = this.props;
+ const {
+ preview,
+ url,
+ type,
+ caption,
+ onCaptionChange,
+ isSelected,
+ className,
+ icon,
+ label,
+ } = this.props;
const { scripts } = preview;
const { interactive } = this.state;
const html = 'photo' === type ? getPhotoHtml( preview ) : preview.html;
const parsedHost = parse( url ).host.split( '.' );
- const parsedHostBaseUrl = parsedHost.splice( parsedHost.length - 2, parsedHost.length - 1 ).join( '.' );
+ const parsedHostBaseUrl = parsedHost
+ .splice( parsedHost.length - 2, parsedHost.length - 1 )
+ .join( '.' );
const cannotPreview = includes( HOSTS_NO_PREVIEWS, parsedHostBaseUrl );
// translators: %s: host providing embed content e.g: www.youtube.com
const iframeTitle = sprintf( __( 'Embedded content from %s' ), parsedHostBaseUrl );
@@ -70,39 +82,50 @@ class EmbedPreview extends Component {
// as far as the user is concerned. We're just catching the first click so that
// the block can be selected without interacting with the embed preview that the overlay covers.
/* eslint-disable jsx-a11y/no-static-element-interactions */
- const embedWrapper = 'wp-embed' === type ? (
-
-
- { ! interactive &&
}
-
+
+ { ! interactive && (
+
+ ) }
+
- { ( cannotPreview ) ? (
+
+ { cannotPreview ? (
{ url }
- {
- /* translators: %s: host providing embed content e.g: www.youtube.com */
- sprintf( __( "Embedded content from %s can't be previewed in the editor." ), parsedHostBaseUrl )
- }
+ { url }
+
+
+ { /* translators: %s: host providing embed content e.g: www.youtube.com */
+ sprintf(
+ __( "Embedded content from %s can't be previewed in the editor." ),
+ parsedHostBaseUrl
+ ) }
- ) : embedWrapper }
+ ) : (
+ embedWrapper
+ ) }
{ ( ! RichText.isEmpty( caption ) || isSelected ) && (
+
+);
+export const embedAudioIcon = (
+
+
+);
+export const embedPhotoIcon = (
+
+
+);
+export const embedVideoIcon = (
+
+
+);
export const embedTwitterIcon = {
foreground: '#1da1f2',
- src:
+
+
+
+ ),
};
export const embedYouTubeIcon = {
foreground: '#ff0000',
- src:
+
+ ),
};
export const embedFacebookIcon = {
foreground: '#3b5998',
- src:
+
+ ),
};
-export const embedInstagramIcon =
+
+
+
+);
export const embedWordPressIcon = {
foreground: '#0073AA',
- src:
+
+
+
+ ),
};
export const embedSpotifyIcon = {
foreground: '#1db954',
- src:
+
+ ),
};
-export const embedFlickrIcon =
+
+);
export const embedVimeoIcon = {
foreground: '#1ab7ea',
- src:
+
+
+
+ ),
};
-export const embedRedditIcon =
+
+);
export const embedTumblrIcon = {
foreground: '#35465c',
- src:
+
+ ),
};
-export const embedAmazonIcon =
+
+);
diff --git a/packages/block-library/src/embed/index.js b/packages/block-library/src/embed/index.js
index 7bf859a002373d..79c57d047ac110 100644
--- a/packages/block-library/src/embed/index.js
+++ b/packages/block-library/src/embed/index.js
@@ -15,7 +15,9 @@ export const name = 'core/embed';
export const settings = getEmbedBlockSettings( {
title: _x( 'Embed', 'block title' ),
- description: __( 'Embed videos, images, tweets, audio, and other content from external sources.' ),
+ description: __(
+ 'Embed videos, images, tweets, audio, and other content from external sources.'
+ ),
icon: embedContentIcon,
// Unknown embeds should not be responsive by default.
responsive: false,
@@ -23,7 +25,8 @@ export const settings = getEmbedBlockSettings( {
from: [
{
type: 'raw',
- isMatch: ( node ) => node.nodeName === 'P' && /^\s*(https?:\/\/\S+)\s*$/i.test( node.textContent ),
+ isMatch: ( node ) =>
+ node.nodeName === 'P' && /^\s*(https?:\/\/\S+)\s*$/i.test( node.textContent ),
transform: ( node ) => {
return createBlock( 'core/embed', {
url: node.textContent.trim(),
@@ -34,20 +37,16 @@ export const settings = getEmbedBlockSettings( {
},
} );
-export const common = commonEmbeds.map(
- ( embedDefinition ) => {
- return {
- ...embedDefinition,
- settings: getEmbedBlockSettings( embedDefinition.settings ),
- };
- }
-);
+export const common = commonEmbeds.map( ( embedDefinition ) => {
+ return {
+ ...embedDefinition,
+ settings: getEmbedBlockSettings( embedDefinition.settings ),
+ };
+} );
-export const others = otherEmbeds.map(
- ( embedDefinition ) => {
- return {
- ...embedDefinition,
- settings: getEmbedBlockSettings( embedDefinition.settings ),
- };
- }
-);
+export const others = otherEmbeds.map( ( embedDefinition ) => {
+ return {
+ ...embedDefinition,
+ settings: getEmbedBlockSettings( embedDefinition.settings ),
+ };
+} );
diff --git a/packages/block-library/src/embed/settings.js b/packages/block-library/src/embed/settings.js
index 17d97cee43da6d..e87977fb491003 100644
--- a/packages/block-library/src/embed/settings.js
+++ b/packages/block-library/src/embed/settings.js
@@ -37,8 +37,21 @@ const embedAttributes = {
},
};
-export function getEmbedBlockSettings( { title, description, icon, category = 'embed', transforms, keywords = [], supports = {}, responsive = true } ) {
- const blockDescription = description || __( 'Add a block that displays content pulled from other sites, like Twitter, Instagram or YouTube.' );
+export function getEmbedBlockSettings( {
+ title,
+ description,
+ icon,
+ category = 'embed',
+ transforms,
+ keywords = [],
+ supports = {},
+ responsive = true,
+} ) {
+ const blockDescription =
+ description ||
+ __(
+ 'Add a block that displays content pulled from other sites, like Twitter, Instagram or YouTube.'
+ );
const edit = getEmbedEditComponent( title, icon, responsive );
return {
title,
@@ -59,7 +72,12 @@ export function getEmbedBlockSettings( { title, description, icon, category = 'e
withSelect( ( select, ownProps ) => {
const { url } = ownProps.attributes;
const core = select( 'core' );
- const { getEmbedPreview, isPreviewEmbedFallback, isRequestingEmbedPreview, getThemeSupports } = core;
+ const {
+ getEmbedPreview,
+ isPreviewEmbedFallback,
+ isRequestingEmbedPreview,
+ getThemeSupports,
+ } = core;
const preview = undefined !== url && getEmbedPreview( url );
const previewIsFallback = undefined !== url && isPreviewEmbedFallback( url );
const fetching = undefined !== url && isRequestingEmbedPreview( url );
@@ -108,7 +126,9 @@ export function getEmbedBlockSettings( { title, description, icon, category = 'e
{ `\n${ url }\n` /* URL needs to be on its own line. */ }
- { ! RichText.isEmpty( caption ) &&
);
},
@@ -131,7 +151,9 @@ export function getEmbedBlockSettings( { title, description, icon, category = 'e
return (
{ `\n${ url }\n` /* URL needs to be on its own line. */ }
- { ! RichText.isEmpty( caption ) &&
);
},
diff --git a/packages/block-library/src/embed/test/index.js b/packages/block-library/src/embed/test/index.js
index 5f01d8ff77ee84..26737576cd86c7 100644
--- a/packages/block-library/src/embed/test/index.js
+++ b/packages/block-library/src/embed/test/index.js
@@ -47,7 +47,9 @@ describe( 'core/embed', () => {
test( 'getClassNames preserves exsiting class names when removing responsive classes', () => {
const html = '';
const expected = 'lovely';
- expect( getClassNames( html, 'lovely wp-embed-aspect-16-9 wp-has-aspect-ratio', false ) ).toEqual( expected );
+ expect(
+ getClassNames( html, 'lovely wp-embed-aspect-16-9 wp-has-aspect-ratio', false )
+ ).toEqual( expected );
} );
test( 'createUpgradedEmbedBlock bails early when block type does not exist', () => {
@@ -59,13 +61,10 @@ describe( 'core/embed', () => {
test( 'createUpgradedEmbedBlock returns a YouTube embed block when given a YouTube URL', () => {
const youtubeURL = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ';
- registerBlockType(
- 'core-embed/youtube',
- {
- title: 'YouTube',
- category: 'embed',
- }
- );
+ registerBlockType( 'core-embed/youtube', {
+ title: 'YouTube',
+ category: 'embed',
+ } );
const result = createUpgradedEmbedBlock( { attributes: { url: youtubeURL } }, {} );
diff --git a/packages/block-library/src/embed/util.js b/packages/block-library/src/embed/util.js
index 0096f1bc3cd98a..86c631880333ae 100644
--- a/packages/block-library/src/embed/util.js
+++ b/packages/block-library/src/embed/util.js
@@ -53,8 +53,12 @@ export const isFromWordPress = ( html ) => {
export const getPhotoHtml = ( photo ) => {
// 100% width for the preview so it fits nicely into the document, some "thumbnails" are
// actually the full size photo. If thumbnails not found, use full image.
- const imageUrl = ( photo.thumbnail_url ) ? photo.thumbnail_url : photo.url;
- const photoPreview =
;
+ const imageUrl = photo.thumbnail_url ? photo.thumbnail_url : photo.url;
+ const photoPreview = (
+
+
+ );
return renderToString( photoPreview );
};
@@ -102,20 +106,17 @@ export const createUpgradedEmbedBlock = ( props, attributesFromPreview ) => {
if ( isFromWordPress( html ) ) {
// If this is not the WordPress embed block, transform it into one.
if ( WORDPRESS_EMBED_BLOCK !== name ) {
- return createBlock(
- WORDPRESS_EMBED_BLOCK,
- {
- url,
- // By now we have the preview, but when the new block first renders, it
- // won't have had all the attributes set, and so won't get the correct
- // type and it won't render correctly. So, we pass through the current attributes
- // here so that the initial render works when we switch to the WordPress
- // block. This only affects the WordPress block because it can't be
- // rendered in the usual Sandbox (it has a sandbox of its own) and it
- // relies on the preview to set the correct render type.
- ...attributesFromPreview,
- }
- );
+ return createBlock( WORDPRESS_EMBED_BLOCK, {
+ url,
+ // By now we have the preview, but when the new block first renders, it
+ // won't have had all the attributes set, and so won't get the correct
+ // type and it won't render correctly. So, we pass through the current attributes
+ // here so that the initial render works when we switch to the WordPress
+ // block. This only affects the WordPress block because it can't be
+ // rendered in the usual Sandbox (it has a sandbox of its own) and it
+ // relies on the preview to set the correct render type.
+ ...attributesFromPreview,
+ } );
}
}
}
@@ -139,10 +140,7 @@ export function getClassNames( html, existingClassNames = '', allowResponsive =
const aspectRatioToRemove = ASPECT_RATIOS[ ratioIndex ];
aspectRatioClassNames[ aspectRatioToRemove.className ] = false;
}
- return classnames(
- existingClassNames,
- aspectRatioClassNames
- );
+ return classnames( existingClassNames, aspectRatioClassNames );
}
const previewDocument = document.implementation.createHTMLDocument( '' );
@@ -156,13 +154,10 @@ export function getClassNames( html, existingClassNames = '', allowResponsive =
for ( let ratioIndex = 0; ratioIndex < ASPECT_RATIOS.length; ratioIndex++ ) {
const potentialRatio = ASPECT_RATIOS[ ratioIndex ];
if ( aspectRatio >= potentialRatio.ratio ) {
- return classnames(
- existingClassNames,
- {
- [ potentialRatio.className ]: allowResponsive,
- 'wp-has-aspect-ratio': allowResponsive,
- }
- );
+ return classnames( existingClassNames, {
+ [ potentialRatio.className ]: allowResponsive,
+ 'wp-has-aspect-ratio': allowResponsive,
+ } );
}
}
}
@@ -179,9 +174,7 @@ export function getClassNames( html, existingClassNames = '', allowResponsive =
*/
export function fallback( url, onReplace ) {
const link = { url } ;
- onReplace(
- createBlock( 'core/paragraph', { content: renderToString( link ) } )
- );
+ onReplace( createBlock( 'core/paragraph', { content: renderToString( link ) } ) );
}
/***
@@ -194,29 +187,35 @@ export function fallback( url, onReplace ) {
* @param {boolean} allowResponsive Apply responsive classes to fixed size content.
* @return {Object} Attributes and values.
*/
-export const getAttributesFromPreview = memoize( ( preview, title, currentClassNames, isResponsive, allowResponsive = true ) => {
- if ( ! preview ) {
- return {};
- }
+export const getAttributesFromPreview = memoize(
+ ( preview, title, currentClassNames, isResponsive, allowResponsive = true ) => {
+ if ( ! preview ) {
+ return {};
+ }
- const attributes = {};
- // Some plugins only return HTML with no type info, so default this to 'rich'.
- let { type = 'rich' } = preview;
- // If we got a provider name from the API, use it for the slug, otherwise we use the title,
- // because not all embed code gives us a provider name.
- const { html, provider_name: providerName } = preview;
- const providerNameSlug = kebabCase( toLower( '' !== providerName ? providerName : title ) );
+ const attributes = {};
+ // Some plugins only return HTML with no type info, so default this to 'rich'.
+ let { type = 'rich' } = preview;
+ // If we got a provider name from the API, use it for the slug, otherwise we use the title,
+ // because not all embed code gives us a provider name.
+ const { html, provider_name: providerName } = preview;
+ const providerNameSlug = kebabCase( toLower( '' !== providerName ? providerName : title ) );
- if ( isFromWordPress( html ) ) {
- type = 'wp-embed';
- }
+ if ( isFromWordPress( html ) ) {
+ type = 'wp-embed';
+ }
- if ( html || 'photo' === type ) {
- attributes.type = type;
- attributes.providerNameSlug = providerNameSlug;
- }
+ if ( html || 'photo' === type ) {
+ attributes.type = type;
+ attributes.providerNameSlug = providerNameSlug;
+ }
- attributes.className = getClassNames( html, currentClassNames, isResponsive && allowResponsive );
+ attributes.className = getClassNames(
+ html,
+ currentClassNames,
+ isResponsive && allowResponsive
+ );
- return attributes;
-} );
+ return attributes;
+ }
+);
diff --git a/packages/block-library/src/embed/wp-embed-preview.js b/packages/block-library/src/embed/wp-embed-preview.js
index ccfb0449819b85..2e52a84438fe29 100644
--- a/packages/block-library/src/embed/wp-embed-preview.js
+++ b/packages/block-library/src/embed/wp-embed-preview.js
@@ -25,10 +25,7 @@ class WpEmbedPreview extends Component {
checkFocus() {
const { activeElement } = document;
- if (
- activeElement.tagName !== 'IFRAME' ||
- activeElement.parentNode !== this.node.current
- ) {
+ if ( activeElement.tagName !== 'IFRAME' || activeElement.parentNode !== this.node.current ) {
return;
}
diff --git a/packages/block-library/src/file/edit.js b/packages/block-library/src/file/edit.js
index c6f6382a1336d4..0c32a633581cfc 100644
--- a/packages/block-library/src/file/edit.js
+++ b/packages/block-library/src/file/edit.js
@@ -6,18 +6,8 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- getBlobByURL,
- isBlobURL,
- revokeBlobURL,
-} from '@wordpress/blob';
-import {
- Animate,
- ClipboardButton,
- IconButton,
- Toolbar,
- withNotices,
-} from '@wordpress/components';
+import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
+import { Animate, ClipboardButton, IconButton, Toolbar, withNotices } from '@wordpress/components';
import { compose } from '@wordpress/compose';
import { withSelect } from '@wordpress/data';
import {
@@ -56,12 +46,7 @@ class FileEdit extends Component {
}
componentDidMount() {
- const {
- attributes,
- mediaUpload,
- noticeOperations,
- setAttributes,
- } = this.props;
+ const { attributes, mediaUpload, noticeOperations, setAttributes } = this.props;
const { downloadButtonText, href } = attributes;
// Upload a file drag-and-dropped into the editor
@@ -136,14 +121,7 @@ class FileEdit extends Component {
}
render() {
- const {
- className,
- isSelected,
- attributes,
- setAttributes,
- noticeUI,
- media,
- } = this.props;
+ const { className, isSelected, attributes, setAttributes, noticeUI, media } = this.props;
const {
fileName,
href,
@@ -219,7 +197,7 @@ class FileEdit extends Component {
onChange={ ( text ) => setAttributes( { fileName: text } ) }
/>
- { showDownloadButton &&
+ { showDownloadButton && (
{ /* Using RichText here instead of PlainText so that it can be styled like a button */ }
setAttributes( { downloadButtonText: text } ) }
/>
- }
+ ) }
- { isSelected &&
+ { isSelected && (
{ showCopyConfirmation ? __( 'Copied!' ) : __( 'Copy URL' ) }
- }
+ ) }
+
+);
diff --git a/packages/block-library/src/file/inspector.js b/packages/block-library/src/file/inspector.js
index f76ff53929d38f..60782743ac7de9 100644
--- a/packages/block-library/src/file/inspector.js
+++ b/packages/block-library/src/file/inspector.js
@@ -2,11 +2,7 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
-import {
- PanelBody,
- SelectControl,
- ToggleControl,
-} from '@wordpress/components';
+import { PanelBody, SelectControl, ToggleControl } from '@wordpress/components';
import { InspectorControls } from '@wordpress/block-editor';
export default function FileBlockInspector( {
diff --git a/packages/block-library/src/file/save.js b/packages/block-library/src/file/save.js
index 461018e4bb8a7c..4755b99ae4bee2 100644
--- a/packages/block-library/src/file/save.js
+++ b/packages/block-library/src/file/save.js
@@ -13,30 +13,24 @@ export default function save( { attributes } ) {
downloadButtonText,
} = attributes;
- return ( href &&
-
- { ! RichText.isEmpty( fileName ) &&
-
-
- }
- { showDownloadButton &&
-
-
- }
-
+ { ! RichText.isEmpty( fileName ) && (
+
+
+ ) }
+ { showDownloadButton && (
+
+
+ ) }
+
+
{ images.map( ( image ) => {
let href;
@@ -163,18 +168,18 @@ const deprecated = [
},
},
isEligible( { images, ids } ) {
- return images &&
+ return (
+ images &&
images.length > 0 &&
- (
- ( ! ids && images ) ||
+ ( ( ! ids && images ) ||
( ids && images && ids.length !== images.length ) ||
some( images, ( id, index ) => {
if ( ! id && ids[ index ] !== null ) {
return true;
}
return parseInt( id, 10 ) !== ids[ index ];
- } )
- );
+ } ) )
+ );
},
migrate( attributes ) {
return {
@@ -188,9 +193,14 @@ const deprecated = [
};
},
save( { attributes } ) {
- const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
+ const {
+ images,
+ columns = defaultColumnsNumber( attributes ),
+ imageCrop,
+ linkTo,
+ } = attributes;
return (
-
+
{ images.map( ( image ) => {
let href;
@@ -203,7 +213,15 @@ const deprecated = [
break;
}
- const img =
@@ -261,13 +279,19 @@ const deprecated = [
},
save( { attributes } ) {
- const { images, columns = defaultColumnsNumber( attributes ), align, imageCrop, linkTo } = attributes;
+ const {
+ images,
+ columns = defaultColumnsNumber( attributes ),
+ align,
+ imageCrop,
+ linkTo,
+ } = attributes;
const className = classnames( `columns-${ columns }`, {
alignnone: align === 'none',
'is-cropped': imageCrop,
} );
return (
-
+
{ images.map( ( image ) => {
let href;
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 449711a356ea42..2422bda8dfb5a5 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -2,14 +2,7 @@
* External dependencies
*/
import classnames from 'classnames';
-import {
- every,
- filter,
- find,
- forEach,
- map,
- some,
-} from 'lodash';
+import { every, filter, find, forEach, map, some } from 'lodash';
/**
* WordPress dependencies
@@ -22,12 +15,7 @@ import {
ToggleControl,
withNotices,
} from '@wordpress/components';
-import {
- BlockIcon,
- MediaPlaceholder,
- InspectorControls,
- RichText,
-} from '@wordpress/block-editor';
+import { BlockIcon, MediaPlaceholder, InspectorControls, RichText } from '@wordpress/block-editor';
import { Component } from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';
import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
@@ -74,7 +62,9 @@ class GalleryEdit extends Component {
setAttributes( attributes ) {
if ( attributes.ids ) {
- throw new Error( 'The "ids" attribute should not be changed directly. It is managed automatically when "images" attribute changes' );
+ throw new Error(
+ 'The "ids" attribute should not be changed directly. It is managed automatically when "images" attribute changes'
+ );
}
if ( attributes.images ) {
@@ -136,9 +126,7 @@ class GalleryEdit extends Component {
}
selectCaption( newImage, images, attachmentCaptions ) {
- const currentImage = find(
- images, { id: newImage.id }
- );
+ const currentImage = find( images, { id: newImage.id } );
const currentImageCaption = currentImage ? currentImage.caption : newImage.caption;
@@ -146,12 +134,10 @@ class GalleryEdit extends Component {
return currentImageCaption;
}
- const attachment = find(
- attachmentCaptions, { id: newImage.id }
- );
+ const attachment = find( attachmentCaptions, { id: newImage.id } );
// if the attachment caption is updated
- if ( attachment && ( attachment.caption !== newImage.caption ) ) {
+ if ( attachment && attachment.caption !== newImage.caption ) {
return newImage.caption;
}
@@ -161,14 +147,12 @@ class GalleryEdit extends Component {
onSelectImages( newImages ) {
const { columns, images } = this.props.attributes;
const { attachmentCaptions } = this.state;
- this.setState(
- {
- attachmentCaptions: newImages.map( ( newImage ) => ( {
- id: newImage.id,
- caption: newImage.caption,
- } ) ),
- }
- );
+ this.setState( {
+ attachmentCaptions: newImages.map( ( newImage ) => ( {
+ id: newImage.id,
+ caption: newImage.caption,
+ } ) ),
+ } );
this.setAttributes( {
images: newImages.map( ( newImage ) => ( {
...pickRelevantMediaFiles( newImage ),
@@ -207,7 +191,9 @@ class GalleryEdit extends Component {
}
setImageAttributes( index, attributes ) {
- const { attributes: { images } } = this.props;
+ const {
+ attributes: { images },
+ } = this.props;
const { setAttributes } = this;
if ( ! images[ index ] ) {
return;
@@ -249,13 +235,7 @@ class GalleryEdit extends Component {
}
render() {
- const {
- attributes,
- className,
- isSelected,
- noticeUI,
- setAttributes,
- } = this.props;
+ const { attributes, className, isSelected, noticeUI, setAttributes } = this.props;
const {
align,
columns = defaultColumnsNumber( attributes ),
@@ -277,7 +257,8 @@ class GalleryEdit extends Component {
icon={ ! hasImages &&
}
labels={ {
title: ! hasImages && __( 'Gallery' ),
- instructions: ! hasImages && __( 'Drag images, upload new ones or select files from your library.' ),
+ instructions:
+ ! hasImages && __( 'Drag images, upload new ones or select files from your library.' ),
} }
onSelect={ this.onSelectImages }
accept="image/*"
@@ -293,24 +274,23 @@ class GalleryEdit extends Component {
return mediaPlaceholder;
}
- const captionClassNames = classnames(
- 'blocks-gallery-caption',
- {
- 'screen-reader-text': ! isSelected && RichText.isEmpty( caption ),
- }
- );
+ const captionClassNames = classnames( 'blocks-gallery-caption', {
+ 'screen-reader-text': ! isSelected && RichText.isEmpty( caption ),
+ } );
return (
<>
- { images.length > 1 &&
{ noticeUI }
-
{ images.map( ( img, index ) => {
- /* translators: %1$d is the order number of the image, %2$d is the total number of images. */
- const ariaLabel = sprintf( __( 'image %1$d of %2$d in gallery' ), ( index + 1 ), images.length );
+ /* translators: %1$d is the order number of the image, %2$d is the total number of images. */
+ const ariaLabel = sprintf(
+ __( 'image %1$d of %2$d in gallery' ),
+ index + 1,
+ images.length
+ );
return (
@@ -347,7 +329,7 @@ class GalleryEdit extends Component {
alt={ img.alt }
id={ img.id }
isFirstItem={ index === 0 }
- isLastItem={ ( index + 1 ) === images.length }
+ isLastItem={ index + 1 === images.length }
isSelected={ isSelected && this.state.selectedImage === index }
onMoveBackward={ this.onMoveBackward( index ) }
onMoveForward={ this.onMoveForward( index ) }
@@ -379,9 +361,7 @@ class GalleryEdit extends Component {
export default compose( [
withSelect( ( select ) => {
const { getSettings } = select( 'core/block-editor' );
- const {
- __experimentalMediaUpload,
- } = getSettings();
+ const { __experimentalMediaUpload } = getSettings();
return {
mediaUpload: __experimentalMediaUpload,
diff --git a/packages/block-library/src/gallery/gallery-image.js b/packages/block-library/src/gallery/gallery-image.js
index aa88c054846373..74510d9978e232 100644
--- a/packages/block-library/src/gallery/gallery-image.js
+++ b/packages/block-library/src/gallery/gallery-image.js
@@ -64,7 +64,8 @@ class GalleryImage extends Component {
onRemoveImage( event ) {
if (
this.container === document.activeElement &&
- this.props.isSelected && [ BACKSPACE, DELETE ].indexOf( event.keyCode ) !== -1
+ this.props.isSelected &&
+ [ BACKSPACE, DELETE ].indexOf( event.keyCode ) !== -1
) {
event.stopPropagation();
event.preventDefault();
@@ -91,7 +92,22 @@ class GalleryImage extends Component {
}
render() {
- const { url, alt, id, linkTo, link, isFirstItem, isLastItem, isSelected, caption, onRemove, onMoveForward, onMoveBackward, setAttributes, 'aria-label': ariaLabel } = this.props;
+ const {
+ url,
+ alt,
+ id,
+ linkTo,
+ link,
+ isFirstItem,
+ isLastItem,
+ isSelected,
+ caption,
+ onRemove,
+ onMoveForward,
+ onMoveBackward,
+ setAttributes,
+ 'aria-label': ariaLabel,
+ } = this.props;
let href;
diff --git a/packages/block-library/src/gallery/icons.js b/packages/block-library/src/gallery/icons.js
index 3847732258b786..c2f6213daa32a5 100644
--- a/packages/block-library/src/gallery/icons.js
+++ b/packages/block-library/src/gallery/icons.js
@@ -6,7 +6,9 @@ import { G, Path, SVG } from '@wordpress/components';
export const icon = (
+
);
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 9981c028598b7a..f699eddf90b066 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,7 +9,13 @@ import { RichText } from '@wordpress/block-editor';
import { defaultColumnsNumber } from './shared';
export default function save( { attributes } ) {
- const { images, columns = defaultColumnsNumber( attributes ), imageCrop, caption, linkTo } = attributes;
+ const {
+ images,
+ columns = defaultColumnsNumber( attributes ),
+ imageCrop,
+ caption,
+ linkTo,
+ } = attributes;
return (
@@ -42,14 +48,24 @@ export default function save( { attributes } ) {
{ href ? { img } : img }
{ ! RichText.isEmpty( image.caption ) && (
-
);
} ) }
- { ! RichText.isEmpty( caption ) &&
);
}
diff --git a/packages/block-library/src/gallery/shared.js b/packages/block-library/src/gallery/shared.js
index 7d40f3b90d62d3..0b7e81cc3050c2 100644
--- a/packages/block-library/src/gallery/shared.js
+++ b/packages/block-library/src/gallery/shared.js
@@ -9,8 +9,13 @@ export function defaultColumnsNumber( attributes ) {
export const pickRelevantMediaFiles = ( image ) => {
const imageProps = pick( image, [ 'alt', 'id', 'link', 'caption' ] );
- imageProps.url = get( image, [ 'sizes', 'large', 'url' ] ) || get( image, [ 'media_details', 'sizes', 'large', 'source_url' ] ) || image.url;
- const fullUrl = get( image, [ 'sizes', 'full', 'url' ] ) || get( image, [ 'media_details', 'sizes', 'full', 'source_url' ] );
+ imageProps.url =
+ get( image, [ 'sizes', 'large', 'url' ] ) ||
+ get( image, [ 'media_details', 'sizes', 'large', 'source_url' ] ) ||
+ image.url;
+ const fullUrl =
+ get( image, [ 'sizes', 'full', 'url' ] ) ||
+ get( image, [ 'media_details', 'sizes', 'full', 'source_url' ] );
if ( fullUrl ) {
imageProps.fullUrl = fullUrl;
}
diff --git a/packages/block-library/src/gallery/transforms.js b/packages/block-library/src/gallery/transforms.js
index 8e42a109ee4b63..9cda0c02228cb6 100644
--- a/packages/block-library/src/gallery/transforms.js
+++ b/packages/block-library/src/gallery/transforms.js
@@ -19,9 +19,7 @@ const parseShortcodeIds = ( ids ) => {
return [];
}
- return ids.split( ',' ).map( ( id ) => (
- parseInt( id, 10 )
- ) );
+ return ids.split( ',' ).map( ( id ) => parseInt( id, 10 ) );
};
const transforms = {
@@ -86,13 +84,17 @@ const transforms = {
// When created by drag and dropping multiple files on an insertion point
type: 'files',
isMatch( files ) {
- return files.length !== 1 && every( files, ( file ) => file.type.indexOf( 'image/' ) === 0 );
+ return (
+ files.length !== 1 && every( files, ( file ) => file.type.indexOf( 'image/' ) === 0 )
+ );
},
transform( files ) {
const block = createBlock( 'core/gallery', {
- images: files.map( ( file ) => pickRelevantMediaFiles( {
- url: createBlobURL( file ),
- } ) ),
+ images: files.map( ( file ) =>
+ pickRelevantMediaFiles( {
+ url: createBlobURL( file ),
+ } )
+ ),
} );
return block;
},
@@ -104,13 +106,15 @@ const transforms = {
blocks: [ 'core/image' ],
transform: ( { images, align } ) => {
if ( images.length > 0 ) {
- return images.map( ( { id, url, alt, caption } ) => createBlock( 'core/image', {
- id,
- url,
- alt,
- caption,
- align,
- } ) );
+ return images.map( ( { id, url, alt, caption } ) =>
+ createBlock( 'core/image', {
+ id,
+ url,
+ alt,
+ caption,
+ align,
+ } )
+ );
}
return createBlock( 'core/image', { align } );
},
diff --git a/packages/block-library/src/group/edit.js b/packages/block-library/src/group/edit.js
index 1e7445a20cc954..ca464ddafd80fa 100644
--- a/packages/block-library/src/group/edit.js
+++ b/packages/block-library/src/group/edit.js
@@ -16,12 +16,7 @@ import {
withColors,
} from '@wordpress/block-editor';
-function GroupEdit( {
- className,
- setBackgroundColor,
- backgroundColor,
- hasInnerBlocks,
-} ) {
+function GroupEdit( { className, setBackgroundColor, backgroundColor, hasInnerBlocks } ) {
const styles = {
backgroundColor: backgroundColor.color,
};
@@ -46,9 +41,7 @@ function GroupEdit( {
@@ -58,9 +51,7 @@ function GroupEdit( {
export default compose( [
withColors( 'backgroundColor' ),
withSelect( ( select, { clientId } ) => {
- const {
- getBlock,
- } = select( 'core/block-editor' );
+ const { getBlock } = select( 'core/block-editor' );
const block = getBlock( clientId );
diff --git a/packages/block-library/src/group/edit.native.js b/packages/block-library/src/group/edit.native.js
index 32c87e3863c881..8e54ee9d1fa26e 100644
--- a/packages/block-library/src/group/edit.native.js
+++ b/packages/block-library/src/group/edit.native.js
@@ -1,4 +1,3 @@
-
/**
* External dependencies
*/
@@ -9,38 +8,24 @@ import { View } from 'react-native';
*/
import { withSelect } from '@wordpress/data';
import { compose } from '@wordpress/compose';
-import {
- InnerBlocks,
- withColors,
-} from '@wordpress/block-editor';
+import { InnerBlocks, withColors } from '@wordpress/block-editor';
/**
* Internal dependencies
*/
import styles from './editor.scss';
-function GroupEdit( {
- hasInnerBlocks,
- isSelected,
-} ) {
+function GroupEdit( { hasInnerBlocks, isSelected } ) {
if ( ! isSelected && ! hasInnerBlocks ) {
- return (
-
- );
+ return
;
}
- return (
-
- );
+ return
;
}
export default compose( [
withColors( 'backgroundColor' ),
withSelect( ( select, { clientId } ) => {
- const {
- getBlock,
- } = select( 'core/block-editor' );
+ const { getBlock } = select( 'core/block-editor' );
const block = getBlock( clientId );
diff --git a/packages/block-library/src/group/icon.js b/packages/block-library/src/group/icon.js
index f9d9dc7790ba95..94d19632e74f08 100644
--- a/packages/block-library/src/group/icon.js
+++ b/packages/block-library/src/group/icon.js
@@ -4,5 +4,16 @@
import { Path, SVG } from '@wordpress/components';
export default (
-
+
+
);
diff --git a/packages/block-library/src/group/index.js b/packages/block-library/src/group/index.js
index 956ded85aa22a1..47dd1bdece2955 100644
--- a/packages/block-library/src/group/index.js
+++ b/packages/block-library/src/group/index.js
@@ -99,7 +99,9 @@ export const settings = {
// Determine the widest setting of all the blocks to be grouped
const widestAlignment = blocks.reduce( ( accumulator, block ) => {
const { align } = block.attributes;
- return alignments.indexOf( align ) > alignments.indexOf( accumulator ) ? align : accumulator;
+ return alignments.indexOf( align ) > alignments.indexOf( accumulator )
+ ? align
+ : accumulator;
}, undefined );
// Clone the Blocks to be Grouped
@@ -111,12 +113,15 @@ export const settings = {
return createBlock( block.name, block.attributes, block.innerBlocks );
} );
- return createBlock( 'core/group', {
- align: widestAlignment,
- }, groupInnerBlocks );
+ return createBlock(
+ 'core/group',
+ {
+ align: widestAlignment,
+ },
+ groupInnerBlocks
+ );
},
},
-
],
},
diff --git a/packages/block-library/src/heading/deprecated.js b/packages/block-library/src/heading/deprecated.js
index e38ffb56171e88..d7d2a9fe30de4a 100644
--- a/packages/block-library/src/heading/deprecated.js
+++ b/packages/block-library/src/heading/deprecated.js
@@ -6,10 +6,7 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- getColorClassName,
- RichText,
-} from '@wordpress/block-editor';
+import { getColorClassName, RichText } from '@wordpress/block-editor';
const blockSupports = {
className: false,
@@ -45,13 +42,7 @@ const deprecated = [
{
attributes: blockAttributes,
save( { attributes } ) {
- const {
- align,
- content,
- customTextColor,
- level,
- textColor,
- } = attributes;
+ const { align, content, customTextColor, level, textColor } = attributes;
const tagName = 'h' + level;
const textClass = getColorClassName( 'color', textColor );
@@ -78,13 +69,7 @@ const deprecated = [
supports: blockSupports,
attributes: blockAttributes,
save( { attributes } ) {
- const {
- align,
- level,
- content,
- textColor,
- customTextColor,
- } = attributes;
+ const { align, level, content, textColor, customTextColor } = attributes;
const tagName = 'h' + level;
const textClass = getColorClassName( 'color', textColor );
diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index d500309a0c9aad..aee94398640c6b 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -25,26 +25,21 @@ import {
} from '@wordpress/block-editor';
import { memo } from '@wordpress/element';
-const HeadingColorUI = memo(
- function( {
- textColorValue,
- setTextColor,
- } ) {
- return (
-
- );
- }
-);
+const HeadingColorUI = memo( function( { textColorValue, setTextColor } ) {
+ return (
+
+ );
+} );
function HeadingEdit( {
attributes,
@@ -61,20 +56,31 @@ function HeadingEdit( {
return (
<>
- setAttributes( { level: newLevel } ) } />
- {
- setAttributes( { align: nextAlign } );
- } } />
+ setAttributes( { level: newLevel } ) }
+ />
+ {
+ setAttributes( { align: nextAlign } );
+ } }
+ />
{ __( 'Level' ) }
- setAttributes( { level: newLevel } ) } />
+ setAttributes( { level: newLevel } ) }
+ />
-
(
+const HeadingEdit = ( { attributes, mergeBlocks, onFocus, onReplace, setAttributes, style } ) => (
+
);
diff --git a/packages/block-library/src/heading/heading-toolbar.js b/packages/block-library/src/heading/heading-toolbar.js
index 6d19cc0822f894..7a9e7c4757e916 100644
--- a/packages/block-library/src/heading/heading-toolbar.js
+++ b/packages/block-library/src/heading/heading-toolbar.js
@@ -34,9 +34,10 @@ class HeadingToolbar extends Component {
- { ( isDisabled ) => (
- ( isPreview || isDisabled ) ? (
+ { ( isDisabled ) =>
+ isPreview || isDisabled ? (
+
);
diff --git a/packages/block-library/src/image/deprecated.js b/packages/block-library/src/image/deprecated.js
index 952cb77b52cc16..fac421b2973f42 100644
--- a/packages/block-library/src/image/deprecated.js
+++ b/packages/block-library/src/image/deprecated.js
@@ -93,7 +93,9 @@ const deprecated = [
return (
{ href ? { image } : image }
- { ! RichText.isEmpty( caption ) &&
);
},
@@ -114,9 +116,11 @@ const deprecated = [
);
return (
-
+
{ href ? { image } : image }
- { ! RichText.isEmpty( caption ) &&
);
},
@@ -139,7 +143,9 @@ const deprecated = [
return (
{ href ? { image } : image }
- { ! RichText.isEmpty( caption ) &&
);
},
diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index fe51a775c4d271..66b7aeaae85a10 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -2,15 +2,7 @@
* External dependencies
*/
import classnames from 'classnames';
-import {
- find,
- get,
- isEmpty,
- map,
- last,
- omit,
- pick,
-} from 'lodash';
+import { find, get, isEmpty, map, last, omit, pick } from 'lodash';
/**
* WordPress dependencies
@@ -37,14 +29,7 @@ import {
withNotices,
} from '@wordpress/components';
import { compose } from '@wordpress/compose';
-import {
- LEFT,
- RIGHT,
- UP,
- DOWN,
- BACKSPACE,
- ENTER,
-} from '@wordpress/keycodes';
+import { LEFT, RIGHT, UP, DOWN, BACKSPACE, ENTER } from '@wordpress/keycodes';
import { withSelect, withDispatch } from '@wordpress/data';
import {
BlockAlignmentToolbar,
@@ -55,12 +40,7 @@ import {
URLPopover,
RichText,
} from '@wordpress/block-editor';
-import {
- Component,
- useCallback,
- useState,
- useRef,
-} from '@wordpress/element';
+import { Component, useCallback, useState, useRef } from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';
import { getPath } from '@wordpress/url';
import { withViewportMatch } from '@wordpress/viewport';
@@ -89,7 +69,10 @@ import {
export const pickRelevantMediaFiles = ( image ) => {
const imageProps = pick( image, [ 'alt', 'id', 'link', 'caption' ] );
- imageProps.url = get( image, [ 'sizes', 'large', 'url' ] ) || get( image, [ 'media_details', 'sizes', 'large', 'source_url' ] ) || image.url;
+ imageProps.url =
+ get( image, [ 'sizes', 'large', 'url' ] ) ||
+ get( image, [ 'media_details', 'sizes', 'large', 'source_url' ] ) ||
+ image.url;
return imageProps;
};
@@ -126,13 +109,7 @@ const stopPropagationRelevantKeys = ( event ) => {
}
};
-const ImageURLInputUI = ( {
- advancedOptions,
- linkDestination,
- mediaLinks,
- onChangeUrl,
- url,
-} ) => {
+const ImageURLInputUI = ( { advancedOptions, linkDestination, mediaLinks, onChangeUrl, url } ) => {
const [ isOpen, setIsOpen ] = useState( false );
const openLinkUI = useCallback( () => {
setIsOpen( true );
@@ -142,7 +119,8 @@ const ImageURLInputUI = ( {
const [ urlInput, setUrlInput ] = useState( null );
const startEditLink = useCallback( () => {
- if ( linkDestination === LINK_DESTINATION_MEDIA ||
+ if (
+ linkDestination === LINK_DESTINATION_MEDIA ||
linkDestination === LINK_DESTINATION_ATTACHMENT
) {
setUrlInput( '' );
@@ -194,9 +172,7 @@ const ImageURLInputUI = ( {
} );
const linkEditorValue = urlInput !== null ? urlInput : url;
- const urlLabel = (
- find( mediaLinks, [ 'linkDestination', linkDestination ] ) || {}
- ).title;
+ const urlLabel = ( find( mediaLinks, [ 'linkDestination', linkDestination ] ) || {} ).title;
return (
<>
advancedOptions }
- additionalControls={ ! linkEditorValue && (
-
- {
- map( mediaLinks, ( link ) => (
+ additionalControls={
+ ! linkEditorValue && (
+
+ { map( mediaLinks, ( link ) => (
{ link.title }
- ) )
- }
-
- ) }
+ ) ) }
+
+ )
+ }
>
{ ( ! url || isEditingLink ) && (
+
+ ),
},
];
}
@@ -587,18 +555,24 @@ export class ImageEdit extends Component {
const cleanRel = removeNewTabRel( rel );
const isExternal = isExternalImage( id, url );
- const editImageIcon = (
+
+ );
const controls = (
-
-
- { __( 'Image Dimensions' ) }
-
+
{ __( 'Image Dimensions' ) }
-
+
{ __( 'Reset' ) }
@@ -789,7 +763,10 @@ export class ImageEdit extends Component {
if ( alt ) {
defaultedAlt = alt;
} else if ( filename ) {
- defaultedAlt = sprintf( __( 'This image has an empty alt attribute; its file name is %s' ), filename );
+ defaultedAlt = sprintf(
+ __( 'This image has an empty alt attribute; its file name is %s' ),
+ filename
+ );
} else {
defaultedAlt = __( 'This image has an empty alt attribute' );
}
@@ -815,9 +792,7 @@ export class ImageEdit extends Component {
return (
<>
{ getInspectorControls( imageWidth, imageHeight ) }
-
- { img }
-
+
{ img }
);
}
@@ -930,13 +905,11 @@ export default compose( [
withSelect( ( select, props ) => {
const { getMedia } = select( 'core' );
const { getSettings } = select( 'core/block-editor' );
- const { attributes: { id }, isSelected } = props;
const {
- __experimentalMediaUpload,
- imageSizes,
- isRTL,
- maxWidth,
- } = getSettings();
+ attributes: { id },
+ isSelected,
+ } = props;
+ const { __experimentalMediaUpload, imageSizes, isRTL, maxWidth } = getSettings();
return {
image: id && isSelected ? getMedia( id ) : null,
diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index be86e880ff2a77..1119b43b03389b 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -47,10 +47,7 @@ import SvgIcon from './icon';
import SvgIconRetry from './icon-retry';
import { getUpdatedLinkTargetSettings } from './utils';
-import {
- LINK_DESTINATION_CUSTOM,
- LINK_DESTINATION_NONE,
-} from './constants';
+import { LINK_DESTINATION_CUSTOM, LINK_DESTINATION_NONE } from './constants';
const IMAGE_SIZE_THUMBNAIL = 'thumbnail';
const IMAGE_SIZE_MEDIUM = 'medium';
@@ -246,18 +243,14 @@ export class ImageEdit extends React.Component {
const getToolbarEditButton = ( open ) => (
-
);
const getInspectorControls = () => (
-
+
this.onSetSizeSlug( newValue ) }
options={ sizeOptions }
- /> }
+ />
+ ) }
+
{ getInspectorControls() }
{ getMediaOptions() }
- { ( ! this.state.isCaptionSelected ) &&
- getToolbarEditButton( openMediaOptions )
- }
+ { ! this.state.isCaptionSelected && getToolbarEditButton( openMediaOptions ) }
{
+ renderContent={ ( {
+ isUploadInProgress,
+ isUploadFailed,
+ finalWidth,
+ finalHeight,
+ imageWidthWithinContainer,
+ retryMessage,
+ } ) => {
const opacity = isUploadInProgress ? 0.3 : 1;
const icon = this.getIcon( isUploadFailed );
- const iconContainer = (
-
- { icon }
-
- );
+ const iconContainer = { icon } ;
return (
-
- { ! imageWidthWithinContainer &&
-
+
+ { ! imageWidthWithinContainer && (
+
{ this.getIcon( false ) }
- }
+
+ ) }
- { isUploadFailed &&
-
+ { isUploadFailed && (
+
{ iconContainer }
{ retryMessage }
- }
+ ) }
);
@@ -376,13 +377,14 @@ export class ImageEdit extends React.Component {
isSelected={ this.state.isCaptionSelected }
accessible={ true }
accessibilityLabelCreator={ ( caption ) =>
- isEmpty( caption ) ?
- /* translators: accessibility text. Empty image caption. */
- ( 'Image caption. Empty' ) :
- sprintf(
- /* translators: accessibility text. %s: image caption. */
- __( 'Image caption. %s' ),
- caption )
+ isEmpty( caption )
+ ? /* translators: accessibility text. Empty image caption. */
+ 'Image caption. Empty'
+ : sprintf(
+ /* translators: accessibility text. %s: image caption. */
+ __( 'Image caption. %s' ),
+ caption
+ )
}
onFocus={ this.onFocusCaption }
onBlur={ this.props.onBlur } // always assign onBlur as props
@@ -392,7 +394,8 @@ export class ImageEdit extends React.Component {
);
return (
- {
return getImageComponent( open, getMediaOptions );
diff --git a/packages/block-library/src/image/icon-retry.native.js b/packages/block-library/src/image/icon-retry.native.js
index bdd40f69efd64a..580cd1fff188f5 100644
--- a/packages/block-library/src/image/icon-retry.native.js
+++ b/packages/block-library/src/image/icon-retry.native.js
@@ -3,4 +3,9 @@
*/
import { Path, SVG } from '@wordpress/components';
-export default
+
+);
diff --git a/packages/block-library/src/image/icon.js b/packages/block-library/src/image/icon.js
index b029bab8fbe98a..37e8bbd8e8594a 100644
--- a/packages/block-library/src/image/icon.js
+++ b/packages/block-library/src/image/icon.js
@@ -3,4 +3,10 @@
*/
import { Path, SVG } from '@wordpress/components';
-export default
+
+);
diff --git a/packages/block-library/src/image/image-size.js b/packages/block-library/src/image/image-size.js
index bc7ebaeaa59b46..24b6fdbe70095a 100644
--- a/packages/block-library/src/image/image-size.js
+++ b/packages/block-library/src/image/image-size.js
@@ -73,11 +73,7 @@ class ImageSize extends Component {
imageWidthWithinContainer: this.state.width,
imageHeightWithinContainer: this.state.height,
};
- return (
-
- { this.props.children( sizes ) }
-
- );
+ return { this.props.children( sizes ) }
;
}
}
diff --git a/packages/block-library/src/image/index.js b/packages/block-library/src/image/index.js
index 78c37538d5bff1..3160e86f966414 100644
--- a/packages/block-library/src/image/index.js
+++ b/packages/block-library/src/image/index.js
@@ -39,7 +39,13 @@ export const settings = {
transforms,
getEditWrapperProps( attributes ) {
const { align, width } = attributes;
- if ( 'left' === align || 'center' === align || 'right' === align || 'wide' === align || 'full' === align ) {
+ if (
+ 'left' === align ||
+ 'center' === align ||
+ 'right' === align ||
+ 'wide' === align ||
+ 'full' === align
+ ) {
return { 'data-align': align, 'data-resized': !! width };
}
},
diff --git a/packages/block-library/src/image/save.js b/packages/block-library/src/image/save.js
index b3976c76a8de85..fd7a4e9cd0f5a4 100644
--- a/packages/block-library/src/image/save.js
+++ b/packages/block-library/src/image/save.js
@@ -46,32 +46,25 @@ export default function save( { attributes } ) {
const figure = (
<>
{ href ? (
-
+
{ image }
- ) : image }
- { ! RichText.isEmpty( caption ) &&
-
- { figure }
-
+ { figure }
);
}
- return (
-
- { figure }
-
- );
+ return { figure } ;
}
diff --git a/packages/block-library/src/image/test/edit.native.js b/packages/block-library/src/image/test/edit.native.js
index 9c21c10d90dbaf..219572d1eb2783 100644
--- a/packages/block-library/src/image/test/edit.native.js
+++ b/packages/block-library/src/image/test/edit.native.js
@@ -15,7 +15,7 @@ const getStylesFromColorScheme = () => {
const setAttributes = jest.fn();
-const getImageComponent = ( attributes = { } ) => (
+const getImageComponent = ( attributes = {} ) => (
{
} );
it( 'unset link target', () => {
- const component = renderer.create( getImageComponent( { linkTarget: '_blank', rel: NEW_TAB_REL.join( ' ' ) } ) );
+ const component = renderer.create(
+ getImageComponent( { linkTarget: '_blank', rel: NEW_TAB_REL.join( ' ' ) } )
+ );
const instance = component.getInstance();
instance.onSetNewTab( false );
@@ -52,4 +54,3 @@ describe( 'Image Block', () => {
expect( setAttributes ).toHaveBeenCalledWith( { linkTarget: undefined, rel: undefined } );
} );
} );
-
diff --git a/packages/block-library/src/image/test/transforms.js b/packages/block-library/src/image/test/transforms.js
index 14f2f8dc425807..a72a04744bd0dd 100644
--- a/packages/block-library/src/image/test/transforms.js
+++ b/packages/block-library/src/image/test/transforms.js
@@ -7,19 +7,27 @@ describe( 'stripFirstImage', () => {
test( 'should do nothing if no image is present', () => {
expect( stripFirstImage( {}, { shortcode: { content: '' } } ) ).toEqual( '' );
expect( stripFirstImage( {}, { shortcode: { content: 'Tucson' } } ) ).toEqual( 'Tucson' );
- expect( stripFirstImage( {}, { shortcode: { content: 'Tucson ' } } ) ).toEqual( 'Tucson ' );
+ expect( stripFirstImage( {}, { shortcode: { content: 'Tucson ' } } ) ).toEqual(
+ 'Tucson '
+ );
} );
test( 'should strip out image when leading as expected', () => {
expect( stripFirstImage( {}, { shortcode: { content: '
' } } ) ).toEqual( '
' );
+ expect(
+ stripFirstImage( {}, { shortcode: { content: '
' } } )
+ ).toEqual( '
' );
} );
} );
diff --git a/packages/block-library/src/image/transforms.js b/packages/block-library/src/image/transforms.js
index 2af42cc2244e99..80f9cc0839a5f8 100644
--- a/packages/block-library/src/image/transforms.js
+++ b/packages/block-library/src/image/transforms.js
@@ -2,11 +2,7 @@
* WordPress dependencies
*/
import { createBlobURL } from '@wordpress/blob';
-import {
- createBlock,
- getBlockAttributes,
- getPhrasingContentSchema,
-} from '@wordpress/blocks';
+import { createBlock, getBlockAttributes, getPhrasingContentSchema } from '@wordpress/blocks';
export function stripFirstImage( attributes, { shortcode } ) {
const { body } = document.implementation.createHTMLDocument( '' );
@@ -34,10 +30,7 @@ function getFirstAnchorAttributeFormHTML( html, attributeName ) {
const { firstElementChild } = body;
- if (
- firstElementChild &&
- firstElementChild.nodeName === 'A'
- ) {
+ if ( firstElementChild && firstElementChild.nodeName === 'A' ) {
return firstElementChild.getAttribute( attributeName ) || undefined;
}
}
@@ -83,8 +76,16 @@ const transforms = {
const linkDestination = anchorElement && anchorElement.href ? 'custom' : undefined;
const href = anchorElement && anchorElement.href ? anchorElement.href : undefined;
const rel = anchorElement && anchorElement.rel ? anchorElement.rel : undefined;
- const linkClass = anchorElement && anchorElement.className ? anchorElement.className : undefined;
- const attributes = getBlockAttributes( 'core/image', node.outerHTML, { align, id, linkDestination, href, rel, linkClass } );
+ const linkClass =
+ anchorElement && anchorElement.className ? anchorElement.className : undefined;
+ const attributes = getBlockAttributes( 'core/image', node.outerHTML, {
+ align,
+ id,
+ linkDestination,
+ href,
+ rel,
+ linkClass,
+ } );
return createBlock( 'core/image', attributes );
},
},
diff --git a/packages/block-library/src/image/utils.js b/packages/block-library/src/image/utils.js
index 1e3e8a07fc3748..3f156d659f89bc 100644
--- a/packages/block-library/src/image/utils.js
+++ b/packages/block-library/src/image/utils.js
@@ -1,10 +1,7 @@
/**
* External dependencies
*/
-import {
- isEmpty,
- each,
-} from 'lodash';
+import { isEmpty, each } from 'lodash';
/**
* Internal dependencies
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index e49f68553b0a6f..52d6fd6f94c522 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -162,14 +162,17 @@ export const registerCoreBlocks = () => {
* __experimentalRegisterExperimentalCoreBlocks( settings );
* ```
*/
-export const __experimentalRegisterExperimentalCoreBlocks = process.env.GUTENBERG_PHASE === 2 ? ( settings ) => {
- const { __experimentalEnableLegacyWidgetBlock, __experimentalEnableMenuBlock } = settings;
+export const __experimentalRegisterExperimentalCoreBlocks =
+ process.env.GUTENBERG_PHASE === 2
+ ? ( settings ) => {
+ const { __experimentalEnableLegacyWidgetBlock, __experimentalEnableMenuBlock } = settings;
- [
- __experimentalEnableLegacyWidgetBlock ? legacyWidget : null,
- __experimentalEnableMenuBlock ? navigationMenu : null,
- __experimentalEnableMenuBlock ? navigationMenuItem : null,
- socialLinks,
- ...socialLink.sites,
- ].forEach( registerBlock );
-} : undefined;
+ [
+ __experimentalEnableLegacyWidgetBlock ? legacyWidget : null,
+ __experimentalEnableMenuBlock ? navigationMenu : null,
+ __experimentalEnableMenuBlock ? navigationMenuItem : null,
+ socialLinks,
+ ...socialLink.sites,
+ ].forEach( registerBlock );
+ }
+ : undefined;
diff --git a/packages/block-library/src/latest-comments/edit.js b/packages/block-library/src/latest-comments/edit.js
index 029778e24f2c59..2023db529c71c9 100644
--- a/packages/block-library/src/latest-comments/edit.js
+++ b/packages/block-library/src/latest-comments/edit.js
@@ -2,12 +2,7 @@
* WordPress dependencies
*/
import { InspectorControls } from '@wordpress/block-editor';
-import {
- Disabled,
- PanelBody,
- RangeControl,
- ToggleControl,
-} from '@wordpress/components';
+import { Disabled, PanelBody, RangeControl, ToggleControl } from '@wordpress/components';
import ServerSideRender from '@wordpress/server-side-render';
import { Component } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
@@ -53,12 +48,7 @@ class LatestComments extends Component {
}
render() {
- const {
- commentsToShow,
- displayAvatar,
- displayDate,
- displayExcerpt,
- } = this.props.attributes;
+ const { commentsToShow, displayAvatar, displayDate, displayExcerpt } = this.props.attributes;
return (
<>
@@ -90,10 +80,7 @@ class LatestComments extends Component {
-
);
diff --git a/packages/block-library/src/latest-comments/icon.js b/packages/block-library/src/latest-comments/icon.js
index b14cf145c0ed16..e4ec9b06c90f03 100644
--- a/packages/block-library/src/latest-comments/icon.js
+++ b/packages/block-library/src/latest-comments/icon.js
@@ -4,5 +4,10 @@
import { G, Path, SVG } from '@wordpress/components';
export default (
-
+
+
+
+
);
diff --git a/packages/block-library/src/latest-posts/edit.js b/packages/block-library/src/latest-posts/edit.js
index 6d0e4198e8242e..56611f8f73e75d 100644
--- a/packages/block-library/src/latest-posts/edit.js
+++ b/packages/block-library/src/latest-posts/edit.js
@@ -22,10 +22,7 @@ import apiFetch from '@wordpress/api-fetch';
import { addQueryArgs } from '@wordpress/url';
import { __ } from '@wordpress/i18n';
import { dateI18n, format, __experimentalGetSettings } from '@wordpress/date';
-import {
- InspectorControls,
- BlockControls,
-} from '@wordpress/block-editor';
+import { InspectorControls, BlockControls } from '@wordpress/block-editor';
import { withSelect } from '@wordpress/data';
/**
@@ -48,19 +45,17 @@ class LatestPostsEdit extends Component {
this.isStillMounted = true;
this.fetchRequest = apiFetch( {
path: addQueryArgs( `/wp/v2/categories`, CATEGORIES_LIST_QUERY ),
- } ).then(
- ( categoriesList ) => {
+ } )
+ .then( ( categoriesList ) => {
if ( this.isStillMounted ) {
this.setState( { categoriesList } );
}
- }
- ).catch(
- () => {
+ } )
+ .catch( () => {
if ( this.isStillMounted ) {
this.setState( { categoriesList: [] } );
}
- }
- );
+ } );
}
componentWillUnmount() {
@@ -70,7 +65,18 @@ class LatestPostsEdit extends Component {
render() {
const { attributes, setAttributes, latestPosts } = this.props;
const { categoriesList } = this.state;
- const { displayPostContentRadio, displayPostContent, displayPostDate, postLayout, columns, order, orderBy, categories, postsToShow, excerptLength } = attributes;
+ const {
+ displayPostContentRadio,
+ displayPostContent,
+ displayPostDate,
+ postLayout,
+ columns,
+ order,
+ orderBy,
+ categories,
+ postsToShow,
+ excerptLength,
+ } = attributes;
const inspectorControls = (
@@ -80,18 +86,18 @@ class LatestPostsEdit extends Component {
checked={ displayPostContent }
onChange={ ( value ) => setAttributes( { displayPostContent: value } ) }
/>
- { displayPostContent &&
- setAttributes( { displayPostContentRadio: value } ) }
- />
- }
- { displayPostContent && displayPostContentRadio === 'excerpt' &&
+ { displayPostContent && (
+ setAttributes( { displayPostContentRadio: value } ) }
+ />
+ ) }
+ { displayPostContent && displayPostContentRadio === 'excerpt' && (
@@ -118,19 +124,23 @@ class LatestPostsEdit extends Component {
selectedCategoryId={ categories }
onOrderChange={ ( value ) => setAttributes( { order: value } ) }
onOrderByChange={ ( value ) => setAttributes( { orderBy: value } ) }
- onCategoryChange={ ( value ) => setAttributes( { categories: '' !== value ? value : undefined } ) }
+ onCategoryChange={ ( value ) =>
+ setAttributes( { categories: '' !== value ? value : undefined } )
+ }
onNumberOfItemsChange={ ( value ) => setAttributes( { postsToShow: value } ) }
/>
- { postLayout === 'grid' &&
+ { postLayout === 'grid' && (
setAttributes( { columns: value } ) }
min={ 2 }
- max={ ! hasPosts ? MAX_POSTS_COLUMNS : Math.min( MAX_POSTS_COLUMNS, latestPosts.length ) }
+ max={
+ ! hasPosts ? MAX_POSTS_COLUMNS : Math.min( MAX_POSTS_COLUMNS, latestPosts.length )
+ }
required
/>
- }
+ ) }
);
@@ -140,23 +150,16 @@ class LatestPostsEdit extends Component {
return (
<>
{ inspectorControls }
-
- { ! Array.isArray( latestPosts ) ?
-
+ { ! Array.isArray( latestPosts ) ?
);
}
// Removing posts from display should be instant.
- const displayPosts = latestPosts.length > postsToShow ?
- latestPosts.slice( 0, postsToShow ) :
- latestPosts;
+ const displayPosts =
+ latestPosts.length > postsToShow ? latestPosts.slice( 0, postsToShow ) : latestPosts;
const layoutControls = [
{
@@ -201,39 +204,41 @@ class LatestPostsEdit extends Component {
return (
- { titleTrimmed ? (
-
- { titleTrimmed }
-
- ) :
- __( '(no title)' )
- }
+ { titleTrimmed ? { titleTrimmed } : __( '(no title)' ) }
- { displayPostDate && post.date_gmt &&
-
+ { displayPostDate && post.date_gmt && (
+
{ dateI18n( dateFormat, post.date_gmt ) }
- }
- { displayPostContent && displayPostContentRadio === 'excerpt' &&
-
-
- { excerptLength < excerpt.trim().split( ' ' ).length ?
- excerpt.trim().split( ' ', excerptLength ).join( ' ' ) + ' ... ' + __( 'Read more' ) + ' ' :
- excerpt.trim().split( ' ', excerptLength ).join( ' ' ) }
-
-
-
- { post.content.raw.trim() }
-
-
- }
+ ) }
+ { displayPostContent && displayPostContentRadio === 'excerpt' && (
+
+
+ { excerptLength < excerpt.trim().split( ' ' ).length
+ ? excerpt
+ .trim()
+ .split( ' ', excerptLength )
+ .join( ' ' ) +
+ ' ... ' +
+ __( 'Read more' ) +
+ ' '
+ : excerpt
+ .trim()
+ .split( ' ', excerptLength )
+ .join( ' ' ) }
+
+
+ { post.content.raw.trim() }
+
+ ) }
);
} ) }
@@ -246,12 +251,15 @@ class LatestPostsEdit extends Component {
export default withSelect( ( select, props ) => {
const { postsToShow, order, orderBy, categories } = props.attributes;
const { getEntityRecords } = select( 'core' );
- const latestPostsQuery = pickBy( {
- categories,
- order,
- orderby: orderBy,
- per_page: postsToShow,
- }, ( value ) => ! isUndefined( value ) );
+ const latestPostsQuery = pickBy(
+ {
+ categories,
+ order,
+ orderby: orderBy,
+ per_page: postsToShow,
+ },
+ ( value ) => ! isUndefined( value )
+ );
return {
latestPosts: getEntityRecords( 'postType', 'post', latestPostsQuery ),
};
diff --git a/packages/block-library/src/latest-posts/icon.js b/packages/block-library/src/latest-posts/icon.js
index 7233084d330bcc..0a37c4a96c6262 100644
--- a/packages/block-library/src/latest-posts/icon.js
+++ b/packages/block-library/src/latest-posts/icon.js
@@ -4,5 +4,14 @@
import { Path, Rect, SVG } from '@wordpress/components';
export default (
-
+
);
diff --git a/packages/block-library/src/legacy-widget/edit/dom-manager.js b/packages/block-library/src/legacy-widget/edit/dom-manager.js
index d4a0b43829f29c..7ce60128392241 100644
--- a/packages/block-library/src/legacy-widget/edit/dom-manager.js
+++ b/packages/block-library/src/legacy-widget/edit/dom-manager.js
@@ -21,9 +21,7 @@ class LegacyWidgetEditDomManager extends Component {
componentDidMount() {
this.triggerWidgetEvent( 'widget-added' );
- this.previousFormData = new window.FormData(
- this.formRef.current
- );
+ this.previousFormData = new window.FormData( this.formRef.current );
}
shouldComponentUpdate( nextProps ) {
@@ -33,9 +31,7 @@ class LegacyWidgetEditDomManager extends Component {
const widgetContent = this.widgetContentRef.current;
widgetContent.innerHTML = nextProps.form;
this.triggerWidgetEvent( 'widget-updated' );
- this.previousFormData = new window.FormData(
- this.formRef.current
- );
+ this.previousFormData = new window.FormData( this.formRef.current );
}
return false;
}
@@ -50,9 +46,7 @@ class LegacyWidgetEditDomManager extends Component {
method="post"
onBlur={ () => {
if ( this.shouldTriggerInstanceUpdate() ) {
- this.props.onInstanceChange(
- this.retrieveUpdatedInstance()
- );
+ this.props.onInstanceChange( this.retrieveUpdatedInstance() );
}
} }
>
@@ -63,7 +57,12 @@ class LegacyWidgetEditDomManager extends Component {
/>
-
- { widgetObject.description }
-
+ { widgetObject.description }
);
if ( ! hasPermissionsToManageWidgets ) {
@@ -109,13 +101,11 @@ class LegacyWidgetEdit extends Component {
isVisible={ ! isPreview }
identifier={ attributes.identifier }
instance={ attributes.instance }
- onInstanceChange={
- ( newInstance ) => {
- this.props.setAttributes( {
- instance: newInstance,
- } );
- }
- }
+ onInstanceChange={ ( newInstance ) => {
+ this.props.setAttributes( {
+ instance: newInstance,
+ } );
+ } }
/>
) }
{ ( isPreview || isCallbackWidget ) && this.renderWidgetPreview() }
@@ -153,10 +143,7 @@ class LegacyWidgetEdit extends Component {
export default withSelect( ( select ) => {
const editorSettings = select( 'core/block-editor' ).getSettings();
- const {
- availableLegacyWidgets,
- hasPermissionsToManageWidgets,
- } = editorSettings;
+ const { availableLegacyWidgets, hasPermissionsToManageWidgets } = editorSettings;
return {
hasPermissionsToManageWidgets,
availableLegacyWidgets,
diff --git a/packages/block-library/src/legacy-widget/edit/placeholder.js b/packages/block-library/src/legacy-widget/edit/placeholder.js
index b19f5654ab4c6f..7cc8b2393c5019 100644
--- a/packages/block-library/src/legacy-widget/edit/placeholder.js
+++ b/packages/block-library/src/legacy-widget/edit/placeholder.js
@@ -18,15 +18,12 @@ export default function LegacyWidgetPlaceholder( {
onChangeWidget,
} ) {
const visibleLegacyWidgets = useMemo(
- () => pickBy(
- availableLegacyWidgets,
- ( { isHidden } ) => ! isHidden
- ),
+ () => pickBy( availableLegacyWidgets, ( { isHidden } ) => ! isHidden ),
[ availableLegacyWidgets ]
);
let placeholderContent;
if ( ! hasPermissionsToManageWidgets ) {
- placeholderContent = __( 'You don\'t have permissions to use widgets on this site.' );
+ placeholderContent = __( "You don't have permissions to use widgets on this site." );
}
if ( isEmpty( visibleLegacyWidgets ) ) {
placeholderContent = __( 'There are no widgets available.' );
@@ -47,10 +44,7 @@ export default function LegacyWidgetPlaceholder( {
/>
);
return (
-
);
diff --git a/packages/block-library/src/legacy-widget/icon.js b/packages/block-library/src/legacy-widget/icon.js
index 31731fc0530d37..8aed9c22642e06 100644
--- a/packages/block-library/src/legacy-widget/icon.js
+++ b/packages/block-library/src/legacy-widget/icon.js
@@ -4,5 +4,10 @@
import { G, Path, SVG } from '@wordpress/components';
export default (
-
+
+
+
+
);
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index 6a76a376f617d3..71d70deebce304 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -3,14 +3,8 @@
*/
import { __, _x } from '@wordpress/i18n';
import { createBlock } from '@wordpress/blocks';
-import {
- RichText,
- BlockControls,
- RichTextShortcut,
-} from '@wordpress/block-editor';
-import {
- Toolbar,
-} from '@wordpress/components';
+import { RichText, BlockControls, RichTextShortcut } from '@wordpress/block-editor';
+import { Toolbar } from '@wordpress/components';
import {
__unstableIndentListItems as indentListItems,
__unstableOutdentListItems as outdentListItems,
@@ -114,31 +108,34 @@ export default function ListEdit( {
);
- return <>
-
setAttributes( { values: nextValues } ) }
- value={ values }
- className={ className }
- placeholder={ __( 'Write list…' ) }
- onMerge={ mergeBlocks }
- onSplit={ ( value ) => createBlock( name, { ordered, values: value } ) }
- __unstableOnSplitMiddle={ () => createBlock( 'core/paragraph' ) }
- onReplace={ onReplace }
- onRemove={ () => onReplace( [] ) }
- start={ start }
- reversed={ reversed }
- >
- { controls }
-
- { ordered && (
-
+ setAttributes( { values: nextValues } ) }
+ value={ values }
+ className={ className }
+ placeholder={ __( 'Write list…' ) }
+ onMerge={ mergeBlocks }
+ onSplit={ ( value ) => createBlock( name, { ordered, values: value } ) }
+ __unstableOnSplitMiddle={ () => createBlock( 'core/paragraph' ) }
+ onReplace={ onReplace }
+ onRemove={ () => onReplace( [] ) }
start={ start }
- /> ) }
- ;
+ reversed={ reversed }
+ >
+ { controls }
+
+ { ordered && (
+
+
+
+
);
diff --git a/packages/block-library/src/list/index.js b/packages/block-library/src/list/index.js
index f2423db6f32253..7f195c17376f24 100644
--- a/packages/block-library/src/list/index.js
+++ b/packages/block-library/src/list/index.js
@@ -26,7 +26,8 @@ export const settings = {
},
example: {
attributes: {
- values: 'Alice. The White Rabbit. The Cheshire Cat. The Mad Hatter. The Queen of Hearts. ',
+ values:
+ 'Alice. The White Rabbit. The Cheshire Cat. The Mad Hatter. The Queen of Hearts. ',
},
},
transforms,
diff --git a/packages/block-library/src/list/ordered-list-settings.js b/packages/block-library/src/list/ordered-list-settings.js
index 4cb845f423d657..4de602c7bc4125 100644
--- a/packages/block-library/src/list/ordered-list-settings.js
+++ b/packages/block-library/src/list/ordered-list-settings.js
@@ -3,11 +3,7 @@
*/
import { __ } from '@wordpress/i18n';
import { InspectorControls } from '@wordpress/block-editor';
-import {
- TextControl,
- PanelBody,
- ToggleControl,
-} from '@wordpress/components';
+import { TextControl, PanelBody, ToggleControl } from '@wordpress/components';
const OrderedListSettings = ( { setAttributes, reversed, start } ) => (
@@ -38,6 +34,7 @@ const OrderedListSettings = ( { setAttributes, reversed, start } ) => (
} }
/>
- );
+
+);
export default OrderedListSettings;
diff --git a/packages/block-library/src/list/transforms.js b/packages/block-library/src/list/transforms.js
index baf09b1b945c6d..0a37c38bd38f01 100644
--- a/packages/block-library/src/list/transforms.js
+++ b/packages/block-library/src/list/transforms.js
@@ -1,11 +1,7 @@
/**
* WordPress dependencies
*/
-import {
- createBlock,
- getBlockAttributes,
- getPhrasingContentSchema,
-} from '@wordpress/blocks';
+import { createBlock, getBlockAttributes, getPhrasingContentSchema } from '@wordpress/blocks';
import {
__UNSTABLE_LINE_SEPARATOR,
create,
@@ -41,17 +37,20 @@ const transforms = {
transform: ( blockAttributes ) => {
return createBlock( 'core/list', {
values: toHTMLString( {
- value: join( blockAttributes.map( ( { content } ) => {
- const value = create( { html: content } );
+ value: join(
+ blockAttributes.map( ( { content } ) => {
+ const value = create( { html: content } );
- if ( blockAttributes.length > 1 ) {
- return value;
- }
+ if ( blockAttributes.length > 1 ) {
+ return value;
+ }
- // When converting only one block, transform
- // every line to a list item.
- return replace( value, /\n/g, __UNSTABLE_LINE_SEPARATOR );
- } ), __UNSTABLE_LINE_SEPARATOR ),
+ // When converting only one block, transform
+ // every line to a list item.
+ return replace( value, /\n/g, __UNSTABLE_LINE_SEPARATOR );
+ } ),
+ __UNSTABLE_LINE_SEPARATOR
+ ),
multilineTag: 'li',
} ),
} );
@@ -78,10 +77,7 @@ const transforms = {
},
transform( node ) {
return createBlock( 'core/list', {
- ...getBlockAttributes(
- 'core/list',
- node.outerHTML
- ),
+ ...getBlockAttributes( 'core/list', node.outerHTML ),
ordered: node.nodeName === 'OL',
} );
},
@@ -111,16 +107,18 @@ const transforms = {
type: 'block',
blocks: [ 'core/paragraph' ],
transform: ( { values } ) =>
- split( create( {
- html: values,
- multilineTag: 'li',
- multilineWrapperTags: [ 'ul', 'ol' ],
- } ), __UNSTABLE_LINE_SEPARATOR )
- .map( ( piece ) =>
- createBlock( 'core/paragraph', {
- content: toHTMLString( { value: piece } ),
- } )
- ),
+ split(
+ create( {
+ html: values,
+ multilineTag: 'li',
+ multilineWrapperTags: [ 'ul', 'ol' ],
+ } ),
+ __UNSTABLE_LINE_SEPARATOR
+ ).map( ( piece ) =>
+ createBlock( 'core/paragraph', {
+ content: toHTMLString( { value: piece } ),
+ } )
+ ),
},
{
type: 'block',
diff --git a/packages/block-library/src/media-text/deprecated.js b/packages/block-library/src/media-text/deprecated.js
index 721a6cf7f3a318..8397218b92efda 100644
--- a/packages/block-library/src/media-text/deprecated.js
+++ b/packages/block-library/src/media-text/deprecated.js
@@ -7,10 +7,7 @@ import { noop } from 'lodash';
/**
* WordPress dependencies
*/
-import {
- InnerBlocks,
- getColorClassName,
-} from '@wordpress/block-editor';
+import { InnerBlocks, getColorClassName } from '@wordpress/block-editor';
/**
* Internal dependencies
@@ -93,7 +90,13 @@ export default [
focalPoint,
} = attributes;
const mediaTypeRenders = {
- image: () =>
-
+
{ ( mediaTypeRenders[ mediaType ] || noop )() }
diff --git a/packages/block-library/src/media-text/edit.js b/packages/block-library/src/media-text/edit.js
index 94495a7d635d65..39bf6c08b80a40 100644
--- a/packages/block-library/src/media-text/edit.js
+++ b/packages/block-library/src/media-text/edit.js
@@ -38,7 +38,8 @@ const TEMPLATE = [
];
// this limits the resize to a safe zone to avoid making broken layouts
const WIDTH_CONSTRAINT_PERCENTAGE = 15;
-const applyWidthConstraints = ( width ) => Math.max( WIDTH_CONSTRAINT_PERCENTAGE, Math.min( width, 100 - WIDTH_CONSTRAINT_PERCENTAGE ) );
+const applyWidthConstraints = ( width ) =>
+ Math.max( WIDTH_CONSTRAINT_PERCENTAGE, Math.min( width, 100 - WIDTH_CONSTRAINT_PERCENTAGE ) );
class MediaTextEdit extends Component {
constructor() {
@@ -66,13 +67,16 @@ class MediaTextEdit extends Component {
// video contain the media type of 'file' in the object returned from the rest api.
mediaType = 'video';
}
- } else { // for media selections originated from existing files in the media library.
+ } else {
+ // for media selections originated from existing files in the media library.
mediaType = media.type;
}
if ( mediaType === 'image' ) {
// Try the "large" size URL, falling back to the "full" size URL below.
- src = get( media, [ 'sizes', 'large', 'url' ] ) || get( media, [ 'media_details', 'sizes', 'large', 'source_url' ] );
+ src =
+ get( media, [ 'sizes', 'large', 'url' ] ) ||
+ get( media, [ 'media_details', 'sizes', 'large', 'source_url' ] );
}
setAttributes( {
@@ -104,7 +108,16 @@ class MediaTextEdit extends Component {
renderMediaArea() {
const { attributes } = this.props;
- const { mediaAlt, mediaId, mediaPosition, mediaType, mediaUrl, mediaWidth, imageFill, focalPoint } = attributes;
+ const {
+ mediaAlt,
+ mediaId,
+ mediaPosition,
+ mediaType,
+ mediaUrl,
+ mediaWidth,
+ imageFill,
+ focalPoint,
+ } = attributes;
return (
);
}
@@ -141,35 +163,41 @@ class MediaTextEdit extends Component {
const classNames = classnames( className, {
'has-media-on-the-right': 'right' === mediaPosition,
'is-selected': isSelected,
- 'has-background': ( backgroundColor.class || backgroundColor.color ),
+ 'has-background': backgroundColor.class || backgroundColor.color,
[ backgroundColor.class ]: backgroundColor.class,
'is-stacked-on-mobile': isStackedOnMobile,
[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
'is-image-fill': imageFill,
} );
const widthString = `${ temporaryMediaWidth || mediaWidth }%`;
- const gridTemplateColumns = 'right' === mediaPosition ? `1fr ${ widthString }` : `${ widthString } 1fr`;
+ const gridTemplateColumns =
+ 'right' === mediaPosition ? `1fr ${ widthString }` : `${ widthString } 1fr`;
const style = {
gridTemplateColumns,
msGridColumns: gridTemplateColumns,
backgroundColor: backgroundColor.color,
};
- const colorSettings = [ {
- value: backgroundColor.color,
- onChange: setBackgroundColor,
- label: __( 'Background Color' ),
- } ];
- const toolbarControls = [ {
- icon: 'align-pull-left',
- title: __( 'Show media on left' ),
- isActive: mediaPosition === 'left',
- onClick: () => setAttributes( { mediaPosition: 'left' } ),
- }, {
- icon: 'align-pull-right',
- title: __( 'Show media on right' ),
- isActive: mediaPosition === 'right',
- onClick: () => setAttributes( { mediaPosition: 'right' } ),
- } ];
+ const colorSettings = [
+ {
+ value: backgroundColor.color,
+ onChange: setBackgroundColor,
+ label: __( 'Background Color' ),
+ },
+ ];
+ const toolbarControls = [
+ {
+ icon: 'align-pull-left',
+ title: __( 'Show media on left' ),
+ isActive: mediaPosition === 'left',
+ onClick: () => setAttributes( { mediaPosition: 'left' } ),
+ },
+ {
+ icon: 'align-pull-right',
+ title: __( 'Show media on right' ),
+ isActive: mediaPosition === 'right',
+ onClick: () => setAttributes( { mediaPosition: 'right' } ),
+ },
+ ];
const onMediaAltChange = ( newMediaAlt ) => {
setAttributes( { mediaAlt: newMediaAlt } );
};
@@ -181,36 +209,46 @@ class MediaTextEdit extends Component {
setAttributes( {
- isStackedOnMobile: ! isStackedOnMobile,
- } ) }
- />
- { mediaType === 'image' && ( setAttributes( {
- imageFill: ! imageFill,
- } ) }
- /> ) }
- { imageFill && ( setAttributes( { focalPoint: value } ) }
- /> ) }
- { mediaType === 'image' && (
-
- { __( 'Describe the purpose of the image' ) }
-
- { __( 'Leave empty if the image is purely decorative.' ) }
-
+ onChange={ () =>
+ setAttributes( {
+ isStackedOnMobile: ! isStackedOnMobile,
+ } )
}
- /> ) }
+ />
+ { mediaType === 'image' && (
+
+ setAttributes( {
+ imageFill: ! imageFill,
+ } )
+ }
+ />
+ ) }
+ { imageFill && (
+ setAttributes( { focalPoint: value } ) }
+ />
+ ) }
+ { mediaType === 'image' && (
+
+
+ { __( 'Describe the purpose of the image' ) }
+
+ { __( 'Leave empty if the image is purely decorative.' ) }
+
+ }
+ />
+ ) }
);
return (
@@ -224,20 +262,15 @@ class MediaTextEdit extends Component {
/>
-
-
+
{ this.renderMediaArea() }
-
);
diff --git a/packages/block-library/src/media-text/edit.native.js b/packages/block-library/src/media-text/edit.native.js
index 73532a322916ae..9e0bc2d1dd43f4 100644
--- a/packages/block-library/src/media-text/edit.native.js
+++ b/packages/block-library/src/media-text/edit.native.js
@@ -15,9 +15,7 @@ import {
withColors,
} from '@wordpress/block-editor';
import { Component } from '@wordpress/element';
-import {
- Toolbar,
-} from '@wordpress/components';
+import { Toolbar } from '@wordpress/components';
import { compose } from '@wordpress/compose';
import { withViewportMatch } from '@wordpress/viewport';
@@ -36,7 +34,8 @@ const TEMPLATE = [
];
// this limits the resize to a safe zone to avoid making broken layouts
const WIDTH_CONSTRAINT_PERCENTAGE = 15;
-const applyWidthConstraints = ( width ) => Math.max( WIDTH_CONSTRAINT_PERCENTAGE, Math.min( width, 100 - WIDTH_CONSTRAINT_PERCENTAGE ) );
+const applyWidthConstraints = ( width ) =>
+ Math.max( WIDTH_CONSTRAINT_PERCENTAGE, Math.min( width, 100 - WIDTH_CONSTRAINT_PERCENTAGE ) );
class MediaTextEdit extends Component {
constructor() {
@@ -65,13 +64,16 @@ class MediaTextEdit extends Component {
// video contain the media type of 'file' in the object returned from the rest api.
mediaType = 'video';
}
- } else { // for media selections originated from existing files in the media library.
+ } else {
+ // for media selections originated from existing files in the media library.
mediaType = media.type;
}
if ( mediaType === 'image' && media.sizes ) {
// Try the "large" size URL, falling back to the "full" size URL below.
- src = get( media, [ 'sizes', 'large', 'url' ] ) || get( media, [ 'media_details', 'sizes', 'large', 'source_url' ] );
+ src =
+ get( media, [ 'sizes', 'large', 'url' ] ) ||
+ get( media, [ 'media_details', 'sizes', 'large', 'source_url' ] );
}
setAttributes( {
@@ -112,7 +114,16 @@ class MediaTextEdit extends Component {
renderMediaArea() {
const { attributes, isSelected } = this.props;
- const { mediaAlt, mediaId, mediaPosition, mediaType, mediaUrl, mediaWidth, imageFill, focalPoint } = attributes;
+ const {
+ mediaAlt,
+ mediaId,
+ mediaPosition,
+ mediaType,
+ mediaUrl,
+ mediaWidth,
+ imageFill,
+ focalPoint,
+ } = attributes;
return (
);
}
render() {
- const {
- attributes,
- backgroundColor,
- setAttributes,
- isMobile,
- } = this.props;
- const {
- isStackedOnMobile,
- mediaPosition,
- mediaWidth,
- verticalAlignment,
- } = attributes;
+ const { attributes, backgroundColor, setAttributes, isMobile } = this.props;
+ const { isStackedOnMobile, mediaPosition, mediaWidth, verticalAlignment } = attributes;
const shouldStack = isStackedOnMobile && isMobile;
- const temporaryMediaWidth = shouldStack ? 100 : ( this.state.mediaWidth || mediaWidth );
+ const temporaryMediaWidth = shouldStack ? 100 : this.state.mediaWidth || mediaWidth;
const widthString = `${ temporaryMediaWidth }%`;
const containerStyles = {
...styles[ 'wp-block-media-text' ],
...styles[ `is-vertically-aligned-${ verticalAlignment }` ],
...( mediaPosition === 'right' ? styles[ 'has-media-on-the-right' ] : {} ),
...( shouldStack ? styles[ 'is-stacked-on-mobile' ] : {} ),
- ...( shouldStack && mediaPosition === 'right' ? styles[ 'is-stacked-on-mobile.has-media-on-the-right' ] : {} ),
+ ...( shouldStack && mediaPosition === 'right'
+ ? styles[ 'is-stacked-on-mobile.has-media-on-the-right' ]
+ : {} ),
backgroundColor: backgroundColor.color,
};
- const innerBlockWidth = shouldStack ? 100 : ( 100 - temporaryMediaWidth );
+ const innerBlockWidth = shouldStack ? 100 : 100 - temporaryMediaWidth;
const innerBlockWidthString = `${ innerBlockWidth }%`;
- const toolbarControls = [ {
- icon: 'align-pull-left',
- title: __( 'Show media on left' ),
- isActive: mediaPosition === 'left',
- onClick: () => setAttributes( { mediaPosition: 'left' } ),
- }, {
- icon: 'align-pull-right',
- title: __( 'Show media on right' ),
- isActive: mediaPosition === 'right',
- onClick: () => setAttributes( { mediaPosition: 'right' } ),
- } ];
+ const toolbarControls = [
+ {
+ icon: 'align-pull-left',
+ title: __( 'Show media on left' ),
+ isActive: mediaPosition === 'left',
+ onClick: () => setAttributes( { mediaPosition: 'left' } ),
+ },
+ {
+ icon: 'align-pull-right',
+ title: __( 'Show media on right' ),
+ isActive: mediaPosition === 'right',
+ onClick: () => setAttributes( { mediaPosition: 'right' } ),
+ },
+ ];
const onVerticalAlignmentChange = ( alignment ) => {
setAttributes( { verticalAlignment: alignment } );
@@ -172,9 +188,7 @@ class MediaTextEdit extends Component {
return (
<>
-
-
- { this.renderMediaArea() }
-
+ { this.renderMediaArea() }
+
+);
diff --git a/packages/block-library/src/media-text/icon.js b/packages/block-library/src/media-text/icon.js
index cfc1f405b34cc9..a0d73c0e9910e1 100644
--- a/packages/block-library/src/media-text/icon.js
+++ b/packages/block-library/src/media-text/icon.js
@@ -3,4 +3,8 @@
*/
import { Path, SVG } from '@wordpress/components';
-export default
+
+);
diff --git a/packages/block-library/src/media-text/index.js b/packages/block-library/src/media-text/index.js
index 73f1ee2080a1b4..fd9c9e7b893092 100644
--- a/packages/block-library/src/media-text/index.js
+++ b/packages/block-library/src/media-text/index.js
@@ -29,7 +29,8 @@ export const settings = {
example: {
attributes: {
mediaType: 'image',
- mediaUrl: 'https://s.w.org/images/core/5.3/Biologia_Centrali-Americana_-_Cantorchilus_semibadius_1902.jpg',
+ mediaUrl:
+ 'https://s.w.org/images/core/5.3/Biologia_Centrali-Americana_-_Cantorchilus_semibadius_1902.jpg',
},
innerBlocks: [
{
diff --git a/packages/block-library/src/media-text/media-container-icon.js b/packages/block-library/src/media-text/media-container-icon.js
index 6e6de30b7a61d5..e5eb65d261dc58 100644
--- a/packages/block-library/src/media-text/media-container-icon.js
+++ b/packages/block-library/src/media-text/media-container-icon.js
@@ -3,4 +3,10 @@
*/
import { Path, SVG } from '@wordpress/components';
-export default
+
+);
diff --git a/packages/block-library/src/media-text/media-container.js b/packages/block-library/src/media-text/media-container.js
index fce35487d6a03b..fdf5bee80b9248 100644
--- a/packages/block-library/src/media-text/media-container.js
+++ b/packages/block-library/src/media-text/media-container.js
@@ -2,12 +2,7 @@
* WordPress dependencies
*/
import { IconButton, ResizableBox, Toolbar, withNotices } from '@wordpress/components';
-import {
- BlockControls,
- BlockIcon,
- MediaPlaceholder,
- MediaUpload,
-} from '@wordpress/block-editor';
+import { BlockControls, BlockIcon, MediaPlaceholder, MediaUpload } from '@wordpress/block-editor';
import { Component } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import { compose } from '@wordpress/compose';
@@ -24,12 +19,14 @@ import icon from './media-container-icon';
const ALLOWED_MEDIA_TYPES = [ 'image', 'video' ];
export function imageFillStyles( url, focalPoint ) {
- return url ?
- {
- backgroundImage: `url(${ url })`,
- backgroundPosition: focalPoint ? `${ focalPoint.x * 100 }% ${ focalPoint.y * 100 }%` : `50% 50%`,
- } :
- {};
+ return url
+ ? {
+ backgroundImage: `url(${ url })`,
+ backgroundPosition: focalPoint
+ ? `${ focalPoint.x * 100 }% ${ focalPoint.y * 100 }%`
+ : `50% 50%`,
+ }
+ : {};
}
class MediaContainer extends Component {
@@ -111,7 +108,15 @@ class MediaContainer extends Component {
}
render() {
- const { mediaPosition, mediaUrl, mediaType, mediaWidth, commitWidthChange, onWidthChange, toggleSelection } = this.props;
+ const {
+ mediaPosition,
+ mediaUrl,
+ mediaType,
+ mediaWidth,
+ commitWidthChange,
+ onWidthChange,
+ toggleSelection,
+ } = this.props;
if ( mediaType && mediaUrl ) {
const onResizeStart = () => {
toggleSelection( false );
diff --git a/packages/block-library/src/media-text/media-container.native.js b/packages/block-library/src/media-text/media-container.native.js
index d929f08d9f4c93..41196099df5482 100644
--- a/packages/block-library/src/media-text/media-container.native.js
+++ b/packages/block-library/src/media-text/media-container.native.js
@@ -12,12 +12,7 @@ import {
/**
* WordPress dependencies
*/
-import {
- Icon,
- IconButton,
- Toolbar,
- withNotices,
-} from '@wordpress/components';
+import { Icon, IconButton, Toolbar, withNotices } from '@wordpress/components';
import {
BlockControls,
MEDIA_TYPE_IMAGE,
@@ -109,7 +104,12 @@ class MediaContainer extends Component {
getIcon( isRetryIcon, isVideo ) {
if ( isRetryIcon ) {
- return
- { ! imageWidthWithinContainer &&
-
- { this.getIcon( false ) }
- }
+ { ! imageWidthWithinContainer && (
+ { this.getIcon( false ) }
+ ) }
- { isUploadFailed &&
+ { isUploadFailed && (
-
- { this.getIcon( isUploadFailed ) }
-
+ { this.getIcon( isUploadFailed ) }
{ retryMessage }
- }
+ ) }
@@ -214,7 +217,7 @@ class MediaContainer extends Component {
disabled={ ! isSelected }
>
- { showVideo &&
+ { showVideo && (
- }
- { ! showVideo &&
+ ) }
+ { ! showVideo && (
-
+
{ isUploadFailed ? this.getIcon( isUploadFailed ) : this.getIcon( false ) }
- { isUploadFailed && { retryMessage } }
+ { isUploadFailed && (
+
+ { retryMessage }
+
+ ) }
- }
+ ) }
);
@@ -279,26 +286,26 @@ class MediaContainer extends Component {
allowedTypes={ ALLOWED_MEDIA_TYPES }
value={ mediaId }
render={ ( { open, getMediaOptions } ) => {
- return <>
- { getMediaOptions() }
- { this.renderToolbarEditButton( open ) }
-
- {
- return (
-
- { this.renderContent( params, open ) }
-
- );
- } }
- />
- ;
+ return (
+ <>
+ { getMediaOptions() }
+ { this.renderToolbarEditButton( open ) }
+
+ {
+ return (
+ { this.renderContent( params, open ) }
+ );
+ } }
+ />
+
+ );
} }
/>
@@ -310,5 +317,5 @@ class MediaContainer extends Component {
export default compose(
withNotices,
- withPreferredColorScheme,
+ withPreferredColorScheme
)( MediaContainer );
diff --git a/packages/block-library/src/media-text/save.js b/packages/block-library/src/media-text/save.js
index 8d4529173948e6..ee58290b5dd180 100644
--- a/packages/block-library/src/media-text/save.js
+++ b/packages/block-library/src/media-text/save.js
@@ -7,10 +7,7 @@ import { noop } from 'lodash';
/**
* WordPress dependencies
*/
-import {
- InnerBlocks,
- getColorClassName,
-} from '@wordpress/block-editor';
+import { InnerBlocks, getColorClassName } from '@wordpress/block-editor';
/**
* Internal dependencies
@@ -35,13 +32,19 @@ export default function save( { attributes } ) {
focalPoint,
} = attributes;
const mediaTypeRenders = {
- image: () =>
- { messageHTML }
-
+ { messageHTML }
{ originalUndelimitedContent }
);
@@ -46,9 +48,12 @@ const MissingEdit = withDispatch( ( dispatch, { clientId, attributes } ) => {
const { replaceBlock } = dispatch( 'core/block-editor' );
return {
convertToHTML() {
- replaceBlock( clientId, createBlock( 'core/html', {
- content: attributes.originalUndelimitedContent,
- } ) );
+ replaceBlock(
+ clientId,
+ createBlock( 'core/html', {
+ content: attributes.originalUndelimitedContent,
+ } )
+ );
},
};
} )( MissingBlockWarning );
diff --git a/packages/block-library/src/missing/edit.native.js b/packages/block-library/src/missing/edit.native.js
index cd4898a4e8c692..67302b0b5560ba 100644
--- a/packages/block-library/src/missing/edit.native.js
+++ b/packages/block-library/src/missing/edit.native.js
@@ -25,14 +25,26 @@ export class UnsupportedBlockEdit extends Component {
const blockType = coreBlocks[ originalName ];
const title = blockType ? blockType.settings.title : __( 'Unsupported' );
- const titleStyle = getStylesFromColorScheme( styles.unsupportedBlockMessage, styles.unsupportedBlockMessageDark );
+ const titleStyle = getStylesFromColorScheme(
+ styles.unsupportedBlockMessage,
+ styles.unsupportedBlockMessageDark
+ );
const icon = blockType ? normalizeIconObject( blockType.settings.icon ) : 'admin-plugins';
- const iconStyle = getStylesFromColorScheme( styles.unsupportedBlockIcon, styles.unsupportedBlockIconDark );
+ const iconStyle = getStylesFromColorScheme(
+ styles.unsupportedBlockIcon,
+ styles.unsupportedBlockIconDark
+ );
const iconClassName = 'unsupported-icon' + '-' + preferredColorScheme;
return (
-
-
+ { title }
);
diff --git a/packages/block-library/src/more/edit.js b/packages/block-library/src/more/edit.js
index 670ef8027e5e59..5847ca748eb25a 100644
--- a/packages/block-library/src/more/edit.js
+++ b/packages/block-library/src/more/edit.js
@@ -6,10 +6,7 @@ import { PanelBody, ToggleControl } from '@wordpress/components';
import { Component } from '@wordpress/element';
import { InspectorControls } from '@wordpress/block-editor';
import { ENTER } from '@wordpress/keycodes';
-import {
- getDefaultBlockName,
- createBlock,
-} from '@wordpress/blocks';
+import { getDefaultBlockName, createBlock } from '@wordpress/blocks';
export default class MoreEdit extends Component {
constructor() {
@@ -41,9 +38,7 @@ export default class MoreEdit extends Component {
}
getHideExcerptHelp( checked ) {
- return checked ?
- __( 'The excerpt is hidden.' ) :
- __( 'The excerpt is visible.' );
+ return checked ? __( 'The excerpt is hidden.' ) : __( 'The excerpt is visible.' );
}
render() {
diff --git a/packages/block-library/src/more/icon.js b/packages/block-library/src/more/icon.js
index b73e5cdf9b3f63..3e24c0d3d471e0 100644
--- a/packages/block-library/src/more/icon.js
+++ b/packages/block-library/src/more/icon.js
@@ -4,5 +4,10 @@
import { G, Path, SVG } from '@wordpress/components';
export default (
-
+
+
+
);
diff --git a/packages/block-library/src/more/index.js b/packages/block-library/src/more/index.js
index d61cb2001ff495..44d8b38aabb2e2 100644
--- a/packages/block-library/src/more/index.js
+++ b/packages/block-library/src/more/index.js
@@ -18,7 +18,9 @@ export { metadata, name };
export const settings = {
title: _x( 'More', 'block name' ),
- description: __( 'Content before this block will be shown in the excerpt on your archives page.' ),
+ description: __(
+ 'Content before this block will be shown in the excerpt on your archives page.'
+ ),
icon,
supports: {
customClassName: false,
diff --git a/packages/block-library/src/more/save.js b/packages/block-library/src/more/save.js
index f3483924d85ffb..dbb5fdc7985fdd 100644
--- a/packages/block-library/src/more/save.js
+++ b/packages/block-library/src/more/save.js
@@ -11,17 +11,9 @@ import { RawHTML } from '@wordpress/element';
export default function save( { attributes } ) {
const { customText, noTeaser } = attributes;
- const moreTag = customText ?
- `` :
- '';
+ const moreTag = customText ? `` : '';
- const noTeaserTag = noTeaser ?
- '' :
- '';
+ const noTeaserTag = noTeaser ? '' : '';
- return (
-
- { compact( [ moreTag, noTeaserTag ] ).join( '\n' ) }
-
- );
+ return { compact( [ moreTag, noTeaserTag ] ).join( '\n' ) } ;
}
diff --git a/packages/block-library/src/navigation-menu-item/edit.js b/packages/block-library/src/navigation-menu-item/edit.js
index 90a80f41e2f696..94f63c9b16de55 100644
--- a/packages/block-library/src/navigation-menu-item/edit.js
+++ b/packages/block-library/src/navigation-menu-item/edit.js
@@ -18,16 +18,8 @@ import {
ToggleControl,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
-import {
- InnerBlocks,
- InspectorControls,
- PlainText,
-} from '@wordpress/block-editor';
-import {
- Fragment,
- useCallback,
- useRef,
-} from '@wordpress/element';
+import { InnerBlocks, InspectorControls, PlainText } from '@wordpress/block-editor';
+import { Fragment, useCallback, useRef } from '@wordpress/element';
/**
* Internal dependencies
@@ -85,17 +77,13 @@ function NavigationMenuItemEdit( {
- { attributes.label }
-
;
+ content = { attributes.label }
;
}
return (
-
+
{
@@ -111,9 +99,7 @@ function NavigationMenuItemEdit( {
label={ __( 'Description' ) }
/>
-
+
{
@@ -128,32 +114,30 @@ function NavigationMenuItemEdit( {
setAttributes( { nofollow } );
} }
label={ __( 'Add nofollow to menu item' ) }
- help={ (
+ help={
- { __( 'Don\'t let search engines follow this link.' ) }
+ { __( "Don't let search engines follow this link." ) }
- { __( 'What\'s this?' ) }
+ { __( "What's this?" ) }
- ) }
+ }
/>
-
{ content }
- { ( isSelected || isParentOfSelectedBlock ) &&
-
);
diff --git a/packages/block-library/src/navigation-menu-item/index.js b/packages/block-library/src/navigation-menu-item/index.js
index b61f3699e12b5c..7546368099b4e2 100644
--- a/packages/block-library/src/navigation-menu-item/index.js
+++ b/packages/block-library/src/navigation-menu-item/index.js
@@ -27,4 +27,3 @@ export const settings = {
edit,
save,
};
-
diff --git a/packages/block-library/src/navigation-menu-item/menu-item-actions.js b/packages/block-library/src/navigation-menu-item/menu-item-actions.js
index 6e39036bab408a..9d2c66376870e0 100644
--- a/packages/block-library/src/navigation-menu-item/menu-item-actions.js
+++ b/packages/block-library/src/navigation-menu-item/menu-item-actions.js
@@ -1,10 +1,7 @@
/**
* WordPress dependencies
*/
-import {
- MenuItem,
- NavigableMenu,
-} from '@wordpress/components';
+import { MenuItem, NavigableMenu } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { withDispatch } from '@wordpress/data';
import { compose } from '@wordpress/compose';
@@ -20,52 +17,26 @@ function MenuItemActions( {
} ) {
return (
-
- { destination }
-
-
+ { destination }
+
{ __( 'Edit label text' ) }
-
+
{ __( 'Move to start' ) }
-
+
{ __( 'Move left' ) }
-
+
{ __( 'Move right' ) }
-
+
{ __( 'Move to end' ) }
-
- { __( 'Nest underneath…' ) }
-
+ { __( 'Nest underneath…' ) }
-
+
{ __( 'Remove from menu' ) }
@@ -74,17 +45,11 @@ function MenuItemActions( {
export default compose( [
withDispatch( ( dispatch, { clientId }, { select } ) => {
- const {
- getBlockOrder,
- getBlockRootClientId,
- } = select( 'core/block-editor' );
+ const { getBlockOrder, getBlockRootClientId } = select( 'core/block-editor' );
const parentID = getBlockRootClientId( clientId );
- const {
- moveBlocksDown,
- moveBlocksUp,
- moveBlockToPosition,
- removeBlocks,
- } = dispatch( 'core/block-editor' );
+ const { moveBlocksDown, moveBlocksUp, moveBlockToPosition, removeBlocks } = dispatch(
+ 'core/block-editor'
+ );
return {
moveToStart() {
moveBlockToPosition( clientId, parentID, parentID, 0 );
@@ -96,12 +61,7 @@ export default compose( [
moveBlocksUp( clientId, parentID );
},
moveToEnd() {
- moveBlockToPosition(
- clientId,
- parentID,
- parentID,
- getBlockOrder( parentID ).length - 1
- );
+ moveBlockToPosition( clientId, parentID, parentID, getBlockOrder( parentID ).length - 1 );
},
remove() {
removeBlocks( clientId );
diff --git a/packages/block-library/src/navigation-menu-item/save.js b/packages/block-library/src/navigation-menu-item/save.js
index 1a0549243fae84..17571d8f30d2de 100644
--- a/packages/block-library/src/navigation-menu-item/save.js
+++ b/packages/block-library/src/navigation-menu-item/save.js
@@ -1,12 +1,8 @@
/**
* WordPress dependencies
*/
-import {
- InnerBlocks,
-} from '@wordpress/block-editor';
+import { InnerBlocks } from '@wordpress/block-editor';
export default function save() {
- return (
-
-
- { navigatorToolbarButton }
-
+ { navigatorToolbarButton }
{ navigatorModal }
-
+
setAttributes( { automaticallyAdd } ) }
@@ -133,13 +114,13 @@ function NavigationMenu( {
{ isRequesting &&
);
@@ -157,7 +138,11 @@ export default compose( [
};
return {
pages: getEntityRecords( 'postType', 'page', filterDefaultPages ),
- isRequesting: isResolving( 'core', 'getEntityRecords', [ 'postType', 'page', filterDefaultPages ] ),
+ isRequesting: isResolving( 'core', 'getEntityRecords', [
+ 'postType',
+ 'page',
+ filterDefaultPages,
+ ] ),
};
} ),
] )( NavigationMenu );
diff --git a/packages/block-library/src/navigation-menu/index.js b/packages/block-library/src/navigation-menu/index.js
index 00ae521ecba522..0b9653dd1e1011 100644
--- a/packages/block-library/src/navigation-menu/index.js
+++ b/packages/block-library/src/navigation-menu/index.js
@@ -30,5 +30,4 @@ export const settings = {
edit,
save,
-
};
diff --git a/packages/block-library/src/navigation-menu/save.js b/packages/block-library/src/navigation-menu/save.js
index 873432fe659547..17571d8f30d2de 100644
--- a/packages/block-library/src/navigation-menu/save.js
+++ b/packages/block-library/src/navigation-menu/save.js
@@ -4,7 +4,5 @@
import { InnerBlocks } from '@wordpress/block-editor';
export default function save() {
- return (
-
-
+
);
diff --git a/packages/block-library/src/nextpage/save.js b/packages/block-library/src/nextpage/save.js
index f86dd0dc6b4be4..0692aecbf052f0 100644
--- a/packages/block-library/src/nextpage/save.js
+++ b/packages/block-library/src/nextpage/save.js
@@ -4,9 +4,5 @@
import { RawHTML } from '@wordpress/element';
export default function save() {
- return (
-
- { '' }
-
- );
+ return { '' } ;
}
diff --git a/packages/block-library/src/paragraph/deprecated.js b/packages/block-library/src/paragraph/deprecated.js
index d7871b8854ca3a..07967ed2c2f1a7 100644
--- a/packages/block-library/src/paragraph/deprecated.js
+++ b/packages/block-library/src/paragraph/deprecated.js
@@ -7,14 +7,8 @@ import { isFinite, omit } from 'lodash';
/**
* WordPress dependencies
*/
-import {
- RawHTML,
-} from '@wordpress/element';
-import {
- getColorClassName,
- getFontSizeClass,
- RichText,
-} from '@wordpress/block-editor';
+import { RawHTML } from '@wordpress/element';
+import { getColorClassName, getFontSizeClass, RichText } from '@wordpress/block-editor';
const supports = {
className: false,
@@ -164,12 +158,17 @@ const deprecated = [
},
{
supports,
- attributes: omit( {
- ...blockAttributes,
- fontSize: {
- type: 'number',
+ attributes: omit(
+ {
+ ...blockAttributes,
+ fontSize: {
+ type: 'number',
+ },
},
- }, 'customFontSize', 'customTextColor', 'customBackgroundColor' ),
+ 'customFontSize',
+ 'customTextColor',
+ 'customBackgroundColor'
+ ),
save( { attributes } ) {
const { width, align, content, dropCap, backgroundColor, textColor, fontSize } = attributes;
const className = classnames( {
@@ -184,15 +183,28 @@ const deprecated = [
textAlign: align,
};
- return { content }
;
+ return (
+
+ { content }
+
+ );
},
migrate( attributes ) {
- return omit( {
- ...attributes,
- customFontSize: isFinite( attributes.fontSize ) ? attributes.fontSize : undefined,
- customTextColor: attributes.textColor && '#' === attributes.textColor[ 0 ] ? attributes.textColor : undefined,
- customBackgroundColor: attributes.backgroundColor && '#' === attributes.backgroundColor[ 0 ] ? attributes.backgroundColor : undefined,
- }, [ 'fontSize', 'textColor', 'backgroundColor' ] );
+ return omit(
+ {
+ ...attributes,
+ customFontSize: isFinite( attributes.fontSize ) ? attributes.fontSize : undefined,
+ customTextColor:
+ attributes.textColor && '#' === attributes.textColor[ 0 ]
+ ? attributes.textColor
+ : undefined,
+ customBackgroundColor:
+ attributes.backgroundColor && '#' === attributes.backgroundColor[ 0 ]
+ ? attributes.backgroundColor
+ : undefined,
+ },
+ [ 'fontSize', 'textColor', 'backgroundColor' ]
+ );
},
},
{
diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js
index 0d41efd5c26836..01180648df09ca 100644
--- a/packages/block-library/src/paragraph/edit.js
+++ b/packages/block-library/src/paragraph/edit.js
@@ -8,12 +8,7 @@ import classnames from 'classnames';
*/
import { __, _x } from '@wordpress/i18n';
import { Component } from '@wordpress/element';
-import {
- PanelBody,
- ToggleControl,
- Toolbar,
- withFallbackStyles,
-} from '@wordpress/components';
+import { PanelBody, ToggleControl, Toolbar, withFallbackStyles } from '@wordpress/components';
import {
withColors,
AlignmentToolbar,
@@ -39,9 +34,13 @@ const applyFallbackStyles = withFallbackStyles( ( node, ownProps ) => {
//verify if editableNode is available, before using getComputedStyle.
const computedStyles = editableNode ? getComputedStyle( editableNode ) : null;
return {
- fallbackBackgroundColor: backgroundColor || ! computedStyles ? undefined : computedStyles.backgroundColor,
+ fallbackBackgroundColor:
+ backgroundColor || ! computedStyles ? undefined : computedStyles.backgroundColor,
fallbackTextColor: textColor || ! computedStyles ? undefined : computedStyles.color,
- fallbackFontSize: fontSize || customFontSize || ! computedStyles ? undefined : parseInt( computedStyles.fontSize ) || undefined,
+ fallbackFontSize:
+ fontSize || customFontSize || ! computedStyles
+ ? undefined
+ : parseInt( computedStyles.fontSize ) || undefined,
};
} );
@@ -58,7 +57,9 @@ class ParagraphBlock extends Component {
}
getDropCapHelp( checked ) {
- return checked ? __( 'Showing large initial letter.' ) : __( 'Toggle to show a large initial letter.' );
+ return checked
+ ? __( 'Showing large initial letter.' )
+ : __( 'Toggle to show a large initial letter.' );
}
render() {
@@ -80,13 +81,7 @@ class ParagraphBlock extends Component {
isRTL,
} = this.props;
- const {
- align,
- content,
- dropCap,
- placeholder,
- direction,
- } = attributes;
+ const { align, content, dropCap, placeholder, direction } = attributes;
return (
<>
@@ -193,7 +188,11 @@ class ParagraphBlock extends Component {
onMerge={ mergeBlocks }
onReplace={ onReplace }
onRemove={ onReplace ? () => onReplace( [] ) : undefined }
- aria-label={ content ? __( 'Paragraph block' ) : __( 'Empty block; start writing or type forward slash to choose a block' ) }
+ aria-label={
+ content
+ ? __( 'Paragraph block' )
+ : __( 'Empty block; start writing or type forward slash to choose a block' )
+ }
placeholder={ placeholder || __( 'Start writing or type / to choose a block' ) }
__unstableEmbedURLOnPaste
/>
diff --git a/packages/block-library/src/paragraph/edit.native.js b/packages/block-library/src/paragraph/edit.native.js
index 6dbcaf8a1459dd..75da528c478df3 100644
--- a/packages/block-library/src/paragraph/edit.native.js
+++ b/packages/block-library/src/paragraph/edit.native.js
@@ -25,31 +25,25 @@ class ParagraphEdit extends Component {
onReplace( blocks ) {
const { attributes, onReplace } = this.props;
- onReplace( blocks.map( ( block, index ) => (
- index === 0 && block.name === name ?
- { ...block,
- attributes: {
- ...attributes,
- ...block.attributes,
- },
- } :
- block
- ) ) );
+ onReplace(
+ blocks.map( ( block, index ) =>
+ index === 0 && block.name === name
+ ? {
+ ...block,
+ attributes: {
+ ...attributes,
+ ...block.attributes,
+ },
+ }
+ : block
+ )
+ );
}
render() {
- const {
- attributes,
- setAttributes,
- mergeBlocks,
- onReplace,
- style,
- } = this.props;
+ const { attributes, setAttributes, mergeBlocks, onReplace, style } = this.props;
- const {
- placeholder,
- content,
- } = attributes;
+ const { placeholder, content } = attributes;
return (
diff --git a/packages/block-library/src/paragraph/icon.js b/packages/block-library/src/paragraph/icon.js
index d8f6a46df59bc6..45f61398578332 100644
--- a/packages/block-library/src/paragraph/icon.js
+++ b/packages/block-library/src/paragraph/icon.js
@@ -4,5 +4,7 @@
import { Path, SVG } from '@wordpress/components';
export default (
-
+
);
diff --git a/packages/block-library/src/paragraph/index.js b/packages/block-library/src/paragraph/index.js
index 63ff90b908fa08..d28120645c6c4f 100644
--- a/packages/block-library/src/paragraph/index.js
+++ b/packages/block-library/src/paragraph/index.js
@@ -24,7 +24,9 @@ export const settings = {
keywords: [ __( 'text' ) ],
example: {
attributes: {
- content: __( 'In a village of La Mancha, the name of which I have no desire to call to mind, there lived not long since one of those gentlemen that keep a lance in the lance-rack, an old buckler, a lean hack, and a greyhound for coursing.' ),
+ content: __(
+ 'In a village of La Mancha, the name of which I have no desire to call to mind, there lived not long since one of those gentlemen that keep a lance in the lance-rack, an old buckler, a lean hack, and a greyhound for coursing.'
+ ),
customFontSize: 28,
dropCap: true,
},
diff --git a/packages/block-library/src/paragraph/save.js b/packages/block-library/src/paragraph/save.js
index b2c1f47a4f32a2..c4e954261ebc6b 100644
--- a/packages/block-library/src/paragraph/save.js
+++ b/packages/block-library/src/paragraph/save.js
@@ -6,11 +6,7 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
-import {
- getColorClassName,
- getFontSizeClass,
- RichText,
-} from '@wordpress/block-editor';
+import { getColorClassName, getFontSizeClass, RichText } from '@wordpress/block-editor';
export default function save( { attributes } ) {
const {
diff --git a/packages/block-library/src/preformatted/icon.js b/packages/block-library/src/preformatted/icon.js
index 2ece9106140a89..8cb81e657e176d 100644
--- a/packages/block-library/src/preformatted/icon.js
+++ b/packages/block-library/src/preformatted/icon.js
@@ -4,5 +4,12 @@
import { Path, Rect, SVG } from '@wordpress/components';
export default (
-
+
);
diff --git a/packages/block-library/src/preformatted/index.js b/packages/block-library/src/preformatted/index.js
index 8a0bed67727347..fba6192331d32d 100644
--- a/packages/block-library/src/preformatted/index.js
+++ b/packages/block-library/src/preformatted/index.js
@@ -22,9 +22,14 @@ export const settings = {
icon,
example: {
attributes: {
- content: __( 'EXT. XANADU - FAINT DAWN - 1940 (MINIATURE)' ) + '\n' +
- __( 'Window, very small in the distance, illuminated.' ) + '\n' +
- __( 'All around this is an almost totally black screen. Now, as the camera moves slowly towards the window which is almost a postage stamp in the frame, other forms appear;' ),
+ content:
+ __( 'EXT. XANADU - FAINT DAWN - 1940 (MINIATURE)' ) +
+ '\n' +
+ __( 'Window, very small in the distance, illuminated.' ) +
+ '\n' +
+ __(
+ 'All around this is an almost totally black screen. Now, as the camera moves slowly towards the window which is almost a postage stamp in the frame, other forms appear;'
+ ),
},
},
transforms,
diff --git a/packages/block-library/src/preformatted/transforms.js b/packages/block-library/src/preformatted/transforms.js
index f7d736ef5770a7..df6121a1084479 100644
--- a/packages/block-library/src/preformatted/transforms.js
+++ b/packages/block-library/src/preformatted/transforms.js
@@ -15,13 +15,9 @@ const transforms = {
},
{
type: 'raw',
- isMatch: ( node ) => (
+ isMatch: ( node ) =>
node.nodeName === 'PRE' &&
- ! (
- node.children.length === 1 &&
- node.firstChild.nodeName === 'CODE'
- )
- ),
+ ! ( node.children.length === 1 && node.firstChild.nodeName === 'CODE' ),
schema: {
pre: {
children: getPhrasingContentSchema(),
@@ -33,8 +29,7 @@ const transforms = {
{
type: 'block',
blocks: [ 'core/paragraph' ],
- transform: ( attributes ) =>
- createBlock( 'core/paragraph', attributes ),
+ transform: ( attributes ) => createBlock( 'core/paragraph', attributes ),
},
],
};
diff --git a/packages/block-library/src/pullquote/deprecated.js b/packages/block-library/src/pullquote/deprecated.js
index dc323edf32ca26..f8c8ecc30b4b36 100644
--- a/packages/block-library/src/pullquote/deprecated.js
+++ b/packages/block-library/src/pullquote/deprecated.js
@@ -12,9 +12,7 @@ import {
getColorObjectByAttributeValues,
RichText,
} from '@wordpress/block-editor';
-import {
- select,
-} from '@wordpress/data';
+import { select } from '@wordpress/data';
/**
* Internal dependencies
@@ -52,7 +50,15 @@ const deprecated = [
{
attributes: blockAttributes,
save( { attributes } ) {
- const { mainColor, customMainColor, textColor, customTextColor, value, citation, className } = attributes;
+ const {
+ mainColor,
+ customMainColor,
+ textColor,
+ customTextColor,
+ value,
+ citation,
+ className,
+ } = attributes;
const isSolidColorStyle = includes( className, SOLID_COLOR_CLASS );
let figureClass, figureStyles;
@@ -80,15 +86,20 @@ const deprecated = [
}
const blockquoteTextColorClass = getColorClassName( 'color', textColor );
- const blockquoteClasses = textColor || customTextColor ? classnames( 'has-text-color', {
- [ blockquoteTextColorClass ]: blockquoteTextColorClass,
- } ) : undefined;
+ const blockquoteClasses =
+ textColor || customTextColor
+ ? classnames( 'has-text-color', {
+ [ blockquoteTextColorClass ]: blockquoteTextColorClass,
+ } )
+ : undefined;
const blockquoteStyle = blockquoteTextColorClass ? undefined : { color: customTextColor };
return (
-
+
);
@@ -103,11 +114,14 @@ const deprecated = [
return (
);
},
- }, {
+ },
+ {
attributes: {
...blockAttributes,
citation: {
@@ -127,7 +141,9 @@ const deprecated = [
return (
);
},
diff --git a/packages/block-library/src/pullquote/edit.js b/packages/block-library/src/pullquote/edit.js
index 010ac8f5078dbd..dd611d9654207e 100644
--- a/packages/block-library/src/pullquote/edit.js
+++ b/packages/block-library/src/pullquote/edit.js
@@ -51,21 +51,14 @@ class PullQuoteEdit extends Component {
}
render() {
- const {
- attributes,
- mainColor,
- textColor,
- setAttributes,
- isSelected,
- className,
- } = this.props;
+ const { attributes, mainColor, textColor, setAttributes, isSelected, className } = this.props;
const { value, citation } = attributes;
const isSolidColorStyle = includes( className, SOLID_COLOR_CLASS );
- const figureStyles = isSolidColorStyle ?
- { backgroundColor: mainColor.color } :
- { borderColor: mainColor.color };
+ const figureStyles = isSolidColorStyle
+ ? { backgroundColor: mainColor.color }
+ : { borderColor: mainColor.color };
const figureClasses = classnames( className, {
'has-background': isSolidColorStyle && mainColor.color,
@@ -76,10 +69,8 @@ class PullQuoteEdit extends Component {
color: textColor.color,
};
- const blockquoteClasses = textColor.color && classnames(
- 'has-text-color',
- { [ textColor.class ]: textColor.class }
- );
+ const blockquoteClasses =
+ textColor.color && classnames( 'has-text-color', { [ textColor.class ]: textColor.class } );
return (
<>
@@ -88,8 +79,8 @@ class PullQuoteEdit extends Component {
setAttributes( {
+ onChange={ ( nextValue ) =>
+ setAttributes( {
value: nextValue,
} )
}
@@ -105,8 +96,8 @@ class PullQuoteEdit extends Component {
// translators: placeholder text used for the citation
__( 'Write citation…' )
}
- onChange={
- ( nextCitation ) => setAttributes( {
+ onChange={ ( nextCitation ) =>
+ setAttributes( {
citation: nextCitation,
} )
}
@@ -147,6 +138,4 @@ class PullQuoteEdit extends Component {
}
}
-export default withColors( { mainColor: 'background-color', textColor: 'color' } )(
- PullQuoteEdit
-);
+export default withColors( { mainColor: 'background-color', textColor: 'color' } )( PullQuoteEdit );
diff --git a/packages/block-library/src/pullquote/icon.js b/packages/block-library/src/pullquote/icon.js
index f8200535b79612..af01763b7e421f 100644
--- a/packages/block-library/src/pullquote/icon.js
+++ b/packages/block-library/src/pullquote/icon.js
@@ -4,5 +4,10 @@
import { Path, Polygon, SVG } from '@wordpress/components';
export default (
-
+
);
diff --git a/packages/block-library/src/pullquote/index.js b/packages/block-library/src/pullquote/index.js
index c3dfcdeed9b950..fbd207eb720dc3 100644
--- a/packages/block-library/src/pullquote/index.js
+++ b/packages/block-library/src/pullquote/index.js
@@ -23,7 +23,8 @@ export const settings = {
icon,
example: {
attributes: {
- value: '' + __( 'One of the hardest things to do in technology is disrupt yourself.' ) + '
',
+ value:
+ '' + __( 'One of the hardest things to do in technology is disrupt yourself.' ) + '
',
citation: 'Matt Mullenweg',
},
},
diff --git a/packages/block-library/src/pullquote/save.js b/packages/block-library/src/pullquote/save.js
index bb07a42d681466..26dab68e43ee01 100644
--- a/packages/block-library/src/pullquote/save.js
+++ b/packages/block-library/src/pullquote/save.js
@@ -12,9 +12,7 @@ import {
RichText,
getColorObjectByAttributeValues,
} from '@wordpress/block-editor';
-import {
- select,
-} from '@wordpress/data';
+import { select } from '@wordpress/data';
/**
* Internal dependencies
@@ -41,20 +39,20 @@ export default function save( { attributes } ) {
const backgroundClass = getColorClassName( 'background-color', mainColor );
figureClasses = classnames( {
- 'has-background': ( backgroundClass || customMainColor ),
+ 'has-background': backgroundClass || customMainColor,
[ backgroundClass ]: backgroundClass,
} );
figureStyles = {
backgroundColor: backgroundClass ? undefined : customMainColor,
};
- // Is normal style and a custom color is being used ( we can set a style directly with its value)
+ // Is normal style and a custom color is being used ( we can set a style directly with its value)
} else if ( customMainColor ) {
figureStyles = {
borderColor: customMainColor,
};
- // If normal style and a named color are being used, we need to retrieve the color value to set the style,
- // as there is no expectation that themes create classes that set border colors.
+ // If normal style and a named color are being used, we need to retrieve the color value to set the style,
+ // as there is no expectation that themes create classes that set border colors.
} else if ( mainColor ) {
const colors = get( select( 'core/block-editor' ).getSettings(), [ 'colors' ], [] );
const colorObject = getColorObjectByAttributeValues( colors, mainColor );
@@ -64,15 +62,17 @@ export default function save( { attributes } ) {
}
const blockquoteTextColorClass = getColorClassName( 'color', textColor );
- const blockquoteClasses = ( textColor || customTextColor ) && classnames( 'has-text-color', {
- [ blockquoteTextColorClass ]: blockquoteTextColorClass,
- } );
+ const blockquoteClasses =
+ ( textColor || customTextColor ) &&
+ classnames( 'has-text-color', {
+ [ blockquoteTextColorClass ]: blockquoteTextColorClass,
+ } );
const blockquoteStyles = blockquoteTextColorClass ? undefined : { color: customTextColor };
return (
-
+
diff --git a/packages/block-library/src/quote/deprecated.js b/packages/block-library/src/quote/deprecated.js
index 5b8637138a2ae8..f74236f7f5a263 100644
--- a/packages/block-library/src/quote/deprecated.js
+++ b/packages/block-library/src/quote/deprecated.js
@@ -36,7 +36,9 @@ const deprecated = [
return (
);
},
@@ -54,7 +56,9 @@ const deprecated = [
if ( attributes.style === 2 ) {
return {
...omit( attributes, [ 'style' ] ),
- className: attributes.className ? attributes.className + ' is-style-large' : 'is-style-large',
+ className: attributes.className
+ ? attributes.className + ' is-style-large'
+ : 'is-style-large',
};
}
@@ -70,7 +74,9 @@ const deprecated = [
style={ { textAlign: align ? align : null } }
>
);
},
@@ -99,7 +105,9 @@ const deprecated = [
style={ { textAlign: align ? align : null } }
>
setAttributes( {
+ onChange={ ( nextCitation ) =>
+ setAttributes( {
citation: nextCitation,
} )
}
diff --git a/packages/block-library/src/quote/icon.js b/packages/block-library/src/quote/icon.js
index 22de4ef2da181e..92c727dd0d8b40 100644
--- a/packages/block-library/src/quote/icon.js
+++ b/packages/block-library/src/quote/icon.js
@@ -4,5 +4,8 @@
import { Path, SVG } from '@wordpress/components';
export default (
-
+
);
diff --git a/packages/block-library/src/quote/index.js b/packages/block-library/src/quote/index.js
index e7d733d41e3d1f..f404853541be9a 100644
--- a/packages/block-library/src/quote/index.js
+++ b/packages/block-library/src/quote/index.js
@@ -19,7 +19,9 @@ export { metadata, name };
export const settings = {
title: __( 'Quote' ),
- description: __( 'Give quoted text visual emphasis. "In quoting others, we cite ourselves." — Julio Cortázar' ),
+ description: __(
+ 'Give quoted text visual emphasis. "In quoting others, we cite ourselves." — Julio Cortázar'
+ ),
icon,
keywords: [ __( 'blockquote' ), __( 'cite' ) ],
example: {
diff --git a/packages/block-library/src/quote/transforms.js b/packages/block-library/src/quote/transforms.js
index c05c8b4b50a799..6f364ff96f75ac 100644
--- a/packages/block-library/src/quote/transforms.js
+++ b/packages/block-library/src/quote/transforms.js
@@ -13,9 +13,10 @@ const transforms = {
transform: ( attributes ) => {
return createBlock( 'core/quote', {
value: toHTMLString( {
- value: join( attributes.map( ( { content } ) =>
- create( { html: content } )
- ), '\u2028' ),
+ value: join(
+ attributes.map( ( { content } ) => create( { html: content } ) ),
+ '\u2028'
+ ),
multilineTag: 'p',
} ),
} );
@@ -33,10 +34,11 @@ const transforms = {
{
type: 'block',
blocks: [ 'core/pullquote' ],
- transform: ( { value, citation } ) => createBlock( 'core/quote', {
- value,
- citation,
- } ),
+ transform: ( { value, citation } ) =>
+ createBlock( 'core/quote', {
+ value,
+ citation,
+ } ),
},
{
type: 'prefix',
@@ -58,21 +60,18 @@ const transforms = {
return true;
}
// Child is a cite and no other cite child exists before it.
- if (
- ! hasCitation &&
- child.nodeName === 'CITE'
- ) {
+ if ( ! hasCitation && child.nodeName === 'CITE' ) {
hasCitation = true;
return true;
}
};
} )();
- return node.nodeName === 'BLOCKQUOTE' &&
+ return (
+ node.nodeName === 'BLOCKQUOTE' &&
// The quote block can only handle multiline paragraph
// content with an optional cite child.
- Array.from( node.childNodes ).every(
- isParagraphOrSingleCite
- );
+ Array.from( node.childNodes ).every( isParagraphOrSingleCite )
+ );
},
schema: {
blockquote: {
@@ -96,12 +95,11 @@ const transforms = {
const paragraphs = [];
if ( value && value !== '
' ) {
paragraphs.push(
- ...split( create( { html: value, multilineTag: 'p' } ), '\u2028' )
- .map( ( piece ) =>
- createBlock( 'core/paragraph', {
- content: toHTMLString( { value: piece } ),
- } )
- )
+ ...split( create( { html: value, multilineTag: 'p' } ), '\u2028' ).map( ( piece ) =>
+ createBlock( 'core/paragraph', {
+ content: toHTMLString( { value: piece } ),
+ } )
+ )
);
}
if ( citation && citation !== '
' ) {
diff --git a/packages/block-library/src/rss/edit.js b/packages/block-library/src/rss/edit.js
index 81c6497f352522..a81de16267de46 100644
--- a/packages/block-library/src/rss/edit.js
+++ b/packages/block-library/src/rss/edit.js
@@ -13,10 +13,7 @@ import {
Toolbar,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
-import {
- BlockControls,
- InspectorControls,
-} from '@wordpress/block-editor';
+import { BlockControls, InspectorControls } from '@wordpress/block-editor';
import ServerSideRender from '@wordpress/server-side-render';
const DEFAULT_MIN_ITEMS = 1;
@@ -67,10 +64,7 @@ class RSSEdit extends Component {
if ( this.state.editing ) {
return (
-
+
',
- innerContent: [
- '',
- null,
- '
',
- ],
+ innerContent: [ '', null, '
' ],
},
],
innerHTML: '
',
- innerContent: [
- '',
- null,
- '',
- null,
- '
',
- ],
+ innerContent: [ '', null, '', null, '
' ],
};
const actual = serializeBlockNode( input );
@@ -885,8 +854,8 @@ describe( 'block parser', () => {
const parsed = parse(
`` +
- 'Brisket' +
- ''
+ 'Brisket' +
+ ''
);
expect( parsed ).toHaveLength( 1 );
@@ -921,8 +890,8 @@ describe( 'block parser', () => {
const parsed = parse(
'\nRibs\n' +
- 'Broccoli
' +
- 'Ribs'
+ 'Broccoli
' +
+ 'Ribs'
);
expect( parsed ).toHaveLength( 1 );
@@ -952,8 +921,8 @@ describe( 'block parser', () => {
const parsed = parse(
'\nBananas\n' +
- 'Broccoli
' +
- 'Ribs'
+ 'Broccoli
' +
+ 'Ribs'
);
expect( parsed ).toHaveLength( 1 );
expect( parsed[ 0 ].name ).toBe( 'core/test-block' );
@@ -967,8 +936,8 @@ describe( 'block parser', () => {
const parsed = parse(
'\nBananas\n' +
- 'Broccoli
' +
- 'Ribs'
+ 'Broccoli
' +
+ 'Ribs'
);
expect( parsed ).toHaveLength( 3 );
@@ -987,10 +956,10 @@ describe( 'block parser', () => {
const parsed = parse(
'Cauliflower
' +
- '\nBananas\n' +
- '\nBroccoli
\n' +
- '\nBananas\n' +
- 'Romanesco
'
+ '\nBananas\n' +
+ '\nBroccoli
\n' +
+ '\nBananas\n' +
+ 'Romanesco
'
);
expect( parsed ).toHaveLength( 5 );
@@ -1008,27 +977,23 @@ describe( 'block parser', () => {
it( 'should parse blocks with empty content', () => {
registerBlockType( 'core/test-block', defaultBlockSettings );
- const parsed = parse(
- ''
- );
+ const parsed = parse( '' );
expect( parsed ).toHaveLength( 1 );
- expect( parsed.map( ( { name } ) => name ) ).toEqual( [
- 'core/test-block',
- ] );
+ expect( parsed.map( ( { name } ) => name ) ).toEqual( [ 'core/test-block' ] );
} );
it( 'should parse void blocks', () => {
registerBlockType( 'core/test-block', defaultBlockSettings );
registerBlockType( 'core/void-block', defaultBlockSettings );
const parsed = parse(
- '' +
- ''
+ '' + ''
);
expect( parsed ).toHaveLength( 2 );
expect( parsed.map( ( { name } ) => name ) ).toEqual( [
- 'core/test-block', 'core/void-block',
+ 'core/test-block',
+ 'core/void-block',
] );
} );
@@ -1044,7 +1009,7 @@ describe( 'block parser', () => {
save: ( { attributes } ) => attributes.content,
} );
- const content = '$foo = "My \"escaped\" text.";';
+ const content = '$foo = "My "escaped" text.";';
const block = createBlock( 'core/code', { content } );
const serialized = serialize( block );
const parsed = parse( serialized );
diff --git a/packages/blocks/src/api/test/registration.js b/packages/blocks/src/api/test/registration.js
index b3e558edb0536d..d23ba9cbf6dc7e 100644
--- a/packages/blocks/src/api/test/registration.js
+++ b/packages/blocks/src/api/test/registration.js
@@ -62,31 +62,41 @@ describe( 'blocks', () => {
it( 'should reject blocks without a namespace', () => {
const block = registerBlockType( 'doing-it-wrong' );
- expect( console ).toHaveErroredWith( 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block' );
+ expect( console ).toHaveErroredWith(
+ 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject blocks with too many namespaces', () => {
const block = registerBlockType( 'doing/it/wrong' );
- expect( console ).toHaveErroredWith( 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block' );
+ expect( console ).toHaveErroredWith(
+ 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject blocks with invalid characters', () => {
const block = registerBlockType( 'still/_doing_it_wrong' );
- expect( console ).toHaveErroredWith( 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block' );
+ expect( console ).toHaveErroredWith(
+ 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject blocks with uppercase characters', () => {
const block = registerBlockType( 'Core/Paragraph' );
- expect( console ).toHaveErroredWith( 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block' );
+ expect( console ).toHaveErroredWith(
+ 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject blocks not starting with a letter', () => {
const block = registerBlockType( 'my-plugin/4-fancy-block', defaultBlockSettings );
- expect( console ).toHaveErroredWith( 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block' );
+ expect( console ).toHaveErroredWith(
+ 'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
+ );
expect( block ).toBeUndefined();
} );
@@ -125,7 +135,12 @@ describe( 'blocks', () => {
} );
it( 'should reject blocks with an invalid edit function', () => {
- const blockType = { save: noop, edit: 'not-a-function', category: 'common', title: 'block title' },
+ const blockType = {
+ save: noop,
+ edit: 'not-a-function',
+ category: 'common',
+ title: 'block title',
+ },
block = registerBlockType( 'my-plugin/fancy-block-6', blockType );
expect( console ).toHaveErroredWith( 'The "edit" property must be a valid function.' );
expect( block ).toBeUndefined();
@@ -134,33 +149,46 @@ describe( 'blocks', () => {
it( 'should reject blocks without category', () => {
const blockType = { settingName: 'settingValue', save: noop, title: 'block title' },
block = registerBlockType( 'my-plugin/fancy-block-8', blockType );
- expect( console ).toHaveErroredWith( 'The block "my-plugin/fancy-block-8" must have a category.' );
+ expect( console ).toHaveErroredWith(
+ 'The block "my-plugin/fancy-block-8" must have a category.'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject blocks with non registered category.', () => {
const blockType = { save: noop, category: 'custom-category-slug', title: 'block title' },
block = registerBlockType( 'my-plugin/fancy-block-9', blockType );
- expect( console ).toHaveErroredWith( 'The block "my-plugin/fancy-block-9" must have a registered category.' );
+ expect( console ).toHaveErroredWith(
+ 'The block "my-plugin/fancy-block-9" must have a registered category.'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject blocks without title', () => {
const blockType = { settingName: 'settingValue', save: noop, category: 'common' },
block = registerBlockType( 'my-plugin/fancy-block-9', blockType );
- expect( console ).toHaveErroredWith( 'The block "my-plugin/fancy-block-9" must have a title.' );
+ expect( console ).toHaveErroredWith(
+ 'The block "my-plugin/fancy-block-9" must have a title.'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject blocks with empty titles', () => {
const blockType = { settingName: 'settingValue', save: noop, category: 'common', title: '' },
block = registerBlockType( 'my-plugin/fancy-block-10', blockType );
- expect( console ).toHaveErroredWith( 'The block "my-plugin/fancy-block-10" must have a title.' );
+ expect( console ).toHaveErroredWith(
+ 'The block "my-plugin/fancy-block-10" must have a title.'
+ );
expect( block ).toBeUndefined();
} );
it( 'should reject titles which are not strings', () => {
- const blockType = { settingName: 'settingValue', save: noop, category: 'common', title: 12345 },
+ const blockType = {
+ settingName: 'settingValue',
+ save: noop,
+ category: 'common',
+ title: 12345,
+ },
block = registerBlockType( 'my-plugin/fancy-block-11', blockType );
expect( console ).toHaveErroredWith( 'Block titles must be strings.' );
expect( block ).toBeUndefined();
@@ -191,7 +219,12 @@ describe( 'blocks', () => {
'core/test-block-with-attributes': { attributes },
} );
- const blockType = { settingName: 'settingValue', save: noop, category: 'common', title: 'block title' };
+ const blockType = {
+ settingName: 'settingValue',
+ save: noop,
+ category: 'common',
+ title: 'block title',
+ };
registerBlockType( 'core/test-block-with-attributes', blockType );
expect( getBlockType( 'core/test-block-with-attributes' ) ).toEqual( {
name: 'core/test-block-with-attributes',
@@ -228,10 +261,11 @@ describe( 'blocks', () => {
save: noop,
category: 'common',
title: 'block title',
- icon: (
- ),
+ icon: (
+
+
+ ),
};
registerBlockType( 'core/test-block-icon-normalize-element', blockType );
expect( getBlockType( 'core/test-block-icon-normalize-element' ) ).toEqual( {
@@ -240,10 +274,11 @@ describe( 'blocks', () => {
category: 'common',
title: 'block title',
icon: {
- src: (
- ),
+ src: (
+
+
+ ),
},
attributes: {},
keywords: [],
@@ -273,10 +308,11 @@ describe( 'blocks', () => {
it( 'should normalize the icon containing a function', () => {
const MyTestIcon = () => {
- return
- ;
+ return (
+
+
+ );
};
const blockType = {
save: noop,
@@ -305,10 +341,11 @@ describe( 'blocks', () => {
title: 'block title',
icon: {
background: '#f00',
- src: (
- ),
+ src: (
+
+
+ ),
},
};
registerBlockType( 'core/test-block-icon-normalize-background', blockType );
@@ -321,10 +358,11 @@ describe( 'blocks', () => {
background: '#f00',
foreground: '#191e23',
shadowColor: 'rgba(255, 0, 0, 0.3)',
- src: (
- ),
+ src: (
+
+
+ ),
},
attributes: {},
keywords: [],
@@ -332,7 +370,12 @@ describe( 'blocks', () => {
} );
it( 'should store a copy of block type', () => {
- const blockType = { settingName: 'settingValue', save: noop, category: 'common', title: 'block title' };
+ const blockType = {
+ settingName: 'settingValue',
+ save: noop,
+ category: 'common',
+ title: 'block title',
+ };
registerBlockType( 'core/test-block-with-settings', blockType );
blockType.mutated = true;
expect( getBlockType( 'core/test-block-with-settings' ) ).toEqual( {
@@ -362,7 +405,9 @@ describe( 'blocks', () => {
};
} );
const block = registerBlockType( 'my-plugin/fancy-block-12', defaultBlockSettings );
- expect( console ).toHaveErroredWith( 'The block "my-plugin/fancy-block-12" must have a title.' );
+ expect( console ).toHaveErroredWith(
+ 'The block "my-plugin/fancy-block-12" must have a title.'
+ );
expect( block ).toBeUndefined();
} );
@@ -548,7 +593,12 @@ describe( 'blocks', () => {
} );
it( 'should return all block type elements', () => {
- const blockType = { settingName: 'settingValue', save: noop, category: 'common', title: 'block title' };
+ const blockType = {
+ settingName: 'settingValue',
+ save: noop,
+ category: 'common',
+ title: 'block title',
+ };
registerBlockType( 'core/test-block-with-settings', blockType );
expect( getBlockType( 'core/test-block-with-settings' ) ).toEqual( {
name: 'core/test-block-with-settings',
@@ -572,7 +622,12 @@ describe( 'blocks', () => {
it( 'should return all registered blocks', () => {
registerBlockType( 'core/test-block', defaultBlockSettings );
- const blockType = { settingName: 'settingValue', save: noop, category: 'common', title: 'block title' };
+ const blockType = {
+ settingName: 'settingValue',
+ save: noop,
+ category: 'common',
+ title: 'block title',
+ };
registerBlockType( 'core/test-block-with-settings', blockType );
expect( getBlockTypes() ).toEqual( [
{
diff --git a/packages/blocks/src/api/test/serializer.js b/packages/blocks/src/api/test/serializer.js
index 28281b42ea8c6d..81f046fd7a33ce 100644
--- a/packages/blocks/src/api/test/serializer.js
+++ b/packages/blocks/src/api/test/serializer.js
@@ -60,10 +60,7 @@ describe( 'block serializer', () => {
save: fruitBlockSave,
} );
- const saved = getSaveContent(
- 'core/fruit',
- { fruit: 'Bananas' }
- );
+ const saved = getSaveContent( 'core/fruit', { fruit: 'Bananas' } );
expect( saved ).toBe( 'Bananas
' );
} );
@@ -148,7 +145,9 @@ describe( 'block serializer', () => {
describe( 'serializeAttributes()', () => {
it( 'should not break HTML comments', () => {
- expect( serializeAttributes( { a: '-- and --' } ) ).toBe( '{"a":"\\u002d\\u002d and \\u002d\\u002d"}' );
+ expect( serializeAttributes( { a: '-- and --' } ) ).toBe(
+ '{"a":"\\u002d\\u002d and \\u002d\\u002d"}'
+ );
} );
it( 'should not break standard-non-compliant tools for "<"', () => {
@@ -170,45 +169,27 @@ describe( 'block serializer', () => {
describe( 'getCommentDelimitedContent()', () => {
it( 'should generate empty attributes void', () => {
- const content = getCommentDelimitedContent(
- 'core/test-block',
- {},
- ''
- );
+ const content = getCommentDelimitedContent( 'core/test-block', {}, '' );
expect( content ).toBe( '' );
} );
it( 'should include the namespace for non-core blocks', () => {
- const content = getCommentDelimitedContent(
- 'my-wonderful-namespace/test-block',
- {},
- ''
- );
+ const content = getCommentDelimitedContent( 'my-wonderful-namespace/test-block', {}, '' );
expect( content ).toBe( '' );
} );
it( 'should generate empty attributes non-void', () => {
- const content = getCommentDelimitedContent(
- 'core/test-block',
- {},
- 'Delicious'
- );
+ const content = getCommentDelimitedContent( 'core/test-block', {}, 'Delicious' );
expect( content ).toBe( '\nDelicious\n' );
} );
it( 'should generate non-empty attributes void', () => {
- const content = getCommentDelimitedContent(
- 'core/test-block',
- { fruit: 'Banana' },
- ''
- );
+ const content = getCommentDelimitedContent( 'core/test-block', { fruit: 'Banana' }, '' );
- expect( content ).toBe(
- ''
- );
+ expect( content ).toBe( '' );
} );
it( 'should generate non-empty attributes non-void', () => {
@@ -260,9 +241,9 @@ describe( 'block serializer', () => {
const content = serializeBlock( block, { isInnerBlocks: true } );
expect( content ).toBe(
- '\n' +
- 'Bananas\n' +
- ''
+ '\n' +
+ 'Bananas\n' +
+ ''
);
} );
it( 'serializes the unregistered fallback block without comment delimiters', () => {
@@ -309,11 +290,7 @@ describe( 'block serializer', () => {
throw new Error();
}
- return (
-
- { attributes.content }
-
- );
+ return { attributes.content }
;
},
category: 'common',
title: 'block title',
@@ -326,7 +303,8 @@ describe( 'block serializer', () => {
content: 'Ribs & Chicken',
stuff: 'left & right -- but ',
} );
- const expectedPostContent = '\nRibs & Chicken
\n';
+ const expectedPostContent =
+ '\nRibs & Chicken
\n';
expect( serialize( [ block ] ) ).toEqual( expectedPostContent );
expect( serialize( block ) ).toEqual( expectedPostContent );
@@ -375,7 +353,7 @@ describe( 'block serializer', () => {
title: 'block title',
};
registerBlockType( 'core/chicken', blockType );
- const block = {
+ const block = {
name: 'core/chicken',
attributes: {
content: 'chicken',
diff --git a/packages/blocks/src/api/test/templates.js b/packages/blocks/src/api/test/templates.js
index 12730f75197eb9..0cbd2f707f21f1 100644
--- a/packages/blocks/src/api/test/templates.js
+++ b/packages/blocks/src/api/test/templates.js
@@ -44,11 +44,7 @@ describe( 'templates', () => {
} );
it( 'return true if the template matches the blocks', () => {
- const template = [
- [ 'core/test-block' ],
- [ 'core/test-block-2' ],
- [ 'core/test-block-2' ],
- ];
+ const template = [ [ 'core/test-block' ], [ 'core/test-block-2' ], [ 'core/test-block-2' ] ];
const blockList = [
createBlock( 'core/test-block' ),
createBlock( 'core/test-block-2' ),
@@ -60,9 +56,7 @@ describe( 'templates', () => {
it( 'return true if the template matches the blocks with nested blocks', () => {
const template = [
[ 'core/test-block' ],
- [ 'core/test-block-2', {}, [
- [ 'core/test-block' ],
- ] ],
+ [ 'core/test-block-2', {}, [ [ 'core/test-block' ] ] ],
[ 'core/test-block-2' ],
];
const blockList = [
@@ -74,10 +68,7 @@ describe( 'templates', () => {
} );
it( "return false if the template length doesn't match the blocks length", () => {
- const template = [
- [ 'core/test-block' ],
- [ 'core/test-block-2' ],
- ];
+ const template = [ [ 'core/test-block' ], [ 'core/test-block-2' ] ];
const blockList = [
createBlock( 'core/test-block' ),
createBlock( 'core/test-block-2' ),
@@ -89,9 +80,7 @@ describe( 'templates', () => {
it( "return false if the nested template doesn't match the blocks", () => {
const template = [
[ 'core/test-block' ],
- [ 'core/test-block-2', {}, [
- [ 'core/test-block' ],
- ] ],
+ [ 'core/test-block-2', {}, [ [ 'core/test-block' ] ] ],
[ 'core/test-block-2' ],
];
const blockList = [
@@ -105,11 +94,7 @@ describe( 'templates', () => {
describe( 'synchronizeBlocksWithTemplate', () => {
it( 'should create blocks for each template entry', () => {
- const template = [
- [ 'core/test-block' ],
- [ 'core/test-block-2' ],
- [ 'core/test-block-2' ],
- ];
+ const template = [ [ 'core/test-block' ], [ 'core/test-block-2' ], [ 'core/test-block-2' ] ];
const blockList = [];
expect( synchronizeBlocksWithTemplate( blockList, template ) ).toMatchObject( [
{ name: 'core/test-block' },
@@ -119,25 +104,15 @@ describe( 'templates', () => {
} );
it( 'should create nested blocks', () => {
- const template = [
- [ 'core/test-block', {}, [
- [ 'core/test-block-2' ],
- ] ],
- ];
+ const template = [ [ 'core/test-block', {}, [ [ 'core/test-block-2' ] ] ] ];
const blockList = [];
expect( synchronizeBlocksWithTemplate( blockList, template ) ).toMatchObject( [
- { name: 'core/test-block', innerBlocks: [
- { name: 'core/test-block-2' },
- ] },
+ { name: 'core/test-block', innerBlocks: [ { name: 'core/test-block-2' } ] },
] );
} );
it( 'should append blocks if more blocks in the template', () => {
- const template = [
- [ 'core/test-block' ],
- [ 'core/test-block-2' ],
- [ 'core/test-block-2' ],
- ];
+ const template = [ [ 'core/test-block' ], [ 'core/test-block-2' ], [ 'core/test-block-2' ] ];
const block1 = createBlock( 'core/test-block' );
const block2 = createBlock( 'core/test-block-2' );
@@ -150,11 +125,7 @@ describe( 'templates', () => {
} );
it( 'should replace blocks if not matching blocks are found', () => {
- const template = [
- [ 'core/test-block' ],
- [ 'core/test-block-2' ],
- [ 'core/test-block-2' ],
- ];
+ const template = [ [ 'core/test-block' ], [ 'core/test-block-2' ], [ 'core/test-block-2' ] ];
const block1 = createBlock( 'core/test-block' );
const block2 = createBlock( 'core/test-block' );
@@ -175,16 +146,12 @@ describe( 'templates', () => {
} );
it( 'should remove blocks if extra blocks are found', () => {
- const template = [
- [ 'core/test-block' ],
- ];
+ const template = [ [ 'core/test-block' ] ];
const block1 = createBlock( 'core/test-block' );
const block2 = createBlock( 'core/test-block' );
const blockList = [ block1, block2 ];
- expect( synchronizeBlocksWithTemplate( blockList, template ) ).toEqual( [
- block1,
- ] );
+ expect( synchronizeBlocksWithTemplate( blockList, template ) ).toEqual( [ block1 ] );
} );
} );
} );
diff --git a/packages/blocks/src/api/test/utils.js b/packages/blocks/src/api/test/utils.js
index 25f57337a8636d..ee153ebf0771c9 100644
--- a/packages/blocks/src/api/test/utils.js
+++ b/packages/blocks/src/api/test/utils.js
@@ -7,7 +7,12 @@ import { noop } from 'lodash';
* Internal dependencies
*/
import { createBlock } from '../factory';
-import { getBlockTypes, unregisterBlockType, registerBlockType, setDefaultBlockName } from '../registration';
+import {
+ getBlockTypes,
+ unregisterBlockType,
+ registerBlockType,
+ setDefaultBlockName,
+} from '../registration';
import { isUnmodifiedDefaultBlock } from '../utils';
describe( 'block helpers', () => {
diff --git a/packages/blocks/src/api/test/validation.js b/packages/blocks/src/api/test/validation.js
index fcfb61bff6ae2c..2103812381cd6b 100644
--- a/packages/blocks/src/api/test/validation.js
+++ b/packages/blocks/src/api/test/validation.js
@@ -140,7 +140,7 @@ describe( 'validation', () => {
it( 'should return false if not equal with collapsed whitespace', () => {
const isEqual = isEquivalentTextTokens(
{ chars: ' a \t b \n c' },
- { chars: 'a \n c \t b ' },
+ { chars: 'a \n c \t b ' }
);
expect( console ).toHaveWarned();
@@ -150,7 +150,7 @@ describe( 'validation', () => {
it( 'should return true if equal with collapsed whitespace', () => {
const isEqual = isEquivalentTextTokens(
{ chars: ' a \t b \n c' },
- { chars: 'a \n b \t c ' },
+ { chars: 'a \n b \t c ' }
);
expect( isEqual ).toBe( true );
@@ -159,9 +159,7 @@ describe( 'validation', () => {
describe( 'getNormalizedStyleValue()', () => {
it( 'omits whitespace and quotes from url value', () => {
- const normalizedValue = getNormalizedStyleValue(
- 'url( "https://wordpress.org/img.png" )'
- );
+ const normalizedValue = getNormalizedStyleValue( 'url( "https://wordpress.org/img.png" )' );
expect( normalizedValue ).toBe( 'url(https://wordpress.org/img.png)' );
} );
@@ -183,28 +181,19 @@ describe( 'validation', () => {
describe( 'isEqualAttributesOfName', () => {
describe( '.class()', () => {
it( 'ignores ordering', () => {
- const isEqual = isEqualAttributesOfName.class(
- 'a b c',
- 'b a c',
- );
+ const isEqual = isEqualAttributesOfName.class( 'a b c', 'b a c' );
expect( isEqual ).toBe( true );
} );
it( 'ignores whitespace', () => {
- const isEqual = isEqualAttributesOfName.class(
- 'a b c',
- 'b a c',
- );
+ const isEqual = isEqualAttributesOfName.class( 'a b c', 'b a c' );
expect( isEqual ).toBe( true );
} );
it( 'returns false if not equal', () => {
- const isEqual = isEqualAttributesOfName.class(
- 'a b c',
- 'b a c d',
- );
+ const isEqual = isEqualAttributesOfName.class( 'a b c', 'b a c d' );
expect( isEqual ).toBe( false );
} );
@@ -232,10 +221,7 @@ describe( 'validation', () => {
describe( 'boolean attributes', () => {
it( 'returns true if both present', () => {
- const isEqual = isEqualAttributesOfName.controls(
- 'true',
- ''
- );
+ const isEqual = isEqualAttributesOfName.controls( 'true', '' );
expect( isEqual ).toBe( true );
} );
@@ -245,9 +231,7 @@ describe( 'validation', () => {
describe( 'isEqualTagAttributePairs()', () => {
it( 'returns false if not equal pairs', () => {
const isEqual = isEqualTagAttributePairs(
- [
- [ 'class', 'b a c' ],
- ],
+ [ [ 'class', 'b a c' ] ],
[
[ 'class', 'c a b' ],
[ 'style', 'background-image: url( "https://wordpress.org/img.png" ); color: red;' ],
@@ -279,10 +263,7 @@ describe( 'validation', () => {
describe( 'isEqualTokensOfType', () => {
describe( '.StartTag()', () => {
it( 'returns false if tag name not the same', () => {
- const isEqual = isEqualTokensOfType.StartTag(
- { tagName: 'p' },
- { tagName: 'section' }
- );
+ const isEqual = isEqualTokensOfType.StartTag( { tagName: 'p' }, { tagName: 'section' } );
expect( console ).toHaveWarned();
expect( isEqual ).toBe( false );
@@ -292,9 +273,7 @@ describe( 'validation', () => {
const isEqual = isEqualTokensOfType.StartTag(
{
tagName: 'p',
- attributes: [
- [ 'class', 'b a c' ],
- ],
+ attributes: [ [ 'class', 'b a c' ] ],
},
{
tagName: 'p',
@@ -334,10 +313,7 @@ describe( 'validation', () => {
describe( 'getNextNonWhitespaceToken()', () => {
it( 'returns the next non-whitespace token, mutating array', () => {
- const tokens = [
- { type: 'Chars', chars: ' \n\t' },
- { type: 'StartTag', tagName: 'p' },
- ];
+ const tokens = [ { type: 'Chars', chars: ' \n\t' }, { type: 'StartTag', tagName: 'p' } ];
const token = getNextNonWhitespaceToken( tokens );
@@ -346,9 +322,7 @@ describe( 'validation', () => {
} );
it( 'returns undefined if token options exhausted', () => {
- const tokens = [
- { type: 'Chars', chars: ' \n\t' },
- ];
+ const tokens = [ { type: 'Chars', chars: ' \n\t' } ];
const token = getNextNonWhitespaceToken( tokens );
@@ -361,7 +335,7 @@ describe( 'validation', () => {
it( 'should return true if self-closed token is closed by an end token', () => {
const isClosed = isClosedByToken(
{ type: 'StartTag', tagName: 'div', selfClosing: true },
- { type: 'EndTag', tagName: 'div' },
+ { type: 'EndTag', tagName: 'div' }
);
expect( isClosed ).toBe( true );
@@ -370,7 +344,7 @@ describe( 'validation', () => {
it( 'should return false if open token is not closed by an end token', () => {
const isClosed = isClosedByToken(
{ type: 'StartTag', tagName: 'div', selfClosing: false },
- { type: 'EndTag', tagName: 'div' },
+ { type: 'EndTag', tagName: 'div' }
);
expect( isClosed ).toBe( false );
@@ -379,7 +353,7 @@ describe( 'validation', () => {
it( 'should return false if self-closed token has a different name to the end token', () => {
const isClosed = isClosedByToken(
{ type: 'StartTag', tagName: 'div', selfClosing: true },
- { type: 'EndTag', tagName: 'span' },
+ { type: 'EndTag', tagName: 'span' }
);
expect( isClosed ).toBe( false );
@@ -388,7 +362,7 @@ describe( 'validation', () => {
it( 'should return false if self-closed token is not closed by a start token', () => {
const isClosed = isClosedByToken(
{ type: 'StartTag', tagName: 'div', selfClosing: true },
- { type: 'StartTag', tagName: 'div' },
+ { type: 'StartTag', tagName: 'div' }
);
expect( isClosed ).toBe( false );
@@ -397,7 +371,7 @@ describe( 'validation', () => {
it( 'should return false if self-closed token is not closed by an undefined token', () => {
const isClosed = isClosedByToken(
{ type: 'StartTag', tagName: 'div', selfClosing: true },
- undefined,
+ undefined
);
expect( isClosed ).toBe( false );
@@ -439,87 +413,60 @@ describe( 'validation', () => {
} );
it( 'should return false when more tokens in first', () => {
- const isEquivalent = isEquivalentHTML(
- 'Hello
',
- 'Hello'
- );
+ const isEquivalent = isEquivalentHTML( '
Hello
', '
Hello' );
expect( console ).toHaveWarned();
expect( isEquivalent ).toBe( false );
} );
it( 'should return false when more tokens in second', () => {
- const isEquivalent = isEquivalentHTML(
- '
Hello',
- '
Hello
'
- );
+ const isEquivalent = isEquivalentHTML( '
Hello', '
Hello
' );
expect( console ).toHaveWarned();
expect( isEquivalent ).toBe( false );
} );
it( 'should return true when first has trailing whitespace', () => {
- const isEquivalent = isEquivalentHTML(
- '
Hello
',
- '
Hello
'
- );
+ const isEquivalent = isEquivalentHTML( '
Hello
', '
Hello
' );
expect( isEquivalent ).toBe( true );
} );
it( 'should return true when second has trailing whitespace', () => {
- const isEquivalent = isEquivalentHTML(
- '
Hello
',
- '
Hello
'
- );
+ const isEquivalent = isEquivalentHTML( '
Hello
', '
Hello
' );
expect( isEquivalent ).toBe( true );
} );
it( 'should return true when difference of empty non-boolean, non-enumerated attribute', () => {
- const isEquivalent = isEquivalentHTML(
- '
Hello
',
- '
Hello
'
- );
+ const isEquivalent = isEquivalentHTML( '
Hello
', '
Hello
' );
expect( isEquivalent ).toBe( true );
} );
it( 'should return false when difference of empty boolean attribute', () => {
- const isEquivalent = isEquivalentHTML(
- '
',
- '
'
- );
+ const isEquivalent = isEquivalentHTML( '
', '
' );
expect( console ).toHaveWarned();
expect( isEquivalent ).toBe( false );
} );
it( 'should return false when difference of empty enumerated attribute', () => {
- const isEquivalent = isEquivalentHTML(
- '
',
- '
'
- );
+ const isEquivalent = isEquivalentHTML( '
', '
' );
expect( console ).toHaveWarned();
expect( isEquivalent ).toBe( false );
} );
it( 'should return false when difference of data- attribute', () => {
- const isEquivalent = isEquivalentHTML(
- '
',
- '
'
- );
+ const isEquivalent = isEquivalentHTML( '
', '
' );
expect( console ).toHaveWarned();
expect( isEquivalent ).toBe( false );
} );
it( 'should return false when difference of boolean attribute', () => {
- const isEquivalent = isEquivalentHTML(
- '
',
- '
'
- );
+ const isEquivalent = isEquivalentHTML( '
', '
' );
expect( console ).toHaveWarned();
expect( isEquivalent ).toBe( false );
@@ -544,10 +491,7 @@ describe( 'validation', () => {
} );
it( 'should return true when comparing empty strings', () => {
- const isEquivalent = isEquivalentHTML(
- '',
- '',
- );
+ const isEquivalent = isEquivalentHTML( '', '' );
expect( isEquivalent ).toBe( true );
} );
@@ -555,7 +499,7 @@ describe( 'validation', () => {
it( 'should return false if supplied malformed HTML', () => {
const isEquivalent = isEquivalentHTML(
'
fsdfsdfsdfdsfsdfsdd
',
- '
fsdfsdfsdfdsfsdfsdd
',
+ '
fsdfsdfsdfdsfsdfsdd
'
);
expect( console ).toHaveWarned();
@@ -565,7 +509,7 @@ describe( 'validation', () => {
it( 'should return false if supplied two sets of malformed HTML', () => {
const isEquivalent = isEquivalentHTML(
'
',
- '
fsdfsdfsdfdsfsdfsdd
',
+ '
fsdfsdfsdfdsfsdfsdd
'
);
expect( console ).toHaveWarned();
@@ -609,11 +553,7 @@ describe( 'validation', () => {
it( 'returns false if block is not valid', () => {
registerBlockType( 'core/test-block', defaultBlockSettings );
- const isValid = isValidBlockContent(
- 'core/test-block',
- { fruit: 'Bananas' },
- 'Apples'
- );
+ const isValid = isValidBlockContent( 'core/test-block', { fruit: 'Bananas' }, 'Apples' );
expect( console ).toHaveWarned();
expect( console ).toHaveErrored();
@@ -628,11 +568,7 @@ describe( 'validation', () => {
},
} );
- const isValid = isValidBlockContent(
- 'core/test-block',
- { fruit: 'Bananas' },
- 'Bananas'
- );
+ const isValid = isValidBlockContent( 'core/test-block', { fruit: 'Bananas' }, 'Bananas' );
expect( console ).toHaveErrored();
expect( isValid ).toBe( false );
@@ -641,11 +577,7 @@ describe( 'validation', () => {
it( 'returns true is block is valid', () => {
registerBlockType( 'core/test-block', defaultBlockSettings );
- const isValid = isValidBlockContent(
- 'core/test-block',
- { fruit: 'Bananas' },
- 'Bananas'
- );
+ const isValid = isValidBlockContent( 'core/test-block', { fruit: 'Bananas' }, 'Bananas' );
expect( isValid ).toBe( true );
} );
diff --git a/packages/blocks/src/api/utils.js b/packages/blocks/src/api/utils.js
index 99dc98b5c3204b..1377e50f377713 100644
--- a/packages/blocks/src/api/utils.js
+++ b/packages/blocks/src/api/utils.js
@@ -50,8 +50,9 @@ export function isUnmodifiedDefaultBlock( block ) {
const newDefaultBlock = isUnmodifiedDefaultBlock.block;
const blockType = getBlockType( defaultBlockName );
- return every( blockType.attributes, ( value, key ) =>
- newDefaultBlock.attributes[ key ] === block.attributes[ key ]
+ return every(
+ blockType.attributes,
+ ( value, key ) => newDefaultBlock.attributes[ key ] === block.attributes[ key ]
);
}
@@ -64,11 +65,12 @@ export function isUnmodifiedDefaultBlock( block ) {
*/
export function isValidIcon( icon ) {
- return !! icon && (
- isString( icon ) ||
- isValidElement( icon ) ||
- isFunction( icon ) ||
- icon instanceof Component
+ return (
+ !! icon &&
+ ( isString( icon ) ||
+ isValidElement( icon ) ||
+ isFunction( icon ) ||
+ icon instanceof Component )
);
}
@@ -93,11 +95,13 @@ export function normalizeIconObject( icon ) {
return {
...icon,
- foreground: icon.foreground ? icon.foreground : mostReadable(
- tinyBgColor,
- ICON_COLORS,
- { includeFallbackColors: true, level: 'AA', size: 'large' }
- ).toHexString(),
+ foreground: icon.foreground
+ ? icon.foreground
+ : mostReadable( tinyBgColor, ICON_COLORS, {
+ includeFallbackColors: true,
+ level: 'AA',
+ size: 'large',
+ } ).toHexString(),
shadowColor: tinyBgColor.setAlpha( 0.3 ).toRgbString(),
};
}
diff --git a/packages/blocks/src/api/validation/index.js b/packages/blocks/src/api/validation/index.js
index fdf3cb67fac1fd..e75f8a4eba3b17 100644
--- a/packages/blocks/src/api/validation/index.js
+++ b/packages/blocks/src/api/validation/index.js
@@ -2,14 +2,7 @@
* External dependencies
*/
import { Tokenizer } from 'simple-html-tokenizer';
-import {
- identity,
- xor,
- fromPairs,
- isEqual,
- includes,
- stubTrue,
-} from 'lodash';
+import { identity, xor, fromPairs, isEqual, includes, stubTrue } from 'lodash';
/**
* WordPress dependencies
@@ -137,10 +130,7 @@ const ENUMERATED_ATTRIBUTES = [
*
* @type {Array}
*/
-const MEANINGFUL_ATTRIBUTES = [
- ...BOOLEAN_ATTRIBUTES,
- ...ENUMERATED_ATTRIBUTES,
-];
+const MEANINGFUL_ATTRIBUTES = [ ...BOOLEAN_ATTRIBUTES, ...ENUMERATED_ATTRIBUTES ];
/**
* Array of functions which receive a text string on which to apply normalizing
@@ -149,10 +139,7 @@ const MEANINGFUL_ATTRIBUTES = [
*
* @type {Array}
*/
-const TEXT_NORMALIZATIONS = [
- identity,
- getTextWithCollapsedWhitespace,
-];
+const TEXT_NORMALIZATIONS = [ identity, getTextWithCollapsedWhitespace ];
/**
* Regular expression matching a named character reference. In lieu of bundling
@@ -285,11 +272,7 @@ export function getTextWithCollapsedWhitespace( text ) {
export function getMeaningfulAttributePairs( token ) {
return token.attributes.filter( ( pair ) => {
const [ key, value ] = pair;
- return (
- value ||
- key.indexOf( 'data-' ) === 0 ||
- includes( MEANINGFUL_ATTRIBUTES, key )
- );
+ return value || key.indexOf( 'data-' ) === 0 || includes( MEANINGFUL_ATTRIBUTES, key );
} );
}
@@ -336,9 +319,11 @@ export function isEquivalentTextTokens( actual, expected, logger = createLogger(
* @return {string} Normalized style value.
*/
export function getNormalizedStyleValue( value ) {
- return value
- // Normalize URL type to omit whitespace or quotes
- .replace( REGEXP_STYLE_URL_TYPE, 'url($1)' );
+ return (
+ value
+ // Normalize URL type to omit whitespace or quotes
+ .replace( REGEXP_STYLE_URL_TYPE, 'url($1)' )
+ );
}
/**
@@ -360,10 +345,7 @@ export function getStyleProperties( text ) {
const [ key, ...valueParts ] = style.split( ':' );
const value = valueParts.join( ':' );
- return [
- key.trim(),
- getNormalizedStyleValue( value.trim() ),
- ];
+ return [ key.trim(), getNormalizedStyleValue( value.trim() ) ];
} );
return fromPairs( pairs );
@@ -424,12 +406,22 @@ export function isEqualTagAttributePairs( actual, expected, logger = createLogge
if ( isEqualAttributes ) {
// Defer custom attribute equality handling
if ( ! isEqualAttributes( actualValue, expectedValue ) ) {
- logger.warning( 'Expected attribute `%s` of value `%s`, saw `%s`.', name, expectedValue, actualValue );
+ logger.warning(
+ 'Expected attribute `%s` of value `%s`, saw `%s`.',
+ name,
+ expectedValue,
+ actualValue
+ );
return false;
}
} else if ( actualValue !== expectedValue ) {
// Otherwise strict inequality should bail
- logger.warning( 'Expected attribute `%s` of value `%s`, saw `%s`.', name, expectedValue, actualValue );
+ logger.warning(
+ 'Expected attribute `%s` of value `%s`, saw `%s`.',
+ name,
+ expectedValue,
+ actualValue
+ );
return false;
}
}
@@ -445,7 +437,11 @@ export function isEqualTagAttributePairs( actual, expected, logger = createLogge
export const isEqualTokensOfType = {
StartTag: ( actual, expected, logger = createLogger() ) => {
if ( actual.tagName !== expected.tagName ) {
- logger.warning( 'Expected tag name `%s`, instead saw `%s`.', expected.tagName, actual.tagName );
+ logger.warning(
+ 'Expected tag name `%s`, instead saw `%s`.',
+ expected.tagName,
+ actual.tagName
+ );
return false;
}
@@ -535,8 +531,8 @@ export function isClosedByToken( currentToken, nextToken ) {
*/
export function isEquivalentHTML( actual, expected, logger = createLogger() ) {
// Tokenize input content and reserialized save content
- const [ actualTokens, expectedTokens ] = [ actual, expected ].map(
- ( html ) => getHTMLTokens( html, logger )
+ const [ actualTokens, expectedTokens ] = [ actual, expected ].map( ( html ) =>
+ getHTMLTokens( html, logger )
);
// If either is malformed then stop comparing - the strings are not equivalent
@@ -556,7 +552,13 @@ export function isEquivalentHTML( actual, expected, logger = createLogger() ) {
// Inequal if next non-whitespace token of each set are not same type
if ( actualToken.type !== expectedToken.type ) {
- logger.warning( 'Expected token of type `%s` (%o), instead saw `%s` (%o).', expectedToken.type, expectedToken, actualToken.type, actualToken );
+ logger.warning(
+ 'Expected token of type `%s` (%o), instead saw `%s` (%o).',
+ expectedToken.type,
+ expectedToken,
+ actualToken.type,
+ actualToken
+ );
return false;
}
@@ -603,13 +605,21 @@ export function isEquivalentHTML( actual, expected, logger = createLogger() ) {
*
* @return {Object} Whether block is valid and contains validation messages.
*/
-export function getBlockContentValidationResult( blockTypeOrName, attributes, originalBlockContent, logger = createQueuedLogger() ) {
+export function getBlockContentValidationResult(
+ blockTypeOrName,
+ attributes,
+ originalBlockContent,
+ logger = createQueuedLogger()
+) {
const blockType = normalizeBlockType( blockTypeOrName );
let generatedBlockContent;
try {
generatedBlockContent = getSaveContent( blockType, attributes );
} catch ( error ) {
- logger.error( 'Block validation failed because an error occurred while generating block content:\n\n%s', error.toString() );
+ logger.error(
+ 'Block validation failed because an error occurred while generating block content:\n\n%s',
+ error.toString()
+ );
return {
isValid: false,
@@ -648,7 +658,12 @@ export function getBlockContentValidationResult( blockTypeOrName, attributes, or
* @return {boolean} Whether block is valid.
*/
export function isValidBlockContent( blockTypeOrName, attributes, originalBlockContent ) {
- const { isValid } = getBlockContentValidationResult( blockTypeOrName, attributes, originalBlockContent, createLogger() );
+ const { isValid } = getBlockContentValidationResult(
+ blockTypeOrName,
+ attributes,
+ originalBlockContent,
+ createLogger()
+ );
return isValid;
}
diff --git a/packages/blocks/src/block-content-provider/index.js b/packages/blocks/src/block-content-provider/index.js
index 352550a87be80f..a33d562072b05a 100644
--- a/packages/blocks/src/block-content-provider/index.js
+++ b/packages/blocks/src/block-content-provider/index.js
@@ -37,11 +37,7 @@ const BlockContentProvider = ( { children, innerBlocks } ) => {
return
{ html } ;
};
- return (
-
- { children }
-
- );
+ return
{ children } ;
};
/**
@@ -53,12 +49,7 @@ const BlockContentProvider = ( { children, innerBlocks } ) => {
export const withBlockContentContext = createHigherOrderComponent( ( OriginalComponent ) => {
return ( props ) => (
- { ( context ) => (
-
);
}, 'withBlockContentContext' );
diff --git a/packages/blocks/src/store/reducer.js b/packages/blocks/src/store/reducer.js
index 405e60109adda3..59077e1c18e6e9 100644
--- a/packages/blocks/src/store/reducer.js
+++ b/packages/blocks/src/store/reducer.js
@@ -1,17 +1,7 @@
/**
* External dependencies
*/
-import {
- filter,
- find,
- get,
- isEmpty,
- keyBy,
- map,
- mapValues,
- omit,
- uniqBy,
-} from 'lodash';
+import { filter, find, get, isEmpty, keyBy, map, mapValues, omit, uniqBy } from 'lodash';
/**
* WordPress dependencies
@@ -44,10 +34,7 @@ export function blockTypes( state = {}, action ) {
case 'ADD_BLOCK_TYPES':
return {
...state,
- ...keyBy(
- map( action.blockTypes, ( blockType ) => omit( blockType, 'styles ' ) ),
- 'name'
- ),
+ ...keyBy( map( action.blockTypes, ( blockType ) => omit( blockType, 'styles ' ) ), 'name' ),
};
case 'REMOVE_BLOCK_TYPES':
return omit( state, action.names );
@@ -70,26 +57,26 @@ export function blockStyles( state = {}, action ) {
return {
...state,
...mapValues( keyBy( action.blockTypes, 'name' ), ( blockType ) => {
- return uniqBy( [
- ...get( blockType, [ 'styles' ], [] ),
- ...get( state, [ blockType.name ], [] ),
- ], ( style ) => style.name );
+ return uniqBy(
+ [ ...get( blockType, [ 'styles' ], [] ), ...get( state, [ blockType.name ], [] ) ],
+ ( style ) => style.name
+ );
} ),
};
case 'ADD_BLOCK_STYLES':
return {
...state,
- [ action.blockName ]: uniqBy( [
- ...get( state, [ action.blockName ], [] ),
- ...( action.styles ),
- ], ( style ) => style.name ),
+ [ action.blockName ]: uniqBy(
+ [ ...get( state, [ action.blockName ], [] ), ...action.styles ],
+ ( style ) => style.name
+ ),
};
case 'REMOVE_BLOCK_STYLES':
return {
...state,
[ action.blockName ]: filter(
get( state, [ action.blockName ], [] ),
- ( style ) => action.styleNames.indexOf( style.name ) === -1,
+ ( style ) => action.styleNames.indexOf( style.name ) === -1
),
};
}
@@ -122,8 +109,12 @@ export function createBlockNameSetterReducer( setActionType ) {
}
export const defaultBlockName = createBlockNameSetterReducer( 'SET_DEFAULT_BLOCK_NAME' );
-export const freeformFallbackBlockName = createBlockNameSetterReducer( 'SET_FREEFORM_FALLBACK_BLOCK_NAME' );
-export const unregisteredFallbackBlockName = createBlockNameSetterReducer( 'SET_UNREGISTERED_FALLBACK_BLOCK_NAME' );
+export const freeformFallbackBlockName = createBlockNameSetterReducer(
+ 'SET_FREEFORM_FALLBACK_BLOCK_NAME'
+);
+export const unregisteredFallbackBlockName = createBlockNameSetterReducer(
+ 'SET_UNREGISTERED_FALLBACK_BLOCK_NAME'
+);
export const groupingBlockName = createBlockNameSetterReducer( 'SET_GROUPING_BLOCK_NAME' );
/**
diff --git a/packages/blocks/src/store/selectors.js b/packages/blocks/src/store/selectors.js
index cb9333e3f6ff12..66cf5be91c4cb0 100644
--- a/packages/blocks/src/store/selectors.js
+++ b/packages/blocks/src/store/selectors.js
@@ -13,11 +13,8 @@ import { filter, get, includes, map, some, flow, deburr } from 'lodash';
*
* @return {Object} Block type object.
*/
-const getNormalizedBlockType = ( state, nameOrType ) => (
- 'string' === typeof nameOrType ?
- getBlockType( state, nameOrType ) :
- nameOrType
-);
+const getNormalizedBlockType = ( state, nameOrType ) =>
+ 'string' === typeof nameOrType ? getBlockType( state, nameOrType ) : nameOrType;
/**
* Returns all the available block types.
@@ -28,9 +25,7 @@ const getNormalizedBlockType = ( state, nameOrType ) => (
*/
export const getBlockTypes = createSelector(
( state ) => Object.values( state.blockTypes ),
- ( state ) => [
- state.blockTypes,
- ]
+ ( state ) => [ state.blockTypes ]
);
/**
@@ -129,9 +124,7 @@ export const getChildBlockNames = createSelector(
( { name } ) => name
);
},
- ( state ) => [
- state.blockTypes,
- ]
+ ( state ) => [ state.blockTypes ]
);
/**
@@ -148,10 +141,7 @@ export const getChildBlockNames = createSelector(
export const getBlockSupport = ( state, nameOrType, feature, defaultSupports ) => {
const blockType = getNormalizedBlockType( state, nameOrType );
- return get( blockType, [
- 'supports',
- feature,
- ], defaultSupports );
+ return get( blockType, [ 'supports', feature ], defaultSupports );
};
/**
@@ -200,10 +190,7 @@ export function isMatchingSearchTerm( state, nameOrType, searchTerm ) {
const isSearchMatch = flow( [
getNormalizedSearchTerm,
- ( normalizedCandidate ) => includes(
- normalizedCandidate,
- normalizedSearchTerm
- ),
+ ( normalizedCandidate ) => includes( normalizedCandidate, normalizedSearchTerm ),
] );
return (
diff --git a/packages/blocks/src/store/test/reducer.js b/packages/blocks/src/store/test/reducer.js
index 346bb2e9aab1bf..1263af14081602 100644
--- a/packages/blocks/src/store/test/reducer.js
+++ b/packages/blocks/src/store/test/reducer.js
@@ -70,9 +70,7 @@ describe( 'blockStyles', () => {
} );
expect( state ).toEqual( {
- 'core/image': [
- { name: 'fancy' },
- ],
+ 'core/image': [ { name: 'fancy' } ],
} );
state = blockStyles( state, {
@@ -82,44 +80,33 @@ describe( 'blockStyles', () => {
} );
expect( state ).toEqual( {
- 'core/image': [
- { name: 'fancy' },
- { name: 'lightbox' },
- ],
+ 'core/image': [ { name: 'fancy' }, { name: 'lightbox' } ],
} );
} );
it( 'should add block styles when adding a block', () => {
const original = deepFreeze( {
- 'core/image': [
- { name: 'fancy' },
- ],
+ 'core/image': [ { name: 'fancy' } ],
} );
const state = blockStyles( original, {
type: 'ADD_BLOCK_TYPES',
- blockTypes: [ {
- name: 'core/image',
- styles: [
- { name: 'original' },
- ],
- } ],
+ blockTypes: [
+ {
+ name: 'core/image',
+ styles: [ { name: 'original' } ],
+ },
+ ],
} );
expect( state ).toEqual( {
- 'core/image': [
- { name: 'original' },
- { name: 'fancy' },
- ],
+ 'core/image': [ { name: 'original' }, { name: 'fancy' } ],
} );
} );
it( 'should remove block styles', () => {
const original = deepFreeze( {
- 'core/image': [
- { name: 'fancy' },
- { name: 'lightbox' },
- ],
+ 'core/image': [ { name: 'fancy' }, { name: 'lightbox' } ],
} );
const state = blockStyles( original, {
@@ -129,9 +116,7 @@ describe( 'blockStyles', () => {
} );
expect( state ).toEqual( {
- 'core/image': [
- { name: 'lightbox' },
- ],
+ 'core/image': [ { name: 'lightbox' } ],
} );
} );
} );
@@ -238,25 +223,23 @@ describe( 'categories', () => {
} );
it( 'should override categories', () => {
- const original = deepFreeze( [
- { slug: 'chicken', title: 'Chicken' },
- ] );
+ const original = deepFreeze( [ { slug: 'chicken', title: 'Chicken' } ] );
const state = categories( original, {
type: 'SET_CATEGORIES',
categories: [ { slug: 'wings', title: 'Wings' } ],
} );
- expect( state ).toEqual( [
- { slug: 'wings', title: 'Wings' },
- ] );
+ expect( state ).toEqual( [ { slug: 'wings', title: 'Wings' } ] );
} );
it( 'should add the category icon', () => {
- const original = deepFreeze( [ {
- slug: 'chicken',
- title: 'Chicken',
- } ] );
+ const original = deepFreeze( [
+ {
+ slug: 'chicken',
+ title: 'Chicken',
+ },
+ ] );
const state = categories( original, {
type: 'UPDATE_CATEGORY',
@@ -266,23 +249,28 @@ describe( 'categories', () => {
},
} );
- expect( state ).toEqual( [ {
- slug: 'chicken',
- title: 'Chicken',
- icon: 'new-icon',
- } ] );
+ expect( state ).toEqual( [
+ {
+ slug: 'chicken',
+ title: 'Chicken',
+ icon: 'new-icon',
+ },
+ ] );
} );
it( 'should update the category icon', () => {
- const original = deepFreeze( [ {
- slug: 'chicken',
- title: 'Chicken',
- icon: 'old-icon',
- }, {
- slug: 'wings',
- title: 'Wings',
- icon: 'old-icon',
- } ] );
+ const original = deepFreeze( [
+ {
+ slug: 'chicken',
+ title: 'Chicken',
+ icon: 'old-icon',
+ },
+ {
+ slug: 'wings',
+ title: 'Wings',
+ icon: 'old-icon',
+ },
+ ] );
const state = categories( original, {
type: 'UPDATE_CATEGORY',
@@ -292,27 +280,33 @@ describe( 'categories', () => {
},
} );
- expect( state ).toEqual( [ {
- slug: 'chicken',
- title: 'Chicken',
- icon: 'new-icon',
- }, {
- slug: 'wings',
- title: 'Wings',
- icon: 'old-icon',
- } ] );
+ expect( state ).toEqual( [
+ {
+ slug: 'chicken',
+ title: 'Chicken',
+ icon: 'new-icon',
+ },
+ {
+ slug: 'wings',
+ title: 'Wings',
+ icon: 'old-icon',
+ },
+ ] );
} );
it( 'should update multiple category properties', () => {
- const original = deepFreeze( [ {
- slug: 'chicken',
- title: 'Chicken',
- icon: 'old-icon',
- }, {
- slug: 'wings',
- title: 'Wings',
- icon: 'old-icon',
- } ] );
+ const original = deepFreeze( [
+ {
+ slug: 'chicken',
+ title: 'Chicken',
+ icon: 'old-icon',
+ },
+ {
+ slug: 'wings',
+ title: 'Wings',
+ icon: 'old-icon',
+ },
+ ] );
const state = categories( original, {
type: 'UPDATE_CATEGORY',
@@ -323,15 +317,18 @@ describe( 'categories', () => {
},
} );
- expect( state ).toEqual( [ {
- slug: 'chicken',
- title: 'Chicken',
- icon: 'old-icon',
- }, {
- slug: 'wings',
- title: 'New Wings',
- chicken: 'ribs',
- icon: 'old-icon',
- } ] );
+ expect( state ).toEqual( [
+ {
+ slug: 'chicken',
+ title: 'Chicken',
+ icon: 'old-icon',
+ },
+ {
+ slug: 'wings',
+ title: 'New Wings',
+ chicken: 'ribs',
+ icon: 'old-icon',
+ },
+ ] );
} );
} );
diff --git a/packages/blocks/src/store/test/selectors.js b/packages/blocks/src/store/test/selectors.js
index 05fc5a23040a85..42a29f136db0fa 100644
--- a/packages/blocks/src/store/test/selectors.js
+++ b/packages/blocks/src/store/test/selectors.js
@@ -1,11 +1,7 @@
/**
* Internal dependencies
*/
-import {
- getChildBlockNames,
- isMatchingSearchTerm,
- getGroupingBlockName,
-} from '../selectors';
+import { getChildBlockNames, isMatchingSearchTerm, getGroupingBlockName } from '../selectors';
describe( 'selectors', () => {
describe( 'getChildBlockNames', () => {
@@ -153,52 +149,52 @@ describe( 'selectors', () => {
},
};
- describe.each( [
- [ 'name', name ],
- [ 'block type', blockType ],
- ] )( 'by %s', ( label, nameOrType ) => {
- it( 'should return false if not match', () => {
- const result = isMatchingSearchTerm( state, nameOrType, 'Quote' );
+ describe.each( [ [ 'name', name ], [ 'block type', blockType ] ] )(
+ 'by %s',
+ ( label, nameOrType ) => {
+ it( 'should return false if not match', () => {
+ const result = isMatchingSearchTerm( state, nameOrType, 'Quote' );
- expect( result ).toBe( false );
- } );
+ expect( result ).toBe( false );
+ } );
- it( 'should return true if match by title', () => {
- const result = isMatchingSearchTerm( state, nameOrType, 'Paragraph' );
+ it( 'should return true if match by title', () => {
+ const result = isMatchingSearchTerm( state, nameOrType, 'Paragraph' );
- expect( result ).toBe( true );
- } );
+ expect( result ).toBe( true );
+ } );
- it( 'should return true if match ignoring case', () => {
- const result = isMatchingSearchTerm( state, nameOrType, 'PARAGRAPH' );
+ it( 'should return true if match ignoring case', () => {
+ const result = isMatchingSearchTerm( state, nameOrType, 'PARAGRAPH' );
- expect( result ).toBe( true );
- } );
+ expect( result ).toBe( true );
+ } );
- it( 'should return true if match ignoring diacritics', () => {
- const result = isMatchingSearchTerm( state, nameOrType, 'PÁRAGRAPH' );
+ it( 'should return true if match ignoring diacritics', () => {
+ const result = isMatchingSearchTerm( state, nameOrType, 'PÁRAGRAPH' );
- expect( result ).toBe( true );
- } );
+ expect( result ).toBe( true );
+ } );
- it( 'should return true if match ignoring whitespace', () => {
- const result = isMatchingSearchTerm( state, nameOrType, ' PARAGRAPH ' );
+ it( 'should return true if match ignoring whitespace', () => {
+ const result = isMatchingSearchTerm( state, nameOrType, ' PARAGRAPH ' );
- expect( result ).toBe( true );
- } );
+ expect( result ).toBe( true );
+ } );
- it( 'should return true if match using the keywords', () => {
- const result = isMatchingSearchTerm( state, nameOrType, 'TEXT' );
+ it( 'should return true if match using the keywords', () => {
+ const result = isMatchingSearchTerm( state, nameOrType, 'TEXT' );
- expect( result ).toBe( true );
- } );
+ expect( result ).toBe( true );
+ } );
- it( 'should return true if match using the categories', () => {
- const result = isMatchingSearchTerm( state, nameOrType, 'COMMON' );
+ it( 'should return true if match using the categories', () => {
+ const result = isMatchingSearchTerm( state, nameOrType, 'COMMON' );
- expect( result ).toBe( true );
- } );
- } );
+ expect( result ).toBe( true );
+ } );
+ }
+ );
} );
describe( 'getGroupingBlockName', () => {
diff --git a/packages/components/src/animate/index.js b/packages/components/src/animate/index.js
index ee6ca3298e006f..e87f3cba737c3f 100644
--- a/packages/components/src/animate/index.js
+++ b/packages/components/src/animate/index.js
@@ -9,13 +9,10 @@ function Animate( { type, options = {}, children } ) {
const [ yAxis, xAxis = 'center' ] = origin.split( ' ' );
return children( {
- className: classnames(
- 'components-animate__appear',
- {
- [ 'is-from-' + xAxis ]: xAxis !== 'center',
- [ 'is-from-' + yAxis ]: yAxis !== 'middle',
- },
- ),
+ className: classnames( 'components-animate__appear', {
+ [ 'is-from-' + xAxis ]: xAxis !== 'center',
+ [ 'is-from-' + yAxis ]: yAxis !== 'middle',
+ } ),
} );
}
@@ -23,18 +20,13 @@ function Animate( { type, options = {}, children } ) {
const { origin = 'left' } = options;
return children( {
- className: classnames(
- 'components-animate__slide-in',
- 'is-from-' + origin,
- ),
+ className: classnames( 'components-animate__slide-in', 'is-from-' + origin ),
} );
}
if ( type === 'loading' ) {
return children( {
- className: classnames(
- 'components-animate__loading',
- ),
+ className: classnames( 'components-animate__loading' ),
} );
}
diff --git a/packages/components/src/animate/stories/index.js b/packages/components/src/animate/stories/index.js
index 84227837e7a3ff..e8231089370972 100644
--- a/packages/components/src/animate/stories/index.js
+++ b/packages/components/src/animate/stories/index.js
@@ -18,10 +18,7 @@ export const _default = () => (
// Unexported helper for different origins.
const Appear = ( { origin } ) => (
-
+
{ ( { className } ) => (
Appear animation. Origin: { origin }.
diff --git a/packages/components/src/autocomplete/index.js b/packages/components/src/autocomplete/index.js
index 283ccd92633b04..2aedb71f814196 100644
--- a/packages/components/src/autocomplete/index.js
+++ b/packages/components/src/autocomplete/index.js
@@ -11,13 +11,7 @@ import { Component, renderToString } from '@wordpress/element';
import { ENTER, ESCAPE, UP, DOWN, LEFT, RIGHT, SPACE } from '@wordpress/keycodes';
import { __, _n, sprintf } from '@wordpress/i18n';
import { withInstanceId, compose } from '@wordpress/compose';
-import {
- create,
- slice,
- insert,
- isCollapsed,
- getTextContent,
-} from '@wordpress/rich-text';
+import { create, slice, insert, isCollapsed, getTextContent } from '@wordpress/rich-text';
import { getRectangleFromRange } from '@wordpress/dom';
/**
@@ -186,9 +180,9 @@ export class Autocomplete extends Component {
const completion = getOptionCompletion( option.value, query );
const { action, value } =
- ( undefined === completion.action || undefined === completion.value ) ?
- { action: 'insert-at-caret', value: completion } :
- completion;
+ undefined === completion.action || undefined === completion.value
+ ? { action: 'insert-at-caret', value: completion }
+ : completion;
if ( 'replace' === action ) {
onReplace( [ value ] );
@@ -219,11 +213,17 @@ export class Autocomplete extends Component {
return;
}
if ( !! filteredOptions.length ) {
- debouncedSpeak( sprintf( _n(
- '%d result found, use up and down arrow keys to navigate.',
- '%d results found, use up and down arrow keys to navigate.',
- filteredOptions.length
- ), filteredOptions.length ), 'assertive' );
+ debouncedSpeak(
+ sprintf(
+ _n(
+ '%d result found, use up and down arrow keys to navigate.',
+ '%d results found, use up and down arrow keys to navigate.',
+ filteredOptions.length
+ ),
+ filteredOptions.length
+ ),
+ 'assertive'
+ );
} else {
debouncedSpeak( __( 'No results.' ), 'assertive' );
}
@@ -249,7 +249,7 @@ export class Autocomplete extends Component {
* `activePromise` in the state would result in it actually being in `this.state`
* before the promise resolves and we check to see if this is the active promise or not.
*/
- const promise = this.activePromise = Promise.resolve(
+ const promise = ( this.activePromise = Promise.resolve(
typeof options === 'function' ? options( query ) : options
).then( ( optionsData ) => {
if ( promise !== this.activePromise ) {
@@ -266,14 +266,15 @@ export class Autocomplete extends Component {
} ) );
const filteredOptions = filterOptions( this.state.search, keyedOptions );
- const selectedIndex = filteredOptions.length === this.state.filteredOptions.length ? this.state.selectedIndex : 0;
+ const selectedIndex =
+ filteredOptions.length === this.state.filteredOptions.length ? this.state.selectedIndex : 0;
this.setState( {
[ 'options_' + completer.idx ]: keyedOptions,
filteredOptions,
selectedIndex,
} );
this.announce( filteredOptions );
- } );
+ } ) );
}
handleKeyDown( event ) {
@@ -348,7 +349,9 @@ export class Autocomplete extends Component {
const prevText = deburr( getTextContent( slice( prevRecord, 0 ) ) );
if ( text !== prevText ) {
- const textAfterSelection = getTextContent( slice( record, undefined, getTextContent( record ).length ) );
+ const textAfterSelection = getTextContent(
+ slice( record, undefined, getTextContent( record ).length )
+ );
const allCompleters = map( completers, ( completer, idx ) => ( { ...completer, idx } ) );
const open = find( allCompleters, ( { triggerPrefix, allowContext } ) => {
const index = text.lastIndexOf( triggerPrefix );
@@ -384,9 +387,11 @@ export class Autocomplete extends Component {
// create a regular expression to filter the options
const search = open ? new RegExp( '(?:\\b|\\s|^)' + escapeRegExp( query ), 'i' ) : /./;
// filter the options we already have
- const filteredOptions = open ? filterOptions( search, this.state[ 'options_' + open.idx ] ) : [];
+ const filteredOptions = open
+ ? filterOptions( search, this.state[ 'options_' + open.idx ] )
+ : [];
// check if we should still suppress the popover
- const suppress = ( open && wasSuppress === open.idx ) ? wasSuppress : undefined;
+ const suppress = open && wasSuppress === open.idx ? wasSuppress : undefined;
// update the state
if ( wasOpen || open ) {
this.setState( { selectedIndex: 0, filteredOptions, suppress, search, open, query } );
@@ -410,7 +415,9 @@ export class Autocomplete extends Component {
const { className, idx } = open || {};
const isExpanded = suppress !== idx && filteredOptions.length > 0;
const listBoxId = isExpanded ? `components-autocomplete-listbox-${ instanceId }` : null;
- const activeId = isExpanded ? `components-autocomplete-item-${ instanceId }-${ selectedKey }` : null;
+ const activeId = isExpanded
+ ? `components-autocomplete-item-${ instanceId }-${ selectedKey }`
+ : null;
return (
<>
@@ -428,26 +435,23 @@ export class Autocomplete extends Component {
className="components-autocomplete__popover"
getAnchorRect={ getCaretRect }
>
-
- { isExpanded && map( filteredOptions, ( option, index ) => (
-
this.select( option ) }
- >
- { option.label }
-
- ) ) }
+
+ { isExpanded &&
+ map( filteredOptions, ( option, index ) => (
+ this.select( option ) }
+ >
+ { option.label }
+
+ ) ) }
) }
@@ -456,7 +460,4 @@ export class Autocomplete extends Component {
}
}
-export default compose( [
- withSpokenMessages,
- withInstanceId,
-] )( Autocomplete );
+export default compose( [ withSpokenMessages, withInstanceId ] )( Autocomplete );
diff --git a/packages/components/src/base-control/index.js b/packages/components/src/base-control/index.js
index 3abe25ee062823..e4d81e6cca636a 100644
--- a/packages/components/src/base-control/index.js
+++ b/packages/components/src/base-control/index.js
@@ -7,25 +7,31 @@ function BaseControl( { id, label, hideLabelFromVision, help, className, childre
return (
- { label && id && { label }
- }
+ { label && id && (
+
+ { label }
+
+ ) }
{ label && ! id && { label } }
{ children }
- { !! help &&
{ help }
}
+ { !! help && (
+
+ { help }
+
+ ) }
);
}
BaseControl.VisualLabel = ( { className, children } ) => {
className = classnames( 'components-base-control__label', className );
- return (
-
- { children }
-
- );
+ return
{ children } ;
};
export default BaseControl;
diff --git a/packages/components/src/base-control/index.native.js b/packages/components/src/base-control/index.native.js
index ddf4067054d832..1bf653768e7532 100644
--- a/packages/components/src/base-control/index.native.js
+++ b/packages/components/src/base-control/index.native.js
@@ -5,10 +5,7 @@ import { Text, View } from 'react-native';
export default function BaseControl( { label, help, children } ) {
return (
-
+
{ label && { label } }
{ children }
{ help && { help } }
diff --git a/packages/components/src/button-group/index.js b/packages/components/src/button-group/index.js
index b864ff7ccc7014..6f4fb672c8c6ef 100644
--- a/packages/components/src/button-group/index.js
+++ b/packages/components/src/button-group/index.js
@@ -6,9 +6,7 @@ import classnames from 'classnames';
function ButtonGroup( { className, ...props } ) {
const classes = classnames( 'components-button-group', className );
- return (
-
- );
+ return
;
}
export default ButtonGroup;
diff --git a/packages/components/src/button-group/stories/index.js b/packages/components/src/button-group/stories/index.js
index 1e1646e0268d15..60d9cc7a82ca43 100644
--- a/packages/components/src/button-group/stories/index.js
+++ b/packages/components/src/button-group/stories/index.js
@@ -10,8 +10,12 @@ export const _default = () => {
const style = { margin: '0 4px' };
return (
- Button 1
- Button 2
+
+ Button 1
+
+
+ Button 2
+
);
};
diff --git a/packages/components/src/button/index.native.js b/packages/components/src/button/index.native.js
index e57cad3ec34d80..e9be1a6eaa56bc 100644
--- a/packages/components/src/button/index.native.js
+++ b/packages/components/src/button/index.native.js
@@ -90,10 +90,18 @@ export function Button( props ) {
states.push( 'disabled' );
}
- const subscriptInactive = getStylesFromColorScheme( styles.subscriptInactive, styles.subscriptInactiveDark );
+ const subscriptInactive = getStylesFromColorScheme(
+ styles.subscriptInactive,
+ styles.subscriptInactiveDark
+ );
const newChildren = Children.map( children, ( child ) => {
- return child ? cloneElement( child, { colorScheme: props.preferredColorScheme, __unstableActive: ariaPressed } ) : child;
+ return child
+ ? cloneElement( child, {
+ colorScheme: props.preferredColorScheme,
+ __unstableActive: ariaPressed,
+ } )
+ : child;
} );
return (
@@ -111,7 +119,11 @@ export function Button( props ) {
{ newChildren }
- { subscript && ( { subscript } ) }
+ { subscript && (
+
+ { subscript }
+
+ ) }
diff --git a/packages/components/src/checkbox-control/index.js b/packages/components/src/checkbox-control/index.js
index 77f75a33064985..5cb69c0fcf148c 100644
--- a/packages/components/src/checkbox-control/index.js
+++ b/packages/components/src/checkbox-control/index.js
@@ -9,7 +9,16 @@ import { withInstanceId } from '@wordpress/compose';
import BaseControl from '../base-control';
import Dashicon from '../dashicon';
-function CheckboxControl( { label, className, heading, checked, help, instanceId, onChange, ...props } ) {
+function CheckboxControl( {
+ label,
+ className,
+ heading,
+ checked,
+ help,
+ instanceId,
+ onChange,
+ ...props
+} ) {
const id = `inspector-checkbox-control-${ instanceId }`;
const onChangeValue = ( event ) => onChange( event.target.checked );
@@ -26,7 +35,13 @@ function CheckboxControl( { label, className, heading, checked, help, instanceId
aria-describedby={ !! help ? id + '__help' : undefined }
{ ...props }
/>
- { checked ?
{ label }
diff --git a/packages/components/src/checkbox-control/stories/index.js b/packages/components/src/checkbox-control/stories/index.js
index 184abbfe8b1614..d601db1833bdc6 100644
--- a/packages/components/src/checkbox-control/stories/index.js
+++ b/packages/components/src/checkbox-control/stories/index.js
@@ -17,13 +17,7 @@ export default { title: 'Checkbox Control', component: CheckboxControl };
export const _default = () => {
const [ isChecked, setChecked ] = useState( true );
- return (
-
- { tooltipText ?
- ( { optionButton } ) :
- optionButton
- }
+ { tooltipText ? { optionButton } : optionButton }
{ isSelected &&
);
}
-function DropdownLinkAction( {
- buttonProps,
- className,
- dropdownProps,
- linkText,
-} ) {
+function DropdownLinkAction( { buttonProps, className, dropdownProps, linkText } ) {
return (
(
-
+
{ linkText }
) }
@@ -67,17 +47,10 @@ function DropdownLinkAction( {
);
}
-function ButtonAction( {
- className,
- children,
- ...additionalProps
-} ) {
+function ButtonAction( { className, children, ...additionalProps } ) {
return (
{ options }
{ actions && (
-
- { actions }
-
+ { actions }
) }
onChange( color ) }
- aria-label={ name ?
- // translators: %s: The name of the color e.g: "vivid red".
- sprintf( __( 'Color: %s' ), name ) :
- // translators: %s: color hex code e.g: "#f00".
- sprintf( __( 'Color code: %s' ), color )
- }
- />
- ) );
- },
- [ colors, value, onChange, clearColor ]
- );
+ const clearColor = useCallback( () => onChange( undefined ), [ onChange ] );
+ const colorOptions = useMemo( () => {
+ return map( colors, ( { color, name } ) => (
+ onChange( color ) }
+ aria-label={
+ name
+ ? // translators: %s: The name of the color e.g: "vivid red".
+ sprintf( __( 'Color: %s' ), name )
+ : // translators: %s: color hex code e.g: "#f00".
+ sprintf( __( 'Color code: %s' ), color )
+ }
+ />
+ ) );
+ }, [ colors, value, onChange, clearColor ] );
const renderCustomColorPicker = useCallback(
() => (
{ ! disableCustomColors && (
) }
- ) }
+ }
/>
);
}
diff --git a/packages/components/src/color-palette/test/index.js b/packages/components/src/color-palette/test/index.js
index 241f048aae96d8..9452c512f170f2 100644
--- a/packages/components/src/color-palette/test/index.js
+++ b/packages/components/src/color-palette/test/index.js
@@ -9,11 +9,17 @@ import { mount, shallow } from 'enzyme';
import ColorPalette from '../';
describe( 'ColorPalette', () => {
- const colors = [ { name: 'red', color: '#f00' }, { name: 'white', color: '#fff' }, { name: 'blue', color: '#00f' } ];
+ const colors = [
+ { name: 'red', color: '#f00' },
+ { name: 'white', color: '#fff' },
+ { name: 'blue', color: '#00f' },
+ ];
const currentColor = '#f00';
const onChange = jest.fn();
- const wrapper = mount(
-
+
{ /* eslint-disable jsx-a11y/no-static-element-interactions */ }
+ onTouchStart={ this.handleChange }
+ >
+ onTouchStart={ this.handleChange }
+ >
{
return true;
} else if ( data.source === 'hsl' && ( ! data.h || ! data.s || ! data.l ) ) {
return true;
- } else if ( data.source === 'rgb' && (
- ( ! data.r || ! data.g || ! data.b ) &&
- ( ! data.h || ! data.s || ! data.v || ! data.a ) &&
- ( ! data.h || ! data.s || ! data.l || ! data.a )
- ) ) {
+ } else if (
+ data.source === 'rgb' &&
+ ( ( ! data.r || ! data.g || ! data.b ) &&
+ ( ! data.h || ! data.s || ! data.v || ! data.a ) &&
+ ( ! data.h || ! data.s || ! data.l || ! data.a ) )
+ ) {
return true;
}
return false;
};
-const isValidColor = ( colors ) => colors.hex ?
- isValidHex( colors.hex ) :
- simpleCheckForValidColor( colors );
+const isValidColor = ( colors ) =>
+ colors.hex ? isValidHex( colors.hex ) : simpleCheckForValidColor( colors );
/**
* Function that creates the new color object
@@ -126,13 +126,14 @@ export default class ColorPicker extends Component {
if ( isValidColor( data ) ) {
const colors = colorToState( data, data.h || oldHue );
- this.setState( {
- ...colors,
- draftHex: toLowerCase( colors.hex ),
- draftHsl: colors.hsl,
- draftRgb: colors.rgb,
- },
- debounce( partial( onChangeComplete, colors ), 100 )
+ this.setState(
+ {
+ ...colors,
+ draftHex: toLowerCase( colors.hex ),
+ draftHsl: colors.hsl,
+ draftRgb: colors.rgb,
+ },
+ debounce( partial( onChangeComplete, colors ), 100 )
);
}
}
@@ -178,15 +179,7 @@ export default class ColorPicker extends Component {
render() {
const { className, disableAlpha } = this.props;
- const {
- color,
- hsl,
- hsv,
- rgb,
- draftHex,
- draftHsl,
- draftRgb,
- } = this.state;
+ const { color, hsl, hsv, rgb, draftHex, draftHsl, draftRgb } = this.state;
const classes = classnames( className, {
'components-color-picker': true,
'is-alpha-disabled': disableAlpha,
@@ -196,11 +189,7 @@ export default class ColorPicker extends Component {
return (
-
@@ -217,11 +206,7 @@ export default class ColorPicker extends Component {
{ disableAlpha ? null : (
-
+
) }
diff --git a/packages/components/src/color-picker/inputs.js b/packages/components/src/color-picker/inputs.js
index 39817d13edb74f..4074f3fe78dc72 100644
--- a/packages/components/src/color-picker/inputs.js
+++ b/packages/components/src/color-picker/inputs.js
@@ -175,9 +175,7 @@ export class Inputs extends Component {
} else if ( this.state.view === 'rgb' ) {
return (
-
- { __( 'Color value in RGB' ) }
-
+ { __( 'Color value in RGB' ) }
-
- { __( 'Color value in HSL' ) }
-
+
{ __( 'Color value in HSL' ) }
-
+
{ __(
'Use your arrow keys to change the base color. Move up to lighten the color, down to darken, left to decrease saturation, and right to increase saturation.'
) }
diff --git a/packages/components/src/color-picker/test/index.js b/packages/components/src/color-picker/test/index.js
index 57e512bd65b8e6..3098e800021523 100644
--- a/packages/components/src/color-picker/test/index.js
+++ b/packages/components/src/color-picker/test/index.js
@@ -18,11 +18,7 @@ describe( 'ColorPicker', () => {
const color = '#FFF';
const renderer = TestRenderer.create(
-
{} }
- disableAlpha
- />
+ {} } disableAlpha />
);
expect( renderer.toJSON() ).toMatchSnapshot();
@@ -31,11 +27,7 @@ describe( 'ColorPicker', () => {
test( 'should only update input view for draft changes', () => {
const color = '#FFF';
const testRenderer = TestRenderer.create(
- {} }
- disableAlpha
- />
+ {} } disableAlpha />
);
testRenderer.root.findByType( 'input' ).props.onChange( { target: { value: '#ABC' } } );
expect( testRenderer.toJSON() ).toMatchSnapshot();
@@ -44,11 +36,7 @@ describe( 'ColorPicker', () => {
test( 'should commit changes to all views on blur', () => {
const color = '#FFF';
const testRenderer = TestRenderer.create(
- {} }
- disableAlpha
- />
+ {} } disableAlpha />
);
testRenderer.root.findByType( 'input' ).props.onChange( { target: { value: '#ABC' } } );
testRenderer.root.findByType( 'input' ).props.onBlur();
@@ -58,11 +46,7 @@ describe( 'ColorPicker', () => {
test( 'should commit changes to all views on keyDown = UP', () => {
const color = '#FFF';
const testRenderer = TestRenderer.create(
- {} }
- disableAlpha
- />
+ {} } disableAlpha />
);
testRenderer.root.findByType( 'input' ).props.onChange( { target: { value: '#ABC' } } );
testRenderer.root.findByType( 'input' ).props.onKeyDown( { keyCode: UP } );
@@ -72,11 +56,7 @@ describe( 'ColorPicker', () => {
test( 'should commit changes to all views on keyDown = DOWN', () => {
const color = '#FFF';
const testRenderer = TestRenderer.create(
- {} }
- disableAlpha
- />
+ {} } disableAlpha />
);
testRenderer.root.findByType( 'input' ).props.onChange( { target: { value: '#ABC' } } );
testRenderer.root.findByType( 'input' ).props.onKeyDown( { keyCode: DOWN } );
@@ -86,11 +66,7 @@ describe( 'ColorPicker', () => {
test( 'should commit changes to all views on keyDown = ENTER', () => {
const color = '#FFF';
const testRenderer = TestRenderer.create(
- {} }
- disableAlpha
- />
+ {} } disableAlpha />
);
testRenderer.root.findByType( 'input' ).props.onChange( { target: { value: '#ABC' } } );
testRenderer.root.findByType( 'input' ).props.onKeyDown( { keyCode: ENTER } );
diff --git a/packages/components/src/color-picker/utils.js b/packages/components/src/color-picker/utils.js
index dada93c31c16ef..463ad65af6d351 100644
--- a/packages/components/src/color-picker/utils.js
+++ b/packages/components/src/color-picker/utils.js
@@ -109,9 +109,7 @@ function getPointOffset( e, container ) {
export function isValidHex( hex ) {
// disable hex4 and hex8
const lh = String( hex ).charAt( 0 ) === '#' ? 1 : 0;
- return (
- hex.length !== 4 + lh && hex.length < 7 + lh && tinycolor( hex ).isValid()
- );
+ return hex.length !== 4 + lh && hex.length < 7 + lh && tinycolor( hex ).isValid();
}
/**
diff --git a/packages/components/src/dashicon/index.js b/packages/components/src/dashicon/index.js
index 5a44b56126378b..484fc9d607e09a 100644
--- a/packages/components/src/dashicon/index.js
+++ b/packages/components/src/dashicon/index.js
@@ -22,67 +22,87 @@ export default class Dashicon extends Component {
switch ( icon ) {
case 'admin-appearance':
- path = 'M14.48 11.06L7.41 3.99l1.5-1.5c.5-.56 2.3-.47 3.51.32 1.21.8 1.43 1.28 2.91 2.1 1.18.64 2.45 1.26 4.45.85zm-.71.71L6.7 4.7 4.93 6.47c-.39.39-.39 1.02 0 1.41l1.06 1.06c.39.39.39 1.03 0 1.42-.6.6-1.43 1.11-2.21 1.69-.35.26-.7.53-1.01.84C1.43 14.23.4 16.08 1.4 17.07c.99 1 2.84-.03 4.18-1.36.31-.31.58-.66.85-1.02.57-.78 1.08-1.61 1.69-2.21.39-.39 1.02-.39 1.41 0l1.06 1.06c.39.39 1.02.39 1.41 0z';
+ path =
+ 'M14.48 11.06L7.41 3.99l1.5-1.5c.5-.56 2.3-.47 3.51.32 1.21.8 1.43 1.28 2.91 2.1 1.18.64 2.45 1.26 4.45.85zm-.71.71L6.7 4.7 4.93 6.47c-.39.39-.39 1.02 0 1.41l1.06 1.06c.39.39.39 1.03 0 1.42-.6.6-1.43 1.11-2.21 1.69-.35.26-.7.53-1.01.84C1.43 14.23.4 16.08 1.4 17.07c.99 1 2.84-.03 4.18-1.36.31-.31.58-.66.85-1.02.57-.78 1.08-1.61 1.69-2.21.39-.39 1.02-.39 1.41 0l1.06 1.06c.39.39 1.02.39 1.41 0z';
break;
case 'admin-collapse':
- path = 'M10 2.16c4.33 0 7.84 3.51 7.84 7.84s-3.51 7.84-7.84 7.84S2.16 14.33 2.16 10 5.71 2.16 10 2.16zm2 11.72V6.12L6.18 9.97z';
+ path =
+ 'M10 2.16c4.33 0 7.84 3.51 7.84 7.84s-3.51 7.84-7.84 7.84S2.16 14.33 2.16 10 5.71 2.16 10 2.16zm2 11.72V6.12L6.18 9.97z';
break;
case 'admin-comments':
- path = 'M5 2h9c1.1 0 2 .9 2 2v7c0 1.1-.9 2-2 2h-2l-5 5v-5H5c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2z';
+ path =
+ 'M5 2h9c1.1 0 2 .9 2 2v7c0 1.1-.9 2-2 2h-2l-5 5v-5H5c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2z';
break;
case 'admin-customizer':
- path = 'M18.33 3.57s.27-.8-.31-1.36c-.53-.52-1.22-.24-1.22-.24-.61.3-5.76 3.47-7.67 5.57-.86.96-2.06 3.79-1.09 4.82.92.98 3.96-.17 4.79-1 2.06-2.06 5.21-7.17 5.5-7.79zM1.4 17.65c2.37-1.56 1.46-3.41 3.23-4.64.93-.65 2.22-.62 3.08.29.63.67.8 2.57-.16 3.46-1.57 1.45-4 1.55-6.15.89z';
+ path =
+ 'M18.33 3.57s.27-.8-.31-1.36c-.53-.52-1.22-.24-1.22-.24-.61.3-5.76 3.47-7.67 5.57-.86.96-2.06 3.79-1.09 4.82.92.98 3.96-.17 4.79-1 2.06-2.06 5.21-7.17 5.5-7.79zM1.4 17.65c2.37-1.56 1.46-3.41 3.23-4.64.93-.65 2.22-.62 3.08.29.63.67.8 2.57-.16 3.46-1.57 1.45-4 1.55-6.15.89z';
break;
case 'admin-generic':
- path = 'M18 12h-2.18c-.17.7-.44 1.35-.81 1.93l1.54 1.54-2.1 2.1-1.54-1.54c-.58.36-1.23.63-1.91.79V19H8v-2.18c-.68-.16-1.33-.43-1.91-.79l-1.54 1.54-2.12-2.12 1.54-1.54c-.36-.58-.63-1.23-.79-1.91H1V9.03h2.17c.16-.7.44-1.35.8-1.94L2.43 5.55l2.1-2.1 1.54 1.54c.58-.37 1.24-.64 1.93-.81V2h3v2.18c.68.16 1.33.43 1.91.79l1.54-1.54 2.12 2.12-1.54 1.54c.36.59.64 1.24.8 1.94H18V12zm-8.5 1.5c1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3 1.34 3 3 3z';
+ path =
+ 'M18 12h-2.18c-.17.7-.44 1.35-.81 1.93l1.54 1.54-2.1 2.1-1.54-1.54c-.58.36-1.23.63-1.91.79V19H8v-2.18c-.68-.16-1.33-.43-1.91-.79l-1.54 1.54-2.12-2.12 1.54-1.54c-.36-.58-.63-1.23-.79-1.91H1V9.03h2.17c.16-.7.44-1.35.8-1.94L2.43 5.55l2.1-2.1 1.54 1.54c.58-.37 1.24-.64 1.93-.81V2h3v2.18c.68.16 1.33.43 1.91.79l1.54-1.54 2.12 2.12-1.54 1.54c.36.59.64 1.24.8 1.94H18V12zm-8.5 1.5c1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3 1.34 3 3 3z';
break;
case 'admin-home':
- path = 'M16 8.5l1.53 1.53-1.06 1.06L10 4.62l-6.47 6.47-1.06-1.06L10 2.5l4 4v-2h2v4zm-6-2.46l6 5.99V18H4v-5.97zM12 17v-5H8v5h4z';
+ path =
+ 'M16 8.5l1.53 1.53-1.06 1.06L10 4.62l-6.47 6.47-1.06-1.06L10 2.5l4 4v-2h2v4zm-6-2.46l6 5.99V18H4v-5.97zM12 17v-5H8v5h4z';
break;
case 'admin-links':
- path = 'M17.74 2.76c1.68 1.69 1.68 4.41 0 6.1l-1.53 1.52c-1.12 1.12-2.7 1.47-4.14 1.09l2.62-2.61.76-.77.76-.76c.84-.84.84-2.2 0-3.04-.84-.85-2.2-.85-3.04 0l-.77.76-3.38 3.38c-.37-1.44-.02-3.02 1.1-4.14l1.52-1.53c1.69-1.68 4.42-1.68 6.1 0zM8.59 13.43l5.34-5.34c.42-.42.42-1.1 0-1.52-.44-.43-1.13-.39-1.53 0l-5.33 5.34c-.42.42-.42 1.1 0 1.52.44.43 1.13.39 1.52 0zm-.76 2.29l4.14-4.15c.38 1.44.03 3.02-1.09 4.14l-1.52 1.53c-1.69 1.68-4.41 1.68-6.1 0-1.68-1.68-1.68-4.42 0-6.1l1.53-1.52c1.12-1.12 2.7-1.47 4.14-1.1l-4.14 4.15c-.85.84-.85 2.2 0 3.05.84.84 2.2.84 3.04 0z';
+ path =
+ 'M17.74 2.76c1.68 1.69 1.68 4.41 0 6.1l-1.53 1.52c-1.12 1.12-2.7 1.47-4.14 1.09l2.62-2.61.76-.77.76-.76c.84-.84.84-2.2 0-3.04-.84-.85-2.2-.85-3.04 0l-.77.76-3.38 3.38c-.37-1.44-.02-3.02 1.1-4.14l1.52-1.53c1.69-1.68 4.42-1.68 6.1 0zM8.59 13.43l5.34-5.34c.42-.42.42-1.1 0-1.52-.44-.43-1.13-.39-1.53 0l-5.33 5.34c-.42.42-.42 1.1 0 1.52.44.43 1.13.39 1.52 0zm-.76 2.29l4.14-4.15c.38 1.44.03 3.02-1.09 4.14l-1.52 1.53c-1.69 1.68-4.41 1.68-6.1 0-1.68-1.68-1.68-4.42 0-6.1l1.53-1.52c1.12-1.12 2.7-1.47 4.14-1.1l-4.14 4.15c-.85.84-.85 2.2 0 3.05.84.84 2.2.84 3.04 0z';
break;
case 'admin-media':
- path = 'M13 11V4c0-.55-.45-1-1-1h-1.67L9 1H5L3.67 3H2c-.55 0-1 .45-1 1v7c0 .55.45 1 1 1h10c.55 0 1-.45 1-1zM7 4.5c1.38 0 2.5 1.12 2.5 2.5S8.38 9.5 7 9.5 4.5 8.38 4.5 7 5.62 4.5 7 4.5zM14 6h5v10.5c0 1.38-1.12 2.5-2.5 2.5S14 17.88 14 16.5s1.12-2.5 2.5-2.5c.17 0 .34.02.5.05V9h-3V6zm-4 8.05V13h2v3.5c0 1.38-1.12 2.5-2.5 2.5S7 17.88 7 16.5 8.12 14 9.5 14c.17 0 .34.02.5.05z';
+ path =
+ 'M13 11V4c0-.55-.45-1-1-1h-1.67L9 1H5L3.67 3H2c-.55 0-1 .45-1 1v7c0 .55.45 1 1 1h10c.55 0 1-.45 1-1zM7 4.5c1.38 0 2.5 1.12 2.5 2.5S8.38 9.5 7 9.5 4.5 8.38 4.5 7 5.62 4.5 7 4.5zM14 6h5v10.5c0 1.38-1.12 2.5-2.5 2.5S14 17.88 14 16.5s1.12-2.5 2.5-2.5c.17 0 .34.02.5.05V9h-3V6zm-4 8.05V13h2v3.5c0 1.38-1.12 2.5-2.5 2.5S7 17.88 7 16.5 8.12 14 9.5 14c.17 0 .34.02.5.05z';
break;
case 'admin-multisite':
- path = 'M14.27 6.87L10 3.14 5.73 6.87 5 6.14l5-4.38 5 4.38zM14 8.42l-4.05 3.43L6 8.38v-.74l4-3.5 4 3.5v.78zM11 9.7V8H9v1.7h2zm-1.73 4.03L5 10 .73 13.73 0 13l5-4.38L10 13zm10 0L15 10l-4.27 3.73L10 13l5-4.38L20 13zM5 11l4 3.5V18H1v-3.5zm10 0l4 3.5V18h-8v-3.5zm-9 6v-2H4v2h2zm10 0v-2h-2v2h2z';
+ path =
+ 'M14.27 6.87L10 3.14 5.73 6.87 5 6.14l5-4.38 5 4.38zM14 8.42l-4.05 3.43L6 8.38v-.74l4-3.5 4 3.5v.78zM11 9.7V8H9v1.7h2zm-1.73 4.03L5 10 .73 13.73 0 13l5-4.38L10 13zm10 0L15 10l-4.27 3.73L10 13l5-4.38L20 13zM5 11l4 3.5V18H1v-3.5zm10 0l4 3.5V18h-8v-3.5zm-9 6v-2H4v2h2zm10 0v-2h-2v2h2z';
break;
case 'admin-network':
- path = 'M16.95 2.58c1.96 1.95 1.96 5.12 0 7.07-1.51 1.51-3.75 1.84-5.59 1.01l-1.87 3.31-2.99.31L5 18H2l-1-2 7.95-7.69c-.92-1.87-.62-4.18.93-5.73 1.95-1.96 5.12-1.96 7.07 0zm-2.51 3.79c.74 0 1.33-.6 1.33-1.34 0-.73-.59-1.33-1.33-1.33-.73 0-1.33.6-1.33 1.33 0 .74.6 1.34 1.33 1.34z';
+ path =
+ 'M16.95 2.58c1.96 1.95 1.96 5.12 0 7.07-1.51 1.51-3.75 1.84-5.59 1.01l-1.87 3.31-2.99.31L5 18H2l-1-2 7.95-7.69c-.92-1.87-.62-4.18.93-5.73 1.95-1.96 5.12-1.96 7.07 0zm-2.51 3.79c.74 0 1.33-.6 1.33-1.34 0-.73-.59-1.33-1.33-1.33-.73 0-1.33.6-1.33 1.33 0 .74.6 1.34 1.33 1.34z';
break;
case 'admin-page':
path = 'M6 15V2h10v13H6zm-1 1h8v2H3V5h2v11z';
break;
case 'admin-plugins':
- path = 'M13.11 4.36L9.87 7.6 8 5.73l3.24-3.24c.35-.34 1.05-.2 1.56.32.52.51.66 1.21.31 1.55zm-8 1.77l.91-1.12 9.01 9.01-1.19.84c-.71.71-2.63 1.16-3.82 1.16H6.14L4.9 17.26c-.59.59-1.54.59-2.12 0-.59-.58-.59-1.53 0-2.12l1.24-1.24v-3.88c0-1.13.4-3.19 1.09-3.89zm7.26 3.97l3.24-3.24c.34-.35 1.04-.21 1.55.31.52.51.66 1.21.31 1.55l-3.24 3.25z';
+ path =
+ 'M13.11 4.36L9.87 7.6 8 5.73l3.24-3.24c.35-.34 1.05-.2 1.56.32.52.51.66 1.21.31 1.55zm-8 1.77l.91-1.12 9.01 9.01-1.19.84c-.71.71-2.63 1.16-3.82 1.16H6.14L4.9 17.26c-.59.59-1.54.59-2.12 0-.59-.58-.59-1.53 0-2.12l1.24-1.24v-3.88c0-1.13.4-3.19 1.09-3.89zm7.26 3.97l3.24-3.24c.34-.35 1.04-.21 1.55.31.52.51.66 1.21.31 1.55l-3.24 3.25z';
break;
case 'admin-post':
- path = 'M10.44 3.02l1.82-1.82 6.36 6.35-1.83 1.82c-1.05-.68-2.48-.57-3.41.36l-.75.75c-.92.93-1.04 2.35-.35 3.41l-1.83 1.82-2.41-2.41-2.8 2.79c-.42.42-3.38 2.71-3.8 2.29s1.86-3.39 2.28-3.81l2.79-2.79L4.1 9.36l1.83-1.82c1.05.69 2.48.57 3.4-.36l.75-.75c.93-.92 1.05-2.35.36-3.41z';
+ path =
+ 'M10.44 3.02l1.82-1.82 6.36 6.35-1.83 1.82c-1.05-.68-2.48-.57-3.41.36l-.75.75c-.92.93-1.04 2.35-.35 3.41l-1.83 1.82-2.41-2.41-2.8 2.79c-.42.42-3.38 2.71-3.8 2.29s1.86-3.39 2.28-3.81l2.79-2.79L4.1 9.36l1.83-1.82c1.05.69 2.48.57 3.4-.36l.75-.75c.93-.92 1.05-2.35.36-3.41z';
break;
case 'admin-settings':
- path = 'M18 16V4c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h13c.55 0 1-.45 1-1zM8 11h1c.55 0 1 .45 1 1s-.45 1-1 1H8v1.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5V13H6c-.55 0-1-.45-1-1s.45-1 1-1h1V5.5c0-.28.22-.5.5-.5s.5.22.5.5V11zm5-2h-1c-.55 0-1-.45-1-1s.45-1 1-1h1V5.5c0-.28.22-.5.5-.5s.5.22.5.5V7h1c.55 0 1 .45 1 1s-.45 1-1 1h-1v5.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5V9z';
+ path =
+ 'M18 16V4c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h13c.55 0 1-.45 1-1zM8 11h1c.55 0 1 .45 1 1s-.45 1-1 1H8v1.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5V13H6c-.55 0-1-.45-1-1s.45-1 1-1h1V5.5c0-.28.22-.5.5-.5s.5.22.5.5V11zm5-2h-1c-.55 0-1-.45-1-1s.45-1 1-1h1V5.5c0-.28.22-.5.5-.5s.5.22.5.5V7h1c.55 0 1 .45 1 1s-.45 1-1 1h-1v5.5c0 .28-.22.5-.5.5s-.5-.22-.5-.5V9z';
break;
case 'admin-site-alt':
- path = 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm7.5 6.48c-.274.896-.908 1.64-1.75 2.05-.45-1.69-1.658-3.074-3.27-3.75.13-.444.41-.83.79-1.09-.43-.28-1-.42-1.34.07-.53.69 0 1.61.21 2v.14c-.555-.337-.99-.84-1.24-1.44-.966-.03-1.922.208-2.76.69-.087-.565-.032-1.142.16-1.68.733.07 1.453-.23 1.92-.8.46-.52-.13-1.18-.59-1.58h.36c1.36-.01 2.702.335 3.89 1 1.36 1.005 2.194 2.57 2.27 4.26.24 0 .7-.55.91-.92.172.34.32.69.44 1.05zM9 16.84c-2.05-2.08.25-3.75-1-5.24-.92-.85-2.29-.26-3.11-1.23-.282-1.473.267-2.982 1.43-3.93.52-.44 4-1 5.42.22.83.715 1.415 1.674 1.67 2.74.46.035.918-.066 1.32-.29.41 2.98-3.15 6.74-5.73 7.73zM5.15 2.09c.786-.3 1.676-.028 2.16.66-.42.38-.94.63-1.5.72.02-.294.085-.584.19-.86l-.85-.52z';
+ path =
+ 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm7.5 6.48c-.274.896-.908 1.64-1.75 2.05-.45-1.69-1.658-3.074-3.27-3.75.13-.444.41-.83.79-1.09-.43-.28-1-.42-1.34.07-.53.69 0 1.61.21 2v.14c-.555-.337-.99-.84-1.24-1.44-.966-.03-1.922.208-2.76.69-.087-.565-.032-1.142.16-1.68.733.07 1.453-.23 1.92-.8.46-.52-.13-1.18-.59-1.58h.36c1.36-.01 2.702.335 3.89 1 1.36 1.005 2.194 2.57 2.27 4.26.24 0 .7-.55.91-.92.172.34.32.69.44 1.05zM9 16.84c-2.05-2.08.25-3.75-1-5.24-.92-.85-2.29-.26-3.11-1.23-.282-1.473.267-2.982 1.43-3.93.52-.44 4-1 5.42.22.83.715 1.415 1.674 1.67 2.74.46.035.918-.066 1.32-.29.41 2.98-3.15 6.74-5.73 7.73zM5.15 2.09c.786-.3 1.676-.028 2.16.66-.42.38-.94.63-1.5.72.02-.294.085-.584.19-.86l-.85-.52z';
break;
case 'admin-site-alt2':
- path = 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm2.92 12.34c0 .35.14.63.36.66.22.03.47-.22.58-.6l.2.08c.718.384 1.07 1.22.84 2-.15.69-.743 1.198-1.45 1.24-.49-1.21-2.11.06-3.56-.22-.612-.154-1.11-.6-1.33-1.19 1.19-.11 2.85-1.73 4.36-1.97zM8 11.27c.918 0 1.695-.68 1.82-1.59.44.54.41 1.324-.07 1.83-.255.223-.594.325-.93.28-.335-.047-.635-.236-.82-.52zm3-.76c.41.39 3-.06 3.52 1.09-.95-.2-2.95.61-3.47-1.08l-.05-.01zM9.73 5.45v.27c-.65-.77-1.33-1.07-1.61-.57-.28.5 1 1.11.76 1.88-.24.77-1.27.56-1.88 1.61-.61 1.05-.49 2.42 1.24 3.67-1.192-.132-2.19-.962-2.54-2.11-.4-1.2-.09-2.26-.78-2.46C4 7.46 3 8.71 3 9.8c-1.26-1.26.05-2.86-1.2-4.18C3.5 1.998 7.644.223 11.44 1.49c-1.1 1.02-1.722 2.458-1.71 3.96z';
+ path =
+ 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm2.92 12.34c0 .35.14.63.36.66.22.03.47-.22.58-.6l.2.08c.718.384 1.07 1.22.84 2-.15.69-.743 1.198-1.45 1.24-.49-1.21-2.11.06-3.56-.22-.612-.154-1.11-.6-1.33-1.19 1.19-.11 2.85-1.73 4.36-1.97zM8 11.27c.918 0 1.695-.68 1.82-1.59.44.54.41 1.324-.07 1.83-.255.223-.594.325-.93.28-.335-.047-.635-.236-.82-.52zm3-.76c.41.39 3-.06 3.52 1.09-.95-.2-2.95.61-3.47-1.08l-.05-.01zM9.73 5.45v.27c-.65-.77-1.33-1.07-1.61-.57-.28.5 1 1.11.76 1.88-.24.77-1.27.56-1.88 1.61-.61 1.05-.49 2.42 1.24 3.67-1.192-.132-2.19-.962-2.54-2.11-.4-1.2-.09-2.26-.78-2.46C4 7.46 3 8.71 3 9.8c-1.26-1.26.05-2.86-1.2-4.18C3.5 1.998 7.644.223 11.44 1.49c-1.1 1.02-1.722 2.458-1.71 3.96z';
break;
case 'admin-site-alt3':
- path = 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zM1.11 9.68h2.51c.04.91.167 1.814.38 2.7H1.84c-.403-.85-.65-1.764-.73-2.7zm8.57-5.4V1.19c.964.366 1.756 1.08 2.22 2 .205.347.386.708.54 1.08l-2.76.01zm3.22 1.35c.232.883.37 1.788.41 2.7H9.68v-2.7h3.22zM8.32 1.19v3.09H5.56c.154-.372.335-.733.54-1.08.462-.924 1.255-1.64 2.22-2.01zm0 4.44v2.7H4.7c.04-.912.178-1.817.41-2.7h3.21zm-4.7 2.69H1.11c.08-.936.327-1.85.73-2.7H4c-.213.886-.34 1.79-.38 2.7zM4.7 9.68h3.62v2.7H5.11c-.232-.883-.37-1.788-.41-2.7zm3.63 4v3.09c-.964-.366-1.756-1.08-2.22-2-.205-.347-.386-.708-.54-1.08l2.76-.01zm1.35 3.09v-3.04h2.76c-.154.372-.335.733-.54 1.08-.464.92-1.256 1.634-2.22 2v-.04zm0-4.44v-2.7h3.62c-.04.912-.178 1.817-.41 2.7H9.68zm4.71-2.7h2.51c-.08.936-.327 1.85-.73 2.7H14c.21-.87.337-1.757.38-2.65l.01-.05zm0-1.35c-.046-.894-.176-1.78-.39-2.65h2.16c.403.85.65 1.764.73 2.7l-2.5-.05zm1-4H13.6c-.324-.91-.793-1.76-1.39-2.52 1.244.56 2.325 1.426 3.14 2.52h.04zm-9.6-2.52c-.597.76-1.066 1.61-1.39 2.52H2.65c.815-1.094 1.896-1.96 3.14-2.52zm-3.15 12H4.4c.324.91.793 1.76 1.39 2.52-1.248-.567-2.33-1.445-3.14-2.55l-.01.03zm9.56 2.52c.597-.76 1.066-1.61 1.39-2.52h1.76c-.82 1.08-1.9 1.933-3.14 2.48l-.01.04z';
+ path =
+ 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zM1.11 9.68h2.51c.04.91.167 1.814.38 2.7H1.84c-.403-.85-.65-1.764-.73-2.7zm8.57-5.4V1.19c.964.366 1.756 1.08 2.22 2 .205.347.386.708.54 1.08l-2.76.01zm3.22 1.35c.232.883.37 1.788.41 2.7H9.68v-2.7h3.22zM8.32 1.19v3.09H5.56c.154-.372.335-.733.54-1.08.462-.924 1.255-1.64 2.22-2.01zm0 4.44v2.7H4.7c.04-.912.178-1.817.41-2.7h3.21zm-4.7 2.69H1.11c.08-.936.327-1.85.73-2.7H4c-.213.886-.34 1.79-.38 2.7zM4.7 9.68h3.62v2.7H5.11c-.232-.883-.37-1.788-.41-2.7zm3.63 4v3.09c-.964-.366-1.756-1.08-2.22-2-.205-.347-.386-.708-.54-1.08l2.76-.01zm1.35 3.09v-3.04h2.76c-.154.372-.335.733-.54 1.08-.464.92-1.256 1.634-2.22 2v-.04zm0-4.44v-2.7h3.62c-.04.912-.178 1.817-.41 2.7H9.68zm4.71-2.7h2.51c-.08.936-.327 1.85-.73 2.7H14c.21-.87.337-1.757.38-2.65l.01-.05zm0-1.35c-.046-.894-.176-1.78-.39-2.65h2.16c.403.85.65 1.764.73 2.7l-2.5-.05zm1-4H13.6c-.324-.91-.793-1.76-1.39-2.52 1.244.56 2.325 1.426 3.14 2.52h.04zm-9.6-2.52c-.597.76-1.066 1.61-1.39 2.52H2.65c.815-1.094 1.896-1.96 3.14-2.52zm-3.15 12H4.4c.324.91.793 1.76 1.39 2.52-1.248-.567-2.33-1.445-3.14-2.55l-.01.03zm9.56 2.52c.597-.76 1.066-1.61 1.39-2.52h1.76c-.82 1.08-1.9 1.933-3.14 2.48l-.01.04z';
break;
case 'admin-site':
- path = 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm3.46 11.95c0 1.47-.8 3.3-4.06 4.7.3-4.17-2.52-3.69-3.2-5 .126-1.1.804-2.063 1.8-2.55-1.552-.266-3-.96-4.18-2 .05.47.28.904.64 1.21-.782-.295-1.458-.817-1.94-1.5.977-3.225 3.883-5.482 7.25-5.63-.84 1.38-1.5 4.13 0 5.57C7.23 7 6.26 5 5.41 5.79c-1.13 1.06.33 2.51 3.42 3.08 3.29.59 3.66 1.58 3.63 3.08zm1.34-4c-.32-1.11.62-2.23 1.69-3.14 1.356 1.955 1.67 4.45.84 6.68-.77-1.89-2.17-2.32-2.53-3.57v.03z';
+ path =
+ 'M9 0C4.03 0 0 4.03 0 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm3.46 11.95c0 1.47-.8 3.3-4.06 4.7.3-4.17-2.52-3.69-3.2-5 .126-1.1.804-2.063 1.8-2.55-1.552-.266-3-.96-4.18-2 .05.47.28.904.64 1.21-.782-.295-1.458-.817-1.94-1.5.977-3.225 3.883-5.482 7.25-5.63-.84 1.38-1.5 4.13 0 5.57C7.23 7 6.26 5 5.41 5.79c-1.13 1.06.33 2.51 3.42 3.08 3.29.59 3.66 1.58 3.63 3.08zm1.34-4c-.32-1.11.62-2.23 1.69-3.14 1.356 1.955 1.67 4.45.84 6.68-.77-1.89-2.17-2.32-2.53-3.57v.03z';
break;
case 'admin-tools':
- path = 'M16.68 9.77c-1.34 1.34-3.3 1.67-4.95.99l-5.41 6.52c-.99.99-2.59.99-3.58 0s-.99-2.59 0-3.57l6.52-5.42c-.68-1.65-.35-3.61.99-4.95 1.28-1.28 3.12-1.62 4.72-1.06l-2.89 2.89 2.82 2.82 2.86-2.87c.53 1.58.18 3.39-1.08 4.65zM3.81 16.21c.4.39 1.04.39 1.43 0 .4-.4.4-1.04 0-1.43-.39-.4-1.03-.4-1.43 0-.39.39-.39 1.03 0 1.43z';
+ path =
+ 'M16.68 9.77c-1.34 1.34-3.3 1.67-4.95.99l-5.41 6.52c-.99.99-2.59.99-3.58 0s-.99-2.59 0-3.57l6.52-5.42c-.68-1.65-.35-3.61.99-4.95 1.28-1.28 3.12-1.62 4.72-1.06l-2.89 2.89 2.82 2.82 2.86-2.87c.53 1.58.18 3.39-1.08 4.65zM3.81 16.21c.4.39 1.04.39 1.43 0 .4-.4.4-1.04 0-1.43-.39-.4-1.03-.4-1.43 0-.39.39-.39 1.03 0 1.43z';
break;
case 'admin-users':
- path = 'M10 9.25c-2.27 0-2.73-3.44-2.73-3.44C7 4.02 7.82 2 9.97 2c2.16 0 2.98 2.02 2.71 3.81 0 0-.41 3.44-2.68 3.44zm0 2.57L12.72 10c2.39 0 4.52 2.33 4.52 4.53v2.49s-3.65 1.13-7.24 1.13c-3.65 0-7.24-1.13-7.24-1.13v-2.49c0-2.25 1.94-4.48 4.47-4.48z';
+ path =
+ 'M10 9.25c-2.27 0-2.73-3.44-2.73-3.44C7 4.02 7.82 2 9.97 2c2.16 0 2.98 2.02 2.71 3.81 0 0-.41 3.44-2.68 3.44zm0 2.57L12.72 10c2.39 0 4.52 2.33 4.52 4.53v2.49s-3.65 1.13-7.24 1.13c-3.65 0-7.24-1.13-7.24-1.13v-2.49c0-2.25 1.94-4.48 4.47-4.48z';
break;
case 'album':
- path = 'M0 18h10v-.26c1.52.4 3.17.35 4.76-.24 4.14-1.52 6.27-6.12 4.75-10.26-1.43-3.89-5.58-6-9.51-4.98V2H0v16zM9 3v14H1V3h8zm5.45 8.22c-.68 1.35-2.32 1.9-3.67 1.23-.31-.15-.57-.35-.78-.59V8.13c.8-.86 2.11-1.13 3.22-.58 1.35.68 1.9 2.32 1.23 3.67zm-2.75-.82c.22.16.53.12.7-.1.16-.22.12-.53-.1-.7s-.53-.12-.7.1c-.16.21-.12.53.1.7zm3.01 3.67c-1.17.78-2.56.99-3.83.69-.27-.06-.44-.34-.37-.61s.34-.43.62-.36l.17.04c.96.17 1.98-.01 2.86-.59.47-.32.86-.72 1.14-1.18.15-.23.45-.3.69-.16.23.15.3.46.16.69-.36.57-.84 1.08-1.44 1.48zm1.05 1.57c-1.48.99-3.21 1.32-4.84 1.06-.28-.05-.47-.32-.41-.6.05-.27.32-.45.61-.39l.22.04c1.31.15 2.68-.14 3.87-.94.71-.47 1.27-1.07 1.7-1.74.14-.24.45-.31.68-.16.24.14.31.45.16.69-.49.79-1.16 1.49-1.99 2.04z';
+ path =
+ 'M0 18h10v-.26c1.52.4 3.17.35 4.76-.24 4.14-1.52 6.27-6.12 4.75-10.26-1.43-3.89-5.58-6-9.51-4.98V2H0v16zM9 3v14H1V3h8zm5.45 8.22c-.68 1.35-2.32 1.9-3.67 1.23-.31-.15-.57-.35-.78-.59V8.13c.8-.86 2.11-1.13 3.22-.58 1.35.68 1.9 2.32 1.23 3.67zm-2.75-.82c.22.16.53.12.7-.1.16-.22.12-.53-.1-.7s-.53-.12-.7.1c-.16.21-.12.53.1.7zm3.01 3.67c-1.17.78-2.56.99-3.83.69-.27-.06-.44-.34-.37-.61s.34-.43.62-.36l.17.04c.96.17 1.98-.01 2.86-.59.47-.32.86-.72 1.14-1.18.15-.23.45-.3.69-.16.23.15.3.46.16.69-.36.57-.84 1.08-1.44 1.48zm1.05 1.57c-1.48.99-3.21 1.32-4.84 1.06-.28-.05-.47-.32-.41-.6.05-.27.32-.45.61-.39l.22.04c1.31.15 2.68-.14 3.87-.94.71-.47 1.27-1.07 1.7-1.74.14-.24.45-.31.68-.16.24.14.31.45.16.69-.49.79-1.16 1.49-1.99 2.04z';
break;
case 'align-center':
path = 'M3 5h14V3H3v2zm12 8V7H5v6h10zM3 17h14v-2H3v2z';
@@ -109,7 +129,8 @@ export default class Dashicon extends Component {
path = 'M5 5h10V3H5v2zm12 8V7H3v6h14zM5 17h10v-2H5v2z';
break;
case 'analytics':
- path = 'M18 18V2H2v16h16zM16 5H4V4h12v1zM7 7v3h3c0 1.66-1.34 3-3 3s-3-1.34-3-3 1.34-3 3-3zm1 2V7c1.1 0 2 .9 2 2H8zm8-1h-4V7h4v1zm0 3h-4V9h4v2zm0 2h-4v-1h4v1zm0 3H4v-1h12v1z';
+ path =
+ 'M18 18V2H2v16h16zM16 5H4V4h12v1zM7 7v3h3c0 1.66-1.34 3-3 3s-3-1.34-3-3 1.34-3 3-3zm1 2V7c1.1 0 2 .9 2 2H8zm8-1h-4V7h4v1zm0 3h-4V9h4v2zm0 2h-4v-1h4v1zm0 3H4v-1h12v1z';
break;
case 'archive':
path = 'M19 4v2H1V4h18zM2 7h16v10H2V7zm11 3V9H7v1h6z';
@@ -151,109 +172,140 @@ export default class Dashicon extends Component {
path = 'M7 13l4.03-6L15 13H7z';
break;
case 'art':
- path = 'M8.55 3.06c1.01.34-1.95 2.01-.1 3.13 1.04.63 3.31-2.22 4.45-2.86.97-.54 2.67-.65 3.53 1.23 1.09 2.38.14 8.57-3.79 11.06-3.97 2.5-8.97 1.23-10.7-2.66-2.01-4.53 3.12-11.09 6.61-9.9zm1.21 6.45c.73 1.64 4.7-.5 3.79-2.8-.59-1.49-4.48 1.25-3.79 2.8z';
+ path =
+ 'M8.55 3.06c1.01.34-1.95 2.01-.1 3.13 1.04.63 3.31-2.22 4.45-2.86.97-.54 2.67-.65 3.53 1.23 1.09 2.38.14 8.57-3.79 11.06-3.97 2.5-8.97 1.23-10.7-2.66-2.01-4.53 3.12-11.09 6.61-9.9zm1.21 6.45c.73 1.64 4.7-.5 3.79-2.8-.59-1.49-4.48 1.25-3.79 2.8z';
break;
case 'awards':
- path = 'M4.46 5.16L5 7.46l-.54 2.29 2.01 1.24L7.7 13l2.3-.54 2.3.54 1.23-2.01 2.01-1.24L15 7.46l.54-2.3-2-1.24-1.24-2.01-2.3.55-2.29-.54-1.25 2zm5.55 6.34C7.79 11.5 6 9.71 6 7.49c0-2.2 1.79-3.99 4.01-3.99 2.2 0 3.99 1.79 3.99 3.99 0 2.22-1.79 4.01-3.99 4.01zm-.02-1C8.33 10.5 7 9.16 7 7.5c0-1.65 1.33-3 2.99-3S13 5.85 13 7.5c0 1.66-1.35 3-3.01 3zm3.84 1.1l-1.28 2.24-2.08-.47L13 19.2l1.4-2.2h2.5zm-7.7.07l1.25 2.25 2.13-.51L7 19.2 5.6 17H3.1z';
+ path =
+ 'M4.46 5.16L5 7.46l-.54 2.29 2.01 1.24L7.7 13l2.3-.54 2.3.54 1.23-2.01 2.01-1.24L15 7.46l.54-2.3-2-1.24-1.24-2.01-2.3.55-2.29-.54-1.25 2zm5.55 6.34C7.79 11.5 6 9.71 6 7.49c0-2.2 1.79-3.99 4.01-3.99 2.2 0 3.99 1.79 3.99 3.99 0 2.22-1.79 4.01-3.99 4.01zm-.02-1C8.33 10.5 7 9.16 7 7.5c0-1.65 1.33-3 2.99-3S13 5.85 13 7.5c0 1.66-1.35 3-3.01 3zm3.84 1.1l-1.28 2.24-2.08-.47L13 19.2l1.4-2.2h2.5zm-7.7.07l1.25 2.25 2.13-.51L7 19.2 5.6 17H3.1z';
break;
case 'backup':
- path = 'M13.65 2.88c3.93 2.01 5.48 6.84 3.47 10.77s-6.83 5.48-10.77 3.47c-1.87-.96-3.2-2.56-3.86-4.4l1.64-1.03c.45 1.57 1.52 2.95 3.08 3.76 3.01 1.54 6.69.35 8.23-2.66 1.55-3.01.36-6.69-2.65-8.24C9.78 3.01 6.1 4.2 4.56 7.21l1.88.97-4.95 3.08-.39-5.82 1.78.91C4.9 2.4 9.75.89 13.65 2.88zm-4.36 7.83C9.11 10.53 9 10.28 9 10c0-.07.03-.12.04-.19h-.01L10 5l.97 4.81L14 13l-4.5-2.12.02-.02c-.08-.04-.16-.09-.23-.15z';
+ path =
+ 'M13.65 2.88c3.93 2.01 5.48 6.84 3.47 10.77s-6.83 5.48-10.77 3.47c-1.87-.96-3.2-2.56-3.86-4.4l1.64-1.03c.45 1.57 1.52 2.95 3.08 3.76 3.01 1.54 6.69.35 8.23-2.66 1.55-3.01.36-6.69-2.65-8.24C9.78 3.01 6.1 4.2 4.56 7.21l1.88.97-4.95 3.08-.39-5.82 1.78.91C4.9 2.4 9.75.89 13.65 2.88zm-4.36 7.83C9.11 10.53 9 10.28 9 10c0-.07.03-.12.04-.19h-.01L10 5l.97 4.81L14 13l-4.5-2.12.02-.02c-.08-.04-.16-.09-.23-.15z';
break;
case 'block-default':
path = 'M15 6V4h-3v2H8V4H5v2H4c-.6 0-1 .4-1 1v8h14V7c0-.6-.4-1-1-1h-1z';
break;
case 'book-alt':
- path = 'M5 17h13v2H5c-1.66 0-3-1.34-3-3V4c0-1.66 1.34-3 3-3h13v14H5c-.55 0-1 .45-1 1s.45 1 1 1zm2-3.5v-11c0-.28-.22-.5-.5-.5s-.5.22-.5.5v11c0 .28.22.5.5.5s.5-.22.5-.5z';
+ path =
+ 'M5 17h13v2H5c-1.66 0-3-1.34-3-3V4c0-1.66 1.34-3 3-3h13v14H5c-.55 0-1 .45-1 1s.45 1 1 1zm2-3.5v-11c0-.28-.22-.5-.5-.5s-.5.22-.5.5v11c0 .28.22.5.5.5s.5-.22.5-.5z';
break;
case 'book':
- path = 'M16 3h2v16H5c-1.66 0-3-1.34-3-3V4c0-1.66 1.34-3 3-3h9v14H5c-.55 0-1 .45-1 1s.45 1 1 1h11V3z';
+ path =
+ 'M16 3h2v16H5c-1.66 0-3-1.34-3-3V4c0-1.66 1.34-3 3-3h9v14H5c-.55 0-1 .45-1 1s.45 1 1 1h11V3z';
break;
case 'buddicons-activity':
- path = 'M8 1v7h2V6c0-1.52 1.45-3 3-3v.86c.55-.52 1.26-.86 2-.86v3h1c1.1 0 2 .9 2 2s-.9 2-2 2h-1v6c0 .55-.45 1-1 1s-1-.45-1-1v-2.18c-.31.11-.65.18-1 .18v2c0 .55-.45 1-1 1s-1-.45-1-1v-2H8v2c0 .55-.45 1-1 1s-1-.45-1-1v-2c-.35 0-.69-.07-1-.18V16c0 .55-.45 1-1 1s-1-.45-1-1v-4H2v-1c0-1.66 1.34-3 3-3h2V1h1zm5 7c.55 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1z';
+ path =
+ 'M8 1v7h2V6c0-1.52 1.45-3 3-3v.86c.55-.52 1.26-.86 2-.86v3h1c1.1 0 2 .9 2 2s-.9 2-2 2h-1v6c0 .55-.45 1-1 1s-1-.45-1-1v-2.18c-.31.11-.65.18-1 .18v2c0 .55-.45 1-1 1s-1-.45-1-1v-2H8v2c0 .55-.45 1-1 1s-1-.45-1-1v-2c-.35 0-.69-.07-1-.18V16c0 .55-.45 1-1 1s-1-.45-1-1v-4H2v-1c0-1.66 1.34-3 3-3h2V1h1zm5 7c.55 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1z';
break;
case 'buddicons-bbpress-logo':
- path = 'M8.5 12.6c.3-1.3 0-2.3-1.1-2.3-.8 0-1.6.6-1.8 1.5l-.3 1.7c-.3 1 .3 1.5 1 1.5 1.2 0 1.9-1.1 2.2-2.4zm-4-6.4C3.7 7.3 3.3 8.6 3.3 10c0 1 .2 1.9.6 2.8l1-4.6c.3-1.7.4-2-.4-2zm9.3 6.4c.3-1.3 0-2.3-1.1-2.3-.8 0-1.6.6-1.8 1.5l-.4 1.7c-.2 1.1.4 1.6 1.1 1.6 1.1-.1 1.9-1.2 2.2-2.5zM10 3.3c-2 0-3.9.9-5.1 2.3.6-.1 1.4-.2 1.8-.3.2 0 .2.1.2.2 0 .2-1 4.8-1 4.8.5-.3 1.2-.7 1.8-.7.9 0 1.5.4 1.9.9l.5-2.4c.4-1.6.4-1.9-.4-1.9-.4 0-.4-.5 0-.6.6-.1 1.8-.2 2.3-.3.2 0 .2.1.2.2l-1 4.8c.5-.4 1.2-.7 1.9-.7 1.7 0 2.5 1.3 2.1 3-.3 1.7-2 3-3.8 3-1.3 0-2.1-.7-2.3-1.4-.7.8-1.7 1.3-2.8 1.4 1.1.7 2.4 1.1 3.7 1.1 3.7 0 6.7-3 6.7-6.7s-3-6.7-6.7-6.7zM10 2c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 15.5c-2.1 0-4-.8-5.3-2.2-.3-.4-.7-.8-1-1.2-.7-1.2-1.2-2.6-1.2-4.1 0-4.1 3.4-7.5 7.5-7.5s7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5z';
+ path =
+ 'M8.5 12.6c.3-1.3 0-2.3-1.1-2.3-.8 0-1.6.6-1.8 1.5l-.3 1.7c-.3 1 .3 1.5 1 1.5 1.2 0 1.9-1.1 2.2-2.4zm-4-6.4C3.7 7.3 3.3 8.6 3.3 10c0 1 .2 1.9.6 2.8l1-4.6c.3-1.7.4-2-.4-2zm9.3 6.4c.3-1.3 0-2.3-1.1-2.3-.8 0-1.6.6-1.8 1.5l-.4 1.7c-.2 1.1.4 1.6 1.1 1.6 1.1-.1 1.9-1.2 2.2-2.5zM10 3.3c-2 0-3.9.9-5.1 2.3.6-.1 1.4-.2 1.8-.3.2 0 .2.1.2.2 0 .2-1 4.8-1 4.8.5-.3 1.2-.7 1.8-.7.9 0 1.5.4 1.9.9l.5-2.4c.4-1.6.4-1.9-.4-1.9-.4 0-.4-.5 0-.6.6-.1 1.8-.2 2.3-.3.2 0 .2.1.2.2l-1 4.8c.5-.4 1.2-.7 1.9-.7 1.7 0 2.5 1.3 2.1 3-.3 1.7-2 3-3.8 3-1.3 0-2.1-.7-2.3-1.4-.7.8-1.7 1.3-2.8 1.4 1.1.7 2.4 1.1 3.7 1.1 3.7 0 6.7-3 6.7-6.7s-3-6.7-6.7-6.7zM10 2c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 15.5c-2.1 0-4-.8-5.3-2.2-.3-.4-.7-.8-1-1.2-.7-1.2-1.2-2.6-1.2-4.1 0-4.1 3.4-7.5 7.5-7.5s7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5z';
break;
case 'buddicons-buddypress-logo':
- path = 'M10 0c5.52 0 10 4.48 10 10s-4.48 10-10 10S0 15.52 0 10 4.48 0 10 0zm0 .5C4.75.5.5 4.75.5 10s4.25 9.5 9.5 9.5 9.5-4.25 9.5-9.5S15.25.5 10 .5zm0 1c4.7 0 8.5 3.8 8.5 8.5s-3.8 8.5-8.5 8.5-8.5-3.8-8.5-8.5S5.3 1.5 10 1.5zm1.8 1.71c-.57 0-1.1.17-1.55.45 1.56.37 2.73 1.77 2.73 3.45 0 .69-.21 1.33-.55 1.87 1.31-.29 2.29-1.45 2.29-2.85 0-1.61-1.31-2.92-2.92-2.92zm-2.38 1c-1.61 0-2.92 1.31-2.92 2.93 0 1.61 1.31 2.92 2.92 2.92 1.62 0 2.93-1.31 2.93-2.92 0-1.62-1.31-2.93-2.93-2.93zm4.25 5.01l-.51.59c2.34.69 2.45 3.61 2.45 3.61h1.28c0-4.71-3.22-4.2-3.22-4.2zm-2.1.8l-2.12 2.09-2.12-2.09C3.12 10.24 3.89 15 3.89 15h11.08c.47-4.98-3.4-4.98-3.4-4.98z';
+ path =
+ 'M10 0c5.52 0 10 4.48 10 10s-4.48 10-10 10S0 15.52 0 10 4.48 0 10 0zm0 .5C4.75.5.5 4.75.5 10s4.25 9.5 9.5 9.5 9.5-4.25 9.5-9.5S15.25.5 10 .5zm0 1c4.7 0 8.5 3.8 8.5 8.5s-3.8 8.5-8.5 8.5-8.5-3.8-8.5-8.5S5.3 1.5 10 1.5zm1.8 1.71c-.57 0-1.1.17-1.55.45 1.56.37 2.73 1.77 2.73 3.45 0 .69-.21 1.33-.55 1.87 1.31-.29 2.29-1.45 2.29-2.85 0-1.61-1.31-2.92-2.92-2.92zm-2.38 1c-1.61 0-2.92 1.31-2.92 2.93 0 1.61 1.31 2.92 2.92 2.92 1.62 0 2.93-1.31 2.93-2.92 0-1.62-1.31-2.93-2.93-2.93zm4.25 5.01l-.51.59c2.34.69 2.45 3.61 2.45 3.61h1.28c0-4.71-3.22-4.2-3.22-4.2zm-2.1.8l-2.12 2.09-2.12-2.09C3.12 10.24 3.89 15 3.89 15h11.08c.47-4.98-3.4-4.98-3.4-4.98z';
break;
case 'buddicons-community':
- path = 'M9 3c0-.67-.47-1.43-1-2-.5.5-1 1.38-1 2 0 .48.45 1 1 1s1-.47 1-1zm4 0c0-.67-.47-1.43-1-2-.5.5-1 1.38-1 2 0 .48.45 1 1 1s1-.47 1-1zM9 9V5.5c0-.55-.45-1-1-1-.57 0-1 .49-1 1V9c0 .55.45 1 1 1 .57 0 1-.49 1-1zm4 0V5.5c0-.55-.45-1-1-1-.57 0-1 .49-1 1V9c0 .55.45 1 1 1 .57 0 1-.49 1-1zm4 1c0-1.48-1.41-2.77-3.5-3.46V9c0 .83-.67 1.5-1.5 1.5s-1.5-.67-1.5-1.5V6.01c-.17 0-.33-.01-.5-.01s-.33.01-.5.01V9c0 .83-.67 1.5-1.5 1.5S6.5 9.83 6.5 9V6.54C4.41 7.23 3 8.52 3 10c0 1.41.95 2.65 3.21 3.37 1.11.35 2.39 1.12 3.79 1.12s2.69-.78 3.79-1.13C16.04 12.65 17 11.41 17 10zm-7 5.43c1.43 0 2.74-.79 3.88-1.11 1.9-.53 2.49-1.34 3.12-2.32v3c0 2.21-3.13 4-7 4s-7-1.79-7-4v-3c.64.99 1.32 1.8 3.15 2.33 1.13.33 2.44 1.1 3.85 1.1z';
+ path =
+ 'M9 3c0-.67-.47-1.43-1-2-.5.5-1 1.38-1 2 0 .48.45 1 1 1s1-.47 1-1zm4 0c0-.67-.47-1.43-1-2-.5.5-1 1.38-1 2 0 .48.45 1 1 1s1-.47 1-1zM9 9V5.5c0-.55-.45-1-1-1-.57 0-1 .49-1 1V9c0 .55.45 1 1 1 .57 0 1-.49 1-1zm4 0V5.5c0-.55-.45-1-1-1-.57 0-1 .49-1 1V9c0 .55.45 1 1 1 .57 0 1-.49 1-1zm4 1c0-1.48-1.41-2.77-3.5-3.46V9c0 .83-.67 1.5-1.5 1.5s-1.5-.67-1.5-1.5V6.01c-.17 0-.33-.01-.5-.01s-.33.01-.5.01V9c0 .83-.67 1.5-1.5 1.5S6.5 9.83 6.5 9V6.54C4.41 7.23 3 8.52 3 10c0 1.41.95 2.65 3.21 3.37 1.11.35 2.39 1.12 3.79 1.12s2.69-.78 3.79-1.13C16.04 12.65 17 11.41 17 10zm-7 5.43c1.43 0 2.74-.79 3.88-1.11 1.9-.53 2.49-1.34 3.12-2.32v3c0 2.21-3.13 4-7 4s-7-1.79-7-4v-3c.64.99 1.32 1.8 3.15 2.33 1.13.33 2.44 1.1 3.85 1.1z';
break;
case 'buddicons-forums':
- path = 'M13.5 7h-7C5.67 7 5 6.33 5 5.5S5.67 4 6.5 4h1.59C8.04 3.84 8 3.68 8 3.5 8 2.67 8.67 2 9.5 2h1c.83 0 1.5.67 1.5 1.5 0 .18-.04.34-.09.5h1.59c.83 0 1.5.67 1.5 1.5S14.33 7 13.5 7zM4 8h12c.55 0 1 .45 1 1s-.45 1-1 1H4c-.55 0-1-.45-1-1s.45-1 1-1zm1 3h10c.55 0 1 .45 1 1s-.45 1-1 1H5c-.55 0-1-.45-1-1s.45-1 1-1zm2 3h6c.55 0 1 .45 1 1s-.45 1-1 1h-1.09c.05.16.09.32.09.5 0 .83-.67 1.5-1.5 1.5h-1c-.83 0-1.5-.67-1.5-1.5 0-.18.04-.34.09-.5H7c-.55 0-1-.45-1-1s.45-1 1-1z';
+ path =
+ 'M13.5 7h-7C5.67 7 5 6.33 5 5.5S5.67 4 6.5 4h1.59C8.04 3.84 8 3.68 8 3.5 8 2.67 8.67 2 9.5 2h1c.83 0 1.5.67 1.5 1.5 0 .18-.04.34-.09.5h1.59c.83 0 1.5.67 1.5 1.5S14.33 7 13.5 7zM4 8h12c.55 0 1 .45 1 1s-.45 1-1 1H4c-.55 0-1-.45-1-1s.45-1 1-1zm1 3h10c.55 0 1 .45 1 1s-.45 1-1 1H5c-.55 0-1-.45-1-1s.45-1 1-1zm2 3h6c.55 0 1 .45 1 1s-.45 1-1 1h-1.09c.05.16.09.32.09.5 0 .83-.67 1.5-1.5 1.5h-1c-.83 0-1.5-.67-1.5-1.5 0-.18.04-.34.09-.5H7c-.55 0-1-.45-1-1s.45-1 1-1z';
break;
case 'buddicons-friends':
- path = 'M8.75 5.77C8.75 4.39 7 2 7 2S5.25 4.39 5.25 5.77 5.9 7.5 7 7.5s1.75-.35 1.75-1.73zm6 0C14.75 4.39 13 2 13 2s-1.75 2.39-1.75 3.77S11.9 7.5 13 7.5s1.75-.35 1.75-1.73zM9 17V9c0-.55-.45-1-1-1H6c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h2c.55 0 1-.45 1-1zm6 0V9c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h2c.55 0 1-.45 1-1zm-9-6l2-1v2l-2 1v-2zm6 0l2-1v2l-2 1v-2zm-6 3l2-1v2l-2 1v-2zm6 0l2-1v2l-2 1v-2z';
+ path =
+ 'M8.75 5.77C8.75 4.39 7 2 7 2S5.25 4.39 5.25 5.77 5.9 7.5 7 7.5s1.75-.35 1.75-1.73zm6 0C14.75 4.39 13 2 13 2s-1.75 2.39-1.75 3.77S11.9 7.5 13 7.5s1.75-.35 1.75-1.73zM9 17V9c0-.55-.45-1-1-1H6c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h2c.55 0 1-.45 1-1zm6 0V9c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1h2c.55 0 1-.45 1-1zm-9-6l2-1v2l-2 1v-2zm6 0l2-1v2l-2 1v-2zm-6 3l2-1v2l-2 1v-2zm6 0l2-1v2l-2 1v-2z';
break;
case 'buddicons-groups':
- path = 'M15.45 6.25c1.83.94 1.98 3.18.7 4.98-.8 1.12-2.33 1.88-3.46 1.78L10.05 18H9l-2.65-4.99c-1.13.16-2.73-.63-3.55-1.79-1.28-1.8-1.13-4.04.71-4.97.48-.24.96-.33 1.43-.31-.01.4.01.8.07 1.21.26 1.69 1.41 3.53 2.86 4.37-.19.55-.49.99-.88 1.25L9 16.58v-5.66C7.64 10.55 6.26 8.76 6 7c-.4-2.65 1-5 3.5-5s3.9 2.35 3.5 5c-.26 1.76-1.64 3.55-3 3.92v5.77l2.07-3.84c-.44-.23-.77-.71-.99-1.3 1.48-.83 2.65-2.69 2.91-4.4.06-.41.08-.82.07-1.22.46-.01.92.08 1.39.32z';
+ path =
+ 'M15.45 6.25c1.83.94 1.98 3.18.7 4.98-.8 1.12-2.33 1.88-3.46 1.78L10.05 18H9l-2.65-4.99c-1.13.16-2.73-.63-3.55-1.79-1.28-1.8-1.13-4.04.71-4.97.48-.24.96-.33 1.43-.31-.01.4.01.8.07 1.21.26 1.69 1.41 3.53 2.86 4.37-.19.55-.49.99-.88 1.25L9 16.58v-5.66C7.64 10.55 6.26 8.76 6 7c-.4-2.65 1-5 3.5-5s3.9 2.35 3.5 5c-.26 1.76-1.64 3.55-3 3.92v5.77l2.07-3.84c-.44-.23-.77-.71-.99-1.3 1.48-.83 2.65-2.69 2.91-4.4.06-.41.08-.82.07-1.22.46-.01.92.08 1.39.32z';
break;
case 'buddicons-pm':
- path = 'M10 2c3 0 8 5 8 5v11H2V7s5-5 8-5zm7 14.72l-3.73-2.92L17 11l-.43-.37-2.26 1.3.24-4.31-8.77-.52-.46 4.54-1.99-.95L3 11l3.73 2.8-3.44 2.85.4.43L10 13l6.53 4.15z';
+ path =
+ 'M10 2c3 0 8 5 8 5v11H2V7s5-5 8-5zm7 14.72l-3.73-2.92L17 11l-.43-.37-2.26 1.3.24-4.31-8.77-.52-.46 4.54-1.99-.95L3 11l3.73 2.8-3.44 2.85.4.43L10 13l6.53 4.15z';
break;
case 'buddicons-replies':
- path = 'M17.54 10.29c1.17 1.17 1.17 3.08 0 4.25-1.18 1.17-3.08 1.17-4.25 0l-.34-.52c0 3.66-2 4.38-2.95 4.98-.82-.6-2.95-1.28-2.95-4.98l-.34.52c-1.17 1.17-3.07 1.17-4.25 0-1.17-1.17-1.17-3.08 0-4.25 0 0 1.02-.67 2.1-1.3C3.71 7.84 3.2 6.42 3.2 4.88c0-.34.03-.67.08-1C3.53 5.66 4.47 7.22 5.8 8.3c.67-.35 1.85-.83 2.37-.92H8c-1.1 0-2-.9-2-2s.9-2 2-2v-.5c0-.28.22-.5.5-.5s.5.22.5.5v.5h2v-.5c0-.28.22-.5.5-.5s.5.22.5.5v.5c1.1 0 2 .9 2 2s-.9 2-2 2h-.17c.51.09 1.78.61 2.38.92 1.33-1.08 2.27-2.64 2.52-4.42.05.33.08.66.08 1 0 1.54-.51 2.96-1.36 4.11 1.08.63 2.09 1.3 2.09 1.3zM8.5 6.38c.5 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1zm3-2c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zm-2.3 5.73c-.12.11-.19.26-.19.43.02.25.23.46.49.46h1c.26 0 .47-.21.49-.46 0-.15-.07-.29-.19-.43-.08-.06-.18-.11-.3-.11h-1c-.12 0-.22.05-.3.11zM12 12.5c0-.12-.06-.28-.19-.38-.09-.07-.19-.12-.31-.12h-3c-.12 0-.22.05-.31.12-.11.1-.19.25-.19.38 0 .28.22.5.5.5h3c.28 0 .5-.22.5-.5zM8.5 15h3c.28 0 .5-.22.5-.5s-.22-.5-.5-.5h-3c-.28 0-.5.22-.5.5s.22.5.5.5zm1 2h1c.28 0 .5-.22.5-.5s-.22-.5-.5-.5h-1c-.28 0-.5.22-.5.5s.22.5.5.5z';
+ path =
+ 'M17.54 10.29c1.17 1.17 1.17 3.08 0 4.25-1.18 1.17-3.08 1.17-4.25 0l-.34-.52c0 3.66-2 4.38-2.95 4.98-.82-.6-2.95-1.28-2.95-4.98l-.34.52c-1.17 1.17-3.07 1.17-4.25 0-1.17-1.17-1.17-3.08 0-4.25 0 0 1.02-.67 2.1-1.3C3.71 7.84 3.2 6.42 3.2 4.88c0-.34.03-.67.08-1C3.53 5.66 4.47 7.22 5.8 8.3c.67-.35 1.85-.83 2.37-.92H8c-1.1 0-2-.9-2-2s.9-2 2-2v-.5c0-.28.22-.5.5-.5s.5.22.5.5v.5h2v-.5c0-.28.22-.5.5-.5s.5.22.5.5v.5c1.1 0 2 .9 2 2s-.9 2-2 2h-.17c.51.09 1.78.61 2.38.92 1.33-1.08 2.27-2.64 2.52-4.42.05.33.08.66.08 1 0 1.54-.51 2.96-1.36 4.11 1.08.63 2.09 1.3 2.09 1.3zM8.5 6.38c.5 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1zm3-2c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zm-2.3 5.73c-.12.11-.19.26-.19.43.02.25.23.46.49.46h1c.26 0 .47-.21.49-.46 0-.15-.07-.29-.19-.43-.08-.06-.18-.11-.3-.11h-1c-.12 0-.22.05-.3.11zM12 12.5c0-.12-.06-.28-.19-.38-.09-.07-.19-.12-.31-.12h-3c-.12 0-.22.05-.31.12-.11.1-.19.25-.19.38 0 .28.22.5.5.5h3c.28 0 .5-.22.5-.5zM8.5 15h3c.28 0 .5-.22.5-.5s-.22-.5-.5-.5h-3c-.28 0-.5.22-.5.5s.22.5.5.5zm1 2h1c.28 0 .5-.22.5-.5s-.22-.5-.5-.5h-1c-.28 0-.5.22-.5.5s.22.5.5.5z';
break;
case 'buddicons-topics':
- path = 'M10.44 1.66c-.59-.58-1.54-.58-2.12 0L2.66 7.32c-.58.58-.58 1.53 0 2.12.6.6 1.56.56 2.12 0l5.66-5.66c.58-.58.59-1.53 0-2.12zm2.83 2.83c-.59-.59-1.54-.59-2.12 0l-5.66 5.66c-.59.58-.59 1.53 0 2.12.6.6 1.56.55 2.12 0l5.66-5.66c.58-.58.58-1.53 0-2.12zm1.06 6.72l4.18 4.18c.59.58.59 1.53 0 2.12s-1.54.59-2.12 0l-4.18-4.18-1.77 1.77c-.59.58-1.54.58-2.12 0-.59-.59-.59-1.54 0-2.13l5.66-5.65c.58-.59 1.53-.59 2.12 0 .58.58.58 1.53 0 2.12zM5 15c0-1.59-1.66-4-1.66-4S2 13.78 2 15s.6 2 1.34 2h.32C4.4 17 5 16.59 5 15z';
+ path =
+ 'M10.44 1.66c-.59-.58-1.54-.58-2.12 0L2.66 7.32c-.58.58-.58 1.53 0 2.12.6.6 1.56.56 2.12 0l5.66-5.66c.58-.58.59-1.53 0-2.12zm2.83 2.83c-.59-.59-1.54-.59-2.12 0l-5.66 5.66c-.59.58-.59 1.53 0 2.12.6.6 1.56.55 2.12 0l5.66-5.66c.58-.58.58-1.53 0-2.12zm1.06 6.72l4.18 4.18c.59.58.59 1.53 0 2.12s-1.54.59-2.12 0l-4.18-4.18-1.77 1.77c-.59.58-1.54.58-2.12 0-.59-.59-.59-1.54 0-2.13l5.66-5.65c.58-.59 1.53-.59 2.12 0 .58.58.58 1.53 0 2.12zM5 15c0-1.59-1.66-4-1.66-4S2 13.78 2 15s.6 2 1.34 2h.32C4.4 17 5 16.59 5 15z';
break;
case 'buddicons-tracking':
- path = 'M10.98 6.78L15.5 15c-1 2-3.5 3-5.5 3s-4.5-1-5.5-3L9 6.82c-.75-1.23-2.28-1.98-4.29-2.03l2.46-2.92c1.68 1.19 2.46 2.32 2.97 3.31.56-.87 1.2-1.68 2.7-2.12l1.83 2.86c-1.42-.34-2.64.08-3.69.86zM8.17 10.4l-.93 1.69c.49.11 1 .16 1.54.16 1.35 0 2.58-.36 3.55-.95l-1.01-1.82c-.87.53-1.96.86-3.15.92zm.86 5.38c1.99 0 3.73-.74 4.74-1.86l-.98-1.76c-1 1.12-2.74 1.87-4.74 1.87-.62 0-1.21-.08-1.76-.21l-.63 1.15c.94.5 2.1.81 3.37.81z';
+ path =
+ 'M10.98 6.78L15.5 15c-1 2-3.5 3-5.5 3s-4.5-1-5.5-3L9 6.82c-.75-1.23-2.28-1.98-4.29-2.03l2.46-2.92c1.68 1.19 2.46 2.32 2.97 3.31.56-.87 1.2-1.68 2.7-2.12l1.83 2.86c-1.42-.34-2.64.08-3.69.86zM8.17 10.4l-.93 1.69c.49.11 1 .16 1.54.16 1.35 0 2.58-.36 3.55-.95l-1.01-1.82c-.87.53-1.96.86-3.15.92zm.86 5.38c1.99 0 3.73-.74 4.74-1.86l-.98-1.76c-1 1.12-2.74 1.87-4.74 1.87-.62 0-1.21-.08-1.76-.21l-.63 1.15c.94.5 2.1.81 3.37.81z';
break;
case 'building':
- path = 'M3 20h14V0H3v20zM7 3H5V1h2v2zm4 0H9V1h2v2zm4 0h-2V1h2v2zM7 6H5V4h2v2zm4 0H9V4h2v2zm4 0h-2V4h2v2zM7 9H5V7h2v2zm4 0H9V7h2v2zm4 0h-2V7h2v2zm-8 3H5v-2h2v2zm4 0H9v-2h2v2zm4 0h-2v-2h2v2zm-4 7H5v-6h6v6zm4-4h-2v-2h2v2zm0 3h-2v-2h2v2z';
+ path =
+ 'M3 20h14V0H3v20zM7 3H5V1h2v2zm4 0H9V1h2v2zm4 0h-2V1h2v2zM7 6H5V4h2v2zm4 0H9V4h2v2zm4 0h-2V4h2v2zM7 9H5V7h2v2zm4 0H9V7h2v2zm4 0h-2V7h2v2zm-8 3H5v-2h2v2zm4 0H9v-2h2v2zm4 0h-2v-2h2v2zm-4 7H5v-6h6v6zm4-4h-2v-2h2v2zm0 3h-2v-2h2v2z';
break;
case 'businessman':
- path = 'M7.3 6l-.03-.19c-.04-.37-.05-.73-.03-1.08.02-.36.1-.71.25-1.04.14-.32.31-.61.52-.86s.49-.46.83-.6c.34-.15.72-.23 1.13-.23.69 0 1.26.2 1.71.59s.76.87.91 1.44.18 1.16.09 1.78l-.03.19c-.01.09-.05.25-.11.48-.05.24-.12.47-.2.69-.08.21-.19.45-.34.72-.14.27-.3.49-.47.69-.18.19-.4.34-.67.48-.27.13-.55.19-.86.19s-.59-.06-.87-.19c-.26-.13-.49-.29-.67-.5-.18-.2-.34-.42-.49-.66-.15-.25-.26-.49-.34-.73-.09-.25-.16-.47-.21-.67-.06-.21-.1-.37-.12-.5zm9.2 6.24c.41.7.5 1.41.5 2.14v2.49c0 .03-.12.08-.29.13-.18.04-.42.13-.97.27-.55.12-1.1.24-1.65.34s-1.19.19-1.95.27c-.75.08-1.46.12-2.13.12-.68 0-1.39-.04-2.14-.12-.75-.07-1.4-.17-1.98-.27-.58-.11-1.08-.23-1.56-.34-.49-.11-.8-.21-1.06-.29L3 16.87v-2.49c0-.75.07-1.46.46-2.15s.81-1.25 1.5-1.68C5.66 10.12 7.19 10 8 10l1.67 1.67L9 13v3l1.02 1.08L11 16v-3l-.68-1.33L11.97 10c.77 0 2.2.07 2.9.52.71.45 1.21 1.02 1.63 1.72z';
+ path =
+ 'M7.3 6l-.03-.19c-.04-.37-.05-.73-.03-1.08.02-.36.1-.71.25-1.04.14-.32.31-.61.52-.86s.49-.46.83-.6c.34-.15.72-.23 1.13-.23.69 0 1.26.2 1.71.59s.76.87.91 1.44.18 1.16.09 1.78l-.03.19c-.01.09-.05.25-.11.48-.05.24-.12.47-.2.69-.08.21-.19.45-.34.72-.14.27-.3.49-.47.69-.18.19-.4.34-.67.48-.27.13-.55.19-.86.19s-.59-.06-.87-.19c-.26-.13-.49-.29-.67-.5-.18-.2-.34-.42-.49-.66-.15-.25-.26-.49-.34-.73-.09-.25-.16-.47-.21-.67-.06-.21-.1-.37-.12-.5zm9.2 6.24c.41.7.5 1.41.5 2.14v2.49c0 .03-.12.08-.29.13-.18.04-.42.13-.97.27-.55.12-1.1.24-1.65.34s-1.19.19-1.95.27c-.75.08-1.46.12-2.13.12-.68 0-1.39-.04-2.14-.12-.75-.07-1.4-.17-1.98-.27-.58-.11-1.08-.23-1.56-.34-.49-.11-.8-.21-1.06-.29L3 16.87v-2.49c0-.75.07-1.46.46-2.15s.81-1.25 1.5-1.68C5.66 10.12 7.19 10 8 10l1.67 1.67L9 13v3l1.02 1.08L11 16v-3l-.68-1.33L11.97 10c.77 0 2.2.07 2.9.52.71.45 1.21 1.02 1.63 1.72z';
break;
case 'button':
- path = 'M17 5H3c-1.1 0-2 .9-2 2v6c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm1 7c0 .6-.4 1-1 1H3c-.6 0-1-.4-1-1V7c0-.6.4-1 1-1h14c.6 0 1 .4 1 1v5z';
+ path =
+ 'M17 5H3c-1.1 0-2 .9-2 2v6c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm1 7c0 .6-.4 1-1 1H3c-.6 0-1-.4-1-1V7c0-.6.4-1 1-1h14c.6 0 1 .4 1 1v5z';
break;
case 'calendar-alt':
- path = 'M15 4h3v15H2V4h3V3c0-.41.15-.76.44-1.06.29-.29.65-.44 1.06-.44s.77.15 1.06.44c.29.3.44.65.44 1.06v1h4V3c0-.41.15-.76.44-1.06.29-.29.65-.44 1.06-.44s.77.15 1.06.44c.29.3.44.65.44 1.06v1zM6 3v2.5c0 .14.05.26.15.36.09.09.21.14.35.14s.26-.05.35-.14c.1-.1.15-.22.15-.36V3c0-.14-.05-.26-.15-.35-.09-.1-.21-.15-.35-.15s-.26.05-.35.15c-.1.09-.15.21-.15.35zm7 0v2.5c0 .14.05.26.14.36.1.09.22.14.36.14s.26-.05.36-.14c.09-.1.14-.22.14-.36V3c0-.14-.05-.26-.14-.35-.1-.1-.22-.15-.36-.15s-.26.05-.36.15c-.09.09-.14.21-.14.35zm4 15V8H3v10h14zM7 9v2H5V9h2zm2 0h2v2H9V9zm4 2V9h2v2h-2zm-6 1v2H5v-2h2zm2 0h2v2H9v-2zm4 2v-2h2v2h-2zm-6 1v2H5v-2h2zm4 2H9v-2h2v2zm4 0h-2v-2h2v2z';
+ path =
+ 'M15 4h3v15H2V4h3V3c0-.41.15-.76.44-1.06.29-.29.65-.44 1.06-.44s.77.15 1.06.44c.29.3.44.65.44 1.06v1h4V3c0-.41.15-.76.44-1.06.29-.29.65-.44 1.06-.44s.77.15 1.06.44c.29.3.44.65.44 1.06v1zM6 3v2.5c0 .14.05.26.15.36.09.09.21.14.35.14s.26-.05.35-.14c.1-.1.15-.22.15-.36V3c0-.14-.05-.26-.15-.35-.09-.1-.21-.15-.35-.15s-.26.05-.35.15c-.1.09-.15.21-.15.35zm7 0v2.5c0 .14.05.26.14.36.1.09.22.14.36.14s.26-.05.36-.14c.09-.1.14-.22.14-.36V3c0-.14-.05-.26-.14-.35-.1-.1-.22-.15-.36-.15s-.26.05-.36.15c-.09.09-.14.21-.14.35zm4 15V8H3v10h14zM7 9v2H5V9h2zm2 0h2v2H9V9zm4 2V9h2v2h-2zm-6 1v2H5v-2h2zm2 0h2v2H9v-2zm4 2v-2h2v2h-2zm-6 1v2H5v-2h2zm4 2H9v-2h2v2zm4 0h-2v-2h2v2z';
break;
case 'calendar':
- path = 'M15 4h3v14H2V4h3V3c0-.83.67-1.5 1.5-1.5S8 2.17 8 3v1h4V3c0-.83.67-1.5 1.5-1.5S15 2.17 15 3v1zM6 3v2.5c0 .28.22.5.5.5s.5-.22.5-.5V3c0-.28-.22-.5-.5-.5S6 2.72 6 3zm7 0v2.5c0 .28.22.5.5.5s.5-.22.5-.5V3c0-.28-.22-.5-.5-.5s-.5.22-.5.5zm4 14V8H3v9h14zM7 16V9H5v7h2zm4 0V9H9v7h2zm4 0V9h-2v7h2z';
+ path =
+ 'M15 4h3v14H2V4h3V3c0-.83.67-1.5 1.5-1.5S8 2.17 8 3v1h4V3c0-.83.67-1.5 1.5-1.5S15 2.17 15 3v1zM6 3v2.5c0 .28.22.5.5.5s.5-.22.5-.5V3c0-.28-.22-.5-.5-.5S6 2.72 6 3zm7 0v2.5c0 .28.22.5.5.5s.5-.22.5-.5V3c0-.28-.22-.5-.5-.5s-.5.22-.5.5zm4 14V8H3v9h14zM7 16V9H5v7h2zm4 0V9H9v7h2zm4 0V9h-2v7h2z';
break;
case 'camera':
- path = 'M6 5V3H3v2h3zm12 10V4H9L7 6H2v9h16zm-7-8c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3z';
+ path =
+ 'M6 5V3H3v2h3zm12 10V4H9L7 6H2v9h16zm-7-8c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3z';
break;
case 'carrot':
- path = 'M2 18.43c1.51 1.36 11.64-4.67 13.14-7.21.72-1.22-.13-3.01-1.52-4.44C15.2 5.73 16.59 9 17.91 8.31c.6-.32.99-1.31.7-1.92-.52-1.08-2.25-1.08-3.42-1.21.83-.2 2.82-1.05 2.86-2.25.04-.92-1.13-1.97-2.05-1.86-1.21.14-1.65 1.88-2.06 3-.05-.71-.2-2.27-.98-2.95-1.04-.91-2.29-.05-2.32 1.05-.04 1.33 2.82 2.07 1.92 3.67C11.04 4.67 9.25 4.03 8.1 4.7c-.49.31-1.05.91-1.63 1.69.89.94 2.12 2.07 3.09 2.72.2.14.26.42.11.62-.14.21-.42.26-.62.12-.99-.67-2.2-1.78-3.1-2.71-.45.67-.91 1.43-1.34 2.23.85.86 1.93 1.83 2.79 2.41.2.14.25.42.11.62-.14.21-.42.26-.63.12-.85-.58-1.86-1.48-2.71-2.32C2.4 13.69 1.1 17.63 2 18.43z';
+ path =
+ 'M2 18.43c1.51 1.36 11.64-4.67 13.14-7.21.72-1.22-.13-3.01-1.52-4.44C15.2 5.73 16.59 9 17.91 8.31c.6-.32.99-1.31.7-1.92-.52-1.08-2.25-1.08-3.42-1.21.83-.2 2.82-1.05 2.86-2.25.04-.92-1.13-1.97-2.05-1.86-1.21.14-1.65 1.88-2.06 3-.05-.71-.2-2.27-.98-2.95-1.04-.91-2.29-.05-2.32 1.05-.04 1.33 2.82 2.07 1.92 3.67C11.04 4.67 9.25 4.03 8.1 4.7c-.49.31-1.05.91-1.63 1.69.89.94 2.12 2.07 3.09 2.72.2.14.26.42.11.62-.14.21-.42.26-.62.12-.99-.67-2.2-1.78-3.1-2.71-.45.67-.91 1.43-1.34 2.23.85.86 1.93 1.83 2.79 2.41.2.14.25.42.11.62-.14.21-.42.26-.63.12-.85-.58-1.86-1.48-2.71-2.32C2.4 13.69 1.1 17.63 2 18.43z';
break;
case 'cart':
- path = 'M6 13h9c.55 0 1 .45 1 1s-.45 1-1 1H5c-.55 0-1-.45-1-1V4H2c-.55 0-1-.45-1-1s.45-1 1-1h3c.55 0 1 .45 1 1v2h13l-4 7H6v1zm-.5 3c.83 0 1.5.67 1.5 1.5S6.33 19 5.5 19 4 18.33 4 17.5 4.67 16 5.5 16zm9 0c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5-1.5-.67-1.5-1.5.67-1.5 1.5-1.5z';
+ path =
+ 'M6 13h9c.55 0 1 .45 1 1s-.45 1-1 1H5c-.55 0-1-.45-1-1V4H2c-.55 0-1-.45-1-1s.45-1 1-1h3c.55 0 1 .45 1 1v2h13l-4 7H6v1zm-.5 3c.83 0 1.5.67 1.5 1.5S6.33 19 5.5 19 4 18.33 4 17.5 4.67 16 5.5 16zm9 0c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5-1.5-.67-1.5-1.5.67-1.5 1.5-1.5z';
break;
case 'category':
path = 'M5 7h13v10H2V4h7l2 2H4v9h1V7z';
break;
case 'chart-area':
- path = 'M18 18l.01-12.28c.59-.35.99-.99.99-1.72 0-1.1-.9-2-2-2s-2 .9-2 2c0 .8.47 1.48 1.14 1.8l-4.13 6.58c-.33-.24-.73-.38-1.16-.38-.84 0-1.55.51-1.85 1.24l-2.14-1.53c.09-.22.14-.46.14-.71 0-1.11-.89-2-2-2-1.1 0-2 .89-2 2 0 .73.4 1.36.98 1.71L1 18h17zM17 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zM5 10c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm5.85 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1z';
+ path =
+ 'M18 18l.01-12.28c.59-.35.99-.99.99-1.72 0-1.1-.9-2-2-2s-2 .9-2 2c0 .8.47 1.48 1.14 1.8l-4.13 6.58c-.33-.24-.73-.38-1.16-.38-.84 0-1.55.51-1.85 1.24l-2.14-1.53c.09-.22.14-.46.14-.71 0-1.11-.89-2-2-2-1.1 0-2 .89-2 2 0 .73.4 1.36.98 1.71L1 18h17zM17 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zM5 10c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm5.85 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1z';
break;
case 'chart-bar':
path = 'M18 18V2h-4v16h4zm-6 0V7H8v11h4zm-6 0v-8H2v8h4z';
break;
case 'chart-line':
- path = 'M18 3.5c0 .62-.38 1.16-.92 1.38v13.11H1.99l4.22-6.73c-.13-.23-.21-.48-.21-.76C6 9.67 6.67 9 7.5 9S9 9.67 9 10.5c0 .13-.02.25-.05.37l1.44.63c.27-.3.67-.5 1.11-.5.18 0 .35.04.51.09l3.58-6.41c-.36-.27-.59-.7-.59-1.18 0-.83.67-1.5 1.5-1.5.19 0 .36.04.53.1l.05-.09v.11c.54.22.92.76.92 1.38zm-1.92 13.49V5.85l-3.29 5.89c.13.23.21.48.21.76 0 .83-.67 1.5-1.5 1.5s-1.5-.67-1.5-1.5l.01-.07-1.63-.72c-.25.18-.55.29-.88.29-.18 0-.35-.04-.51-.1l-3.2 5.09h12.29z';
+ path =
+ 'M18 3.5c0 .62-.38 1.16-.92 1.38v13.11H1.99l4.22-6.73c-.13-.23-.21-.48-.21-.76C6 9.67 6.67 9 7.5 9S9 9.67 9 10.5c0 .13-.02.25-.05.37l1.44.63c.27-.3.67-.5 1.11-.5.18 0 .35.04.51.09l3.58-6.41c-.36-.27-.59-.7-.59-1.18 0-.83.67-1.5 1.5-1.5.19 0 .36.04.53.1l.05-.09v.11c.54.22.92.76.92 1.38zm-1.92 13.49V5.85l-3.29 5.89c.13.23.21.48.21.76 0 .83-.67 1.5-1.5 1.5s-1.5-.67-1.5-1.5l.01-.07-1.63-.72c-.25.18-.55.29-.88.29-.18 0-.35-.04-.51-.1l-3.2 5.09h12.29z';
break;
case 'chart-pie':
path = 'M10 10V3c3.87 0 7 3.13 7 7h-7zM9 4v7h7c0 3.87-3.13 7-7 7s-7-3.13-7-7 3.13-7 7-7z';
break;
case 'clipboard':
- path = 'M11.9.39l1.4 1.4c1.61.19 3.5-.74 4.61.37s.18 3 .37 4.61l1.4 1.4c.39.39.39 1.02 0 1.41l-9.19 9.2c-.4.39-1.03.39-1.42 0L1.29 11c-.39-.39-.39-1.02 0-1.42l9.2-9.19c.39-.39 1.02-.39 1.41 0zm.58 2.25l-.58.58 4.95 4.95.58-.58c-.19-.6-.2-1.22-.15-1.82.02-.31.05-.62.09-.92.12-1 .18-1.63-.17-1.98s-.98-.29-1.98-.17c-.3.04-.61.07-.92.09-.6.05-1.22.04-1.82-.15zm4.02.93c.39.39.39 1.03 0 1.42s-1.03.39-1.42 0-.39-1.03 0-1.42 1.03-.39 1.42 0zm-6.72.36l-.71.7L15.44 11l.7-.71zM8.36 5.34l-.7.71 6.36 6.36.71-.7zM6.95 6.76l-.71.7 6.37 6.37.7-.71zM5.54 8.17l-.71.71 6.36 6.36.71-.71zM4.12 9.58l-.71.71 6.37 6.37.71-.71z';
+ path =
+ 'M11.9.39l1.4 1.4c1.61.19 3.5-.74 4.61.37s.18 3 .37 4.61l1.4 1.4c.39.39.39 1.02 0 1.41l-9.19 9.2c-.4.39-1.03.39-1.42 0L1.29 11c-.39-.39-.39-1.02 0-1.42l9.2-9.19c.39-.39 1.02-.39 1.41 0zm.58 2.25l-.58.58 4.95 4.95.58-.58c-.19-.6-.2-1.22-.15-1.82.02-.31.05-.62.09-.92.12-1 .18-1.63-.17-1.98s-.98-.29-1.98-.17c-.3.04-.61.07-.92.09-.6.05-1.22.04-1.82-.15zm4.02.93c.39.39.39 1.03 0 1.42s-1.03.39-1.42 0-.39-1.03 0-1.42 1.03-.39 1.42 0zm-6.72.36l-.71.7L15.44 11l.7-.71zM8.36 5.34l-.7.71 6.36 6.36.71-.7zM6.95 6.76l-.71.7 6.37 6.37.7-.71zM5.54 8.17l-.71.71 6.36 6.36.71-.71zM4.12 9.58l-.71.71 6.37 6.37.71-.71z';
break;
case 'clock':
- path = 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm0 14c3.31 0 6-2.69 6-6s-2.69-6-6-6-6 2.69-6 6 2.69 6 6 6zm-.71-5.29c.07.05.14.1.23.15l-.02.02L14 13l-3.03-3.19L10 5l-.97 4.81h.01c0 .02-.01.05-.02.09S9 9.97 9 10c0 .28.1.52.29.71z';
+ path =
+ 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm0 14c3.31 0 6-2.69 6-6s-2.69-6-6-6-6 2.69-6 6 2.69 6 6 6zm-.71-5.29c.07.05.14.1.23.15l-.02.02L14 13l-3.03-3.19L10 5l-.97 4.81h.01c0 .02-.01.05-.02.09S9 9.97 9 10c0 .28.1.52.29.71z';
break;
case 'cloud-saved':
- path = 'M14.8 9c.1-.3.2-.6.2-1 0-2.2-1.8-4-4-4-1.5 0-2.9.9-3.5 2.2-.3-.1-.7-.2-1-.2C5.1 6 4 7.1 4 8.5c0 .2 0 .4.1.5-1.8.3-3.1 1.7-3.1 3.5C1 14.4 2.6 16 4.5 16h10c1.9 0 3.5-1.6 3.5-3.5 0-1.8-1.4-3.3-3.2-3.5zm-6.3 5.9l-3.2-3.2 1.4-1.4 1.8 1.8 3.8-3.8 1.4 1.4-5.2 5.2z';
+ path =
+ 'M14.8 9c.1-.3.2-.6.2-1 0-2.2-1.8-4-4-4-1.5 0-2.9.9-3.5 2.2-.3-.1-.7-.2-1-.2C5.1 6 4 7.1 4 8.5c0 .2 0 .4.1.5-1.8.3-3.1 1.7-3.1 3.5C1 14.4 2.6 16 4.5 16h10c1.9 0 3.5-1.6 3.5-3.5 0-1.8-1.4-3.3-3.2-3.5zm-6.3 5.9l-3.2-3.2 1.4-1.4 1.8 1.8 3.8-3.8 1.4 1.4-5.2 5.2z';
break;
case 'cloud-upload':
- path = 'M14.8 9c.1-.3.2-.6.2-1 0-2.2-1.8-4-4-4-1.5 0-2.9.9-3.5 2.2-.3-.1-.7-.2-1-.2C5.1 6 4 7.1 4 8.5c0 .2 0 .4.1.5-1.8.3-3.1 1.7-3.1 3.5C1 14.4 2.6 16 4.5 16H8v-3H5l4.5-4.5L14 13h-3v3h3.5c1.9 0 3.5-1.6 3.5-3.5 0-1.8-1.4-3.3-3.2-3.5z';
+ path =
+ 'M14.8 9c.1-.3.2-.6.2-1 0-2.2-1.8-4-4-4-1.5 0-2.9.9-3.5 2.2-.3-.1-.7-.2-1-.2C5.1 6 4 7.1 4 8.5c0 .2 0 .4.1.5-1.8.3-3.1 1.7-3.1 3.5C1 14.4 2.6 16 4.5 16H8v-3H5l4.5-4.5L14 13h-3v3h3.5c1.9 0 3.5-1.6 3.5-3.5 0-1.8-1.4-3.3-3.2-3.5z';
break;
case 'cloud':
- path = 'M14.9 9c1.8.2 3.1 1.7 3.1 3.5 0 1.9-1.6 3.5-3.5 3.5h-10C2.6 16 1 14.4 1 12.5 1 10.7 2.3 9.3 4.1 9 4 8.9 4 8.7 4 8.5 4 7.1 5.1 6 6.5 6c.3 0 .7.1.9.2C8.1 4.9 9.4 4 11 4c2.2 0 4 1.8 4 4 0 .4-.1.7-.1 1z';
+ path =
+ 'M14.9 9c1.8.2 3.1 1.7 3.1 3.5 0 1.9-1.6 3.5-3.5 3.5h-10C2.6 16 1 14.4 1 12.5 1 10.7 2.3 9.3 4.1 9 4 8.9 4 8.7 4 8.5 4 7.1 5.1 6 6.5 6c.3 0 .7.1.9.2C8.1 4.9 9.4 4 11 4c2.2 0 4 1.8 4 4 0 .4-.1.7-.1 1z';
break;
case 'columns':
path = 'M3 15h6V5H3v10zm8 0h6V5h-6v10z';
@@ -283,25 +335,31 @@ export default class Dashicon extends Component {
path = 'M2 7h4l5-4v14l-5-4H2V7z';
break;
case 'controls-volumeon':
- path = 'M2 7h4l5-4v14l-5-4H2V7zm12.69-2.46C14.82 4.59 18 5.92 18 10s-3.18 5.41-3.31 5.46c-.06.03-.13.04-.19.04-.2 0-.39-.12-.46-.31-.11-.26.02-.55.27-.65.11-.05 2.69-1.15 2.69-4.54 0-3.41-2.66-4.53-2.69-4.54-.25-.1-.38-.39-.27-.65.1-.25.39-.38.65-.27zM16 10c0 2.57-2.23 3.43-2.32 3.47-.06.02-.12.03-.18.03-.2 0-.39-.12-.47-.32-.1-.26.04-.55.29-.65.07-.02 1.68-.67 1.68-2.53s-1.61-2.51-1.68-2.53c-.25-.1-.38-.39-.29-.65.1-.25.39-.39.65-.29.09.04 2.32.9 2.32 3.47z';
+ path =
+ 'M2 7h4l5-4v14l-5-4H2V7zm12.69-2.46C14.82 4.59 18 5.92 18 10s-3.18 5.41-3.31 5.46c-.06.03-.13.04-.19.04-.2 0-.39-.12-.46-.31-.11-.26.02-.55.27-.65.11-.05 2.69-1.15 2.69-4.54 0-3.41-2.66-4.53-2.69-4.54-.25-.1-.38-.39-.27-.65.1-.25.39-.38.65-.27zM16 10c0 2.57-2.23 3.43-2.32 3.47-.06.02-.12.03-.18.03-.2 0-.39-.12-.47-.32-.1-.26.04-.55.29-.65.07-.02 1.68-.67 1.68-2.53s-1.61-2.51-1.68-2.53c-.25-.1-.38-.39-.29-.65.1-.25.39-.39.65-.29.09.04 2.32.9 2.32 3.47z';
break;
case 'cover-image':
- path = 'M2.2 1h15.5c.7 0 1.3.6 1.3 1.2v11.5c0 .7-.6 1.2-1.2 1.2H2.2c-.6.1-1.2-.5-1.2-1.1V2.2C1 1.6 1.6 1 2.2 1zM17 13V3H3v10h14zm-4-4s0-5 3-5v7c0 .6-.4 1-1 1H5c-.6 0-1-.4-1-1V7c2 0 3 4 3 4s1-4 3-4 3 2 3 2zM4 17h12v2H4z';
+ path =
+ 'M2.2 1h15.5c.7 0 1.3.6 1.3 1.2v11.5c0 .7-.6 1.2-1.2 1.2H2.2c-.6.1-1.2-.5-1.2-1.1V2.2C1 1.6 1.6 1 2.2 1zM17 13V3H3v10h14zm-4-4s0-5 3-5v7c0 .6-.4 1-1 1H5c-.6 0-1-.4-1-1V7c2 0 3 4 3 4s1-4 3-4 3 2 3 2zM4 17h12v2H4z';
break;
case 'dashboard':
- path = 'M3.76 16h12.48c1.1-1.37 1.76-3.11 1.76-5 0-4.42-3.58-8-8-8s-8 3.58-8 8c0 1.89.66 3.63 1.76 5zM10 4c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zM6 6c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm8 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm-5.37 5.55L12 7v6c0 1.1-.9 2-2 2s-2-.9-2-2c0-.57.24-1.08.63-1.45zM4 10c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm12 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm-5 3c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1z';
+ path =
+ 'M3.76 16h12.48c1.1-1.37 1.76-3.11 1.76-5 0-4.42-3.58-8-8-8s-8 3.58-8 8c0 1.89.66 3.63 1.76 5zM10 4c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zM6 6c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm8 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm-5.37 5.55L12 7v6c0 1.1-.9 2-2 2s-2-.9-2-2c0-.57.24-1.08.63-1.45zM4 10c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm12 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm-5 3c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1z';
break;
case 'desktop':
- path = 'M3 2h14c.55 0 1 .45 1 1v10c0 .55-.45 1-1 1h-5v2h2c.55 0 1 .45 1 1v1H5v-1c0-.55.45-1 1-1h2v-2H3c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm13 9V4H4v7h12zM5 5h9L5 9V5z';
+ path =
+ 'M3 2h14c.55 0 1 .45 1 1v10c0 .55-.45 1-1 1h-5v2h2c.55 0 1 .45 1 1v1H5v-1c0-.55.45-1 1-1h2v-2H3c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm13 9V4H4v7h12zM5 5h9L5 9V5z';
break;
case 'dismiss':
- path = 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm5 11l-3-3 3-3-2-2-3 3-3-3-2 2 3 3-3 3 2 2 3-3 3 3z';
+ path =
+ 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm5 11l-3-3 3-3-2-2-3 3-3-3-2 2 3 3-3 3 2 2 3-3 3 3z';
break;
case 'download':
path = 'M14.01 4v6h2V2H4v8h2.01V4h8zm-2 2v6h3l-5 6-5-6h3V6h4z';
break;
case 'edit':
- path = 'M13.89 3.39l2.71 2.72c.46.46.42 1.24.03 1.64l-8.01 8.02-5.56 1.16 1.16-5.58s7.6-7.63 7.99-8.03c.39-.39 1.22-.39 1.68.07zm-2.73 2.79l-5.59 5.61 1.11 1.11 5.54-5.65zm-2.97 8.23l5.58-5.6-1.07-1.08-5.59 5.6z';
+ path =
+ 'M13.89 3.39l2.71 2.72c.46.46.42 1.24.03 1.64l-8.01 8.02-5.56 1.16 1.16-5.58s7.6-7.63 7.99-8.03c.39-.39 1.22-.39 1.68.07zm-2.73 2.79l-5.59 5.61 1.11 1.11 5.54-5.65zm-2.97 8.23l5.58-5.6-1.07-1.08-5.59 5.6z';
break;
case 'editor-aligncenter':
path = 'M14 5V3H6v2h8zm3 4V7H3v2h14zm-3 4v-2H6v2h8zm3 4v-2H3v2h14z';
@@ -313,7 +371,8 @@ export default class Dashicon extends Component {
path = 'M17 5V3H8v2h9zm0 4V7H3v2h14zm0 4v-2H8v2h9zm0 4v-2H3v2h14z';
break;
case 'editor-bold':
- path = 'M6 4v13h4.54c1.37 0 2.46-.33 3.26-1 .8-.66 1.2-1.58 1.2-2.77 0-.84-.17-1.51-.51-2.01s-.9-.85-1.67-1.03v-.09c.57-.1 1.02-.4 1.36-.9s.51-1.13.51-1.91c0-1.14-.39-1.98-1.17-2.5C12.75 4.26 11.5 4 9.78 4H6zm2.57 5.15V6.26h1.36c.73 0 1.27.11 1.61.32.34.22.51.58.51 1.07 0 .54-.16.92-.47 1.15s-.82.35-1.51.35h-1.5zm0 2.19h1.6c1.44 0 2.16.53 2.16 1.61 0 .6-.17 1.05-.51 1.34s-.86.43-1.57.43H8.57v-3.38z';
+ path =
+ 'M6 4v13h4.54c1.37 0 2.46-.33 3.26-1 .8-.66 1.2-1.58 1.2-2.77 0-.84-.17-1.51-.51-2.01s-.9-.85-1.67-1.03v-.09c.57-.1 1.02-.4 1.36-.9s.51-1.13.51-1.91c0-1.14-.39-1.98-1.17-2.5C12.75 4.26 11.5 4 9.78 4H6zm2.57 5.15V6.26h1.36c.73 0 1.27.11 1.61.32.34.22.51.58.51 1.07 0 .54-.16.92-.47 1.15s-.82.35-1.51.35h-1.5zm0 2.19h1.6c1.44 0 2.16.53 2.16 1.61 0 .6-.17 1.05-.51 1.34s-.86.43-1.57.43H8.57v-3.38z';
break;
case 'editor-break':
path = 'M16 4h2v9H7v3l-5-4 5-4v3h9V4z';
@@ -322,19 +381,24 @@ export default class Dashicon extends Component {
path = 'M9 6l-4 4 4 4-1 2-6-6 6-6zm2 8l4-4-4-4 1-2 6 6-6 6z';
break;
case 'editor-contract':
- path = 'M15.75 6.75L18 3v14l-2.25-3.75L17 12h-4v4l1.25-1.25L18 17H2l3.75-2.25L7 16v-4H3l1.25 1.25L2 17V3l2.25 3.75L3 8h4V4L5.75 5.25 2 3h16l-3.75 2.25L13 4v4h4z';
+ path =
+ 'M15.75 6.75L18 3v14l-2.25-3.75L17 12h-4v4l1.25-1.25L18 17H2l3.75-2.25L7 16v-4H3l1.25 1.25L2 17V3l2.25 3.75L3 8h4V4L5.75 5.25 2 3h16l-3.75 2.25L13 4v4h4z';
break;
case 'editor-customchar':
- path = 'M10 5.4c1.27 0 2.24.36 2.91 1.08.66.71 1 1.76 1 3.13 0 1.28-.23 2.37-.69 3.27-.47.89-1.27 1.52-2.22 2.12v2h6v-2h-3.69c.92-.64 1.62-1.34 2.12-2.34.49-1.01.74-2.13.74-3.35 0-1.78-.55-3.19-1.65-4.22S11.92 3.54 10 3.54s-3.43.53-4.52 1.57c-1.1 1.04-1.65 2.44-1.65 4.2 0 1.21.24 2.31.73 3.33.48 1.01 1.19 1.71 2.1 2.36H3v2h6v-2c-.98-.64-1.8-1.28-2.24-2.17-.45-.89-.67-1.96-.67-3.22 0-1.37.33-2.41 1-3.13C7.75 5.76 8.72 5.4 10 5.4z';
+ path =
+ 'M10 5.4c1.27 0 2.24.36 2.91 1.08.66.71 1 1.76 1 3.13 0 1.28-.23 2.37-.69 3.27-.47.89-1.27 1.52-2.22 2.12v2h6v-2h-3.69c.92-.64 1.62-1.34 2.12-2.34.49-1.01.74-2.13.74-3.35 0-1.78-.55-3.19-1.65-4.22S11.92 3.54 10 3.54s-3.43.53-4.52 1.57c-1.1 1.04-1.65 2.44-1.65 4.2 0 1.21.24 2.31.73 3.33.48 1.01 1.19 1.71 2.1 2.36H3v2h6v-2c-.98-.64-1.8-1.28-2.24-2.17-.45-.89-.67-1.96-.67-3.22 0-1.37.33-2.41 1-3.13C7.75 5.76 8.72 5.4 10 5.4z';
break;
case 'editor-expand':
- path = 'M7 8h6v4H7zm-5 5v4h4l-1.2-1.2L7 12l-3.8 2.2M14 17h4v-4l-1.2 1.2L13 12l2.2 3.8M14 3l1.3 1.3L13 8l3.8-2.2L18 7V3M6 3H2v4l1.2-1.2L7 8 4.7 4.3';
+ path =
+ 'M7 8h6v4H7zm-5 5v4h4l-1.2-1.2L7 12l-3.8 2.2M14 17h4v-4l-1.2 1.2L13 12l2.2 3.8M14 3l1.3 1.3L13 8l3.8-2.2L18 7V3M6 3H2v4l1.2-1.2L7 8 4.7 4.3';
break;
case 'editor-help':
- path = 'M17 10c0-3.87-3.14-7-7-7-3.87 0-7 3.13-7 7s3.13 7 7 7c3.86 0 7-3.13 7-7zm-6.3 1.48H9.14v-.43c0-.38.08-.7.24-.98s.46-.57.88-.89c.41-.29.68-.53.81-.71.14-.18.2-.39.2-.62 0-.25-.09-.44-.28-.58-.19-.13-.45-.19-.79-.19-.58 0-1.25.19-2 .57l-.64-1.28c.87-.49 1.8-.74 2.77-.74.81 0 1.45.2 1.92.58.48.39.71.91.71 1.55 0 .43-.09.8-.29 1.11-.19.32-.57.67-1.11 1.06-.38.28-.61.49-.71.63-.1.15-.15.34-.15.57v.35zm-1.47 2.74c-.18-.17-.27-.42-.27-.73 0-.33.08-.58.26-.75s.43-.25.77-.25c.32 0 .57.09.75.26s.27.42.27.74c0 .3-.09.55-.27.72-.18.18-.43.27-.75.27-.33 0-.58-.09-.76-.26z';
+ path =
+ 'M17 10c0-3.87-3.14-7-7-7-3.87 0-7 3.13-7 7s3.13 7 7 7c3.86 0 7-3.13 7-7zm-6.3 1.48H9.14v-.43c0-.38.08-.7.24-.98s.46-.57.88-.89c.41-.29.68-.53.81-.71.14-.18.2-.39.2-.62 0-.25-.09-.44-.28-.58-.19-.13-.45-.19-.79-.19-.58 0-1.25.19-2 .57l-.64-1.28c.87-.49 1.8-.74 2.77-.74.81 0 1.45.2 1.92.58.48.39.71.91.71 1.55 0 .43-.09.8-.29 1.11-.19.32-.57.67-1.11 1.06-.38.28-.61.49-.71.63-.1.15-.15.34-.15.57v.35zm-1.47 2.74c-.18-.17-.27-.42-.27-.73 0-.33.08-.58.26-.75s.43-.25.77-.25c.32 0 .57.09.75.26s.27.42.27.74c0 .3-.09.55-.27.72-.18.18-.43.27-.75.27-.33 0-.58-.09-.76-.26z';
break;
case 'editor-indent':
- path = 'M3 5V3h9v2H3zm10-1V3h4v1h-4zm0 3h2V5l4 3.5-4 3.5v-2h-2V7zM3 8V6h9v2H3zm2 3V9h7v2H5zm-2 3v-2h9v2H3zm10 0v-1h4v1h-4zm-4 3v-2h3v2H9z';
+ path =
+ 'M3 5V3h9v2H3zm10-1V3h4v1h-4zm0 3h2V5l4 3.5-4 3.5v-2h-2V7zM3 8V6h9v2H3zm2 3V9h7v2H5zm-2 3v-2h9v2H3zm10 0v-1h4v1h-4zm-4 3v-2h3v2H9z';
break;
case 'editor-insertmore':
path = 'M17 7V3H3v4h14zM6 11V9H3v2h3zm6 0V9H8v2h4zm5 0V9h-3v2h3zm0 6v-4H3v4h14z';
@@ -346,109 +410,142 @@ export default class Dashicon extends Component {
path = 'M2 3h16v2H2V3zm0 4h16v2H2V7zm0 4h16v2H2v-2zm0 4h16v2H2v-2z';
break;
case 'editor-kitchensink':
- path = 'M19 2v6H1V2h18zm-1 5V3H2v4h16zM5 4v2H3V4h2zm3 0v2H6V4h2zm3 0v2H9V4h2zm3 0v2h-2V4h2zm3 0v2h-2V4h2zm2 5v9H1V9h18zm-1 8v-7H2v7h16zM5 11v2H3v-2h2zm3 0v2H6v-2h2zm3 0v2H9v-2h2zm6 0v2h-5v-2h5zm-6 3v2H3v-2h8zm3 0v2h-2v-2h2zm3 0v2h-2v-2h2z';
+ path =
+ 'M19 2v6H1V2h18zm-1 5V3H2v4h16zM5 4v2H3V4h2zm3 0v2H6V4h2zm3 0v2H9V4h2zm3 0v2h-2V4h2zm3 0v2h-2V4h2zm2 5v9H1V9h18zm-1 8v-7H2v7h16zM5 11v2H3v-2h2zm3 0v2H6v-2h2zm3 0v2H9v-2h2zm6 0v2h-5v-2h5zm-6 3v2H3v-2h8zm3 0v2h-2v-2h2zm3 0v2h-2v-2h2z';
break;
case 'editor-ltr':
- path = 'M5.52 2h7.43c.55 0 1 .45 1 1s-.45 1-1 1h-1v13c0 .55-.45 1-1 1s-1-.45-1-1V5c0-.55-.45-1-1-1s-1 .45-1 1v12c0 .55-.45 1-1 1s-1-.45-1-1v-5.96h-.43C3.02 11.04 1 9.02 1 6.52S3.02 2 5.52 2zM14 14l5-4-5-4v8z';
+ path =
+ 'M5.52 2h7.43c.55 0 1 .45 1 1s-.45 1-1 1h-1v13c0 .55-.45 1-1 1s-1-.45-1-1V5c0-.55-.45-1-1-1s-1 .45-1 1v12c0 .55-.45 1-1 1s-1-.45-1-1v-5.96h-.43C3.02 11.04 1 9.02 1 6.52S3.02 2 5.52 2zM14 14l5-4-5-4v8z';
break;
case 'editor-ol-rtl':
- path = 'M15.025 8.75a1.048 1.048 0 0 1 .45-.1.507.507 0 0 1 .35.11.455.455 0 0 1 .13.36.803.803 0 0 1-.06.3 1.448 1.448 0 0 1-.19.33c-.09.11-.29.32-.58.62l-.99 1v.58h2.76v-.7h-1.72v-.04l.51-.48a7.276 7.276 0 0 0 .7-.71 1.75 1.75 0 0 0 .3-.49 1.254 1.254 0 0 0 .1-.51.968.968 0 0 0-.16-.56 1.007 1.007 0 0 0-.44-.37 1.512 1.512 0 0 0-.65-.14 1.98 1.98 0 0 0-.51.06 1.9 1.9 0 0 0-.42.15 3.67 3.67 0 0 0-.48.35l.45.54a2.505 2.505 0 0 1 .45-.3zM16.695 15.29a1.29 1.29 0 0 0-.74-.3v-.02a1.203 1.203 0 0 0 .65-.37.973.973 0 0 0 .23-.65.81.81 0 0 0-.37-.71 1.72 1.72 0 0 0-1-.26 2.185 2.185 0 0 0-1.33.4l.4.6a1.79 1.79 0 0 1 .46-.23 1.18 1.18 0 0 1 .41-.07c.38 0 .58.15.58.46a.447.447 0 0 1-.22.43 1.543 1.543 0 0 1-.7.12h-.31v.66h.31a1.764 1.764 0 0 1 .75.12.433.433 0 0 1 .23.41.55.55 0 0 1-.2.47 1.084 1.084 0 0 1-.63.15 2.24 2.24 0 0 1-.57-.08 2.671 2.671 0 0 1-.52-.2v.74a2.923 2.923 0 0 0 1.18.22 1.948 1.948 0 0 0 1.22-.33 1.077 1.077 0 0 0 .43-.92.836.836 0 0 0-.26-.64zM15.005 4.17c.06-.05.16-.14.3-.28l-.02.42V7h.84V3h-.69l-1.29 1.03.4.51zM4.02 5h9v1h-9zM4.02 10h9v1h-9zM4.02 15h9v1h-9z';
+ path =
+ 'M15.025 8.75a1.048 1.048 0 0 1 .45-.1.507.507 0 0 1 .35.11.455.455 0 0 1 .13.36.803.803 0 0 1-.06.3 1.448 1.448 0 0 1-.19.33c-.09.11-.29.32-.58.62l-.99 1v.58h2.76v-.7h-1.72v-.04l.51-.48a7.276 7.276 0 0 0 .7-.71 1.75 1.75 0 0 0 .3-.49 1.254 1.254 0 0 0 .1-.51.968.968 0 0 0-.16-.56 1.007 1.007 0 0 0-.44-.37 1.512 1.512 0 0 0-.65-.14 1.98 1.98 0 0 0-.51.06 1.9 1.9 0 0 0-.42.15 3.67 3.67 0 0 0-.48.35l.45.54a2.505 2.505 0 0 1 .45-.3zM16.695 15.29a1.29 1.29 0 0 0-.74-.3v-.02a1.203 1.203 0 0 0 .65-.37.973.973 0 0 0 .23-.65.81.81 0 0 0-.37-.71 1.72 1.72 0 0 0-1-.26 2.185 2.185 0 0 0-1.33.4l.4.6a1.79 1.79 0 0 1 .46-.23 1.18 1.18 0 0 1 .41-.07c.38 0 .58.15.58.46a.447.447 0 0 1-.22.43 1.543 1.543 0 0 1-.7.12h-.31v.66h.31a1.764 1.764 0 0 1 .75.12.433.433 0 0 1 .23.41.55.55 0 0 1-.2.47 1.084 1.084 0 0 1-.63.15 2.24 2.24 0 0 1-.57-.08 2.671 2.671 0 0 1-.52-.2v.74a2.923 2.923 0 0 0 1.18.22 1.948 1.948 0 0 0 1.22-.33 1.077 1.077 0 0 0 .43-.92.836.836 0 0 0-.26-.64zM15.005 4.17c.06-.05.16-.14.3-.28l-.02.42V7h.84V3h-.69l-1.29 1.03.4.51zM4.02 5h9v1h-9zM4.02 10h9v1h-9zM4.02 15h9v1h-9z';
break;
case 'editor-ol':
- path = 'M6 7V3h-.69L4.02 4.03l.4.51.46-.37c.06-.05.16-.14.3-.28l-.02.42V7H6zm2-2h9v1H8V5zm-1.23 6.95v-.7H5.05v-.04l.51-.48c.33-.31.57-.54.7-.71.14-.17.24-.33.3-.49.07-.16.1-.33.1-.51 0-.21-.05-.4-.16-.56-.1-.16-.25-.28-.44-.37s-.41-.14-.65-.14c-.19 0-.36.02-.51.06-.15.03-.29.09-.42.15-.12.07-.29.19-.48.35l.45.54c.16-.13.31-.23.45-.3.15-.07.3-.1.45-.1.14 0 .26.03.35.11s.13.2.13.36c0 .1-.02.2-.06.3s-.1.21-.19.33c-.09.11-.29.32-.58.62l-.99 1v.58h2.76zM8 10h9v1H8v-1zm-1.29 3.95c0-.3-.12-.54-.37-.71-.24-.17-.58-.26-1-.26-.52 0-.96.13-1.33.4l.4.6c.17-.11.32-.19.46-.23.14-.05.27-.07.41-.07.38 0 .58.15.58.46 0 .2-.07.35-.22.43s-.38.12-.7.12h-.31v.66h.31c.34 0 .59.04.75.12.15.08.23.22.23.41 0 .22-.07.37-.2.47-.14.1-.35.15-.63.15-.19 0-.38-.03-.57-.08s-.36-.12-.52-.2v.74c.34.15.74.22 1.18.22.53 0 .94-.11 1.22-.33.29-.22.43-.52.43-.92 0-.27-.09-.48-.26-.64s-.42-.26-.74-.3v-.02c.27-.06.49-.19.65-.37.15-.18.23-.39.23-.65zM8 15h9v1H8v-1z';
+ path =
+ 'M6 7V3h-.69L4.02 4.03l.4.51.46-.37c.06-.05.16-.14.3-.28l-.02.42V7H6zm2-2h9v1H8V5zm-1.23 6.95v-.7H5.05v-.04l.51-.48c.33-.31.57-.54.7-.71.14-.17.24-.33.3-.49.07-.16.1-.33.1-.51 0-.21-.05-.4-.16-.56-.1-.16-.25-.28-.44-.37s-.41-.14-.65-.14c-.19 0-.36.02-.51.06-.15.03-.29.09-.42.15-.12.07-.29.19-.48.35l.45.54c.16-.13.31-.23.45-.3.15-.07.3-.1.45-.1.14 0 .26.03.35.11s.13.2.13.36c0 .1-.02.2-.06.3s-.1.21-.19.33c-.09.11-.29.32-.58.62l-.99 1v.58h2.76zM8 10h9v1H8v-1zm-1.29 3.95c0-.3-.12-.54-.37-.71-.24-.17-.58-.26-1-.26-.52 0-.96.13-1.33.4l.4.6c.17-.11.32-.19.46-.23.14-.05.27-.07.41-.07.38 0 .58.15.58.46 0 .2-.07.35-.22.43s-.38.12-.7.12h-.31v.66h.31c.34 0 .59.04.75.12.15.08.23.22.23.41 0 .22-.07.37-.2.47-.14.1-.35.15-.63.15-.19 0-.38-.03-.57-.08s-.36-.12-.52-.2v.74c.34.15.74.22 1.18.22.53 0 .94-.11 1.22-.33.29-.22.43-.52.43-.92 0-.27-.09-.48-.26-.64s-.42-.26-.74-.3v-.02c.27-.06.49-.19.65-.37.15-.18.23-.39.23-.65zM8 15h9v1H8v-1z';
break;
case 'editor-outdent':
- path = 'M7 4V3H3v1h4zm10 1V3H8v2h9zM7 7H5V5L1 8.5 5 12v-2h2V7zm10 1V6H8v2h9zm-2 3V9H8v2h7zm2 3v-2H8v2h9zM7 14v-1H3v1h4zm4 3v-2H8v2h3z';
+ path =
+ 'M7 4V3H3v1h4zm10 1V3H8v2h9zM7 7H5V5L1 8.5 5 12v-2h2V7zm10 1V6H8v2h9zm-2 3V9H8v2h7zm2 3v-2H8v2h9zM7 14v-1H3v1h4zm4 3v-2H8v2h3z';
break;
case 'editor-paragraph':
- path = 'M15 2H7.54c-.83 0-1.59.2-2.28.6-.7.41-1.25.96-1.65 1.65C3.2 4.94 3 5.7 3 6.52s.2 1.58.61 2.27c.4.69.95 1.24 1.65 1.64.69.41 1.45.61 2.28.61h.43V17c0 .27.1.51.29.71.2.19.44.29.71.29.28 0 .51-.1.71-.29.2-.2.3-.44.3-.71V5c0-.27.09-.51.29-.71.2-.19.44-.29.71-.29s.51.1.71.29c.19.2.29.44.29.71v12c0 .27.1.51.3.71.2.19.43.29.71.29.27 0 .51-.1.71-.29.19-.2.29-.44.29-.71V4H15c.27 0 .5-.1.7-.3.2-.19.3-.43.3-.7s-.1-.51-.3-.71C15.5 2.1 15.27 2 15 2z';
+ path =
+ 'M15 2H7.54c-.83 0-1.59.2-2.28.6-.7.41-1.25.96-1.65 1.65C3.2 4.94 3 5.7 3 6.52s.2 1.58.61 2.27c.4.69.95 1.24 1.65 1.64.69.41 1.45.61 2.28.61h.43V17c0 .27.1.51.29.71.2.19.44.29.71.29.28 0 .51-.1.71-.29.2-.2.3-.44.3-.71V5c0-.27.09-.51.29-.71.2-.19.44-.29.71-.29s.51.1.71.29c.19.2.29.44.29.71v12c0 .27.1.51.3.71.2.19.43.29.71.29.27 0 .51-.1.71-.29.19-.2.29-.44.29-.71V4H15c.27 0 .5-.1.7-.3.2-.19.3-.43.3-.7s-.1-.51-.3-.71C15.5 2.1 15.27 2 15 2z';
break;
case 'editor-paste-text':
- path = 'M12.38 2L15 5v1H5V5l2.64-3h4.74zM10 5c.55 0 1-.44 1-1 0-.55-.45-1-1-1s-1 .45-1 1c0 .56.45 1 1 1zm5.45-1H17c.55 0 1 .45 1 1v12c0 .56-.45 1-1 1H3c-.55 0-1-.44-1-1V5c0-.55.45-1 1-1h1.55L4 4.63V7h12V4.63zM14 11V9H6v2h3v5h2v-5h3z';
+ path =
+ 'M12.38 2L15 5v1H5V5l2.64-3h4.74zM10 5c.55 0 1-.44 1-1 0-.55-.45-1-1-1s-1 .45-1 1c0 .56.45 1 1 1zm5.45-1H17c.55 0 1 .45 1 1v12c0 .56-.45 1-1 1H3c-.55 0-1-.44-1-1V5c0-.55.45-1 1-1h1.55L4 4.63V7h12V4.63zM14 11V9H6v2h3v5h2v-5h3z';
break;
case 'editor-paste-word':
- path = 'M12.38 2L15 5v1H5V5l2.64-3h4.74zM10 5c.55 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1zm8 12V5c0-.55-.45-1-1-1h-1.54l.54.63V7H4V4.62L4.55 4H3c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h14c.55 0 1-.45 1-1zm-3-8l-2 7h-2l-1-5-1 5H6.92L5 9h2l1 5 1-5h2l1 5 1-5h2z';
+ path =
+ 'M12.38 2L15 5v1H5V5l2.64-3h4.74zM10 5c.55 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1zm8 12V5c0-.55-.45-1-1-1h-1.54l.54.63V7H4V4.62L4.55 4H3c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h14c.55 0 1-.45 1-1zm-3-8l-2 7h-2l-1-5-1 5H6.92L5 9h2l1 5 1-5h2l1 5 1-5h2z';
break;
case 'editor-quote':
- path = 'M9.49 13.22c0-.74-.2-1.38-.61-1.9-.62-.78-1.83-.88-2.53-.72-.29-1.65 1.11-3.75 2.92-4.65L7.88 4c-2.73 1.3-5.42 4.28-4.96 8.05C3.21 14.43 4.59 16 6.54 16c.85 0 1.56-.25 2.12-.75s.83-1.18.83-2.03zm8.05 0c0-.74-.2-1.38-.61-1.9-.63-.78-1.83-.88-2.53-.72-.29-1.65 1.11-3.75 2.92-4.65L15.93 4c-2.73 1.3-5.41 4.28-4.95 8.05.29 2.38 1.66 3.95 3.61 3.95.85 0 1.56-.25 2.12-.75s.83-1.18.83-2.03z';
+ path =
+ 'M9.49 13.22c0-.74-.2-1.38-.61-1.9-.62-.78-1.83-.88-2.53-.72-.29-1.65 1.11-3.75 2.92-4.65L7.88 4c-2.73 1.3-5.42 4.28-4.96 8.05C3.21 14.43 4.59 16 6.54 16c.85 0 1.56-.25 2.12-.75s.83-1.18.83-2.03zm8.05 0c0-.74-.2-1.38-.61-1.9-.63-.78-1.83-.88-2.53-.72-.29-1.65 1.11-3.75 2.92-4.65L15.93 4c-2.73 1.3-5.41 4.28-4.95 8.05.29 2.38 1.66 3.95 3.61 3.95.85 0 1.56-.25 2.12-.75s.83-1.18.83-2.03z';
break;
case 'editor-removeformatting':
- path = 'M14.29 4.59l1.1 1.11c.41.4.61.94.61 1.47v2.12c0 .53-.2 1.07-.61 1.47l-6.63 6.63c-.4.41-.94.61-1.47.61s-1.07-.2-1.47-.61l-1.11-1.1-1.1-1.11c-.41-.4-.61-.94-.61-1.47v-2.12c0-.54.2-1.07.61-1.48l6.63-6.62c.4-.41.94-.61 1.47-.61s1.06.2 1.47.61zm-6.21 9.7l6.42-6.42c.39-.39.39-1.03 0-1.43L12.36 4.3c-.19-.19-.45-.29-.72-.29s-.52.1-.71.29l-6.42 6.42c-.39.4-.39 1.04 0 1.43l2.14 2.14c.38.38 1.04.38 1.43 0z';
+ path =
+ 'M14.29 4.59l1.1 1.11c.41.4.61.94.61 1.47v2.12c0 .53-.2 1.07-.61 1.47l-6.63 6.63c-.4.41-.94.61-1.47.61s-1.07-.2-1.47-.61l-1.11-1.1-1.1-1.11c-.41-.4-.61-.94-.61-1.47v-2.12c0-.54.2-1.07.61-1.48l6.63-6.62c.4-.41.94-.61 1.47-.61s1.06.2 1.47.61zm-6.21 9.7l6.42-6.42c.39-.39.39-1.03 0-1.43L12.36 4.3c-.19-.19-.45-.29-.72-.29s-.52.1-.71.29l-6.42 6.42c-.39.4-.39 1.04 0 1.43l2.14 2.14c.38.38 1.04.38 1.43 0z';
break;
case 'editor-rtl':
- path = 'M5.52 2h7.43c.55 0 1 .45 1 1s-.45 1-1 1h-1v13c0 .55-.45 1-1 1s-1-.45-1-1V5c0-.55-.45-1-1-1s-1 .45-1 1v12c0 .55-.45 1-1 1s-1-.45-1-1v-5.96h-.43C3.02 11.04 1 9.02 1 6.52S3.02 2 5.52 2zM19 6l-5 4 5 4V6z';
+ path =
+ 'M5.52 2h7.43c.55 0 1 .45 1 1s-.45 1-1 1h-1v13c0 .55-.45 1-1 1s-1-.45-1-1V5c0-.55-.45-1-1-1s-1 .45-1 1v12c0 .55-.45 1-1 1s-1-.45-1-1v-5.96h-.43C3.02 11.04 1 9.02 1 6.52S3.02 2 5.52 2zM19 6l-5 4 5 4V6z';
break;
case 'editor-spellcheck':
- path = 'M15.84 2.76c.25 0 .49.04.71.11.23.07.44.16.64.25l.35-.81c-.52-.26-1.08-.39-1.69-.39-.58 0-1.09.13-1.52.37-.43.25-.76.61-.99 1.08C13.11 3.83 13 4.38 13 5c0 .99.23 1.75.7 2.28s1.15.79 2.02.79c.6 0 1.13-.09 1.6-.26v-.84c-.26.08-.51.14-.74.19-.24.05-.49.08-.74.08-.59 0-1.04-.19-1.34-.57-.32-.37-.47-.93-.47-1.66 0-.7.16-1.25.48-1.65.33-.4.77-.6 1.33-.6zM6.5 8h1.04L5.3 2H4.24L2 8h1.03l.58-1.66H5.9zM8 2v6h2.17c.67 0 1.19-.15 1.57-.46.38-.3.56-.72.56-1.26 0-.4-.1-.72-.3-.95-.19-.24-.5-.39-.93-.47v-.04c.35-.06.6-.21.78-.44.18-.24.28-.53.28-.88 0-.52-.19-.9-.56-1.14-.36-.24-.96-.36-1.79-.36H8zm.98 2.48V2.82h.85c.44 0 .77.06.97.19.21.12.31.33.31.61 0 .31-.1.53-.29.66-.18.13-.48.2-.89.2h-.95zM5.64 5.5H3.9l.54-1.56c.14-.4.25-.76.32-1.1l.15.52c.07.23.13.4.17.51zm3.34-.23h.99c.44 0 .76.08.98.23.21.15.32.38.32.69 0 .34-.11.59-.32.75s-.52.24-.93.24H8.98V5.27zM4 13l5 5 9-8-1-1-8 6-4-3z';
+ path =
+ 'M15.84 2.76c.25 0 .49.04.71.11.23.07.44.16.64.25l.35-.81c-.52-.26-1.08-.39-1.69-.39-.58 0-1.09.13-1.52.37-.43.25-.76.61-.99 1.08C13.11 3.83 13 4.38 13 5c0 .99.23 1.75.7 2.28s1.15.79 2.02.79c.6 0 1.13-.09 1.6-.26v-.84c-.26.08-.51.14-.74.19-.24.05-.49.08-.74.08-.59 0-1.04-.19-1.34-.57-.32-.37-.47-.93-.47-1.66 0-.7.16-1.25.48-1.65.33-.4.77-.6 1.33-.6zM6.5 8h1.04L5.3 2H4.24L2 8h1.03l.58-1.66H5.9zM8 2v6h2.17c.67 0 1.19-.15 1.57-.46.38-.3.56-.72.56-1.26 0-.4-.1-.72-.3-.95-.19-.24-.5-.39-.93-.47v-.04c.35-.06.6-.21.78-.44.18-.24.28-.53.28-.88 0-.52-.19-.9-.56-1.14-.36-.24-.96-.36-1.79-.36H8zm.98 2.48V2.82h.85c.44 0 .77.06.97.19.21.12.31.33.31.61 0 .31-.1.53-.29.66-.18.13-.48.2-.89.2h-.95zM5.64 5.5H3.9l.54-1.56c.14-.4.25-.76.32-1.1l.15.52c.07.23.13.4.17.51zm3.34-.23h.99c.44 0 .76.08.98.23.21.15.32.38.32.69 0 .34-.11.59-.32.75s-.52.24-.93.24H8.98V5.27zM4 13l5 5 9-8-1-1-8 6-4-3z';
break;
case 'editor-strikethrough':
- path = 'M15.82 12.25c.26 0 .5-.02.74-.07.23-.05.48-.12.73-.2v.84c-.46.17-.99.26-1.58.26-.88 0-1.54-.26-2.01-.79-.39-.44-.62-1.04-.68-1.79h-.94c.12.21.18.48.18.79 0 .54-.18.95-.55 1.26-.38.3-.9.45-1.56.45H8v-2.5H6.59l.93 2.5H6.49l-.59-1.67H3.62L3.04 13H2l.93-2.5H2v-1h1.31l.93-2.49H5.3l.92 2.49H8V7h1.77c1 0 1.41.17 1.77.41.37.24.55.62.55 1.13 0 .35-.09.64-.27.87l-.08.09h1.29c.05-.4.15-.77.31-1.1.23-.46.55-.82.98-1.06.43-.25.93-.37 1.51-.37.61 0 1.17.12 1.69.38l-.35.81c-.2-.1-.42-.18-.64-.25s-.46-.11-.71-.11c-.55 0-.99.2-1.31.59-.23.29-.38.66-.44 1.11H17v1h-2.95c.06.5.2.9.44 1.19.3.37.75.56 1.33.56zM4.44 8.96l-.18.54H5.3l-.22-.61c-.04-.11-.09-.28-.17-.51-.07-.24-.12-.41-.14-.51-.08.33-.18.69-.33 1.09zm4.53-1.09V9.5h1.19c.28-.02.49-.09.64-.18.19-.13.28-.35.28-.66 0-.28-.1-.48-.3-.61-.2-.12-.53-.18-.97-.18h-.84zm-3.33 2.64v-.01H3.91v.01h1.73zm5.28.01l-.03-.02H8.97v1.68h1.04c.4 0 .71-.08.92-.23.21-.16.31-.4.31-.74 0-.31-.11-.54-.32-.69z';
+ path =
+ 'M15.82 12.25c.26 0 .5-.02.74-.07.23-.05.48-.12.73-.2v.84c-.46.17-.99.26-1.58.26-.88 0-1.54-.26-2.01-.79-.39-.44-.62-1.04-.68-1.79h-.94c.12.21.18.48.18.79 0 .54-.18.95-.55 1.26-.38.3-.9.45-1.56.45H8v-2.5H6.59l.93 2.5H6.49l-.59-1.67H3.62L3.04 13H2l.93-2.5H2v-1h1.31l.93-2.49H5.3l.92 2.49H8V7h1.77c1 0 1.41.17 1.77.41.37.24.55.62.55 1.13 0 .35-.09.64-.27.87l-.08.09h1.29c.05-.4.15-.77.31-1.1.23-.46.55-.82.98-1.06.43-.25.93-.37 1.51-.37.61 0 1.17.12 1.69.38l-.35.81c-.2-.1-.42-.18-.64-.25s-.46-.11-.71-.11c-.55 0-.99.2-1.31.59-.23.29-.38.66-.44 1.11H17v1h-2.95c.06.5.2.9.44 1.19.3.37.75.56 1.33.56zM4.44 8.96l-.18.54H5.3l-.22-.61c-.04-.11-.09-.28-.17-.51-.07-.24-.12-.41-.14-.51-.08.33-.18.69-.33 1.09zm4.53-1.09V9.5h1.19c.28-.02.49-.09.64-.18.19-.13.28-.35.28-.66 0-.28-.1-.48-.3-.61-.2-.12-.53-.18-.97-.18h-.84zm-3.33 2.64v-.01H3.91v.01h1.73zm5.28.01l-.03-.02H8.97v1.68h1.04c.4 0 .71-.08.92-.23.21-.16.31-.4.31-.74 0-.31-.11-.54-.32-.69z';
break;
case 'editor-table':
- path = 'M18 17V3H2v14h16zM16 7H4V5h12v2zm-7 4H4V9h5v2zm7 0h-5V9h5v2zm-7 4H4v-2h5v2zm7 0h-5v-2h5v2z';
+ path =
+ 'M18 17V3H2v14h16zM16 7H4V5h12v2zm-7 4H4V9h5v2zm7 0h-5V9h5v2zm-7 4H4v-2h5v2zm7 0h-5v-2h5v2z';
break;
case 'editor-textcolor':
path = 'M13.23 15h1.9L11 4H9L5 15h1.88l1.07-3h4.18zm-1.53-4.54H8.51L10 5.6z';
break;
case 'editor-ul':
- path = 'M5.5 7C4.67 7 4 6.33 4 5.5 4 4.68 4.67 4 5.5 4 6.32 4 7 4.68 7 5.5 7 6.33 6.32 7 5.5 7zM8 5h9v1H8V5zm-2.5 7c-.83 0-1.5-.67-1.5-1.5C4 9.68 4.67 9 5.5 9c.82 0 1.5.68 1.5 1.5 0 .83-.68 1.5-1.5 1.5zM8 10h9v1H8v-1zm-2.5 7c-.83 0-1.5-.67-1.5-1.5 0-.82.67-1.5 1.5-1.5.82 0 1.5.68 1.5 1.5 0 .83-.68 1.5-1.5 1.5zM8 15h9v1H8v-1z';
+ path =
+ 'M5.5 7C4.67 7 4 6.33 4 5.5 4 4.68 4.67 4 5.5 4 6.32 4 7 4.68 7 5.5 7 6.33 6.32 7 5.5 7zM8 5h9v1H8V5zm-2.5 7c-.83 0-1.5-.67-1.5-1.5C4 9.68 4.67 9 5.5 9c.82 0 1.5.68 1.5 1.5 0 .83-.68 1.5-1.5 1.5zM8 10h9v1H8v-1zm-2.5 7c-.83 0-1.5-.67-1.5-1.5 0-.82.67-1.5 1.5-1.5.82 0 1.5.68 1.5 1.5 0 .83-.68 1.5-1.5 1.5zM8 15h9v1H8v-1z';
break;
case 'editor-underline':
- path = 'M14 5h-2v5.71c0 1.99-1.12 2.98-2.45 2.98-1.32 0-2.55-1-2.55-2.96V5H5v5.87c0 1.91 1 4.54 4.48 4.54 3.49 0 4.52-2.58 4.52-4.5V5zm0 13v-2H5v2h9z';
+ path =
+ 'M14 5h-2v5.71c0 1.99-1.12 2.98-2.45 2.98-1.32 0-2.55-1-2.55-2.96V5H5v5.87c0 1.91 1 4.54 4.48 4.54 3.49 0 4.52-2.58 4.52-4.5V5zm0 13v-2H5v2h9z';
break;
case 'editor-unlink':
- path = 'M17.74 2.26c1.68 1.69 1.68 4.41 0 6.1l-1.53 1.52c-.32.33-.69.58-1.08.77L13 10l1.69-1.64.76-.77.76-.76c.84-.84.84-2.2 0-3.04-.84-.85-2.2-.85-3.04 0l-.77.76-.76.76L10 7l-.65-2.14c.19-.38.44-.75.77-1.07l1.52-1.53c1.69-1.68 4.42-1.68 6.1 0zM2 4l8 6-6-8zm4-2l4 8-2-8H6zM2 6l8 4-8-2V6zm7.36 7.69L10 13l.74 2.35-1.38 1.39c-1.69 1.68-4.41 1.68-6.1 0-1.68-1.68-1.68-4.42 0-6.1l1.39-1.38L7 10l-.69.64-1.52 1.53c-.85.84-.85 2.2 0 3.04.84.85 2.2.85 3.04 0zM18 16l-8-6 6 8zm-4 2l-4-8 2 8h2zm4-4l-8-4 8 2v2z';
+ path =
+ 'M17.74 2.26c1.68 1.69 1.68 4.41 0 6.1l-1.53 1.52c-.32.33-.69.58-1.08.77L13 10l1.69-1.64.76-.77.76-.76c.84-.84.84-2.2 0-3.04-.84-.85-2.2-.85-3.04 0l-.77.76-.76.76L10 7l-.65-2.14c.19-.38.44-.75.77-1.07l1.52-1.53c1.69-1.68 4.42-1.68 6.1 0zM2 4l8 6-6-8zm4-2l4 8-2-8H6zM2 6l8 4-8-2V6zm7.36 7.69L10 13l.74 2.35-1.38 1.39c-1.69 1.68-4.41 1.68-6.1 0-1.68-1.68-1.68-4.42 0-6.1l1.39-1.38L7 10l-.69.64-1.52 1.53c-.85.84-.85 2.2 0 3.04.84.85 2.2.85 3.04 0zM18 16l-8-6 6 8zm-4 2l-4-8 2 8h2zm4-4l-8-4 8 2v2z';
break;
case 'editor-video':
- path = 'M16 2h-3v1H7V2H4v15h3v-1h6v1h3V2zM6 3v1H5V3h1zm9 0v1h-1V3h1zm-2 1v5H7V4h6zM6 5v1H5V5h1zm9 0v1h-1V5h1zM6 7v1H5V7h1zm9 0v1h-1V7h1zM6 9v1H5V9h1zm9 0v1h-1V9h1zm-2 1v5H7v-5h6zm-7 1v1H5v-1h1zm9 0v1h-1v-1h1zm-9 2v1H5v-1h1zm9 0v1h-1v-1h1zm-9 2v1H5v-1h1zm9 0v1h-1v-1h1z';
+ path =
+ 'M16 2h-3v1H7V2H4v15h3v-1h6v1h3V2zM6 3v1H5V3h1zm9 0v1h-1V3h1zm-2 1v5H7V4h6zM6 5v1H5V5h1zm9 0v1h-1V5h1zM6 7v1H5V7h1zm9 0v1h-1V7h1zM6 9v1H5V9h1zm9 0v1h-1V9h1zm-2 1v5H7v-5h6zm-7 1v1H5v-1h1zm9 0v1h-1v-1h1zm-9 2v1H5v-1h1zm9 0v1h-1v-1h1zm-9 2v1H5v-1h1zm9 0v1h-1v-1h1z';
break;
case 'ellipsis':
- path = 'M5 10c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zm12-2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-7 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z';
+ path =
+ 'M5 10c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zm12-2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-7 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z';
break;
case 'email-alt':
- path = 'M19 14.5v-9c0-.83-.67-1.5-1.5-1.5H3.49c-.83 0-1.5.67-1.5 1.5v9c0 .83.67 1.5 1.5 1.5H17.5c.83 0 1.5-.67 1.5-1.5zm-1.31-9.11c.33.33.15.67-.03.84L13.6 9.95l3.9 4.06c.12.14.2.36.06.51-.13.16-.43.15-.56.05l-4.37-3.73-2.14 1.95-2.13-1.95-4.37 3.73c-.13.1-.43.11-.56-.05-.14-.15-.06-.37.06-.51l3.9-4.06-4.06-3.72c-.18-.17-.36-.51-.03-.84s.67-.17.95.07l6.24 5.04 6.25-5.04c.28-.24.62-.4.95-.07z';
+ path =
+ 'M19 14.5v-9c0-.83-.67-1.5-1.5-1.5H3.49c-.83 0-1.5.67-1.5 1.5v9c0 .83.67 1.5 1.5 1.5H17.5c.83 0 1.5-.67 1.5-1.5zm-1.31-9.11c.33.33.15.67-.03.84L13.6 9.95l3.9 4.06c.12.14.2.36.06.51-.13.16-.43.15-.56.05l-4.37-3.73-2.14 1.95-2.13-1.95-4.37 3.73c-.13.1-.43.11-.56-.05-.14-.15-.06-.37.06-.51l3.9-4.06-4.06-3.72c-.18-.17-.36-.51-.03-.84s.67-.17.95.07l6.24 5.04 6.25-5.04c.28-.24.62-.4.95-.07z';
break;
case 'email-alt2':
- path = 'M18.01 11.18V2.51c0-1.19-.9-1.81-2-1.37L4 5.91c-1.1.44-2 1.77-2 2.97v8.66c0 1.2.9 1.81 2 1.37l12.01-4.77c1.1-.44 2-1.76 2-2.96zm-1.43-7.46l-6.04 9.33-6.65-4.6c-.1-.07-.36-.32-.17-.64.21-.36.65-.21.65-.21l6.3 2.32s4.83-6.34 5.11-6.7c.13-.17.43-.34.73-.13.29.2.16.49.07.63z';
+ path =
+ 'M18.01 11.18V2.51c0-1.19-.9-1.81-2-1.37L4 5.91c-1.1.44-2 1.77-2 2.97v8.66c0 1.2.9 1.81 2 1.37l12.01-4.77c1.1-.44 2-1.76 2-2.96zm-1.43-7.46l-6.04 9.33-6.65-4.6c-.1-.07-.36-.32-.17-.64.21-.36.65-.21.65-.21l6.3 2.32s4.83-6.34 5.11-6.7c.13-.17.43-.34.73-.13.29.2.16.49.07.63z';
break;
case 'email':
- path = 'M3.87 4h13.25C18.37 4 19 4.59 19 5.79v8.42c0 1.19-.63 1.79-1.88 1.79H3.87c-1.25 0-1.88-.6-1.88-1.79V5.79c0-1.2.63-1.79 1.88-1.79zm6.62 8.6l6.74-5.53c.24-.2.43-.66.13-1.07-.29-.41-.82-.42-1.17-.17l-5.7 3.86L4.8 5.83c-.35-.25-.88-.24-1.17.17-.3.41-.11.87.13 1.07z';
+ path =
+ 'M3.87 4h13.25C18.37 4 19 4.59 19 5.79v8.42c0 1.19-.63 1.79-1.88 1.79H3.87c-1.25 0-1.88-.6-1.88-1.79V5.79c0-1.2.63-1.79 1.88-1.79zm6.62 8.6l6.74-5.53c.24-.2.43-.66.13-1.07-.29-.41-.82-.42-1.17-.17l-5.7 3.86L4.8 5.83c-.35-.25-.88-.24-1.17.17-.3.41-.11.87.13 1.07z';
break;
case 'embed-audio':
- path = 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-7 3H7v4c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2c.4 0 .7.1 1 .3V5h4v2zm4 3.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
+ path =
+ 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-7 3H7v4c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2c.4 0 .7.1 1 .3V5h4v2zm4 3.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
break;
case 'embed-generic':
- path = 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-3 6.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
+ path =
+ 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-3 6.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
break;
case 'embed-photo':
- path = 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-7 8H3V6h7v6zm4-1.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3zm-6-4V8.5L7.2 10 6 9.2 4 11h5zM4.6 8.6c.6 0 1-.4 1-1s-.4-1-1-1-1 .4-1 1 .4 1 1 1z';
+ path =
+ 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-7 8H3V6h7v6zm4-1.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3zm-6-4V8.5L7.2 10 6 9.2 4 11h5zM4.6 8.6c.6 0 1-.4 1-1s-.4-1-1-1-1 .4-1 1 .4 1 1 1z';
break;
case 'embed-post':
- path = 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zM8.6 9l-.4.3c-.4.4-.5 1.1-.2 1.6l-.8.8-1.1-1.1-1.3 1.3c-.2.2-1.6 1.3-1.8 1.1-.2-.2.9-1.6 1.1-1.8l1.3-1.3-1.1-1.1.8-.8c.5.3 1.2.3 1.6-.2l.3-.3c.5-.5.5-1.2.2-1.7L8 5l3 2.9-.8.8c-.5-.2-1.2-.2-1.6.3zm5.4 1.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
+ path =
+ 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zM8.6 9l-.4.3c-.4.4-.5 1.1-.2 1.6l-.8.8-1.1-1.1-1.3 1.3c-.2.2-1.6 1.3-1.8 1.1-.2-.2.9-1.6 1.1-1.8l1.3-1.3-1.1-1.1.8-.8c.5.3 1.2.3 1.6-.2l.3-.3c.5-.5.5-1.2.2-1.7L8 5l3 2.9-.8.8c-.5-.2-1.2-.2-1.6.3zm5.4 1.5L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
break;
case 'embed-video':
- path = 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-7 6.5L8 9.1V11H3V6h5v1.8l2-1.3v4zm4 0L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
+ path =
+ 'M17 4H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-7 6.5L8 9.1V11H3V6h5v1.8l2-1.3v4zm4 0L12.5 12l1.5 1.5V15l-3-3 3-3v1.5zm1 4.5v-1.5l1.5-1.5-1.5-1.5V9l3 3-3 3z';
break;
case 'excerpt-view':
- path = 'M19 18V2c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1v16c0 .55.45 1 1 1h16c.55 0 1-.45 1-1zM4 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v6H6V3h11zM4 11c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v6H6v-6h11z';
+ path =
+ 'M19 18V2c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1v16c0 .55.45 1 1 1h16c.55 0 1-.45 1-1zM4 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v6H6V3h11zM4 11c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v6H6v-6h11z';
break;
case 'exit':
- path = 'M13 3v2h2v10h-2v2h4V3h-4zm0 8V9H5.4l4.3-4.3-1.4-1.4L1.6 10l6.7 6.7 1.4-1.4L5.4 11H13z';
+ path =
+ 'M13 3v2h2v10h-2v2h4V3h-4zm0 8V9H5.4l4.3-4.3-1.4-1.4L1.6 10l6.7 6.7 1.4-1.4L5.4 11H13z';
break;
case 'external':
path = 'M9 3h8v8l-2-1V6.92l-5.6 5.59-1.41-1.41L14.08 5H10zm3 12v-3l2-2v7H3V6h8L9 8H5v7h7z';
break;
case 'facebook-alt':
- path = 'M8.46 18h2.93v-7.3h2.45l.37-2.84h-2.82V6.04c0-.82.23-1.38 1.41-1.38h1.51V2.11c-.26-.03-1.15-.11-2.19-.11-2.18 0-3.66 1.33-3.66 3.76v2.1H6v2.84h2.46V18z';
+ path =
+ 'M8.46 18h2.93v-7.3h2.45l.37-2.84h-2.82V6.04c0-.82.23-1.38 1.41-1.38h1.51V2.11c-.26-.03-1.15-.11-2.19-.11-2.18 0-3.66 1.33-3.66 3.76v2.1H6v2.84h2.46V18z';
break;
case 'facebook':
- path = 'M2.89 2h14.23c.49 0 .88.39.88.88v14.24c0 .48-.39.88-.88.88h-4.08v-6.2h2.08l.31-2.41h-2.39V7.85c0-.7.2-1.18 1.2-1.18h1.28V4.51c-.22-.03-.98-.09-1.86-.09-1.85 0-3.11 1.12-3.11 3.19v1.78H8.46v2.41h2.09V18H2.89c-.49 0-.89-.4-.89-.88V2.88c0-.49.4-.88.89-.88z';
+ path =
+ 'M2.89 2h14.23c.49 0 .88.39.88.88v14.24c0 .48-.39.88-.88.88h-4.08v-6.2h2.08l.31-2.41h-2.39V7.85c0-.7.2-1.18 1.2-1.18h1.28V4.51c-.22-.03-.98-.09-1.86-.09-1.85 0-3.11 1.12-3.11 3.19v1.78H8.46v2.41h2.09V18H2.89c-.49 0-.89-.4-.89-.88V2.88c0-.49.4-.88.89-.88z';
break;
case 'feedback':
- path = 'M2 2h16c.55 0 1 .45 1 1v14c0 .55-.45 1-1 1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm15 14V7H3v9h14zM4 8v1h3V8H4zm4 0v3h8V8H8zm-4 4v1h3v-1H4zm4 0v3h8v-3H8z';
+ path =
+ 'M2 2h16c.55 0 1 .45 1 1v14c0 .55-.45 1-1 1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm15 14V7H3v9h14zM4 8v1h3V8H4zm4 0v3h8V8H8zm-4 4v1h3v-1H4zm4 0v3h8v-3H8z';
break;
case 'filter':
- path = 'M3 4.5v-2s3.34-1 7-1 7 1 7 1v2l-5 7.03v6.97s-1.22-.09-2.25-.59S8 16.5 8 16.5v-4.97z';
+ path =
+ 'M3 4.5v-2s3.34-1 7-1 7 1 7 1v2l-5 7.03v6.97s-1.22-.09-2.25-.59S8 16.5 8 16.5v-4.97z';
break;
case 'flag':
path = 'M5 18V3H3v15h2zm1-6V4c3-1 7 1 11 0v8c-3 1.27-8-1-11 0z';
@@ -457,112 +554,146 @@ export default class Dashicon extends Component {
path = 'M1 1h18v12l-6 6H1V1zm3 3v1h12V4H4zm0 4v1h12V8H4zm6 5v-1H4v1h6zm2 4l5-5h-5v5z';
break;
case 'format-audio':
- path = 'M6.99 3.08l11.02-2c.55-.08.99.45.99 1V14.5c0 1.94-1.57 3.5-3.5 3.5S12 16.44 12 14.5c0-1.93 1.57-3.5 3.5-3.5.54 0 1.04.14 1.5.35V5.08l-9 2V16c-.24 1.7-1.74 3-3.5 3C2.57 19 1 17.44 1 15.5 1 13.57 2.57 12 4.5 12c.54 0 1.04.14 1.5.35V4.08c0-.55.44-.91.99-1z';
+ path =
+ 'M6.99 3.08l11.02-2c.55-.08.99.45.99 1V14.5c0 1.94-1.57 3.5-3.5 3.5S12 16.44 12 14.5c0-1.93 1.57-3.5 3.5-3.5.54 0 1.04.14 1.5.35V5.08l-9 2V16c-.24 1.7-1.74 3-3.5 3C2.57 19 1 17.44 1 15.5 1 13.57 2.57 12 4.5 12c.54 0 1.04.14 1.5.35V4.08c0-.55.44-.91.99-1z';
break;
case 'format-chat':
- path = 'M11 6h-.82C9.07 6 8 7.2 8 8.16V10l-3 3v-3H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h6c1.1 0 2 .9 2 2v3zm0 1h6c1.1 0 2 .9 2 2v5c0 1.1-.9 2-2 2h-2v3l-3-3h-1c-1.1 0-2-.9-2-2V9c0-1.1.9-2 2-2z';
+ path =
+ 'M11 6h-.82C9.07 6 8 7.2 8 8.16V10l-3 3v-3H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h6c1.1 0 2 .9 2 2v3zm0 1h6c1.1 0 2 .9 2 2v5c0 1.1-.9 2-2 2h-2v3l-3-3h-1c-1.1 0-2-.9-2-2V9c0-1.1.9-2 2-2z';
break;
case 'format-gallery':
- path = 'M16 4h1.96c.57 0 1.04.47 1.04 1.04v12.92c0 .57-.47 1.04-1.04 1.04H5.04C4.47 19 4 18.53 4 17.96V16H2.04C1.47 16 1 15.53 1 14.96V2.04C1 1.47 1.47 1 2.04 1h12.92c.57 0 1.04.47 1.04 1.04V4zM3 14h11V3H3v11zm5-8.5C8 4.67 7.33 4 6.5 4S5 4.67 5 5.5 5.67 7 6.5 7 8 6.33 8 5.5zm2 4.5s1-5 3-5v8H4V7c2 0 2 3 2 3s.33-2 2-2 2 2 2 2zm7 7V6h-1v8.96c0 .57-.47 1.04-1.04 1.04H6v1h11z';
+ path =
+ 'M16 4h1.96c.57 0 1.04.47 1.04 1.04v12.92c0 .57-.47 1.04-1.04 1.04H5.04C4.47 19 4 18.53 4 17.96V16H2.04C1.47 16 1 15.53 1 14.96V2.04C1 1.47 1.47 1 2.04 1h12.92c.57 0 1.04.47 1.04 1.04V4zM3 14h11V3H3v11zm5-8.5C8 4.67 7.33 4 6.5 4S5 4.67 5 5.5 5.67 7 6.5 7 8 6.33 8 5.5zm2 4.5s1-5 3-5v8H4V7c2 0 2 3 2 3s.33-2 2-2 2 2 2 2zm7 7V6h-1v8.96c0 .57-.47 1.04-1.04 1.04H6v1h11z';
break;
case 'format-image':
- path = 'M2.25 1h15.5c.69 0 1.25.56 1.25 1.25v15.5c0 .69-.56 1.25-1.25 1.25H2.25C1.56 19 1 18.44 1 17.75V2.25C1 1.56 1.56 1 2.25 1zM17 17V3H3v14h14zM10 6c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2 2-.9 2-2zm3 5s0-6 3-6v10c0 .55-.45 1-1 1H5c-.55 0-1-.45-1-1V8c2 0 3 4 3 4s1-3 3-3 3 2 3 2z';
+ path =
+ 'M2.25 1h15.5c.69 0 1.25.56 1.25 1.25v15.5c0 .69-.56 1.25-1.25 1.25H2.25C1.56 19 1 18.44 1 17.75V2.25C1 1.56 1.56 1 2.25 1zM17 17V3H3v14h14zM10 6c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2 2-.9 2-2zm3 5s0-6 3-6v10c0 .55-.45 1-1 1H5c-.55 0-1-.45-1-1V8c2 0 3 4 3 4s1-3 3-3 3 2 3 2z';
break;
case 'format-quote':
- path = 'M8.54 12.74c0-.87-.24-1.61-.72-2.22-.73-.92-2.14-1.03-2.96-.85-.34-1.93 1.3-4.39 3.42-5.45L6.65 1.94C3.45 3.46.31 6.96.85 11.37 1.19 14.16 2.8 16 5.08 16c1 0 1.83-.29 2.48-.88.66-.59.98-1.38.98-2.38zm9.43 0c0-.87-.24-1.61-.72-2.22-.73-.92-2.14-1.03-2.96-.85-.34-1.93 1.3-4.39 3.42-5.45l-1.63-2.28c-3.2 1.52-6.34 5.02-5.8 9.43.34 2.79 1.95 4.63 4.23 4.63 1 0 1.83-.29 2.48-.88.66-.59.98-1.38.98-2.38z';
+ path =
+ 'M8.54 12.74c0-.87-.24-1.61-.72-2.22-.73-.92-2.14-1.03-2.96-.85-.34-1.93 1.3-4.39 3.42-5.45L6.65 1.94C3.45 3.46.31 6.96.85 11.37 1.19 14.16 2.8 16 5.08 16c1 0 1.83-.29 2.48-.88.66-.59.98-1.38.98-2.38zm9.43 0c0-.87-.24-1.61-.72-2.22-.73-.92-2.14-1.03-2.96-.85-.34-1.93 1.3-4.39 3.42-5.45l-1.63-2.28c-3.2 1.52-6.34 5.02-5.8 9.43.34 2.79 1.95 4.63 4.23 4.63 1 0 1.83-.29 2.48-.88.66-.59.98-1.38.98-2.38z';
break;
case 'format-status':
- path = 'M10 1c7 0 9 2.91 9 6.5S17 14 10 14s-9-2.91-9-6.5S3 1 10 1zM5.5 9C6.33 9 7 8.33 7 7.5S6.33 6 5.5 6 4 6.67 4 7.5 4.67 9 5.5 9zM10 9c.83 0 1.5-.67 1.5-1.5S10.83 6 10 6s-1.5.67-1.5 1.5S9.17 9 10 9zm4.5 0c.83 0 1.5-.67 1.5-1.5S15.33 6 14.5 6 13 6.67 13 7.5 13.67 9 14.5 9zM6 14.5c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5-1.5-.67-1.5-1.5.67-1.5 1.5-1.5zm-3 2c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1z';
+ path =
+ 'M10 1c7 0 9 2.91 9 6.5S17 14 10 14s-9-2.91-9-6.5S3 1 10 1zM5.5 9C6.33 9 7 8.33 7 7.5S6.33 6 5.5 6 4 6.67 4 7.5 4.67 9 5.5 9zM10 9c.83 0 1.5-.67 1.5-1.5S10.83 6 10 6s-1.5.67-1.5 1.5S9.17 9 10 9zm4.5 0c.83 0 1.5-.67 1.5-1.5S15.33 6 14.5 6 13 6.67 13 7.5 13.67 9 14.5 9zM6 14.5c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5-1.5-.67-1.5-1.5.67-1.5 1.5-1.5zm-3 2c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1z';
break;
case 'format-video':
- path = 'M2 1h16c.55 0 1 .45 1 1v16l-18-.02V2c0-.55.45-1 1-1zm4 1L4 5h1l2-3H6zm4 0H9L7 5h1zm3 0h-1l-2 3h1zm3 0h-1l-2 3h1zm1 14V6H3v10h14zM8 7l6 4-6 4V7z';
+ path =
+ 'M2 1h16c.55 0 1 .45 1 1v16l-18-.02V2c0-.55.45-1 1-1zm4 1L4 5h1l2-3H6zm4 0H9L7 5h1zm3 0h-1l-2 3h1zm3 0h-1l-2 3h1zm1 14V6H3v10h14zM8 7l6 4-6 4V7z';
break;
case 'forms':
- path = 'M2 2h7v7H2V2zm9 0v7h7V2h-7zM5.5 4.5L7 3H4zM12 8V3h5v5h-5zM4.5 5.5L3 4v3zM8 4L6.5 5.5 8 7V4zM5.5 6.5L4 8h3zM9 18v-7H2v7h7zm9 0h-7v-7h7v7zM8 12v5H3v-5h5zm6.5 1.5L16 12h-3zM12 16l1.5-1.5L12 13v3zm3.5-1.5L17 16v-3zm-1 1L13 17h3z';
+ path =
+ 'M2 2h7v7H2V2zm9 0v7h7V2h-7zM5.5 4.5L7 3H4zM12 8V3h5v5h-5zM4.5 5.5L3 4v3zM8 4L6.5 5.5 8 7V4zM5.5 6.5L4 8h3zM9 18v-7H2v7h7zm9 0h-7v-7h7v7zM8 12v5H3v-5h5zm6.5 1.5L16 12h-3zM12 16l1.5-1.5L12 13v3zm3.5-1.5L17 16v-3zm-1 1L13 17h3z';
break;
case 'googleplus':
- path = 'M6.73 10h5.4c.05.29.09.57.09.95 0 3.27-2.19 5.6-5.49 5.6-3.17 0-5.73-2.57-5.73-5.73 0-3.17 2.56-5.73 5.73-5.73 1.54 0 2.84.57 3.83 1.5l-1.55 1.5c-.43-.41-1.17-.89-2.28-.89-1.96 0-3.55 1.62-3.55 3.62 0 1.99 1.59 3.61 3.55 3.61 2.26 0 3.11-1.62 3.24-2.47H6.73V10zM19 10v1.64h-1.64v1.63h-1.63v-1.63h-1.64V10h1.64V8.36h1.63V10H19z';
+ path =
+ 'M6.73 10h5.4c.05.29.09.57.09.95 0 3.27-2.19 5.6-5.49 5.6-3.17 0-5.73-2.57-5.73-5.73 0-3.17 2.56-5.73 5.73-5.73 1.54 0 2.84.57 3.83 1.5l-1.55 1.5c-.43-.41-1.17-.89-2.28-.89-1.96 0-3.55 1.62-3.55 3.62 0 1.99 1.59 3.61 3.55 3.61 2.26 0 3.11-1.62 3.24-2.47H6.73V10zM19 10v1.64h-1.64v1.63h-1.63v-1.63h-1.64V10h1.64V8.36h1.63V10H19z';
break;
case 'grid-view':
- path = 'M2 1h16c.55 0 1 .45 1 1v16c0 .55-.45 1-1 1H2c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1zm7.01 7.99v-6H3v6h6.01zm8 0v-6h-6v6h6zm-8 8.01v-6H3v6h6.01zm8 0v-6h-6v6h6z';
+ path =
+ 'M2 1h16c.55 0 1 .45 1 1v16c0 .55-.45 1-1 1H2c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1zm7.01 7.99v-6H3v6h6.01zm8 0v-6h-6v6h6zm-8 8.01v-6H3v6h6.01zm8 0v-6h-6v6h6z';
break;
case 'groups':
- path = 'M8.03 4.46c-.29 1.28.55 3.46 1.97 3.46 1.41 0 2.25-2.18 1.96-3.46-.22-.98-1.08-1.63-1.96-1.63-.89 0-1.74.65-1.97 1.63zm-4.13.9c-.25 1.08.47 2.93 1.67 2.93s1.92-1.85 1.67-2.93c-.19-.83-.92-1.39-1.67-1.39s-1.48.56-1.67 1.39zm8.86 0c-.25 1.08.47 2.93 1.66 2.93 1.2 0 1.92-1.85 1.67-2.93-.19-.83-.92-1.39-1.67-1.39-.74 0-1.47.56-1.66 1.39zm-.59 11.43l1.25-4.3C14.2 10 12.71 8.47 10 8.47c-2.72 0-4.21 1.53-3.44 4.02l1.26 4.3C8.05 17.51 9 18 10 18c.98 0 1.94-.49 2.17-1.21zm-6.1-7.63c-.49.67-.96 1.83-.42 3.59l1.12 3.79c-.34.2-.77.31-1.2.31-.85 0-1.65-.41-1.85-1.03l-1.07-3.65c-.65-2.11.61-3.4 2.92-3.4.27 0 .54.02.79.06-.1.1-.2.22-.29.33zm8.35-.39c2.31 0 3.58 1.29 2.92 3.4l-1.07 3.65c-.2.62-1 1.03-1.85 1.03-.43 0-.86-.11-1.2-.31l1.11-3.77c.55-1.78.08-2.94-.42-3.61-.08-.11-.18-.23-.28-.33.25-.04.51-.06.79-.06z';
+ path =
+ 'M8.03 4.46c-.29 1.28.55 3.46 1.97 3.46 1.41 0 2.25-2.18 1.96-3.46-.22-.98-1.08-1.63-1.96-1.63-.89 0-1.74.65-1.97 1.63zm-4.13.9c-.25 1.08.47 2.93 1.67 2.93s1.92-1.85 1.67-2.93c-.19-.83-.92-1.39-1.67-1.39s-1.48.56-1.67 1.39zm8.86 0c-.25 1.08.47 2.93 1.66 2.93 1.2 0 1.92-1.85 1.67-2.93-.19-.83-.92-1.39-1.67-1.39-.74 0-1.47.56-1.66 1.39zm-.59 11.43l1.25-4.3C14.2 10 12.71 8.47 10 8.47c-2.72 0-4.21 1.53-3.44 4.02l1.26 4.3C8.05 17.51 9 18 10 18c.98 0 1.94-.49 2.17-1.21zm-6.1-7.63c-.49.67-.96 1.83-.42 3.59l1.12 3.79c-.34.2-.77.31-1.2.31-.85 0-1.65-.41-1.85-1.03l-1.07-3.65c-.65-2.11.61-3.4 2.92-3.4.27 0 .54.02.79.06-.1.1-.2.22-.29.33zm8.35-.39c2.31 0 3.58 1.29 2.92 3.4l-1.07 3.65c-.2.62-1 1.03-1.85 1.03-.43 0-.86-.11-1.2-.31l1.11-3.77c.55-1.78.08-2.94-.42-3.61-.08-.11-.18-.23-.28-.33.25-.04.51-.06.79-.06z';
break;
case 'hammer':
- path = 'M17.7 6.32l1.41 1.42-3.47 3.41-1.42-1.42.84-.82c-.32-.76-.81-1.57-1.51-2.31l-4.61 6.59-5.26 4.7c-.39.39-1.02.39-1.42 0l-1.2-1.21c-.39-.39-.39-1.02 0-1.41l10.97-9.92c-1.37-.86-3.21-1.46-5.67-1.48 2.7-.82 4.95-.93 6.58-.3 1.7.66 2.82 2.2 3.91 3.58z';
+ path =
+ 'M17.7 6.32l1.41 1.42-3.47 3.41-1.42-1.42.84-.82c-.32-.76-.81-1.57-1.51-2.31l-4.61 6.59-5.26 4.7c-.39.39-1.02.39-1.42 0l-1.2-1.21c-.39-.39-.39-1.02 0-1.41l10.97-9.92c-1.37-.86-3.21-1.46-5.67-1.48 2.7-.82 4.95-.93 6.58-.3 1.7.66 2.82 2.2 3.91 3.58z';
break;
case 'heading':
path = 'M12.5 4v5.2h-5V4H5v13h2.5v-5.2h5V17H15V4';
break;
case 'heart':
- path = 'M10 17.12c3.33-1.4 5.74-3.79 7.04-6.21 1.28-2.41 1.46-4.81.32-6.25-1.03-1.29-2.37-1.78-3.73-1.74s-2.68.63-3.63 1.46c-.95-.83-2.27-1.42-3.63-1.46s-2.7.45-3.73 1.74c-1.14 1.44-.96 3.84.34 6.25 1.28 2.42 3.69 4.81 7.02 6.21z';
+ path =
+ 'M10 17.12c3.33-1.4 5.74-3.79 7.04-6.21 1.28-2.41 1.46-4.81.32-6.25-1.03-1.29-2.37-1.78-3.73-1.74s-2.68.63-3.63 1.46c-.95-.83-2.27-1.42-3.63-1.46s-2.7.45-3.73 1.74c-1.14 1.44-.96 3.84.34 6.25 1.28 2.42 3.69 4.81 7.02 6.21z';
break;
case 'hidden':
- path = 'M17.2 3.3l.16.17c.39.39.39 1.02 0 1.41L4.55 17.7c-.39.39-1.03.39-1.41 0l-.17-.17c-.39-.39-.39-1.02 0-1.41l1.59-1.6c-1.57-1-2.76-2.3-3.56-3.93.81-1.65 2.03-2.98 3.64-3.99S8.04 5.09 10 5.09c1.2 0 2.33.21 3.4.6l2.38-2.39c.39-.39 1.03-.39 1.42 0zm-7.09 4.01c-.23.25-.34.54-.34.88 0 .31.12.58.31.81l1.8-1.79c-.13-.12-.28-.21-.45-.26-.11-.01-.28-.03-.49-.04-.33.03-.6.16-.83.4zM2.4 10.59c.69 1.23 1.71 2.25 3.05 3.05l1.28-1.28c-.51-.69-.77-1.47-.77-2.36 0-1.06.36-1.98 1.09-2.76-1.04.27-1.96.7-2.76 1.26-.8.58-1.43 1.27-1.89 2.09zm13.22-2.13l.96-.96c1.02.86 1.83 1.89 2.42 3.09-.81 1.65-2.03 2.98-3.64 3.99s-3.4 1.51-5.36 1.51c-.63 0-1.24-.07-1.83-.18l1.07-1.07c.25.02.5.05.76.05 1.63 0 3.13-.4 4.5-1.21s2.4-1.84 3.1-3.09c-.46-.82-1.09-1.51-1.89-2.09-.03-.01-.06-.03-.09-.04zm-5.58 5.58l4-4c-.01 1.1-.41 2.04-1.18 2.81-.78.78-1.72 1.18-2.82 1.19z';
+ path =
+ 'M17.2 3.3l.16.17c.39.39.39 1.02 0 1.41L4.55 17.7c-.39.39-1.03.39-1.41 0l-.17-.17c-.39-.39-.39-1.02 0-1.41l1.59-1.6c-1.57-1-2.76-2.3-3.56-3.93.81-1.65 2.03-2.98 3.64-3.99S8.04 5.09 10 5.09c1.2 0 2.33.21 3.4.6l2.38-2.39c.39-.39 1.03-.39 1.42 0zm-7.09 4.01c-.23.25-.34.54-.34.88 0 .31.12.58.31.81l1.8-1.79c-.13-.12-.28-.21-.45-.26-.11-.01-.28-.03-.49-.04-.33.03-.6.16-.83.4zM2.4 10.59c.69 1.23 1.71 2.25 3.05 3.05l1.28-1.28c-.51-.69-.77-1.47-.77-2.36 0-1.06.36-1.98 1.09-2.76-1.04.27-1.96.7-2.76 1.26-.8.58-1.43 1.27-1.89 2.09zm13.22-2.13l.96-.96c1.02.86 1.83 1.89 2.42 3.09-.81 1.65-2.03 2.98-3.64 3.99s-3.4 1.51-5.36 1.51c-.63 0-1.24-.07-1.83-.18l1.07-1.07c.25.02.5.05.76.05 1.63 0 3.13-.4 4.5-1.21s2.4-1.84 3.1-3.09c-.46-.82-1.09-1.51-1.89-2.09-.03-.01-.06-.03-.09-.04zm-5.58 5.58l4-4c-.01 1.1-.41 2.04-1.18 2.81-.78.78-1.72 1.18-2.82 1.19z';
break;
case 'html':
- path = 'M4 16v-2H2v2H1v-5h1v2h2v-2h1v5H4zM7 16v-4H5.6v-1h3.7v1H8v4H7zM10 16v-5h1l1.4 3.4h.1L14 11h1v5h-1v-3.1h-.1l-1.1 2.5h-.6l-1.1-2.5H11V16h-1zM19 16h-3v-5h1v4h2v1zM9.4 4.2L7.1 6.5l2.3 2.3-.6 1.2-3.5-3.5L8.8 3l.6 1.2zm1.2 4.6l2.3-2.3-2.3-2.3.6-1.2 3.5 3.5-3.5 3.5-.6-1.2z';
+ path =
+ 'M4 16v-2H2v2H1v-5h1v2h2v-2h1v5H4zM7 16v-4H5.6v-1h3.7v1H8v4H7zM10 16v-5h1l1.4 3.4h.1L14 11h1v5h-1v-3.1h-.1l-1.1 2.5h-.6l-1.1-2.5H11V16h-1zM19 16h-3v-5h1v4h2v1zM9.4 4.2L7.1 6.5l2.3 2.3-.6 1.2-3.5-3.5L8.8 3l.6 1.2zm1.2 4.6l2.3-2.3-2.3-2.3.6-1.2 3.5 3.5-3.5 3.5-.6-1.2z';
break;
case 'id-alt':
- path = 'M18 18H2V2h16v16zM8.05 7.53c.13-.07.24-.15.33-.24.09-.1.17-.21.24-.34.07-.14.13-.26.17-.37s.07-.22.1-.34L8.95 6c0-.04.01-.07.01-.09.05-.32.03-.61-.04-.9-.08-.28-.23-.52-.46-.72C8.23 4.1 7.95 4 7.6 4c-.2 0-.39.04-.56.11-.17.08-.31.18-.41.3-.11.13-.2.27-.27.44-.07.16-.11.33-.12.51s0 .36.01.55l.02.09c.01.06.03.15.06.25s.06.21.1.33.1.25.17.37c.08.12.16.23.25.33s.2.19.34.25c.13.06.28.09.43.09s.3-.03.43-.09zM16 5V4h-5v1h5zm0 2V6h-5v1h5zM7.62 8.83l-1.38-.88c-.41 0-.79.11-1.14.32-.35.22-.62.5-.81.85-.19.34-.29.7-.29 1.07v1.25l.2.05c.13.04.31.09.55.14.24.06.51.12.8.17.29.06.62.1 1 .14.37.04.73.06 1.07.06s.69-.02 1.07-.06.7-.09.98-.14c.27-.05.54-.1.82-.17.27-.06.45-.11.54-.13.09-.03.16-.05.21-.06v-1.25c0-.36-.1-.72-.31-1.07s-.49-.64-.84-.86-.72-.33-1.11-.33zM16 9V8h-3v1h3zm0 2v-1h-3v1h3zm0 3v-1H4v1h12zm0 2v-1H4v1h12z';
+ path =
+ 'M18 18H2V2h16v16zM8.05 7.53c.13-.07.24-.15.33-.24.09-.1.17-.21.24-.34.07-.14.13-.26.17-.37s.07-.22.1-.34L8.95 6c0-.04.01-.07.01-.09.05-.32.03-.61-.04-.9-.08-.28-.23-.52-.46-.72C8.23 4.1 7.95 4 7.6 4c-.2 0-.39.04-.56.11-.17.08-.31.18-.41.3-.11.13-.2.27-.27.44-.07.16-.11.33-.12.51s0 .36.01.55l.02.09c.01.06.03.15.06.25s.06.21.1.33.1.25.17.37c.08.12.16.23.25.33s.2.19.34.25c.13.06.28.09.43.09s.3-.03.43-.09zM16 5V4h-5v1h5zm0 2V6h-5v1h5zM7.62 8.83l-1.38-.88c-.41 0-.79.11-1.14.32-.35.22-.62.5-.81.85-.19.34-.29.7-.29 1.07v1.25l.2.05c.13.04.31.09.55.14.24.06.51.12.8.17.29.06.62.1 1 .14.37.04.73.06 1.07.06s.69-.02 1.07-.06.7-.09.98-.14c.27-.05.54-.1.82-.17.27-.06.45-.11.54-.13.09-.03.16-.05.21-.06v-1.25c0-.36-.1-.72-.31-1.07s-.49-.64-.84-.86-.72-.33-1.11-.33zM16 9V8h-3v1h3zm0 2v-1h-3v1h3zm0 3v-1H4v1h12zm0 2v-1H4v1h12z';
break;
case 'id':
- path = 'M18 16H2V4h16v12zM7.05 8.53c.13-.07.24-.15.33-.24.09-.1.17-.21.24-.34.07-.14.13-.26.17-.37s.07-.22.1-.34L7.95 7c0-.04.01-.07.01-.09.05-.32.03-.61-.04-.9-.08-.28-.23-.52-.46-.72C7.23 5.1 6.95 5 6.6 5c-.2 0-.39.04-.56.11-.17.08-.31.18-.41.3-.11.13-.2.27-.27.44-.07.16-.11.33-.12.51s0 .36.01.55l.02.09c.01.06.03.15.06.25s.06.21.1.33.1.25.17.37c.08.12.16.23.25.33s.2.19.34.25c.13.06.28.09.43.09s.3-.03.43-.09zM17 9V5h-5v4h5zm-10.38.83l-1.38-.88c-.41 0-.79.11-1.14.32-.35.22-.62.5-.81.85-.19.34-.29.7-.29 1.07v1.25l.2.05c.13.04.31.09.55.14.24.06.51.12.8.17.29.06.62.1 1 .14.37.04.73.06 1.07.06s.69-.02 1.07-.06.7-.09.98-.14c.27-.05.54-.1.82-.17.27-.06.45-.11.54-.13.09-.03.16-.05.21-.06v-1.25c0-.36-.1-.72-.31-1.07s-.49-.64-.84-.86-.72-.33-1.11-.33zM17 11v-1h-5v1h5zm0 2v-1h-5v1h5zm0 2v-1H3v1h14z';
+ path =
+ 'M18 16H2V4h16v12zM7.05 8.53c.13-.07.24-.15.33-.24.09-.1.17-.21.24-.34.07-.14.13-.26.17-.37s.07-.22.1-.34L7.95 7c0-.04.01-.07.01-.09.05-.32.03-.61-.04-.9-.08-.28-.23-.52-.46-.72C7.23 5.1 6.95 5 6.6 5c-.2 0-.39.04-.56.11-.17.08-.31.18-.41.3-.11.13-.2.27-.27.44-.07.16-.11.33-.12.51s0 .36.01.55l.02.09c.01.06.03.15.06.25s.06.21.1.33.1.25.17.37c.08.12.16.23.25.33s.2.19.34.25c.13.06.28.09.43.09s.3-.03.43-.09zM17 9V5h-5v4h5zm-10.38.83l-1.38-.88c-.41 0-.79.11-1.14.32-.35.22-.62.5-.81.85-.19.34-.29.7-.29 1.07v1.25l.2.05c.13.04.31.09.55.14.24.06.51.12.8.17.29.06.62.1 1 .14.37.04.73.06 1.07.06s.69-.02 1.07-.06.7-.09.98-.14c.27-.05.54-.1.82-.17.27-.06.45-.11.54-.13.09-.03.16-.05.21-.06v-1.25c0-.36-.1-.72-.31-1.07s-.49-.64-.84-.86-.72-.33-1.11-.33zM17 11v-1h-5v1h5zm0 2v-1h-5v1h5zm0 2v-1H3v1h14z';
break;
case 'image-crop':
path = 'M19 12v3h-4v4h-3v-4H4V7H0V4h4V0h3v4h7l3-3 1 1-3 3v7h4zm-8-5H7v4zm-3 5h4V8z';
break;
case 'image-filter':
- path = 'M14 5.87c0-2.2-1.79-4-4-4s-4 1.8-4 4c0 2.21 1.79 4 4 4s4-1.79 4-4zM3.24 10.66c-1.92 1.1-2.57 3.55-1.47 5.46 1.11 1.92 3.55 2.57 5.47 1.47 1.91-1.11 2.57-3.55 1.46-5.47-1.1-1.91-3.55-2.56-5.46-1.46zm9.52 6.93c1.92 1.1 4.36.45 5.47-1.46 1.1-1.92.45-4.36-1.47-5.47-1.91-1.1-4.36-.45-5.46 1.46-1.11 1.92-.45 4.36 1.46 5.47z';
+ path =
+ 'M14 5.87c0-2.2-1.79-4-4-4s-4 1.8-4 4c0 2.21 1.79 4 4 4s4-1.79 4-4zM3.24 10.66c-1.92 1.1-2.57 3.55-1.47 5.46 1.11 1.92 3.55 2.57 5.47 1.47 1.91-1.11 2.57-3.55 1.46-5.47-1.1-1.91-3.55-2.56-5.46-1.46zm9.52 6.93c1.92 1.1 4.36.45 5.47-1.46 1.1-1.92.45-4.36-1.47-5.47-1.91-1.1-4.36-.45-5.46 1.46-1.11 1.92-.45 4.36 1.46 5.47z';
break;
case 'image-flip-horizontal':
- path = 'M19 3v14h-8v3H9v-3H1V3h8V0h2v3h8zm-8.5 14V3h-1v14h1zM7 6.5L3 10l4 3.5v-7zM17 10l-4-3.5v7z';
+ path =
+ 'M19 3v14h-8v3H9v-3H1V3h8V0h2v3h8zm-8.5 14V3h-1v14h1zM7 6.5L3 10l4 3.5v-7zM17 10l-4-3.5v7z';
break;
case 'image-flip-vertical':
- path = 'M20 9v2h-3v8H3v-8H0V9h3V1h14v8h3zM6.5 7h7L10 3zM17 9.5H3v1h14v-1zM13.5 13h-7l3.5 4z';
+ path =
+ 'M20 9v2h-3v8H3v-8H0V9h3V1h14v8h3zM6.5 7h7L10 3zM17 9.5H3v1h14v-1zM13.5 13h-7l3.5 4z';
break;
case 'image-rotate-left':
- path = 'M7 5H5.05c0-1.74.85-2.9 2.95-2.9V0C4.85 0 2.96 2.11 2.96 5H1.18L3.8 8.39zm13-4v14h-5v5H1V10h9V1h10zm-2 2h-6v7h3v3h3V3zm-5 9H3v6h10v-6z';
+ path =
+ 'M7 5H5.05c0-1.74.85-2.9 2.95-2.9V0C4.85 0 2.96 2.11 2.96 5H1.18L3.8 8.39zm13-4v14h-5v5H1V10h9V1h10zm-2 2h-6v7h3v3h3V3zm-5 9H3v6h10v-6z';
break;
case 'image-rotate-right':
- path = 'M15.95 5H14l3.2 3.39L19.82 5h-1.78c0-2.89-1.89-5-5.04-5v2.1c2.1 0 2.95 1.16 2.95 2.9zM1 1h10v9h9v10H6v-5H1V1zm2 2v10h3v-3h3V3H3zm5 9v6h10v-6H8z';
+ path =
+ 'M15.95 5H14l3.2 3.39L19.82 5h-1.78c0-2.89-1.89-5-5.04-5v2.1c2.1 0 2.95 1.16 2.95 2.9zM1 1h10v9h9v10H6v-5H1V1zm2 2v10h3v-3h3V3H3zm5 9v6h10v-6H8z';
break;
case 'image-rotate':
- path = 'M10.25 1.02c5.1 0 8.75 4.04 8.75 9s-3.65 9-8.75 9c-3.2 0-6.02-1.59-7.68-3.99l2.59-1.52c1.1 1.5 2.86 2.51 4.84 2.51 3.3 0 6-2.79 6-6s-2.7-6-6-6c-1.97 0-3.72 1-4.82 2.49L7 8.02l-6 2v-7L2.89 4.6c1.69-2.17 4.36-3.58 7.36-3.58z';
+ path =
+ 'M10.25 1.02c5.1 0 8.75 4.04 8.75 9s-3.65 9-8.75 9c-3.2 0-6.02-1.59-7.68-3.99l2.59-1.52c1.1 1.5 2.86 2.51 4.84 2.51 3.3 0 6-2.79 6-6s-2.7-6-6-6c-1.97 0-3.72 1-4.82 2.49L7 8.02l-6 2v-7L2.89 4.6c1.69-2.17 4.36-3.58 7.36-3.58z';
break;
case 'images-alt':
- path = 'M4 15v-3H2V2h12v3h2v3h2v10H6v-3H4zm7-12c-1.1 0-2 .9-2 2h4c0-1.1-.89-2-2-2zm-7 8V6H3v5h1zm7-3h4c0-1.1-.89-2-2-2-1.1 0-2 .9-2 2zm-5 6V9H5v5h1zm9-1c1.1 0 2-.89 2-2 0-1.1-.9-2-2-2s-2 .9-2 2c0 1.11.9 2 2 2zm2 4v-2c-5 0-5-3-10-3v5h10z';
+ path =
+ 'M4 15v-3H2V2h12v3h2v3h2v10H6v-3H4zm7-12c-1.1 0-2 .9-2 2h4c0-1.1-.89-2-2-2zm-7 8V6H3v5h1zm7-3h4c0-1.1-.89-2-2-2-1.1 0-2 .9-2 2zm-5 6V9H5v5h1zm9-1c1.1 0 2-.89 2-2 0-1.1-.9-2-2-2s-2 .9-2 2c0 1.11.9 2 2 2zm2 4v-2c-5 0-5-3-10-3v5h10z';
break;
case 'images-alt2':
- path = 'M5 3h14v11h-2v2h-2v2H1V7h2V5h2V3zm13 10V4H6v9h12zm-3-4c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm1 6v-1H5V6H4v9h12zM7 6l10 6H7V6zm7 11v-1H3V8H2v9h12z';
+ path =
+ 'M5 3h14v11h-2v2h-2v2H1V7h2V5h2V3zm13 10V4H6v9h12zm-3-4c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm1 6v-1H5V6H4v9h12zM7 6l10 6H7V6zm7 11v-1H3V8H2v9h12z';
break;
case 'index-card':
- path = 'M1 3.17V18h18V4H8v-.83c0-.32-.12-.6-.35-.83S7.14 2 6.82 2H2.18c-.33 0-.6.11-.83.34-.24.23-.35.51-.35.83zM10 6v2H3V6h7zm7 0v10h-5V6h5zm-7 4v2H3v-2h7zm0 4v2H3v-2h7z';
+ path =
+ 'M1 3.17V18h18V4H8v-.83c0-.32-.12-.6-.35-.83S7.14 2 6.82 2H2.18c-.33 0-.6.11-.83.34-.24.23-.35.51-.35.83zM10 6v2H3V6h7zm7 0v10h-5V6h5zm-7 4v2H3v-2h7zm0 4v2H3v-2h7z';
break;
case 'info-outline':
- path = 'M9 15h2V9H9v6zm1-10c-.5 0-1 .5-1 1s.5 1 1 1 1-.5 1-1-.5-1-1-1zm0-4c-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 7z';
+ path =
+ 'M9 15h2V9H9v6zm1-10c-.5 0-1 .5-1 1s.5 1 1 1 1-.5 1-1-.5-1-1-1zm0-4c-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 7z';
break;
case 'info':
- path = 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm1 4c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zm0 9V9H9v6h2z';
+ path =
+ 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm1 4c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zm0 9V9H9v6h2z';
break;
case 'insert-after':
- path = 'M9 12h2v-2h2V8h-2V6H9v2H7v2h2v2zm1 4c3.9 0 7-3.1 7-7s-3.1-7-7-7-7 3.1-7 7 3.1 7 7 7zm0-12c2.8 0 5 2.2 5 5s-2.2 5-5 5-5-2.2-5-5 2.2-5 5-5zM3 19h14v-2H3v2z';
+ path =
+ 'M9 12h2v-2h2V8h-2V6H9v2H7v2h2v2zm1 4c3.9 0 7-3.1 7-7s-3.1-7-7-7-7 3.1-7 7 3.1 7 7 7zm0-12c2.8 0 5 2.2 5 5s-2.2 5-5 5-5-2.2-5-5 2.2-5 5-5zM3 19h14v-2H3v2z';
break;
case 'insert-before':
- path = 'M11 8H9v2H7v2h2v2h2v-2h2v-2h-2V8zm-1-4c-3.9 0-7 3.1-7 7s3.1 7 7 7 7-3.1 7-7-3.1-7-7-7zm0 12c-2.8 0-5-2.2-5-5s2.2-5 5-5 5 2.2 5 5-2.2 5-5 5zM3 1v2h14V1H3z';
+ path =
+ 'M11 8H9v2H7v2h2v2h2v-2h2v-2h-2V8zm-1-4c-3.9 0-7 3.1-7 7s3.1 7 7 7 7-3.1 7-7-3.1-7-7-7zm0 12c-2.8 0-5-2.2-5-5s2.2-5 5-5 5 2.2 5 5-2.2 5-5 5zM3 1v2h14V1H3z';
break;
case 'insert':
- path = '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-3V6z';
+ path =
+ '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-3V6z';
break;
case 'instagram':
- path = 'M12.67 10A2.67 2.67 0 1 0 10 12.67 2.68 2.68 0 0 0 12.67 10zm1.43 0A4.1 4.1 0 1 1 10 5.9a4.09 4.09 0 0 1 4.1 4.1zm1.13-4.27a1 1 0 1 1-1-1 1 1 0 0 1 1 1zM10 3.44c-1.17 0-3.67-.1-4.72.32a2.67 2.67 0 0 0-1.52 1.52c-.42 1-.32 3.55-.32 4.72s-.1 3.67.32 4.72a2.74 2.74 0 0 0 1.52 1.52c1 .42 3.55.32 4.72.32s3.67.1 4.72-.32a2.83 2.83 0 0 0 1.52-1.52c.42-1.05.32-3.55.32-4.72s.1-3.67-.32-4.72a2.74 2.74 0 0 0-1.52-1.52c-1.05-.42-3.55-.32-4.72-.32zM18 10c0 1.1 0 2.2-.05 3.3a4.84 4.84 0 0 1-1.29 3.36A4.8 4.8 0 0 1 13.3 18H6.7a4.84 4.84 0 0 1-3.36-1.29 4.84 4.84 0 0 1-1.29-3.41C2 12.2 2 11.1 2 10V6.7a4.84 4.84 0 0 1 1.34-3.36A4.8 4.8 0 0 1 6.7 2.05C7.8 2 8.9 2 10 2h3.3a4.84 4.84 0 0 1 3.36 1.29A4.8 4.8 0 0 1 18 6.7V10z';
+ path =
+ 'M12.67 10A2.67 2.67 0 1 0 10 12.67 2.68 2.68 0 0 0 12.67 10zm1.43 0A4.1 4.1 0 1 1 10 5.9a4.09 4.09 0 0 1 4.1 4.1zm1.13-4.27a1 1 0 1 1-1-1 1 1 0 0 1 1 1zM10 3.44c-1.17 0-3.67-.1-4.72.32a2.67 2.67 0 0 0-1.52 1.52c-.42 1-.32 3.55-.32 4.72s-.1 3.67.32 4.72a2.74 2.74 0 0 0 1.52 1.52c1 .42 3.55.32 4.72.32s3.67.1 4.72-.32a2.83 2.83 0 0 0 1.52-1.52c.42-1.05.32-3.55.32-4.72s.1-3.67-.32-4.72a2.74 2.74 0 0 0-1.52-1.52c-1.05-.42-3.55-.32-4.72-.32zM18 10c0 1.1 0 2.2-.05 3.3a4.84 4.84 0 0 1-1.29 3.36A4.8 4.8 0 0 1 13.3 18H6.7a4.84 4.84 0 0 1-3.36-1.29 4.84 4.84 0 0 1-1.29-3.41C2 12.2 2 11.1 2 10V6.7a4.84 4.84 0 0 1 1.34-3.36A4.8 4.8 0 0 1 6.7 2.05C7.8 2 8.9 2 10 2h3.3a4.84 4.84 0 0 1 3.36 1.29A4.8 4.8 0 0 1 18 6.7V10z';
break;
case 'keyboard-hide':
- path = 'M18,0 L2,0 C0.9,0 0.01,0.9 0.01,2 L0,12 C0,13.1 0.9,14 2,14 L18,14 C19.1,14 20,13.1 20,12 L20,2 C20,0.9 19.1,0 18,0 Z M18,12 L2,12 L2,2 L18,2 L18,12 Z M9,3 L11,3 L11,5 L9,5 L9,3 Z M9,6 L11,6 L11,8 L9,8 L9,6 Z M6,3 L8,3 L8,5 L6,5 L6,3 Z M6,6 L8,6 L8,8 L6,8 L6,6 Z M3,6 L5,6 L5,8 L3,8 L3,6 Z M3,3 L5,3 L5,5 L3,5 L3,3 Z M6,9 L14,9 L14,11 L6,11 L6,9 Z M12,6 L14,6 L14,8 L12,8 L12,6 Z M12,3 L14,3 L14,5 L12,5 L12,3 Z M15,6 L17,6 L17,8 L15,8 L15,6 Z M15,3 L17,3 L17,5 L15,5 L15,3 Z M10,20 L14,16 L6,16 L10,20 Z';
+ path =
+ 'M18,0 L2,0 C0.9,0 0.01,0.9 0.01,2 L0,12 C0,13.1 0.9,14 2,14 L18,14 C19.1,14 20,13.1 20,12 L20,2 C20,0.9 19.1,0 18,0 Z M18,12 L2,12 L2,2 L18,2 L18,12 Z M9,3 L11,3 L11,5 L9,5 L9,3 Z M9,6 L11,6 L11,8 L9,8 L9,6 Z M6,3 L8,3 L8,5 L6,5 L6,3 Z M6,6 L8,6 L8,8 L6,8 L6,6 Z M3,6 L5,6 L5,8 L3,8 L3,6 Z M3,3 L5,3 L5,5 L3,5 L3,3 Z M6,9 L14,9 L14,11 L6,11 L6,9 Z M12,6 L14,6 L14,8 L12,8 L12,6 Z M12,3 L14,3 L14,5 L12,5 L12,3 Z M15,6 L17,6 L17,8 L15,8 L15,6 Z M15,3 L17,3 L17,5 L15,5 L15,3 Z M10,20 L14,16 L6,16 L10,20 Z';
break;
case 'laptop':
- path = 'M3 3h14c.6 0 1 .4 1 1v10c0 .6-.4 1-1 1H3c-.6 0-1-.4-1-1V4c0-.6.4-1 1-1zm13 2H4v8h12V5zm-3 1H5v4zm6 11v-1H1v1c0 .6.5 1 1.1 1h15.8c.6 0 1.1-.4 1.1-1z';
+ path =
+ 'M3 3h14c.6 0 1 .4 1 1v10c0 .6-.4 1-1 1H3c-.6 0-1-.4-1-1V4c0-.6.4-1 1-1zm13 2H4v8h12V5zm-3 1H5v4zm6 11v-1H1v1c0 .6.5 1 1.1 1h15.8c.6 0 1.1-.4 1.1-1z';
break;
case 'layout':
path = 'M2 2h5v11H2V2zm6 0h5v5H8V2zm6 0h4v16h-4V2zM8 8h5v5H8V8zm-6 6h11v4H2v-4z';
@@ -571,28 +702,36 @@ export default class Dashicon extends Component {
path = 'M3 10.03L9 6v8zM11 6l6 4.03L11 14V6z';
break;
case 'lightbulb':
- path = 'M10 1c3.11 0 5.63 2.52 5.63 5.62 0 1.84-2.03 4.58-2.03 4.58-.33.44-.6 1.25-.6 1.8v1c0 .55-.45 1-1 1H8c-.55 0-1-.45-1-1v-1c0-.55-.27-1.36-.6-1.8 0 0-2.02-2.74-2.02-4.58C4.38 3.52 6.89 1 10 1zM7 16.87V16h6v.87c0 .62-.13 1.13-.75 1.13H12c0 .62-.4 1-1.02 1h-2c-.61 0-.98-.38-.98-1h-.25c-.62 0-.75-.51-.75-1.13z';
+ path =
+ 'M10 1c3.11 0 5.63 2.52 5.63 5.62 0 1.84-2.03 4.58-2.03 4.58-.33.44-.6 1.25-.6 1.8v1c0 .55-.45 1-1 1H8c-.55 0-1-.45-1-1v-1c0-.55-.27-1.36-.6-1.8 0 0-2.02-2.74-2.02-4.58C4.38 3.52 6.89 1 10 1zM7 16.87V16h6v.87c0 .62-.13 1.13-.75 1.13H12c0 .62-.4 1-1.02 1h-2c-.61 0-.98-.38-.98-1h-.25c-.62 0-.75-.51-.75-1.13z';
break;
case 'list-view':
- path = 'M2 19h16c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1v16c0 .55.45 1 1 1zM4 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6V3h11zM4 7c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6V7h11zM4 11c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6v-2h11zM4 15c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6v-2h11z';
+ path =
+ 'M2 19h16c.55 0 1-.45 1-1V2c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1v16c0 .55.45 1 1 1zM4 3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6V3h11zM4 7c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6V7h11zM4 11c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6v-2h11zM4 15c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm13 0v2H6v-2h11z';
break;
case 'location-alt':
- path = 'M13 13.14l1.17-5.94c.79-.43 1.33-1.25 1.33-2.2 0-1.38-1.12-2.5-2.5-2.5S10.5 3.62 10.5 5c0 .95.54 1.77 1.33 2.2zm0-9.64c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5-1.5-.67-1.5-1.5.67-1.5 1.5-1.5zm1.72 4.8L18 6.97v9L13.12 18 7 15.97l-5 2v-9l5-2 4.27 1.41 1.73 7.3z';
+ path =
+ 'M13 13.14l1.17-5.94c.79-.43 1.33-1.25 1.33-2.2 0-1.38-1.12-2.5-2.5-2.5S10.5 3.62 10.5 5c0 .95.54 1.77 1.33 2.2zm0-9.64c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5-1.5-.67-1.5-1.5.67-1.5 1.5-1.5zm1.72 4.8L18 6.97v9L13.12 18 7 15.97l-5 2v-9l5-2 4.27 1.41 1.73 7.3z';
break;
case 'location':
- path = 'M10 2C6.69 2 4 4.69 4 8c0 2.02 1.17 3.71 2.53 4.89.43.37 1.18.96 1.85 1.83.74.97 1.41 2.01 1.62 2.71.21-.7.88-1.74 1.62-2.71.67-.87 1.42-1.46 1.85-1.83C14.83 11.71 16 10.02 16 8c0-3.31-2.69-6-6-6zm0 2.56c1.9 0 3.44 1.54 3.44 3.44S11.9 11.44 10 11.44 6.56 9.9 6.56 8 8.1 4.56 10 4.56z';
+ path =
+ 'M10 2C6.69 2 4 4.69 4 8c0 2.02 1.17 3.71 2.53 4.89.43.37 1.18.96 1.85 1.83.74.97 1.41 2.01 1.62 2.71.21-.7.88-1.74 1.62-2.71.67-.87 1.42-1.46 1.85-1.83C14.83 11.71 16 10.02 16 8c0-3.31-2.69-6-6-6zm0 2.56c1.9 0 3.44 1.54 3.44 3.44S11.9 11.44 10 11.44 6.56 9.9 6.56 8 8.1 4.56 10 4.56z';
break;
case 'lock':
- path = 'M14 9h1c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1H5c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1h1V6c0-2.21 1.79-4 4-4s4 1.79 4 4v3zm-2 0V6c0-1.1-.9-2-2-2s-2 .9-2 2v3h4zm-1 7l-.36-2.15c.51-.24.86-.75.86-1.35 0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5c0 .6.35 1.11.86 1.35L9 16h2z';
+ path =
+ 'M14 9h1c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1H5c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1h1V6c0-2.21 1.79-4 4-4s4 1.79 4 4v3zm-2 0V6c0-1.1-.9-2-2-2s-2 .9-2 2v3h4zm-1 7l-.36-2.15c.51-.24.86-.75.86-1.35 0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5c0 .6.35 1.11.86 1.35L9 16h2z';
break;
case 'marker':
- path = 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm0 13c2.76 0 5-2.24 5-5s-2.24-5-5-5-5 2.24-5 5 2.24 5 5 5z';
+ path =
+ 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm0 13c2.76 0 5-2.24 5-5s-2.24-5-5-5-5 2.24-5 5 2.24 5 5 5z';
break;
case 'media-archive':
- path = 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zM8 3.5v2l1.8-1zM11 5L9.2 6 11 7V5zM8 6.5v2l1.8-1zM11 8L9.2 9l1.8 1V8zM8 9.5v2l1.8-1zm3 1.5l-1.8 1 1.8 1v-2zm-1.5 6c.83 0 1.62-.72 1.5-1.63-.05-.38-.49-1.61-.49-1.61l-1.99-1.1s-.45 1.95-.52 2.71c-.07.77.67 1.63 1.5 1.63zm0-2.39c.42 0 .76.34.76.76 0 .43-.34.77-.76.77s-.76-.34-.76-.77c0-.42.34-.76.76-.76z';
+ path =
+ 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zM8 3.5v2l1.8-1zM11 5L9.2 6 11 7V5zM8 6.5v2l1.8-1zM11 8L9.2 9l1.8 1V8zM8 9.5v2l1.8-1zm3 1.5l-1.8 1 1.8 1v-2zm-1.5 6c.83 0 1.62-.72 1.5-1.63-.05-.38-.49-1.61-.49-1.61l-1.99-1.1s-.45 1.95-.52 2.71c-.07.77.67 1.63 1.5 1.63zm0-2.39c.42 0 .76.34.76.76 0 .43-.34.77-.76.77s-.76-.34-.76-.77c0-.42.34-.76.76-.76z';
break;
case 'media-audio':
- path = 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zm1 7.26V8.09c0-.11-.04-.21-.12-.29-.07-.08-.16-.11-.27-.1 0 0-3.97.71-4.25.78C8.07 8.54 8 8.8 8 9v3.37c-.2-.09-.42-.07-.6-.07-.38 0-.7.13-.96.39-.26.27-.4.58-.4.96 0 .37.14.69.4.95.26.27.58.4.96.4.34 0 .7-.04.96-.26.26-.23.64-.65.64-1.12V10.3l3-.6V12c-.67-.2-1.17.04-1.44.31-.26.26-.39.58-.39.95 0 .38.13.69.39.96.27.26.71.39 1.08.39.38 0 .7-.13.96-.39.26-.27.4-.58.4-.96z';
+ path =
+ 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zm1 7.26V8.09c0-.11-.04-.21-.12-.29-.07-.08-.16-.11-.27-.1 0 0-3.97.71-4.25.78C8.07 8.54 8 8.8 8 9v3.37c-.2-.09-.42-.07-.6-.07-.38 0-.7.13-.96.39-.26.27-.4.58-.4.96 0 .37.14.69.4.95.26.27.58.4.96.4.34 0 .7-.04.96-.26.26-.23.64-.65.64-1.12V10.3l3-.6V12c-.67-.2-1.17.04-1.44.31-.26.26-.39.58-.39.95 0 .38.13.69.39.96.27.26.71.39 1.08.39.38 0 .7-.13.96-.39.26-.27.4-.58.4-.96z';
break;
case 'media-code':
path = 'M12 2l4 4v12H4V2h8zM9 13l-2-2 2-2-1-1-3 3 3 3zm3 1l3-3-3-3-1 1 2 2-2 2z';
@@ -601,22 +740,28 @@ export default class Dashicon extends Component {
path = 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3z';
break;
case 'media-document':
- path = 'M12 2l4 4v12H4V2h8zM5 3v1h6V3H5zm7 3h3l-3-3v3zM5 5v1h6V5H5zm10 3V7H5v1h10zM5 9v1h4V9H5zm10 3V9h-5v3h5zM5 11v1h4v-1H5zm10 3v-1H5v1h10zm-3 2v-1H5v1h7z';
+ path =
+ 'M12 2l4 4v12H4V2h8zM5 3v1h6V3H5zm7 3h3l-3-3v3zM5 5v1h6V5H5zm10 3V7H5v1h10zM5 9v1h4V9H5zm10 3V9h-5v3h5zM5 11v1h4v-1H5zm10 3v-1H5v1h10zm-3 2v-1H5v1h7z';
break;
case 'media-interactive':
- path = 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zm2 8V8H6v6h3l-1 2h1l1-2 1 2h1l-1-2h3zm-6-3c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm5-2v2h-3V9h3zm0 3v1H7v-1h6z';
+ path =
+ 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zm2 8V8H6v6h3l-1 2h1l1-2 1 2h1l-1-2h3zm-6-3c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm5-2v2h-3V9h3zm0 3v1H7v-1h6z';
break;
case 'media-spreadsheet':
- path = 'M12 2l4 4v12H4V2h8zm-1 4V3H5v3h6zM8 8V7H5v1h3zm3 0V7H9v1h2zm4 0V7h-3v1h3zm-7 2V9H5v1h3zm3 0V9H9v1h2zm4 0V9h-3v1h3zm-7 2v-1H5v1h3zm3 0v-1H9v1h2zm4 0v-1h-3v1h3zm-7 2v-1H5v1h3zm3 0v-1H9v1h2zm4 0v-1h-3v1h3zm-7 2v-1H5v1h3zm3 0v-1H9v1h2z';
+ path =
+ 'M12 2l4 4v12H4V2h8zm-1 4V3H5v3h6zM8 8V7H5v1h3zm3 0V7H9v1h2zm4 0V7h-3v1h3zm-7 2V9H5v1h3zm3 0V9H9v1h2zm4 0V9h-3v1h3zm-7 2v-1H5v1h3zm3 0v-1H9v1h2zm4 0v-1h-3v1h3zm-7 2v-1H5v1h3zm3 0v-1H9v1h2zm4 0v-1h-3v1h3zm-7 2v-1H5v1h3zm3 0v-1H9v1h2z';
break;
case 'media-text':
- path = 'M12 2l4 4v12H4V2h8zM5 3v1h6V3H5zm7 3h3l-3-3v3zM5 5v1h6V5H5zm10 3V7H5v1h10zm0 2V9H5v1h10zm0 2v-1H5v1h10zm-4 2v-1H5v1h6z';
+ path =
+ 'M12 2l4 4v12H4V2h8zM5 3v1h6V3H5zm7 3h3l-3-3v3zM5 5v1h6V5H5zm10 3V7H5v1h10zm0 2V9H5v1h10zm0 2v-1H5v1h10zm-4 2v-1H5v1h6z';
break;
case 'media-video':
- path = 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zm-1 8v-3c0-.27-.1-.51-.29-.71-.2-.19-.44-.29-.71-.29H7c-.27 0-.51.1-.71.29-.19.2-.29.44-.29.71v3c0 .27.1.51.29.71.2.19.44.29.71.29h3c.27 0 .51-.1.71-.29.19-.2.29-.44.29-.71zm3 1v-5l-2 2v1z';
+ path =
+ 'M12 2l4 4v12H4V2h8zm0 4h3l-3-3v3zm-1 8v-3c0-.27-.1-.51-.29-.71-.2-.19-.44-.29-.71-.29H7c-.27 0-.51.1-.71.29-.19.2-.29.44-.29.71v3c0 .27.1.51.29.71.2.19.44.29.71.29h3c.27 0 .51-.1.71-.29.19-.2.29-.44.29-.71zm3 1v-5l-2 2v1z';
break;
case 'megaphone':
- path = 'M18.15 5.94c.46 1.62.38 3.22-.02 4.48-.42 1.28-1.26 2.18-2.3 2.48-.16.06-.26.06-.4.06-.06.02-.12.02-.18.02-.06.02-.14.02-.22.02h-6.8l2.22 5.5c.02.14-.06.26-.14.34-.08.1-.24.16-.34.16H6.95c-.1 0-.26-.06-.34-.16-.08-.08-.16-.2-.14-.34l-1-5.5H4.25l-.02-.02c-.5.06-1.08-.18-1.54-.62s-.88-1.08-1.06-1.88c-.24-.8-.2-1.56-.02-2.2.18-.62.58-1.08 1.06-1.3l.02-.02 9-5.4c.1-.06.18-.1.24-.16.06-.04.14-.08.24-.12.16-.08.28-.12.5-.18 1.04-.3 2.24.1 3.22.98s1.84 2.24 2.26 3.86zm-2.58 5.98h-.02c.4-.1.74-.34 1.04-.7.58-.7.86-1.76.86-3.04 0-.64-.1-1.3-.28-1.98-.34-1.36-1.02-2.5-1.78-3.24s-1.68-1.1-2.46-.88c-.82.22-1.4.96-1.7 2-.32 1.04-.28 2.36.06 3.72.38 1.36 1 2.5 1.8 3.24.78.74 1.62 1.1 2.48.88zm-2.54-7.08c.22-.04.42-.02.62.04.38.16.76.48 1.02 1s.42 1.2.42 1.78c0 .3-.04.56-.12.8-.18.48-.44.84-.86.94-.34.1-.8-.06-1.14-.4s-.64-.86-.78-1.5c-.18-.62-.12-1.24.02-1.72s.48-.84.82-.94z';
+ path =
+ 'M18.15 5.94c.46 1.62.38 3.22-.02 4.48-.42 1.28-1.26 2.18-2.3 2.48-.16.06-.26.06-.4.06-.06.02-.12.02-.18.02-.06.02-.14.02-.22.02h-6.8l2.22 5.5c.02.14-.06.26-.14.34-.08.1-.24.16-.34.16H6.95c-.1 0-.26-.06-.34-.16-.08-.08-.16-.2-.14-.34l-1-5.5H4.25l-.02-.02c-.5.06-1.08-.18-1.54-.62s-.88-1.08-1.06-1.88c-.24-.8-.2-1.56-.02-2.2.18-.62.58-1.08 1.06-1.3l.02-.02 9-5.4c.1-.06.18-.1.24-.16.06-.04.14-.08.24-.12.16-.08.28-.12.5-.18 1.04-.3 2.24.1 3.22.98s1.84 2.24 2.26 3.86zm-2.58 5.98h-.02c.4-.1.74-.34 1.04-.7.58-.7.86-1.76.86-3.04 0-.64-.1-1.3-.28-1.98-.34-1.36-1.02-2.5-1.78-3.24s-1.68-1.1-2.46-.88c-.82.22-1.4.96-1.7 2-.32 1.04-.28 2.36.06 3.72.38 1.36 1 2.5 1.8 3.24.78.74 1.62 1.1 2.48.88zm-2.54-7.08c.22-.04.42-.02.62.04.38.16.76.48 1.02 1s.42 1.2.42 1.78c0 .3-.04.56-.12.8-.18.48-.44.84-.86.94-.34.1-.8-.06-1.14-.4s-.64-.86-.78-1.5c-.18-.62-.12-1.24.02-1.72s.48-.84.82-.94z';
break;
case 'menu-alt':
path = 'M3 4h14v2H3V4zm0 5h14v2H3V9zm0 5h14v2H3v-2z';
@@ -625,7 +770,8 @@ export default class Dashicon extends Component {
path = 'M17 7V5H3v2h14zm0 4V9H3v2h14zm0 4v-2H3v2h14z';
break;
case 'microphone':
- path = 'M12 9V3c0-1.1-.89-2-2-2-1.12 0-2 .94-2 2v6c0 1.1.9 2 2 2 1.13 0 2-.94 2-2zm4 0c0 2.97-2.16 5.43-5 5.91V17h2c.56 0 1 .45 1 1s-.44 1-1 1H7c-.55 0-1-.45-1-1s.45-1 1-1h2v-2.09C6.17 14.43 4 11.97 4 9c0-.55.45-1 1-1 .56 0 1 .45 1 1 0 2.21 1.8 4 4 4 2.21 0 4-1.79 4-4 0-.55.45-1 1-1 .56 0 1 .45 1 1z';
+ path =
+ 'M12 9V3c0-1.1-.89-2-2-2-1.12 0-2 .94-2 2v6c0 1.1.9 2 2 2 1.13 0 2-.94 2-2zm4 0c0 2.97-2.16 5.43-5 5.91V17h2c.56 0 1 .45 1 1s-.44 1-1 1H7c-.55 0-1-.45-1-1s.45-1 1-1h2v-2.09C6.17 14.43 4 11.97 4 9c0-.55.45-1 1-1 .56 0 1 .45 1 1 0 2.21 1.8 4 4 4 2.21 0 4-1.79 4-4 0-.55.45-1 1-1 .56 0 1 .45 1 1z';
break;
case 'migrate':
path = 'M4 6h6V4H2v12.01h8V14H4V6zm2 2h6V5l6 5-6 5v-3H6V8z';
@@ -634,43 +780,55 @@ export default class Dashicon extends Component {
path = 'M4 9h12v2H4V9z';
break;
case 'money':
- path = 'M0 3h20v12h-.75c0-1.79-1.46-3.25-3.25-3.25-1.31 0-2.42.79-2.94 1.91-.25-.1-.52-.16-.81-.16-.98 0-1.8.63-2.11 1.5H0V3zm8.37 3.11c-.06.15-.1.31-.11.47s-.01.33.01.5l.02.08c.01.06.02.14.05.23.02.1.06.2.1.31.03.11.09.22.15.33.07.12.15.22.23.31s.18.17.31.23c.12.06.25.09.4.09.14 0 .27-.03.39-.09s.22-.14.3-.22c.09-.09.16-.2.22-.32.07-.12.12-.23.16-.33s.07-.2.09-.31c.03-.11.04-.18.05-.22s.01-.07.01-.09c.05-.29.03-.56-.04-.82s-.21-.48-.41-.66c-.21-.18-.47-.27-.79-.27-.19 0-.36.03-.52.1-.15.07-.28.16-.38.28-.09.11-.17.25-.24.4zm4.48 6.04v-1.14c0-.33-.1-.66-.29-.98s-.45-.59-.77-.79c-.32-.21-.66-.31-1.02-.31l-1.24.84-1.28-.82c-.37 0-.72.1-1.04.3-.31.2-.56.46-.74.77-.18.32-.27.65-.27.99v1.14l.18.05c.12.04.29.08.51.14.23.05.47.1.74.15.26.05.57.09.91.13.34.03.67.05.99.05.3 0 .63-.02.98-.05.34-.04.64-.08.89-.13.25-.04.5-.1.76-.16l.5-.12c.08-.02.14-.04.19-.06zm3.15.1c1.52 0 2.75 1.23 2.75 2.75s-1.23 2.75-2.75 2.75c-.73 0-1.38-.3-1.87-.77.23-.35.37-.78.37-1.23 0-.77-.39-1.46-.99-1.86.43-.96 1.37-1.64 2.49-1.64zm-5.5 3.5c0-.96.79-1.75 1.75-1.75s1.75.79 1.75 1.75-.79 1.75-1.75 1.75-1.75-.79-1.75-1.75z';
+ path =
+ 'M0 3h20v12h-.75c0-1.79-1.46-3.25-3.25-3.25-1.31 0-2.42.79-2.94 1.91-.25-.1-.52-.16-.81-.16-.98 0-1.8.63-2.11 1.5H0V3zm8.37 3.11c-.06.15-.1.31-.11.47s-.01.33.01.5l.02.08c.01.06.02.14.05.23.02.1.06.2.1.31.03.11.09.22.15.33.07.12.15.22.23.31s.18.17.31.23c.12.06.25.09.4.09.14 0 .27-.03.39-.09s.22-.14.3-.22c.09-.09.16-.2.22-.32.07-.12.12-.23.16-.33s.07-.2.09-.31c.03-.11.04-.18.05-.22s.01-.07.01-.09c.05-.29.03-.56-.04-.82s-.21-.48-.41-.66c-.21-.18-.47-.27-.79-.27-.19 0-.36.03-.52.1-.15.07-.28.16-.38.28-.09.11-.17.25-.24.4zm4.48 6.04v-1.14c0-.33-.1-.66-.29-.98s-.45-.59-.77-.79c-.32-.21-.66-.31-1.02-.31l-1.24.84-1.28-.82c-.37 0-.72.1-1.04.3-.31.2-.56.46-.74.77-.18.32-.27.65-.27.99v1.14l.18.05c.12.04.29.08.51.14.23.05.47.1.74.15.26.05.57.09.91.13.34.03.67.05.99.05.3 0 .63-.02.98-.05.34-.04.64-.08.89-.13.25-.04.5-.1.76-.16l.5-.12c.08-.02.14-.04.19-.06zm3.15.1c1.52 0 2.75 1.23 2.75 2.75s-1.23 2.75-2.75 2.75c-.73 0-1.38-.3-1.87-.77.23-.35.37-.78.37-1.23 0-.77-.39-1.46-.99-1.86.43-.96 1.37-1.64 2.49-1.64zm-5.5 3.5c0-.96.79-1.75 1.75-1.75s1.75.79 1.75 1.75-.79 1.75-1.75 1.75-1.75-.79-1.75-1.75z';
break;
case 'move':
path = 'M19 10l-4 4v-3h-4v4h3l-4 4-4-4h3v-4H5v3l-4-4 4-4v3h4V5H6l4-4 4 4h-3v4h4V6z';
break;
case 'nametag':
- path = 'M12 5V2c0-.55-.45-1-1-1H9c-.55 0-1 .45-1 1v3c0 .55.45 1 1 1h2c.55 0 1-.45 1-1zm-2-3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm8 13V7c0-1.1-.9-2-2-2h-3v.33C13 6.25 12.25 7 11.33 7H8.67C7.75 7 7 6.25 7 5.33V5H4c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2zm-1-6v6H3V9h14zm-8 2c0-.55-.22-1-.5-1s-.5.45-.5 1 .22 1 .5 1 .5-.45.5-1zm3 0c0-.55-.22-1-.5-1s-.5.45-.5 1 .22 1 .5 1 .5-.45.5-1zm-5.96 1.21c.92.48 2.34.79 3.96.79s3.04-.31 3.96-.79c-.21 1-1.89 1.79-3.96 1.79s-3.75-.79-3.96-1.79z';
+ path =
+ 'M12 5V2c0-.55-.45-1-1-1H9c-.55 0-1 .45-1 1v3c0 .55.45 1 1 1h2c.55 0 1-.45 1-1zm-2-3c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm8 13V7c0-1.1-.9-2-2-2h-3v.33C13 6.25 12.25 7 11.33 7H8.67C7.75 7 7 6.25 7 5.33V5H4c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2zm-1-6v6H3V9h14zm-8 2c0-.55-.22-1-.5-1s-.5.45-.5 1 .22 1 .5 1 .5-.45.5-1zm3 0c0-.55-.22-1-.5-1s-.5.45-.5 1 .22 1 .5 1 .5-.45.5-1zm-5.96 1.21c.92.48 2.34.79 3.96.79s3.04-.31 3.96-.79c-.21 1-1.89 1.79-3.96 1.79s-3.75-.79-3.96-1.79z';
break;
case 'networking':
- path = 'M18 13h1c.55 0 1 .45 1 1.01v2.98c0 .56-.45 1.01-1 1.01h-4c-.55 0-1-.45-1-1.01v-2.98c0-.56.45-1.01 1-1.01h1v-2h-5v2h1c.55 0 1 .45 1 1.01v2.98c0 .56-.45 1.01-1 1.01H8c-.55 0-1-.45-1-1.01v-2.98c0-.56.45-1.01 1-1.01h1v-2H4v2h1c.55 0 1 .45 1 1.01v2.98C6 17.55 5.55 18 5 18H1c-.55 0-1-.45-1-1.01v-2.98C0 13.45.45 13 1 13h1v-2c0-1.1.9-2 2-2h5V7H8c-.55 0-1-.45-1-1.01V3.01C7 2.45 7.45 2 8 2h4c.55 0 1 .45 1 1.01v2.98C13 6.55 12.55 7 12 7h-1v2h5c1.1 0 2 .9 2 2v2z';
+ path =
+ 'M18 13h1c.55 0 1 .45 1 1.01v2.98c0 .56-.45 1.01-1 1.01h-4c-.55 0-1-.45-1-1.01v-2.98c0-.56.45-1.01 1-1.01h1v-2h-5v2h1c.55 0 1 .45 1 1.01v2.98c0 .56-.45 1.01-1 1.01H8c-.55 0-1-.45-1-1.01v-2.98c0-.56.45-1.01 1-1.01h1v-2H4v2h1c.55 0 1 .45 1 1.01v2.98C6 17.55 5.55 18 5 18H1c-.55 0-1-.45-1-1.01v-2.98C0 13.45.45 13 1 13h1v-2c0-1.1.9-2 2-2h5V7H8c-.55 0-1-.45-1-1.01V3.01C7 2.45 7.45 2 8 2h4c.55 0 1 .45 1 1.01v2.98C13 6.55 12.55 7 12 7h-1v2h5c1.1 0 2 .9 2 2v2z';
break;
case 'no-alt':
- path = 'M14.95 6.46L11.41 10l3.54 3.54-1.41 1.41L10 11.42l-3.53 3.53-1.42-1.42L8.58 10 5.05 6.47l1.42-1.42L10 8.58l3.54-3.53z';
+ path =
+ 'M14.95 6.46L11.41 10l3.54 3.54-1.41 1.41L10 11.42l-3.53 3.53-1.42-1.42L8.58 10 5.05 6.47l1.42-1.42L10 8.58l3.54-3.53z';
break;
case 'no':
- path = 'M12.12 10l3.53 3.53-2.12 2.12L10 12.12l-3.54 3.54-2.12-2.12L7.88 10 4.34 6.46l2.12-2.12L10 7.88l3.54-3.53 2.12 2.12z';
+ path =
+ 'M12.12 10l3.53 3.53-2.12 2.12L10 12.12l-3.54 3.54-2.12-2.12L7.88 10 4.34 6.46l2.12-2.12L10 7.88l3.54-3.53 2.12 2.12z';
break;
case 'palmtree':
- path = 'M8.58 2.39c.32 0 .59.05.81.14 1.25.55 1.69 2.24 1.7 3.97.59-.82 2.15-2.29 3.41-2.29s2.94.73 3.53 3.55c-1.13-.65-2.42-.94-3.65-.94-1.26 0-2.45.32-3.29.89.4-.11.86-.16 1.33-.16 1.39 0 2.9.45 3.4 1.31.68 1.16.47 3.38-.76 4.14-.14-2.1-1.69-4.12-3.47-4.12-.44 0-.88.12-1.33.38C8 10.62 7 14.56 7 19H2c0-5.53 4.21-9.65 7.68-10.79-.56-.09-1.17-.15-1.82-.15C6.1 8.06 4.05 8.5 2 10c.76-2.96 2.78-4.1 4.69-4.1 1.25 0 2.45.5 3.2 1.29-.66-2.24-2.49-2.86-4.08-2.86-.8 0-1.55.16-2.05.35.91-1.29 3.31-2.29 4.82-2.29zM13 11.5c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5.67 1.5 1.5 1.5 1.5-.67 1.5-1.5z';
+ path =
+ 'M8.58 2.39c.32 0 .59.05.81.14 1.25.55 1.69 2.24 1.7 3.97.59-.82 2.15-2.29 3.41-2.29s2.94.73 3.53 3.55c-1.13-.65-2.42-.94-3.65-.94-1.26 0-2.45.32-3.29.89.4-.11.86-.16 1.33-.16 1.39 0 2.9.45 3.4 1.31.68 1.16.47 3.38-.76 4.14-.14-2.1-1.69-4.12-3.47-4.12-.44 0-.88.12-1.33.38C8 10.62 7 14.56 7 19H2c0-5.53 4.21-9.65 7.68-10.79-.56-.09-1.17-.15-1.82-.15C6.1 8.06 4.05 8.5 2 10c.76-2.96 2.78-4.1 4.69-4.1 1.25 0 2.45.5 3.2 1.29-.66-2.24-2.49-2.86-4.08-2.86-.8 0-1.55.16-2.05.35.91-1.29 3.31-2.29 4.82-2.29zM13 11.5c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5.67 1.5 1.5 1.5 1.5-.67 1.5-1.5z';
break;
case 'paperclip':
- path = 'M17.05 2.7c1.93 1.94 1.93 5.13 0 7.07L10 16.84c-1.88 1.89-4.91 1.93-6.86.15-.06-.05-.13-.09-.19-.15-1.93-1.94-1.93-5.12 0-7.07l4.94-4.95c.91-.92 2.28-1.1 3.39-.58.3.15.59.33.83.58 1.17 1.17 1.17 3.07 0 4.24l-4.93 4.95c-.39.39-1.02.39-1.41 0s-.39-1.02 0-1.41l4.93-4.95c.39-.39.39-1.02 0-1.41-.38-.39-1.02-.39-1.4 0l-4.94 4.95c-.91.92-1.1 2.29-.57 3.4.14.3.32.59.57.84s.54.43.84.57c1.11.53 2.47.35 3.39-.57l7.05-7.07c1.16-1.17 1.16-3.08 0-4.25-.56-.55-1.28-.83-2-.86-.08.01-.16.01-.24 0-.22-.03-.43-.11-.6-.27-.39-.4-.38-1.05.02-1.45.16-.16.36-.24.56-.28.14-.02.27-.01.4.02 1.19.06 2.36.52 3.27 1.43z';
+ path =
+ 'M17.05 2.7c1.93 1.94 1.93 5.13 0 7.07L10 16.84c-1.88 1.89-4.91 1.93-6.86.15-.06-.05-.13-.09-.19-.15-1.93-1.94-1.93-5.12 0-7.07l4.94-4.95c.91-.92 2.28-1.1 3.39-.58.3.15.59.33.83.58 1.17 1.17 1.17 3.07 0 4.24l-4.93 4.95c-.39.39-1.02.39-1.41 0s-.39-1.02 0-1.41l4.93-4.95c.39-.39.39-1.02 0-1.41-.38-.39-1.02-.39-1.4 0l-4.94 4.95c-.91.92-1.1 2.29-.57 3.4.14.3.32.59.57.84s.54.43.84.57c1.11.53 2.47.35 3.39-.57l7.05-7.07c1.16-1.17 1.16-3.08 0-4.25-.56-.55-1.28-.83-2-.86-.08.01-.16.01-.24 0-.22-.03-.43-.11-.6-.27-.39-.4-.38-1.05.02-1.45.16-.16.36-.24.56-.28.14-.02.27-.01.4.02 1.19.06 2.36.52 3.27 1.43z';
break;
case 'performance':
- path = 'M3.76 17.01h12.48C17.34 15.63 18 13.9 18 12c0-4.41-3.58-8-8-8s-8 3.59-8 8c0 1.9.66 3.63 1.76 5.01zM9 6c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zM4 8c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zm4.52 3.4c.84-.83 6.51-3.5 6.51-3.5s-2.66 5.68-3.49 6.51c-.84.84-2.18.84-3.02 0-.83-.83-.83-2.18 0-3.01zM3 13c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zm6 0c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zm6 0c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1z';
+ path =
+ 'M3.76 17.01h12.48C17.34 15.63 18 13.9 18 12c0-4.41-3.58-8-8-8s-8 3.59-8 8c0 1.9.66 3.63 1.76 5.01zM9 6c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zM4 8c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zm4.52 3.4c.84-.83 6.51-3.5 6.51-3.5s-2.66 5.68-3.49 6.51c-.84.84-2.18.84-3.02 0-.83-.83-.83-2.18 0-3.01zM3 13c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zm6 0c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1zm6 0c0-.55.45-1 1-1s1 .45 1 1c0 .56-.45 1-1 1s-1-.44-1-1z';
break;
case 'phone':
- path = 'M12.06 6l-.21-.2c-.52-.54-.43-.79.08-1.3l2.72-2.75c.81-.82.96-1.21 1.73-.48l.21.2zm.53.45l4.4-4.4c.7.94 2.34 3.47 1.53 5.34-.73 1.67-1.09 1.75-2 3-1.85 2.11-4.18 4.37-6 6.07-1.26.91-1.31 1.33-3 2-1.8.71-4.4-.89-5.38-1.56l4.4-4.4 1.18 1.62c.34.46 1.2-.06 1.8-.66 1.04-1.05 3.18-3.18 4-4.07.59-.59 1.12-1.45.66-1.8zM1.57 16.5l-.21-.21c-.68-.74-.29-.9.52-1.7l2.74-2.72c.51-.49.75-.6 1.27-.11l.2.21z';
+ path =
+ 'M12.06 6l-.21-.2c-.52-.54-.43-.79.08-1.3l2.72-2.75c.81-.82.96-1.21 1.73-.48l.21.2zm.53.45l4.4-4.4c.7.94 2.34 3.47 1.53 5.34-.73 1.67-1.09 1.75-2 3-1.85 2.11-4.18 4.37-6 6.07-1.26.91-1.31 1.33-3 2-1.8.71-4.4-.89-5.38-1.56l4.4-4.4 1.18 1.62c.34.46 1.2-.06 1.8-.66 1.04-1.05 3.18-3.18 4-4.07.59-.59 1.12-1.45.66-1.8zM1.57 16.5l-.21-.21c-.68-.74-.29-.9.52-1.7l2.74-2.72c.51-.49.75-.6 1.27-.11l.2.21z';
break;
case 'playlist-audio':
- path = 'M17 3V1H2v2h15zm0 4V5H2v2h15zm-7 4V9H2v2h8zm7.45-1.96l-6 1.12c-.16.02-.19.03-.29.13-.11.09-.16.22-.16.37v4.59c-.29-.13-.66-.14-.93-.14-.54 0-1 .19-1.38.57s-.56.84-.56 1.38c0 .53.18.99.56 1.37s.84.57 1.38.57c.49 0 .92-.16 1.29-.48s.59-.71.65-1.19v-4.95L17 11.27v3.48c-.29-.13-.56-.19-.83-.19-.54 0-1.11.19-1.49.57-.38.37-.57.83-.57 1.37s.19.99.57 1.37.84.57 1.38.57c.53 0 .99-.19 1.37-.57s.57-.83.57-1.37V9.6c0-.16-.05-.3-.16-.41-.11-.12-.24-.17-.39-.15zM8 15v-2H2v2h6zm-2 4v-2H2v2h4z';
+ path =
+ 'M17 3V1H2v2h15zm0 4V5H2v2h15zm-7 4V9H2v2h8zm7.45-1.96l-6 1.12c-.16.02-.19.03-.29.13-.11.09-.16.22-.16.37v4.59c-.29-.13-.66-.14-.93-.14-.54 0-1 .19-1.38.57s-.56.84-.56 1.38c0 .53.18.99.56 1.37s.84.57 1.38.57c.49 0 .92-.16 1.29-.48s.59-.71.65-1.19v-4.95L17 11.27v3.48c-.29-.13-.56-.19-.83-.19-.54 0-1.11.19-1.49.57-.38.37-.57.83-.57 1.37s.19.99.57 1.37.84.57 1.38.57c.53 0 .99-.19 1.37-.57s.57-.83.57-1.37V9.6c0-.16-.05-.3-.16-.41-.11-.12-.24-.17-.39-.15zM8 15v-2H2v2h6zm-2 4v-2H2v2h4z';
break;
case 'playlist-video':
- path = 'M17 3V1H2v2h15zm0 4V5H2v2h15zM6 11V9H2v2h4zm2-2h9c.55 0 1 .45 1 1v8c0 .55-.45 1-1 1H8c-.55 0-1-.45-1-1v-8c0-.55.45-1 1-1zm3 7l3.33-2L11 12v4zm-5-1v-2H2v2h4zm0 4v-2H2v2h4z';
+ path =
+ 'M17 3V1H2v2h15zm0 4V5H2v2h15zM6 11V9H2v2h4zm2-2h9c.55 0 1 .45 1 1v8c0 .55-.45 1-1 1H8c-.55 0-1-.45-1-1v-8c0-.55.45-1 1-1zm3 7l3.33-2L11 12v4zm-5-1v-2H2v2h4zm0 4v-2H2v2h4z';
break;
case 'plus-alt':
- path = 'M15.8 4.2c3.2 3.21 3.2 8.39 0 11.6-3.21 3.2-8.39 3.2-11.6 0C1 12.59 1 7.41 4.2 4.2 7.41 1 12.59 1 15.8 4.2zm-4.3 11.3v-4h4v-3h-4v-4h-3v4h-4v3h4v4h3z';
+ path =
+ 'M15.8 4.2c3.2 3.21 3.2 8.39 0 11.6-3.21 3.2-8.39 3.2-11.6 0C1 12.59 1 7.41 4.2 4.2 7.41 1 12.59 1 15.8 4.2zm-4.3 11.3v-4h4v-3h-4v-4h-3v4h-4v3h4v4h3z';
break;
case 'plus-light':
path = 'M17 9v2h-6v6H9v-6H3V9h6V3h2v6h6z';
@@ -679,19 +837,24 @@ export default class Dashicon extends Component {
path = 'M17 7v3h-5v5H9v-5H4V7h5V2h3v5h5z';
break;
case 'portfolio':
- path = 'M4 5H.78c-.37 0-.74.32-.69.84l1.56 9.99S3.5 8.47 3.86 6.7c.11-.53.61-.7.98-.7H10s-.7-2.08-.77-2.31C9.11 3.25 8.89 3 8.45 3H5.14c-.36 0-.7.23-.8.64C4.25 4.04 4 5 4 5zm4.88 0h-4s.42-1 .87-1h2.13c.48 0 1 1 1 1zM2.67 16.25c-.31.47-.76.75-1.26.75h15.73c.54 0 .92-.31 1.03-.83.44-2.19 1.68-8.44 1.68-8.44.07-.5-.3-.73-.62-.73H16V5.53c0-.16-.26-.53-.66-.53h-3.76c-.52 0-.87.58-.87.58L10 7H5.59c-.32 0-.63.19-.69.5 0 0-1.59 6.7-1.72 7.33-.07.37-.22.99-.51 1.42zM15.38 7H11s.58-1 1.13-1h2.29c.71 0 .96 1 .96 1z';
+ path =
+ 'M4 5H.78c-.37 0-.74.32-.69.84l1.56 9.99S3.5 8.47 3.86 6.7c.11-.53.61-.7.98-.7H10s-.7-2.08-.77-2.31C9.11 3.25 8.89 3 8.45 3H5.14c-.36 0-.7.23-.8.64C4.25 4.04 4 5 4 5zm4.88 0h-4s.42-1 .87-1h2.13c.48 0 1 1 1 1zM2.67 16.25c-.31.47-.76.75-1.26.75h15.73c.54 0 .92-.31 1.03-.83.44-2.19 1.68-8.44 1.68-8.44.07-.5-.3-.73-.62-.73H16V5.53c0-.16-.26-.53-.66-.53h-3.76c-.52 0-.87.58-.87.58L10 7H5.59c-.32 0-.63.19-.69.5 0 0-1.59 6.7-1.72 7.33-.07.37-.22.99-.51 1.42zM15.38 7H11s.58-1 1.13-1h2.29c.71 0 .96 1 .96 1z';
break;
case 'post-status':
- path = 'M14 6c0 1.86-1.28 3.41-3 3.86V16c0 1-2 2-2 2V9.86c-1.72-.45-3-2-3-3.86 0-2.21 1.79-4 4-4s4 1.79 4 4zM8 5c0 .55.45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1z';
+ path =
+ 'M14 6c0 1.86-1.28 3.41-3 3.86V16c0 1-2 2-2 2V9.86c-1.72-.45-3-2-3-3.86 0-2.21 1.79-4 4-4s4 1.79 4 4zM8 5c0 .55.45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1z';
break;
case 'pressthis':
- path = 'M14.76 1C16.55 1 18 2.46 18 4.25c0 1.78-1.45 3.24-3.24 3.24-.23 0-.47-.03-.7-.08L13 8.47V19H2V4h9.54c.13-2 1.52-3 3.22-3zm0 5.49C16 6.49 17 5.48 17 4.25 17 3.01 16 2 14.76 2s-2.24 1.01-2.24 2.25c0 .37.1.72.27 1.03L9.57 8.5c-.28.28-1.77 2.22-1.5 2.49.02.03.06.04.1.04.49 0 2.14-1.28 2.39-1.53l3.24-3.24c.29.14.61.23.96.23z';
+ path =
+ 'M14.76 1C16.55 1 18 2.46 18 4.25c0 1.78-1.45 3.24-3.24 3.24-.23 0-.47-.03-.7-.08L13 8.47V19H2V4h9.54c.13-2 1.52-3 3.22-3zm0 5.49C16 6.49 17 5.48 17 4.25 17 3.01 16 2 14.76 2s-2.24 1.01-2.24 2.25c0 .37.1.72.27 1.03L9.57 8.5c-.28.28-1.77 2.22-1.5 2.49.02.03.06.04.1.04.49 0 2.14-1.28 2.39-1.53l3.24-3.24c.29.14.61.23.96.23z';
break;
case 'products':
- path = 'M17 8h1v11H2V8h1V6c0-2.76 2.24-5 5-5 .71 0 1.39.15 2 .42.61-.27 1.29-.42 2-.42 2.76 0 5 2.24 5 5v2zM5 6v2h2V6c0-1.13.39-2.16 1.02-3H8C6.35 3 5 4.35 5 6zm10 2V6c0-1.65-1.35-3-3-3h-.02c.63.84 1.02 1.87 1.02 3v2h2zm-5-4.22C9.39 4.33 9 5.12 9 6v2h2V6c0-.88-.39-1.67-1-2.22z';
+ path =
+ 'M17 8h1v11H2V8h1V6c0-2.76 2.24-5 5-5 .71 0 1.39.15 2 .42.61-.27 1.29-.42 2-.42 2.76 0 5 2.24 5 5v2zM5 6v2h2V6c0-1.13.39-2.16 1.02-3H8C6.35 3 5 4.35 5 6zm10 2V6c0-1.65-1.35-3-3-3h-.02c.63.84 1.02 1.87 1.02 3v2h2zm-5-4.22C9.39 4.33 9 5.12 9 6v2h2V6c0-.88-.39-1.67-1-2.22z';
break;
case 'randomize':
- path = 'M18 6.01L14 9V7h-4l-5 8H2v-2h2l5-8h5V3zM2 5h3l1.15 2.17-1.12 1.8L4 7H2V5zm16 9.01L14 17v-2H9l-1.15-2.17 1.12-1.8L10 13h4v-2z';
+ path =
+ 'M18 6.01L14 9V7h-4l-5 8H2v-2h2l5-8h5V3zM2 5h3l1.15 2.17-1.12 1.8L4 7H2V5zm16 9.01L14 17v-2H9l-1.15-2.17 1.12-1.8L10 13h4v-2z';
break;
case 'redo':
path = 'M8 5h5V2l6 4-6 4V7H8c-2.2 0-4 1.8-4 4s1.8 4 4 4h5v2H8c-3.3 0-6-2.7-6-6s2.7-6 6-6z';
@@ -700,187 +863,238 @@ export default class Dashicon extends Component {
path = 'M3 4h2v12H3z';
break;
case 'rss':
- path = 'M14.92 18H18C18 9.32 10.82 2.25 2 2.25v3.02c7.12 0 12.92 5.71 12.92 12.73zm-5.44 0h3.08C12.56 12.27 7.82 7.6 2 7.6v3.02c2 0 3.87.77 5.29 2.16C8.7 14.17 9.48 16.03 9.48 18zm-5.35-.02c1.17 0 2.13-.93 2.13-2.09 0-1.15-.96-2.09-2.13-2.09-1.18 0-2.13.94-2.13 2.09 0 1.16.95 2.09 2.13 2.09z';
+ path =
+ 'M14.92 18H18C18 9.32 10.82 2.25 2 2.25v3.02c7.12 0 12.92 5.71 12.92 12.73zm-5.44 0h3.08C12.56 12.27 7.82 7.6 2 7.6v3.02c2 0 3.87.77 5.29 2.16C8.7 14.17 9.48 16.03 9.48 18zm-5.35-.02c1.17 0 2.13-.93 2.13-2.09 0-1.15-.96-2.09-2.13-2.09-1.18 0-2.13.94-2.13 2.09 0 1.16.95 2.09 2.13 2.09z';
break;
case 'saved':
path = 'M15.3 5.3l-6.8 6.8-2.8-2.8-1.4 1.4 4.2 4.2 8.2-8.2';
break;
case 'schedule':
- path = 'M2 2h16v4H2V2zm0 10V8h4v4H2zm6-2V8h4v2H8zm6 3V8h4v5h-4zm-6 5v-6h4v6H8zm-6 0v-4h4v4H2zm12 0v-3h4v3h-4z';
+ path =
+ 'M2 2h16v4H2V2zm0 10V8h4v4H2zm6-2V8h4v2H8zm6 3V8h4v5h-4zm-6 5v-6h4v6H8zm-6 0v-4h4v4H2zm12 0v-3h4v3h-4z';
break;
case 'screenoptions':
path = 'M9 9V3H3v6h6zm8 0V3h-6v6h6zm-8 8v-6H3v6h6zm8 0v-6h-6v6h6z';
break;
case 'search':
- path = 'M12.14 4.18c1.87 1.87 2.11 4.75.72 6.89.12.1.22.21.36.31.2.16.47.36.81.59.34.24.56.39.66.47.42.31.73.57.94.78.32.32.6.65.84 1 .25.35.44.69.59 1.04.14.35.21.68.18 1-.02.32-.14.59-.36.81s-.49.34-.81.36c-.31.02-.65-.04-.99-.19-.35-.14-.7-.34-1.04-.59-.35-.24-.68-.52-1-.84-.21-.21-.47-.52-.77-.93-.1-.13-.25-.35-.47-.66-.22-.32-.4-.57-.56-.78-.16-.2-.29-.35-.44-.5-2.07 1.09-4.69.76-6.44-.98-2.14-2.15-2.14-5.64 0-7.78 2.15-2.15 5.63-2.15 7.78 0zm-1.41 6.36c1.36-1.37 1.36-3.58 0-4.95-1.37-1.37-3.59-1.37-4.95 0-1.37 1.37-1.37 3.58 0 4.95 1.36 1.37 3.58 1.37 4.95 0z';
+ path =
+ 'M12.14 4.18c1.87 1.87 2.11 4.75.72 6.89.12.1.22.21.36.31.2.16.47.36.81.59.34.24.56.39.66.47.42.31.73.57.94.78.32.32.6.65.84 1 .25.35.44.69.59 1.04.14.35.21.68.18 1-.02.32-.14.59-.36.81s-.49.34-.81.36c-.31.02-.65-.04-.99-.19-.35-.14-.7-.34-1.04-.59-.35-.24-.68-.52-1-.84-.21-.21-.47-.52-.77-.93-.1-.13-.25-.35-.47-.66-.22-.32-.4-.57-.56-.78-.16-.2-.29-.35-.44-.5-2.07 1.09-4.69.76-6.44-.98-2.14-2.15-2.14-5.64 0-7.78 2.15-2.15 5.63-2.15 7.78 0zm-1.41 6.36c1.36-1.37 1.36-3.58 0-4.95-1.37-1.37-3.59-1.37-4.95 0-1.37 1.37-1.37 3.58 0 4.95 1.36 1.37 3.58 1.37 4.95 0z';
break;
case 'share-alt':
- path = 'M16.22 5.8c.47.69.29 1.62-.4 2.08-.69.47-1.62.29-2.08-.4-.16-.24-.35-.46-.55-.67-.21-.2-.43-.39-.67-.55s-.5-.3-.77-.41c-.27-.12-.55-.21-.84-.26-.59-.13-1.23-.13-1.82-.01-.29.06-.57.15-.84.27-.27.11-.53.25-.77.41s-.46.35-.66.55c-.21.21-.4.43-.56.67s-.3.5-.41.76c-.01.02-.01.03-.01.04-.1.24-.17.48-.23.72H1V6h2.66c.04-.07.07-.13.12-.2.27-.4.57-.77.91-1.11s.72-.65 1.11-.91c.4-.27.83-.51 1.28-.7s.93-.34 1.41-.43c.99-.21 2.03-.21 3.02 0 .48.09.96.24 1.41.43s.88.43 1.28.7c.39.26.77.57 1.11.91s.64.71.91 1.11zM12.5 10c0-1.38-1.12-2.5-2.5-2.5S7.5 8.62 7.5 10s1.12 2.5 2.5 2.5 2.5-1.12 2.5-2.5zm-8.72 4.2c-.47-.69-.29-1.62.4-2.09.69-.46 1.62-.28 2.08.41.16.24.35.46.55.67.21.2.43.39.67.55s.5.3.77.41c.27.12.55.2.84.26.59.13 1.23.12 1.82 0 .29-.06.57-.14.84-.26.27-.11.53-.25.77-.41s.46-.35.66-.55c.21-.21.4-.44.56-.67.16-.25.3-.5.41-.76.01-.02.01-.03.01-.04.1-.24.17-.48.23-.72H19v3h-2.66c-.04.06-.07.13-.12.2-.27.4-.57.77-.91 1.11s-.72.65-1.11.91c-.4.27-.83.51-1.28.7s-.93.33-1.41.43c-.99.21-2.03.21-3.02 0-.48-.1-.96-.24-1.41-.43s-.88-.43-1.28-.7c-.39-.26-.77-.57-1.11-.91s-.64-.71-.91-1.11z';
+ path =
+ 'M16.22 5.8c.47.69.29 1.62-.4 2.08-.69.47-1.62.29-2.08-.4-.16-.24-.35-.46-.55-.67-.21-.2-.43-.39-.67-.55s-.5-.3-.77-.41c-.27-.12-.55-.21-.84-.26-.59-.13-1.23-.13-1.82-.01-.29.06-.57.15-.84.27-.27.11-.53.25-.77.41s-.46.35-.66.55c-.21.21-.4.43-.56.67s-.3.5-.41.76c-.01.02-.01.03-.01.04-.1.24-.17.48-.23.72H1V6h2.66c.04-.07.07-.13.12-.2.27-.4.57-.77.91-1.11s.72-.65 1.11-.91c.4-.27.83-.51 1.28-.7s.93-.34 1.41-.43c.99-.21 2.03-.21 3.02 0 .48.09.96.24 1.41.43s.88.43 1.28.7c.39.26.77.57 1.11.91s.64.71.91 1.11zM12.5 10c0-1.38-1.12-2.5-2.5-2.5S7.5 8.62 7.5 10s1.12 2.5 2.5 2.5 2.5-1.12 2.5-2.5zm-8.72 4.2c-.47-.69-.29-1.62.4-2.09.69-.46 1.62-.28 2.08.41.16.24.35.46.55.67.21.2.43.39.67.55s.5.3.77.41c.27.12.55.2.84.26.59.13 1.23.12 1.82 0 .29-.06.57-.14.84-.26.27-.11.53-.25.77-.41s.46-.35.66-.55c.21-.21.4-.44.56-.67.16-.25.3-.5.41-.76.01-.02.01-.03.01-.04.1-.24.17-.48.23-.72H19v3h-2.66c-.04.06-.07.13-.12.2-.27.4-.57.77-.91 1.11s-.72.65-1.11.91c-.4.27-.83.51-1.28.7s-.93.33-1.41.43c-.99.21-2.03.21-3.02 0-.48-.1-.96-.24-1.41-.43s-.88-.43-1.28-.7c-.39-.26-.77-.57-1.11-.91s-.64-.71-.91-1.11z';
break;
case 'share-alt2':
- path = 'M18 8l-5 4V9.01c-2.58.06-4.88.45-7 2.99.29-3.57 2.66-5.66 7-5.94V3zM4 14h11v-2l2-1.6V16H2V5h9.43c-1.83.32-3.31 1-4.41 2H4v7z';
+ path =
+ 'M18 8l-5 4V9.01c-2.58.06-4.88.45-7 2.99.29-3.57 2.66-5.66 7-5.94V3zM4 14h11v-2l2-1.6V16H2V5h9.43c-1.83.32-3.31 1-4.41 2H4v7z';
break;
case 'share':
- path = 'M14.5 12c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3c0-.24.03-.46.09-.69l-4.38-2.3c-.55.61-1.33.99-2.21.99-1.66 0-3-1.34-3-3s1.34-3 3-3c.88 0 1.66.39 2.21.99l4.38-2.3c-.06-.23-.09-.45-.09-.69 0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3c-.88 0-1.66-.39-2.21-.99l-4.38 2.3c.06.23.09.45.09.69s-.03.46-.09.69l4.38 2.3c.55-.61 1.33-.99 2.21-.99z';
+ path =
+ 'M14.5 12c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3c0-.24.03-.46.09-.69l-4.38-2.3c-.55.61-1.33.99-2.21.99-1.66 0-3-1.34-3-3s1.34-3 3-3c.88 0 1.66.39 2.21.99l4.38-2.3c-.06-.23-.09-.45-.09-.69 0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3c-.88 0-1.66-.39-2.21-.99l-4.38 2.3c.06.23.09.45.09.69s-.03.46-.09.69l4.38 2.3c.55-.61 1.33-.99 2.21-.99z';
break;
case 'shield-alt':
path = 'M10 2s3 2 7 2c0 11-7 14-7 14S3 15 3 4c4 0 7-2 7-2z';
break;
case 'shield':
- path = 'M10 2s3 2 7 2c0 11-7 14-7 14S3 15 3 4c4 0 7-2 7-2zm0 8h5s1-1 1-5c0 0-5-1-6-2v7H5c1 4 5 7 5 7v-7z';
+ path =
+ 'M10 2s3 2 7 2c0 11-7 14-7 14S3 15 3 4c4 0 7-2 7-2zm0 8h5s1-1 1-5c0 0-5-1-6-2v7H5c1 4 5 7 5 7v-7z';
break;
case 'shortcode':
path = 'M6 14H4V6h2V4H2v12h4M7.1 17h2.1l3.7-14h-2.1M14 4v2h2v8h-2v2h4V4';
break;
case 'slides':
- path = 'M5 14V6h10v8H5zm-3-1V7h2v6H2zm4-6v6h8V7H6zm10 0h2v6h-2V7zm-3 2V8H7v1h6zm0 3v-2H7v2h6z';
+ path =
+ 'M5 14V6h10v8H5zm-3-1V7h2v6H2zm4-6v6h8V7H6zm10 0h2v6h-2V7zm-3 2V8H7v1h6zm0 3v-2H7v2h6z';
break;
case 'smartphone':
- path = 'M6 2h8c.55 0 1 .45 1 1v14c0 .55-.45 1-1 1H6c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm7 12V4H7v10h6zM8 5h4l-4 5V5z';
+ path =
+ 'M6 2h8c.55 0 1 .45 1 1v14c0 .55-.45 1-1 1H6c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm7 12V4H7v10h6zM8 5h4l-4 5V5z';
break;
case 'smiley':
- path = 'M7 5.2c1.1 0 2 .89 2 2 0 .37-.11.71-.28 1C8.72 8.2 8 8 7 8s-1.72.2-1.72.2c-.17-.29-.28-.63-.28-1 0-1.11.9-2 2-2zm6 0c1.11 0 2 .89 2 2 0 .37-.11.71-.28 1 0 0-.72-.2-1.72-.2s-1.72.2-1.72.2c-.17-.29-.28-.63-.28-1 0-1.11.89-2 2-2zm-3 13.7c3.72 0 7.03-2.36 8.23-5.88l-1.32-.46C15.9 15.52 13.12 17.5 10 17.5s-5.9-1.98-6.91-4.94l-1.32.46c1.2 3.52 4.51 5.88 8.23 5.88z';
+ path =
+ 'M7 5.2c1.1 0 2 .89 2 2 0 .37-.11.71-.28 1C8.72 8.2 8 8 7 8s-1.72.2-1.72.2c-.17-.29-.28-.63-.28-1 0-1.11.9-2 2-2zm6 0c1.11 0 2 .89 2 2 0 .37-.11.71-.28 1 0 0-.72-.2-1.72-.2s-1.72.2-1.72.2c-.17-.29-.28-.63-.28-1 0-1.11.89-2 2-2zm-3 13.7c3.72 0 7.03-2.36 8.23-5.88l-1.32-.46C15.9 15.52 13.12 17.5 10 17.5s-5.9-1.98-6.91-4.94l-1.32.46c1.2 3.52 4.51 5.88 8.23 5.88z';
break;
case 'sort':
path = 'M11 7H1l5 7zm-2 7h10l-5-7z';
break;
case 'sos':
- path = 'M18 10c0-4.42-3.58-8-8-8s-8 3.58-8 8 3.58 8 8 8 8-3.58 8-8zM7.23 3.57L8.72 7.3c-.62.29-1.13.8-1.42 1.42L3.57 7.23c.71-1.64 2.02-2.95 3.66-3.66zm9.2 3.66L12.7 8.72c-.29-.62-.8-1.13-1.42-1.42l1.49-3.73c1.64.71 2.95 2.02 3.66 3.66zM10 12c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm-6.43.77l3.73-1.49c.29.62.8 1.13 1.42 1.42l-1.49 3.73c-1.64-.71-2.95-2.02-3.66-3.66zm9.2 3.66l-1.49-3.73c.62-.29 1.13-.8 1.42-1.42l3.73 1.49c-.71 1.64-2.02 2.95-3.66 3.66z';
+ path =
+ 'M18 10c0-4.42-3.58-8-8-8s-8 3.58-8 8 3.58 8 8 8 8-3.58 8-8zM7.23 3.57L8.72 7.3c-.62.29-1.13.8-1.42 1.42L3.57 7.23c.71-1.64 2.02-2.95 3.66-3.66zm9.2 3.66L12.7 8.72c-.29-.62-.8-1.13-1.42-1.42l1.49-3.73c1.64.71 2.95 2.02 3.66 3.66zM10 12c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm-6.43.77l3.73-1.49c.29.62.8 1.13 1.42 1.42l-1.49 3.73c-1.64-.71-2.95-2.02-3.66-3.66zm9.2 3.66l-1.49-3.73c.62-.29 1.13-.8 1.42-1.42l3.73 1.49c-.71 1.64-2.02 2.95-3.66 3.66z';
break;
case 'star-empty':
- path = 'M10 1L7 7l-6 .75 4.13 4.62L4 19l6-3 6 3-1.12-6.63L19 7.75 13 7zm0 2.24l2.34 4.69 4.65.58-3.18 3.56.87 5.15L10 14.88l-4.68 2.34.87-5.15-3.18-3.56 4.65-.58z';
+ path =
+ 'M10 1L7 7l-6 .75 4.13 4.62L4 19l6-3 6 3-1.12-6.63L19 7.75 13 7zm0 2.24l2.34 4.69 4.65.58-3.18 3.56.87 5.15L10 14.88l-4.68 2.34.87-5.15-3.18-3.56 4.65-.58z';
break;
case 'star-filled':
path = 'M10 1l3 6 6 .75-4.12 4.62L16 19l-6-3-6 3 1.13-6.63L1 7.75 7 7z';
break;
case 'star-half':
- path = 'M10 1L7 7l-6 .75 4.13 4.62L4 19l6-3 6 3-1.12-6.63L19 7.75 13 7zm0 2.24l2.34 4.69 4.65.58-3.18 3.56.87 5.15L10 14.88V3.24z';
+ path =
+ 'M10 1L7 7l-6 .75 4.13 4.62L4 19l6-3 6 3-1.12-6.63L19 7.75 13 7zm0 2.24l2.34 4.69 4.65.58-3.18 3.56.87 5.15L10 14.88V3.24z';
break;
case 'sticky':
- path = 'M5 3.61V1.04l8.99-.01-.01 2.58c-1.22.26-2.16 1.35-2.16 2.67v.5c.01 1.31.93 2.4 2.17 2.66l-.01 2.58h-3.41l-.01 2.57c0 .6-.47 4.41-1.06 4.41-.6 0-1.08-3.81-1.08-4.41v-2.56L5 12.02l.01-2.58c1.23-.25 2.15-1.35 2.15-2.66v-.5c0-1.31-.92-2.41-2.16-2.67z';
+ path =
+ 'M5 3.61V1.04l8.99-.01-.01 2.58c-1.22.26-2.16 1.35-2.16 2.67v.5c.01 1.31.93 2.4 2.17 2.66l-.01 2.58h-3.41l-.01 2.57c0 .6-.47 4.41-1.06 4.41-.6 0-1.08-3.81-1.08-4.41v-2.56L5 12.02l.01-2.58c1.23-.25 2.15-1.35 2.15-2.66v-.5c0-1.31-.92-2.41-2.16-2.67z';
break;
case 'store':
- path = 'M1 10c.41.29.96.43 1.5.43.55 0 1.09-.14 1.5-.43.62-.46 1-1.17 1-2 0 .83.37 1.54 1 2 .41.29.96.43 1.5.43.55 0 1.09-.14 1.5-.43.62-.46 1-1.17 1-2 0 .83.37 1.54 1 2 .41.29.96.43 1.51.43.54 0 1.08-.14 1.49-.43.62-.46 1-1.17 1-2 0 .83.37 1.54 1 2 .41.29.96.43 1.5.43.55 0 1.09-.14 1.5-.43.63-.46 1-1.17 1-2V7l-3-7H4L0 7v1c0 .83.37 1.54 1 2zm2 8.99h5v-5h4v5h5v-7c-.37-.05-.72-.22-1-.43-.63-.45-1-.73-1-1.56 0 .83-.38 1.11-1 1.56-.41.3-.95.43-1.49.44-.55 0-1.1-.14-1.51-.44-.63-.45-1-.73-1-1.56 0 .83-.38 1.11-1 1.56-.41.3-.95.43-1.5.44-.54 0-1.09-.14-1.5-.44-.63-.45-1-.73-1-1.57 0 .84-.38 1.12-1 1.57-.29.21-.63.38-1 .44v6.99z';
+ path =
+ 'M1 10c.41.29.96.43 1.5.43.55 0 1.09-.14 1.5-.43.62-.46 1-1.17 1-2 0 .83.37 1.54 1 2 .41.29.96.43 1.5.43.55 0 1.09-.14 1.5-.43.62-.46 1-1.17 1-2 0 .83.37 1.54 1 2 .41.29.96.43 1.51.43.54 0 1.08-.14 1.49-.43.62-.46 1-1.17 1-2 0 .83.37 1.54 1 2 .41.29.96.43 1.5.43.55 0 1.09-.14 1.5-.43.63-.46 1-1.17 1-2V7l-3-7H4L0 7v1c0 .83.37 1.54 1 2zm2 8.99h5v-5h4v5h5v-7c-.37-.05-.72-.22-1-.43-.63-.45-1-.73-1-1.56 0 .83-.38 1.11-1 1.56-.41.3-.95.43-1.49.44-.55 0-1.1-.14-1.51-.44-.63-.45-1-.73-1-1.56 0 .83-.38 1.11-1 1.56-.41.3-.95.43-1.5.44-.54 0-1.09-.14-1.5-.44-.63-.45-1-.73-1-1.57 0 .84-.38 1.12-1 1.57-.29.21-.63.38-1 .44v6.99z';
break;
case 'table-col-after':
- path = 'M14.08 12.864V9.216h3.648V7.424H14.08V3.776h-1.728v3.648H8.64v1.792h3.712v3.648zM0 17.92V0h20.48v17.92H0zM6.4 1.28H1.28v3.84H6.4V1.28zm0 5.12H1.28v3.84H6.4V6.4zm0 5.12H1.28v3.84H6.4v-3.84zM19.2 1.28H7.68v14.08H19.2V1.28z';
+ path =
+ 'M14.08 12.864V9.216h3.648V7.424H14.08V3.776h-1.728v3.648H8.64v1.792h3.712v3.648zM0 17.92V0h20.48v17.92H0zM6.4 1.28H1.28v3.84H6.4V1.28zm0 5.12H1.28v3.84H6.4V6.4zm0 5.12H1.28v3.84H6.4v-3.84zM19.2 1.28H7.68v14.08H19.2V1.28z';
break;
case 'table-col-before':
- path = 'M6.4 3.776v3.648H2.752v1.792H6.4v3.648h1.728V9.216h3.712V7.424H8.128V3.776zM0 17.92V0h20.48v17.92H0zM12.8 1.28H1.28v14.08H12.8V1.28zm6.4 0h-5.12v3.84h5.12V1.28zm0 5.12h-5.12v3.84h5.12V6.4zm0 5.12h-5.12v3.84h5.12v-3.84z';
+ path =
+ 'M6.4 3.776v3.648H2.752v1.792H6.4v3.648h1.728V9.216h3.712V7.424H8.128V3.776zM0 17.92V0h20.48v17.92H0zM12.8 1.28H1.28v14.08H12.8V1.28zm6.4 0h-5.12v3.84h5.12V1.28zm0 5.12h-5.12v3.84h5.12V6.4zm0 5.12h-5.12v3.84h5.12v-3.84z';
break;
case 'table-col-delete':
- path = 'M6.4 9.98L7.68 8.7v-.256L6.4 7.164V9.98zm6.4-1.532l1.28-1.28V9.92L12.8 8.64v-.192zm7.68 9.472V0H0v17.92h20.48zm-1.28-2.56h-5.12v-1.024l-.256.256-1.024-1.024v1.792H7.68v-1.792l-1.024 1.024-.256-.256v1.024H1.28V1.28H6.4v2.368l.704-.704.576.576V1.216h5.12V3.52l.96-.96.32.32V1.216h5.12V15.36zm-5.76-2.112l-3.136-3.136-3.264 3.264-1.536-1.536 3.264-3.264L5.632 5.44l1.536-1.536 3.136 3.136 3.2-3.2 1.536 1.536-3.2 3.2 3.136 3.136-1.536 1.536z';
+ path =
+ 'M6.4 9.98L7.68 8.7v-.256L6.4 7.164V9.98zm6.4-1.532l1.28-1.28V9.92L12.8 8.64v-.192zm7.68 9.472V0H0v17.92h20.48zm-1.28-2.56h-5.12v-1.024l-.256.256-1.024-1.024v1.792H7.68v-1.792l-1.024 1.024-.256-.256v1.024H1.28V1.28H6.4v2.368l.704-.704.576.576V1.216h5.12V3.52l.96-.96.32.32V1.216h5.12V15.36zm-5.76-2.112l-3.136-3.136-3.264 3.264-1.536-1.536 3.264-3.264L5.632 5.44l1.536-1.536 3.136 3.136 3.2-3.2 1.536 1.536-3.2 3.2 3.136 3.136-1.536 1.536z';
break;
case 'table-row-after':
- path = 'M13.824 10.176h-2.88v-2.88H9.536v2.88h-2.88v1.344h2.88v2.88h1.408v-2.88h2.88zM0 17.92V0h20.48v17.92H0zM6.4 1.28H1.28v3.84H6.4V1.28zm6.4 0H7.68v3.84h5.12V1.28zm6.4 0h-5.12v3.84h5.12V1.28zm0 5.056H1.28v9.024H19.2V6.336z';
+ path =
+ 'M13.824 10.176h-2.88v-2.88H9.536v2.88h-2.88v1.344h2.88v2.88h1.408v-2.88h2.88zM0 17.92V0h20.48v17.92H0zM6.4 1.28H1.28v3.84H6.4V1.28zm6.4 0H7.68v3.84h5.12V1.28zm6.4 0h-5.12v3.84h5.12V1.28zm0 5.056H1.28v9.024H19.2V6.336z';
break;
case 'table-row-before':
- path = 'M6.656 6.464h2.88v2.88h1.408v-2.88h2.88V5.12h-2.88V2.24H9.536v2.88h-2.88zM0 17.92V0h20.48v17.92H0zm7.68-2.56h5.12v-3.84H7.68v3.84zm-6.4 0H6.4v-3.84H1.28v3.84zM19.2 1.28H1.28v9.024H19.2V1.28zm0 10.24h-5.12v3.84h5.12v-3.84z';
+ path =
+ 'M6.656 6.464h2.88v2.88h1.408v-2.88h2.88V5.12h-2.88V2.24H9.536v2.88h-2.88zM0 17.92V0h20.48v17.92H0zm7.68-2.56h5.12v-3.84H7.68v3.84zm-6.4 0H6.4v-3.84H1.28v3.84zM19.2 1.28H1.28v9.024H19.2V1.28zm0 10.24h-5.12v3.84h5.12v-3.84z';
break;
case 'table-row-delete':
- path = 'M17.728 11.456L14.592 8.32l3.2-3.2-1.536-1.536-3.2 3.2L9.92 3.648 8.384 5.12l3.2 3.2-3.264 3.264 1.536 1.536 3.264-3.264 3.136 3.136 1.472-1.536zM0 17.92V0h20.48v17.92H0zm19.2-6.4h-.448l-1.28-1.28H19.2V6.4h-1.792l1.28-1.28h.512V1.28H1.28v3.84h6.208l1.28 1.28H1.28v3.84h7.424l-1.28 1.28H1.28v3.84H19.2v-3.84z';
+ path =
+ 'M17.728 11.456L14.592 8.32l3.2-3.2-1.536-1.536-3.2 3.2L9.92 3.648 8.384 5.12l3.2 3.2-3.264 3.264 1.536 1.536 3.264-3.264 3.136 3.136 1.472-1.536zM0 17.92V0h20.48v17.92H0zm19.2-6.4h-.448l-1.28-1.28H19.2V6.4h-1.792l1.28-1.28h.512V1.28H1.28v3.84h6.208l1.28 1.28H1.28v3.84h7.424l-1.28 1.28H1.28v3.84H19.2v-3.84z';
break;
case 'tablet':
- path = 'M4 2h12c.55 0 1 .45 1 1v14c0 .55-.45 1-1 1H4c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm11 14V4H5v12h10zM6 5h6l-6 5V5z';
+ path =
+ 'M4 2h12c.55 0 1 .45 1 1v14c0 .55-.45 1-1 1H4c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1zm11 14V4H5v12h10zM6 5h6l-6 5V5z';
break;
case 'tag':
path = 'M11 2h7v7L8 19l-7-7zm3 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z';
break;
case 'tagcloud':
- path = 'M11 3v4H1V3h10zm8 0v4h-7V3h7zM7 8v3H1V8h6zm12 0v3H8V8h11zM9 12v2H1v-2h8zm10 0v2h-9v-2h9zM6 15v1H1v-1h5zm5 0v1H7v-1h4zm3 0v1h-2v-1h2zm5 0v1h-4v-1h4z';
+ path =
+ 'M11 3v4H1V3h10zm8 0v4h-7V3h7zM7 8v3H1V8h6zm12 0v3H8V8h11zM9 12v2H1v-2h8zm10 0v2h-9v-2h9zM6 15v1H1v-1h5zm5 0v1H7v-1h4zm3 0v1h-2v-1h2zm5 0v1h-4v-1h4z';
break;
case 'testimonial':
- path = 'M4 3h12c.55 0 1.02.2 1.41.59S18 4.45 18 5v7c0 .55-.2 1.02-.59 1.41S16.55 14 16 14h-1l-5 5v-5H4c-.55 0-1.02-.2-1.41-.59S2 12.55 2 12V5c0-.55.2-1.02.59-1.41S3.45 3 4 3zm11 2H4v1h11V5zm1 3H4v1h12V8zm-3 3H4v1h9v-1z';
+ path =
+ 'M4 3h12c.55 0 1.02.2 1.41.59S18 4.45 18 5v7c0 .55-.2 1.02-.59 1.41S16.55 14 16 14h-1l-5 5v-5H4c-.55 0-1.02-.2-1.41-.59S2 12.55 2 12V5c0-.55.2-1.02.59-1.41S3.45 3 4 3zm11 2H4v1h11V5zm1 3H4v1h12V8zm-3 3H4v1h9v-1z';
break;
case 'text':
- path = 'M18 3v2H2V3h16zm-6 4v2H2V7h10zm6 0v2h-4V7h4zM8 11v2H2v-2h6zm10 0v2h-8v-2h8zm-4 4v2H2v-2h12z';
+ path =
+ 'M18 3v2H2V3h16zm-6 4v2H2V7h10zm6 0v2h-4V7h4zM8 11v2H2v-2h6zm10 0v2h-8v-2h8zm-4 4v2H2v-2h12z';
break;
case 'thumbs-down':
- path = 'M7.28 18c-.15.02-.26-.02-.41-.07-.56-.19-.83-.79-.66-1.35.17-.55 1-3.04 1-3.58 0-.53-.75-1-1.35-1h-3c-.6 0-1-.4-1-1s2-7 2-7c.17-.39.55-1 1-1H14v9h-2.14c-.41.41-3.3 4.71-3.58 5.27-.21.41-.6.68-1 .73zM18 12h-2V3h2v9z';
+ path =
+ 'M7.28 18c-.15.02-.26-.02-.41-.07-.56-.19-.83-.79-.66-1.35.17-.55 1-3.04 1-3.58 0-.53-.75-1-1.35-1h-3c-.6 0-1-.4-1-1s2-7 2-7c.17-.39.55-1 1-1H14v9h-2.14c-.41.41-3.3 4.71-3.58 5.27-.21.41-.6.68-1 .73zM18 12h-2V3h2v9z';
break;
case 'thumbs-up':
- path = 'M12.72 2c.15-.02.26.02.41.07.56.19.83.79.66 1.35-.17.55-1 3.04-1 3.58 0 .53.75 1 1.35 1h3c.6 0 1 .4 1 1s-2 7-2 7c-.17.39-.55 1-1 1H6V8h2.14c.41-.41 3.3-4.71 3.58-5.27.21-.41.6-.68 1-.73zM2 8h2v9H2V8z';
+ path =
+ 'M12.72 2c.15-.02.26.02.41.07.56.19.83.79.66 1.35-.17.55-1 3.04-1 3.58 0 .53.75 1 1.35 1h3c.6 0 1 .4 1 1s-2 7-2 7c-.17.39-.55 1-1 1H6V8h2.14c.41-.41 3.3-4.71 3.58-5.27.21-.41.6-.68 1-.73zM2 8h2v9H2V8z';
break;
case 'tickets-alt':
- path = 'M20 6.38L18.99 9.2v-.01c-.52-.19-1.03-.16-1.53.08s-.85.62-1.04 1.14-.16 1.03.07 1.53c.24.5.62.84 1.15 1.03v.01l-1.01 2.82-15.06-5.38.99-2.79c.52.19 1.03.16 1.53-.08.5-.23.84-.61 1.03-1.13s.16-1.03-.08-1.53c-.23-.49-.61-.83-1.13-1.02L4.93 1zm-4.97 5.69l1.37-3.76c.12-.31.1-.65-.04-.95s-.39-.53-.7-.65L8.14 3.98c-.64-.23-1.37.12-1.6.74L5.17 8.48c-.24.65.1 1.37.74 1.6l7.52 2.74c.14.05.28.08.43.08.52 0 1-.33 1.17-.83zM7.97 4.45l7.51 2.73c.19.07.34.21.43.39.08.18.09.38.02.57l-1.37 3.76c-.13.38-.58.59-.96.45L6.09 9.61c-.39-.14-.59-.57-.45-.96l1.37-3.76c.1-.29.39-.49.7-.49.09 0 .17.02.26.05zm6.82 12.14c.35.27.75.41 1.2.41H16v3H0v-2.96c.55 0 1.03-.2 1.41-.59.39-.38.59-.86.59-1.41s-.2-1.02-.59-1.41-.86-.59-1.41-.59V10h1.05l-.28.8 2.87 1.02c-.51.16-.89.62-.89 1.18v4c0 .69.56 1.25 1.25 1.25h8c.69 0 1.25-.56 1.25-1.25v-1.75l.83.3c.12.43.36.78.71 1.04zM3.25 17v-4c0-.41.34-.75.75-.75h.83l7.92 2.83V17c0 .41-.34.75-.75.75H4c-.41 0-.75-.34-.75-.75z';
+ path =
+ 'M20 6.38L18.99 9.2v-.01c-.52-.19-1.03-.16-1.53.08s-.85.62-1.04 1.14-.16 1.03.07 1.53c.24.5.62.84 1.15 1.03v.01l-1.01 2.82-15.06-5.38.99-2.79c.52.19 1.03.16 1.53-.08.5-.23.84-.61 1.03-1.13s.16-1.03-.08-1.53c-.23-.49-.61-.83-1.13-1.02L4.93 1zm-4.97 5.69l1.37-3.76c.12-.31.1-.65-.04-.95s-.39-.53-.7-.65L8.14 3.98c-.64-.23-1.37.12-1.6.74L5.17 8.48c-.24.65.1 1.37.74 1.6l7.52 2.74c.14.05.28.08.43.08.52 0 1-.33 1.17-.83zM7.97 4.45l7.51 2.73c.19.07.34.21.43.39.08.18.09.38.02.57l-1.37 3.76c-.13.38-.58.59-.96.45L6.09 9.61c-.39-.14-.59-.57-.45-.96l1.37-3.76c.1-.29.39-.49.7-.49.09 0 .17.02.26.05zm6.82 12.14c.35.27.75.41 1.2.41H16v3H0v-2.96c.55 0 1.03-.2 1.41-.59.39-.38.59-.86.59-1.41s-.2-1.02-.59-1.41-.86-.59-1.41-.59V10h1.05l-.28.8 2.87 1.02c-.51.16-.89.62-.89 1.18v4c0 .69.56 1.25 1.25 1.25h8c.69 0 1.25-.56 1.25-1.25v-1.75l.83.3c.12.43.36.78.71 1.04zM3.25 17v-4c0-.41.34-.75.75-.75h.83l7.92 2.83V17c0 .41-.34.75-.75.75H4c-.41 0-.75-.34-.75-.75z';
break;
case 'tickets':
- path = 'M20 5.38L18.99 8.2v-.01c-1.04-.37-2.19.18-2.57 1.22-.37 1.04.17 2.19 1.22 2.56v.01l-1.01 2.82L1.57 9.42l.99-2.79c1.04.38 2.19-.17 2.56-1.21s-.17-2.18-1.21-2.55L4.93 0zm-5.45 3.37c.74-2.08-.34-4.37-2.42-5.12-2.08-.74-4.37.35-5.11 2.42-.74 2.08.34 4.38 2.42 5.12 2.07.74 4.37-.35 5.11-2.42zm-2.56-4.74c.89.32 1.57.94 1.97 1.71-.01-.01-.02-.01-.04-.02-.33-.12-.67.09-.78.4-.1.28-.03.57.05.91.04.27.09.62-.06 1.04-.1.29-.33.58-.65 1l-.74 1.01.08-4.08.4.11c.19.04.26-.24.08-.29 0 0-.57-.15-.92-.28-.34-.12-.88-.36-.88-.36-.18-.08-.3.19-.12.27 0 0 .16.08.34.16l.01 1.63L9.2 9.18l.08-4.11c.2.06.4.11.4.11.19.04.26-.23.07-.29 0 0-.56-.15-.91-.28-.07-.02-.14-.05-.22-.08.93-.7 2.19-.94 3.37-.52zM7.4 6.19c.17-.49.44-.92.78-1.27l.04 5c-.94-.95-1.3-2.39-.82-3.73zm4.04 4.75l2.1-2.63c.37-.41.57-.77.69-1.12.05-.12.08-.24.11-.35.09.57.04 1.18-.17 1.77-.45 1.25-1.51 2.1-2.73 2.33zm-.7-3.22l.02 3.22c0 .02 0 .04.01.06-.4 0-.8-.07-1.2-.21-.33-.12-.63-.28-.9-.48zm1.24 6.08l2.1.75c.24.84 1 1.45 1.91 1.45H16v3H0v-2.96c1.1 0 2-.89 2-2 0-1.1-.9-2-2-2V9h1.05l-.28.8 4.28 1.52C4.4 12.03 4 12.97 4 14c0 2.21 1.79 4 4 4s4-1.79 4-4c0-.07-.02-.13-.02-.2zm-6.53-2.33l1.48.53c-.14.04-.15.27.03.28 0 0 .18.02.37.03l.56 1.54-.78 2.36-1.31-3.9c.21-.01.41-.03.41-.03.19-.02.17-.31-.02-.3 0 0-.59.05-.96.05-.07 0-.15 0-.23-.01.13-.2.28-.38.45-.55zM4.4 14c0-.52.12-1.02.32-1.46l1.71 4.7C5.23 16.65 4.4 15.42 4.4 14zm4.19-1.41l1.72.62c.07.17.12.37.12.61 0 .31-.12.66-.28 1.16l-.35 1.2zM11.6 14c0 1.33-.72 2.49-1.79 3.11l1.1-3.18c.06-.17.1-.31.14-.46l.52.19c.02.11.03.22.03.34zm-4.62 3.45l1.08-3.14 1.11 3.03c.01.02.01.04.02.05-.37.13-.77.21-1.19.21-.35 0-.69-.06-1.02-.15z';
+ path =
+ 'M20 5.38L18.99 8.2v-.01c-1.04-.37-2.19.18-2.57 1.22-.37 1.04.17 2.19 1.22 2.56v.01l-1.01 2.82L1.57 9.42l.99-2.79c1.04.38 2.19-.17 2.56-1.21s-.17-2.18-1.21-2.55L4.93 0zm-5.45 3.37c.74-2.08-.34-4.37-2.42-5.12-2.08-.74-4.37.35-5.11 2.42-.74 2.08.34 4.38 2.42 5.12 2.07.74 4.37-.35 5.11-2.42zm-2.56-4.74c.89.32 1.57.94 1.97 1.71-.01-.01-.02-.01-.04-.02-.33-.12-.67.09-.78.4-.1.28-.03.57.05.91.04.27.09.62-.06 1.04-.1.29-.33.58-.65 1l-.74 1.01.08-4.08.4.11c.19.04.26-.24.08-.29 0 0-.57-.15-.92-.28-.34-.12-.88-.36-.88-.36-.18-.08-.3.19-.12.27 0 0 .16.08.34.16l.01 1.63L9.2 9.18l.08-4.11c.2.06.4.11.4.11.19.04.26-.23.07-.29 0 0-.56-.15-.91-.28-.07-.02-.14-.05-.22-.08.93-.7 2.19-.94 3.37-.52zM7.4 6.19c.17-.49.44-.92.78-1.27l.04 5c-.94-.95-1.3-2.39-.82-3.73zm4.04 4.75l2.1-2.63c.37-.41.57-.77.69-1.12.05-.12.08-.24.11-.35.09.57.04 1.18-.17 1.77-.45 1.25-1.51 2.1-2.73 2.33zm-.7-3.22l.02 3.22c0 .02 0 .04.01.06-.4 0-.8-.07-1.2-.21-.33-.12-.63-.28-.9-.48zm1.24 6.08l2.1.75c.24.84 1 1.45 1.91 1.45H16v3H0v-2.96c1.1 0 2-.89 2-2 0-1.1-.9-2-2-2V9h1.05l-.28.8 4.28 1.52C4.4 12.03 4 12.97 4 14c0 2.21 1.79 4 4 4s4-1.79 4-4c0-.07-.02-.13-.02-.2zm-6.53-2.33l1.48.53c-.14.04-.15.27.03.28 0 0 .18.02.37.03l.56 1.54-.78 2.36-1.31-3.9c.21-.01.41-.03.41-.03.19-.02.17-.31-.02-.3 0 0-.59.05-.96.05-.07 0-.15 0-.23-.01.13-.2.28-.38.45-.55zM4.4 14c0-.52.12-1.02.32-1.46l1.71 4.7C5.23 16.65 4.4 15.42 4.4 14zm4.19-1.41l1.72.62c.07.17.12.37.12.61 0 .31-.12.66-.28 1.16l-.35 1.2zM11.6 14c0 1.33-.72 2.49-1.79 3.11l1.1-3.18c.06-.17.1-.31.14-.46l.52.19c.02.11.03.22.03.34zm-4.62 3.45l1.08-3.14 1.11 3.03c.01.02.01.04.02.05-.37.13-.77.21-1.19.21-.35 0-.69-.06-1.02-.15z';
break;
case 'tide':
- path = 'M17 7.2V3H3v7.1c2.6-.5 4.5-1.5 6.4-2.6.2-.2.4-.3.6-.5v3c-1.9 1.1-4 2.2-7 2.8V17h14V9.9c-2.6.5-4.4 1.5-6.2 2.6-.3.1-.5.3-.8.4V10c2-1.1 4-2.2 7-2.8z';
+ path =
+ 'M17 7.2V3H3v7.1c2.6-.5 4.5-1.5 6.4-2.6.2-.2.4-.3.6-.5v3c-1.9 1.1-4 2.2-7 2.8V17h14V9.9c-2.6.5-4.4 1.5-6.2 2.6-.3.1-.5.3-.8.4V10c2-1.1 4-2.2 7-2.8z';
break;
case 'translation':
- path = 'M11 7H9.49c-.63 0-1.25.3-1.59.7L7 5H4.13l-2.39 7h1.69l.74-2H7v4H2c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2h7c1.1 0 2 .9 2 2v2zM6.51 9H4.49l1-2.93zM10 8h7c1.1 0 2 .9 2 2v7c0 1.1-.9 2-2 2h-7c-1.1 0-2-.9-2-2v-7c0-1.1.9-2 2-2zm7.25 5v-1.08h-3.17V9.75h-1.16v2.17H9.75V13h1.28c.11.85.56 1.85 1.28 2.62-.87.36-1.89.62-2.31.62-.01.02.22.97.2 1.46.84 0 2.21-.5 3.28-1.15 1.09.65 2.48 1.15 3.34 1.15-.02-.49.2-1.44.2-1.46-.43 0-1.49-.27-2.38-.63.7-.77 1.14-1.77 1.25-2.61h1.36zm-3.81 1.93c-.5-.46-.85-1.13-1.01-1.93h2.09c-.17.8-.51 1.47-1 1.93l-.04.03s-.03-.02-.04-.03z';
+ path =
+ 'M11 7H9.49c-.63 0-1.25.3-1.59.7L7 5H4.13l-2.39 7h1.69l.74-2H7v4H2c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2h7c1.1 0 2 .9 2 2v2zM6.51 9H4.49l1-2.93zM10 8h7c1.1 0 2 .9 2 2v7c0 1.1-.9 2-2 2h-7c-1.1 0-2-.9-2-2v-7c0-1.1.9-2 2-2zm7.25 5v-1.08h-3.17V9.75h-1.16v2.17H9.75V13h1.28c.11.85.56 1.85 1.28 2.62-.87.36-1.89.62-2.31.62-.01.02.22.97.2 1.46.84 0 2.21-.5 3.28-1.15 1.09.65 2.48 1.15 3.34 1.15-.02-.49.2-1.44.2-1.46-.43 0-1.49-.27-2.38-.63.7-.77 1.14-1.77 1.25-2.61h1.36zm-3.81 1.93c-.5-.46-.85-1.13-1.01-1.93h2.09c-.17.8-.51 1.47-1 1.93l-.04.03s-.03-.02-.04-.03z';
break;
case 'trash':
- path = 'M12 4h3c.6 0 1 .4 1 1v1H3V5c0-.6.5-1 1-1h3c.2-1.1 1.3-2 2.5-2s2.3.9 2.5 2zM8 4h3c-.2-.6-.9-1-1.5-1S8.2 3.4 8 4zM4 7h11l-.9 10.1c0 .5-.5.9-1 .9H5.9c-.5 0-.9-.4-1-.9L4 7z';
+ path =
+ 'M12 4h3c.6 0 1 .4 1 1v1H3V5c0-.6.5-1 1-1h3c.2-1.1 1.3-2 2.5-2s2.3.9 2.5 2zM8 4h3c-.2-.6-.9-1-1.5-1S8.2 3.4 8 4zM4 7h11l-.9 10.1c0 .5-.5.9-1 .9H5.9c-.5 0-.9-.4-1-.9L4 7z';
break;
case 'twitter':
- path = 'M18.94 4.46c-.49.73-1.11 1.38-1.83 1.9.01.15.01.31.01.47 0 4.85-3.69 10.44-10.43 10.44-2.07 0-4-.61-5.63-1.65.29.03.58.05.88.05 1.72 0 3.3-.59 4.55-1.57-1.6-.03-2.95-1.09-3.42-2.55.22.04.45.07.69.07.33 0 .66-.05.96-.13-1.67-.34-2.94-1.82-2.94-3.6v-.04c.5.27 1.06.44 1.66.46-.98-.66-1.63-1.78-1.63-3.06 0-.67.18-1.3.5-1.84 1.81 2.22 4.51 3.68 7.56 3.83-.06-.27-.1-.55-.1-.84 0-2.02 1.65-3.66 3.67-3.66 1.06 0 2.01.44 2.68 1.16.83-.17 1.62-.47 2.33-.89-.28.85-.86 1.57-1.62 2.02.75-.08 1.45-.28 2.11-.57z';
+ path =
+ 'M18.94 4.46c-.49.73-1.11 1.38-1.83 1.9.01.15.01.31.01.47 0 4.85-3.69 10.44-10.43 10.44-2.07 0-4-.61-5.63-1.65.29.03.58.05.88.05 1.72 0 3.3-.59 4.55-1.57-1.6-.03-2.95-1.09-3.42-2.55.22.04.45.07.69.07.33 0 .66-.05.96-.13-1.67-.34-2.94-1.82-2.94-3.6v-.04c.5.27 1.06.44 1.66.46-.98-.66-1.63-1.78-1.63-3.06 0-.67.18-1.3.5-1.84 1.81 2.22 4.51 3.68 7.56 3.83-.06-.27-.1-.55-.1-.84 0-2.02 1.65-3.66 3.67-3.66 1.06 0 2.01.44 2.68 1.16.83-.17 1.62-.47 2.33-.89-.28.85-.86 1.57-1.62 2.02.75-.08 1.45-.28 2.11-.57z';
break;
case 'undo':
path = 'M12 5H7V2L1 6l6 4V7h5c2.2 0 4 1.8 4 4s-1.8 4-4 4H7v2h5c3.3 0 6-2.7 6-6s-2.7-6-6-6z';
break;
case 'universal-access-alt':
- path = 'M19 10c0-4.97-4.03-9-9-9s-9 4.03-9 9 4.03 9 9 9 9-4.03 9-9zm-9-7.4c.83 0 1.5.67 1.5 1.5s-.67 1.51-1.5 1.51c-.82 0-1.5-.68-1.5-1.51s.68-1.5 1.5-1.5zM3.4 7.36c0-.65 6.6-.76 6.6-.76s6.6.11 6.6.76-4.47 1.4-4.47 1.4 1.69 8.14 1.06 8.38c-.62.24-3.19-5.19-3.19-5.19s-2.56 5.43-3.18 5.19c-.63-.24 1.06-8.38 1.06-8.38S3.4 8.01 3.4 7.36z';
+ path =
+ 'M19 10c0-4.97-4.03-9-9-9s-9 4.03-9 9 4.03 9 9 9 9-4.03 9-9zm-9-7.4c.83 0 1.5.67 1.5 1.5s-.67 1.51-1.5 1.51c-.82 0-1.5-.68-1.5-1.51s.68-1.5 1.5-1.5zM3.4 7.36c0-.65 6.6-.76 6.6-.76s6.6.11 6.6.76-4.47 1.4-4.47 1.4 1.69 8.14 1.06 8.38c-.62.24-3.19-5.19-3.19-5.19s-2.56 5.43-3.18 5.19c-.63-.24 1.06-8.38 1.06-8.38S3.4 8.01 3.4 7.36z';
break;
case 'universal-access':
- path = 'M10 2.6c.83 0 1.5.67 1.5 1.5s-.67 1.51-1.5 1.51c-.82 0-1.5-.68-1.5-1.51s.68-1.5 1.5-1.5zM3.4 7.36c0-.65 6.6-.76 6.6-.76s6.6.11 6.6.76-4.47 1.4-4.47 1.4 1.69 8.14 1.06 8.38c-.62.24-3.19-5.19-3.19-5.19s-2.56 5.43-3.18 5.19c-.63-.24 1.06-8.38 1.06-8.38S3.4 8.01 3.4 7.36z';
+ path =
+ 'M10 2.6c.83 0 1.5.67 1.5 1.5s-.67 1.51-1.5 1.51c-.82 0-1.5-.68-1.5-1.51s.68-1.5 1.5-1.5zM3.4 7.36c0-.65 6.6-.76 6.6-.76s6.6.11 6.6.76-4.47 1.4-4.47 1.4 1.69 8.14 1.06 8.38c-.62.24-3.19-5.19-3.19-5.19s-2.56 5.43-3.18 5.19c-.63-.24 1.06-8.38 1.06-8.38S3.4 8.01 3.4 7.36z';
break;
case 'unlock':
- path = 'M12 9V6c0-1.1-.9-2-2-2s-2 .9-2 2H6c0-2.21 1.79-4 4-4s4 1.79 4 4v3h1c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1H5c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1h7zm-1 7l-.36-2.15c.51-.24.86-.75.86-1.35 0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5c0 .6.35 1.11.86 1.35L9 16h2z';
+ path =
+ 'M12 9V6c0-1.1-.9-2-2-2s-2 .9-2 2H6c0-2.21 1.79-4 4-4s4 1.79 4 4v3h1c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1H5c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1h7zm-1 7l-.36-2.15c.51-.24.86-.75.86-1.35 0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5c0 .6.35 1.11.86 1.35L9 16h2z';
break;
case 'update':
- path = 'M10.2 3.28c3.53 0 6.43 2.61 6.92 6h2.08l-3.5 4-3.5-4h2.32c-.45-1.97-2.21-3.45-4.32-3.45-1.45 0-2.73.71-3.54 1.78L4.95 5.66C6.23 4.2 8.11 3.28 10.2 3.28zm-.4 13.44c-3.52 0-6.43-2.61-6.92-6H.8l3.5-4c1.17 1.33 2.33 2.67 3.5 4H5.48c.45 1.97 2.21 3.45 4.32 3.45 1.45 0 2.73-.71 3.54-1.78l1.71 1.95c-1.28 1.46-3.15 2.38-5.25 2.38z';
+ path =
+ 'M10.2 3.28c3.53 0 6.43 2.61 6.92 6h2.08l-3.5 4-3.5-4h2.32c-.45-1.97-2.21-3.45-4.32-3.45-1.45 0-2.73.71-3.54 1.78L4.95 5.66C6.23 4.2 8.11 3.28 10.2 3.28zm-.4 13.44c-3.52 0-6.43-2.61-6.92-6H.8l3.5-4c1.17 1.33 2.33 2.67 3.5 4H5.48c.45 1.97 2.21 3.45 4.32 3.45 1.45 0 2.73-.71 3.54-1.78l1.71 1.95c-1.28 1.46-3.15 2.38-5.25 2.38z';
break;
case 'upload':
path = 'M8 14V8H5l5-6 5 6h-3v6H8zm-2 2v-6H4v8h12.01v-8H14v6H6z';
break;
case 'vault':
- path = 'M18 17V3c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v14c0 .55.45 1 1 1h14c.55 0 1-.45 1-1zm-1 0H3V3h14v14zM4.75 4h10.5c.41 0 .75.34.75.75V6h-1v3h1v2h-1v3h1v1.25c0 .41-.34.75-.75.75H4.75c-.41 0-.75-.34-.75-.75V4.75c0-.41.34-.75.75-.75zM13 10c0-2.21-1.79-4-4-4s-4 1.79-4 4 1.79 4 4 4 4-1.79 4-4zM9 7l.77 1.15C10.49 8.46 11 9.17 11 10c0 1.1-.9 2-2 2s-2-.9-2-2c0-.83.51-1.54 1.23-1.85z';
+ path =
+ 'M18 17V3c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v14c0 .55.45 1 1 1h14c.55 0 1-.45 1-1zm-1 0H3V3h14v14zM4.75 4h10.5c.41 0 .75.34.75.75V6h-1v3h1v2h-1v3h1v1.25c0 .41-.34.75-.75.75H4.75c-.41 0-.75-.34-.75-.75V4.75c0-.41.34-.75.75-.75zM13 10c0-2.21-1.79-4-4-4s-4 1.79-4 4 1.79 4 4 4 4-1.79 4-4zM9 7l.77 1.15C10.49 8.46 11 9.17 11 10c0 1.1-.9 2-2 2s-2-.9-2-2c0-.83.51-1.54 1.23-1.85z';
break;
case 'video-alt':
- path = 'M8 5c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1 0 .57.49 1 1 1h5c.55 0 1-.45 1-1zm6 5l4-4v10l-4-4v-2zm-1 4V8c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h8c.55 0 1-.45 1-1z';
+ path =
+ 'M8 5c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1 0 .57.49 1 1 1h5c.55 0 1-.45 1-1zm6 5l4-4v10l-4-4v-2zm-1 4V8c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h8c.55 0 1-.45 1-1z';
break;
case 'video-alt2':
- path = 'M12 13V7c0-1.1-.9-2-2-2H3c-1.1 0-2 .9-2 2v6c0 1.1.9 2 2 2h7c1.1 0 2-.9 2-2zm1-2.5l6 4.5V5l-6 4.5v1z';
+ path =
+ 'M12 13V7c0-1.1-.9-2-2-2H3c-1.1 0-2 .9-2 2v6c0 1.1.9 2 2 2h7c1.1 0 2-.9 2-2zm1-2.5l6 4.5V5l-6 4.5v1z';
break;
case 'video-alt3':
- path = 'M19 15V5c0-1.1-.9-2-2-2H4c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h13c1.1 0 2-.9 2-2zM8 14V6l6 4z';
+ path =
+ 'M19 15V5c0-1.1-.9-2-2-2H4c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h13c1.1 0 2-.9 2-2zM8 14V6l6 4z';
break;
case 'visibility':
- path = 'M19.7 9.4C17.7 6 14 3.9 10 3.9S2.3 6 .3 9.4L0 10l.3.6c2 3.4 5.7 5.5 9.7 5.5s7.7-2.1 9.7-5.5l.3-.6-.3-.6zM10 14.1c-3.1 0-6-1.6-7.7-4.1C3.6 8 5.7 6.6 8 6.1c-.9.6-1.5 1.7-1.5 2.9 0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5c0-1.2-.6-2.3-1.5-2.9 2.3.5 4.4 1.9 5.7 3.9-1.7 2.5-4.6 4.1-7.7 4.1z';
+ path =
+ 'M19.7 9.4C17.7 6 14 3.9 10 3.9S2.3 6 .3 9.4L0 10l.3.6c2 3.4 5.7 5.5 9.7 5.5s7.7-2.1 9.7-5.5l.3-.6-.3-.6zM10 14.1c-3.1 0-6-1.6-7.7-4.1C3.6 8 5.7 6.6 8 6.1c-.9.6-1.5 1.7-1.5 2.9 0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5c0-1.2-.6-2.3-1.5-2.9 2.3.5 4.4 1.9 5.7 3.9-1.7 2.5-4.6 4.1-7.7 4.1z';
break;
case 'warning':
- path = 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm1.13 9.38l.35-6.46H8.52l.35 6.46h2.26zm-.09 3.36c.24-.23.37-.55.37-.96 0-.42-.12-.74-.36-.97s-.59-.35-1.06-.35-.82.12-1.07.35-.37.55-.37.97c0 .41.13.73.38.96.26.23.61.34 1.06.34s.8-.11 1.05-.34z';
+ path =
+ 'M10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8zm1.13 9.38l.35-6.46H8.52l.35 6.46h2.26zm-.09 3.36c.24-.23.37-.55.37-.96 0-.42-.12-.74-.36-.97s-.59-.35-1.06-.35-.82.12-1.07.35-.37.55-.37.97c0 .41.13.73.38.96.26.23.61.34 1.06.34s.8-.11 1.05-.34z';
break;
case 'welcome-add-page':
path = 'M17 7V4h-2V2h-3v1H3v15h11V9h1V7h2zm-1-2v1h-2v2h-1V6h-2V5h2V3h1v2h2z';
break;
case 'welcome-comments':
- path = 'M5 2h10c1.1 0 2 .9 2 2v8c0 1.1-.9 2-2 2h-2l-5 5v-5H5c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2zm8.5 8.5L11 8l2.5-2.5-1-1L10 7 7.5 4.5l-1 1L9 8l-2.5 2.5 1 1L10 9l2.5 2.5z';
+ path =
+ 'M5 2h10c1.1 0 2 .9 2 2v8c0 1.1-.9 2-2 2h-2l-5 5v-5H5c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2zm8.5 8.5L11 8l2.5-2.5-1-1L10 7 7.5 4.5l-1 1L9 8l-2.5 2.5 1 1L10 9l2.5 2.5z';
break;
case 'welcome-learn-more':
- path = 'M10 10L2.54 7.02 3 18H1l.48-11.41L0 6l10-4 10 4zm0-5c-.55 0-1 .22-1 .5s.45.5 1 .5 1-.22 1-.5-.45-.5-1-.5zm0 6l5.57-2.23c.71.94 1.2 2.07 1.36 3.3-.3-.04-.61-.07-.93-.07-2.55 0-4.78 1.37-6 3.41C8.78 13.37 6.55 12 4 12c-.32 0-.63.03-.93.07.16-1.23.65-2.36 1.36-3.3z';
+ path =
+ 'M10 10L2.54 7.02 3 18H1l.48-11.41L0 6l10-4 10 4zm0-5c-.55 0-1 .22-1 .5s.45.5 1 .5 1-.22 1-.5-.45-.5-1-.5zm0 6l5.57-2.23c.71.94 1.2 2.07 1.36 3.3-.3-.04-.61-.07-.93-.07-2.55 0-4.78 1.37-6 3.41C8.78 13.37 6.55 12 4 12c-.32 0-.63.03-.93.07.16-1.23.65-2.36 1.36-3.3z';
break;
case 'welcome-view-site':
- path = 'M18 14V4c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h14c.55 0 1-.45 1-1zm-8-8c2.3 0 4.4 1.14 6 3-1.6 1.86-3.7 3-6 3s-4.4-1.14-6-3c1.6-1.86 3.7-3 6-3zm2 3c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2 2-.9 2-2zm2 8h3v1H3v-1h3v-1h8v1z';
+ path =
+ 'M18 14V4c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h14c.55 0 1-.45 1-1zm-8-8c2.3 0 4.4 1.14 6 3-1.6 1.86-3.7 3-6 3s-4.4-1.14-6-3c1.6-1.86 3.7-3 6-3zm2 3c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2 2-.9 2-2zm2 8h3v1H3v-1h3v-1h8v1z';
break;
case 'welcome-widgets-menus':
- path = 'M19 16V3c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v13c0 .55.45 1 1 1h15c.55 0 1-.45 1-1zM4 4h13v4H4V4zm1 1v2h3V5H5zm4 0v2h3V5H9zm4 0v2h3V5h-3zm-8.5 5c.28 0 .5.22.5.5s-.22.5-.5.5-.5-.22-.5-.5.22-.5.5-.5zM6 10h4v1H6v-1zm6 0h5v5h-5v-5zm-7.5 2c.28 0 .5.22.5.5s-.22.5-.5.5-.5-.22-.5-.5.22-.5.5-.5zM6 12h4v1H6v-1zm7 0v2h3v-2h-3zm-8.5 2c.28 0 .5.22.5.5s-.22.5-.5.5-.5-.22-.5-.5.22-.5.5-.5zM6 14h4v1H6v-1z';
+ path =
+ 'M19 16V3c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v13c0 .55.45 1 1 1h15c.55 0 1-.45 1-1zM4 4h13v4H4V4zm1 1v2h3V5H5zm4 0v2h3V5H9zm4 0v2h3V5h-3zm-8.5 5c.28 0 .5.22.5.5s-.22.5-.5.5-.5-.22-.5-.5.22-.5.5-.5zM6 10h4v1H6v-1zm6 0h5v5h-5v-5zm-7.5 2c.28 0 .5.22.5.5s-.22.5-.5.5-.5-.22-.5-.5.22-.5.5-.5zM6 12h4v1H6v-1zm7 0v2h3v-2h-3zm-8.5 2c.28 0 .5.22.5.5s-.22.5-.5.5-.5-.22-.5-.5.22-.5.5-.5zM6 14h4v1H6v-1z';
break;
case 'welcome-write-blog':
- path = 'M16.89 1.2l1.41 1.41c.39.39.39 1.02 0 1.41L14 8.33V18H3V3h10.67l1.8-1.8c.4-.39 1.03-.4 1.42 0zm-5.66 8.48l5.37-5.36-1.42-1.42-5.36 5.37-.71 2.12z';
+ path =
+ 'M16.89 1.2l1.41 1.41c.39.39.39 1.02 0 1.41L14 8.33V18H3V3h10.67l1.8-1.8c.4-.39 1.03-.4 1.42 0zm-5.66 8.48l5.37-5.36-1.42-1.42-5.36 5.37-.71 2.12z';
break;
case 'wordpress-alt':
- path = 'M20 10c0-5.51-4.49-10-10-10C4.48 0 0 4.49 0 10c0 5.52 4.48 10 10 10 5.51 0 10-4.48 10-10zM7.78 15.37L4.37 6.22c.55-.02 1.17-.08 1.17-.08.5-.06.44-1.13-.06-1.11 0 0-1.45.11-2.37.11-.18 0-.37 0-.58-.01C4.12 2.69 6.87 1.11 10 1.11c2.33 0 4.45.87 6.05 2.34-.68-.11-1.65.39-1.65 1.58 0 .74.45 1.36.9 2.1.35.61.55 1.36.55 2.46 0 1.49-1.4 5-1.4 5l-3.03-8.37c.54-.02.82-.17.82-.17.5-.05.44-1.25-.06-1.22 0 0-1.44.12-2.38.12-.87 0-2.33-.12-2.33-.12-.5-.03-.56 1.2-.06 1.22l.92.08 1.26 3.41zM17.41 10c.24-.64.74-1.87.43-4.25.7 1.29 1.05 2.71 1.05 4.25 0 3.29-1.73 6.24-4.4 7.78.97-2.59 1.94-5.2 2.92-7.78zM6.1 18.09C3.12 16.65 1.11 13.53 1.11 10c0-1.3.23-2.48.72-3.59C3.25 10.3 4.67 14.2 6.1 18.09zm4.03-6.63l2.58 6.98c-.86.29-1.76.45-2.71.45-.79 0-1.57-.11-2.29-.33.81-2.38 1.62-4.74 2.42-7.1z';
+ path =
+ 'M20 10c0-5.51-4.49-10-10-10C4.48 0 0 4.49 0 10c0 5.52 4.48 10 10 10 5.51 0 10-4.48 10-10zM7.78 15.37L4.37 6.22c.55-.02 1.17-.08 1.17-.08.5-.06.44-1.13-.06-1.11 0 0-1.45.11-2.37.11-.18 0-.37 0-.58-.01C4.12 2.69 6.87 1.11 10 1.11c2.33 0 4.45.87 6.05 2.34-.68-.11-1.65.39-1.65 1.58 0 .74.45 1.36.9 2.1.35.61.55 1.36.55 2.46 0 1.49-1.4 5-1.4 5l-3.03-8.37c.54-.02.82-.17.82-.17.5-.05.44-1.25-.06-1.22 0 0-1.44.12-2.38.12-.87 0-2.33-.12-2.33-.12-.5-.03-.56 1.2-.06 1.22l.92.08 1.26 3.41zM17.41 10c.24-.64.74-1.87.43-4.25.7 1.29 1.05 2.71 1.05 4.25 0 3.29-1.73 6.24-4.4 7.78.97-2.59 1.94-5.2 2.92-7.78zM6.1 18.09C3.12 16.65 1.11 13.53 1.11 10c0-1.3.23-2.48.72-3.59C3.25 10.3 4.67 14.2 6.1 18.09zm4.03-6.63l2.58 6.98c-.86.29-1.76.45-2.71.45-.79 0-1.57-.11-2.29-.33.81-2.38 1.62-4.74 2.42-7.1z';
break;
case 'wordpress':
- path = 'M20 10c0-5.52-4.48-10-10-10S0 4.48 0 10s4.48 10 10 10 10-4.48 10-10zM10 1.01c4.97 0 8.99 4.02 8.99 8.99s-4.02 8.99-8.99 8.99S1.01 14.97 1.01 10 5.03 1.01 10 1.01zM8.01 14.82L4.96 6.61c.49-.03 1.05-.08 1.05-.08.43-.05.38-1.01-.06-.99 0 0-1.29.1-2.13.1-.15 0-.33 0-.52-.01 1.44-2.17 3.9-3.6 6.7-3.6 2.09 0 3.99.79 5.41 2.09-.6-.08-1.45.35-1.45 1.42 0 .66.38 1.22.79 1.88.31.54.5 1.22.5 2.21 0 1.34-1.27 4.48-1.27 4.48l-2.71-7.5c.48-.03.75-.16.75-.16.43-.05.38-1.1-.05-1.08 0 0-1.3.11-2.14.11-.78 0-2.11-.11-2.11-.11-.43-.02-.48 1.06-.05 1.08l.84.08 1.12 3.04zm6.02 2.15L16.64 10s.67-1.69.39-3.81c.63 1.14.94 2.42.94 3.81 0 2.96-1.56 5.58-3.94 6.97zM2.68 6.77L6.5 17.25c-2.67-1.3-4.47-4.08-4.47-7.25 0-1.16.2-2.23.65-3.23zm7.45 4.53l2.29 6.25c-.75.27-1.57.42-2.42.42-.72 0-1.41-.11-2.06-.3z';
+ path =
+ 'M20 10c0-5.52-4.48-10-10-10S0 4.48 0 10s4.48 10 10 10 10-4.48 10-10zM10 1.01c4.97 0 8.99 4.02 8.99 8.99s-4.02 8.99-8.99 8.99S1.01 14.97 1.01 10 5.03 1.01 10 1.01zM8.01 14.82L4.96 6.61c.49-.03 1.05-.08 1.05-.08.43-.05.38-1.01-.06-.99 0 0-1.29.1-2.13.1-.15 0-.33 0-.52-.01 1.44-2.17 3.9-3.6 6.7-3.6 2.09 0 3.99.79 5.41 2.09-.6-.08-1.45.35-1.45 1.42 0 .66.38 1.22.79 1.88.31.54.5 1.22.5 2.21 0 1.34-1.27 4.48-1.27 4.48l-2.71-7.5c.48-.03.75-.16.75-.16.43-.05.38-1.1-.05-1.08 0 0-1.3.11-2.14.11-.78 0-2.11-.11-2.11-.11-.43-.02-.48 1.06-.05 1.08l.84.08 1.12 3.04zm6.02 2.15L16.64 10s.67-1.69.39-3.81c.63 1.14.94 2.42.94 3.81 0 2.96-1.56 5.58-3.94 6.97zM2.68 6.77L6.5 17.25c-2.67-1.3-4.47-4.08-4.47-7.25 0-1.16.2-2.23.65-3.23zm7.45 4.53l2.29 6.25c-.75.27-1.57.42-2.42.42-.72 0-1.41-.11-2.06-.3z';
break;
case 'yes-alt':
- path = 'M10 2c-4.42 0-8 3.58-8 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm-.615 12.66h-1.34l-3.24-4.54 1.34-1.25 2.57 2.4 5.14-5.93 1.34.94-5.81 8.38z';
+ path =
+ 'M10 2c-4.42 0-8 3.58-8 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm-.615 12.66h-1.34l-3.24-4.54 1.34-1.25 2.57 2.4 5.14-5.93 1.34.94-5.81 8.38z';
break;
case 'yes':
path = 'M14.83 4.89l1.34.94-5.81 8.38H9.02L5.78 9.67l1.34-1.25 2.57 2.4z';
diff --git a/packages/components/src/dashicon/stories/index.js b/packages/components/src/dashicon/stories/index.js
index 5ba7d7be98cbcb..874bf174db71ad 100644
--- a/packages/components/src/dashicon/stories/index.js
+++ b/packages/components/src/dashicon/stories/index.js
@@ -15,11 +15,5 @@ export const _default = () => {
const color = text( 'Color', '#0079AA' );
const size = number( 'Size', 20 );
- return (
-
+
{ ! this.state.calendarHelpIsVisible && (
<>
-
{ __( 'Click to Select' ) }
- { __( 'Click the right or left arrows to select other months in the past or the future.' ) }
+
+ { __(
+ 'Click the right or left arrows to select other months in the past or the future.'
+ ) }
+
{ __( 'Click the desired day to select it.' ) }
diff --git a/packages/components/src/date-time/test/date.js b/packages/components/src/date-time/test/date.js
index cd1b1e1e12e2b2..7e06aab49ef649 100644
--- a/packages/components/src/date-time/test/date.js
+++ b/packages/components/src/date-time/test/date.js
@@ -61,7 +61,9 @@ describe( 'DatePicker', () => {
it( 'should call onChange with a formated date of the input', () => {
const onChangeSpy = jest.fn();
const currentDate = '1986-10-18T11:00:00';
- const wrapper = shallow(
+
+
-
:
+
+ :
+
{
window.MutationObserver = MutationObserver;
} );
- const Form = () =>
;
+ const Form = () => (
+
+ );
it( 'will disable all fields', () => {
- const wrapper = TestUtils.renderIntoDocument(
);
+ const wrapper = TestUtils.renderIntoDocument(
+
+
+
+ );
const input = TestUtils.findRenderedDOMComponentWithTag( wrapper, 'input' );
const div = TestUtils.scryRenderedDOMComponentsWithTag( wrapper, 'div' )[ 1 ];
@@ -83,9 +92,13 @@ describe( 'Disabled', () => {
}
render() {
- return this.state.isDisabled ?
-
:
-
;
+ return this.state.isDisabled ? (
+
+
+
+ ) : (
+
+ );
}
}
@@ -115,7 +128,7 @@ describe( 'Disabled', () => {
return (
- { ( isDisabled ) => isDisabled ? 'Disabled' : 'Not disabled' }
+ { ( isDisabled ) => ( isDisabled ? 'Disabled' : 'Not disabled' ) }
);
@@ -123,7 +136,11 @@ describe( 'Disabled', () => {
}
test( "lets components know that they're disabled via context", () => {
- const wrapper = TestUtils.renderIntoDocument(
);
+ const wrapper = TestUtils.renderIntoDocument(
+
+
+ );
const wrapperElement = TestUtils.findRenderedDOMComponentWithTag( wrapper, 'p' );
expect( wrapperElement.textContent ).toBe( 'Disabled' );
} );
diff --git a/packages/components/src/draggable/index.js b/packages/components/src/draggable/index.js
index cd7d8c310e9530..9439785bd18f32 100644
--- a/packages/components/src/draggable/index.js
+++ b/packages/components/src/draggable/index.js
@@ -47,10 +47,12 @@ class Draggable extends Component {
* @param {Object} event The non-custom DragEvent.
*/
onDragOver( event ) {
- this.cloneWrapper.style.top =
- `${ parseInt( this.cloneWrapper.style.top, 10 ) + event.clientY - this.cursorTop }px`;
- this.cloneWrapper.style.left =
- `${ parseInt( this.cloneWrapper.style.left, 10 ) + event.clientX - this.cursorLeft }px`;
+ this.cloneWrapper.style.top = `${ parseInt( this.cloneWrapper.style.top, 10 ) +
+ event.clientY -
+ this.cursorTop }px`;
+ this.cloneWrapper.style.left = `${ parseInt( this.cloneWrapper.style.left, 10 ) +
+ event.clientX -
+ this.cursorLeft }px`;
// Update cursor coordinates.
this.cursorLeft = event.clientX;
@@ -100,7 +102,7 @@ class Draggable extends Component {
clone.id = `clone-${ elementId }`;
this.cloneWrapper = document.createElement( 'div' );
this.cloneWrapper.classList.add( cloneWrapperClass );
- this.cloneWrapper.style.width = `${ elementRect.width + ( clonePadding * 2 ) }px`;
+ this.cloneWrapper.style.width = `${ elementRect.width + clonePadding * 2 }px`;
if ( elementRect.height > cloneHeightTransformationBreakpoint ) {
// Scale down clone if original element is larger than 700px.
@@ -116,7 +118,9 @@ class Draggable extends Component {
}
// Hack: Remove iFrames as it's causing the embeds drag clone to freeze
- Array.from( clone.querySelectorAll( 'iframe' ) ).forEach( ( child ) => child.parentNode.removeChild( child ) );
+ Array.from( clone.querySelectorAll( 'iframe' ) ).forEach( ( child ) =>
+ child.parentNode.removeChild( child )
+ );
this.cloneWrapper.appendChild( clone );
elementWrapper.appendChild( this.cloneWrapper );
diff --git a/packages/components/src/drop-zone/index.js b/packages/components/src/drop-zone/index.js
index 07e384e22f9476..9b837ee5a56ddf 100644
--- a/packages/components/src/drop-zone/index.js
+++ b/packages/components/src/drop-zone/index.js
@@ -75,11 +75,7 @@ class DropZoneComponent extends Component {
if ( isDraggingOverElement ) {
children = (
-
+
{ label ? label : __( 'Drop files to upload' ) }
diff --git a/packages/components/src/drop-zone/provider.js b/packages/components/src/drop-zone/provider.js
index a0df1364b8ac7b..cd55d6bb88b000 100644
--- a/packages/components/src/drop-zone/provider.js
+++ b/packages/components/src/drop-zone/provider.js
@@ -32,9 +32,11 @@ const getDragEventType = ( { dataTransfer } ) => {
};
const isTypeSupportedByDropZone = ( type, dropZone ) => {
- return ( type === 'file' && dropZone.onFilesDrop ) ||
+ return (
+ ( type === 'file' && dropZone.onFilesDrop ) ||
( type === 'html' && dropZone.onHTMLDrop ) ||
- ( type === 'default' && dropZone.onDrop );
+ ( type === 'default' && dropZone.onDrop )
+ );
};
const isWithinElementBounds = ( element, x, y ) => {
@@ -106,12 +108,14 @@ class DropZoneProvider extends Component {
position: null,
} );
- this.dropZones.forEach( ( dropZone ) => dropZone.setState( {
- isDraggingOverDocument: false,
- isDraggingOverElement: false,
- position: null,
- type: null,
- } ) );
+ this.dropZones.forEach( ( dropZone ) =>
+ dropZone.setState( {
+ isDraggingOverDocument: false,
+ isDraggingOverElement: false,
+ position: null,
+ type: null,
+ } )
+ );
}
toggleDraggingOverDocument( event, dragEventType ) {
@@ -124,15 +128,22 @@ class DropZoneProvider extends Component {
const detail = window.CustomEvent && event instanceof window.CustomEvent ? event.detail : event;
// Index of hovered dropzone.
- const hoveredDropZones = filter( this.dropZones, ( dropZone ) =>
- isTypeSupportedByDropZone( dragEventType, dropZone ) &&
- isWithinElementBounds( dropZone.element, detail.clientX, detail.clientY )
+ const hoveredDropZones = filter(
+ this.dropZones,
+ ( dropZone ) =>
+ isTypeSupportedByDropZone( dragEventType, dropZone ) &&
+ isWithinElementBounds( dropZone.element, detail.clientX, detail.clientY )
);
// Find the leaf dropzone not containing another dropzone
- const hoveredDropZone = find( hoveredDropZones, ( zone ) => (
- ! some( hoveredDropZones, ( subZone ) => subZone !== zone && zone.element.parentElement.contains( subZone.element ) )
- ) );
+ const hoveredDropZone = find(
+ hoveredDropZones,
+ ( zone ) =>
+ ! some(
+ hoveredDropZones,
+ ( subZone ) => subZone !== zone && zone.element.parentElement.contains( subZone.element )
+ )
+ );
const hoveredDropZoneIndex = this.dropZones.indexOf( hoveredDropZone );
@@ -224,9 +235,7 @@ class DropZoneProvider extends Component {
render() {
return (
-
- { this.props.children }
-
+
{ this.props.children }
);
}
diff --git a/packages/components/src/dropdown-menu/index.js b/packages/components/src/dropdown-menu/index.js
index e94b246231ad1b..a2f1c94edd3480 100644
--- a/packages/components/src/dropdown-menu/index.js
+++ b/packages/components/src/dropdown-menu/index.js
@@ -70,10 +70,13 @@ function DropdownMenu( {
controlSets = [ controlSets ];
}
}
- const mergedPopoverProps = mergeProps( {
- className: 'components-dropdown-menu__popover',
- position,
- }, popoverProps );
+ const mergedPopoverProps = mergeProps(
+ {
+ className: 'components-dropdown-menu__popover',
+ position,
+ },
+ popoverProps
+ );
return (
- { ( ! icon || hasArrowIndicator ) &&
- {
- isFunction( children ) ?
- children( props ) :
- null
- }
- { flatMap( controlSets, ( controlSet, indexOfSet ) => (
+
+ { isFunction( children ) ? children( props ) : null }
+ { flatMap( controlSets, ( controlSet, indexOfSet ) =>
controlSet.map( ( control, indexOfControl ) => (
0 && indexOfControl === 0,
- 'is-active': control.isActive,
- },
- ) }
+ className={ classnames( 'components-dropdown-menu__menu-item', {
+ 'has-separator': indexOfSet > 0 && indexOfControl === 0,
+ 'is-active': control.isActive,
+ } ) }
icon={ control.icon }
role="menuitem"
disabled={ control.isDisabled }
@@ -149,7 +150,7 @@ function DropdownMenu( {
{ control.title }
) )
- ) ) }
+ ) }
);
} }
diff --git a/packages/components/src/dropdown-menu/index.native.js b/packages/components/src/dropdown-menu/index.native.js
index 65306eee3081f0..6243847023227e 100644
--- a/packages/components/src/dropdown-menu/index.native.js
+++ b/packages/components/src/dropdown-menu/index.native.js
@@ -1,4 +1,3 @@
-
function DropdownMenu() {
return null;
}
diff --git a/packages/components/src/dropdown-menu/test/index.js b/packages/components/src/dropdown-menu/test/index.js
index 74e0089eed68bb..03aedf63464383 100644
--- a/packages/components/src/dropdown-menu/test/index.js
+++ b/packages/components/src/dropdown-menu/test/index.js
@@ -67,7 +67,9 @@ describe( 'DropdownMenu', () => {
} );
expect( wrapper.find( NavigableMenu ) ).toHaveLength( 1 );
- expect( wrapper.find( IconButton ).filter( '.components-dropdown-menu__menu-item' ) ).toHaveLength( controls.length );
+ expect(
+ wrapper.find( IconButton ).filter( '.components-dropdown-menu__menu-item' )
+ ).toHaveLength( controls.length );
} );
it( 'should open menu on arrow down (children)', () => {
@@ -82,7 +84,10 @@ describe( 'DropdownMenu', () => {
expect( wrapper.find( NavigableMenu ) ).toHaveLength( 1 );
- wrapper.find( MenuItem ).props().onClick();
+ wrapper
+ .find( MenuItem )
+ .props()
+ .onClick();
wrapper.update();
expect( wrapper.find( NavigableMenu ) ).toHaveLength( 0 );
diff --git a/packages/components/src/dropdown/index.native.js b/packages/components/src/dropdown/index.native.js
index de7c7b7839613a..232a16b6106bcc 100644
--- a/packages/components/src/dropdown/index.native.js
+++ b/packages/components/src/dropdown/index.native.js
@@ -43,10 +43,7 @@ class Dropdown extends Component {
render() {
const { isOpen } = this.state;
- const {
- renderContent,
- renderToggle,
- } = this.props;
+ const { renderContent, renderToggle } = this.props;
const args = { isOpen, onToggle: this.toggle, onClose: this.close };
diff --git a/packages/components/src/dropdown/test/index.js b/packages/components/src/dropdown/test/index.js
index 3de873a76787b8..9ffaf6bcbf1309 100644
--- a/packages/components/src/dropdown/test/index.js
+++ b/packages/components/src/dropdown/test/index.js
@@ -11,34 +11,34 @@ import Dropdown from '../';
describe( 'Dropdown', () => {
const expectPopoverVisible = ( wrapper, visible ) => {
expect(
- TestUtils.scryRenderedDOMComponentsWithClass( wrapper, 'components-popover' ) )
- .toHaveLength( visible ? 1 : 0 );
+ TestUtils.scryRenderedDOMComponentsWithClass( wrapper, 'components-popover' )
+ ).toHaveLength( visible ? 1 : 0 );
};
- const buttonElement = ( wrapper ) => TestUtils.findRenderedDOMComponentWithTag(
- wrapper,
- 'button'
- );
- const openCloseElement = ( wrapper, className ) => TestUtils
- .findRenderedDOMComponentWithClass( wrapper, className );
+ const buttonElement = ( wrapper ) =>
+ TestUtils.findRenderedDOMComponentWithTag( wrapper, 'button' );
+ const openCloseElement = ( wrapper, className ) =>
+ TestUtils.findRenderedDOMComponentWithClass( wrapper, className );
it( 'should toggle the dropdown properly', () => {
const expectButtonExpanded = ( wrapper, expanded ) => {
- expect(
- TestUtils.scryRenderedDOMComponentsWithTag( wrapper, 'button' ) )
- .toHaveLength( 1 );
- expect(
- buttonElement( wrapper ).getAttribute( 'aria-expanded' )
- ).toBe( expanded.toString() );
+ expect( TestUtils.scryRenderedDOMComponentsWithTag( wrapper, 'button' ) ).toHaveLength( 1 );
+ expect( buttonElement( wrapper ).getAttribute( 'aria-expanded' ) ).toBe(
+ expanded.toString()
+ );
};
- const wrapper = TestUtils.renderIntoDocument( (
- Toggleee
- ) }
- renderContent={ () => test }
- /> );
+ const wrapper = TestUtils.renderIntoDocument(
+ (
+
+ Toggleee
+
+ ) }
+ renderContent={ () => test }
+ />
+ );
expectButtonExpanded( wrapper, false );
expectPopoverVisible( wrapper, false );
@@ -50,15 +50,21 @@ describe( 'Dropdown', () => {
} );
it( 'should close the dropdown when calling onClose', () => {
- const wrapper = TestUtils.renderIntoDocument( [
- Toggleee ,
- closee ,
- ] }
- renderContent={ () => null }
- /> );
+ const wrapper = TestUtils.renderIntoDocument(
+ [
+
+ Toggleee
+ ,
+
+ closee
+ ,
+ ] }
+ renderContent={ () => null }
+ />
+ );
expectPopoverVisible( wrapper, false );
diff --git a/packages/components/src/external-link/index.js b/packages/components/src/external-link/index.js
index 68bf56394b8f86..8b58b56e679e26 100644
--- a/packages/components/src/external-link/index.js
+++ b/packages/components/src/external-link/index.js
@@ -16,22 +16,24 @@ import { forwardRef } from '@wordpress/element';
import Dashicon from '../dashicon';
export function ExternalLink( { href, children, className, rel = '', ...additionalProps }, ref ) {
- rel = uniq( compact( [
- ...rel.split( ' ' ),
- 'external',
- 'noreferrer',
- 'noopener',
- ] ) ).join( ' ' );
+ rel = uniq( compact( [ ...rel.split( ' ' ), 'external', 'noreferrer', 'noopener' ] ) ).join(
+ ' '
+ );
const classes = classnames( 'components-external-link', className );
return (
// eslint-disable-next-line react/jsx-no-target-blank
-
+
{ children }
- {
- /* translators: accessibility text */
- __( '(opens in a new tab)' )
- }
+ { /* translators: accessibility text */
+ __( '(opens in a new tab)' ) }
diff --git a/packages/components/src/focal-point-picker/index.js b/packages/components/src/focal-point-picker/index.js
index d502ebbded0e03..3901d2f0285641 100644
--- a/packages/components/src/focal-point-picker/index.js
+++ b/packages/components/src/focal-point-picker/index.js
@@ -89,21 +89,11 @@ export class FocalPointPicker extends Component {
left: event.pageX - pickerDimensions.left,
top: event.pageY - pickerDimensions.top,
};
- const left = Math.max(
- bounds.left,
- Math.min(
- cursorPosition.left, bounds.right
- )
- );
- const top = Math.max(
- bounds.top,
- Math.min(
- cursorPosition.top, bounds.bottom
- )
- );
+ const left = Math.max( bounds.left, Math.min( cursorPosition.left, bounds.right ) );
+ const top = Math.max( bounds.top, Math.min( cursorPosition.top, bounds.bottom ) );
const percentages = {
- x: ( left - bounds.left ) / ( pickerDimensions.width - ( bounds.left * 2 ) ),
- y: ( top - bounds.top ) / ( pickerDimensions.height - ( bounds.top * 2 ) ),
+ x: ( left - bounds.left ) / ( pickerDimensions.width - bounds.left * 2 ),
+ y: ( top - bounds.top ) / ( pickerDimensions.height - bounds.top * 2 ),
};
this.setState( { percentages }, function() {
onChange( {
@@ -160,8 +150,8 @@ export class FocalPointPicker extends Component {
const { bounds, isDragging, percentages } = this.state;
const pickerDimensions = this.pickerDimensions();
const iconCoordinates = {
- left: ( value.x * ( pickerDimensions.width - ( bounds.left * 2 ) ) ) + bounds.left,
- top: ( value.y * ( pickerDimensions.height - ( bounds.top * 2 ) ) ) + bounds.top,
+ left: value.x * ( pickerDimensions.width - bounds.left * 2 ) + bounds.left,
+ top: value.y * ( pickerDimensions.height - bounds.top * 2 ) + bounds.top,
};
const iconContainerStyle = {
left: `${ iconCoordinates.left }px`,
@@ -196,9 +186,19 @@ export class FocalPointPicker extends Component {
draggable="false"
/>
diff --git a/packages/components/src/focusable-iframe/index.js b/packages/components/src/focusable-iframe/index.js
index 24581406d9d65c..4627c5b2fa41df 100644
--- a/packages/components/src/focusable-iframe/index.js
+++ b/packages/components/src/focusable-iframe/index.js
@@ -50,12 +50,7 @@ class FocusableIframe extends Component {
// responsibility of the parent to assign a title.
/* eslint-disable jsx-a11y/iframe-has-title */
- return (
-
- );
+ return
;
/* eslint-enable jsx-a11y/iframe-has-title */
}
}
diff --git a/packages/components/src/font-size-picker/index.js b/packages/components/src/font-size-picker/index.js
index a52f6ccd841d2f..538da8c3b083de 100644
--- a/packages/components/src/font-size-picker/index.js
+++ b/packages/components/src/font-size-picker/index.js
@@ -1,4 +1,3 @@
-
/**
* WordPress dependencies
*/
@@ -35,7 +34,9 @@ function FontSizePicker( {
value,
withSlider = false,
} ) {
- const [ currentSelectValue, setCurrentSelectValue ] = useState( getSelectValueFromFontSize( fontSizes, value ) );
+ const [ currentSelectValue, setCurrentSelectValue ] = useState(
+ getSelectValueFromFontSize( fontSizes, value )
+ );
if ( disableCustomFontSizes && ! fontSizes.length ) {
return null;
@@ -61,11 +62,9 @@ function FontSizePicker( {
return (
-
- { __( 'Font Size' ) }
-
+ { __( 'Font Size' ) }
- { ( fontSizes.length > 0 ) &&
+ { fontSizes.length > 0 && (
- { withSlider &&
+ { withSlider && (
);
}
diff --git a/packages/components/src/form-file-upload/index.js b/packages/components/src/form-file-upload/index.js
index 1314e4d5b85ae0..6153df48a97627 100644
--- a/packages/components/src/form-file-upload/index.js
+++ b/packages/components/src/form-file-upload/index.js
@@ -34,16 +34,13 @@ class FormFileUpload extends Component {
...props
} = this.props;
- const ui = render ?
- render( { openFileDialog: this.openFileDialog } ) : (
-
- { children }
-
- );
+ const ui = render ? (
+ render( { openFileDialog: this.openFileDialog } )
+ ) : (
+
+ { children }
+
+ );
return (
{ ui }
diff --git a/packages/components/src/form-toggle/index.js b/packages/components/src/form-toggle/index.js
index 1b6c8275e74ed1..19cace17839d35 100644
--- a/packages/components/src/form-toggle/index.js
+++ b/packages/components/src/form-toggle/index.js
@@ -10,11 +10,9 @@ import { noop } from 'lodash';
import { Path, SVG } from '../primitives';
function FormToggle( { className, checked, id, onChange = noop, ...props } ) {
- const wrapperClasses = classnames(
- 'components-form-toggle',
- className,
- { 'is-checked': checked },
- );
+ const wrapperClasses = classnames( 'components-form-toggle', className, {
+ 'is-checked': checked,
+ } );
return (
@@ -28,10 +26,30 @@ function FormToggle( { className, checked, id, onChange = noop, ...props } ) {
/>
+
+ ) : (
+
+
+ ) }
);
}
diff --git a/packages/components/src/form-toggle/test/index.js b/packages/components/src/form-toggle/test/index.js
index 14cae967bfb78a..a208d360ea9820 100644
--- a/packages/components/src/form-toggle/test/index.js
+++ b/packages/components/src/form-toggle/test/index.js
@@ -39,14 +39,18 @@ describe( 'FormToggle', () => {
it( 'should render a checkbox with a noop onChange', () => {
const formToggle = shallow(
);
- const checkBox = formToggle.prop( 'children' ).find( ( child ) => 'input' === child.type && 'checkbox' === child.props.type );
+ const checkBox = formToggle
+ .prop( 'children' )
+ .find( ( child ) => 'input' === child.type && 'checkbox' === child.props.type );
expect( checkBox.props.onChange ).toBe( noop );
} );
it( 'should render a checkbox with a user-provided onChange', () => {
const testFunction = ( event ) => event;
const formToggle = shallow(
);
- const checkBox = formToggle.prop( 'children' ).find( ( child ) => 'input' === child.type && 'checkbox' === child.props.type );
+ const checkBox = formToggle
+ .prop( 'children' )
+ .find( ( child ) => 'input' === child.type && 'checkbox' === child.props.type );
expect( checkBox.props.onChange ).toBe( testFunction );
} );
} );
diff --git a/packages/components/src/form-token-field/index.js b/packages/components/src/form-token-field/index.js
index bdb8871f0a5aa3..ec85012ed49f6a 100644
--- a/packages/components/src/form-token-field/index.js
+++ b/packages/components/src/form-token-field/index.js
@@ -10,7 +10,17 @@ import classnames from 'classnames';
import { __, _n, sprintf } from '@wordpress/i18n';
import { Component } from '@wordpress/element';
import { withInstanceId } from '@wordpress/compose';
-import { BACKSPACE, ENTER, UP, DOWN, LEFT, RIGHT, SPACE, DELETE, ESCAPE } from '@wordpress/keycodes';
+import {
+ BACKSPACE,
+ ENTER,
+ UP,
+ DOWN,
+ LEFT,
+ RIGHT,
+ SPACE,
+ DELETE,
+ ESCAPE,
+} from '@wordpress/keycodes';
import isShallowEqual from '@wordpress/is-shallow-equal';
/**
@@ -243,15 +253,16 @@ class FormTokenField extends Component {
handleUpArrowKey() {
this.setState( ( state, props ) => ( {
- selectedSuggestionIndex: (
- ( state.selectedSuggestionIndex === 0 ? this.getMatchingSuggestions(
- state.incompleteTokenValue,
- props.suggestions,
- props.value,
- props.maxSuggestions,
- props.saveTransform
- ).length : state.selectedSuggestionIndex ) - 1
- ),
+ selectedSuggestionIndex:
+ ( state.selectedSuggestionIndex === 0
+ ? this.getMatchingSuggestions(
+ state.incompleteTokenValue,
+ props.suggestions,
+ props.value,
+ props.maxSuggestions,
+ props.saveTransform
+ ).length
+ : state.selectedSuggestionIndex ) - 1,
selectedSuggestionScroll: true,
} ) );
@@ -260,15 +271,15 @@ class FormTokenField extends Component {
handleDownArrowKey() {
this.setState( ( state, props ) => ( {
- selectedSuggestionIndex: (
- ( state.selectedSuggestionIndex + 1 ) % this.getMatchingSuggestions(
+ selectedSuggestionIndex:
+ ( state.selectedSuggestionIndex + 1 ) %
+ this.getMatchingSuggestions(
state.incompleteTokenValue,
props.suggestions,
props.value,
props.maxSuggestions,
props.saveTransform
- ).length
- ),
+ ).length,
selectedSuggestionScroll: true,
} ) );
@@ -354,10 +365,7 @@ class FormTokenField extends Component {
if ( tokensToAdd.length > 0 ) {
const newValue = clone( this.props.value );
- newValue.splice.apply(
- newValue,
- [ this.getIndexOfInput(), 0 ].concat( tokensToAdd )
- );
+ newValue.splice.apply( newValue, [ this.getIndexOfInput(), 0 ].concat( tokensToAdd ) );
this.props.onChange( newValue );
}
}
@@ -399,7 +407,7 @@ class FormTokenField extends Component {
suggestions = this.props.suggestions,
value = this.props.value,
maxSuggestions = this.props.maxSuggestions,
- saveTransform = this.props.saveTransform,
+ saveTransform = this.props.saveTransform
) {
let match = saveTransform( searchValue );
const startsWithMatch = [];
@@ -471,13 +479,16 @@ class FormTokenField extends Component {
if ( inputHasMinimumChars ) {
const { debouncedSpeak } = this.props;
- const message = hasMatchingSuggestions ?
- sprintf( _n(
- '%d result found, use up and down arrow keys to navigate.',
- '%d results found, use up and down arrow keys to navigate.',
- matchingSuggestions.length
- ), matchingSuggestions.length ) :
- __( 'No results.' );
+ const message = hasMatchingSuggestions
+ ? sprintf(
+ _n(
+ '%d result found, use up and down arrow keys to navigate.',
+ '%d results found, use up and down arrow keys to navigate.',
+ matchingSuggestions.length
+ ),
+ matchingSuggestions.length
+ )
+ : __( 'No results.' );
debouncedSpeak( message, 'assertive' );
}
@@ -535,18 +546,11 @@ class FormTokenField extends Component {
props = { ...props, onChange: this.onInputChange };
}
- return (
-
- );
+ return
;
}
render() {
- const {
- disabled,
- label = __( 'Add item' ),
- instanceId,
- className,
- } = this.props;
+ const { disabled, label = __( 'Add item' ), instanceId, className } = this.props;
const { isExpanded } = this.state;
const classes = classnames( className, 'components-form-token-field__input-container', {
'is-active': this.state.isActive,
@@ -579,7 +583,8 @@ class FormTokenField extends Component {
>
{ label }
-
) }
-
- { this.props.tokenizeOnSpace ?
- __( 'Separate with commas, spaces, or the Enter key.' ) :
- __( 'Separate with commas or the Enter key.' )
- }
+
+ { this.props.tokenizeOnSpace
+ ? __( 'Separate with commas, spaces, or the Enter key.' )
+ : __( 'Separate with commas or the Enter key.' ) }
);
diff --git a/packages/components/src/form-token-field/suggestions-list.js b/packages/components/src/form-token-field/suggestions-list.js
index 2d7e64f84be7d0..0786c00291f011 100644
--- a/packages/components/src/form-token-field/suggestions-list.js
+++ b/packages/components/src/form-token-field/suggestions-list.js
@@ -84,42 +84,39 @@ class SuggestionsList extends Component {
id={ `components-form-token-suggestions-${ this.props.instanceId }` }
role="listbox"
>
- {
- map( this.props.suggestions, ( suggestion, index ) => {
- const match = this.computeSuggestionMatch( suggestion );
- const classeName = classnames( 'components-form-token-field__suggestion', {
- 'is-selected': index === this.props.selectedIndex,
- } );
+ { map( this.props.suggestions, ( suggestion, index ) => {
+ const match = this.computeSuggestionMatch( suggestion );
+ const classeName = classnames( 'components-form-token-field__suggestion', {
+ 'is-selected': index === this.props.selectedIndex,
+ } );
- /* eslint-disable jsx-a11y/click-events-have-key-events */
- return (
-
- { match ?
- (
-
- { match.suggestionBeforeMatch }
-
- { match.suggestionMatch }
-
- { match.suggestionAfterMatch }
-
- ) :
- this.props.displayTransform( suggestion )
- }
-
- );
- /* eslint-enable jsx-a11y/click-events-have-key-events */
- } )
- }
+ /* eslint-disable jsx-a11y/click-events-have-key-events */
+ return (
+
+ { match ? (
+
+ { match.suggestionBeforeMatch }
+
+ { match.suggestionMatch }
+
+ { match.suggestionAfterMatch }
+
+ ) : (
+ this.props.displayTransform( suggestion )
+ ) }
+
+ );
+ /* eslint-enable jsx-a11y/click-events-have-key-events */
+ } ) }
);
}
diff --git a/packages/components/src/form-token-field/test/index.js b/packages/components/src/form-token-field/test/index.js
index 3bfcf6e5baf0d7..a2f4a108af8c43 100644
--- a/packages/components/src/form-token-field/test/index.js
+++ b/packages/components/src/form-token-field/test/index.js
@@ -35,40 +35,35 @@ describe( 'FormTokenField', function() {
let wrapper, wrapperElement, textInputElement, textInputComponent;
function setText( text ) {
- TestUtils.Simulate.change(
- textInputElement(),
- {
- target: {
- value: text,
- },
- }
- );
+ TestUtils.Simulate.change( textInputElement(), {
+ target: {
+ value: text,
+ },
+ } );
}
function sendKeyDown( keyCode, shiftKey ) {
- TestUtils.Simulate.keyDown(
- wrapperElement(),
- {
- keyCode,
- shiftKey: ! ! shiftKey,
- }
- );
+ TestUtils.Simulate.keyDown( wrapperElement(), {
+ keyCode,
+ shiftKey: !! shiftKey,
+ } );
}
function sendKeyPress( charCode ) {
- TestUtils.Simulate.keyPress(
- wrapperElement(),
- { charCode }
- );
+ TestUtils.Simulate.keyPress( wrapperElement(), { charCode } );
}
function getTokensHTML() {
- const textNodes = wrapperElement().querySelectorAll( '.components-form-token-field__token-text span[aria-hidden]' );
+ const textNodes = wrapperElement().querySelectorAll(
+ '.components-form-token-field__token-text span[aria-hidden]'
+ );
return map( textNodes, ( node ) => node.innerHTML );
}
function getSuggestionsText( selector ) {
- const suggestionNodes = wrapperElement().querySelectorAll( selector || '.components-form-token-field__suggestion' );
+ const suggestionNodes = wrapperElement().querySelectorAll(
+ selector || '.components-form-token-field__suggestion'
+ );
return map( suggestionNodes, getSuggestionNodeText );
}
@@ -93,25 +88,20 @@ describe( 'FormTokenField', function() {
}
function getSelectedSuggestion() {
- const selectedSuggestions = getSuggestionsText( '.components-form-token-field__suggestion.is-selected' );
+ const selectedSuggestions = getSuggestionsText(
+ '.components-form-token-field__suggestion.is-selected'
+ );
return selectedSuggestions[ 0 ] || null;
}
beforeEach( function() {
- wrapper = TestUtils.renderIntoDocument(
- ( onChange( gradient ) )
- }
- aria-label={ name ?
- // translators: %s: The name of the gradient e.g: "Angular red to blue".
- sprintf( __( 'Gradient: %s' ), name ) :
- // translators: %s: gradient code e.g: "linear-gradient(90deg, rgba(98,16,153,1) 0%, rgba(172,110,22,1) 100%);".
- sprintf( __( 'Gradient code: %s' ), gradient )
- }
- />
- ) );
- },
- [ gradients, value, onChange, clearGradient ]
- );
+export default function GradientPicker( { className, gradients, onChange, value } ) {
+ const clearGradient = useCallback( () => onChange( undefined ), [ onChange ] );
+ const gradientOptions = useMemo( () => {
+ return map( gradients, ( { gradient, name } ) => (
+ onChange( gradient ) }
+ aria-label={
+ name
+ ? // translators: %s: The name of the gradient e.g: "Angular red to blue".
+ sprintf( __( 'Gradient: %s' ), name )
+ : // translators: %s: gradient code e.g: "linear-gradient(90deg, rgba(98,16,153,1) 0%, rgba(172,110,22,1) 100%);".
+ sprintf( __( 'Gradient code: %s' ), gradient )
+ }
+ />
+ ) );
+ }, [ gradients, value, onChange, clearGradient ] );
return (
{ __( 'Clear' ) }
- ) }
+ }
/>
);
}
diff --git a/packages/components/src/higher-order/navigate-regions/index.js b/packages/components/src/higher-order/navigate-regions/index.js
index b8b010a7414f45..f20de145c484bb 100644
--- a/packages/components/src/higher-order/navigate-regions/index.js
+++ b/packages/components/src/higher-order/navigate-regions/index.js
@@ -15,69 +15,67 @@ import { rawShortcut } from '@wordpress/keycodes';
*/
import KeyboardShortcuts from '../../keyboard-shortcuts';
-export default createHigherOrderComponent(
- ( WrappedComponent ) => {
- return class extends Component {
- constructor() {
- super( ...arguments );
- this.bindContainer = this.bindContainer.bind( this );
- this.focusNextRegion = this.focusRegion.bind( this, 1 );
- this.focusPreviousRegion = this.focusRegion.bind( this, -1 );
- this.onClick = this.onClick.bind( this );
- this.state = {
- isFocusingRegions: false,
- };
- }
-
- bindContainer( ref ) {
- this.container = ref;
- }
+export default createHigherOrderComponent( ( WrappedComponent ) => {
+ return class extends Component {
+ constructor() {
+ super( ...arguments );
+ this.bindContainer = this.bindContainer.bind( this );
+ this.focusNextRegion = this.focusRegion.bind( this, 1 );
+ this.focusPreviousRegion = this.focusRegion.bind( this, -1 );
+ this.onClick = this.onClick.bind( this );
+ this.state = {
+ isFocusingRegions: false,
+ };
+ }
- focusRegion( offset ) {
- const regions = Array.from( this.container.querySelectorAll( '[role="region"]' ) );
- if ( ! regions.length ) {
- return;
- }
- let nextRegion = regions[ 0 ];
- const selectedIndex = regions.indexOf( document.activeElement );
- if ( selectedIndex !== -1 ) {
- let nextIndex = selectedIndex + offset;
- nextIndex = nextIndex === -1 ? regions.length - 1 : nextIndex;
- nextIndex = nextIndex === regions.length ? 0 : nextIndex;
- nextRegion = regions[ nextIndex ];
- }
+ bindContainer( ref ) {
+ this.container = ref;
+ }
- nextRegion.focus();
- this.setState( { isFocusingRegions: true } );
+ focusRegion( offset ) {
+ const regions = Array.from( this.container.querySelectorAll( '[role="region"]' ) );
+ if ( ! regions.length ) {
+ return;
}
-
- onClick() {
- this.setState( { isFocusingRegions: false } );
+ let nextRegion = regions[ 0 ];
+ const selectedIndex = regions.indexOf( document.activeElement );
+ if ( selectedIndex !== -1 ) {
+ let nextIndex = selectedIndex + offset;
+ nextIndex = nextIndex === -1 ? regions.length - 1 : nextIndex;
+ nextIndex = nextIndex === regions.length ? 0 : nextIndex;
+ nextRegion = regions[ nextIndex ];
}
- render() {
- const className = classnames( 'components-navigate-regions', {
- 'is-focusing-regions': this.state.isFocusingRegions,
- } );
+ nextRegion.focus();
+ this.setState( { isFocusingRegions: true } );
+ }
- // Disable reason: Clicking the editor should dismiss the regions focus style
- /* eslint-disable jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
- return (
-
-
- );
- /* eslint-enable jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
- }
- };
- }, 'navigateRegions'
-);
+ onClick() {
+ this.setState( { isFocusingRegions: false } );
+ }
+
+ render() {
+ const className = classnames( 'components-navigate-regions', {
+ 'is-focusing-regions': this.state.isFocusingRegions,
+ } );
+
+ // Disable reason: Clicking the editor should dismiss the regions focus style
+ /* eslint-disable jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
+ return (
+
+
+ );
+ /* eslint-enable jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
+ }
+ };
+}, 'navigateRegions' );
diff --git a/packages/components/src/higher-order/with-constrained-tabbing/index.js b/packages/components/src/higher-order/with-constrained-tabbing/index.js
index 75745cc9d02429..854e41e6abbfe8 100644
--- a/packages/components/src/higher-order/with-constrained-tabbing/index.js
+++ b/packages/components/src/higher-order/with-constrained-tabbing/index.js
@@ -7,58 +7,55 @@ import { TAB } from '@wordpress/keycodes';
import { focus } from '@wordpress/dom';
const withConstrainedTabbing = createHigherOrderComponent(
- ( WrappedComponent ) => class extends Component {
- constructor() {
- super( ...arguments );
+ ( WrappedComponent ) =>
+ class extends Component {
+ constructor() {
+ super( ...arguments );
- this.focusContainRef = createRef();
- this.handleTabBehaviour = this.handleTabBehaviour.bind( this );
- }
-
- handleTabBehaviour( event ) {
- if ( event.keyCode !== TAB ) {
- return;
+ this.focusContainRef = createRef();
+ this.handleTabBehaviour = this.handleTabBehaviour.bind( this );
}
- const tabbables = focus.tabbable.find( this.focusContainRef.current );
- if ( ! tabbables.length ) {
- return;
- }
- const firstTabbable = tabbables[ 0 ];
- const lastTabbable = tabbables[ tabbables.length - 1 ];
+ handleTabBehaviour( event ) {
+ if ( event.keyCode !== TAB ) {
+ return;
+ }
- if ( event.shiftKey && event.target === firstTabbable ) {
- event.preventDefault();
- lastTabbable.focus();
- } else if ( ! event.shiftKey && event.target === lastTabbable ) {
- event.preventDefault();
- firstTabbable.focus();
- /*
- * When pressing Tab and none of the tabbables has focus, the keydown
- * event happens on the wrapper div: move focus on the first tabbable.
- */
- } else if ( ! tabbables.includes( event.target ) ) {
- event.preventDefault();
- firstTabbable.focus();
+ const tabbables = focus.tabbable.find( this.focusContainRef.current );
+ if ( ! tabbables.length ) {
+ return;
+ }
+ const firstTabbable = tabbables[ 0 ];
+ const lastTabbable = tabbables[ tabbables.length - 1 ];
+
+ if ( event.shiftKey && event.target === firstTabbable ) {
+ event.preventDefault();
+ lastTabbable.focus();
+ } else if ( ! event.shiftKey && event.target === lastTabbable ) {
+ event.preventDefault();
+ firstTabbable.focus();
+ /*
+ * When pressing Tab and none of the tabbables has focus, the keydown
+ * event happens on the wrapper div: move focus on the first tabbable.
+ */
+ } else if ( ! tabbables.includes( event.target ) ) {
+ event.preventDefault();
+ firstTabbable.focus();
+ }
}
- }
- render() {
- // Disable reason: this component is non-interactive, but must capture
- // events from the wrapped component to determine when the Tab key is used.
- /* eslint-disable jsx-a11y/no-static-element-interactions */
- return (
-
-
- );
- /* eslint-enable jsx-a11y/no-static-element-interactions */
- }
- },
+ render() {
+ // Disable reason: this component is non-interactive, but must capture
+ // events from the wrapped component to determine when the Tab key is used.
+ /* eslint-disable jsx-a11y/no-static-element-interactions */
+ return (
+
+
+ );
+ /* eslint-enable jsx-a11y/no-static-element-interactions */
+ }
+ },
'withConstrainedTabbing'
);
diff --git a/packages/components/src/higher-order/with-fallback-styles/index.js b/packages/components/src/higher-order/with-fallback-styles/index.js
index 0771f567bd474f..3685914c371ea4 100644
--- a/packages/components/src/higher-order/with-fallback-styles/index.js
+++ b/packages/components/src/higher-order/with-fallback-styles/index.js
@@ -9,8 +9,8 @@ import { every, isEqual } from 'lodash';
import { Component } from '@wordpress/element';
import { createHigherOrderComponent } from '@wordpress/compose';
-export default ( mapNodeToProps ) => createHigherOrderComponent(
- ( WrappedComponent ) => {
+export default ( mapNodeToProps ) =>
+ createHigherOrderComponent( ( WrappedComponent ) => {
return class extends Component {
constructor() {
super( ...arguments );
@@ -52,10 +52,14 @@ export default ( mapNodeToProps ) => createHigherOrderComponent(
}
render() {
- const wrappedComponent = { wrappedComponent }
;
+ const wrappedComponent = (
+ { wrappedComponent }
+ );
}
};
- },
- 'withFallbackStyles'
-);
+ }, 'withFallbackStyles' );
diff --git a/packages/components/src/higher-order/with-filters/index.js b/packages/components/src/higher-order/with-filters/index.js
index e44a41cee35af0..7039854e58a611 100644
--- a/packages/components/src/higher-order/with-filters/index.js
+++ b/packages/components/src/higher-order/with-filters/index.js
@@ -64,10 +64,7 @@ export default function withFilters( hookName ) {
}
componentWillUnmount() {
- FilteredComponentRenderer.instances = without(
- FilteredComponentRenderer.instances,
- this
- );
+ FilteredComponentRenderer.instances = without( FilteredComponentRenderer.instances, this );
// If this was the last of the mounted components filtered on
// this hook, remove the hook handler.
diff --git a/packages/components/src/higher-order/with-filters/test/index.js b/packages/components/src/higher-order/with-filters/test/index.js
index 68aecd9685e80b..a9520781711e5e 100644
--- a/packages/components/src/higher-order/with-filters/test/index.js
+++ b/packages/components/src/higher-order/with-filters/test/index.js
@@ -60,11 +60,7 @@ describe( 'withFilters', () => {
it( 'should display a component overridden by the filter', () => {
const OverriddenComponent = () => Overridden component
;
- addFilter(
- 'EnhancedComponent',
- 'test/enhanced-component-override',
- () => OverriddenComponent
- );
+ addFilter( 'EnhancedComponent', 'test/enhanced-component-override', () => OverriddenComponent );
const EnhancedComponent = withFilters( hookName )( MyComponent );
shallowWrapper = shallow( Composed component
;
- addFilter(
- hookName,
- 'test/enhanced-component-compose',
- ( FilteredComponent ) => () => (
-
-
- )
- );
+ addFilter( hookName, 'test/enhanced-component-compose', ( FilteredComponent ) => () => (
+
+
+ ) );
const EnhancedComponent = withFilters( hookName )( MyComponent );
shallowWrapper = shallow( My component
Composed component
My component
Composed component
Spied component
;
};
- addFilter(
- hookName,
- 'test/enhanced-component-spy-1',
- ( FilteredComponent ) => () => (
-
-
- ),
- );
+ addFilter( hookName, 'test/enhanced-component-spy-1', ( FilteredComponent ) => () => (
+
+
+ ) );
const EnhancedComponent = withFilters( hookName )( SpiedComponent );
wrapper = TestUtils.renderIntoDocument( getTestComponent( EnhancedComponent ) );
@@ -113,10 +103,7 @@ describe( 'withFilters', () => {
jest.runAllTimers();
expect( spy ).toHaveBeenCalledTimes( 1 );
- assertExpectedHtml(
- wrapper,
- 'Spied component
Spied component
-
- ),
- );
+ addFilter( hookName, 'test/enhanced-component-spy-1', ( FilteredComponent ) => () => (
+
+
+ ) );
jest.runAllTimers();
expect( spy ).toHaveBeenCalledTimes( 1 );
- assertExpectedHtml(
- wrapper,
- 'Spied component
Spied component
-
- ),
- );
- addFilter(
- hookName,
- 'test/enhanced-component-spy-2',
- ( FilteredComponent ) => () => (
-
- ),
- );
+ addFilter( hookName, 'test/enhanced-component-spy-1', ( FilteredComponent ) => () => (
+
+
+ ) );
+ addFilter( hookName, 'test/enhanced-component-spy-2', ( FilteredComponent ) => () => (
+
+ ) );
jest.runAllTimers();
expect( spy ).toHaveBeenCalledTimes( 1 );
@@ -196,28 +168,18 @@ describe( 'withFilters', () => {
wrapper = TestUtils.renderIntoDocument( getTestComponent( EnhancedComponent ) );
spy.mockClear();
- addFilter(
- hookName,
- 'test/enhanced-component-spy',
- ( FilteredComponent ) => () => (
-
-
- ),
- );
+ addFilter( hookName, 'test/enhanced-component-spy', ( FilteredComponent ) => () => (
+
+
+ ) );
jest.runAllTimers();
- removeFilter(
- hookName,
- 'test/enhanced-component-spy',
- );
+ removeFilter( hookName, 'test/enhanced-component-spy' );
jest.runAllTimers();
expect( spy ).toHaveBeenCalledTimes( 2 );
- assertExpectedHtml(
- wrapper,
- 'Spied component
'
- );
+ assertExpectedHtml( wrapper, 'Spied component
' );
} );
it( 'should re-render both components once each when one filter added', () => {
@@ -236,15 +198,11 @@ describe( 'withFilters', () => {
wrapper = TestUtils.renderIntoDocument( getTestComponent( CombinedComponents ) );
spy.mockClear();
- addFilter(
- hookName,
- 'test/enhanced-component-spy-1',
- ( FilteredComponent ) => () => (
-
-
- ),
- );
+ addFilter( hookName, 'test/enhanced-component-spy-1', ( FilteredComponent ) => () => (
+
+
+ ) );
jest.runAllTimers();
expect( spy ).toHaveBeenCalledTimes( 2 );
diff --git a/packages/components/src/higher-order/with-focus-outside/index.js b/packages/components/src/higher-order/with-focus-outside/index.js
index 5f178b4a34df28..4a3b1099100bd4 100644
--- a/packages/components/src/higher-order/with-focus-outside/index.js
+++ b/packages/components/src/higher-order/with-focus-outside/index.js
@@ -15,10 +15,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
*
* @type {string[]}
*/
-const INPUT_BUTTON_TYPES = [
- 'button',
- 'submit',
-];
+const INPUT_BUTTON_TYPES = [ 'button', 'submit' ];
/**
* Returns true if the given element is a button element subject to focus
@@ -43,104 +40,100 @@ function isFocusNormalizedButton( element ) {
return false;
}
-export default createHigherOrderComponent(
- ( WrappedComponent ) => {
- return class extends Component {
- constructor() {
- super( ...arguments );
-
- this.bindNode = this.bindNode.bind( this );
- this.cancelBlurCheck = this.cancelBlurCheck.bind( this );
- this.queueBlurCheck = this.queueBlurCheck.bind( this );
- this.normalizeButtonFocus = this.normalizeButtonFocus.bind( this );
- }
-
- componentWillUnmount() {
+export default createHigherOrderComponent( ( WrappedComponent ) => {
+ return class extends Component {
+ constructor() {
+ super( ...arguments );
+
+ this.bindNode = this.bindNode.bind( this );
+ this.cancelBlurCheck = this.cancelBlurCheck.bind( this );
+ this.queueBlurCheck = this.queueBlurCheck.bind( this );
+ this.normalizeButtonFocus = this.normalizeButtonFocus.bind( this );
+ }
+
+ componentWillUnmount() {
+ this.cancelBlurCheck();
+ }
+
+ bindNode( node ) {
+ if ( node ) {
+ this.node = node;
+ } else {
+ delete this.node;
this.cancelBlurCheck();
}
+ }
- bindNode( node ) {
- if ( node ) {
- this.node = node;
- } else {
- delete this.node;
- this.cancelBlurCheck();
- }
- }
+ queueBlurCheck( event ) {
+ // React does not allow using an event reference asynchronously
+ // due to recycling behavior, except when explicitly persisted.
+ event.persist();
- queueBlurCheck( event ) {
- // React does not allow using an event reference asynchronously
- // due to recycling behavior, except when explicitly persisted.
- event.persist();
+ // Skip blur check if clicking button. See `normalizeButtonFocus`.
+ if ( this.preventBlurCheck ) {
+ return;
+ }
- // Skip blur check if clicking button. See `normalizeButtonFocus`.
- if ( this.preventBlurCheck ) {
+ this.blurCheckTimeout = setTimeout( () => {
+ // If document is not focused then focus should remain
+ // inside the wrapped component and therefore we cancel
+ // this blur event thereby leaving focus in place.
+ // https://developer.mozilla.org/en-US/docs/Web/API/Document/hasFocus.
+ if ( ! document.hasFocus() ) {
+ event.preventDefault();
return;
}
-
- this.blurCheckTimeout = setTimeout( () => {
- // If document is not focused then focus should remain
- // inside the wrapped component and therefore we cancel
- // this blur event thereby leaving focus in place.
- // https://developer.mozilla.org/en-US/docs/Web/API/Document/hasFocus.
- if ( ! document.hasFocus() ) {
- event.preventDefault();
- return;
- }
- if ( 'function' === typeof this.node.handleFocusOutside ) {
- this.node.handleFocusOutside( event );
- }
- }, 0 );
- }
-
- cancelBlurCheck() {
- clearTimeout( this.blurCheckTimeout );
- }
-
- /**
- * Handles a mousedown or mouseup event to respectively assign and
- * unassign a flag for preventing blur check on button elements. Some
- * browsers, namely Firefox and Safari, do not emit a focus event on
- * button elements when clicked, while others do. The logic here
- * intends to normalize this as treating click on buttons as focus.
- *
- * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus
- *
- * @param {MouseEvent} event Event for mousedown or mouseup.
- */
- normalizeButtonFocus( event ) {
- const { type, target } = event;
-
- const isInteractionEnd = includes( [ 'mouseup', 'touchend' ], type );
-
- if ( isInteractionEnd ) {
- this.preventBlurCheck = false;
- } else if ( isFocusNormalizedButton( target ) ) {
- this.preventBlurCheck = true;
+ if ( 'function' === typeof this.node.handleFocusOutside ) {
+ this.node.handleFocusOutside( event );
}
+ }, 0 );
+ }
+
+ cancelBlurCheck() {
+ clearTimeout( this.blurCheckTimeout );
+ }
+
+ /**
+ * Handles a mousedown or mouseup event to respectively assign and
+ * unassign a flag for preventing blur check on button elements. Some
+ * browsers, namely Firefox and Safari, do not emit a focus event on
+ * button elements when clicked, while others do. The logic here
+ * intends to normalize this as treating click on buttons as focus.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus
+ *
+ * @param {MouseEvent} event Event for mousedown or mouseup.
+ */
+ normalizeButtonFocus( event ) {
+ const { type, target } = event;
+
+ const isInteractionEnd = includes( [ 'mouseup', 'touchend' ], type );
+
+ if ( isInteractionEnd ) {
+ this.preventBlurCheck = false;
+ } else if ( isFocusNormalizedButton( target ) ) {
+ this.preventBlurCheck = true;
}
-
- render() {
- // Disable reason: See `normalizeButtonFocus` for browser-specific
- // focus event normalization.
-
- /* eslint-disable jsx-a11y/no-static-element-interactions */
- return (
-
-
- );
- /* eslint-enable jsx-a11y/no-static-element-interactions */
- }
- };
- }, 'withFocusOutside'
-);
+ }
+
+ render() {
+ // Disable reason: See `normalizeButtonFocus` for browser-specific
+ // focus event normalization.
+
+ /* eslint-disable jsx-a11y/no-static-element-interactions */
+ return (
+
+
+ );
+ /* eslint-enable jsx-a11y/no-static-element-interactions */
+ }
+ };
+}, 'withFocusOutside' );
diff --git a/packages/components/src/higher-order/with-focus-outside/index.native.js b/packages/components/src/higher-order/with-focus-outside/index.native.js
index 3efc036cdd46eb..eee3f46ee9f7a3 100644
--- a/packages/components/src/higher-order/with-focus-outside/index.native.js
+++ b/packages/components/src/higher-order/with-focus-outside/index.native.js
@@ -16,10 +16,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
*
* @type {string[]}
*/
-const INPUT_BUTTON_TYPES = [
- 'button',
- 'submit',
-];
+const INPUT_BUTTON_TYPES = [ 'button', 'submit' ];
/**
* Returns true if the given element is a button element subject to focus
@@ -44,94 +41,90 @@ function isFocusNormalizedButton( element ) {
return false;
}
-export default createHigherOrderComponent(
- ( WrappedComponent ) => {
- return class extends Component {
- constructor() {
- super( ...arguments );
-
- this.bindNode = this.bindNode.bind( this );
- this.cancelBlurCheck = this.cancelBlurCheck.bind( this );
- this.queueBlurCheck = this.queueBlurCheck.bind( this );
- this.normalizeButtonFocus = this.normalizeButtonFocus.bind( this );
- }
-
- componentWillUnmount() {
+export default createHigherOrderComponent( ( WrappedComponent ) => {
+ return class extends Component {
+ constructor() {
+ super( ...arguments );
+
+ this.bindNode = this.bindNode.bind( this );
+ this.cancelBlurCheck = this.cancelBlurCheck.bind( this );
+ this.queueBlurCheck = this.queueBlurCheck.bind( this );
+ this.normalizeButtonFocus = this.normalizeButtonFocus.bind( this );
+ }
+
+ componentWillUnmount() {
+ this.cancelBlurCheck();
+ }
+
+ bindNode( node ) {
+ if ( node ) {
+ this.node = node;
+ } else {
+ delete this.node;
this.cancelBlurCheck();
}
+ }
- bindNode( node ) {
- if ( node ) {
- this.node = node;
- } else {
- delete this.node;
- this.cancelBlurCheck();
- }
- }
-
- queueBlurCheck( event ) {
- // React does not allow using an event reference asynchronously
- // due to recycling behavior, except when explicitly persisted.
- event.persist();
+ queueBlurCheck( event ) {
+ // React does not allow using an event reference asynchronously
+ // due to recycling behavior, except when explicitly persisted.
+ event.persist();
- // Skip blur check if clicking button. See `normalizeButtonFocus`.
- if ( this.preventBlurCheck ) {
- return;
- }
-
- this.blurCheckTimeout = setTimeout( () => {
- if ( 'function' === typeof this.node.handleFocusOutside ) {
- this.node.handleFocusOutside( event );
- }
- }, 0 );
- }
-
- cancelBlurCheck() {
- clearTimeout( this.blurCheckTimeout );
+ // Skip blur check if clicking button. See `normalizeButtonFocus`.
+ if ( this.preventBlurCheck ) {
+ return;
}
- /**
- * Handles a mousedown or mouseup event to respectively assign and
- * unassign a flag for preventing blur check on button elements. Some
- * browsers, namely Firefox and Safari, do not emit a focus event on
- * button elements when clicked, while others do. The logic here
- * intends to normalize this as treating click on buttons as focus.
- *
- * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus
- *
- * @param {MouseEvent} event Event for mousedown or mouseup.
- */
- normalizeButtonFocus( event ) {
- const { type, target } = event;
-
- const isInteractionEnd = includes( [ 'mouseup', 'touchend' ], type );
-
- if ( isInteractionEnd ) {
- this.preventBlurCheck = false;
- } else if ( isFocusNormalizedButton( target ) ) {
- this.preventBlurCheck = true;
+ this.blurCheckTimeout = setTimeout( () => {
+ if ( 'function' === typeof this.node.handleFocusOutside ) {
+ this.node.handleFocusOutside( event );
}
+ }, 0 );
+ }
+
+ cancelBlurCheck() {
+ clearTimeout( this.blurCheckTimeout );
+ }
+
+ /**
+ * Handles a mousedown or mouseup event to respectively assign and
+ * unassign a flag for preventing blur check on button elements. Some
+ * browsers, namely Firefox and Safari, do not emit a focus event on
+ * button elements when clicked, while others do. The logic here
+ * intends to normalize this as treating click on buttons as focus.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus
+ *
+ * @param {MouseEvent} event Event for mousedown or mouseup.
+ */
+ normalizeButtonFocus( event ) {
+ const { type, target } = event;
+
+ const isInteractionEnd = includes( [ 'mouseup', 'touchend' ], type );
+
+ if ( isInteractionEnd ) {
+ this.preventBlurCheck = false;
+ } else if ( isFocusNormalizedButton( target ) ) {
+ this.preventBlurCheck = true;
}
-
- render() {
- // Disable reason: See `normalizeButtonFocus` for browser-specific
- // focus event normalization.
-
- return (
-
-
- );
- }
- };
- }, 'withFocusOutside'
-);
+ }
+
+ render() {
+ // Disable reason: See `normalizeButtonFocus` for browser-specific
+ // focus event normalization.
+
+ return (
+
+
+ );
+ }
+ };
+}, 'withFocusOutside' );
diff --git a/packages/components/src/higher-order/with-focus-return/context.js b/packages/components/src/higher-order/with-focus-return/context.js
index f65834f4886927..a7da6f320eba65 100644
--- a/packages/components/src/higher-order/with-focus-return/context.js
+++ b/packages/components/src/higher-order/with-focus-return/context.js
@@ -46,9 +46,7 @@ class FocusReturnProvider extends Component {
// stack may otherwise only consist of members pending destruction, at
// which point focus might have been lost.
const nextFocusHistory = uniq(
- [ ...focusHistory, event.target ]
- .slice( -1 * MAX_STACK_LENGTH )
- .reverse()
+ [ ...focusHistory, event.target ].slice( -1 * MAX_STACK_LENGTH ).reverse()
).reverse();
this.setState( { focusHistory: nextFocusHistory } );
diff --git a/packages/components/src/higher-order/with-focus-return/index.js b/packages/components/src/higher-order/with-focus-return/index.js
index 2b504878bdf528..37e404006430f0 100644
--- a/packages/components/src/higher-order/with-focus-return/index.js
+++ b/packages/components/src/higher-order/with-focus-return/index.js
@@ -23,10 +23,7 @@ import Provider, { Consumer } from './context';
* @return {boolean} Whether object is component-like.
*/
function isComponentLike( object ) {
- return (
- object instanceof Component ||
- typeof object === 'function'
- );
+ return object instanceof Component || typeof object === 'function';
}
/**
@@ -57,9 +54,9 @@ function withFocusReturn( options ) {
constructor() {
super( ...arguments );
- this.ownFocusedElements = new Set;
+ this.ownFocusedElements = new Set();
this.activeElementOnMount = document.activeElement;
- this.setIsFocusedFalse = () => this.isFocused = false;
+ this.setIsFocusedFalse = () => ( this.isFocused = false );
this.setIsFocusedTrue = ( event ) => {
this.ownFocusedElements.add( event.target );
this.isFocused = true;
@@ -67,11 +64,7 @@ function withFocusReturn( options ) {
}
componentWillUnmount() {
- const {
- activeElementOnMount,
- isFocused,
- ownFocusedElements,
- } = this;
+ const { activeElementOnMount, isFocused, ownFocusedElements } = this;
if ( ! isFocused ) {
return;
@@ -87,10 +80,7 @@ function withFocusReturn( options ) {
}
const stack = [
- ...without(
- this.props.focus.focusHistory,
- ...ownFocusedElements
- ),
+ ...without( this.props.focus.focusHistory, ...ownFocusedElements ),
activeElementOnMount,
];
@@ -105,10 +95,7 @@ function withFocusReturn( options ) {
render() {
return (
-
+
);
@@ -116,9 +103,7 @@ function withFocusReturn( options ) {
}
return ( props ) => (
-
- { ( context ) =>
+
{ ( context ) =>
);
};
}
diff --git a/packages/components/src/higher-order/with-focus-return/test/index.js b/packages/components/src/higher-order/with-focus-return/test/index.js
index f3e2b326b6daca..cedd708c29dcf2 100644
--- a/packages/components/src/higher-order/with-focus-return/test/index.js
+++ b/packages/components/src/higher-order/with-focus-return/test/index.js
@@ -17,7 +17,9 @@ import withFocusReturn, { Provider } from '../';
class Test extends Component {
render() {
return (
-
+
+
+
);
}
}
@@ -29,9 +31,7 @@ describe( 'withFocusReturn()', () => {
const switchFocusTo = document.createElement( 'input' );
const getInstance = ( wrapper ) => {
- return wrapper.root.find(
- ( node ) => node.instance instanceof Component
- ).instance;
+ return wrapper.root.find( ( node ) => node.instance instanceof Component ).instance;
};
beforeEach( () => {
@@ -81,7 +81,10 @@ describe( 'withFocusReturn()', () => {
it( 'should switch focus back when unmounted while having focus', () => {
const wrapper = mount(
);
- wrapper.find( 'textarea' ).at( 0 ).simulate( 'focus' );
+ wrapper
+ .find( 'textarea' )
+ .at( 0 )
+ .simulate( 'focus' );
// Should return to the activeElement saved with this component.
wrapper.unmount();
diff --git a/packages/components/src/higher-order/with-notices/index.js b/packages/components/src/higher-order/with-notices/index.js
index 49a44608039ce1..c03576aa68a55a 100644
--- a/packages/components/src/higher-order/with-notices/index.js
+++ b/packages/components/src/higher-order/with-notices/index.js
@@ -89,11 +89,13 @@ export default createHigherOrderComponent( ( OriginalComponent ) => {
noticeList={ this.state.noticeList }
noticeOperations={ this.noticeOperations }
noticeUI={
- this.state.noticeList.length > 0 &&
+ this.state.noticeList.length > 0 && (
+
+ )
}
{ ...this.props }
/>
diff --git a/packages/components/src/higher-order/with-spoken-messages/index.js b/packages/components/src/higher-order/with-spoken-messages/index.js
index de17dc62aeb575..9f298b20ef4991 100644
--- a/packages/components/src/higher-order/with-spoken-messages/index.js
+++ b/packages/components/src/higher-order/with-spoken-messages/index.js
@@ -35,7 +35,8 @@ export default createHigherOrderComponent( ( WrappedComponent ) => {
render() {
return (
-
diff --git a/packages/components/src/icon-button/index.js b/packages/components/src/icon-button/index.js
index 8c2e361eb2a371..fdacd044eb2c88 100644
--- a/packages/components/src/icon-button/index.js
+++ b/packages/components/src/icon-button/index.js
@@ -33,28 +33,21 @@ function IconButton( props, ref ) {
const tooltipText = tooltip || label;
// Should show the tooltip if...
- const showTooltip = ! additionalProps.disabled && (
+ const showTooltip =
+ ! additionalProps.disabled &&
// an explicit tooltip is passed or...
- tooltip ||
- // there's a shortcut or...
- shortcut ||
- (
+ ( tooltip ||
+ // there's a shortcut or...
+ shortcut ||
// there's a label and...
- !! label &&
- // the children are empty and...
- ( ! children || ( isArray( children ) && ! children.length ) ) &&
- // the tooltip is not explicitly disabled.
- false !== tooltip
- )
- );
+ ( !! label &&
+ // the children are empty and...
+ ( ! children || ( isArray( children ) && ! children.length ) ) &&
+ // the tooltip is not explicitly disabled.
+ false !== tooltip ) );
let element = (
-
+
{ isString( icon ) ?
diff --git a/packages/components/src/icon-button/test/index.js b/packages/components/src/icon-button/test/index.js
index f4a8d4330d3cc2..a47256fb4faa9e 100644
--- a/packages/components/src/icon-button/test/index.js
+++ b/packages/components/src/icon-button/test/index.js
@@ -24,12 +24,23 @@ describe( 'IconButton', () => {
it( 'should render a Dashicon component matching the wordpress icon', () => {
const iconButton = shallow( Test } /> );
- expect( iconButton.find( '.test' ).shallow().text() ).toBe( 'Test' );
+ expect(
+ iconButton
+ .find( '.test' )
+ .shallow()
+ .text()
+ ).toBe( 'Test' );
} );
it( 'should add an aria-label when the label property is used', () => {
diff --git a/packages/components/src/icon/stories/index.js b/packages/components/src/icon/stories/index.js
index be4e9fed65787f..03490a52dcf0a1 100644
--- a/packages/components/src/icon/stories/index.js
+++ b/packages/components/src/icon/stories/index.js
@@ -40,10 +40,7 @@ export const colors = () => {
return (
<>
{ iconColors.map( ( color ) => (
-
+
diff --git a/packages/components/src/icon/test/index.js b/packages/components/src/icon/test/index.js
index a645568c1e2eee..6fb16a507e7826 100644
--- a/packages/components/src/icon/test/index.js
+++ b/packages/components/src/icon/test/index.js
@@ -17,7 +17,11 @@ import { Path, SVG } from '../../';
describe( 'Icon', () => {
const className = 'example-class';
- const svg =
;
+ const svg = (
+
+
+ );
const style = { fill: 'red' };
it( 'renders nothing when icon omitted', () => {
@@ -70,7 +74,16 @@ describe( 'Icon', () => {
} );
it( 'renders an svg element and passes the size as its width and height', () => {
- const wrapper = shallow(
+
+
{ children }
);
diff --git a/packages/components/src/keyboard-shortcuts/index.js b/packages/components/src/keyboard-shortcuts/index.js
index 5bb2cee5499c63..3c6794e1696686 100644
--- a/packages/components/src/keyboard-shortcuts/index.js
+++ b/packages/components/src/keyboard-shortcuts/index.js
@@ -35,12 +35,12 @@ class KeyboardShortcuts extends Component {
const hasShift = modifiers.has( 'shift' );
if (
- isAppleOS() && (
- ( modifiers.size === 1 && hasAlt ) ||
- ( modifiers.size === 2 && hasAlt && hasShift )
- )
+ isAppleOS() &&
+ ( ( modifiers.size === 1 && hasAlt ) || ( modifiers.size === 2 && hasAlt && hasShift ) )
) {
- throw new Error( `Cannot bind ${ key }. Alt and Shift+Alt modifiers are reserved for character input.` );
+ throw new Error(
+ `Cannot bind ${ key }. Alt and Shift+Alt modifiers are reserved for character input.`
+ );
}
}
diff --git a/packages/components/src/keyboard-shortcuts/platform.js b/packages/components/src/keyboard-shortcuts/platform.js
index 386f0d7fb173f9..de77c087fcbd71 100644
--- a/packages/components/src/keyboard-shortcuts/platform.js
+++ b/packages/components/src/keyboard-shortcuts/platform.js
@@ -13,6 +13,5 @@ import { includes } from 'lodash';
export function isAppleOS( _window = window ) {
const { platform } = _window.navigator;
- return platform.indexOf( 'Mac' ) !== -1 ||
- includes( [ 'iPad', 'iPhone' ], platform );
+ return platform.indexOf( 'Mac' ) !== -1 || includes( [ 'iPad', 'iPhone' ], platform );
}
diff --git a/packages/components/src/keyboard-shortcuts/test/index.js b/packages/components/src/keyboard-shortcuts/test/index.js
index caaa459780b0aa..774ac4a1ba4b21 100644
--- a/packages/components/src/keyboard-shortcuts/test/index.js
+++ b/packages/components/src/keyboard-shortcuts/test/index.js
@@ -30,7 +30,8 @@ describe( 'KeyboardShortcuts', () => {
+ } }
+ />
);
keyPress( 68, document );
@@ -49,7 +50,8 @@ describe( 'KeyboardShortcuts', () => {
bindGlobal
shortcuts={ {
d: spy,
- } } />
+ } }
+ />
- { label &&
-
+ { label && (
+
{ label }
- }
+ ) }
{ children }
diff --git a/packages/components/src/menu-group/test/index.js b/packages/components/src/menu-group/test/index.js
index 7f5a476614b22d..63551df4f982ec 100644
--- a/packages/components/src/menu-group/test/index.js
+++ b/packages/components/src/menu-group/test/index.js
@@ -17,10 +17,7 @@ describe( 'MenuGroup', () => {
test( 'should match snapshot', () => {
const wrapper = shallow(
-
+
My item
);
diff --git a/packages/components/src/menu-item/index.js b/packages/components/src/menu-item/index.js
index b7cc7c8ca7a0bd..67503b307d701b 100644
--- a/packages/components/src/menu-item/index.js
+++ b/packages/components/src/menu-item/index.js
@@ -38,10 +38,7 @@ export function MenuItem( {
children = (
{ children }
-
- { info }
-
+ { info }
);
}
@@ -58,7 +55,9 @@ export function MenuItem( {
{
it( 'should match snapshot when only label provided', () => {
- const wrapper = shallow(
-
- My item
-
- );
+ const wrapper = shallow( My item );
expect( wrapper ).toMatchSnapshot();
} );
@@ -39,12 +35,7 @@ describe( 'MenuItem', () => {
it( 'should match snapshot when isSelected and role are optionally provided', () => {
const wrapper = shallow(
-
+
My item
);
@@ -53,18 +44,16 @@ describe( 'MenuItem', () => {
} );
it( 'should match snapshot when info is provided', () => {
- const wrapper = shallow(
-
- My item
-
- );
+ const wrapper = shallow( My item );
expect( wrapper ).toMatchSnapshot();
} );
it( 'should avoid using aria-label if only has non-string children', () => {
const wrapper = shallow(
-
+
+
);
expect( wrapper.prop( 'aria-label' ) ).toBeUndefined();
@@ -72,7 +61,9 @@ describe( 'MenuItem', () => {
it( 'should avoid using aria-checked if only menuitem is set as aria-role', () => {
const wrapper = shallow(
-
+
+
);
expect( wrapper.prop( 'aria-checked' ) ).toBeUndefined();
@@ -80,13 +71,17 @@ describe( 'MenuItem', () => {
it( 'should use aria-checked if menuitemradio or menuitemcheckbox is set as aria-role', () => {
let wrapper = shallow(
-
+
+
);
expect( wrapper.prop( 'aria-checked' ) ).toBe( true );
wrapper = shallow(
-
+
+
);
expect( wrapper.prop( 'aria-checked' ) ).toBe( true );
diff --git a/packages/components/src/menu-items-choice/index.js b/packages/components/src/menu-items-choice/index.js
index 2311fd3a0435dd..f894ad86a845ed 100644
--- a/packages/components/src/menu-items-choice/index.js
+++ b/packages/components/src/menu-items-choice/index.js
@@ -3,11 +3,7 @@
*/
import MenuItem from '../menu-item';
-export default function MenuItemsChoice( {
- choices = [],
- onSelect,
- value,
-} ) {
+export default function MenuItemsChoice( { choices = [], onSelect, value } ) {
return choices.map( ( item ) => {
const isSelected = value === item.value;
return (
diff --git a/packages/components/src/mobile/bottom-sheet/button.native.js b/packages/components/src/mobile/bottom-sheet/button.native.js
index cc9c5cdae22ab3..8e97a07a9a558a 100644
--- a/packages/components/src/mobile/bottom-sheet/button.native.js
+++ b/packages/components/src/mobile/bottom-sheet/button.native.js
@@ -8,21 +8,10 @@ import { TouchableOpacity, View, Text } from 'react-native';
*/
import styles from './styles.scss';
-const BottomSheetButton = ( {
- onPress,
- disabled,
- text,
- color,
-} ) => (
-
+const BottomSheetButton = ( { onPress, disabled, text, color } ) => (
+
-
- { text }
-
+ { text }
);
diff --git a/packages/components/src/mobile/bottom-sheet/cell.native.js b/packages/components/src/mobile/bottom-sheet/cell.native.js
index 52ff00b6b5b856..c5601842dc25dc 100644
--- a/packages/components/src/mobile/bottom-sheet/cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/cell.native.js
@@ -57,12 +57,22 @@ class BottomSheetCell extends Component {
const showValue = value !== undefined;
const isValueEditable = editable && onChangeValue !== undefined;
const cellLabelStyle = getStylesFromColorScheme( styles.cellLabel, styles.cellTextDark );
- const cellLabelCenteredStyle = getStylesFromColorScheme( styles.cellLabelCentered, styles.cellTextDark );
- const cellLabelLeftAlignNoIconStyle = getStylesFromColorScheme( styles.cellLabelLeftAlignNoIcon, styles.cellTextDark );
- const defaultMissingIconAndValue = leftAlign ? cellLabelLeftAlignNoIconStyle : cellLabelCenteredStyle;
- const defaultLabelStyle = showValue || icon !== undefined ? cellLabelStyle : defaultMissingIconAndValue;
-
- const drawSeparator = ( separatorType && separatorType !== 'none' ) || separatorStyle === undefined;
+ const cellLabelCenteredStyle = getStylesFromColorScheme(
+ styles.cellLabelCentered,
+ styles.cellTextDark
+ );
+ const cellLabelLeftAlignNoIconStyle = getStylesFromColorScheme(
+ styles.cellLabelLeftAlignNoIcon,
+ styles.cellTextDark
+ );
+ const defaultMissingIconAndValue = leftAlign
+ ? cellLabelLeftAlignNoIconStyle
+ : cellLabelCenteredStyle;
+ const defaultLabelStyle =
+ showValue || icon !== undefined ? cellLabelStyle : defaultMissingIconAndValue;
+
+ const drawSeparator =
+ ( separatorType && separatorType !== 'none' ) || separatorStyle === undefined;
const drawTopSeparator = drawSeparator && separatorType === 'topFullWidth';
const onCellPress = () => {
@@ -85,8 +95,14 @@ class BottomSheetCell extends Component {
const separatorStyle = () => {
//eslint-disable-next-line @wordpress/no-unused-vars-before-return
- const defaultSeparatorStyle = this.props.getStylesFromColorScheme( styles.separator, styles.separatorDark );
- const cellSeparatorStyle = this.props.getStylesFromColorScheme( styles.cellSeparator, styles.cellSeparatorDark );
+ const defaultSeparatorStyle = this.props.getStylesFromColorScheme(
+ styles.separator,
+ styles.separatorDark
+ );
+ const cellSeparatorStyle = this.props.getStylesFromColorScheme(
+ styles.cellSeparator,
+ styles.cellSeparatorDark
+ );
const leftMarginStyle = { ...cellSeparatorStyle, ...platformStyles.separatorMarginLeft };
switch ( separatorType ) {
case 'leftMargin':
@@ -103,7 +119,10 @@ class BottomSheetCell extends Component {
const getValueComponent = () => {
const styleRTL = I18nManager.isRTL && styles.cellValueRTL;
- const cellValueStyle = this.props.getStylesFromColorScheme( styles.cellValue, styles.cellTextDark );
+ const cellValueStyle = this.props.getStylesFromColorScheme(
+ styles.cellValue,
+ styles.cellTextDark
+ );
const finalStyle = { ...cellValueStyle, ...valueStyle, ...styleRTL };
// To be able to show the `middle` ellipsizeMode on editable cells
@@ -113,7 +132,7 @@ class BottomSheetCell extends Component {
const shouldShowPlaceholder = isValueEditable && value === '';
return this.state.isEditingValue || shouldShowPlaceholder ? (
this._valueTextInput = c }
+ ref={ ( c ) => ( this._valueTextInput = c ) }
numberOfLines={ 1 }
style={ finalStyle }
value={ value }
@@ -141,19 +160,19 @@ class BottomSheetCell extends Component {
if ( accessibilityLabel || ! showValue ) {
return accessibilityLabel || label;
}
- return isEmpty( value ) ?
- sprintf(
- /* translators: accessibility text. Empty state of a inline textinput cell. %s: The cell's title */
- _x( '%s. Empty', 'inline textinput cell' ),
- label
- ) :
- // Separating by ',' is necessary to make a pause on urls (non-capitalized text)
- sprintf(
- /* translators: accessibility text. Inline textinput title and value.%1: Cell title, %2: cell value. */
- _x( '%1$s, %2$s', 'inline textinput cell' ),
- label,
- value
- );
+ return isEmpty( value )
+ ? sprintf(
+ /* translators: accessibility text. Empty state of a inline textinput cell. %s: The cell's title */
+ _x( '%s. Empty', 'inline textinput cell' ),
+ label
+ )
+ : // Separating by ',' is necessary to make a pause on urls (non-capitalized text)
+ sprintf(
+ /* translators: accessibility text. Inline textinput title and value.%1: Cell title, %2: cell value. */
+ _x( '%1$s, %2$s', 'inline textinput cell' ),
+ label,
+ value
+ );
};
const iconStyle = getStylesFromColorScheme( styles.icon, styles.iconDark );
@@ -163,17 +182,16 @@ class BottomSheetCell extends Component {
accessible={ ! this.state.isEditingValue }
accessibilityLabel={ getAccessibilityLabel() }
accessibilityRole={ accessibilityRole || 'button' }
- accessibilityHint={ isValueEditable ?
- /* translators: accessibility text */
- __( 'Double tap to edit this value' ) :
- accessibilityHint
+ accessibilityHint={
+ isValueEditable
+ ? /* translators: accessibility text */
+ __( 'Double tap to edit this value' )
+ : accessibilityHint
}
onPress={ onCellPress }
style={ { ...styles.clipToBounds, ...style } }
>
- { drawTopSeparator && (
-
{ icon && (
@@ -189,9 +207,7 @@ class BottomSheetCell extends Component {
{ showValue && getValueComponent() }
{ children }
- { ! drawTopSeparator && (
-
);
}
diff --git a/packages/components/src/mobile/bottom-sheet/index.native.js b/packages/components/src/mobile/bottom-sheet/index.native.js
index 34d05a83974957..844f82c05e032c 100644
--- a/packages/components/src/mobile/bottom-sheet/index.native.js
+++ b/packages/components/src/mobile/bottom-sheet/index.native.js
@@ -34,7 +34,10 @@ class BottomSheet extends Component {
}
componentDidMount() {
- this.safeAreaEventSubscription = SafeArea.addEventListener( 'safeAreaInsetsForRootViewDidChange', this.onSafeAreaInsetsUpdate );
+ this.safeAreaEventSubscription = SafeArea.addEventListener(
+ 'safeAreaInsetsForRootViewDidChange',
+ this.onSafeAreaInsetsUpdate
+ );
}
componentWillUnmount() {
@@ -43,7 +46,10 @@ class BottomSheet extends Component {
}
this.safeAreaEventSubscription.remove();
this.safeAreaEventSubscription = null;
- SafeArea.removeEventListener( 'safeAreaInsetsForRootViewDidChange', this.onSafeAreaInsetsUpdate );
+ SafeArea.removeEventListener(
+ 'safeAreaInsetsForRootViewDidChange',
+ this.onSafeAreaInsetsUpdate
+ );
}
onSafeAreaInsetsUpdate( result ) {
@@ -82,24 +88,18 @@ class BottomSheet extends Component {
const getHeader = () => (
-
- { leftButton }
-
+ { leftButton }
-
- { title }
-
-
-
- { rightButton }
+ { title }
+ { rightButton }
);
const { height } = Dimensions.get( 'window' );
- const easing = Easing.bezier( 0.450, 0.000, 0.160, 1.020 );
+ const easing = Easing.bezier( 0.45, 0.0, 0.16, 1.02 );
const animationIn = {
easing,
@@ -150,15 +150,12 @@ class BottomSheet extends Component {
keyboardVerticalOffset={ -this.state.safeAreaBottomInset }
>
- { this.props.children }
-
+ { this.props.children }
+
{ children }
);
diff --git a/packages/components/src/mobile/bottom-sheet/picker-cell.native.js b/packages/components/src/mobile/bottom-sheet/picker-cell.native.js
index 12eae94c7d8919..5a37c1d0067bba 100644
--- a/packages/components/src/mobile/bottom-sheet/picker-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/picker-cell.native.js
@@ -5,12 +5,7 @@ import Cell from './cell';
import Picker from '../picker';
export default function BottomSheetPickerCell( props ) {
- const {
- options,
- hideCancelButton,
- onChangeValue,
- ...cellProps
- } = props;
+ const { options, hideCancelButton, onChangeValue, ...cellProps } = props;
let picker;
@@ -23,11 +18,11 @@ export default function BottomSheetPickerCell( props ) {
};
return (
-
+
picker = instance }
+ ref={ ( instance ) => ( picker = instance ) }
options={ options }
onChange={ onChange }
/>
diff --git a/packages/components/src/mobile/bottom-sheet/range-cell.native.js b/packages/components/src/mobile/bottom-sheet/range-cell.native.js
index 07b343e9ec0781..ad724a11c826c5 100644
--- a/packages/components/src/mobile/bottom-sheet/range-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/range-cell.native.js
@@ -25,10 +25,7 @@ export default function BottomSheetRangeCell( props ) {
} = props;
return (
-
+
{
onValueChange( ! value );
};
- const accessibilityLabel = value ?
- sprintf(
- /* translators: accessibility text. Switch setting ON state. %s: Switch title. */
- _x( '%s. On', 'switch control' ),
- cellProps.label
- ) :
- sprintf(
- /* translators: accessibility text. Switch setting OFF state. %s: Switch title. */
- _x( '%s. Off', 'switch control' ),
- cellProps.label
- );
+ const accessibilityLabel = value
+ ? sprintf(
+ /* translators: accessibility text. Switch setting ON state. %s: Switch title. */
+ _x( '%s. On', 'switch control' ),
+ cellProps.label
+ )
+ : sprintf(
+ /* translators: accessibility text. Switch setting OFF state. %s: Switch title. */
+ _x( '%s. Off', 'switch control' ),
+ cellProps.label
+ );
return (
- |
);
}
diff --git a/packages/components/src/mobile/html-text-input/container.android.js b/packages/components/src/mobile/html-text-input/container.android.js
index ef62fc0178a3d6..3af7c38fec6cb3 100644
--- a/packages/components/src/mobile/html-text-input/container.android.js
+++ b/packages/components/src/mobile/html-text-input/container.android.js
@@ -11,9 +11,7 @@ import styles from './style.android.scss';
const HTMLInputContainer = ( { children, parentHeight } ) => (
-
- { children }
-
+ { children }
);
diff --git a/packages/components/src/mobile/html-text-input/index.native.js b/packages/components/src/mobile/html-text-input/index.native.js
index 7b7c648216ef33..01806ca87ac81f 100644
--- a/packages/components/src/mobile/html-text-input/index.native.js
+++ b/packages/components/src/mobile/html-text-input/index.native.js
@@ -96,10 +96,7 @@ export class HTMLTextInput extends Component {
export default compose( [
withSelect( ( select ) => {
- const {
- getEditedPostAttribute,
- getEditedPostContent,
- } = select( 'core/editor' );
+ const { getEditedPostAttribute, getEditedPostContent } = select( 'core/editor' );
return {
title: getEditedPostAttribute( 'title' ),
diff --git a/packages/components/src/mobile/html-text-input/test/index.native.js b/packages/components/src/mobile/html-text-input/test/index.native.js
index 2481e533a4fad8..f451719b4cea07 100644
--- a/packages/components/src/mobile/html-text-input/test/index.native.js
+++ b/packages/components/src/mobile/html-text-input/test/index.native.js
@@ -15,9 +15,12 @@ import { HTMLTextInput } from '..';
// Utility to find a TextInput in a ShallowWrapper
const findTextInputInWrapper = ( wrapper, matchingProps ) => {
- return wrapper.dive().findWhere( ( node ) => {
- return node.name() === 'TextInput' && node.is( matchingProps );
- } ).first();
+ return wrapper
+ .dive()
+ .findWhere( ( node ) => {
+ return node.name() === 'TextInput' && node.is( matchingProps );
+ } )
+ .first();
};
// Finds the Content TextInput in our HTMLInputView
@@ -49,10 +52,7 @@ describe( 'HTMLTextInput', () => {
const onChange = jest.fn();
const wrapper = shallow(
-
- { this.props.options.map( ( option, index ) =>
+ { this.props.options.map( ( option, index ) => (
this.onCellPress( option.value ) }
/>
+ ) ) }
+ { ! this.props.hideCancelButton && (
+
);
diff --git a/packages/components/src/mobile/picker/index.ios.js b/packages/components/src/mobile/picker/index.ios.js
index 9de17d1ff7060a..fff27f50e15838 100644
--- a/packages/components/src/mobile/picker/index.ios.js
+++ b/packages/components/src/mobile/picker/index.ios.js
@@ -27,7 +27,7 @@ class Picker extends Component {
}
const selected = options[ buttonIndex - 1 ];
onChange( selected.value );
- },
+ }
);
}
diff --git a/packages/components/src/mobile/readable-content-view/index.native.js b/packages/components/src/mobile/readable-content-view/index.native.js
index dbeb172ab04342..b74af7b9b7add4 100644
--- a/packages/components/src/mobile/readable-content-view/index.native.js
+++ b/packages/components/src/mobile/readable-content-view/index.native.js
@@ -9,8 +9,8 @@ import { View, Dimensions } from 'react-native';
import styles from './style.scss';
const ReadableContentView = ( { reversed, children } ) => (
-
-
+
+
{ children }
diff --git a/packages/components/src/mobile/slider/index.native.js b/packages/components/src/mobile/slider/index.native.js
index 111d9987e973db..5abdd99047da67 100644
--- a/packages/components/src/mobile/slider/index.native.js
+++ b/packages/components/src/mobile/slider/index.native.js
@@ -21,12 +21,14 @@ class Slider extends Component {
this.handleValueSave = this.handleValueSave.bind( this );
this.handleReset = this.handleReset.bind( this );
- const initialValue = this.validateInput( props.value || props.defaultValue || props.minimumValue );
+ const initialValue = this.validateInput(
+ props.value || props.defaultValue || props.minimumValue
+ );
this.state = { hasFocus: false, initialValue, sliderValue: initialValue };
}
- componentDidUpdate( ) {
+ componentDidUpdate() {
const reset = this.props.value === null;
if ( reset ) {
this.handleReset();
@@ -52,7 +54,10 @@ class Slider extends Component {
if ( typeof text === 'number' ) {
return Math.min( Math.max( text, minimumValue ), maximumValue );
}
- return Math.min( Math.max( text.replace( /[^0-9]/g, '' ).replace( /^0+(?=\d)/, '' ), minimumValue ), maximumValue );
+ return Math.min(
+ Math.max( text.replace( /[^0-9]/g, '' ).replace( /^0+(?=\d)/, '' ), minimumValue ),
+ maximumValue
+ );
}
handleChange( text ) {
diff --git a/packages/components/src/modal/aria-helper.js b/packages/components/src/modal/aria-helper.js
index 8b714b147d55e4..ae7843d6f7e4b0 100644
--- a/packages/components/src/modal/aria-helper.js
+++ b/packages/components/src/modal/aria-helper.js
@@ -3,13 +3,7 @@
*/
import { forEach } from 'lodash';
-const LIVE_REGION_ARIA_ROLES = new Set( [
- 'alert',
- 'status',
- 'log',
- 'marquee',
- 'timer',
-] );
+const LIVE_REGION_ARIA_ROLES = new Set( [ 'alert', 'status', 'log', 'marquee', 'timer' ] );
let hiddenElements = [],
isHidden = false;
@@ -32,9 +26,7 @@ export function hideApp( unhiddenElement ) {
}
const elements = document.body.children;
forEach( elements, ( element ) => {
- if (
- element === unhiddenElement
- ) {
+ if ( element === unhiddenElement ) {
return;
}
if ( elementShouldBeHidden( element ) ) {
diff --git a/packages/components/src/modal/frame.js b/packages/components/src/modal/frame.js
index 286171a06e0ca2..ad3a99202885c8 100644
--- a/packages/components/src/modal/frame.js
+++ b/packages/components/src/modal/frame.js
@@ -107,10 +107,7 @@ class ModalFrame extends Component {
const {
overlayClassName,
contentLabel,
- aria: {
- describedby,
- labelledby,
- },
+ aria: { describedby, labelledby },
children,
className,
role,
@@ -123,10 +120,7 @@ class ModalFrame extends Component {
onKeyDown={ this.handleKeyDown }
>
+
- { icon &&
+ { icon && (
{ icon }
- }
- { title &&
-
+ ) }
+ { title && (
+
{ title }
- }
+ ) }
- { isDismissible &&
-
- }
+ { isDismissible && }
);
};
diff --git a/packages/components/src/navigable-container/container.js b/packages/components/src/navigable-container/container.js
index a4fb6eeabd80a1..1d88d973c76098 100644
--- a/packages/components/src/navigable-container/container.js
+++ b/packages/components/src/navigable-container/container.js
@@ -117,7 +117,8 @@ class NavigableContainer extends Component {
render() {
const { children, ...props } = this.props;
return (
- {
const { keyCode } = evt;
diff --git a/packages/components/src/navigable-container/test/menu.js b/packages/components/src/navigable-container/test/menu.js
index 8f19afe270cb64..7fe1b874402009 100644
--- a/packages/components/src/navigable-container/test/menu.js
+++ b/packages/components/src/navigable-container/test/menu.js
@@ -41,27 +41,38 @@ function fireKeyDown( container, keyCode, shiftKey ) {
describe( 'NavigableMenu', () => {
it( 'vertical: should navigate by up and down', () => {
let currentIndex = 0;
- const wrapper = mount( (
+ const wrapper = mount(
/*
Disabled because of our rule restricting literal IDs, preferring
`withInstanceId`. In this case, it's fine to use literal IDs.
*/
/* eslint-disable no-restricted-syntax */
- currentIndex = index }>
- One
- Two
+ ( currentIndex = index ) }>
+
+ One
+
+
+ Two
+
- Deep
+
+ Deep
+
+
+
+ Three
- Three
/* eslint-enable no-restricted-syntax */
- ) );
+ );
simulateVisible( wrapper, '*' );
const container = wrapper.find( 'div' );
- wrapper.getDOMNode().querySelector( '#btn1' ).focus();
+ wrapper
+ .getDOMNode()
+ .querySelector( '#btn1' )
+ .focus();
// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
@@ -85,24 +96,37 @@ describe( 'NavigableMenu', () => {
it( 'vertical: should navigate by up and down, and stop at edges', () => {
let currentIndex = 0;
- const wrapper = mount( (
+ const wrapper = mount(
/*
Disabled because of our rule restricting literal IDs, preferring
`withInstanceId`. In this case, it's fine to use literal IDs.
*/
/* eslint-disable no-restricted-syntax */
- currentIndex = index }>
- One
- Two
- Three
+ ( currentIndex = index ) }
+ >
+
+ One
+
+
+ Two
+
+
+ Three
+
/* eslint-enable no-restricted-syntax */
- ) );
+ );
simulateVisible( wrapper, '*' );
const container = wrapper.find( 'div' );
- wrapper.getDOMNode().querySelector( '#btn1' ).focus();
+ wrapper
+ .getDOMNode()
+ .querySelector( '#btn1' )
+ .focus();
// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
@@ -124,27 +148,38 @@ describe( 'NavigableMenu', () => {
it( 'horizontal: should navigate by left and right', () => {
let currentIndex = 0;
- const wrapper = mount( (
+ const wrapper = mount(
/*
Disabled because of our rule restricting literal IDs, preferring
`withInstanceId`. In this case, it's fine to use literal IDs.
*/
/* eslint-disable no-restricted-syntax */
- currentIndex = index }>
- One
- Two
+ ( currentIndex = index ) }>
+
+ One
+
+
+ Two
+
- Deep
+
+ Deep
+
+
+
+ Three
- Three
/* eslint-enable no-restricted-syntax */
- ) );
+ );
simulateVisible( wrapper, '*' );
const container = wrapper.find( 'div' );
- wrapper.getDOMNode().querySelector( '#btn1' ).focus();
+ wrapper
+ .getDOMNode()
+ .querySelector( '#btn1' )
+ .focus();
// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
@@ -168,24 +203,37 @@ describe( 'NavigableMenu', () => {
it( 'horizontal: should navigate by left and right, and stop at edges', () => {
let currentIndex = 0;
- const wrapper = mount( (
+ const wrapper = mount(
/*
Disabled because of our rule restricting literal IDs, preferring
`withInstanceId`. In this case, it's fine to use literal IDs.
*/
/* eslint-disable no-restricted-syntax */
- currentIndex = index }>
- One
- Two
- Three
+ ( currentIndex = index ) }
+ >
+
+ One
+
+
+ Two
+
+
+ Three
+
/* eslint-enable no-restricted-syntax */
- ) );
+ );
simulateVisible( wrapper, '*' );
const container = wrapper.find( 'div' );
- wrapper.getDOMNode().querySelector( '#btn1' ).focus();
+ wrapper
+ .getDOMNode()
+ .querySelector( '#btn1' )
+ .focus();
// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
@@ -207,24 +255,27 @@ describe( 'NavigableMenu', () => {
it( 'both: should navigate by up/down and left/right', () => {
let currentIndex = 0;
- const wrapper = mount( (
+ const wrapper = mount(
/*
Disabled because of our rule restricting literal IDs, preferring
`withInstanceId`. In this case, it's fine to use literal IDs.
*/
/* eslint-disable no-restricted-syntax */
- currentIndex = index }>
+ ( currentIndex = index ) }>
One
Two
Three
/* eslint-enable no-restricted-syntax */
- ) );
+ );
simulateVisible( wrapper, '*' );
const container = wrapper.find( 'div' );
- wrapper.getDOMNode().querySelector( '#btn1' ).focus();
+ wrapper
+ .getDOMNode()
+ .querySelector( '#btn1' )
+ .focus();
// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
diff --git a/packages/components/src/navigable-container/test/tabbable.js b/packages/components/src/navigable-container/test/tabbable.js
index 65bfbb387c2f3b..5bf715d58290e7 100644
--- a/packages/components/src/navigable-container/test/tabbable.js
+++ b/packages/components/src/navigable-container/test/tabbable.js
@@ -41,27 +41,38 @@ function fireKeyDown( container, keyCode, shiftKey ) {
describe( 'TabbableContainer', () => {
it( 'should navigate by keypresses', () => {
let currentIndex = 0;
- const wrapper = mount( (
+ const wrapper = mount(
/*
Disabled because of our rule restricting literal IDs, preferring
`withInstanceId`. In this case, it's fine to use literal IDs.
*/
/* eslint-disable no-restricted-syntax */
- currentIndex = index }>
- Section One
- Section Two
+ ( currentIndex = index ) }>
+
+ Section One
+
+
+ Section Two
+
- Section to not skip
+
+ Section to not skip
+
+
+ Section Three
- Section Three
/* eslint-enable no-restricted-syntax */
- ) );
+ );
simulateVisible( wrapper, '*' );
const container = wrapper.find( 'div.wrapper' );
- wrapper.getDOMNode().querySelector( '#section1' ).focus();
+ wrapper
+ .getDOMNode()
+ .querySelector( '#section1' )
+ .focus();
// Navigate options
function assertKeyDown( keyCode, shiftKey, expectedActiveIndex, expectedStop ) {
@@ -83,24 +94,37 @@ describe( 'TabbableContainer', () => {
it( 'should navigate by keypresses and stop at edges', () => {
let currentIndex = 0;
- const wrapper = mount( (
+ const wrapper = mount(
/*
Disabled because of our rule restricting literal IDs, preferring
`withInstanceId`. In this case, it's fine to use literal IDs.
*/
/* eslint-disable no-restricted-syntax */
- currentIndex = index }>
- Section One
- Section Two
- Section Three
+ ( currentIndex = index ) }
+ >
+
+ Section One
+
+
+ Section Two
+
+
+ Section Three
+
/* eslint-enable no-restricted-syntax */
- ) );
+ );
simulateVisible( wrapper, '*' );
const container = wrapper.find( 'div.wrapper' );
- wrapper.getDOMNode().querySelector( '#section1' ).focus();
+ wrapper
+ .getDOMNode()
+ .querySelector( '#section1' )
+ .focus();
// Navigate options
function assertKeyDown( keyCode, shiftKey, expectedActiveIndex, expectedStop ) {
diff --git a/packages/components/src/notice/index.js b/packages/components/src/notice/index.js
index 4f55ead17a1a34..2ad48170289497 100644
--- a/packages/components/src/notice/index.js
+++ b/packages/components/src/notice/index.js
@@ -38,13 +38,7 @@ function Notice( {
{ children }
{ actions.map(
(
- {
- className: buttonCustomClasses,
- label,
- noDefaultClasses = false,
- onClick,
- url,
- },
+ { className: buttonCustomClasses, label, noDefaultClasses = false, onClick, url },
index
) => {
return (
@@ -54,16 +48,12 @@ function Notice( {
isDefault={ ! noDefaultClasses && ! url }
isLink={ ! noDefaultClasses && !! url }
onClick={ url ? undefined : onClick }
- className={ classnames(
- 'components-notice__action',
- buttonCustomClasses
- ) }
+ className={ classnames( 'components-notice__action', buttonCustomClasses ) }
>
{ label }
);
}
-
) }
{ isDismissible && (
diff --git a/packages/components/src/notice/test/index.js b/packages/components/src/notice/test/index.js
index a4b46887a1ecd1..f5f2b1e25b23b6 100644
--- a/packages/components/src/notice/test/index.js
+++ b/packages/components/src/notice/test/index.js
@@ -18,12 +18,7 @@ describe( 'Notice', () => {
const renderer = new ShallowRenderer();
renderer.render(
-
+
Example
);
diff --git a/packages/components/src/panel/actions.native.js b/packages/components/src/panel/actions.native.js
index 02031bf53cb857..282384130787f8 100644
--- a/packages/components/src/panel/actions.native.js
+++ b/packages/components/src/panel/actions.native.js
@@ -6,9 +6,7 @@ import { View } from 'react-native';
/**
* WordPress dependencies
*/
-import {
- TextControl,
-} from '@wordpress/components';
+import { TextControl } from '@wordpress/components';
/**
* Internal dependencies
diff --git a/packages/components/src/panel/body.js b/packages/components/src/panel/body.js
index b7b60e976e44e8..c304a77c9c18c3 100644
--- a/packages/components/src/panel/body.js
+++ b/packages/components/src/panel/body.js
@@ -56,16 +56,37 @@ export class PanelBody extends Component {
repaints the whole element, so this wrapping span hides that.
*/ }
- { isOpened ?
-
- :
-
-
+
+
+
+
- }
+ ) : (
+
+
+
+
+
+
+ ) }
{ title }
{ icon &&
- { children }
-
- );
+ return { children } ;
}
export default PanelRow;
diff --git a/packages/components/src/panel/test/body.js b/packages/components/src/panel/test/body.js
index 78d4774afccd8d..5aaaa9c22e2e96 100644
--- a/packages/components/src/panel/test/body.js
+++ b/packages/components/src/panel/test/body.js
@@ -23,7 +23,12 @@ describe( 'PanelBody', () => {
expect( panelBody.state( 'opened' ) ).toBe( true );
expect( button.prop( 'onClick' ) ).toBe( panelBody.instance().toggle );
expect( button.childAt( 0 ).name() ).toBe( 'span' );
- expect( button.childAt( 0 ).childAt( 0 ).name() ).toBe( 'SVG' );
+ expect(
+ button
+ .childAt( 0 )
+ .childAt( 0 )
+ .name()
+ ).toBe( 'SVG' );
expect( button.childAt( 1 ).text() ).toBe( 'Some Text' );
} );
@@ -34,7 +39,9 @@ describe( 'PanelBody', () => {
} );
it( 'should use the "opened" prop instead of state if provided', () => {
- const panelBody = shallow( children
+ children
+
+ );
expect( wrapper.find( 'p' ).text() ).toBe( 'children' );
} );
} );
diff --git a/packages/components/src/placeholder/index.js b/packages/components/src/placeholder/index.js
index 3a7c40c993001f..eef83516261270 100644
--- a/packages/components/src/placeholder/index.js
+++ b/packages/components/src/placeholder/index.js
@@ -15,25 +15,33 @@ import Dashicon from '../dashicon';
* @param {Object} props The component props.
* @return {Object} The rendered placeholder.
*/
-function Placeholder( { icon, children, label, instructions, className, notices, preview, isColumnLayout, ...additionalProps } ) {
+function Placeholder( {
+ icon,
+ children,
+ label,
+ instructions,
+ className,
+ notices,
+ preview,
+ isColumnLayout,
+ ...additionalProps
+} ) {
const classes = classnames( 'components-placeholder', className );
- const fieldsetClasses = classnames( 'components-placeholder__fieldset', { 'is-column-layout': isColumnLayout } );
+ const fieldsetClasses = classnames( 'components-placeholder__fieldset', {
+ 'is-column-layout': isColumnLayout,
+ } );
return (
{ notices }
- { preview &&
-
- { preview }
-
- }
+ { preview && { preview } }
{ isString( icon ) ?
- { !! instructions && { instructions } }
-
- { children }
-
+ { !! instructions && (
+ { instructions }
+ ) }
+ { children }
{ popoverPosition.isMobile && (
-
- { headerTitle }
-
- { headerTitle }
+
) }
diff --git a/packages/components/src/popover/test/index.js b/packages/components/src/popover/test/index.js
index 1ae2b3e932fc59..433ceb2711fe56 100644
--- a/packages/components/src/popover/test/index.js
+++ b/packages/components/src/popover/test/index.js
@@ -75,7 +75,9 @@ describe( 'Popover', () => {
it( 'should pass additional props to portaled element', () => {
let wrapper;
TestUtils.act( () => {
- wrapper = TestUtils.renderIntoDocument( Hello );
+ wrapper = TestUtils.renderIntoDocument(
+ Hello
+ );
} );
const content = TestUtils.findRenderedDOMComponentWithTag( wrapper, 'span' );
diff --git a/packages/components/src/popover/test/utils.js b/packages/components/src/popover/test/utils.js
index 3c491fa98d9a54..d2e8a7586a192f 100644
--- a/packages/components/src/popover/test/utils.js
+++ b/packages/components/src/popover/test/utils.js
@@ -210,7 +210,9 @@ describe( 'computePopoverPosition', () => {
};
window.innerWidth = 200;
- expect( computePopoverPosition( anchorRect, contentSize, 'bottom right', true ).isMobile ).toBe( true );
+ expect( computePopoverPosition( anchorRect, contentSize, 'bottom right', true ).isMobile ).toBe(
+ true
+ );
window.innerWidth = originalWidth;
} );
} );
diff --git a/packages/components/src/popover/utils.js b/packages/components/src/popover/utils.js
index 1b71fab09aa574..9d48b53bb8595a 100644
--- a/packages/components/src/popover/utils.js
+++ b/packages/components/src/popover/utils.js
@@ -1,4 +1,3 @@
-
/**
* Module constants
*/
@@ -26,13 +25,14 @@ export function computePopoverXAxisPosition( anchorRect, contentSize, xAxis, cho
}
// x axis alignment choices
- const anchorMidPoint = Math.round( anchorRect.left + ( anchorRect.width / 2 ) );
+ const anchorMidPoint = Math.round( anchorRect.left + anchorRect.width / 2 );
const centerAlignment = {
popoverLeft: anchorMidPoint,
- contentWidth: (
- ( anchorMidPoint - ( width / 2 ) > 0 ? ( width / 2 ) : anchorMidPoint ) +
- ( anchorMidPoint + ( width / 2 ) > window.innerWidth ? window.innerWidth - anchorMidPoint : ( width / 2 ) )
- ),
+ contentWidth:
+ ( anchorMidPoint - width / 2 > 0 ? width / 2 : anchorMidPoint ) +
+ ( anchorMidPoint + width / 2 > window.innerWidth
+ ? window.innerWidth - anchorMidPoint
+ : width / 2 ),
};
const leftAlignmentX = chosenYAxis === 'middle' ? anchorRect.left : anchorMidPoint;
const leftAlignment = {
@@ -42,7 +42,8 @@ export function computePopoverXAxisPosition( anchorRect, contentSize, xAxis, cho
const rightAlignmentX = chosenYAxis === 'middle' ? anchorRect.right : anchorMidPoint;
const rightAlignment = {
popoverLeft: rightAlignmentX,
- contentWidth: rightAlignmentX + width > window.innerWidth ? window.innerWidth - rightAlignmentX : width,
+ contentWidth:
+ rightAlignmentX + width > window.innerWidth ? window.innerWidth - rightAlignmentX : width,
};
// Choosing the x axis
@@ -56,7 +57,8 @@ export function computePopoverXAxisPosition( anchorRect, contentSize, xAxis, cho
chosenXAxis = 'right';
} else {
chosenXAxis = leftAlignment.contentWidth > rightAlignment.contentWidth ? 'left' : 'right';
- const chosenWidth = chosenXAxis === 'left' ? leftAlignment.contentWidth : rightAlignment.contentWidth;
+ const chosenWidth =
+ chosenXAxis === 'left' ? leftAlignment.contentWidth : rightAlignment.contentWidth;
contentWidth = chosenWidth !== width ? chosenWidth : null;
}
@@ -89,21 +91,26 @@ export function computePopoverYAxisPosition( anchorRect, contentSize, yAxis ) {
const { height } = contentSize;
// y axis alignment choices
- const anchorMidPoint = anchorRect.top + ( anchorRect.height / 2 );
+ const anchorMidPoint = anchorRect.top + anchorRect.height / 2;
const middleAlignment = {
popoverTop: anchorMidPoint,
- contentHeight: (
- ( anchorMidPoint - ( height / 2 ) > 0 ? ( height / 2 ) : anchorMidPoint ) +
- ( anchorMidPoint + ( height / 2 ) > window.innerHeight ? window.innerHeight - anchorMidPoint : ( height / 2 ) )
- ),
+ contentHeight:
+ ( anchorMidPoint - height / 2 > 0 ? height / 2 : anchorMidPoint ) +
+ ( anchorMidPoint + height / 2 > window.innerHeight
+ ? window.innerHeight - anchorMidPoint
+ : height / 2 ),
};
const topAlignment = {
popoverTop: anchorRect.top,
- contentHeight: anchorRect.top - HEIGHT_OFFSET - height > 0 ? height : anchorRect.top - HEIGHT_OFFSET,
+ contentHeight:
+ anchorRect.top - HEIGHT_OFFSET - height > 0 ? height : anchorRect.top - HEIGHT_OFFSET,
};
const bottomAlignment = {
popoverTop: anchorRect.bottom,
- contentHeight: anchorRect.bottom + HEIGHT_OFFSET + height > window.innerHeight ? window.innerHeight - HEIGHT_OFFSET - anchorRect.bottom : height,
+ contentHeight:
+ anchorRect.bottom + HEIGHT_OFFSET + height > window.innerHeight
+ ? window.innerHeight - HEIGHT_OFFSET - anchorRect.bottom
+ : height,
};
// Choosing the y axis
@@ -117,7 +124,8 @@ export function computePopoverYAxisPosition( anchorRect, contentSize, yAxis ) {
chosenYAxis = 'bottom';
} else {
chosenYAxis = topAlignment.contentHeight > bottomAlignment.contentHeight ? 'top' : 'bottom';
- const chosenHeight = chosenYAxis === 'top' ? topAlignment.contentHeight : bottomAlignment.contentHeight;
+ const chosenHeight =
+ chosenYAxis === 'top' ? topAlignment.contentHeight : bottomAlignment.contentHeight;
contentHeight = chosenHeight !== height ? chosenHeight : null;
}
@@ -148,11 +156,21 @@ export function computePopoverYAxisPosition( anchorRect, contentSize, yAxis ) {
*
* @return {Object} Popover position and constraints.
*/
-export function computePopoverPosition( anchorRect, contentSize, position = 'top', expandOnMobile = false ) {
+export function computePopoverPosition(
+ anchorRect,
+ contentSize,
+ position = 'top',
+ expandOnMobile = false
+) {
const [ yAxis, xAxis = 'center' ] = position.split( ' ' );
const yAxisPosition = computePopoverYAxisPosition( anchorRect, contentSize, yAxis );
- const xAxisPosition = computePopoverXAxisPosition( anchorRect, contentSize, xAxis, yAxisPosition.yAxis );
+ const xAxisPosition = computePopoverXAxisPosition(
+ anchorRect,
+ contentSize,
+ xAxis,
+ yAxisPosition.yAxis
+ );
return {
isMobile: isMobileViewport() && expandOnMobile,
diff --git a/packages/components/src/primitives/block-quotation/index.native.js b/packages/components/src/primitives/block-quotation/index.native.js
index abbafa09cae949..7784920068d9a5 100644
--- a/packages/components/src/primitives/block-quotation/index.native.js
+++ b/packages/components/src/primitives/block-quotation/index.native.js
@@ -21,9 +21,5 @@ export const BlockQuotation = ( props ) => {
}
return child;
} );
- return (
-
- { newChildren }
-
- );
+ return { newChildren } ;
};
diff --git a/packages/components/src/primitives/horizontal-rule/index.native.js b/packages/components/src/primitives/horizontal-rule/index.native.js
index 7c5382762c4c5b..315fc3d94f38d7 100644
--- a/packages/components/src/primitives/horizontal-rule/index.native.js
+++ b/packages/components/src/primitives/horizontal-rule/index.native.js
@@ -10,7 +10,5 @@ export const HorizontalRule = ( props ) => {
...props.lineStyle,
};
- return (
-
- );
+ return ;
};
diff --git a/packages/components/src/primitives/svg/index.native.js b/packages/components/src/primitives/svg/index.native.js
index 8cf9a2d7cee274..7d54594616137a 100644
--- a/packages/components/src/primitives/svg/index.native.js
+++ b/packages/components/src/primitives/svg/index.native.js
@@ -8,18 +8,17 @@ import { Svg } from 'react-native-svg';
*/
import styles from './style.scss';
-export {
- Circle,
- G,
- Path,
- Polygon,
- Rect,
-} from 'react-native-svg';
+export { Circle, G, Path, Polygon, Rect } from 'react-native-svg';
export const SVG = ( props ) => {
const colorScheme = props.colorScheme || 'light';
- const stylesFromClasses = ( props.className || '' ).split( ' ' ).map( ( element ) => styles[ element ] ).filter( Boolean );
- const defaultStyle = props.__unstableActive ? styles[ 'is-active' ] : styles[ 'components-toolbar__control-' + colorScheme ];
+ const stylesFromClasses = ( props.className || '' )
+ .split( ' ' )
+ .map( ( element ) => styles[ element ] )
+ .filter( Boolean );
+ const defaultStyle = props.__unstableActive
+ ? styles[ 'is-active' ]
+ : styles[ 'components-toolbar__control-' + colorScheme ];
const styleValues = Object.assign( {}, props.style, defaultStyle, ...stylesFromClasses );
const safeProps = { ...props, style: styleValues };
@@ -34,4 +33,3 @@ export const SVG = ( props ) => {
/>
);
};
-
diff --git a/packages/components/src/query-controls/category-select.js b/packages/components/src/query-controls/category-select.js
index 0ee0575addaf58..b6e11839de990a 100644
--- a/packages/components/src/query-controls/category-select.js
+++ b/packages/components/src/query-controls/category-select.js
@@ -4,7 +4,13 @@
import { buildTermsTree } from './terms';
import TreeSelect from '../tree-select';
-export default function CategorySelect( { label, noOptionLabel, categoriesList, selectedCategoryId, onChange } ) {
+export default function CategorySelect( {
+ label,
+ noOptionLabel,
+ categoriesList,
+ selectedCategoryId,
+ onChange,
+} ) {
const termsTree = buildTermsTree( categoriesList );
return (
),
+ />
+ ),
onNumberOfItemsChange && (
{
it( 'Should return same array as input with null parent and empty children added if parent is never specified.', () => {
- const input = Object.freeze( [
- { id: 2232, dummy: true },
- { id: 2245, dummy: true },
- ] );
+ const input = Object.freeze( [ { id: 2232, dummy: true }, { id: 2245, dummy: true } ] );
const output = Object.freeze( [
{ id: 2232, parent: null, children: [], dummy: true },
{ id: 2245, parent: null, children: [], dummy: true },
@@ -29,14 +26,9 @@ describe( 'buildTermsTree()', () => {
expect( termsTreem ).toEqual( output );
} );
it( 'Should return element with its child if a child exists', () => {
- const input = Object.freeze( [
- { id: 2232, parent: 0 },
- { id: 2245, parent: 2232 },
- ] );
+ const input = Object.freeze( [ { id: 2232, parent: 0 }, { id: 2245, parent: 2232 } ] );
const output = [
- { id: 2232, parent: 0, children: [
- { id: 2245, parent: 2232, children: [] },
- ] },
+ { id: 2232, parent: 0, children: [ { id: 2245, parent: 2232, children: [] } ] },
];
const termsTreem = buildTermsTree( input );
expect( termsTreem ).toEqual( output );
@@ -49,10 +41,14 @@ describe( 'buildTermsTree()', () => {
{ id: 2246, parent: 2232 },
] );
const output = [
- { id: 2232, parent: 0, children: [
- { id: 2245, parent: 2232, children: [] },
- { id: 2246, parent: 2232, children: [] },
- ] },
+ {
+ id: 2232,
+ parent: 0,
+ children: [
+ { id: 2245, parent: 2232, children: [] },
+ { id: 2246, parent: 2232, children: [] },
+ ],
+ },
{ id: 2249, parent: 0, children: [] },
];
const termsTreem = buildTermsTree( input );
diff --git a/packages/components/src/radio-control/index.js b/packages/components/src/radio-control/index.js
index 2aec3eaca43d48..da007d32d5a907 100644
--- a/packages/components/src/radio-control/index.js
+++ b/packages/components/src/radio-control/index.js
@@ -18,29 +18,31 @@ function RadioControl( { label, className, selected, help, instanceId, onChange,
const id = `inspector-radio-control-${ instanceId }`;
const onChangeValue = ( event ) => onChange( event.target.value );
- return ! isEmpty( options ) && (
-
- { options.map( ( option, index ) =>
-
-
- { option.label }
-
-
- ) }
-
+ return (
+ ! isEmpty( options ) && (
+
+ { options.map( ( option, index ) => (
+
+ { option.label }
+
+ ) ) }
+
+ )
);
}
diff --git a/packages/components/src/range-control/index.js b/packages/components/src/range-control/index.js
index 3b33f2b499c34b..607e0d18b04d41 100644
--- a/packages/components/src/range-control/index.js
+++ b/packages/components/src/range-control/index.js
@@ -59,14 +59,11 @@ function RangeControl( {
// The input is valid, reset the local state property used to temporaly save the value,
// and call onChange with the new value as a number.
resetCurrentInput();
- onChange( ( newValue === '' ) ?
- undefined :
- parseFloat( newValue )
- );
+ onChange( newValue === '' ? undefined : parseFloat( newValue ) );
};
- const initialSliderValue = isFinite( currentInputValue ) ?
- currentInputValue :
- initialPosition || '';
+ const initialSliderValue = isFinite( currentInputValue )
+ ? currentInputValue
+ : initialPosition || '';
return (
{ this.props.title }
- { ( this.props.styles && this.props.styles.map(
- ( rules, i ) =>
- ) ) }
+ { this.props.styles &&
+ this.props.styles.map( ( rules, i ) => (
+
+ ) ) }
-
+
-
- { ( this.props.scripts && this.props.scripts.map(
- ( src ) =>
- ) ) }
+
+ { this.props.scripts &&
+ this.props.scripts.map( ( src ) => ) }
);
@@ -209,7 +215,8 @@ class Sandbox extends Component {
onLoad={ this.trySandbox }
onFocus={ onFocus }
width={ Math.ceil( this.state.width ) }
- height={ Math.ceil( this.state.height ) } />
+ height={ Math.ceil( this.state.height ) }
+ />
);
}
}
diff --git a/packages/components/src/scroll-lock/stories/index.js b/packages/components/src/scroll-lock/stories/index.js
index 865fb6a7e909b9..d9aed1e39d14f3 100644
--- a/packages/components/src/scroll-lock/stories/index.js
+++ b/packages/components/src/scroll-lock/stories/index.js
@@ -36,8 +36,7 @@ function StripedBackground( props ) {
-
- { options.map( ( option, index ) =>
-
- { option.label }
-
- ) }
-
-
+
+ { options.map( ( option, index ) => (
+
+ { option.label }
+
+ ) ) }
+
+
+ )
);
/* eslint-enable jsx-a11y/no-onchange */
}
diff --git a/packages/components/src/shortcut/test/index.js b/packages/components/src/shortcut/test/index.js
index 7e75665cd653d9..d6b5baa27dfd41 100644
--- a/packages/components/src/shortcut/test/index.js
+++ b/packages/components/src/shortcut/test/index.js
@@ -16,11 +16,7 @@ describe( 'Shortcut', () => {
} );
it( 'renders the shortcut display text when a string is passed as the shortcut', () => {
- const wrapper = shallow(
-
- );
+ const wrapper = shallow( );
expect( wrapper.text() ).toBe( 'shortcut text' );
} );
diff --git a/packages/components/src/slot-fill/context.js b/packages/components/src/slot-fill/context.js
index 587c1ccab5ccb8..6106fbc2d5dadb 100644
--- a/packages/components/src/slot-fill/context.js
+++ b/packages/components/src/slot-fill/context.js
@@ -64,10 +64,7 @@ class SlotFillProvider extends Component {
}
registerFill( name, instance ) {
- this.fills[ name ] = [
- ...( this.fills[ name ] || [] ),
- instance,
- ];
+ this.fills[ name ] = [ ...( this.fills[ name ] || [] ), instance ];
this.forceUpdateSlot( name );
}
@@ -84,10 +81,7 @@ class SlotFillProvider extends Component {
}
unregisterFill( name, instance ) {
- this.fills[ name ] = without(
- this.fills[ name ],
- instance
- );
+ this.fills[ name ] = without( this.fills[ name ], instance );
this.resetFillOccurrence( name );
this.forceUpdateSlot( name );
}
@@ -132,11 +126,7 @@ class SlotFillProvider extends Component {
}
render() {
- return (
-
- { this.props.children }
-
- );
+ return { this.props.children } ;
}
}
diff --git a/packages/components/src/slot-fill/fill.js b/packages/components/src/slot-fill/fill.js
index 3600e177e5434f..9c4d23b1385459 100644
--- a/packages/components/src/slot-fill/fill.js
+++ b/packages/components/src/slot-fill/fill.js
@@ -64,11 +64,7 @@ function FillComponent( { name, children, registerFill, unregisterFill } ) {
const Fill = ( props ) => (
{ ( { registerFill, unregisterFill } ) => (
-
);
diff --git a/packages/components/src/slot-fill/slot.js b/packages/components/src/slot-fill/slot.js
index 4578656b5efaa9..9e4beb50cc1cbc 100644
--- a/packages/components/src/slot-fill/slot.js
+++ b/packages/components/src/slot-fill/slot.js
@@ -1,22 +1,12 @@
/**
* External dependencies
*/
-import {
- isFunction,
- isString,
- map,
- negate,
-} from 'lodash';
+import { isFunction, isString, map, negate } from 'lodash';
/**
* WordPress dependencies
*/
-import {
- Children,
- Component,
- cloneElement,
- isEmptyElement,
-} from '@wordpress/element';
+import { Children, Component, cloneElement, isEmptyElement } from '@wordpress/element';
/**
* Internal dependencies
@@ -56,7 +46,14 @@ class SlotComponent extends Component {
}
render() {
- const { children, name, bubblesVirtually = false, fillProps = {}, getFills, className } = this.props;
+ const {
+ children,
+ name,
+ bubblesVirtually = false,
+ fillProps = {},
+ getFills,
+ className,
+ } = this.props;
if ( bubblesVirtually ) {
return
;
@@ -81,11 +78,7 @@ class SlotComponent extends Component {
negate( isEmptyElement )
);
- return (
- <>
- { isFunction( children ) ? children( fills ) : fills }
-
- );
+ return <>{ isFunction( children ) ? children( fills ) : fills };
}
}
diff --git a/packages/components/src/slot-fill/test/slot.js b/packages/components/src/slot-fill/test/slot.js
index c4a61e8e2a9a55..6974d461b32983 100644
--- a/packages/components/src/slot-fill/test/slot.js
+++ b/packages/components/src/slot-fill/test/slot.js
@@ -26,8 +26,14 @@ class Filler extends Component {
}
render() {
return [
- this.setState( { num: this.state.num + 1 } ) } />,
- { this.props.text || this.state.num.toString() } ,
+ this.setState( { num: this.state.num + 1 } ) }
+ />,
+
+ { this.props.text || this.state.num.toString() }
+ ,
];
}
}
@@ -52,9 +58,7 @@ describe( 'Slot', () => {
-
- content
-
+ content
).toJSON();
@@ -82,9 +86,7 @@ describe( 'Slot', () => {
-
- { [
, 'text' ] }
-
+ { [
, 'text' ] }
).toJSON();
@@ -99,9 +101,7 @@ describe( 'Slot', () => {
{ ( props ) => {
- return (
- Click me
- );
+ return Click me ;
} }
@@ -117,11 +117,7 @@ describe( 'Slot', () => {
- { ( fills ) => ( ! isEmpty( fills ) && (
-
- { fills }
-
- ) ) }
+ { ( fills ) => ! isEmpty( fills ) && { fills } }
-
- { ( fills ) => ( fills && (
-
- { fills }
-
- ) ) }
-
+ { ( fills ) => fills && { fills } }
- content
-
+ content
).toJSON();
@@ -210,48 +198,45 @@ describe( 'Slot', () => {
expect( testRenderer.toJSON() ).toMatchSnapshot();
} );
- describe.each( [ false, true ] )(
- 'bubblesVirtually %p',
- ( bubblesVirtually ) => {
- it( 'should subsume another slot by the same name', () => {
- const testRenderer = ReactTestRenderer.create(
-
-
-
-
- Content
-
- );
-
- testRenderer.update(
-
-
-
-
-
- Content
-
- );
-
- expect( testRenderer.toJSON() ).toMatchSnapshot();
-
- testRenderer.update(
-
-
-
-
- Content
-
- );
-
- expect( testRenderer.toJSON() ).toMatchSnapshot();
-
- expect( testRenderer.getInstance().slots ).toHaveProperty( 'egg' );
- } );
- }
- );
+ describe.each( [ false, true ] )( 'bubblesVirtually %p', ( bubblesVirtually ) => {
+ it( 'should subsume another slot by the same name', () => {
+ const testRenderer = ReactTestRenderer.create(
+
+
+
+
+ Content
+
+ );
+
+ testRenderer.update(
+
+
+
+
+
+ Content
+
+ );
+
+ expect( testRenderer.toJSON() ).toMatchSnapshot();
+
+ testRenderer.update(
+
+
+
+
+ Content
+
+ );
+
+ expect( testRenderer.toJSON() ).toMatchSnapshot();
+
+ expect( testRenderer.getInstance().slots ).toHaveProperty( 'egg' );
+ } );
+ } );
} );
diff --git a/packages/components/src/snackbar/index.js b/packages/components/src/snackbar/index.js
index e970a0fba5dc03..fca59cffec4e51 100644
--- a/packages/components/src/snackbar/index.js
+++ b/packages/components/src/snackbar/index.js
@@ -17,12 +17,7 @@ import { Button } from '../';
const NOTICE_TIMEOUT = 10000;
-function Snackbar( {
- className,
- children,
- actions = [],
- onRemove = noop,
-}, ref ) {
+function Snackbar( { className, children, actions = [], onRemove = noop }, ref ) {
useEffect( () => {
const timeoutHandle = setTimeout( () => {
onRemove();
@@ -35,7 +30,9 @@ function Snackbar( {
if ( actions && actions.length > 1 ) {
// we need to inform developers that snackbar only accepts 1 action
// eslint-disable-next-line no-console
- console.warn( 'Snackbar can only have 1 action, use Notice if your message require many messages' );
+ console.warn(
+ 'Snackbar can only have 1 action, use Notice if your message require many messages'
+ );
// return first element only while keeping it inside an array
actions = [ actions[ 0 ] ];
}
@@ -52,35 +49,24 @@ function Snackbar( {
>
{ children }
- { actions.map(
- (
- {
- label,
- onClick,
- url,
- },
- index
- ) => {
- return (
- {
- event.stopPropagation();
- if ( onClick ) {
- onClick( event );
- }
- } }
- className="components-snackbar__action"
-
- >
- { label }
-
- );
- }
-
- ) }
+ { actions.map( ( { label, onClick, url }, index ) => {
+ return (
+ {
+ event.stopPropagation();
+ if ( onClick ) {
+ onClick( event );
+ }
+ } }
+ className="components-snackbar__action"
+ >
+ { label }
+
+ );
+ } ) }
+
{ notice.content }
{ tabs.map( ( tab ) => (
-
{ selectedTab && (
- {
};
const getElementsByClass = ( wrapper, className ) => {
- return TestUtils
- .scryRenderedDOMComponentsWithClass( wrapper, className );
+ return TestUtils.scryRenderedDOMComponentsWithClass( wrapper, className );
};
const elementClick = ( element ) => {
@@ -61,13 +60,15 @@ describe( 'TabPanel', () => {
},
],
children: ( tab ) => {
- return { tab.name } ;
+ return (
+
+ { tab.name }
+
+ );
},
};
- const wrapper = TestUtils.renderIntoDocument(
- getTestComponent( TabPanel, props )
- );
+ const wrapper = TestUtils.renderIntoDocument( getTestComponent( TabPanel, props ) );
const alphaTab = getElementByClass( wrapper, 'alpha' );
const betaTab = getElementByClass( wrapper, 'beta' );
@@ -78,7 +79,8 @@ describe( 'TabPanel', () => {
const getGammaViews = () => getElementsByClass( wrapper, 'gamma-view' );
const getActiveTab = () => getElementByClass( wrapper, 'active-tab' );
- const getActiveView = () => getElementByClass( wrapper, 'components-tab-panel__tab-content' ).firstChild.textContent;
+ const getActiveView = () =>
+ getElementByClass( wrapper, 'components-tab-panel__tab-content' ).firstChild.textContent;
expect( getActiveTab().innerHTML ).toBe( 'Alpha' );
expect( getAlphaViews() ).toHaveLength( 1 );
@@ -138,12 +140,14 @@ describe( 'TabPanel', () => {
},
],
children: ( tab ) => {
- return { tab.name } ;
+ return (
+
+ { tab.name }
+
+ );
},
};
- const wrapper = TestUtils.renderIntoDocument(
- getTestComponent( TabPanel, props )
- );
+ const wrapper = TestUtils.renderIntoDocument( getTestComponent( TabPanel, props ) );
const getActiveTab = () => getElementByClass( wrapper, 'active-tab' );
expect( getActiveTab().innerHTML ).toBe( 'Beta' );
diff --git a/packages/components/src/text-control/index.js b/packages/components/src/text-control/index.js
index 61504cc7da5cfb..910359b13176c3 100644
--- a/packages/components/src/text-control/index.js
+++ b/packages/components/src/text-control/index.js
@@ -8,13 +8,30 @@ import { withInstanceId } from '@wordpress/compose';
*/
import BaseControl from '../base-control';
-function TextControl( { label, hideLabelFromVision, value, help, className, instanceId, onChange, type = 'text', ...props } ) {
+function TextControl( {
+ label,
+ hideLabelFromVision,
+ value,
+ help,
+ className,
+ instanceId,
+ onChange,
+ type = 'text',
+ ...props
+} ) {
const id = `inspector-text-control-${ instanceId }`;
const onChangeValue = ( event ) => onChange( event.target.value );
return (
-
-
+
| | | |