@activecollab/components 1.0.304 → 1.0.305

package/dist/index.js

@@ -10377,51 +10377,61 @@
       return [selected];
     }, [selected]);
     var handleSort = React.useCallback(function (opts) {
+      var _opts$;
       if (keepSameOptionsOrder) {
         return opts;
       }
-      var selectedIdsSet = new Set(selectedOptions);
-      if (opts.every(function (opt) {
-        return !opt.options;
-      })) {
-        var sortedOptions = opts.filter(function (opt) {
-          return selectedIdsSet.has(opt.id);
-        }).concat(opts.filter(function (opt) {
-          return !selectedIdsSet.has(opt.id);
-        }));
-        var selectedOptionsInOrder = sortedOptions.filter(function (opt) {
-          return selectedIdsSet.has(opt.id);
-        }).sort(function (a, b) {
-          return selectedOptions.indexOf(a.id) - selectedOptions.indexOf(b.id);
-        });
-        return selectedOptionsInOrder.concat(sortedOptions.filter(function (opt) {
-          return !selectedIdsSet.has(opt.id);
-        }));
-      }
-      return opts.map(function (group) {
-        var groupSelectedOptions = group.options.filter(function (opt) {
-          return selectedIdsSet.has(opt.id);
-        });
-        var groupUnselectedOptions = group.options.filter(function (opt) {
-          return !selectedIdsSet.has(opt.id);
-        });
-        var selectedOptionsInOrder = groupSelectedOptions.sort(function (a, b) {
-          return selectedOptions.indexOf(a.id) - selectedOptions.indexOf(b.id);
+      var isGrouped = Array.isArray((_opts$ = opts[0]) === null || _opts$ === void 0 ? void 0 : _opts$.options);
+      if (isGrouped) {
+        return opts.map(function (group) {
+          var sortedGroupOptions = group.options.sort(function (a, b) {
+            if (selectedOptions.includes(b.id) && !selectedOptions.includes(a.id)) {
+              return 1;
+            }
+            if (selectedOptions.includes(a.id) && !selectedOptions.includes(b.id)) {
+              return -1;
+            }
+            return 0;
+          });
+          return _objectSpread2(_objectSpread2({}, group), {}, {
+            options: sortedGroupOptions
+          });
         });
-        var finalOptionsInGroup = selectedOptionsInOrder.concat(groupUnselectedOptions);
-        return _objectSpread2(_objectSpread2({}, group), {}, {
-          options: finalOptionsInGroup
+      } else {
+        return opts.sort(function (a, b) {
+          if (selectedOptions.includes(b.id) && !selectedOptions.includes(a.id)) {
+            return 1;
+          }
+          if (selectedOptions.includes(a.id) && !selectedOptions.includes(b.id)) {
+            return -1;
+          }
+          return 0;
         });
-      });
+      }
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     var sortList = React.useCallback(function (options) {
+      var _options$;
       if (disabledInternalSort) {
         return handleSort(_toConsumableArray(options));
       }
-      return handleSort(_toConsumableArray(options).sort(function (a, b) {
-        return sortDirection === "asc" ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
-      }));
+      var isGrouped = Array.isArray((_options$ = options[0]) === null || _options$ === void 0 ? void 0 : _options$.options);
+      if (isGrouped) {
+        var sortedOptions = options.map(function (group) {
+          var sortedGroupOptions = group.options.sort(function (a, b) {
+            return sortDirection === "asc" ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
+          });
+          return _objectSpread2(_objectSpread2({}, group), {}, {
+            options: handleSort(sortedGroupOptions)
+          });
+        });
+        return handleSort(sortedOptions);
+      } else {
+        var _sortedOptions = options.sort(function (a, b) {
+          return sortDirection === "asc" ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
+        });
+        return handleSort(_sortedOptions);
+      }
     }, [sortDirection, disabledInternalSort, handleSort]);
     var sortedList = React.useMemo(function () {
       return sortList(options);