linear-react-components-ui 1.0.10-rc.14 → 1.0.10-rc.16

package/lib/form/FieldArray.js

@@ -10,7 +10,7 @@ var _withFieldHOC = _interopRequireDefault(require("./withFieldHOC"));
 var _gridlayout = _interopRequireDefault(require("../gridlayout"));
 var _fieldset = _interopRequireDefault(require("../fieldset"));
 var _helpers = require("./helpers");
-var _excluded = ["cols", "label", "bordered", "labelContainerStyle", "skipLabel", "data", "name", "handlerStoreValidators", "component", "handlerFieldChange", "handlerFieldValidade", "changePropName", "fieldErrors", "externalMessagesErrors", "dataSource", "handlerRemoveValidators", "validators", "valuePropName", "idKey", "originalData"];
+var _excluded = ["cols", "label", "bordered", "labelContainerStyle", "skipLabel", "data", "name", "handlerStoreValidators", "component", "handlerFieldChange", "handlerFieldValidade", "changePropName", "fieldErrors", "externalMessagesErrors", "handlerRemoveValidators", "validators", "valuePropName", "originalData"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -53,21 +53,16 @@ var getDefaultProps = function getDefaultProps(props, handleShowValidateMessages
       }
     });
     if (handlerSelecionados) handlerSelecionados(ids);
-    // if (handleShowValidateMessages) handleShowValidateMessages(true);
+    if (handleShowValidateMessages) handleShowValidateMessages(true);
   }), _ref;
 };
 var getEvents = function getEvents(_ref2) {
   var _onBlur2 = _ref2.onBlur,
-    _onSelect = _ref2.onSelect,
     handleShowValidateMessages = _ref2.handleShowValidateMessages;
   return {
     onBlur: function onBlur(e) {
       handleShowValidateMessages(true);
       if (_onBlur2) _onBlur2(e);
-    },
-    onSelect: function onSelect(e) {
-      handleShowValidateMessages(true);
-      if (_onSelect) _onSelect(e);
     }
   };
 };
@@ -86,11 +81,9 @@ var FieldArray = function FieldArray(props) {
     changePropName = props.changePropName,
     fieldErrors = props.fieldErrors,
     externalMessagesErrors = props.externalMessagesErrors,
-    dataSource = props.dataSource,
     handlerRemoveValidators = props.handlerRemoveValidators,
     validators = props.validators,
     valuePropName = props.valuePropName,
-    idKey = props.idKey,
     originalData = props.originalData,
     rest = _objectWithoutProperties(props, _excluded);
   var _useState = (0, _react.useState)(false),
@@ -121,7 +114,10 @@ var FieldArray = function FieldArray(props) {
         handleShowValidateMessages: function handleShowValidateMessages(value) {
           return setShowValidateMessages(value);
         }
-      })))), (0, _helpers.getErrorMessages)(_objectSpread(_objectSpread({}, props), {}, {
+      })), {
+        label: label,
+        name: name
+      })), (0, _helpers.getErrorMessages)(_objectSpread(_objectSpread({}, props), {}, {
         fieldErrors: showValidateMessages ? props.fieldErrors : {}
       })));
     } else {
@@ -129,7 +125,10 @@ var FieldArray = function FieldArray(props) {
         handleShowValidateMessages: function handleShowValidateMessages(value) {
           return setShowValidateMessages(value);
         }
-      })))), (0, _helpers.getErrorMessages)(_objectSpread(_objectSpread({}, props), {}, {
+      })), {
+        label: label,
+        name: name
+      })), (0, _helpers.getErrorMessages)(_objectSpread(_objectSpread({}, props), {}, {
         fieldErrors: showValidateMessages ? props.fieldErrors : {}
       })));
     }

package/lib/form/index.js

@@ -97,6 +97,10 @@ var Form = function Form(_ref) {
     fieldErrors = _useState8[0],
     setFieldErrors = _useState8[1];
   var fieldsValidators = (0, _react.useRef)({});
+  var _useState9 = (0, _react.useState)(0),
+    _useState10 = _slicedToArray(_useState9, 2),
+    oldFieldsValidatorsQuantity = _useState10[0],
+    setOldFieldsValidatorsQuantity = _useState10[1];
   var context = (0, _react.useContext)(_withFormSecurity.FormSecurityContext);
   var usedData = useInternalState ? data : dataSource;
   var getValidatesErrorMessages = function getValidatesErrorMessages(validators, fieldValue) {
@@ -239,25 +243,21 @@ var Form = function Form(_ref) {
       setSubmitFormOnEnter(submitOnPressEnterKey);
     }
   }, [submitOnPressEnterKey]);
+  (0, _react.useEffect)(function () {
+    var newValidatorsQuantity = Object.values(fieldsValidators.current).reduce(function (acc, currentValue) {
+      return acc + ((currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) || 0);
+    }, 0);
+    if (fieldsValidators.current && onValidateForm && oldFieldsValidatorsQuantity !== newValidatorsQuantity) {
+      setOldFieldsValidatorsQuantity(newValidatorsQuantity);
+      onValidateForm(checkIsValid(usedData, true, fieldsValidators.current));
+    }
+  }, [fieldsValidators.current, oldFieldsValidatorsQuantity, onValidateForm, JSON.stringify(usedData)]);
   var contextValues = {
     skeletonize: skeletonize,
     handlerFieldChange: onFieldChange,
     handlerFieldValidade: onValidate,
     handlerStoreValidators: function handlerStoreValidators(fieldName, fieldValidates) {
-      var oldFieldsValidators = _objectSpread({}, fieldsValidators.current);
       fieldsValidators.current = _objectSpread(_objectSpread({}, fieldsValidators.current), {}, _defineProperty({}, fieldName, fieldValidates));
-      if (onValidateForm && oldFieldsValidators && oldFieldsValidators[fieldName]) {
-        var oldValidatorsValue = Object.values(oldFieldsValidators[fieldName]);
-        var newValidatorValue = Object.values(fieldValidates);
-        var validatorsIsNotEqual = oldValidatorsValue.length !== newValidatorValue.length;
-        if (validatorsIsNotEqual) {
-          if (!useInternalState && onDataChange) {
-            onValidateForm(checkIsValid(dataSource, true, fieldsValidators.current));
-          } else {
-            onValidateForm(checkIsValid(data, true, fieldsValidators.current));
-          }
-        }
-      }
     },
     handlerRemoveValidators: onRemoveFieldValidators,
     data: useInternalState ? data : dataSource,

package/lib/form/types.d.ts

@@ -156,6 +156,7 @@ interface FormContextProps {
 }
 interface WithFieldProps {
     name: string;
+    data?: Data;
     handlerStoreValidators?: (name: string, validators: Validator | Validator[]) => void;
     handlerRemoveValidators?: (name: string) => void;
     validators?: Validator | Validator[] | PeriodValidator | PeriodValidator[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linear-react-components-ui",
-  "version": "1.0.10-rc.14",
+  "version": "1.0.10-rc.16",
   "description": "Linear Sistemas ReactJs Components",
   "main": "lib/index.js",
   "module": "lib/index.cjs",