react-survey-builder 1.0.62 → 1.0.64

package/lib/form-fields.js

@@ -20,7 +20,6 @@ var _esm = require("react-bootstrap/esm");
 var _reactHookForm = require("react-hook-form");
 var _lodash = require("lodash");
 var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
-var _validators = require("./utils/validators");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -431,29 +430,6 @@ var ReactSurveyFormFields = function ReactSurveyFormFields(_ref) {
     if (item.required) {
       fieldRules.required = "".concat(item.label, " is required");
     }
-    switch (item.element) {
-      case 'EmailInput':
-        fieldRules.minLength = {
-          value: 4,
-          message: "".concat(item.label, " must be at least 4 characters long")
-        };
-        fieldRules.validate = function (value) {
-          return (0, _validators.validateEmail)(value) || "".concat(item.label, " field requires valid email address");
-        };
-        break;
-      case 'PhoneNumber':
-        fieldRules.validate = function (value) {
-          return (0, _validators.validatePhone)(value) || "".concat(item.label, " field requires a valid phone number");
-        };
-        break;
-      case 'DatePicker':
-        fieldRules.validate = function (value) {
-          return (0, _validators.validateDate)(value) || "".concat(item.label, " field requires a valid date in the format MM/DD/YYYY");
-        };
-        break;
-      default:
-        break;
-    }
     return fieldRules;
   };
   var handleRenderSubmit = function handleRenderSubmit() {

package/lib/form.js

@@ -20,7 +20,6 @@ var _esm = require("react-bootstrap/esm");
 var _reactHookForm = require("react-hook-form");
 var _lodash = require("lodash");
 var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
-var _validators = require("./utils/validators");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -439,29 +438,6 @@ var ReactSurvey = function ReactSurvey(_ref) {
     if (item.required) {
       fieldRules.required = "".concat(item.label, " is required");
     }
-    switch (item.element) {
-      case 'EmailInput':
-        fieldRules.minLength = {
-          value: 4,
-          message: "".concat(item.label, " must be at least 4 characters long")
-        };
-        fieldRules.validate = function (value) {
-          return (0, _validators.validateEmail)(value) || "".concat(item.label, " field requires valid email address");
-        };
-        break;
-      case 'PhoneNumber':
-        fieldRules.validate = function (value) {
-          return (0, _validators.validatePhone)(value) || "".concat(item.label, " field requires a valid phone number");
-        };
-        break;
-      case 'DatePicker':
-        fieldRules.validate = function (value) {
-          return (0, _validators.validateDate)(value) || "".concat(item.label, " field requires a valid date in the format MM/DD/YYYY");
-        };
-        break;
-      default:
-        break;
-    }
     return fieldRules;
   };
   var handleRenderSubmit = function handleRenderSubmit() {

package/lib/survey-elements/index.js

@@ -35,9 +35,9 @@ var _ri = require("react-icons/ri");
 var _io = require("react-icons/io5");
 var _functions = require("../functions");
 var _esm = require("react-bootstrap/esm");
-var _validators = require("../utils/validators");
 var _reactHookForm = require("react-hook-form");
 var _esm2 = require("react-imask/esm");
+var _libphonenumberJs = require("libphonenumber-js");
 var _excluded = ["name", "onChange", "value", "style", "item"],
   _excluded2 = ["name", "onChange", "value", "style", "item"],
   _excluded3 = ["name", "onChange", "value", "style", "item"],
@@ -373,6 +373,11 @@ var EmailInput = exports.EmailInput = function EmailInput(_ref3) {
       onChange(value);
     }
   };
+  var validateEmail = function validateEmail(email) {
+    return email.match(
+    // eslint-disable-next-line no-useless-escape
+    /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);
+  };
   var inputProps = {
     type: 'text',
     required: (_item$required4 = item === null || item === void 0 ? void 0 : item.required) !== null && _item$required4 !== void 0 ? _item$required4 : false,
@@ -396,7 +401,7 @@ var EmailInput = exports.EmailInput = function EmailInput(_ref3) {
       message: "".concat(item === null || item === void 0 ? void 0 : item.label, " must be at least 4 characters long")
     },
     validate: function validate(value) {
-      return (0, _validators.validateEmail)(value) || "".concat(item === null || item === void 0 ? void 0 : item.label, " field requires valid email address");
+      return validateEmail(value) || "".concat(item === null || item === void 0 ? void 0 : item.label, " field requires valid email address");
     }
   };
   if ((_item$required5 = item === null || item === void 0 ? void 0 : item.required) !== null && _item$required5 !== void 0 ? _item$required5 : false) {
@@ -535,6 +540,24 @@ var PhoneNumber = exports.PhoneNumber = function PhoneNumber(_ref5) {
       onChange(value);
     }
   };
+  var toE164PhoneNumber = function toE164PhoneNumber(phoneNumberValue) {
+    if (phoneNumberValue !== undefined && phoneNumberValue !== null) {
+      //Filter only numbers from the input
+      var cleaned = ('' + phoneNumberValue).replace(/\D/g, '');
+
+      //Check if the input is of correct
+      var match = cleaned.match(/^(1|)?(\d{3})(\d{3})(\d{4})$/);
+      if (match) {
+        //Remove the matched extension code
+        //Change this to format for any country code.
+        var intlCode = match[1] ? '+1' : '+1';
+        return [intlCode, match[2], match[3], match[4]].join('');
+      }
+      return '';
+    } else {
+      return '';
+    }
+  };
   var inputProps = {
     type: 'text',
     required: (_item$required7 = item === null || item === void 0 ? void 0 : item.required) !== null && _item$required7 !== void 0 ? _item$required7 : false,
@@ -556,7 +579,7 @@ var PhoneNumber = exports.PhoneNumber = function PhoneNumber(_ref5) {
   }
   var fieldRules = {
     validate: function validate(value) {
-      return (0, _validators.validatePhone)(value) || "".concat(item === null || item === void 0 ? void 0 : item.label, " field requires a valid phone number");
+      return (0, _libphonenumberJs.isValidPhoneNumber)(toE164PhoneNumber(value), 'US') || "".concat(item === null || item === void 0 ? void 0 : item.label, " field requires a valid phone number");
     }
   };
   if ((_item$required8 = item === null || item === void 0 ? void 0 : item.required) !== null && _item$required8 !== void 0 ? _item$required8 : false) {
@@ -748,6 +771,54 @@ var DatePicker = exports.DatePicker = function DatePicker(_ref8) {
       onChange(value);
     }
   };
+  var validateDate = function validateDate(dateString) {
+    if (dateString !== undefined && dateString !== null && dateString !== "") {
+      var dateformat = /^(0?[1-9]|1[0-2])[\/](0?[1-9]|[1-2][0-9]|3[01])[\/]\d{4}$/;
+
+      // Matching the date through regular expression      
+      if (dateString.match(dateformat)) {
+        var operator = dateString.split('/');
+
+        // Extract the string into month, date and year      
+        var datepart = [];
+        if (operator.length > 1) {
+          datepart = dateString.split('/');
+        }
+        var month = parseInt(datepart[0]);
+        var day = parseInt(datepart[1]);
+        var year = parseInt(datepart[2]);
+        if (day > 31 || day < 1) {
+          return false;
+        }
+        var currentYear = new Date().getFullYear();
+        if (year < 1900 || year > currentYear + 5) {
+          return false;
+        }
+
+        // Create a list of days of a month      
+        var ListofDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+        if (month === 1 || month > 2) {
+          if (day > ListofDays[month - 1]) {
+            // to check if the date is out of range     
+            return false;
+          }
+        } else if (month === 2) {
+          var leapYear = false;
+          if (!(year % 4) && year % 100 || !(year % 400)) leapYear = true;
+          if (leapYear === false && day >= 29) return false;else if (leapYear === true && day > 29) {
+            // console.log('Invalid date format!');
+            return false;
+          }
+        } else if (month > 12 || month < 1) {
+          return false;
+        }
+      } else {
+        // console.log("Invalid date format!");
+        return false;
+      }
+    }
+    return true;
+  };
   var inputProps = {
     type: 'text',
     required: (_item$required10 = item === null || item === void 0 ? void 0 : item.required) !== null && _item$required10 !== void 0 ? _item$required10 : false,
@@ -769,7 +840,7 @@ var DatePicker = exports.DatePicker = function DatePicker(_ref8) {
   }
   var fieldRules = {
     validate: function validate(value) {
-      return (0, _validators.validateDate)(value) || 'Please enter a valid Date in the format MM/DD/YYYY';
+      return validateDate(value) || 'Please enter a valid Date in the format MM/DD/YYYY';
     }
   };
   if ((_item$required11 = item === null || item === void 0 ? void 0 : item.required) !== null && _item$required11 !== void 0 ? _item$required11 : false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-survey-builder",
-  "version": "1.0.62",
+  "version": "1.0.64",
   "description": "A complete survey builder for react.",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
@@ -88,6 +88,7 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.22.0",
     "express": "^4.17.1",
+    "libphonenumber-js": "^1.10.61",
     "multer": "^1.4.2",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0",

package/lib/utils/validators.js

@@ -1,81 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.validatePhone = exports.validateEmail = exports.validateDate = exports.toE164PhoneNumber = void 0;
-var _libphonenumberJs = require("libphonenumber-js");
-var validateEmail = exports.validateEmail = function validateEmail(email) {
-  return email.match(
-  // eslint-disable-next-line no-useless-escape
-  /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);
-};
-var toE164PhoneNumber = exports.toE164PhoneNumber = function toE164PhoneNumber(phoneNumberValue) {
-  if (phoneNumberValue !== undefined && phoneNumberValue !== null) {
-    //Filter only numbers from the input
-    var cleaned = ('' + phoneNumberValue).replace(/\D/g, '');
-
-    //Check if the input is of correct
-    var match = cleaned.match(/^(1|)?(\d{3})(\d{3})(\d{4})$/);
-    if (match) {
-      //Remove the matched extension code
-      //Change this to format for any country code.
-      var intlCode = match[1] ? '+1' : '+1';
-      return [intlCode, match[2], match[3], match[4]].join('');
-    }
-    return '';
-  } else {
-    return '';
-  }
-};
-var validatePhone = exports.validatePhone = function validatePhone(phone) {
-  return (0, _libphonenumberJs.isValidPhoneNumber)(toE164PhoneNumber(phone), 'US');
-};
-var validateDate = exports.validateDate = function validateDate(dateString) {
-  if (dateString !== undefined && dateString !== null && dateString !== "") {
-    var dateformat = /^(0?[1-9]|1[0-2])[\/](0?[1-9]|[1-2][0-9]|3[01])[\/]\d{4}$/;
-
-    // Matching the date through regular expression      
-    if (dateString.match(dateformat)) {
-      var operator = dateString.split('/');
-
-      // Extract the string into month, date and year      
-      var datepart = [];
-      if (operator.length > 1) {
-        datepart = dateString.split('/');
-      }
-      var month = parseInt(datepart[0]);
-      var day = parseInt(datepart[1]);
-      var year = parseInt(datepart[2]);
-      if (day > 31 || day < 1) {
-        return false;
-      }
-      var currentYear = new Date().getFullYear();
-      if (year < 1900 || year > currentYear + 5) {
-        return false;
-      }
-
-      // Create a list of days of a month      
-      var ListofDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-      if (month === 1 || month > 2) {
-        if (day > ListofDays[month - 1]) {
-          // to check if the date is out of range     
-          return false;
-        }
-      } else if (month === 2) {
-        var leapYear = false;
-        if (!(year % 4) && year % 100 || !(year % 400)) leapYear = true;
-        if (leapYear === false && day >= 29) return false;else if (leapYear === true && day > 29) {
-          // console.log('Invalid date format!');
-          return false;
-        }
-      } else if (month > 12 || month < 1) {
-        return false;
-      }
-    } else {
-      // console.log("Invalid date format!");
-      return false;
-    }
-  }
-  return true;
-};