1
- import AsyncValidator from 'async-validator' ;
1
+ import RawAsyncValidator from 'async-validator' ;
2
2
import * as React from 'react' ;
3
3
import warning from 'warning' ;
4
4
import {
@@ -11,6 +11,9 @@ import {
11
11
import { setValues } from './valueUtil' ;
12
12
import { defaultValidateMessages } from './messages' ;
13
13
14
+ // Remove incorrect original ts define
15
+ const AsyncValidator : any = RawAsyncValidator ;
16
+
14
17
/**
15
18
* Replace with template.
16
19
* `I'm ${name}` + { name: 'bamboo' } = I'm bamboo
@@ -41,13 +44,7 @@ function convertMessages(
41
44
replaceMessage ( template , { ...kv , ...additionalKV } ) ;
42
45
43
46
/* 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 = { } ) {
51
48
Object . keys ( source ) . forEach ( ruleName => {
52
49
const value = source [ ruleName ] ;
53
50
if ( typeof value === 'string' ) {
@@ -96,9 +93,9 @@ async function validateRule(
96
93
if ( errObj . errors ) {
97
94
result = errObj . errors . map ( ( { message } , index ) =>
98
95
// Wrap ReactNode with `key`
99
- ( React . isValidElement ( message )
96
+ React . isValidElement ( message )
100
97
? React . cloneElement ( message , { key : `error_${ index } ` } )
101
- : message ) ,
98
+ : message ,
102
99
) ;
103
100
} else {
104
101
console . error ( errObj ) ;
0 commit comments