Block Editor: Remove (more) legacy "editor-" class name compatibility (…

…#19489)
WordPress · Jan 9, 2020 · 0db5ebb · 0db5ebb
1 parent 5714888
commit 0db5ebb
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 21 deletions.
diff --git a/packages/block-editor/src/components/block-settings-menu/block-convert-button.js b/packages/block-editor/src/components/block-settings-menu/block-convert-button.js
@@ -12,7 +12,6 @@ export default function BlockConvertButton( { shouldRender, onClick, small } ) {
 	const label = __( 'Convert to Blocks' );
 	return (
 		<MenuItem
-			className="block-editor-block-settings-menu__control"
 			onClick={ onClick }
 			icon="screenoptions"
 		>

diff --git a/packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js b/packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js
@@ -23,7 +23,6 @@ export function BlockModeToggle( { blockType, mode, onToggleMode, small = false,
 
 	return (
 		<MenuItem
-			className="block-editor-block-settings-menu__control"
 			onClick={ onToggleMode }
 			icon="html"
 		>

diff --git a/packages/block-editor/src/components/block-settings-menu/index.js b/packages/block-editor/src/components/block-settings-menu/index.js
@@ -81,7 +81,6 @@ export function BlockSettingsMenu( { clientIds } ) {
 									) }
 									{ canDuplicate && (
 										<MenuItem
-											className="block-editor-block-settings-menu__control"
 											onClick={ flow( onClose, onDuplicate ) }
 											icon="admin-page"
 											shortcut={ shortcuts.duplicate }
@@ -92,15 +91,13 @@ export function BlockSettingsMenu( { clientIds } ) {
 									{ canInsertDefaultBlock && (
 										<>
 											<MenuItem
-												className="block-editor-block-settings-menu__control"
 												onClick={ flow( onClose, onInsertBefore ) }
 												icon="insert-before"
 												shortcut={ shortcuts.insertBefore }
 											>
 												{ __( 'Insert Before' ) }
 											</MenuItem>
 											<MenuItem
-												className="block-editor-block-settings-menu__control"
 												onClick={ flow( onClose, onInsertAfter ) }
 												icon="insert-after"
 												shortcut={ shortcuts.insertAfter }
@@ -122,7 +119,6 @@ export function BlockSettingsMenu( { clientIds } ) {
 								<MenuGroup>
 									{ ! isLocked && (
 										<MenuItem
-											className="block-editor-block-settings-menu__control"
 											onClick={ flow( onClose, onRemove ) }
 											icon="trash"
 											shortcut={ shortcuts.remove }

diff --git a/packages/block-editor/src/components/url-popover/image-url-input-ui.js b/packages/block-editor/src/components/url-popover/image-url-input-ui.js
@@ -276,7 +276,7 @@ const ImageURLInputUI = ( {
 				>
 					{ ( ! url || isEditingLink ) && (
 						<URLPopover.LinkEditor
-							className="editor-format-toolbar__link-container-content block-editor-format-toolbar__link-container-content"
+							className="block-editor-format-toolbar__link-container-content"
 							value={ linkEditorValue }
 							onChangeInputValue={ setUrlInput }
 							onKeyDown={ stopPropagationRelevantKeys }
@@ -288,7 +288,7 @@ const ImageURLInputUI = ( {
 					{ ( url && ! isEditingLink ) && (
 						<>
 							<URLPopover.LinkViewer
-								className="editor-format-toolbar__link-container-content block-editor-format-toolbar__link-container-content"
+								className="block-editor-format-toolbar__link-container-content"
 								onKeyPress={ stopPropagation }
 								url={ url }
 								onEditLinkClick={ startEditLink }

diff --git a/packages/block-library/src/social-link/edit.js b/packages/block-library/src/social-link/edit.js
@@ -63,7 +63,7 @@ const SocialLinkEdit = ( { attributes, setAttributes, isSelected } ) => {
 								event.preventDefault();
 								setPopover( false );
 							} } >
-							<div className="editor-url-input block-editor-url-input">
+							<div className="block-editor-url-input">
 								<URLInput
 									value={ url }
 									onChange={ ( nextURL ) => setAttributes( { url: nextURL } ) }

diff --git a/packages/edit-post/src/components/block-settings-menu/plugin-block-settings-menu-item.js b/packages/edit-post/src/components/block-settings-menu/plugin-block-settings-menu-item.js
@@ -90,7 +90,6 @@ const PluginBlockSettingsMenuItem = ( { allowedBlocks, icon, label, onClick, sma
 				return null;
 			}
 			return ( <MenuItem
-				className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 				onClick={ compose( onClick, onClose ) }
 				icon={ icon || 'admin-plugins' }
 				label={ small ? label : undefined }

diff --git a/packages/edit-post/src/components/visual-editor/block-inspector-button.js b/packages/edit-post/src/components/visual-editor/block-inspector-button.js
@@ -33,7 +33,6 @@ export function BlockInspectorButton( {
 
 	return (
 		<MenuItem
-			className="block-editor-block-settings-menu__control"
 			onClick={ () => {
 				if ( areAdvancedSettingsOpened ) {
 					closeGeneralSidebar();

diff --git a/packages/editor/src/components/convert-to-group-buttons/convert-button.js b/packages/editor/src/components/convert-to-group-buttons/convert-button.js
@@ -28,7 +28,6 @@ export function ConvertToGroupButton( {
 		<Fragment>
 			{ isGroupable && (
 				<MenuItem
-					className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 					icon={ Group }
 					onClick={ onConvertToGroup }
 				>
@@ -37,7 +36,6 @@ export function ConvertToGroupButton( {
 			) }
 			{ isUngroupable && (
 				<MenuItem
-					className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 					icon={ Ungroup }
 					onClick={ onConvertFromGroup }
 				>

diff --git a/packages/editor/src/components/reusable-blocks-buttons/reusable-block-convert-button.js b/packages/editor/src/components/reusable-blocks-buttons/reusable-block-convert-button.js
@@ -26,7 +26,6 @@ export function ReusableBlockConvertButton( {
 		<>
 			{ ! isReusable && (
 				<MenuItem
-					className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 					icon="controls-repeat"
 					onClick={ onConvertToReusable }
 				>
@@ -35,7 +34,6 @@ export function ReusableBlockConvertButton( {
 			) }
 			{ isReusable && (
 				<MenuItem
-					className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 					icon="controls-repeat"
 					onClick={ onConvertToStatic }
 				>

diff --git a/packages/editor/src/components/reusable-blocks-buttons/reusable-block-delete-button.js b/packages/editor/src/components/reusable-blocks-buttons/reusable-block-delete-button.js
@@ -19,7 +19,6 @@ export function ReusableBlockDeleteButton( { isVisible, isDisabled, onDelete } )
 
 	return (
 		<MenuItem
-			className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 			icon="no"
 			disabled={ isDisabled }
 			onClick={ () => onDelete() }

diff --git a/...omponents/reusable-blocks-buttons/test/__snapshots__/reusable-block-delete-button.js.snap b/...omponents/reusable-blocks-buttons/test/__snapshots__/reusable-block-delete-button.js.snap
@@ -2,7 +2,6 @@
 
 exports[`ReusableBlockDeleteButton matches the snapshot 1`] = `
 <MenuItem
-  className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
   disabled={false}
   icon="no"
   onClick={[Function]}

diff --git a/packages/format-library/src/image/index.js b/packages/format-library/src/image/index.js
@@ -124,7 +124,7 @@ export const image = {
 							{ // Disable reason: KeyPress must be suppressed so the block doesn't hide the toolbar
 							/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */ }
 							<form
-								className="editor-format-toolbar__image-container-content block-editor-format-toolbar__image-container-content"
+								className="block-editor-format-toolbar__image-container-content"
 								onKeyPress={ stopKeyPropagation }
 								onKeyDown={ this.onKeyDown }
 								onSubmit={ ( event ) => {
@@ -147,7 +147,7 @@ export const image = {
 								} }
 							>
 								<TextControl
-									className="editor-format-toolbar__image-container-value block-editor-format-toolbar__image-container-value"
+									className="block-editor-format-toolbar__image-container-value"
 									type="number"
 									label={ __( 'Width' ) }
 									value={ this.state.width }

diff --git a/packages/format-library/src/link/inline.js b/packages/format-library/src/link/inline.js
@@ -211,7 +211,7 @@ class InlineLinkUI extends Component {
 			>
 				{ showInput ? (
 					<URLPopover.LinkEditor
-						className="editor-format-toolbar__link-container-content block-editor-format-toolbar__link-container-content"
+						className="block-editor-format-toolbar__link-container-content"
 						value={ inputValue }
 						onChangeInputValue={ this.onChangeInputValue }
 						onKeyDown={ this.onKeyDown }
@@ -221,7 +221,7 @@ class InlineLinkUI extends Component {
 					/>
 				) : (
 					<URLPopover.LinkViewer
-						className="editor-format-toolbar__link-container-content block-editor-format-toolbar__link-container-content"
+						className="block-editor-format-toolbar__link-container-content"
 						onKeyPress={ stopKeyPropagation }
 						url={ url }
 						onEditLinkClick={ this.editLink }