web-mojo 2.1.458 → 2.1.498

package/dist/chunks/{FormView-C9PgTIH2.js → FormView-DrvkHPA-.js}

@@ -1,4 +1,4 @@
-import { M as Mustache, h as MOJOUtils, V as View } from "./WebApp-BONphh_h.js";
+import { M as Mustache, h as MOJOUtils, V as View } from "./WebApp-BdmNWAj2.js";
 class FormBuilder {
   constructor(config = {}) {
     this.fields = config.fields || [];
@@ -978,7 +978,8 @@ class FormBuilder {
     } = field;
     const inputClass = `form-select ${fieldClass}`.trim();
     const error = this.errors[name];
-    const fieldValue = this.getFieldValue(name) ?? value;
+    const dataValue = this.getFieldValue(name);
+    const fieldValue = dataValue ?? value;
     const attrs = Object.entries(attributes).map(([key, val]) => `${key}="${this.escapeHtml(val)}"`).join(" ");
     const fieldId = this.getFieldId(name);
     let optionsHTML = "";
@@ -1537,7 +1538,8 @@ class FormBuilder {
     if (this.structureOnly) {
       return "";
     }
-    return MOJOUtils.getContextData(this.data, name);
+    const value = MOJOUtils.getContextData(this.data, name);
+    return value;
   }
   /**
    * Render tag input field
@@ -3037,6 +3039,9 @@ class CollectionSelectView extends View {
     }
   }
   getValue() {
+    if (this.selectedValue === 0 || this.selectedValue === "0") {
+      return null;
+    }
     return this.selectedValue;
   }
   getLabel() {
@@ -3060,6 +3065,9 @@ class CollectionSelectView extends View {
   }
   // FormBuilder integration
   getFormValue() {
+    if (this.selectedValue === 0 || this.selectedValue === "0") {
+      return null;
+    }
     return this.selectedValue;
   }
   setFormValue(value) {
@@ -4255,8 +4263,8 @@ class FormView extends View {
     this.formConfig = formConfig || { fields: fields || [] };
     this.formBuilder = new FormBuilder({
       ...this.formConfig,
-      structureOnly: true,
-      // Only generate structure, FormView will control values
+      data: this.data,
+      // Pass data so field.value defaults work
       errors
     });
   }
@@ -4271,7 +4279,8 @@ class FormView extends View {
       if (this.model.attributes && typeof this.model.attributes === "object") {
         Object.assign(formData, this.model.attributes);
       } else if (typeof this.model.toJSON === "function") {
-        Object.assign(formData, this.model.toJSON());
+        const modelData = this.model.toJSON();
+        Object.assign(formData, modelData);
       } else if (typeof this.model === "object" && this.model.constructor === Object) {
         Object.assign(formData, this.model);
       }
@@ -4332,7 +4341,9 @@ class FormView extends View {
     const fieldElement = this.element.querySelector(`[name="${fieldConfig.name}"]`);
     if (!fieldElement) return;
     const value = MOJOUtils.getContextData(this.data, fieldConfig.name);
-    this.setFieldValue(fieldElement, fieldConfig, value);
+    if (value !== void 0 && value !== null) {
+      this.setFieldValue(fieldElement, fieldConfig, value);
+    }
   }
   /**
    * Initialize form components after rendering
@@ -4352,7 +4363,6 @@ class FormView extends View {
   initializeImageFields() {
     const imageFields = this.element.querySelectorAll(".image-drop-zone.droppable");
     if (imageFields.length > 0) {
-      applyFileDropMixin(FormView);
       this.enableFileDrop({
         acceptedTypes: ["image/*"],
         maxFileSize: 10 * 1024 * 1024,
@@ -4385,7 +4395,9 @@ class FormView extends View {
   initializeChangeHandlers() {
     if (!this.element) return;
     const inputs = this.element.querySelectorAll("input:not([data-action]), select:not([data-action]), textarea:not([data-action])");
+    console.log("FormView: initializeChangeHandlers - found", inputs.length, "inputs");
     inputs.forEach((input) => {
+      console.log("FormView: Processing input:", input.type, input.name, input.getAttribute("data-change-action"));
       if (input.hasAttribute("data-component") || input.classList.contains("form-check-input")) {
         return;
       }
@@ -4400,6 +4412,15 @@ class FormView extends View {
             if (!input.checked) return;
           } else if (input.multiple && input.selectedOptions) {
             value = Array.from(input.selectedOptions).map((opt) => opt.value);
+          } else if (input.type === "file") {
+            const changeAction = input.getAttribute("data-change-action");
+            if (changeAction === "image-selected") {
+              this.onChangeImageSelected(event, input);
+              return;
+            } else if (changeAction === "file-selected") {
+              this.onChangeFileSelected(event, input);
+              return;
+            }
           }
           this.handleFieldChange(fieldName, value);
         }
@@ -4679,11 +4700,23 @@ class FormView extends View {
    * Handle image upload click
    */
   async onActionClickImageUpload(event, element) {
+    console.log("FormView: onActionClickImageUpload called");
+    console.log("FormView: element:", element);
     const fieldId = element.getAttribute("data-field-id");
-    if (!fieldId) return;
+    console.log("FormView: fieldId:", fieldId);
+    if (!fieldId) {
+      console.error("FormView: No fieldId attribute found");
+      return;
+    }
     const fileInput = this.element.querySelector(`#${fieldId}`);
+    console.log("FormView: fileInput:", fileInput);
     if (fileInput && !fileInput.disabled) {
       fileInput.click();
+      console.log("FormView: fileInput.click() called");
+    } else if (!fileInput) {
+      console.error("FormView: fileInput not found for fieldId:", fieldId);
+    } else {
+      console.log("FormView: fileInput is disabled");
     }
   }
   /**
@@ -4812,15 +4845,29 @@ class FormView extends View {
    * Handle image selection
    */
   async onChangeImageSelected(event, element) {
+    console.log("FormView: onChangeImageSelected called");
+    console.log("FormView: element:", element);
+    console.log("FormView: element.files:", element.files);
     const fieldName = element.getAttribute("data-field");
     const file = element.files[0];
+    console.log("FormView: fieldName:", fieldName);
+    console.log("FormView: file:", file);
     if (fieldName && file) {
+      console.log("FormView: fieldName and file exist, processing...");
       const fieldConfig = this.findFieldConfig(fieldName);
+      console.log("FormView: fieldConfig:", fieldConfig);
       const previewUrl = URL.createObjectURL(file);
+      console.log("FormView: previewUrl created:", previewUrl);
       if (fieldConfig && fieldConfig.imageSize) {
+        console.log("FormView: Image cropping is required, imageSize:", fieldConfig.imageSize);
         try {
           const ImageCropView = window.MOJO?.plugins?.ImageCropView;
+          console.log("FormView: ImageCropView available?", !!ImageCropView);
           if (!ImageCropView) {
+            console.log("FormView: ImageCropView not available, falling back to normal handling");
+            this.data[fieldName] = file;
+            await this.updateImagePreview(fieldName, previewUrl);
+            this.emit("image:selected", { field: fieldName, file, form: this });
             return;
           }
           const result = await ImageCropView.showDialog(previewUrl, {
@@ -4853,6 +4900,8 @@ class FormView extends View {
             element.value = "";
           }
         } catch (error) {
+          console.error("FormView: Error during image cropping:", error);
+          console.log("FormView: Falling back to normal image handling after error");
           this.data[fieldName] = file;
           await this.updateImagePreview(fieldName, previewUrl);
           this.emit("image:selected", {
@@ -4867,14 +4916,20 @@ class FormView extends View {
           });
         }
       } else {
+        console.log("FormView: Normal image handling (no cropping)");
         this.data[fieldName] = file;
+        console.log("FormView: File stored in this.data[" + fieldName + "]");
         await this.updateImagePreview(fieldName, previewUrl);
+        console.log("FormView: updateImagePreview completed");
         this.emit("image:selected", {
           field: fieldName,
           file,
           form: this
         });
+        console.log("FormView: image:selected event emitted");
       }
+    } else {
+      console.log("FormView: Missing fieldName or file - not processing");
     }
   }
   /**
@@ -5040,6 +5095,32 @@ class FormView extends View {
       checkboxes.forEach((checkbox) => {
         data[checkbox.name] = checkbox.checked;
       });
+      const numberInputs = form.querySelectorAll('input[type="number"]');
+      numberInputs.forEach((input) => {
+        if (input.name && data[input.name] !== void 0 && data[input.name] !== "") {
+          const num = Number(data[input.name]);
+          if (!isNaN(num)) {
+            data[input.name] = num;
+          }
+        }
+      });
+      this.formConfig.fields?.forEach((field) => {
+        if (field.type === "select" && field.name && data[field.name] !== void 0) {
+          const fieldConfig = this.getFormFieldConfig(field.name);
+          if (fieldConfig?.options && Array.isArray(fieldConfig.options)) {
+            const allNumeric = fieldConfig.options.every((opt) => {
+              const val = typeof opt === "object" ? opt.value : opt;
+              return val === "" || !isNaN(Number(val));
+            });
+            if (allNumeric && data[field.name] !== "") {
+              const num = Number(data[field.name]);
+              if (!isNaN(num)) {
+                data[field.name] = num;
+              }
+            }
+          }
+        }
+      });
       const jsonFields = form.querySelectorAll('[data-field-type="json"]');
       jsonFields.forEach((textarea) => {
         try {
@@ -5048,6 +5129,13 @@ class FormView extends View {
           data[textarea.name] = textarea.value;
         }
       });
+      this.customComponents.forEach((component, fieldName) => {
+        if (component.getFormValue) {
+          data[fieldName] = component.getFormValue();
+        } else if (component.getValue) {
+          data[fieldName] = component.getValue();
+        }
+      });
       for (const [key, value] of Object.entries(this.data)) {
         if (value instanceof File) {
           try {
@@ -5995,6 +6083,7 @@ class FieldStatusManager {
     this.timeouts.clear();
   }
 }
+applyFileDropMixin(FormView);
 const FormView$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   FormView,
@@ -6005,4 +6094,4 @@ export {
   applyFileDropMixin as a,
   FormView$1 as b
 };
-//# sourceMappingURL=FormView-C9PgTIH2.js.map
+//# sourceMappingURL=FormView-DrvkHPA-.js.map