@snack-uikit/list 0.11.3 → 0.11.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/dist/components/Items/hooks.js +10 -3
- package/package.json +2 -2
- package/src/components/Items/hooks.tsx +19 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## 0.11.4 (2024-04-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **PDS-00:** fix disabled items selection by group ([9ab4c61](https://github.com/cloud-ru-tech/snack-uikit/commit/9ab4c615e4b6c09278414765af8c675aaeac0aff))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## 0.11.3 (2024-04-27)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -62,18 +62,25 @@ export function useGroupItemSelection({ id, allChildIds }) {
|
|
|
62
62
|
const item = flattenItems[itemId];
|
|
63
63
|
return item && !('type' in item);
|
|
64
64
|
}), [allChildIds, flattenItems]);
|
|
65
|
+
const enableChildIds = useMemo(() => baseChildIds.filter(itemId => {
|
|
66
|
+
const item = flattenItems[itemId];
|
|
67
|
+
return item && !('type' in item) && !item.disabled;
|
|
68
|
+
}), [baseChildIds, flattenItems]);
|
|
65
69
|
const checked = isSelectionMultiple
|
|
66
70
|
? value && Boolean(value.length) && baseChildIds.every(childId => value === null || value === void 0 ? void 0 : value.includes(childId))
|
|
67
71
|
: undefined;
|
|
72
|
+
const allEnabledChecked = isSelectionMultiple
|
|
73
|
+
? value && Boolean(value.length) && enableChildIds.every(childId => value === null || value === void 0 ? void 0 : value.includes(childId))
|
|
74
|
+
: undefined;
|
|
68
75
|
const indeterminate = isSelectionMultiple
|
|
69
76
|
? !checked && baseChildIds.some(childId => value === null || value === void 0 ? void 0 : value.includes(childId))
|
|
70
77
|
: baseChildIds.includes(value !== null && value !== void 0 ? value : '');
|
|
71
78
|
const handleOnSelect = () => {
|
|
72
|
-
if (checked) {
|
|
73
|
-
setValue === null || setValue === void 0 ? void 0 : setValue((value) => (value !== null && value !== void 0 ? value : []).filter(itemId => itemId !== id && !
|
|
79
|
+
if (checked || allEnabledChecked) {
|
|
80
|
+
setValue === null || setValue === void 0 ? void 0 : setValue((value) => (value !== null && value !== void 0 ? value : []).filter(itemId => itemId !== id && !enableChildIds.includes(itemId)));
|
|
74
81
|
return;
|
|
75
82
|
}
|
|
76
|
-
setValue === null || setValue === void 0 ? void 0 : setValue((value) => Array.from(new Set([...(value !== null && value !== void 0 ? value : []), ...
|
|
83
|
+
setValue === null || setValue === void 0 ? void 0 : setValue((value) => Array.from(new Set([...(value !== null && value !== void 0 ? value : []), ...enableChildIds])));
|
|
77
84
|
};
|
|
78
85
|
return { checked, indeterminate, handleOnSelect };
|
|
79
86
|
}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
6
|
"title": "List",
|
|
7
|
-
"version": "0.11.
|
|
7
|
+
"version": "0.11.4",
|
|
8
8
|
"sideEffects": [
|
|
9
9
|
"*.css",
|
|
10
10
|
"*.woff",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"peerDependencies": {
|
|
50
50
|
"@snack-uikit/locale": "*"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "e7cf32fd5b9568bacce1f8cb1958c0ace6b52274"
|
|
53
53
|
}
|
|
@@ -103,21 +103,37 @@ export function useGroupItemSelection({ id, allChildIds }: UseGroupItemSelection
|
|
|
103
103
|
[allChildIds, flattenItems],
|
|
104
104
|
);
|
|
105
105
|
|
|
106
|
+
const enableChildIds = useMemo(
|
|
107
|
+
() =>
|
|
108
|
+
baseChildIds.filter(itemId => {
|
|
109
|
+
const item = flattenItems[itemId];
|
|
110
|
+
|
|
111
|
+
return item && !('type' in item) && !item.disabled;
|
|
112
|
+
}),
|
|
113
|
+
[baseChildIds, flattenItems],
|
|
114
|
+
);
|
|
115
|
+
|
|
106
116
|
const checked = isSelectionMultiple
|
|
107
117
|
? value && Boolean(value.length) && baseChildIds.every(childId => value?.includes(childId))
|
|
108
118
|
: undefined;
|
|
109
119
|
|
|
120
|
+
const allEnabledChecked = isSelectionMultiple
|
|
121
|
+
? value && Boolean(value.length) && enableChildIds.every(childId => value?.includes(childId))
|
|
122
|
+
: undefined;
|
|
123
|
+
|
|
110
124
|
const indeterminate = isSelectionMultiple
|
|
111
125
|
? !checked && baseChildIds.some(childId => value?.includes(childId))
|
|
112
126
|
: baseChildIds.includes(value ?? '');
|
|
113
127
|
|
|
114
128
|
const handleOnSelect = () => {
|
|
115
|
-
if (checked) {
|
|
116
|
-
setValue?.((value: ItemId[]) =>
|
|
129
|
+
if (checked || allEnabledChecked) {
|
|
130
|
+
setValue?.((value: ItemId[]) =>
|
|
131
|
+
(value ?? []).filter(itemId => itemId !== id && !enableChildIds.includes(itemId)),
|
|
132
|
+
);
|
|
117
133
|
return;
|
|
118
134
|
}
|
|
119
135
|
|
|
120
|
-
setValue?.((value: ItemId[]) => Array.from(new Set([...(value ?? []), ...
|
|
136
|
+
setValue?.((value: ItemId[]) => Array.from(new Set([...(value ?? []), ...enableChildIds])));
|
|
121
137
|
};
|
|
122
138
|
|
|
123
139
|
return { checked, indeterminate, handleOnSelect };
|