arengibook 2.4.591 → 2.4.592

package/dist/index.js

@@ -35948,8 +35948,6 @@ var PopupPresets = {
 var Dropdown = function Dropdown(_ref) {
   var _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
-    _ref$optionLoad = _ref.optionLoad,
-    optionLoad = _ref$optionLoad === void 0 ? null : _ref$optionLoad,
     _ref$isGroupedOption = _ref.isGroupedOption,
     isGroupedOption = _ref$isGroupedOption === void 0 ? false : _ref$isGroupedOption,
     value = _ref.value,
@@ -36000,22 +35998,86 @@ var Dropdown = function Dropdown(_ref) {
     _useState2 = _slicedToArray$8(_useState, 2),
     optionSelected = _useState2[0],
     setOptionSelected = _useState2[1];
-  var items = useRef([]);
+  useRef([]);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray$8(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var loadedOptionsRef = useRef([]);
+  useRef([]);
   var currentPageRef = useRef(1);
-  var isLazy = typeof optionLoad === 'function';
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray$8(_useState5, 2),
+    loadedOptions = _useState6[0],
+    setLoadedOptions = _useState6[1];
+  var isOptionLoadFunction = typeof options === 'function';
+
+  // useEffect(() => {
+  //     if (isOptionLoadFunction) {
+  //         const loadOptions = async () => {
+  //             setLoading(true);
+  //             try {
+  //                 const result = await options();
+  //                 setLoadedOptions(result);
+  //             } catch (err) {
+  //                 console.error('Erreur lors du chargement des options:', err);
+  //             } finally {
+  //                 setLoading(false);
+  //             }
+  //         };
+  //
+  //         loadOptions();
+  //     } else {
+  //         setLoadedOptions(options);
+  //     }
+  // }, [options, isOptionLoadFunction]);
+
+  useEffect(function () {
+    var loadOptions = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+        var result, _t;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
+            case 0:
+              if (!isOptionLoadFunction) {
+                _context.n = 6;
+                break;
+              }
+              setLoading(true);
+              _context.p = 1;
+              _context.n = 2;
+              return options();
+            case 2:
+              result = _context.v;
+              setLoadedOptions(Array.isArray(result.options) ? result.options : []);
+              _context.n = 4;
+              break;
+            case 3:
+              _context.p = 3;
+              _t = _context.v;
+              console.error('Erreur lors du chargement des options:', _t);
+            case 4:
+              _context.p = 4;
+              setLoading(false);
+              return _context.f(4);
+            case 5:
+              _context.n = 7;
+              break;
+            case 6:
+              setLoadedOptions(options);
+            case 7:
+              return _context.a(2);
+          }
+        }, _callee, null, [[1, 3, 4, 5]]);
+      }));
+      return function loadOptions() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    loadOptions();
+  }, [options, isOptionLoadFunction]);
   useEffect(function () {
     setOptionSelected(value !== null && value !== void 0 ? value : null);
   }, [value]);
