react-mui-form-validator 1.5.0 → 1.5.2

package/Readme.md

@@ -1,3 +1,4 @@
+
 ## Validation component for material-ui forms
 
 [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT)

package/lib/index.d.ts

@@ -93,7 +93,7 @@ interface ValidatorFormProps {
 }
 
 declare class ValidatorForm extends React$1.Component<ValidatorFormProps> {
-    static getValidator: (value: any, validator: Validator) => boolean;
+    static getValidator: (value: any, validator: Validator, includeRequired: boolean) => boolean;
     childs: any[];
     errors: any[];
     instantValidate: boolean;
@@ -144,7 +144,7 @@ declare class ValidatorComponent extends React$1.Component<MuiTextFieldProps & V
     componentDidUpdate(prevProps: MuiTextFieldProps, prevState: ValidatorComponentState): void;
     componentWillUnmount(): void;
     getErrorMessage: () => string | boolean | string[];
-    validate: (value: any, dryRun?: boolean) => Promise<boolean>;
+    validate: (value: any, includeRequired?: boolean, dryRun?: boolean) => Promise<boolean>;
     isValid: () => boolean;
     makeInvalid: () => void;
     makeValid: () => void;

package/lib/index.js

@@ -17377,48 +17377,71 @@ var ValidationRules_default = validations;
 // src/core/validator/ValidatorForm.tsx
 var FormContext = React61.createContext("form");
 var ValidatorForm = class extends React61.Component {
-  static getValidator = (value, validator2) => {
+  static getValidator = (value, validator2, includeRequired) => {
     let valid = validator2;
-    switch (valid.validator) {
-      case "required":
-        return ValidationRules_default.isEmpty(value);
-      case "isEmail":
-        return ValidationRules_default.isEmail(value);
-      case "isEmpty":
-        return ValidationRules_default.isEmpty(value);
-      case "allowedExtensions":
-        return ValidationRules_default.allowedExtensions(value, valid.fileTypes);
-      case "isFile":
-        return ValidationRules_default.isFile(value);
-      case "isFloat":
-        return ValidationRules_default.isFloat(value);
-      case "isNumber":
-        return ValidationRules_default.isNumber(value);
-      case "isPositive":
-        return ValidationRules_default.isPositive(value);
-      case "isString":
-        return ValidationRules_default.isString(value);
-      case "matchRegexp":
-        return ValidationRules_default.matchRegexp(value, valid.regexp);
-      case "maxFileSize":
-        return ValidationRules_default.maxFileSize(value, valid.max);
-      case "maxFloat":
-        return ValidationRules_default.maxFloat(value, valid.max);
-      case "maxNumber":
-        return ValidationRules_default.maxNumber(value, valid.max);
-      case "maxStringLength":
-        return ValidationRules_default.maxStringLength(value, valid.max);
-      case "minFloat":
-        return ValidationRules_default.minFloat(value, valid.min);
-      case "minNumber":
-        return ValidationRules_default.minNumber(value, valid.min);
-      case "minStringLength":
-        return ValidationRules_default.minStringLength(value, valid.min);
-      case "trim":
-        return ValidationRules_default.trim(value);
-      default:
-        return true;
+    let result = true;
+    if (valid.validator !== "required" || includeRequired) {
+      switch (valid.validator) {
+        case "required":
+          result = ValidationRules_default.isEmpty(value);
+          break;
+        case "isEmail":
+          result = ValidationRules_default.isEmail(value);
+          break;
+        case "isEmpty":
+          result = ValidationRules_default.isEmpty(value);
+          break;
+        case "allowedExtensions":
+          result = ValidationRules_default.allowedExtensions(value, valid.fileTypes);
+          break;
+        case "isFile":
+          result = ValidationRules_default.isFile(value);
+          break;
+        case "isFloat":
+          result = ValidationRules_default.isFloat(value);
+          break;
+        case "isNumber":
+          result = ValidationRules_default.isNumber(value);
+          break;
+        case "isPositive":
+          result = ValidationRules_default.isPositive(value);
+          break;
+        case "isString":
+          result = ValidationRules_default.isString(value);
+          break;
+        case "matchRegexp":
+          result = ValidationRules_default.matchRegexp(value, valid.regexp);
+          break;
+        case "maxFileSize":
+          result = ValidationRules_default.maxFileSize(value, valid.max);
+          break;
+        case "maxFloat":
+          result = ValidationRules_default.maxFloat(value, valid.max);
+          break;
+        case "maxNumber":
+          result = ValidationRules_default.maxNumber(value, valid.max);
+          break;
+        case "maxStringLength":
+          result = ValidationRules_default.maxStringLength(value, valid.max);
+          break;
+        case "minFloat":
+          result = ValidationRules_default.minFloat(value, valid.min);
+          break;
+        case "minNumber":
+          result = ValidationRules_default.minNumber(value, valid.min);
+          break;
+        case "minStringLength":
+          result = ValidationRules_default.minStringLength(value, valid.min);
+          break;
+        case "trim":
+          result = ValidationRules_default.trim(value);
+          break;
+        default:
+          result = true;
+          break;
+      }
     }
+    return result;
   };
   childs = [];
   errors = [];
@@ -17617,42 +17640,37 @@ var ValidatorComponent = class extends React62.Component {
   getErrorMessage = () => {
     const { errorMessages } = this.state;
     const type = typeof errorMessages;
-    if (errorMessages) {
-      if (type === "string") {
-        return errorMessages;
-      } else if (type === "object") {
-        if (this.invalid.length > 0) {
-          return errorMessages[this.invalid[0]];
-        }
+    if (type === "string") {
+      return errorMessages;
+    } else if (type === "object") {
+      if (this.invalid.length > 0) {
+        return errorMessages[this.invalid[0]];
       }
     }
     return true;
   };
-  validate = async (value, dryRun = false) => {
-    let valid = false;
-    if (this.state.validators) {
-      const validations2 = Promise.all(
-        this.state.validators.map(
-          (validator2) => ValidatorForm_default.getValidator(value, validator2)
-        )
-      );
-      const results = await validations2;
-      this.invalid = [];
-      valid = true;
-      results.forEach((result, key) => {
-        if (!result) {
-          valid = false;
-          this.invalid.push(key);
-        }
-      });
-      if (!dryRun) {
-        this.setState({ isValid: valid }, () => {
-          if (this.props.validatorListener)
-            this.props.validatorListener(
-              this.state.isValid === void 0 ? false : this.state.isValid
-            );
-        });
+  validate = async (value, includeRequired = false, dryRun = false) => {
+    const validations2 = Promise.all(
+      this.state.validators.map(
+        (validator2) => ValidatorForm_default.getValidator(value, validator2, includeRequired)
+      )
+    );
+    const results = await validations2;
+    this.invalid = [];
+    let valid = true;
+    results.forEach((result, key) => {
+      if (!result) {
+        valid = false;
+        this.invalid.push(key);
       }
+    });
+    if (!dryRun) {
+      this.setState({ isValid: valid }, () => {
+        if (this.props.validatorListener)
+          this.props.validatorListener(
+            this.state.isValid === void 0 ? false : this.state.isValid
+          );
+      });
     }
     return valid;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-mui-form-validator",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Validator for forms designed with material-ui components.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,7 +39,8 @@
   },
   "devDependencies": {
     "@mui/material": "^5.14.16",
-    "@types/react": "^18.2.33",
+    "@types/node": "^20.8.10",
+    "@types/react": "^18.2.34",
     "@types/react-dom": "^18.2.14",
     "@types/react-lifecycles-compat": "^3.0.3",
     "mui-tel-input": "4.0.1",