djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #759 from mirumee/fix/variant-table-header-1319

Browse source 
Fix delete icon placement
This commit is contained in:
Marcin Gębala 2020-10-13 17:13:24 +02:00 committed by GitHub
commit 5cc005da96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/products/components/ProductVariants/ProductVariants.tsx
View file

@ -70,7 +70,7 @@ const useStyles = makeStyles(
theme => ({ theme => ({
[theme.breakpoints.up("lg")]: { [theme.breakpoints.up("lg")]: {
colActions: { colActions: {
width: 30 width: 70
}, },
colInventory: { colInventory: {
width: 200 width: 200
@ -89,7 +89,9 @@ const useStyles = makeStyles(
colInventory: { colInventory: {
textAlign: "right" textAlign: "right"
}, },
colName: {}, colName: {
paddingLeft: 0
},
colPrice: { colPrice: {
textAlign: "right" textAlign: "right"
}, },
@ -99,12 +101,6 @@ const useStyles = makeStyles(
color: fade(theme.palette.text.secondary, 0.6), color: fade(theme.palette.text.secondary, 0.6),
display: "block" display: "block"
}, },
denseTable: {
"& td, & th": {
paddingRight: theme.spacing(3)
},
width: "auto"
},
link: { link: {
cursor: "pointer" cursor: "pointer"
}, },
@ -195,7 +191,7 @@ interface ProductVariantsProps extends ListActions {
onVariantsAdd?(); onVariantsAdd?();
} }
const numberOfColumns = 6; const numberOfColumns = 7;
export const ProductVariants: React.FC<ProductVariantsProps> = props => { export const ProductVariants: React.FC<ProductVariantsProps> = props => {
const { const {
@ -280,7 +276,7 @@ export const ProductVariants: React.FC<ProductVariantsProps> = props => {
</CardContent> </CardContent>
)} )}
{hasVariants && ( {hasVariants && (
<ResponsiveTable className={classes.denseTable}> <ResponsiveTable>
<colgroup> <colgroup>
<col className={classes.colGrab} /> <col className={classes.colGrab} />
<col /> <col />
@ -288,6 +284,7 @@ export const ProductVariants: React.FC<ProductVariantsProps> = props => {
<col className={classes.colSku} /> <col className={classes.colSku} />
<col className={classes.colPrice} /> <col className={classes.colPrice} />
<col className={classes.colInventory} /> <col className={classes.colInventory} />
<col className={classes.colActions} />
</colgroup> </colgroup>
<TableHead <TableHead
colSpan={numberOfColumns} colSpan={numberOfColumns}

20
src/storybook/__snapshots__/Stories.test.ts.snap
View file

@ -146430,7 +146430,7 @@ Ctrl + K"
class="ResponsiveTable-root-id" class="ResponsiveTable-root-id"
> >
<table <table
class="MuiTable-root-id ProductVariants-denseTable-id" class="MuiTable-root-id"
> >
<colgroup> <colgroup>
<col <col
@ -146449,6 +146449,9 @@ Ctrl + K"
<col <col
class="ProductVariants-colInventory-id" class="ProductVariants-colInventory-id"
/> />
<col
class="ProductVariants-colActions-id"
/>
</colgroup> </colgroup>
<thead <thead
class="MuiTableHead-root-id" class="MuiTableHead-root-id"
@ -148721,7 +148724,7 @@ Ctrl + K"
class="ResponsiveTable-root-id" class="ResponsiveTable-root-id"
> >
<table <table
class="MuiTable-root-id ProductVariants-denseTable-id" class="MuiTable-root-id"
> >
<colgroup> <colgroup>
<col <col
@ -148740,6 +148743,9 @@ Ctrl + K"
<col <col
class="ProductVariants-colInventory-id" class="ProductVariants-colInventory-id"
/> />
<col
class="ProductVariants-colActions-id"
/>
</colgroup> </colgroup>
<thead <thead
class="MuiTableHead-root-id" class="MuiTableHead-root-id"
@ -158861,7 +158867,7 @@ Ctrl + K"
class="ResponsiveTable-root-id" class="ResponsiveTable-root-id"
> >
<table <table
class="MuiTable-root-id ProductVariants-denseTable-id" class="MuiTable-root-id"
> >
<colgroup> <colgroup>
<col <col
@ -158880,6 +158886,9 @@ Ctrl + K"
<col <col
class="ProductVariants-colInventory-id" class="ProductVariants-colInventory-id"
/> />
<col
class="ProductVariants-colActions-id"
/>
</colgroup> </colgroup>
<thead <thead
class="MuiTableHead-root-id" class="MuiTableHead-root-id"
@ -162780,7 +162789,7 @@ Ctrl + K"
class="ResponsiveTable-root-id" class="ResponsiveTable-root-id"
> >
<table <table
class="MuiTable-root-id ProductVariants-denseTable-id" class="MuiTable-root-id"
> >
<colgroup> <colgroup>
<col <col
@ -162799,6 +162808,9 @@ Ctrl + K"
<col <col
class="ProductVariants-colInventory-id" class="ProductVariants-colInventory-id"
/> />
<col
class="ProductVariants-colActions-id"
/>
</colgroup> </colgroup>
<thead <thead
class="MuiTableHead-root-id" class="MuiTableHead-root-id"