@majoo-ui/react 1.61.16-rc.1 → 1.61.16-rc.2

package/index.esm.js

@@ -15920,6 +15920,10 @@ function InputResourceList({
       return 0;
     });
   }, [data, query, checkedItems]);
+  const isItemDisabled = item => !!((item === null || item === void 0 ? void 0 : item.disabled) || disabledItems && disabledItems.includes(item.value));
+  const selectableAvailableData = useMemo(() => {
+    return availableData.filter(item => !isItemDisabled(item));
+  }, [availableData, disabledItems]);
   const renderCheckbox = (resource, index) => {
     var _a, _b;
     const isDisabled = resource.disabled || disabledItems && disabledItems.includes(resource.value);
@@ -16032,25 +16036,28 @@ function InputResourceList({
     setSortType(sortType === 'asc' ? 'desc' : 'asc');
   }
   function toggleCheckAll() {
-    const allAvailableItemsSelected = availableData.every(item => checkedItems.some(checkedItem => checkedItem.value === item.value));
-    if (allAvailableItemsSelected) {
-      const newCheckedItems = checkedItems.filter(checkedItem => !availableData.some(item => item.value === checkedItem.value));
+    const selectable = selectableAvailableData;
+    const allSelectableItemsSelected = selectable.length > 0 && selectable.every(item => checkedItems.some(checkedItem => checkedItem.value === item.value));
+    if (allSelectableItemsSelected) {
+      const newCheckedItems = checkedItems.filter(checkedItem => !selectable.some(item => item.value === checkedItem.value));
       onChange === null || onChange === void 0 ? void 0 : onChange(isValueString ? newCheckedItems.map(item => item.value) : newCheckedItems);
     } else {
-      const newCheckedItems = [...checkedItems, ...availableData.filter(item => !checkedItems.some(checkedItem => checkedItem.value === item.value))];
+      const itemsToAdd = selectable.filter(item => !checkedItems.some(checkedItem => checkedItem.value === item.value));
+      const newCheckedItems = [...checkedItems, ...itemsToAdd];
       onChange === null || onChange === void 0 ? void 0 : onChange(isValueString ? newCheckedItems.map(item => item.value) : newCheckedItems);
     }
   }
   function handleCheckedAllExpandable() {
     const allItems = data || [];
-    const allItemValues = allItems.map(i => i.value);
+    const selectableAllItems = allItems.filter(item => !isItemDisabled(item));
+    const allItemValues = selectableAllItems.map(i => i.value);
     const currentValues = checkedItems.map(i => i.value);
-    const areAllSelected = allItems.length > 0 && allItems.every(item => currentValues.includes(item.value));
+    const areAllSelected = selectableAllItems.length > 0 && selectableAllItems.every(item => currentValues.includes(item.value));
     let newCheckedItems;
     if (areAllSelected) {
       newCheckedItems = checkedItems.filter(item => !allItemValues.includes(item.value));
     } else {
-      const itemsToAdd = allItems.filter(item => !currentValues.includes(item.value));
+      const itemsToAdd = selectableAllItems.filter(item => !currentValues.includes(item.value));
       newCheckedItems = [...checkedItems, ...itemsToAdd];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(isValueString ? newCheckedItems.map(item => item.value) : newCheckedItems);
@@ -16077,8 +16084,8 @@ function InputResourceList({
       }
     }, {
       children: [!hideSelectAll && jsx(InputCheckbox, {
-        checked: availableData.length > 0 && availableData.every(item => checkedItems.some(checkedItem => checkedItem.value === item.value)),
-        indeterminate: availableData.some(item => checkedItems.some(checkedItem => checkedItem.value === item.value)) && !availableData.every(item => checkedItems.some(checkedItem => checkedItem.value === item.value)),
+        checked: selectableAvailableData.length > 0 && selectableAvailableData.every(item => checkedItems.some(checkedItem => checkedItem.value === item.value)),
+        indeterminate: selectableAvailableData.some(item => checkedItems.some(checkedItem => checkedItem.value === item.value)) && !(selectableAvailableData.length > 0 && selectableAvailableData.every(item => checkedItems.some(checkedItem => checkedItem.value === item.value))),
         onCheckedChange: toggleCheckAll,
         css: {
           marginRight: '$spacing-02'
@@ -16195,9 +16202,10 @@ function InputResourceList({
   }), void 0);
   if (expandable) {
     const allItems = data || [];
+    const selectableAllItems = allItems.filter(item => !isItemDisabled(item));
     const checkedValues = checkedItems.map(i => i.value);
-    const isAllSelected = allItems.length > 0 && allItems.every(item => checkedValues.includes(item.value));
-    const isIndeterminate = !isAllSelected && allItems.some(item => checkedValues.includes(item.value));
+    const isAllSelected = selectableAllItems.length > 0 && selectableAllItems.every(item => checkedValues.includes(item.value));
+    const isIndeterminate = !isAllSelected && selectableAllItems.some(item => checkedValues.includes(item.value));
     return jsxs(Box, {
       children: [jsxs(Flex$1, Object.assign({
         justify: "between",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@majoo-ui/react",
-  "version": "1.61.16-rc.1",
+  "version": "1.61.16-rc.2",
   "main": "./index.esm.js",
   "exports": {
     ".": {