aport-tools 4.4.40 → 4.4.41

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-/*! aport-tools v4.4.40 | ISC */
+/*! aport-tools v4.4.41 | ISC */
 import React, { useContext, useState, createContext, useRef, useEffect, useMemo, useCallback } from 'react';
 import { StyleSheet, Text as Text$1, Animated, View, TouchableOpacity, Image, TextInput, Modal, Pressable, FlatList, Keyboard, Platform, Alert, ActivityIndicator } from 'react-native';
 import { ThemeContext } from 'aport-themes';
@@ -377,15 +377,9 @@ var styles$9 = StyleSheet.create({
 });
 
 // src/forms/FormContext.tsx
-// Create a ref to hold the global `setFormValue` function
-var globalSetFormValueRef = {
-  current: null
-};
 // Utility to use `setFormValue` globally
 var setFormValueGlobal = function setFormValueGlobal(name, value, firstValue) {
-  if (globalSetFormValueRef.current) {
-    globalSetFormValueRef.current(name, value, firstValue);
-  } else {
+  {
     console.warn("setFormValueGlobal was called before the Form was rendered.");
   }
 };
@@ -410,19 +404,14 @@ var Form = function Form(_a) {
   var _d = useState({}),
     firstValues = _d[0],
     setFirstValues = _d[1]; // Track firstValues
-  // Assign the local `setFormValue` to the global ref on first render
-  React.useEffect(function () {
-    globalSetFormValueRef.current = setFormValue;
-    return function () {
-      globalSetFormValueRef.current = null; // Cleanup on unmount
-    };
-  }, []);
   var setFormValue = function setFormValue(name, value, firstValue) {
+    // Update formValues with the latest value
     setFormValues(function (prev) {
       var _a;
       return __assign(__assign({}, prev), (_a = {}, _a[name] = value, _a));
     });
-    if (firstValue !== undefined) {
+    // If firstValue exists and is not empty, set it in firstValues
+    if (firstValue !== undefined && firstValue !== null && firstValue !== "") {
       setFirstValues(function (prev) {
         var _a;
         return __assign(__assign({}, prev), (_a = {}, _a[name] = firstValue, _a));
@@ -439,8 +428,14 @@ var Form = function Form(_a) {
               var hasFirstValue = key in firstValues;
               var isModified = hasFirstValue && formValues[key] !== firstValues[key];
               var isNewValue = !hasFirstValue;
+              // If the field was modified or is a new value, include it in the modified values
               if (isModified || isNewValue) {
                 result[key] = formValues[key];
+              } else {
+                // If there were no changes, use the firstValue
+                if (hasFirstValue && firstValues[key] !== undefined) {
+                  result[key] = firstValues[key];
+                }
               }
               return result;
             }, {});
@@ -571,14 +566,16 @@ var Input = function Input(_a) {
   var isFirstRender = useRef(true); // Track the first render
   // Initialize the internal value when `firstValue` changes or on first render
   useEffect(function () {
-    var _a;
     if (isFirstRender.current) {
       isFirstRender.current = false;
-      var initialValue = (_a = firstValue !== null && firstValue !== void 0 ? firstValue : formValues[name]) !== null && _a !== void 0 ? _a : ""; // Priority: firstValue > formValues[name] > ""
-      setInternalValue(initialValue);
-      setFormValue(name, initialValue, firstValue); // Initialize the form value globally
+      if (firstValue !== undefined) {
+        setInternalValue(firstValue);
+        setFormValue(name, firstValue, firstValue); // Pass firstValue here
+      } else {
+        setInternalValue(formValues[name] || "");
+      }
     }
-  }, [firstValue, formValues, name, setFormValue]);
+  }, [firstValue]);
   /**
    * Handles text changes in the input field, applying formatting based on the inputType.
    *