Skip to content

Commit dc586db

Browse files
committed
Fix code formatting
1 parent 6d2d981 commit dc586db

File tree

3 files changed

+12
-35
lines changed

3 files changed

+12
-35
lines changed

src/incubator/TextField/Presenter.ts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function getColorByState(color?: ColorType, context?: FieldContextType) {
1414
} else if (!context?.isValid) {
1515
finalColor = color?.error;
1616
} else if (context?.isFocused) {
17-
finalColor = color?.focus;
17+
finalColor = color?.focus;
1818
}
1919

2020
finalColor = finalColor || color?.default || Colors.grey10;
@@ -23,10 +23,7 @@ export function getColorByState(color?: ColorType, context?: FieldContextType) {
2323
return finalColor;
2424
}
2525

26-
export function validate(
27-
value?: string,
28-
validator?: Validator | Validator[]
29-
): [boolean, number?] {
26+
export function validate(value?: string, validator?: Validator | Validator[]): [boolean, number?] {
3027
if (_.isUndefined(validator)) {
3128
return [true, undefined];
3229
}
@@ -51,14 +48,9 @@ export function validate(
5148
return [_isValid, _failingValidatorIndex];
5249
}
5350

54-
export function getRelevantValidationMessage(
55-
validationMessage: string | string[] | undefined,
56-
failingValidatorIndex: undefined | number
57-
) {
58-
if (
59-
_.isUndefined(failingValidatorIndex) ||
60-
_.isUndefined(validationMessage)
61-
) {
51+
export function getRelevantValidationMessage(validationMessage: string | string[] | undefined,
52+
failingValidatorIndex: undefined | number) {
53+
if (_.isUndefined(failingValidatorIndex) || _.isUndefined(validationMessage)) {
6254
return;
6355
}
6456

src/incubator/TextField/ValidationMessage.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ const ValidationMessage = ({
3232
return null;
3333
}
3434

35-
const relevantValidationMessage = getRelevantValidationMessage(
36-
validationMessage,
37-
context.failingValidatorIndex
38-
);
35+
const relevantValidationMessage = getRelevantValidationMessage(validationMessage, context.failingValidatorIndex);
3936

4037
return (
4138
<Text red30 style={[styles.validationMessage, validationMessageStyle]}>

src/incubator/TextField/__tests__/Presenter.spec.js

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ describe('TextField:Presenter', () => {
1212
expect(uut.validate('value', validator)).toEqual([false, 0]);
1313
expect(uut.validate('', validator)).toEqual([false, 0]);
1414
expect(uut.validate('test@mail', validator)).toEqual([false, 0]);
15-
expect(uut.validate('[email protected]', validator)).toEqual([
16-
true,
17-
undefined
18-
]);
15+
expect(uut.validate('[email protected]', validator)).toEqual([true, undefined]);
1916
});
2017

2118
it('should validate required', () => {
@@ -27,7 +24,7 @@ describe('TextField:Presenter', () => {
2724
});
2825

2926
it('should validate a function validator', () => {
30-
const validator = (value) => value.length > 3;
27+
const validator = value => value.length > 3;
3128

3229
expect(uut.validate('', validator)).toEqual([false, 0]);
3330
expect(uut.validate('abc', validator)).toEqual([false, 0]);
@@ -39,10 +36,7 @@ describe('TextField:Presenter', () => {
3936

4037
expect(uut.validate('', validator)).toEqual([false, 0]);
4138
expect(uut.validate('value', validator)).toEqual([false, 1]);
42-
expect(uut.validate('[email protected]', validator)).toEqual([
43-
true,
44-
undefined
45-
]);
39+
expect(uut.validate('[email protected]', validator)).toEqual([true, undefined]);
4640
});
4741
});
4842

@@ -52,21 +46,15 @@ describe('TextField:Presenter', () => {
5246
});
5347

5448
it('should return the relevant validation message when there is a single message', () => {
55-
expect(uut.getRelevantValidationMessage('error message', 0)).toBe(
56-
'error message'
57-
);
58-
expect(
59-
uut.getRelevantValidationMessage('error message', undefined)
60-
).toBeUndefined();
49+
expect(uut.getRelevantValidationMessage('error message', 0)).toBe('error message');
50+
expect(uut.getRelevantValidationMessage('error message', undefined)).toBeUndefined();
6151
});
6252

6353
it('should return the relevant validation message when there are multiple messages', () => {
6454
const messages = ['Field is required', 'Email is invalid'];
6555
expect(uut.getRelevantValidationMessage(messages, 0)).toBe(messages[0]);
6656
expect(uut.getRelevantValidationMessage(messages, 1)).toBe(messages[1]);
67-
expect(
68-
uut.getRelevantValidationMessage(messages, undefined)
69-
).toBeUndefined();
57+
expect(uut.getRelevantValidationMessage(messages, undefined)).toBeUndefined();
7058
});
7159
});
7260
});

0 commit comments

Comments
 (0)