IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Components: checkbox: Fix displaying indeterminate color.

Browse Source
This commit is contained in:
TatianaLopaeva 2021-03-02 20:15:27 +03:00
parent bf7f680d08
commit ccc45a8d74
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/asc-web-components/checkbox/styled-checkbox.js
View File

@ -71,9 +71,11 @@ const StyledLabel = styled.label`
} }
rect:last-child { rect:last-child {
fill: ${(props) => fill: ${(props) =>
props.color === "#FFFF" props.color
? props.theme.checkbox.indeterminateColor ? props.color === "#FFFF"
: "white"}; ? props.theme.checkbox.indeterminateColor
: "white"
: props.theme.checkbox.indeterminateColor};
stroke: ${(props) => stroke: ${(props) =>
props.color === "#FFFF" props.color === "#FFFF"
? props.theme.checkbox.fillColor ? props.theme.checkbox.fillColor
@ -118,7 +120,7 @@ const StyledLabel = styled.label`
? css` ? css`
cursor: not-allowed; cursor: not-allowed;
` `
: !props.indeterminate : !props.isIndeterminate
? css` ? css`
cursor: pointer; cursor: pointer;
@ -139,11 +141,13 @@ const StyledLabel = styled.label`
} }
rect:last-child { rect:last-child {
fill: ${(props) => fill: ${(props) =>
props.indeterminate && props.color === "#FFFF" props.color
? props.theme.checkbox.hoverIndeterminateColor ? props.isIndeterminate && props.color === "#FFFF"
: props.indeterminate ? props.theme.checkbox.hoverIndeterminateColor
? "white" : props.isIndeterminate
: props.color}; ? "white"
: props.color
: props.theme.checkbox.hoverIndeterminateColor};
`} `}
} }

4
packages/asc-web-components/themes/base.js
View File

@ -357,7 +357,7 @@ const Base = {
disableIndeterminateColor: gray, disableIndeterminateColor: gray,
hoverBorderColor: gray, hoverBorderColor: gray,
hoverIndeterminateColor: gray, hoverIndeterminateColor: black,
}, },
// slider: { // slider: {
@ -1508,7 +1508,7 @@ const Base = {
cursor: "pointer", cursor: "pointer",
color: white, color: white,
}, },
comboBox: { comboBox: {
color: black, color: black,
minWidth: "80px", minWidth: "80px",