commit
591f2eced3
3 changed files with 50 additions and 56 deletions
|
@ -33,6 +33,7 @@ All notable, unreleased changes to this project will be documented in this file.
|
|||
- Update order history information - #680 by @dominik-zeglen
|
||||
- Add metadata editor to creator views - #684 by @dominik-zeglen
|
||||
- Update product visibility card component - #679 by @AlicjaSzu
|
||||
- Update savebar design - #690 by @dominik-zeglen
|
||||
|
||||
## 2.10.1
|
||||
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
import Button from "@material-ui/core/Button";
|
||||
import Card from "@material-ui/core/Card";
|
||||
import CardContent from "@material-ui/core/CardContent";
|
||||
import Portal from "@material-ui/core/Portal";
|
||||
import { makeStyles } from "@material-ui/core/styles";
|
||||
import useWindowScroll from "@saleor/hooks/useWindowScroll";
|
||||
import { buttonMessages } from "@saleor/intl";
|
||||
import classNames from "classnames";
|
||||
import React from "react";
|
||||
import { useIntl } from "react-intl";
|
||||
|
||||
|
@ -22,7 +23,10 @@ const useStyles = makeStyles(
|
|||
cancelButton: {
|
||||
marginRight: theme.spacing(2)
|
||||
},
|
||||
container: {
|
||||
content: {
|
||||
"&:last-child": {
|
||||
paddingBottom: theme.spacing(2)
|
||||
},
|
||||
display: "flex",
|
||||
paddingBottom: theme.spacing(2),
|
||||
paddingTop: theme.spacing(2),
|
||||
|
@ -38,20 +42,10 @@ const useStyles = makeStyles(
|
|||
color: theme.palette.error.contrastText
|
||||
},
|
||||
root: {
|
||||
background: theme.palette.background.default,
|
||||
borderTop: "1px solid transparent",
|
||||
boxShadow: `0 -5px 5px 0 ${theme.palette.divider}`,
|
||||
height: 70,
|
||||
transition: `box-shadow ${theme.transitions.duration.shortest}ms`
|
||||
height: 120
|
||||
},
|
||||
spacer: {
|
||||
flex: "1"
|
||||
},
|
||||
stop: {
|
||||
"&$root": {
|
||||
borderTopColor: theme.palette.divider,
|
||||
boxShadow: `0 0 0 0 ${theme.palette.divider}`
|
||||
}
|
||||
}
|
||||
}),
|
||||
{ name: "SaveButtonBar" }
|
||||
|
@ -92,48 +86,47 @@ export const SaveButtonBar: React.FC<SaveButtonBarProps> = props => {
|
|||
{anchor =>
|
||||
anchor ? (
|
||||
<Portal container={anchor.current}>
|
||||
<div
|
||||
className={classNames(classes.root, {
|
||||
[classes.stop]: scrolledToBottom
|
||||
})}
|
||||
{...rest}
|
||||
>
|
||||
<Container className={classes.container}>
|
||||
{!!onDelete && (
|
||||
<Button
|
||||
variant="contained"
|
||||
onClick={onDelete}
|
||||
className={classes.deleteButton}
|
||||
data-test="button-bar-delete"
|
||||
>
|
||||
{labels && labels.delete
|
||||
? labels.delete
|
||||
: intl.formatMessage(buttonMessages.delete)}
|
||||
</Button>
|
||||
)}
|
||||
<div className={classes.spacer} />
|
||||
<Button
|
||||
className={classes.cancelButton}
|
||||
variant="text"
|
||||
onClick={onCancel}
|
||||
data-test="button-bar-cancel"
|
||||
>
|
||||
{maybe(
|
||||
() => labels.cancel,
|
||||
intl.formatMessage(buttonMessages.back)
|
||||
)}
|
||||
</Button>
|
||||
<ConfirmButton
|
||||
disabled={disabled}
|
||||
onClick={onSave}
|
||||
transitionState={state}
|
||||
data-test="button-bar-confirm"
|
||||
>
|
||||
{maybe(
|
||||
() => labels.save,
|
||||
intl.formatMessage(buttonMessages.save)
|
||||
)}
|
||||
</ConfirmButton>
|
||||
<div className={classes.root} {...rest}>
|
||||
<Container>
|
||||
<Card elevation={scrolledToBottom ? 0 : 16}>
|
||||
<CardContent className={classes.content}>
|
||||
{!!onDelete && (
|
||||
<Button
|
||||
variant="contained"
|
||||
onClick={onDelete}
|
||||
className={classes.deleteButton}
|
||||
data-test="button-bar-delete"
|
||||
>
|
||||
{labels && labels.delete
|
||||
? labels.delete
|
||||
: intl.formatMessage(buttonMessages.delete)}
|
||||
</Button>
|
||||
)}
|
||||
<div className={classes.spacer} />
|
||||
<Button
|
||||
className={classes.cancelButton}
|
||||
variant="text"
|
||||
onClick={onCancel}
|
||||
data-test="button-bar-cancel"
|
||||
>
|
||||
{maybe(
|
||||
() => labels.cancel,
|
||||
intl.formatMessage(buttonMessages.back)
|
||||
)}
|
||||
</Button>
|
||||
<ConfirmButton
|
||||
disabled={disabled}
|
||||
onClick={onSave}
|
||||
transitionState={state}
|
||||
data-test="button-bar-confirm"
|
||||
>
|
||||
{maybe(
|
||||
() => labels.save,
|
||||
intl.formatMessage(buttonMessages.save)
|
||||
)}
|
||||
</ConfirmButton>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</Container>
|
||||
</div>
|
||||
</Portal>
|
||||
|
|
|
@ -70,7 +70,7 @@ export const dark: IThemeColors = {
|
|||
export const light: IThemeColors = {
|
||||
autofill: "#f4f6c5",
|
||||
background: {
|
||||
default: "#F1F6F6",
|
||||
default: "#EFF5F8",
|
||||
paper: "#FFFFFF"
|
||||
},
|
||||
checkbox: {
|
||||
|
|
Loading…
Reference in a new issue