-  useEffect(function () {
-    if (!isLazy) {
-      items.current = options;
-    }
-  }, [options, isLazy]);
   var style = {
     border: invalid ? '1px solid red' : '1px solid #ccc',
     width: '100%'
@@ -36035,9 +36097,9 @@ var Dropdown = function Dropdown(_ref) {
         }, optionStyle)
       }, option === null || option === void 0 ? void 0 : option[optionLabel]);
     } else {
-      var _ref2 = selectMetaConfig || {},
-        labelStyle = _ref2.labelStyle,
-        generalIcon = _ref2.generalIcon;
+      var _ref3 = selectMetaConfig || {},
+        labelStyle = _ref3.labelStyle,
+        generalIcon = _ref3.generalIcon;
       var styleLabel = {
         marginLeft: '10px'
       };
@@ -36091,48 +36153,49 @@ var Dropdown = function Dropdown(_ref) {
     }
   };
   var onLazyLoad = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(event) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(event) {
       var _event$filter;
-      var search, _res$options, _res$additional$page, _res$additional, res, newOptions, _t;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
+      var search, _res$options, _res$additional$page, _res$additional, res, newOptions, _t2;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
-            if (!(!isLazy || !optionLoad)) {
-              _context.n = 1;
+            if (isOptionLoadFunction) {
+              _context2.n = 1;
               break;
             }
-            return _context.a(2);
+            return _context2.a(2);
           case 1:
             setLoading(true);
             search = (_event$filter = event === null || event === void 0 ? void 0 : event.filter) !== null && _event$filter !== void 0 ? _event$filter : '';
-            _context.p = 2;
-            _context.n = 3;
-            return optionLoad(search, loadedOptionsRef.current, {
+            _context2.p = 2;
+            _context2.n = 3;
+            return options(search, loadedOptions, {
               page: currentPageRef.current
             });
           case 3:
-            res = _context.v;
+            res = _context2.v;
             newOptions = (_res$options = res === null || res === void 0 ? void 0 : res.options) !== null && _res$options !== void 0 ? _res$options : [];
-            loadedOptionsRef.current = [].concat(_toConsumableArray$6(loadedOptionsRef.current), _toConsumableArray$6(newOptions));
-            items.current = loadedOptionsRef.current;
+            setLoadedOptions(function (prevOptions) {
+              return [].concat(_toConsumableArray$6(prevOptions), _toConsumableArray$6(newOptions));
+            });
             currentPageRef.current = (_res$additional$page = res === null || res === void 0 || (_res$additional = res.additional) === null || _res$additional === void 0 ? void 0 : _res$additional.page) !== null && _res$additional$page !== void 0 ? _res$additional$page : currentPageRef.current + 1;
-            _context.n = 5;
+            _context2.n = 5;
             break;
           case 4:
-            _context.p = 4;
-            _t = _context.v;
-            console.error('Erreur optionLoad:', _t);
+            _context2.p = 4;
+            _t2 = _context2.v;
+            console.error('Erreur lors du chargement des options:', _t2);
           case 5:
-            _context.p = 5;
+            _context2.p = 5;
             setLoading(false);
-            return _context.f(5);
+            return _context2.f(5);
           case 6:
-            return _context.a(2);
+            return _context2.a(2);
         }
-      }, _callee, null, [[2, 4, 5, 6]]);
+      }, _callee2, null, [[2, 4, 5, 6]]);
     }));
     return function onLazyLoad(_x) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var handleChange = function handleChange(e) {
@@ -36143,15 +36206,15 @@ var Dropdown = function Dropdown(_ref) {
     }
   };
   var groupedItemTemplate = function groupedItemTemplate(option) {
-    var _ref4 = groupedItemTemplateConfig || {},
-      showImage = _ref4.showImage,
-      imageKey = _ref4.imageKey,
-      imageStyle = _ref4.imageStyle,
-      showIcon = _ref4.showIcon,
-      iconKey = _ref4.iconKey,
-      labelStyle = _ref4.labelStyle,
-      generalIcon = _ref4.generalIcon,
-      generalImage = _ref4.generalImage;
+    var _ref5 = groupedItemTemplateConfig || {},
+      showImage = _ref5.showImage,
+      imageKey = _ref5.imageKey,
+      imageStyle = _ref5.imageStyle,
+      showIcon = _ref5.showIcon,
+      iconKey = _ref5.iconKey,
+      labelStyle = _ref5.labelStyle,
+      generalIcon = _ref5.generalIcon,
+      generalImage = _ref5.generalImage;
     var icon = option.value && option.value[iconKey];
     var styleLabel = generalIcon || showImage && option[imageKey] || showIcon && icon ? {
       marginLeft: '10px'
@@ -36201,7 +36264,7 @@ var Dropdown = function Dropdown(_ref) {
     className: "flex flex-col gap-1"
   }, /*#__PURE__*/React__default.createElement(Dropdown$1, _extends$A({
     value: optionSelected,
-    options: isLazy ? items.current : options,
+    options: loadedOptions,
     onChange: handleChange,
     placeholder: placeholder,
     disabled: disabled,
@@ -36216,7 +36279,7 @@ var Dropdown = function Dropdown(_ref) {
   }, isGroupedOption && {
     optionGroupLabel: 'label',
     optionGroupChildren: 'items'
-  }, (isSelectMeta || isLazy) && {
+  }, (isSelectMeta || isOptionLoadFunction) && {
     virtualScrollerOptions: {
       lazy: true,
       onLazyLoad: onLazyLoad,
@@ -36375,9 +36438,8 @@ var DropdownPresets = {
   },
   AsyncLoad: {
     placeholder: 'Chargement distant simulé',
-    options: [],
-    optionLoad: function () {
-      var _optionLoad = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(search, loadedOptions, _ref) {
+    options: function () {
+      var _options = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(search, loadedOptions, _ref) {
         var page, length, start, data;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
@@ -36400,7 +36462,6 @@ var DropdownPresets = {
                   });
                 }),
                 hasMore: page * length < 100,
-                // Supposons que nous avons 100 options au total
                 additional: {
                   page: page + 1
                 }
@@ -36408,10 +36469,10 @@ var DropdownPresets = {
           }
         }, _callee);
       }));
-      function optionLoad(_x, _x2, _x3) {
-        return _optionLoad.apply(this, arguments);
+      function options(_x, _x2, _x3) {
+        return _options.apply(this, arguments);
       }
-      return optionLoad;
+      return options;
     }(),
     selectMetaConfig: {
       generalIcon: 'pi pi-circle-fill'
@@ -36429,9 +36490,8 @@ var DropdownPresets = {
   AsyncSearch: {
     placeholder: 'Recherchez une option...',
     filter: true,
-    options: [],
-    optionLoad: function () {
-      var _optionLoad2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(search, loadedOptions, _ref2) {
+    options: function () {
+      var _options2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(search, loadedOptions, _ref2) {
         var page, length, allOptions, filteredOptions, start, pageSlice;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
@@ -36464,10 +36524,10 @@ var DropdownPresets = {
           }
         }, _callee2);
       }));
-      function optionLoad(_x4, _x5, _x6) {
-        return _optionLoad2.apply(this, arguments);
+      function options(_x4, _x5, _x6) {
+        return _options2.apply(this, arguments);
       }
-      return optionLoad;
+      return options;
     }(),
     isSelectMeta: true,
     selectMetaConfig: {

package/package.json

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