fix file allowBlank

ts: add emailDomain msg

Author: Guillaume Tournier

README.md

@@ -476,6 +476,8 @@ The default error messages are:
 
 > Note: incorrect `minSize` or `maxSize` options will display an error in the console
 
+> Note: for an optional file input, don't forget to pass `allowBlank: true`
+
 
 ### validateForm
 

examples/src/field-validation-form.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import { reduxForm, Field, FormSection } from 'redux-form'
-import { connect } from 'react-redux'
 import { FormattedMessage } from 'react-intl'
 import Validators, {
   acceptance,

examples/src/general-validation-form.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import { reduxForm, Field, FormSection } from 'redux-form'
-import { connect } from 'react-redux'
 import { FormattedMessage } from 'react-intl'
 import {
   acceptance,

index.d.ts

@@ -35,6 +35,7 @@ export interface ValidatorMessages {
   dateInvalid: ValidatorMessage
   dateRange: ValidatorMessage
   email: ValidatorMessage
+  emailDomain: ValidatorMessage
   equalTo: ValidatorMessage
   even: ValidatorMessage
   exclusion: ValidatorMessage

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-form-validators",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Simple validations with redux-form / react-final-form",
   "module": "lib/index.js",
   "main": "lib/index.js",

package.json

@@ -19,6 +19,7 @@ describe('Validator option: allowBlank', function () {
       assert.ok(test(length, blank, { is: 300, allowBlank: false }).indexOf('form.errors') === 0)
       assert.ok(test(numericality, blank, { allowBlank: false }).indexOf('form.errors') === 0)
       assert.ok(test(url, blank, { allowBlank: false }).indexOf('form.errors') === 0)
+      assert.ok(test(file, blank, { allowBlank: false }).indexOf('form.errors') === 0)
     })
     assert.ok(test(file, new FileList(), { allowBlank: false }).indexOf('form.errors') === 0)
   })
@@ -32,6 +33,7 @@ describe('Validator option: allowBlank', function () {
       assert.ok(!test(length, blank, { is: 300, allowBlank: true }))
       assert.ok(!test(numericality, blank, { allowBlank: true }))
       assert.ok(!test(url, blank, { allowBlank: true }))
+      assert.ok(!test(file, blank, { allowBlank: true }))
     })
     assert.ok(!test(file, new FileList(), { allowBlank: true }))
   })
@@ -49,6 +51,7 @@ describe('Validator option: allowBlank', function () {
         assert.ok(allowBlank !== (test(length, blank, { is: 300 }).indexOf('form.errors') === 0))
         assert.ok(allowBlank !== (test(numericality, blank).indexOf('form.errors') === 0))
         assert.ok(allowBlank !== (test(url, blank).indexOf('form.errors') === 0))
+        assert.ok(allowBlank !== (test(file, blank).indexOf('form.errors') === 0))
       })
     })
 

src/__tests__/allow-blank.spec.js

@@ -46,7 +46,10 @@ let file = memoize(function ({
     let isAFileList = isFileList(value)
 
     // special blank check
-    if ((allowBlank != null ? allowBlank : Validators.defaultOptions.allowBlank) && isAFileList && value.length === 0) {
+    if (
+      (allowBlank != null ? allowBlank : Validators.defaultOptions.allowBlank) &&
+      (typeof value === 'string' ? value.trim() === '' : isAFileList && value.length === 0)
+    ) {
       return
     }
     if (!isAFileList) {