@apia/validations 2.0.9 → 2.0.11

package/dist/index.js

@@ -273,23 +273,14 @@ const validationsStore = new class {
      * Inicializa el estado de un nuevo formulario
      */
     __publicField$9(this, "registerForm", (formName, props = { avoidFieldsOverride: false }) => {
-      props.persistToSessionStorage && this.loadFromSessionStorage(formName);
       if (this.activeForms.includes(formName)) {
-        this.updateFormStore(
-          formName,
-          {
-            avoidFieldsOverride: props.avoidFieldsOverride
-          },
-          true
-        );
+        this.updateFormStore(formName, {
+          avoidFieldsOverride: props.avoidFieldsOverride
+        });
         if (props.initialValues)
           Object.entries(props.initialValues).forEach(([fieldId, fieldProps]) => {
             if (fieldProps instanceof Object)
-              this.updateField(
-                formName,
-                { name: fieldId, ...fieldProps },
-                { avoidFieldsOverride: props.avoidFieldsOverride }
-              );
+              this.updateField(formName, { name: fieldId, ...fieldProps });
           });
         return;
       }
@@ -300,18 +291,10 @@ const validationsStore = new class {
         isTouched: false,
         isValid: false,
         name: formName,
-        validationResult: null,
-        persistToSessionStorage: props.persistToSessionStorage
+        validationResult: null
       });
       Object.entries(props.initialValues ?? {}).forEach(([name, value]) => {
-        this.updateField(
-          formName,
-          { name, value },
-          {
-            markFormAsTouched: false,
-            avoidFieldsOverride: props.avoidFieldsOverride
-          }
-        );
+        this.updateField(formName, { name, value }, { markFormAsTouched: false });
       });
     });
     /**
@@ -335,7 +318,7 @@ const validationsStore = new class {
         this.updateFormStore(formName, { isValid: false });
     });
     __publicField$9(this, "setFormIsTouched", (formName, isTouched = true) => {
-      this.updateFormStore(formName, { isTouched }, true);
+      this.updateFormStore(formName, { isTouched });
     });
     /**
      * Elimina un campo del registro de validación de un formulario. De esta
@@ -372,11 +355,9 @@ const validationsStore = new class {
     __publicField$9(this, "updateField", (formName, field, options) => {
       const previousValue = this.getFieldStore(formName, field.name)?.value;
       if (this.getFormStore(formName))
-        this.updateFormStore(formName, { isValid: false }, true);
+        this.updateFormStore(formName, { isValid: false });
       else
         this.registerForm(formName);
-      if (previousValue !== void 0 && options?.avoidFieldsOverride)
-        return;
       const isTouched = field.value !== void 0 && field.value !== previousValue && options?.markFormAsTouched !== false;
       if (!this.existsField(formName, field.name))
         this.registerField(formName, field, {
@@ -468,76 +449,19 @@ const validationsStore = new class {
           });
           console.error("Campos que fallaron la validaci\xF3n", fieldsWithError);
         }
-        this.updateFormStore(
-          formName,
-          {
-            isValid: false,
-            validationResult: validationErrors
-          },
-          true
-        );
+        this.updateFormStore(formName, {
+          isValid: false,
+          validationResult: validationErrors
+        });
         return validationErrors;
       }
-      this.updateFormStore(
-        formName,
-        {
-          isValid: true,
-          validationResult: validationValues
-        },
-        true
-      );
+      this.updateFormStore(formName, {
+        isValid: true,
+        validationResult: validationValues
+      });
       return validationValues;
     });
   }
-  loadFromSessionStorage(formName) {
-    const storageValue = sessionStorage.getItem(this.makeFormName(formName));
-    if (storageValue) {
-      try {
-        const parsedValue = JSON.parse(storageValue);
-        this.activeForms.push(formName);
-        this.updateFormStore(formName, parsedValue.formProps, true);
-        Object.entries(parsedValue.fields).forEach(([name, field]) => {
-          propsStore.updateField(
-            this.makeFieldName(formName, name),
-            {
-              ...this.getFieldStore(formName, name),
-              ...field
-            },
-            { noEmit: true }
-          );
-        });
-        return true;
-      } catch (e) {
-      }
-    }
-    return false;
-  }
-  persistFormToSessionStorage(formName) {
-    const { isTouched, isValid, validationResult, ...formProps } = this.getFormStore(formName);
-    const shouldPersist = formProps.persistToSessionStorage;
-    if (shouldPersist) {
-      const fields = formProps.fields.map((current) => {
-        const {
-          validationFunction,
-          isTouched: isTouched2,
-          error,
-          validationValueParser,
-          ...field
-        } = this.getFieldStore(formName, current);
-        return field;
-      }).reduce(
-        (o, c) => ({ ...o, [c.name]: c }),
-        {}
-      );
-      sessionStorage.setItem(
-        this.makeFormName(formName),
-        JSON.stringify({
-          formProps,
-          fields
-        })
-      );
-    }
-  }
   getFieldStore(formName, fieldName) {
     return propsStore.getFieldProps(
       this.makeFieldName(formName, fieldName)
@@ -555,12 +479,9 @@ const validationsStore = new class {
       },
       { noEmit }
     );
-    this.persistFormToSessionStorage(formName);
   }
-  updateFormStore(formName, newState, avoidPersist = false) {
+  updateFormStore(formName, newState) {
     propsStore.updateField(this.makeFormName(formName), newState);
-    if (!avoidPersist)
-      this.persistFormToSessionStorage(formName);
   }
   enableFormTouch(formName) {
     this.timeouts[formName] = true;
@@ -571,6 +492,12 @@ const validationsStore = new class {
   makeFormName(formName) {
     return `validation_${formName}`;
   }
+  resetForm(formName) {
+    const state = this.getFormStore(formName);
+    state.fields.forEach((field) => {
+      this.setFieldValue(formName, field, "");
+    });
+  }
 }();
 function useFormSelector(formName, selector, comparator) {
   return usePropsSelector(
@@ -614,7 +541,6 @@ const Form = ({
   initialValues,
   onUnmount,
   onValidate,
-  persistToSessionStorage,
   unregisterOnUnmount
 }) => {
   const actualName = React.useMemo(
@@ -655,8 +581,7 @@ const Form = ({
   useMount(() => {
     validationsStore.registerForm(actualName, {
       avoidFieldsOverride: avoidFieldsOverride ?? initialValues !== void 0,
-      initialValues,
-      persistToSessionStorage
+      initialValues
     });
     setHasRegistered(true);
   });
@@ -916,7 +841,7 @@ const FieldWrapper = ({
     ] });
   }
   return /* @__PURE__ */ jsxs(Box, { className: `fieldWrapper ${className ?? ""}`, ...props, as, children: [
-    /* @__PURE__ */ jsxs(Box, { as: "span", className: "fieldWrapper__label", children: [
+    /* @__PURE__ */ jsxs(Box, { as: "span", children: [
       window.SHOW_REQUIRED_POSITION !== "0" && label && /* @__PURE__ */ jsx(RequiredMark, { isRequired }),
       label,
       !avoidSemicolon && label && /* @__PURE__ */ jsx("abbr", { className: "semicolon", children: ": " }),
@@ -1741,9 +1666,9 @@ var __privateAdd$3 = (obj, member, value) => {
 };
 var _emitter;
 class CollectorField extends EventEmitter {
-  constructor(_name, label, properties) {
+  constructor(name, label, properties) {
     super();
-    this._name = _name;
+    this.name = name;
     this.label = label;
     __privateAdd$3(this, _emitter, new StatefulEmitter({
       isHidden: false
@@ -1777,12 +1702,6 @@ class CollectorField extends EventEmitter {
       this.properties = properties;
     }
   }
-  get name() {
-    return this._name;
-  }
-  set name(name) {
-    this._name = name;
-  }
 }
 _emitter = new WeakMap();
 
@@ -1807,7 +1726,7 @@ var __privateAdd$2 = (obj, member, value) => {
 };
 var __privateSet$1 = (obj, member, value, setter) => {
   __accessCheck$2(obj, member, "write to private field");
-  member.set(obj, value);
+  setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
 var _rules, _validationFunction;
@@ -1943,7 +1862,7 @@ var __privateAdd$1 = (obj, member, value) => {
 };
 var __privateSet = (obj, member, value, setter) => {
   __accessCheck$1(obj, member, "write to private field");
-  member.set(obj, value);
+  setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
 var _options, _useOptions;
@@ -2037,7 +1956,7 @@ const _CollectorLabel = class _CollectorLabel extends CollectorField {
     __publicField$2(this, "type", "label");
     __publicField$2(this, "Component", () => {
       if (this.kind === "label")
-        return /* @__PURE__ */ jsx(Box, { as: this.kind, children: this.label });
+        return /* @__PURE__ */ jsx(Box, { as: this.kind, children: /* @__PURE__ */ jsx("span", { children: this.label }) });
       return /* @__PURE__ */ jsx(Box, { as: this.kind, children: this.label });
     });
   }
@@ -2106,6 +2025,7 @@ class Collector {
       textarea: CollectorTextarea
     });
     __publicField(this, "private__id", `Collector${maxId++}`);
+    __publicField(this, "modal", null);
     __privateAdd(this, _fields, {});
     __publicField(this, "add", (...fields) => {
       fields.forEach((field) => {
@@ -2123,33 +2043,44 @@ class Collector {
     }) => {
       const modal = useModalContext();
       let hasValidated = false;
-      return /* @__PURE__ */ jsx(Box, { ...getVariant("layout.util.collector.formContainer"), children: /* @__PURE__ */ jsxs(
-        Form,
+      return /* @__PURE__ */ jsx(
+        Box,
         {
-          name: this.private__id,
-          onValidate: (result) => {
-            if (hasSucceedFormValidation(result)) {
-              resolve(result.submitValues);
-              modal.close();
+          className: "formContainer",
+          ...getVariant("layout.util.collector.formContainer"),
+          children: /* @__PURE__ */ jsxs(
+            Form,
+            {
+              name: this.private__id,
+              onValidate: (result) => {
+                if (hasSucceedFormValidation(result)) {
+                  const res = resolve(result.submitValues);
+                  if (res) {
+                    modal.close();
+                  }
+                }
+              },
+              children: [
+                /* @__PURE__ */ jsx(Box, { className: "collector__fields", children: Object.values(__privateGet(this, _fields)).map((current) => {
+                  if (current instanceof ValidatedCollectorField)
+                    hasValidated = true;
+                  return /* @__PURE__ */ jsx(current.SuperComponent, {}, current.name);
+                }) }),
+                hasValidated && !hideConfirm && /* @__PURE__ */ jsx(Box, { className: "collector__buttons", children: /* @__PURE__ */ jsx(Button, { variant: "outline", children: getLabel("btnCon").text }) })
+              ]
             }
-          },
-          children: [
-            Object.values(__privateGet(this, _fields)).map((current) => {
-              if (current instanceof ValidatedCollectorField)
-                hasValidated = true;
-              return /* @__PURE__ */ jsx(current.SuperComponent, {}, current.name);
-            }),
-            hasValidated && !hideConfirm && /* @__PURE__ */ jsx(Box, { className: "collector__buttons", children: /* @__PURE__ */ jsx(Button, { variant: "outline", children: getLabel("btnCon").text }) })
-          ]
+          )
         }
-      ) });
+      );
     });
     __publicField(this, "show", (modalProps) => {
+      const { onConfirm, ...actualModalProps } = modalProps ?? {};
       return new Promise((resolve) => {
         const C = __privateGet(this, _Component);
-        ApiaUtil.instance.modals.open({
-          onExited() {
+        const modal = ApiaUtil.instance.modals.open({
+          onExited: () => {
             {
+              this.modal = null;
               resolve(null);
             }
           },
@@ -2158,7 +2089,14 @@ class Collector {
             {
               hideConfirm: modalProps?.hideConfirm,
               resolve: (values) => {
+                if (onConfirm) {
+                  const confirmResult = onConfirm(values);
+                  if (!confirmResult) {
+                    return false;
+                  }
+                }
                 resolve(values);
+                return true;
               }
             }
           ),
@@ -2168,8 +2106,9 @@ class Collector {
               "input,textarea,select,button:not(.modal__closeButton)"
             );
           },
-          ...modalProps
+          ...actualModalProps
         });
+        this.modal = modal;
       });
     });
   }