Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allSelectedRows and someSelectedRows should be more reliable #28577

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "28456",
"packageName": "@fluentui/react-table",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,36 @@ describe('useTableSelectionState', () => {
});

describe('allRowsSelected', () => {
it('should return true after items updated if all selectable rows are selected', () => {
const getRowId = (item: { value: string }) => item.value;
let tableState = mockTableState({ items, getRowId });
const { result, rerender } = renderHook(() =>
useTableSelectionState(tableState, { selectionMode: 'multiselect' }),
);

act(() => {
result.current.selection.toggleAllRows(mockSyntheticEvent());
});

act(() => {
result.current.selection.deselectRow(mockSyntheticEvent(), 'c');
});

expect(result.current.selection.allRowsSelected).toBe(false);

// remove the deselected item
const nextItems = [...items];
const indexToDelete = nextItems.findIndex(x => x.value === 'c');
nextItems.splice(indexToDelete, 1);
tableState = mockTableState({ items: nextItems, getRowId });

act(() => {
rerender();
});

expect(result.current.selection.allRowsSelected).toBe(true);
});

it('should return true if all rows are selected', () => {
const { result } = renderHook(() =>
useTableSelectionState(mockTableState({ items }), { selectionMode: 'multiselect' }),
Expand Down Expand Up @@ -258,6 +288,32 @@ describe('useTableSelectionState', () => {
});

describe('someRowsSelected', () => {
it('should return false after selectedItems are removed', () => {
const getRowId = (item: { value: string }) => item.value;
let tableState = mockTableState({ items, getRowId });
const { result, rerender } = renderHook(() =>
useTableSelectionState(tableState, { selectionMode: 'multiselect' }),
);

act(() => {
result.current.selection.selectRow(mockSyntheticEvent(), 'a');
});

expect(result.current.selection.someRowsSelected).toBe(true);

// remove the deselected item
const nextItems = [...items];
const indexToDelete = nextItems.findIndex(x => x.value === 'a');
nextItems.splice(indexToDelete, 1);
tableState = mockTableState({ items: nextItems, getRowId });

act(() => {
rerender();
});

expect(result.current.selection.someRowsSelected).toBe(false);
});

it('should return true if there is a selected row', () => {
const { result } = renderHook(() =>
useTableSelectionState(mockTableState({ items }), { selectionMode: 'multiselect' }),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import * as React from 'react';
import { SelectionHookParams, useEventCallback, useSelection } from '@fluentui/react-utilities';
import type { TableRowId, TableSelectionState, TableFeaturesState } from './types';

Expand Down Expand Up @@ -36,6 +37,52 @@ export function useTableSelectionState<TItem>(
onSelectionChange,
});

// Selection state can contain obselete items (i.e. rows that are removed)
const selectableRowIds = React.useMemo(() => {
const rowIds = new Set<TableRowId>();
for (let i = 0; i < items.length; i++) {
rowIds.add(getRowId?.(items[i]) ?? i);
}

return rowIds;
}, [items, getRowId]);

const allRowsSelected = React.useMemo(() => {
if (selectionMode === 'single') {
const selectedRow = Array.from(selected)[0];
return selectableRowIds.has(selectedRow);
}

// multiselect case
if (selected.size < selectableRowIds.size) {
return false;
}

let res = true;
selectableRowIds.forEach(selectableRowId => {
if (!selected.has(selectableRowId)) {
res = false;
}
});

return res;
}, [selectableRowIds, selected, selectionMode]);

const someRowsSelected = React.useMemo(() => {
if (selected.size <= 0) {
return false;
}

let res = false;
selectableRowIds.forEach(selectableRowId => {
if (selected.has(selectableRowId)) {
res = true;
}
});

return res;
}, [selectableRowIds, selected]);

const toggleAllRows: TableSelectionState['toggleAllRows'] = useEventCallback(e => {
selectionMethods.toggleAllItems(
e,
Expand Down Expand Up @@ -63,8 +110,8 @@ export function useTableSelectionState<TItem>(
...tableState,
selection: {
selectionMode,
someRowsSelected: selected.size > 0,
allRowsSelected: selectionMode === 'single' ? selected.size > 0 : selected.size === items.length,
someRowsSelected,
allRowsSelected,
selectedRows: selected,
toggleRow,
toggleAllRows,
Expand Down
Loading