Removed onFeedback due to validation complexity

gameflow-tv · Feb 16, 2022 · 02d2a8f · 02d2a8f
1 parent b26f52d
commit 02d2a8f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/src/lib/components/inputs/basic/password/Password.tsx b/src/lib/components/inputs/basic/password/Password.tsx
@@ -25,7 +25,6 @@ export const Password = (props: InputProps) => {
 
   useEffect(() => {
     props.onValidate?.call(null, getResultantValidationResponse(validationResponse))
-    props.onFeedback?.call(null, validationResponse)
   }, [validationResponse])
 
   return (

diff --git a/src/lib/components/inputs/basic/search/Search.tsx b/src/lib/components/inputs/basic/search/Search.tsx
@@ -22,7 +22,6 @@ export const Search = (props: InputProps) => {
 
   useEffect(() => {
     props.onValidate?.call(null, getResultantValidationResponse(validationResponse))
-    props.onFeedback?.call(null, validationResponse)
   }, [validationResponse])
 
   return (

diff --git a/src/lib/components/inputs/basic/shared/types.ts b/src/lib/components/inputs/basic/shared/types.ts
@@ -43,14 +43,14 @@ export interface InputValidation {
     type: CriteriaType
     rule?: number | boolean | RegExp | ValidationFunction
   }
+  nonBlocking?: boolean
 }
 
 export type InputCriteriaResponse = {
   message: string
   type: InputResponseType
   icon?: IconName
   isValid: boolean
-  criteriaId?: string | number
 }
 
 export const criteriaRule = (

diff --git a/src/lib/components/inputs/basic/text/Text.tsx b/src/lib/components/inputs/basic/text/Text.tsx
@@ -17,7 +17,6 @@ export const Text = (props: InputProps) => {
 
   useEffect(() => {
     props.onValidate?.call(null, getResultantValidationResponse(validationResponse))
-    props.onFeedback?.call(null, validationResponse)
   }, [validationResponse])
 
   return (

diff --git a/src/lib/hooks/useInputValidation.ts b/src/lib/hooks/useInputValidation.ts
@@ -27,23 +27,27 @@ const handleResponse = (
   invalidMessage: string,
   validMessage: string,
   type: InputResponseType,
+  nonBlocking: boolean,
   isValid: boolean,
-  fromMultiple: boolean,
-  criteriaId?: string | number
+  fromMultiple: boolean
 ): InputCriteriaResponse => {
   let message = invalidMessage
 
   if (isValid && !fromMultiple) {
     message = !isEmpty(validMessage) ? validMessage : ''
   }
+
+  if (!isValid && nonBlocking) {
+    type = 'warning'
+  }
+
   const icon = getValidationIcon(type)
 
   return {
     message,
     type: type,
     icon,
-    isValid,
-    criteriaId
+    isValid
   }
 }
 
@@ -109,9 +113,9 @@ export const useInputValidation = (props: InputProps) => {
               crit.invalidMessage,
               crit.validMessage,
               crit.invalidResponseType,
+              crit.nonBlocking,
               isValid,
-              false,
-              crit.id
+              false
             )
           )
           break
@@ -121,9 +125,9 @@ export const useInputValidation = (props: InputProps) => {
               crit.invalidMessage,
               crit.validMessage,
               crit.validResponseType,
+              crit.nonBlocking,
               isValid,
-              false,
-              crit.id
+              false
             )
           )
         }
@@ -138,7 +142,14 @@ export const useInputValidation = (props: InputProps) => {
 
         validations = [
           ...validations,
-          handleResponse(crit.invalidMessage, crit.validMessage, respType, isValid, true, crit.id)
+          handleResponse(
+            crit.invalidMessage,
+            crit.validMessage,
+            respType,
+            crit.nonBlocking,
+            isValid,
+            true
+          )
         ]
       }