Skip to content

Commit 66325eb

Browse files
committed
chore: Update ts & fix lint
1 parent d6368c3 commit 66325eb

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = {
44
...base,
55
rules: {
66
...base.rules,
7+
'no-confusing-arrow': 0,
78
'no-template-curly-in-string': 0,
89
'prefer-promise-reject-errors': 0,
910
'react/no-array-index-key': 0,

src/utils/validateUtil.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import AsyncValidator from 'async-validator';
1+
import RawAsyncValidator from 'async-validator';
22
import * as React from 'react';
33
import warning from 'warning';
44
import {
@@ -11,6 +11,9 @@ import {
1111
import { setValues } from './valueUtil';
1212
import { defaultValidateMessages } from './messages';
1313

14+
// Remove incorrect original ts define
15+
const AsyncValidator: any = RawAsyncValidator;
16+
1417
/**
1518
* Replace with template.
1619
* `I'm ${name}` + { name: 'bamboo' } = I'm bamboo
@@ -41,13 +44,7 @@ function convertMessages(
4144
replaceMessage(template, { ...kv, ...additionalKV });
4245

4346
/* eslint-disable no-param-reassign */
44-
type Template =
45-
| {
46-
[name: string]: string | (() => string) | { [name: string]: Template };
47-
}
48-
| string;
49-
50-
function fillTemplate(source: Template, target: Template = {}) {
47+
function fillTemplate(source: ValidateMessages, target: ValidateMessages = {}) {
5148
Object.keys(source).forEach(ruleName => {
5249
const value = source[ruleName];
5350
if (typeof value === 'string') {
@@ -96,9 +93,9 @@ async function validateRule(
9693
if (errObj.errors) {
9794
result = errObj.errors.map(({ message }, index) =>
9895
// Wrap ReactNode with `key`
99-
(React.isValidElement(message)
96+
React.isValidElement(message)
10097
? React.cloneElement(message, { key: `error_${index}` })
101-
: message),
98+
: message,
10299
);
103100
} else {
104101
console.error(errObj);

0 commit comments

Comments
 (0)