From 079f7cda1c8e84663565847d8cb350bb8f5dab4b Mon Sep 17 00:00:00 2001 From: moshyfawn Date: Tue, 3 Jan 2023 12:05:10 -0500 Subject: [PATCH 1/5] =?UTF-8?q?WIP=20=F0=9F=90=9Bfix(Validation):=20remove?= =?UTF-8?q?=20ref.value=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #9709 --- src/logic/validateField.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/logic/validateField.ts b/src/logic/validateField.ts index 48732b72b1c..13e66e4bc1d 100644 --- a/src/logic/validateField.ts +++ b/src/logic/validateField.ts @@ -66,7 +66,6 @@ export default async ( isUndefined(ref.value) && isUndefined(inputValue)) || inputValue === '' || - ref.value === '' || (Array.isArray(inputValue) && !inputValue.length); const appendErrorsCurry = appendErrors.bind( null, From f253a7b57c481f611a70a23f4b136de7154c4504 Mon Sep 17 00:00:00 2001 From: "Beier (Bill)" Date: Wed, 4 Jan 2023 08:18:44 +1100 Subject: [PATCH 2/5] Update validateField.ts --- src/logic/validateField.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/logic/validateField.ts b/src/logic/validateField.ts index 13e66e4bc1d..19f0bee0ce9 100644 --- a/src/logic/validateField.ts +++ b/src/logic/validateField.ts @@ -24,6 +24,7 @@ import getCheckboxValue from './getCheckboxValue'; import getRadioValue from './getRadioValue'; import getValidateError from './getValidateError'; import getValueAndMessage from './getValueAndMessage'; +import isHTMLElement from '../utils/isHTMLElement'; export default async ( field: Field, @@ -65,6 +66,7 @@ export default async ( ((valueAsNumber || isFileInput(ref)) && isUndefined(ref.value) && isUndefined(inputValue)) || + (isHTMLElement(ref) && ref.value === '') || inputValue === '' || (Array.isArray(inputValue) && !inputValue.length); const appendErrorsCurry = appendErrors.bind( From f0a46581fb5a45ed958b82cdb8e9c5211cde9963 Mon Sep 17 00:00:00 2001 From: "Beier (Bill)" Date: Wed, 4 Jan 2023 08:22:13 +1100 Subject: [PATCH 3/5] Update validateField.ts --- src/logic/validateField.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/validateField.ts b/src/logic/validateField.ts index 19f0bee0ce9..6905531d09a 100644 --- a/src/logic/validateField.ts +++ b/src/logic/validateField.ts @@ -11,6 +11,7 @@ import isCheckBoxInput from '../utils/isCheckBoxInput'; import isEmptyObject from '../utils/isEmptyObject'; import isFileInput from '../utils/isFileInput'; import isFunction from '../utils/isFunction'; +import isHTMLElement from '../utils/isHTMLElement'; import isMessage from '../utils/isMessage'; import isNullOrUndefined from '../utils/isNullOrUndefined'; import isObject from '../utils/isObject'; @@ -24,7 +25,6 @@ import getCheckboxValue from './getCheckboxValue'; import getRadioValue from './getRadioValue'; import getValidateError from './getValidateError'; import getValueAndMessage from './getValueAndMessage'; -import isHTMLElement from '../utils/isHTMLElement'; export default async ( field: Field, From 01617e6ec935e6b8703db0b34e307d631bebcec3 Mon Sep 17 00:00:00 2001 From: "Beier (Bill)" Date: Wed, 4 Jan 2023 08:29:50 +1100 Subject: [PATCH 4/5] Update validateField.test.tsx --- src/__tests__/logic/validateField.test.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/__tests__/logic/validateField.test.tsx b/src/__tests__/logic/validateField.test.tsx index ce95aeec86d..eb103132c26 100644 --- a/src/__tests__/logic/validateField.test.tsx +++ b/src/__tests__/logic/validateField.test.tsx @@ -36,13 +36,15 @@ describe('validateField', () => { }, }); + const input = document.createElement("input"); + expect( await validateField( { _f: { mount: true, name: 'test', - ref: { type: 'text', value: '', name: 'test' }, + ref: input, required: true, valueAsNumber: true, }, @@ -52,7 +54,7 @@ describe('validateField', () => { ), ).toEqual({ test: { - ref: { type: 'text', value: '', name: 'test' }, + ref: input, message: '', type: 'required', }, From ba8c5939628be264e44aa1724a953490b0eb7f15 Mon Sep 17 00:00:00 2001 From: "Beier (Bill)" Date: Wed, 4 Jan 2023 08:34:13 +1100 Subject: [PATCH 5/5] Update validateField.test.tsx --- src/__tests__/logic/validateField.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/__tests__/logic/validateField.test.tsx b/src/__tests__/logic/validateField.test.tsx index eb103132c26..6a5aee959cb 100644 --- a/src/__tests__/logic/validateField.test.tsx +++ b/src/__tests__/logic/validateField.test.tsx @@ -36,7 +36,7 @@ describe('validateField', () => { }, }); - const input = document.createElement("input"); + const input = document.createElement('input'); expect( await validateField(