Replace IconButton component with Button (#3547)

* Replace IconButton component with Button * Fix All Products editor.scss file not included by Webpack
woocommerce · Dec 21, 2020 · a334951 · a334951
1 parent ca7ae3b
commit a334951
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/assets/js/blocks/featured-category/block.js b/assets/js/blocks/featured-category/block.js
@@ -16,7 +16,6 @@ import {
 import {
 	Button,
 	FocalPointPicker,
-	IconButton,
 	PanelBody,
 	Placeholder,
 	RangeControl,
@@ -105,7 +104,7 @@ const FeaturedCategory = ( {
 							allowedTypes={ [ 'image' ] }
 							value={ mediaId }
 							render={ ( { open } ) => (
-								<IconButton
+								<Button
 									className="components-toolbar__control"
 									label={ __( 'Edit media' ) }
 									icon="format-image"

diff --git a/assets/js/blocks/featured-product/block.js b/assets/js/blocks/featured-product/block.js
@@ -17,7 +17,6 @@ import { withSelect } from '@wordpress/data';
 import {
 	Button,
 	FocalPointPicker,
-	IconButton,
 	PanelBody,
 	Placeholder,
 	RangeControl,
@@ -158,7 +157,7 @@ const FeaturedProduct = ( {
 							allowedTypes={ [ 'image' ] }
 							value={ mediaId }
 							render={ ( { open } ) => (
-								<IconButton
+								<Button
 									className="components-toolbar__control"
 									label={ __( 'Edit media' ) }
 									icon="format-image"

diff --git a/assets/js/blocks/products/all-products/edit.js b/assets/js/blocks/products/all-products/edit.js
@@ -14,7 +14,6 @@ import {
 	withSpokenMessages,
 	Placeholder,
 	Button,
-	IconButton,
 	Toolbar,
 	Disabled,
 	Tip,
@@ -46,6 +45,7 @@ import {
 } from '../base-utils';
 import { getSharedContentControls, getSharedListControls } from '../edit';
 import Block from './block';
+import './editor.scss';
 
 /**
  * Component to handle edit mode of "All Products".
@@ -235,7 +235,7 @@ class Editor extends Component {
 						>
 							{ __( 'Cancel', 'woo-gutenberg-products-block' ) }
 						</Button>
-						<IconButton
+						<Button
 							className="wc-block-all-products__reset-button"
 							icon={ <Icon srcElement={ grid } /> }
 							label={ __(
@@ -248,7 +248,7 @@ class Editor extends Component {
 								'Reset Layout',
 								'woo-gutenberg-products-block'
 							) }
-						</IconButton>
+						</Button>
 					</div>
 				</div>
 			</Placeholder>

diff --git a/assets/js/blocks/products/editor.scss → .../blocks/products/all-products/editor.scss b/assets/js/blocks/products/editor.scss → .../blocks/products/all-products/editor.scss
diff --git a/assets/js/blocks/products/edit.js b/assets/js/blocks/products/edit.js
@@ -4,11 +4,6 @@
 import { __ } from '@wordpress/i18n';
 import { ToggleControl, SelectControl } from '@wordpress/components';
 
-/**
- * Internal dependencies
- */
-import './editor.scss';
-
 export const getSharedContentControls = ( attributes, setAttributes ) => {
 	const { contentVisibility } = attributes;
 	return (