aport-tools 4.4.14 → 4.4.16

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! aport-tools v4.4.14 | ISC */
+/*! aport-tools v4.4.16 | ISC */
 'use strict';
 
 var React = require('react');
@@ -751,29 +751,34 @@ var InputList = function InputList(_a) {
     closeOnSelect = _h === void 0 ? true : _h,
     maxSelection = _a.maxSelection,
     onChange = _a.onChange;
-  var _j = useFormContext();
-    _j.formValues;
-    var setFormValue = _j.setFormValue,
+  var _j = useFormContext(),
+    formValues = _j.formValues,
+    setFormValue = _j.setFormValue,
     formErrors = _j.errors;
   var _k = React.useState(false),
     isDropdownVisible = _k[0],
     setIsDropdownVisible = _k[1];
-  var sortedOptions = sortBy ? __spreadArray([], options, true).sort(function (a, b) {
-    return a[sortBy] > b[sortBy] ? 1 : -1;
-  }) : options;
+  var selectedOptions = formValues[name] || (multi ? [] : null);
+  var sortedOptions = React.useMemo(function () {
+    return sortBy ? __spreadArray([], options, true).sort(function (a, b) {
+      return a[sortBy] > b[sortBy] ? 1 : -1;
+    }) : options;
+  }, [options, sortBy]);
   var theme = React.useContext(aportThemes.ThemeContext).theme;
   var colors = theme.colors;
-  // Initialize selected options based on firstValue
-  var initialSelections = options.filter(function (opt) {
-    return firstValue.includes(opt.value);
-  });
-  var _l = React.useState(multi ? initialSelections : initialSelections[0] || null),
-    selectedOptions = _l[0];
-    _l[1];
-  // Update form value on mount if firstValue is provided
+  var _l = React.useState([]);
+    _l[0];
+    var setInternalValue = _l[1];
+  // Initialize the internal value based on `firstValue` or `formValues`
   React.useEffect(function () {
-    setFormValue(name, multi ? initialSelections : initialSelections[0] || null);
-  }, [firstValue]);
+    var selectedValue = formValues[name];
+    if (firstValue) {
+      setInternalValue(firstValue);
+      setFormValue(name, firstValue);
+    } else {
+      setInternalValue(selectedValue || "");
+    }
+  }, [firstValue, formValues[name]]);
   /**
    * Handles selection of an option. Adds or removes the option from selectedOptions based on
    * multi-selection and maxSelection criteria.
@@ -782,49 +787,35 @@ var InputList = function InputList(_a) {
   var handleSelectOption = function handleSelectOption(option) {
     var updatedSelections;
     if (multi) {
-      // Ensure selectedOptions is treated as an array
-      var selectedArray = Array.isArray(selectedOptions) ? selectedOptions : [];
-      var alreadySelected = selectedArray.some(function (opt) {
+      var alreadySelected = (selectedOptions || []).some(function (opt) {
         return opt.id === option.id;
       });
-      updatedSelections = alreadySelected ? selectedArray.filter(function (opt) {
+      updatedSelections = alreadySelected ? (selectedOptions || []).filter(function (opt) {
         return opt.id !== option.id;
-      }) : __spreadArray(__spreadArray([], selectedArray, true), [option], false);
+      }) : __spreadArray(__spreadArray([], selectedOptions || [], true), [option], false);
       if (!alreadySelected && maxSelection && updatedSelections.length >= maxSelection) {
         setIsDropdownVisible(false);
       }
+      setInternalValue(updatedSelections);
       setFormValue(name, updatedSelections);
     } else {
-      // Handle single-selection case
       updatedSelections = option;
+      setInternalValue(option);
       setFormValue(name, option);
       if (closeOnSelect) setIsDropdownVisible(false);
     }
-    // Trigger onChange callback with the updated selection
     if (onChange) {
       onChange(updatedSelections);
     }
   };
-  var isItemDisabled = function isItemDisabled(option) {
-    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;
-    });
-  };
   /**
-  * Renders selected options as a comma-separated string or the placeholder if none selected.
-  * @returns {string} - The display text for selected options or placeholder.
-  */
+   * Renders selected options as a comma-separated string or the placeholder if none selected.
+   * @returns {string} - The display text for selected options or placeholder.
+   */
   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;
-    }
+    if (multi) return (selectedOptions || []).map(function (opt) {
+      return opt.label;
+    }).join(", ") || placeholder;
     return (selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions.label) || placeholder;
   };
   /**
@@ -843,6 +834,11 @@ var InputList = function InputList(_a) {
     if (isDropdownVisible) setIsDropdownVisible(false);
   }, [isDropdownVisible]);
   // Conditionally render item as disabled if max selection reached and item is unselected
+  var isItemDisabled = function isItemDisabled(option) {
+    return multi && maxSelection && selectedOptions.length >= maxSelection && !selectedOptions.some(function (opt) {
+      return opt.id === option.id;
+    });
+  };
   return /*#__PURE__*/React.createElement(reactNative.View, {
     style: [styles$4.container, style]
   }, /*#__PURE__*/React.createElement(reactNative.Text, {
@@ -880,9 +876,9 @@ var InputList = function InputList(_a) {
     },
     renderItem: function renderItem(_a) {
       var item = _a.item;
-      var isSelected = multi ? Array.isArray(selectedOptions) && selectedOptions.some(function (opt) {
+      var isSelected = multi ? selectedOptions.some(function (opt) {
         return opt.id === item.id;
-      }) : selectedOptions && 'id' in selectedOptions && selectedOptions.id === item.id;
+      }) : (selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions.id) === item.id;
       var isDisabled = isItemDisabled(item);
       return /*#__PURE__*/React.createElement(reactNative.TouchableOpacity, {
         onPress: function onPress() {
@@ -920,12 +916,12 @@ var styles$4 = reactNative.StyleSheet.create({
     borderRadius: 5
   },
   dropdownContainer: {
-    position: 'absolute',
-    top: '30%',
+    position: "absolute",
+    top: "30%",
     // Center the dropdown vertically
-    alignSelf: 'center',
-    width: '90%',
-    backgroundColor: '#fff',
+    alignSelf: "center",
+    width: "90%",
+    backgroundColor: "#fff",
     borderRadius: 8,
     elevation: 5,
     paddingVertical: 10
@@ -934,16 +930,16 @@ var styles$4 = reactNative.StyleSheet.create({
     padding: 12
   },
   disabledText: {
-    color: '#999'
+    color: "#999"
   },
   separator: {
     height: 1,
-    backgroundColor: '#ddd',
+    backgroundColor: "#ddd",
     marginHorizontal: 8
   },
   overlay: {
     flex: 1,
-    backgroundColor: 'rgba(0,0,0,0.3)'
+    backgroundColor: "rgba(0,0,0,0.3)"
   }
 });