design-zystem 1.0.444 → 1.0.445

package/dist/ui/index.js

@@ -3943,7 +3943,7 @@ var TableSelectAllResultsBar = ({
 }) => {
   if (selection.isAllResultsSelected)
     return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "border-b border-grey-200 bg-blue-50 px-3 py-2 text-center text-xs font-semibold text-blue-900", children: [
-      `Les ${selection.totalCount} r\xE9sultats sont s\xE9lectionn\xE9s.`,
+      selection.selectedCount === selection.totalCount ? `Les ${selection.totalCount} r\xE9sultats sont s\xE9lectionn\xE9s.` : `${selection.selectedCount} r\xE9sultats sur ${selection.totalCount} sont s\xE9lectionn\xE9s.`,
       " ",
       /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
         "button",
@@ -5183,29 +5183,38 @@ var useRowSelection = ({
 }) => {
   const [selectedIds, setSelectedIds] = (0, import_react32.useState)(/* @__PURE__ */ new Set());
   const [isAllResultsSelected, setIsAllResultsSelected] = (0, import_react32.useState)(false);
+  const [excludedIds, setExcludedIds] = (0, import_react32.useState)(/* @__PURE__ */ new Set());
   const anchorId = (0, import_react32.useRef)(null);
+  const isRowSelected = (id) => isAllResultsSelected ? !excludedIds.has(id) : selectedIds.has(id);
   const resolvedTotal = totalCount != null ? totalCount : rowIds.length;
-  const selectedOnPage = rowIds.filter((id) => selectedIds.has(id)).length;
+  const selectedOnPage = rowIds.filter(isRowSelected).length;
   const isPageFullySelected = rowIds.length > 0 && selectedOnPage === rowIds.length;
   const canSelectAllResults = isPageFullySelected && !isAllResultsSelected && resolvedTotal > rowIds.length;
-  const headerState = isAllResultsSelected || isPageFullySelected ? true : selectedOnPage > 0 ? "indeterminate" : false;
+  const headerState = isPageFullySelected ? true : selectedOnPage > 0 ? "indeterminate" : false;
   const clear = (0, import_react32.useCallback)(() => {
     setSelectedIds(/* @__PURE__ */ new Set());
     setIsAllResultsSelected(false);
+    setExcludedIds(/* @__PURE__ */ new Set());
     anchorId.current = null;
   }, []);
-  const isRowSelected = (id) => isAllResultsSelected || selectedIds.has(id);
   const getGroupState = (groupIds) => {
     const selectedInGroup = groupIds.filter(isRowSelected).length;
     if (selectedInGroup === 0) return false;
     return selectedInGroup === groupIds.length ? true : "indeterminate";
   };
   const applyToRows = (idsToApply, willSelect) => {
-    const next = new Set(isAllResultsSelected ? rowIds : selectedIds);
+    if (isAllResultsSelected) {
+      const nextExcluded = new Set(excludedIds);
+      idsToApply.forEach(
+        (rowId) => willSelect ? nextExcluded.delete(rowId) : nextExcluded.add(rowId)
+      );
+      setExcludedIds(nextExcluded);
+      return;
+    }
+    const next = new Set(selectedIds);
     idsToApply.forEach(
       (rowId) => willSelect ? next.add(rowId) : next.delete(rowId)
     );
-    setIsAllResultsSelected(false);
     setSelectedIds(next);
   };
   const toggleGroup = (groupIds) => applyToRows(groupIds, getGroupState(groupIds) !== true);
@@ -5221,7 +5230,7 @@ var useRowSelection = ({
     applyToRows(idsToApply, willSelect);
   };
   const toggleAllOnPage = () => {
-    if (isAllResultsSelected) {
+    if (isAllResultsSelected && headerState === true) {
       clear();
       return;
     }
@@ -5229,11 +5238,12 @@ var useRowSelection = ({
   };
   const selectAllResults = () => {
     setSelectedIds(new Set(rowIds));
+    setExcludedIds(/* @__PURE__ */ new Set());
     setIsAllResultsSelected(true);
   };
   return {
     selectedIds,
-    selectedCount: isAllResultsSelected ? resolvedTotal : selectedIds.size,
+    selectedCount: isAllResultsSelected ? resolvedTotal - excludedIds.size : selectedIds.size,
     isRowSelected,
     headerState,
     isAllResultsSelected,

package/dist/ui/index.mjs

@@ -3737,7 +3737,7 @@ var TableSelectAllResultsBar = ({
 }) => {
   if (selection.isAllResultsSelected)
     return /* @__PURE__ */ jsxs22("div", { className: "border-b border-grey-200 bg-blue-50 px-3 py-2 text-center text-xs font-semibold text-blue-900", children: [
-      `Les ${selection.totalCount} r\xE9sultats sont s\xE9lectionn\xE9s.`,
+      selection.selectedCount === selection.totalCount ? `Les ${selection.totalCount} r\xE9sultats sont s\xE9lectionn\xE9s.` : `${selection.selectedCount} r\xE9sultats sur ${selection.totalCount} sont s\xE9lectionn\xE9s.`,
       " ",
       /* @__PURE__ */ jsx41(
         "button",
@@ -4984,29 +4984,38 @@ var useRowSelection = ({
 }) => {
   const [selectedIds, setSelectedIds] = useState8(/* @__PURE__ */ new Set());
   const [isAllResultsSelected, setIsAllResultsSelected] = useState8(false);
+  const [excludedIds, setExcludedIds] = useState8(/* @__PURE__ */ new Set());
   const anchorId = useRef8(null);
+  const isRowSelected = (id) => isAllResultsSelected ? !excludedIds.has(id) : selectedIds.has(id);
   const resolvedTotal = totalCount != null ? totalCount : rowIds.length;
-  const selectedOnPage = rowIds.filter((id) => selectedIds.has(id)).length;
+  const selectedOnPage = rowIds.filter(isRowSelected).length;
   const isPageFullySelected = rowIds.length > 0 && selectedOnPage === rowIds.length;
   const canSelectAllResults = isPageFullySelected && !isAllResultsSelected && resolvedTotal > rowIds.length;
-  const headerState = isAllResultsSelected || isPageFullySelected ? true : selectedOnPage > 0 ? "indeterminate" : false;
+  const headerState = isPageFullySelected ? true : selectedOnPage > 0 ? "indeterminate" : false;
   const clear = useCallback2(() => {
     setSelectedIds(/* @__PURE__ */ new Set());
     setIsAllResultsSelected(false);
+    setExcludedIds(/* @__PURE__ */ new Set());
     anchorId.current = null;
   }, []);
-  const isRowSelected = (id) => isAllResultsSelected || selectedIds.has(id);
   const getGroupState = (groupIds) => {
     const selectedInGroup = groupIds.filter(isRowSelected).length;
     if (selectedInGroup === 0) return false;
     return selectedInGroup === groupIds.length ? true : "indeterminate";
   };
   const applyToRows = (idsToApply, willSelect) => {
-    const next = new Set(isAllResultsSelected ? rowIds : selectedIds);
+    if (isAllResultsSelected) {
+      const nextExcluded = new Set(excludedIds);
+      idsToApply.forEach(
+        (rowId) => willSelect ? nextExcluded.delete(rowId) : nextExcluded.add(rowId)
+      );
+      setExcludedIds(nextExcluded);
+      return;
+    }
+    const next = new Set(selectedIds);
     idsToApply.forEach(
       (rowId) => willSelect ? next.add(rowId) : next.delete(rowId)
     );
-    setIsAllResultsSelected(false);
     setSelectedIds(next);
   };
   const toggleGroup = (groupIds) => applyToRows(groupIds, getGroupState(groupIds) !== true);
@@ -5022,7 +5031,7 @@ var useRowSelection = ({
     applyToRows(idsToApply, willSelect);
   };
   const toggleAllOnPage = () => {
-    if (isAllResultsSelected) {
+    if (isAllResultsSelected && headerState === true) {
       clear();
       return;
     }
@@ -5030,11 +5039,12 @@ var useRowSelection = ({
   };
   const selectAllResults = () => {
     setSelectedIds(new Set(rowIds));
+    setExcludedIds(/* @__PURE__ */ new Set());
     setIsAllResultsSelected(true);
   };
   return {
     selectedIds,
-    selectedCount: isAllResultsSelected ? resolvedTotal : selectedIds.size,
+    selectedCount: isAllResultsSelected ? resolvedTotal - excludedIds.size : selectedIds.size,
     isRowSelected,
     headerState,
     isAllResultsSelected,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "design-zystem",
-  "version": "1.0.444",
+  "version": "1.0.445",
   "description": "A React design system of importable components",
   "main": "dist/index.js",
   "module": "dist/index.mjs",