@geotab/zenith 3.16.0-beta.2 → 3.16.0-beta.3

package/esm/table/selectable/useSelectableRows.js

@@ -10,6 +10,8 @@ import { useLanguage } from "../../utils/localization/useLanguage";
 import { checkRow } from "./utils/checkRow";
 import { isRowChecked } from "./utils/isRowChecked";
 import { getCurrentPageSelection } from "./utils/getCurrentPageSelection";
+import { useDragSelection } from "./useDragSelection";
+import { getDragSelectionRows } from "./utils/getDragSelectionRows";
 injectString("cs", "Select all", "Vybrat v\u0161e");
 injectString("da-DK", "Select all", "V\xE6lg alle");
 injectString("de", "Select all", "Alle ausw\xE4hlen");
@@ -83,7 +85,7 @@ export const getEmptySelection = () => ({
 export const SelectableWrapperName = "Selectable";
 // Infinite scroll has no pages, so the header checkbox always means "select all" (never current page).
 const resolveCheckboxEmitsCurrentPage = (isInfinite, checkboxSelectsCurrentPage, turnOffSelectAll) => isInfinite ? false : checkboxSelectsCurrentPage !== null && checkboxSelectsCurrentPage !== void 0 ? checkboxSelectsCurrentPage : turnOffSelectAll;
-export const useSelectableRows = (columns, entities, isMobile, selectMode, setSelectMode, selectable, isInfinite = false) => {
+export const useSelectableRows = (columns, entities, isMobile, selectMode, setSelectMode, selectable, isInfinite = false, gridRef, expandedRows) => {
   var _a;
   const {
     translate
@@ -133,30 +135,19 @@ export const useSelectableRows = (columns, entities, isMobile, selectMode, setSe
     }
   }, [checkboxDisabled, checkboxVisible, entities, selectable, setSelectMode, selectable === null || selectable === void 0 ? void 0 : selectable.strategy]);
   const getNewSelection = useCallback((id, checked) => {
-    var _a;
-    if ((_a = selectable === null || selectable === void 0 ? void 0 : selectable.selection) === null || _a === void 0 ? void 0 : _a.all) {
-      // MYG-142234: `selections` holds the ids excluded from the "all" selection.
-      // Toggling a row here must only ever add/remove that single id from the
-      // exclusion set - it must never be rebuilt from `entities` (the current page),
-      // otherwise every other page's rows would silently fall out of the selection.
-      const excluded = new Set(selections);
-      checkRow(excluded, selectable, entities, id, !checked);
-      return excluded;
+    if (state === SelectionState.All) {
+      const newSelection = getCurrentPageSelection(entities, selectable);
+      checkRow(newSelection, selectable, entities, id, false);
+      return newSelection;
     }
     checkRow(selections, selectable, entities, id, checked);
     return selections;
-  }, [entities, selectable, selections]);
+  }, [state, entities, selectable, selections]);
   const onSelectListener = useCallback((id, checked) => {
     var _a;
-    const wasAllSelected = ((_a = selectable === null || selectable === void 0 ? void 0 : selectable.selection) === null || _a === void 0 ? void 0 : _a.all) || false;
     const newSelection = getNewSelection(id, checked);
-    const newState = calculateSelectionState(entities, newSelection, wasAllSelected, checkboxVisible, checkboxDisabled, selectable === null || selectable === void 0 ? void 0 : selectable.strategy);
-    // MYG-142234: once selection spans "all" pages, unchecking a row must keep `all: true`
-    // and only record the exclusion - it must not collapse to the current page's ids.
-    const newValue = wasAllSelected ? {
-      selected: [...newSelection],
-      all: true
-    } : {
+    const newState = calculateSelectionState(entities, newSelection, ((_a = selectable === null || selectable === void 0 ? void 0 : selectable.selection) === null || _a === void 0 ? void 0 : _a.all) || false, checkboxVisible, checkboxDisabled, selectable === null || selectable === void 0 ? void 0 : selectable.strategy);
+    const newValue = {
       selected: [...newSelection],
       all: newState === SelectionState.All
     };
@@ -164,8 +155,49 @@ export const useSelectableRows = (columns, entities, isMobile, selectMode, setSe
     selectable === null || selectable === void 0 ? void 0 : selectable.onSelect(newValue);
     setSelectMode(newValue.all || newValue.selected.length > 0);
   }, [checkboxDisabled, checkboxVisible, entities, selectable, setSelectMode, setState, getNewSelection]);
+  const onBatchSelect = useCallback((rangeIds, select, base) => {
+    var _a;
+    const result = new Set(base);
+    const limit = selectable === null || selectable === void 0 ? void 0 : selectable.selectionLimit;
+    for (const id of rangeIds) {
+      if (select && limit !== undefined && result.size >= limit) {
+        break;
+      }
+      checkRow(result, selectable, entities, id, select);
+    }
+    const newState = calculateSelectionState(entities, result, ((_a = selectable === null || selectable === void 0 ? void 0 : selectable.selection) === null || _a === void 0 ? void 0 : _a.all) || false, checkboxVisible, checkboxDisabled, selectable === null || selectable === void 0 ? void 0 : selectable.strategy);
+    const newValue = {
+      selected: [...result],
+      all: newState === SelectionState.All
+    };
+    setState(newState);
+    selectable === null || selectable === void 0 ? void 0 : selectable.onSelect(newValue);
+    setSelectMode(newValue.all || newValue.selected.length > 0);
+  }, [entities, selectable, checkboxVisible, checkboxDisabled, setSelectMode]);
+  // Deliberately independent of the current selection, so the drag anchor survives the
+  // selection changes a drag itself produces.
+  const {
+    rows: dragRows,
+    entityById
+  } = useMemo(() => getDragSelectionRows(entities, expandedRows), [entities, expandedRows]);
+  const isSelectable = useCallback(row => {
+    const entity = entityById.get(row.id);
+    return !!entity && checkboxVisible(entity, row.isNested) && !checkboxDisabled(entity, row.isNested);
+  }, [entityById, checkboxVisible, checkboxDisabled]);
+  const getBaseSelection = useCallback(() => state === SelectionState.All ? getCurrentPageSelection(entities, selectable) : new Set(selections), [state, entities, selectable, selections]);
+  const {
+    onCheckboxMouseDown,
+    suppressNextChangeRef
+  } = useDragSelection(dragRows, gridRef, onBatchSelect, getBaseSelection, isSelectable, !!selectable);
+  const onCheckboxChange = useCallback((id, checked) => {
+    if (suppressNextChangeRef.current) {
+      suppressNextChangeRef.current = false;
+      return;
+    }
+    onSelectListener(id, checked);
+  }, [onSelectListener, suppressNextChangeRef]);
   const onChangeSelectionState = useCallback(newState => {
-    var _a, _b, _c;
+    var _a, _b;
     if (newState === SelectionState.All) {
       (selectable === null || selectable === void 0 ? void 0 : selectable.onSelect) && selectable.onSelect({
         selected: [],
@@ -184,11 +216,7 @@ export const useSelectableRows = (columns, entities, isMobile, selectMode, setSe
     }
     const newSelections = getCurrentPageSelection(entities, selectable);
     setState(newState);
-    // MYG-142234: previous `selected` ids mean something different depending on `all` -
-    // included ids when `all` is false, excluded ids when `all` is true. Switching to an
-    // explicit "select current page" here always leaves `all: false`, so a previous
-    // exclusion list must not be reinterpreted as an inclusion list.
-    const previousSelections = ((_a = selectable === null || selectable === void 0 ? void 0 : selectable.selection) === null || _a === void 0 ? void 0 : _a.all) ? [] : (_c = (_b = selectable === null || selectable === void 0 ? void 0 : selectable.selection) === null || _b === void 0 ? void 0 : _b.selected) !== null && _c !== void 0 ? _c : [];
+    const previousSelections = (_b = (_a = selectable === null || selectable === void 0 ? void 0 : selectable.selection) === null || _a === void 0 ? void 0 : _a.selected) !== null && _b !== void 0 ? _b : [];
     const mergedSelections = new Set([...previousSelections, ...newSelections]);
     const newValue = {
       selected: [...mergedSelections],
@@ -207,12 +235,7 @@ export const useSelectableRows = (columns, entities, isMobile, selectMode, setSe
     }
     return translate("Deselect all");
   }, [selectable, selectableState, state, translate]);
-  const isEntityChecked = useCallback(
-  // MYG-142234: while `selection.all` is true, `selections` holds excluded ids, and every
-  // row must be evaluated through the SelectionState.All (exclusion-aware) branch of
-  // isRowChecked - not the per-page `state`, which can be Partial/None for a page that
-  // contains some of those exclusions.
-  (entity, isNested) => isRowChecked(selections, isAllSelected ? SelectionState.All : state, selectable === null || selectable === void 0 ? void 0 : selectable.strategy, entity, isNested), [selections, isAllSelected, state, selectable === null || selectable === void 0 ? void 0 : selectable.strategy]);
+  const isEntityChecked = useCallback((entity, isNested) => isRowChecked(selections, state, selectable === null || selectable === void 0 ? void 0 : selectable.strategy, entity, isNested), [selections, state, selectable === null || selectable === void 0 ? void 0 : selectable.strategy]);
   const hasSelectable = !!selectable;
   const selectableCheckboxSelectsCurrentPage = selectable === null || selectable === void 0 ? void 0 : selectable.checkboxSelectsCurrentPage;
   const selectableTurnOffSelectAll = selectable === null || selectable === void 0 ? void 0 : selectable.turnOffSelectAll;
@@ -250,7 +273,8 @@ export const useSelectableRows = (columns, entities, isMobile, selectMode, setSe
           indeterminate: checked.indeterminate,
           disabled: isDisable,
           label: checkboxTitle(entity),
-          onChange: onSelectListener,
+          onChange: onCheckboxChange,
+          onMouseDown: isDisable ? undefined : onCheckboxMouseDown,
           children: _jsx(CheckboxCell.Content, {
             children: value
           })
@@ -264,30 +288,16 @@ export const useSelectableRows = (columns, entities, isMobile, selectMode, setSe
           checked: state === SelectionState.CurrentPage || state === SelectionState.All,
           indeterminate: state === SelectionState.Partial,
           onChange: newValue => {
-            var _a, _b, _c;
+            var _a, _b;
             if (newValue) {
               const newState = checkboxEmitsCurrentPage ? SelectionState.CurrentPage : SelectionState.All;
               setState(newState);
               onChangeSelectionState(newState);
-            } else if ((_a = selectable.selection) === null || _a === void 0 ? void 0 : _a.all) {
-              // MYG-142234: in exclusion mode, `selected` holds excluded ids. Unchecking
-              // the header must add the current page's ids to that exclusion set and
-              // keep `all: true` - it must never be treated as an inclusion list, or
-              // every other page's selection would be silently wiped out.
-              const currentPageIds = getCurrentPageSelection(entities, selectable);
-              const newExcluded = new Set([...selectable.selection.selected, ...currentPageIds]);
-              const newState = calculateSelectionState(entities, newExcluded, true, checkboxVisible, checkboxDisabled, selectable.strategy);
-              setState(newState);
-              selectable.onSelect({
-                selected: [...newExcluded],
-                all: true
-              });
-              setSelectMode(true);
             } else {
               // Intentionally different from onSelect(None) ("Deselect all" menu item, which clears everything).
               // Unchecking the header checkbox only removes the current page from the selection, preserving other pages.
               const currentPageIds = getCurrentPageSelection(entities, selectable);
-              const remaining = ((_c = (_b = selectable.selection) === null || _b === void 0 ? void 0 : _b.selected) !== null && _c !== void 0 ? _c : []).filter(id => !currentPageIds.has(id));
+              const remaining = ((_b = (_a = selectable.selection) === null || _a === void 0 ? void 0 : _a.selected) !== null && _b !== void 0 ? _b : []).filter(id => !currentPageIds.has(id));
               const newState = remaining.length > 0 ? SelectionState.Partial : SelectionState.None;
               setState(newState);
               selectable.onSelect({
@@ -310,7 +320,7 @@ export const useSelectableRows = (columns, entities, isMobile, selectMode, setSe
         return cell;
       }
     };
-  }, [checkboxDisabled, checkboxTitle, checkboxVisible, headerTitle, onChangeSelectionState, onSelectListener, hasSelectable, checkboxEmitsCurrentPage, checkboxInHeaderValue, selectableHeader, selectableTurnOffSelectAll, isInfinite, selectable, selectableState, state, isMobile, checkboxPlaceholder, isEntityChecked, entities, setSelectMode]);
+  }, [checkboxDisabled, checkboxTitle, checkboxVisible, headerTitle, onChangeSelectionState, onCheckboxChange, onCheckboxMouseDown, hasSelectable, checkboxEmitsCurrentPage, checkboxInHeaderValue, selectableHeader, selectableTurnOffSelectAll, isInfinite, selectable, selectableState, state, isMobile, checkboxPlaceholder, isEntityChecked, entities, setSelectMode]);
   const selectableFeedWrapper = useCallback((primaryData, secondaryData, entity, isNested) => {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (!entity) {

package/esm/table/selectable/utils/calculateSelectionState.js

@@ -3,41 +3,6 @@ export const calculateSelectionState = (entities, selections, all, checkboxVisib
     if (selections.size === 0) {
         return all ? SelectionState.All : SelectionState.None;
     }
-    if (all) {
-        // When `all` is true, `selections` holds the ids explicitly excluded from the
-        // otherwise-fully-selected set (see ISelectionValue), rather than included ids.
-        const isExcluded = (entity) => {
-            if (strategy === "nested" && entity.children) {
-                if (entity.children.length === 0) {
-                    return false;
-                }
-                return entity.children.every(child => {
-                    if (!checkboxVisible(child)) {
-                        return true;
-                    }
-                    if (checkboxDisabled(child)) {
-                        return true;
-                    }
-                    return selections.has(child.id);
-                });
-            }
-            return selections.has(entity.id);
-        };
-        const isPartiallyExcluded = (entity) => {
-            if (strategy === "nested" && entity.children) {
-                return entity.children.some(child => selections.has(child.id));
-            }
-            return selections.has(entity.id);
-        };
-        const relevantEntities = entities.filter(entity => checkboxVisible(entity) && !checkboxDisabled(entity));
-        if (relevantEntities.length === 0) {
-            return SelectionState.All;
-        }
-        if (relevantEntities.every(entity => !isPartiallyExcluded(entity))) {
-            return SelectionState.All;
-        }
-        return relevantEntities.every(entity => isExcluded(entity)) ? SelectionState.None : SelectionState.Partial;
-    }
     return entities.every(entity => {
         if (!checkboxVisible(entity)) {
             return true;

package/esm/table/selectable/utils/getDragSelectionRows.d.ts

@@ -0,0 +1,15 @@
+import { IEntityWithId } from "../../../commonHelpers/entity";
+import { IRowEntity } from "../../../dataGrid/row/row";
+import { IDragSelectionRow } from "../interfaces";
+export interface IDragSelection<T> {
+    /** The rows in render order. */
+    rows: IDragSelectionRow[];
+    /** Every entity a row can point at, parents and children alike. */
+    entityById: Map<string, T>;
+}
+/**
+ * Flattens the entities into the rows the grid actually renders: each entity followed by its
+ * children while it is expanded. Drag and shift-click ranges walk this list, so they cross
+ * nesting levels the way the user sees them on screen.
+ */
+export declare const getDragSelectionRows: <T extends IRowEntity<N>, N extends IEntityWithId>(entities: T[], expandedRows?: string[]) => IDragSelection<T | N>;

package/esm/table/selectable/utils/getDragSelectionRows.js

@@ -0,0 +1,24 @@
+/**
+ * Flattens the entities into the rows the grid actually renders: each entity followed by its
+ * children while it is expanded. Drag and shift-click ranges walk this list, so they cross
+ * nesting levels the way the user sees them on screen.
+ */
+export const getDragSelectionRows = (entities, expandedRows) => {
+    const expanded = new Set(expandedRows);
+    const rows = [];
+    const entityById = new Map();
+    entities.forEach(entity => {
+        rows.push({ id: entity.id, isNested: false });
+        entityById.set(entity.id, entity);
+        // Children are always indexed — a collapsed row's children still need to resolve for
+        // the selection predicates — but only an expanded row contributes them to the range.
+        const isExpanded = expanded.has(entity.id);
+        (entity.children || []).forEach(child => {
+            entityById.set(child.id, child);
+            if (isExpanded) {
+                rows.push({ id: child.id, isNested: true });
+            }
+        });
+    });
+    return { rows, entityById };
+};

package/esm/table/selectable/utils/getRangeIds.d.ts

@@ -0,0 +1,2 @@
+import { IDragSelectionRow } from "../interfaces";
+export declare const getRangeIds: (rows: IDragSelectionRow[], fromId: string, toId: string, isSelectable: (row: IDragSelectionRow) => boolean) => string[];

package/esm/table/selectable/utils/getRangeIds.js

@@ -0,0 +1,17 @@
+export const getRangeIds = (rows, fromId, toId, isSelectable) => {
+    const fromIdx = rows.findIndex(row => row.id === fromId);
+    const toIdx = rows.findIndex(row => row.id === toId);
+    if (fromIdx === -1 || toIdx === -1) {
+        return [];
+    }
+    const start = Math.min(fromIdx, toIdx);
+    const end = Math.max(fromIdx, toIdx);
+    const ids = [];
+    for (let i = start; i <= end; i++) {
+        const row = rows[i];
+        if (isSelectable(row)) {
+            ids.push(row.id);
+        }
+    }
+    return ids;
+};

package/esm/table/selectable/utils/isRowChecked.js

@@ -1,18 +1,7 @@
 import { SelectionState } from "../interfaces";
 export const isRowChecked = (selections, state, strategy, entity, isNested) => {
     if (state === SelectionState.All) {
-        // When the overall selection is "all", `selections` holds the ids that have been
-        // explicitly excluded from that selection (see ISelectionValue), not included ids.
-        if (isNested) {
-            return { indeterminate: false, checked: !selections.has(entity.id) };
-        }
-        const mainEntity = entity;
-        if (strategy === "nested" && mainEntity.children && mainEntity.children.length > 0) {
-            const allChildrenChecked = mainEntity.children.every(child => !selections.has(child.id));
-            const someChildrenChecked = mainEntity.children.some(child => !selections.has(child.id));
-            return { indeterminate: someChildrenChecked && !allChildrenChecked, checked: allChildrenChecked };
-        }
-        return { indeterminate: false, checked: !selections.has(entity.id) };
+        return { indeterminate: false, checked: true };
     }
     if (isNested) {
         return { indeterminate: false, checked: selections.has(entity.id) };

package/esm/table/table.js

@@ -238,7 +238,7 @@ const TableInner = ({
   const {
     selectableColumns,
     selectableFeedWrapper
-  } = useSelectableRows(nestedColumns, entities, isMobile, selectMode, setMobileSelectMode, isLoading ? undefined : selectable, isInfinite);
+  } = useSelectableRows(nestedColumns, entities, isMobile, selectMode, setMobileSelectMode, isLoading ? undefined : selectable, isInfinite, gridRef, expanded);
   const {
     sortableColumns,
     feedSortControl

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geotab/zenith",
-    "version": "3.16.0-beta.2",
+    "version": "3.16.0-beta.3",
     "description": "Zenith components library on React",
     "main": "dist/index.js",
     "types": "esm/index.d.ts",