arengibook 2.4.629 → 2.4.631

package/dist/index.js

@@ -39109,43 +39109,55 @@ var MultiSelectMetaAsync = function MultiSelectMetaAsync(_ref) {
     useCheckbox = _ref$useCheckbox === void 0 ? false : _ref$useCheckbox,
     _ref$showSelectAll = _ref.showSelectAll,
     showSelectAll = _ref$showSelectAll === void 0 ? true : _ref$showSelectAll;
+  // const [selectedOptions, setSelectedOptions] = useState(value ?? []);
   var _useState = useState(null),
     _useState2 = _slicedToArray$9(_useState, 2),
     selectedOptions = _useState2[0],
     setSelectedOptions = _useState2[1];
-  var _useState3 = useState(null),
-    _useState4 = _slicedToArray$9(_useState3, 2);
-    _useState4[0];
-    _useState4[1];
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray$9(_useState5, 2),
-    loadedOptions = _useState6[0],
-    setLoadedOptions = _useState6[1];
-  var _useState7 = useState(''),
-    _useState8 = _slicedToArray$9(_useState7, 2),
-    inputValue = _useState8[0];
-    _useState8[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray$9(_useState3, 2),
+    loadedOptions = _useState4[0],
+    setLoadedOptions = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray$9(_useState5, 2);
+    _useState6[0];
+    _useState6[1];
   var multiSelectRef = useRef(null);
-  var _useState9 = useState(false),
-    _useState0 = _slicedToArray$9(_useState9, 2),
-    loading = _useState0[0],
-    setLoading = _useState0[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray$9(_useState7, 2),
+    loading = _useState8[0],
+    setLoading = _useState8[1];
   var loadLazyTimeout = useRef();
-  var currentPageRef = useRef(1);
+  useRef(1);
   var isOptionsArray = Array.isArray(options);
-  var numericValue = Array.isArray(value) ? value.map(function (v) {
-    return typeof v === 'string' ? parseInt(v, 10) : v;
-  }) : [];
-  var numericObjValue = Array.isArray(objValue) ? objValue.map(function (opt) {
+  console.log(isOptionsArray);
+  var numObjValue = objValue.map(function (opt) {
     return _objectSpread2(_objectSpread2({}, opt), {}, _defineProperty$b({}, optionValue, typeof opt[optionValue] === 'string' ? parseInt(opt[optionValue], 10) : opt[optionValue]));
-  }) : [];
+  });
+  var numValue = function numValue() {
+    if (value && Array.isArray(value) && value.length) {
+      return value;
+    } else if (objValue && Array.isArray(objValue) && objValue.length) {
+      return objValue.map(function (opt) {
+        return parseInt(opt.value);
+      });
+    } else {
+      return [];
+    }
+  };
+  useEffect(function () {
+    var _numValue;
+    setSelectedOptions(objValue ? _toConsumableArray$7(numObjValue.map(function (opt) {
+      return opt[optionValue];
+    })) : (_numValue = numValue()) !== null && _numValue !== void 0 ? _numValue : []);
+  }, []);
   useEffect(function () {
     if (isOptionsArray) {
       setLoadedOptions(options);
     } else {
       var loadInitialOptions = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-          var result, initialValues;
+          var result, _result$options, exists;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.n) {
               case 0:
@@ -39156,10 +39168,16 @@ var MultiSelectMetaAsync = function MultiSelectMetaAsync(_ref) {
               case 1:
                 result = _context.v;
                 setLoadedOptions((result === null || result === void 0 ? void 0 : result.options) || []);
-                initialValues = numericObjValue ? numericObjValue.map(function (opt) {
-                  return opt[optionValue];
-                }) : numericValue;
-                setSelectedOptions(initialValues);
+                if (numObjValue) {
+                  exists = result === null || result === void 0 || (_result$options = result.options) === null || _result$options === void 0 ? void 0 : _result$options.some(function (opt) {
+                    return opt[optionValue] === numObjValue[optionValue];
+                  });
+                  if (!exists) {
+                    setLoadedOptions(function (prev) {
+                      return [].concat(_toConsumableArray$7(prev), [numObjValue]);
+                    });
+                  }
+                }
               case 2:
                 return _context.a(2);
             }
@@ -39171,7 +39189,7 @@ var MultiSelectMetaAsync = function MultiSelectMetaAsync(_ref) {
       }();
       loadInitialOptions();
     }
-  }, [options, numericObjValue, numericValue]);
+  }, [options]);
   useEffect(function () {
     var observer = new MutationObserver(function () {
       var panel = document.querySelector('.p-multiselect-panel.p-component');
@@ -39190,10 +39208,10 @@ var MultiSelectMetaAsync = function MultiSelectMetaAsync(_ref) {
 
   // Gestion du changement de sélection
   var handleChange = function handleChange(e) {
-    console.log(selectedOptions);
     setSelectedOptions(e.value);
     if (onChange) onChange(e.value);
   };
+
   // Inversion de couleur pour le texte des badges
   var inverseColor = function inverseColor(hexColor) {
     var r = parseInt(hexColor.substr(1, 2), 16);
@@ -39268,45 +39286,64 @@ var MultiSelectMetaAsync = function MultiSelectMetaAsync(_ref) {
   };
 
   // Fonction de lazy loading
+  // const onLazyLoad = (event) => {
+  //     if (isOptionsArray) return;
+  //     setLoading(true);
+  //     if (loadLazyTimeout.current) {
+  //         clearTimeout(loadLazyTimeout.current);
+  //     }
+  //     loadLazyTimeout.current = setTimeout(async () => {
+  //         const { first, last } = event;
+  //         const _items = [...loadedOptions];
+  //         const result = await options(inputValue, [], { page: currentPageRef.current + 1 });
+  //         const newOptions = result?.options || [];
+  //         for (let i = first; i < last; i++) {
+  //             if (!_items[i] && newOptions[i - first]) {
+  //                 _items[i] = newOptions[i - first];
+  //             }
+  //         }
+  //         setLoadedOptions(_items);
+  //         setLoading(false);
+  //         currentPageRef.current += 1;
+  //
+  //         // redimensionnement du conteneur
+  //         let virtualscroll = document.querySelector('.p-virtualscroller.p-dropdown-items-wrapper');
+  //         if (virtualscroll) {
+  //             virtualscroll.style.height = "auto";
+  //         }
+  //     }, 500);
+  // };
   var onLazyLoad = function onLazyLoad(event) {
-    if (isOptionsArray) return;
     setLoading(true);
     if (loadLazyTimeout.current) {
       clearTimeout(loadLazyTimeout.current);
     }
-    loadLazyTimeout.current = setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-      var first, last, _items, result, newOptions, i, virtualscroll;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
-          case 0:
-            first = event.first, last = event.last;
-            _items = _toConsumableArray$7(loadedOptions);
-            _context2.n = 1;
-            return options(inputValue, [], {
-              page: currentPageRef.current + 1
-            });
-          case 1:
-            result = _context2.v;
-            newOptions = (result === null || result === void 0 ? void 0 : result.options) || [];
-            for (i = first; i < last; i++) {
-              if (!_items[i] && newOptions[i - first]) {
-                _items[i] = newOptions[i - first];
-              }
-            }
-            setLoadedOptions(_items);
-            setLoading(false);
-            currentPageRef.current += 1;
-
-            // redimensionnement du conteneur
-            virtualscroll = document.querySelector('.p-virtualscroller.p-dropdown-items-wrapper');
-            if (virtualscroll) {
-              virtualscroll.style.height = "auto";
-            }
-          case 2:
-            return _context2.a(2);
+    loadLazyTimeout.current = setTimeout(function () {
+      var first = event.first,
+        last = event.last;
+      var _items = _toConsumableArray$7(loadedOptions);
+      for (var i = first; i < last; i++) {
+        if (!_items[i]) {
+          _items[i] = _defineProperty$b(_defineProperty$b({}, optionLabel, "Option #".concat(i)), optionValue, i);
         }
-      }, _callee2);
-    })), 500);
+      }
+      setLoadedOptions(_items);
+      setLoading(false);
+      var virtualscroll1 = document.querySelector('.p-virtualscroller.p-dropdown-items-wrapper');
+      if (virtualscroll1) {
+        virtualscroll1.style.height = "auto";
+      }
+      var hiddenSelectDiv = document.querySelector('.p-hidden-accessible.p-dropdown-hidden-select');
+      if (hiddenSelectDiv) {
+        var nextEl = hiddenSelectDiv.nextElementSibling;
+        if (nextEl && nextEl.tagName === 'INPUT' && nextEl.value && nextEl.value.trim() !== '') {
+          var virtualscroll = document.querySelector('.p-virtualscroller.p-dropdown-items-wrapper');
+          if (virtualscroll) {
+            virtualscroll.style.height = 'auto';
+          }
+        }
+      }
+    }, Math.random() * 1000 + 250);
   };
   return /*#__PURE__*/React__default.createElement("div", {
     ref: multiSelectRef,
@@ -39340,7 +39377,7 @@ var MultiSelectMetaAsync = function MultiSelectMetaAsync(_ref) {
   }), name && /*#__PURE__*/React__default.createElement("input", {
     type: "hidden",
     name: name,
-    value: (Array.isArray(selectedOptions) ? selectedOptions : []).map(function (opt) {
+    value: selectedOptions.map(function (opt) {
       return opt[optionValue];
     }).join(',')
   }), invalid && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("small", {
@@ -39855,13 +39892,36 @@ var MultiSelectPresets = {
     isSelectMeta: true,
     objValue: [{
       label: 'Option 9',
-      value: '9',
+      value: 9,
       color: '#ff9900'
     }, {
       label: 'Option 4',
-      value: '4',
+      value: 4,
       color: 'black'
     }],
+    // objValue: [
+    //     {
+    //         "id": 2299,
+    //         "nom": "Economique",
+    //         "color": "#62BAC0",
+    //         "label": "Economique",
+    //         "value": 2299
+    //     },
+    //     {
+    //         "id": 2300,
+    //         "nom": "Financière",
+    //         "color": "#40839E",
+    //         "label": "Financière",
+    //         "value": 2300
+    //     },
+    //     {
+    //         "id": 2301,
+    //         "nom": "Données bancaires",
+    //         "color": "#E5E798",
+    //         "label": "Données bancaires",
+    //         "value": 2301
+    //     }
+    // ],
     // value: ['3', '4'],
     options: function () {
       var _options = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "arengibook",
   "private": false,
-  "version": "2.4.629",
+  "version": "2.4.631",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {