aport-tools 4.4.21 → 4.4.23

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! aport-tools v4.4.21 | ISC */
+/*! aport-tools v4.4.23 | ISC */
 'use strict';
 
 var React = require('react');
@@ -550,15 +550,19 @@ var Input = function Input(_a) {
   var _c = React.useState(""),
     internalValue = _c[0],
     setInternalValue = _c[1];
-  // Initialize the internal value based on `firstValue` or `formValues`
+  var isFirstRender = React.useRef(true); // Track the first render
+  // Initialize the internal value when `firstValue` changes or on first render
   React.useEffect(function () {
-    if (firstValue) {
-      setInternalValue(firstValue);
-      setFormValue(name, firstValue);
-    } else {
-      setInternalValue(formValues[name] || "");
+    if (isFirstRender.current) {
+      isFirstRender.current = false;
+      if (firstValue !== undefined) {
+        setInternalValue(firstValue);
+        setFormValue(name, firstValue);
+      } else {
+        setInternalValue(formValues[name] || "");
+      }
     }
-  }, [firstValue, formValues[name]]);
+  }, [firstValue]); // Only re-run if `firstValue` changes
   /**
    * Handles text changes in the input field, applying formatting based on the inputType.
    *
@@ -768,73 +772,71 @@ var InputList = function InputList(_a) {
   var colors = theme.colors;
   // Initialize selected options based on firstValue
   // Filter initial selections from options based on `firstValue`
-  React.useMemo(function () {
+  var initialSelections = React.useMemo(function () {
     return options.filter(function (opt) {
       return firstValue.includes(opt.value);
     });
   }, [options, firstValue]);
   // State for selected options
-  var _l = React.useState(multi ? firstValue : firstValue.length > 0 ? firstValue[0] : null),
+  var _l = React.useState(multi ? initialSelections : initialSelections[0] || null),
     selectedOptions = _l[0],
     setSelectedOptions = _l[1];
   // Update form value on mount if firstValue is provided
-  // Update form value and internal state on mount or `firstValue` change
   React.useEffect(function () {
-    var isDifferent = multi ? Array.isArray(selectedOptions) && (selectedOptions.length !== firstValue.length || !selectedOptions.every(function (opt) {
-      return firstValue.includes(opt);
-    })) : selectedOptions !== firstValue[0];
-    if (firstValue && isDifferent) {
-      setSelectedOptions(multi ? firstValue : firstValue[0] || null);
+    if (firstValue && selectedOptions !== firstValue) {
+      setSelectedOptions(firstValue); // Only update if necessary
     }
-  }, [firstValue, selectedOptions, multi]);
-  // Handle option selection
+  }, [firstValue, selectedOptions]);
   var handleSelectOption = function handleSelectOption(option) {
     var updatedSelections;
     if (multi) {
-      var alreadySelected = Array.isArray(selectedOptions) && selectedOptions.some(function (opt) {
+      // Ensure selectedOptions is treated as an array
+      var selectedArray = Array.isArray(selectedOptions) ? selectedOptions : [];
+      var alreadySelected = selectedArray.some(function (opt) {
         return opt.id === option.id;
       });
-      updatedSelections = alreadySelected ? selectedOptions.filter(function (opt) {
+      updatedSelections = alreadySelected ? selectedArray.filter(function (opt) {
         return opt.id !== option.id;
-      }) : Array.isArray(selectedOptions) ? __spreadArray(__spreadArray([], selectedOptions, true), [option], false) : [option];
+      }) : __spreadArray(__spreadArray([], selectedArray, true), [option], false);
       if (!alreadySelected && maxSelection && updatedSelections.length >= maxSelection) {
         setIsDropdownVisible(false);
       }
+      setFormValue(name, updatedSelections);
     } else {
+      // Handle single-selection case
       updatedSelections = option;
+      setFormValue(name, option);
       if (closeOnSelect) setIsDropdownVisible(false);
     }
-    setSelectedOptions(updatedSelections);
-    setFormValue(name, updatedSelections);
+    // Trigger onChange callback with the updated selection
     if (onChange) {
       onChange(updatedSelections);
     }
   };
-  // Check if an option should be disabled
   var isItemDisabled = function isItemDisabled(option) {
-    if (!multi) return false;
-    return maxSelection && Array.isArray(selectedOptions) && selectedOptions.length >= maxSelection && !selectedOptions.some(function (opt) {
+    if (!multi) return false; // Disable check only applies for multi-select
+    // Ensure selectedOptions is treated as an array
+    var selectedArray = Array.isArray(selectedOptions) ? selectedOptions : [];
+    return maxSelection && selectedArray.length >= maxSelection && !selectedArray.some(function (opt) {
       return opt.id === option.id;
     });
   };
-  // Render selected text
   var renderSelectedText = function renderSelectedText() {
     if (multi) {
+      // Ensure selectedOptions is treated as an array
       var selectedArray = Array.isArray(selectedOptions) ? selectedOptions : [];
       return selectedArray.map(function (opt) {
         return opt.label;
-      }).join(", ") || placeholder;
+      }).join(', ') || placeholder;
     }
     return (selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions.label) || placeholder;
   };
-  // Toggle dropdown visibility
   var toggleDropdown = function toggleDropdown() {
     if (!disabled) {
       setIsDropdownVisible(!isDropdownVisible);
       if (!isDropdownVisible) reactNative.Keyboard.dismiss();
     }
   };
-  // Close dropdown
   var handleCloseDropdown = React.useCallback(function () {
     if (isDropdownVisible) setIsDropdownVisible(false);
   }, [isDropdownVisible]);