Merge branch 'style/newRow-green-bg' of https://github.com/mrSnow95/lamassu-server into bruno/green-background-on-new-rows
This commit is contained in:
commit
a54034fe08
4 changed files with 21 additions and 3 deletions
|
|
@ -202,7 +202,7 @@ const groupStriped = elements => {
|
|||
)
|
||||
}
|
||||
|
||||
const ERow = ({ editing, disabled, lastOfGroup }) => {
|
||||
const ERow = ({ editing, disabled, lastOfGroup, newRow }) => {
|
||||
const { touched, errors, values } = useFormikContext()
|
||||
const {
|
||||
elements,
|
||||
|
|
@ -249,6 +249,7 @@ const ERow = ({ editing, disabled, lastOfGroup }) => {
|
|||
className={classnames(classNames)}
|
||||
size={rowSize}
|
||||
error={editing && hasErrors}
|
||||
newRow={newRow && !hasErrors}
|
||||
errorMessage={errorMessage}>
|
||||
{innerElements.map((it, idx) => {
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -193,7 +193,11 @@ const ETable = ({
|
|||
onSubmit={innerSave}>
|
||||
<Form>
|
||||
<PromptWhenDirty />
|
||||
<ERow editing={true} disabled={forceDisable} />
|
||||
<ERow
|
||||
editing={true}
|
||||
disabled={forceDisable}
|
||||
newRow={true}
|
||||
/>
|
||||
</Form>
|
||||
</Formik>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -75,13 +75,22 @@ const ThDoubleLevel = ({ title, children, className, width }) => {
|
|||
)
|
||||
}
|
||||
|
||||
const Tr = ({ onClick, error, errorMessage, children, className, size }) => {
|
||||
const Tr = ({
|
||||
onClick,
|
||||
error,
|
||||
errorMessage,
|
||||
children,
|
||||
className,
|
||||
size,
|
||||
newRow
|
||||
}) => {
|
||||
const classes = useStyles({ size })
|
||||
const cardClasses = { root: classes.cardContentRoot }
|
||||
const classNames = {
|
||||
[classes.tr]: true,
|
||||
[classes.trError]: error,
|
||||
[classes.card]: true,
|
||||
[classes.trAdding]: newRow,
|
||||
className
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import {
|
|||
tableHeaderColor,
|
||||
tableHeaderHeight,
|
||||
tableErrorColor,
|
||||
tableSuccessColor,
|
||||
spacer,
|
||||
white,
|
||||
tableDoubleHeaderHeight,
|
||||
|
|
@ -71,6 +72,9 @@ export default {
|
|||
trError: {
|
||||
backgroundColor: tableErrorColor
|
||||
},
|
||||
trAdding: {
|
||||
backgroundColor: tableSuccessColor
|
||||
},
|
||||
mainContent: ({ size }) => {
|
||||
const sizes = {
|
||||
sm: 34,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue