Skip to content

Commit 44625a7

Browse files
Merge pull request #930 from gympass/ds-1369
feat:(DS-1369) Update disabled color input
2 parents 7fa5e1d + 3fcc72e commit 44625a7

File tree

16 files changed

+26
-26
lines changed

16 files changed

+26
-26
lines changed

packages/yoga/src/Dropdown/web/__snapshots__/Dropdown.test.jsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ exports[`<Dropdown /> should match snapshot when disabled 1`] = `
410410
border-width: 1px;
411411
border-style: solid;
412412
border-color: #D7D7E0;
413-
border-color: #D7D7E0;
413+
border-color: #8F8F8F;
414414
}
415415
416416
.c2:hover:not(:disabled),
@@ -1027,7 +1027,7 @@ exports[`<Dropdown /> should match snapshot when has a selected value 1`] = `
10271027
border-style: solid;
10281028
border-color: #D7D7E0;
10291029
border-color: #231B22;
1030-
border-color: #D7D7E0;
1030+
border-color: #8F8F8F;
10311031
}
10321032
10331033
.c2:hover:not(:disabled),

packages/yoga/src/Input/native/Helper.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const Info = styled(Text.Caption)(
4040
font-family: ${baseFont.family};
4141
color: ${input.helper.color.default};
4242
43-
${disabled ? `color: ${colors.text.disabled};` : ''}
43+
${disabled ? `color: ${colors.steady};` : ''}
4444
${focused ? `color: ${input.helper.color.focus};` : ''}
4545
${error ? `color: ${colors.feedback.attention.dark};` : ''}
4646
`,

packages/yoga/src/Input/native/Input.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ const Field = styled.TextInput(
7676
${
7777
disabled
7878
? `
79-
border-color: ${colors.elements.lineAndBorders};
80-
color: ${colors.text.disabled};
79+
border-color: ${colors.steady};
80+
color: ${colors.steady};
8181
`
8282
: ''
8383
}
@@ -143,7 +143,7 @@ const Label = styled(Animated.Text)(
143143
}
144144
145145
${error ? `color: ${colors.feedback.attention[1]};` : ''}
146-
${disabled ? `color: ${colors.text.disabled};` : ''}
146+
${disabled ? `color: ${colors.steady};` : ''}
147147
`,
148148
);
149149

@@ -208,7 +208,7 @@ const Input = React.forwardRef(
208208

209209
const iconColor = () => {
210210
if (disabled) {
211-
return colors.elements.backgroundAndDisabled;
211+
return colors.steady;
212212
}
213213

214214
if (focused) {

packages/yoga/src/Input/native/Password.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const Password = React.forwardRef(
5959

6060
const iconColor = () => {
6161
if (disabled) {
62-
return colors.elements.backgroundAndDisabled;
62+
return colors.steady;
6363
}
6464

6565
if (focused) {

packages/yoga/src/Input/native/__snapshots__/Input.test.jsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ exports[`<Input /> Snapshots should match with disabled input 1`] = `
168168
style={
169169
[
170170
{
171-
"borderColor": "#D7D7E0",
171+
"borderColor": "#8F8F8F",
172172
"borderRadius": 8,
173173
"borderStyle": "solid",
174174
"borderWidth": 1,

packages/yoga/src/Input/native/__snapshots__/Password.test.jsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ exports[`<Input.Password /> Snapshots should match with disabled input 1`] = `
430430
style={
431431
[
432432
{
433-
"borderColor": "#D7D7E0",
433+
"borderColor": "#8F8F8F",
434434
"borderRadius": 8,
435435
"borderStyle": "solid",
436436
"borderWidth": 1,
@@ -493,7 +493,7 @@ exports[`<Input.Password /> Snapshots should match with disabled input 1`] = `
493493
<RNSVGSvgView
494494
bbHeight={52}
495495
bbWidth={20}
496-
fill="#F5F5FA"
496+
fill="#8F8F8F"
497497
focusable={false}
498498
height={52}
499499
style={
@@ -519,7 +519,7 @@ exports[`<Input.Password /> Snapshots should match with disabled input 1`] = `
519519
fill={
520520
[
521521
0,
522-
4294309370,
522+
4287598479,
523523
]
524524
}
525525
fillOpacity={1}

packages/yoga/src/Input/web/Field.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ const Field = styled.input`
8888
8989
&:disabled {
9090
cursor: not-allowed;
91-
color: ${colors.text.disabled};
92-
-webkit-text-fill-color: ${colors.text.disabled};
91+
color: ${colors.steady};
92+
-webkit-text-fill-color: ${colors.steady};
9393
opacity: 1;
9494
}
9595

packages/yoga/src/Input/web/Fieldset.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const Fieldset = styled.fieldset`
3333
3434
${value && !error ? `border-color: ${input.border.color.typed};` : ''}
3535
36-
${disabled ? `border-color: ${colors.elements.lineAndBorders};` : ''}
36+
${disabled ? `border-color: ${colors.steady};` : ''}
3737
3838
&:hover, &:focus-within {
3939
&:not(:disabled) {

packages/yoga/src/Input/web/Helper.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const Wrapper = styled.div`
2020
margin-top: ${input.helper.margin.top}px;
2121
2222
color: ${error ? colors.feedback.attention[1] : input.helper.color.default};
23-
${disabled ? `color: ${colors.text.disabled};` : ''}
23+
${disabled ? `color: ${colors.steady};` : ''}
2424
`}
2525
`;
2626

packages/yoga/src/Input/web/Input.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const IconWrapper = styled.div`
7171
cursor: not-allowed;
7272
pointer-events: none;
7373
svg {
74-
fill: ${colors.text.disabled};
74+
fill: ${colors.steady};
7575
}
7676
`
7777
: ''}

0 commit comments

Comments
 (0)