@mcurros2/microm 1.1.265-0 → 1.1.266-0

package/dist/index.js

@@ -34365,32 +34365,35 @@ const $900fa559ce35569a$export$4003d000af5d7585 = /*#__PURE__*/ (0, $b4te3$react
         required: resolvedSelectProps?.required,
         requiredMessage: requiredLabel
     });
+    const bindingColumnValue = form.values[column.name];
+    const resolvedBindingValue = typeof bindingColumnValue === 'string' ? selectData.find((item)=>typeof item.value === 'string' && item.value.localeCompare(bindingColumnValue, undefined, {
+            sensitivity: 'base'
+        }) === 0)?.value ?? bindingColumnValue : bindingColumnValue;
+    const { onChange: mantineOnChange, value: _mantineValue, ...lookupInputProps } = lookupSelectAPI.inputProps;
+    const handleSelectChange = (0, $b4te3$react.useCallback)((nextValue)=>{
+        if (typeof nextValue === 'string') {
+            const matchedValue = selectData.find((item)=>typeof item.value === 'string' && item.value.localeCompare(nextValue, undefined, {
+                    sensitivity: 'base'
+                }) === 0)?.value ?? nextValue;
+            mantineOnChange(matchedValue);
+            return;
+        }
+        mantineOnChange(nextValue);
+    }, [
+        mantineOnChange,
+        selectData
+    ]);
     // MMC: Effect for setting the column valueDescription
     (0, $b4te3$react.useEffect)(()=>{
-        const value = entityForm.form.values[column.name];
-        if (value) {
-            const index = selectData.findIndex((item)=>item.value === value);
+        if (typeof resolvedBindingValue !== 'string') console.error(`LookupSelect: Column.Value is not resolved to a string for column ${column.name}. This may cause unexpected behavior.`);
+        if (resolvedBindingValue) {
+            const index = selectData.findIndex((item)=>item.value === resolvedBindingValue);
             if (index >= 0) column.valueDescription = selectData[index].label;
             else column.valueDescription = '';
         } else column.valueDescription = '';
     }, [
         column,
-        entityForm.form.values,
-        selectData
-    ]);
-    // MMC: Effect for setting the key column value to the case of the selectData
-    const bindingColumnValue = form.values[column.name];
-    (0, $b4te3$react.useEffect)(()=>{
-        if (formMode === 'add') return;
-        const originalItem = selectData.find((item)=>item.value.localeCompare(bindingColumnValue, undefined, {
-                sensitivity: 'base'
-            }) === 0)?.value ?? null;
-        if (originalItem !== null) form.setFieldValue(column.name, originalItem);
-    }, [
-        bindingColumnValue,
-        column.name,
-        form,
-        formMode,
+        resolvedBindingValue,
         selectData
     ]);
     const readoOnlyResult = resolvedSelectProps?.readOnly || entityForm.formMode === 'view' || lookupSelectAPI.status.loading || formStatus?.loading || column.hasFlag((0, $4H7ea.EntityColumnFlags).pk) && entityForm.formMode !== 'add' ? true : false;
@@ -34437,7 +34440,9 @@ const $900fa559ce35569a$export$4003d000af5d7585 = /*#__PURE__*/ (0, $b4te3$react
             ]
         }),
         rightSectionWidth: enableEdit ? "auto" : undefined,
-        ...lookupSelectAPI.inputProps,
+        value: typeof resolvedBindingValue === 'string' ? resolvedBindingValue : null,
+        onChange: handleSelectChange,
+        ...lookupInputProps,
         ref: ref
     });
 });