Skip to content

Commit

Permalink
fix: Added getKey to SelectionUtils.optimizeSelection (#1994)
Browse files Browse the repository at this point in the history
fixes root issue of DH-16914

I published this as an alpha for DHE testing: 

[0.76.1-alpha-optimize-selection-get-key.0](https://www.npmjs.com/package/@deephaven/react-hooks/v/0.76.1-alpha-optimize-selection-get-key.0)

BREAKING CHANGE: @deephaven/react-hooks:
`SelectionUtils.optimizeSelection` and `useMappedSelection` require
additional `getKey` arg
  • Loading branch information
bmingles authored May 7, 2024
1 parent 1b241ca commit 4404894
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { renderHook } from '@testing-library/react-hooks';
import {
createKeyedItemKey,
createSelectedValuesFilter,
FilterConditionFactory,
TableUtils,
Expand Down Expand Up @@ -82,7 +83,8 @@ it('should map selection to values', () => {

expect(useMappedSelection).toHaveBeenCalledWith(
mockViewportData,
mapItemToValue
mapItemToValue,
createKeyedItemKey
);
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
createKeyedItemKey,
createSelectedValuesFilter,
FilterConditionFactory,
} from '@deephaven/jsapi-utils';
Expand Down Expand Up @@ -40,7 +41,11 @@ export function useDebouncedViewportSelectionFilter<TItem, TValue>({
const tableUtils = useTableUtils();

// Map selection to values contained in the column to filter
const valuesSelection = useMappedSelection(viewportData, mapItemToValue);
const valuesSelection = useMappedSelection(
viewportData,
mapItemToValue,
createKeyedItemKey
);

// Debounce so user can rapidly select multiple items in a row without the
// cost of updating the table on each change
Expand Down
14 changes: 8 additions & 6 deletions packages/react-hooks/src/SelectionUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,13 @@ describe('mapSelection', () => {
});

describe('optimizeSelection', () => {
const getKey = (i: number) => 'abcdefg'.charAt(i);

it('should invert selection if selection is "all"', () => {
const selection = 'all';
const totalRecords = 10;

const actual = optimizeSelection(selection, totalRecords);
const actual = optimizeSelection(selection, totalRecords, getKey);

expect(actual).toEqual({
isInverted: true,
Expand All @@ -137,16 +139,16 @@ describe('optimizeSelection', () => {
it.each([
// Odd record count
[new Set(''), 5, { isInverted: false, selection: new Set('') }],
[new Set('12'), 5, { isInverted: false, selection: new Set('12') }],
[new Set('123'), 5, { isInverted: true, selection: new Set('04') }],
[new Set('bc'), 5, { isInverted: false, selection: new Set('bc') }],
[new Set('bcd'), 5, { isInverted: true, selection: new Set('ae') }],
// Even record count
[new Set(''), 6, { isInverted: false, selection: new Set('') }],
[new Set('123'), 6, { isInverted: false, selection: new Set('123') }],
[new Set('1234'), 6, { isInverted: true, selection: new Set('05') }],
[new Set('bcd'), 6, { isInverted: false, selection: new Set('bcd') }],
[new Set('bcde'), 6, { isInverted: true, selection: new Set('af') }],
] as const)(
'should invert selection if selection size > half the total size',
(selection, totalRecords, expected) => {
const actual = optimizeSelection(selection, totalRecords);
const actual = optimizeSelection(selection, totalRecords, getKey);

expect(actual).toEqual(expected);
}
Expand Down
8 changes: 5 additions & 3 deletions packages/react-hooks/src/SelectionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ export function mapSelection<TItem, TMap>(
* "no filter".
* @param selection The selection to optimize
* @param totalRecords The total number of records that can potentially be selected
* @param getKey A function to get the key for a given index.
*/
export function optimizeSelection(
selection: Selection,
totalRecords: number
totalRecords: number,
getKey: (i: number) => string
): { selection: Selection; isInverted: boolean } {
const isInverted = selection === 'all' || selection.size > totalRecords / 2;

Expand All @@ -110,8 +112,8 @@ export function optimizeSelection(
: new Set<Key>(
// Create a new set from any key that is not selected
[...generateRange(0, totalRecords - 1)]
.filter(i => !selection.has(String(i)))
.map(i => String(i))
.map(getKey)
.filter(key => !selection.has(key))
);
}

Expand Down
7 changes: 5 additions & 2 deletions packages/react-hooks/src/useMappedSelection.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,16 @@ beforeEach(() => {
});

it('should optimize selection and map it to another selection', () => {
const getKey = jest.fn().mockName('getKey');

const { result } = renderHook(() =>
useMappedSelection(viewportData, mapName)
useMappedSelection(viewportData, mapName, getKey)
);

expect(optimizeSelection).toHaveBeenCalledWith(
viewportData.selectedKeys,
viewportData.items.length
viewportData.items.length,
getKey
);

expect(mapSelection).toHaveBeenCalledWith(
Expand Down
9 changes: 6 additions & 3 deletions packages/react-hooks/src/useMappedSelection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,27 @@ import type { WindowedListData } from './useWindowedListData';
* The keys are mapped to new values via a `mapItem` function.
* @param viewportData The viewport to map selections for
* @param mapItem A function to map an item in the viewport to a new value
* @param getKey A function to get the key for an item in the viewport.
*/
export function useMappedSelection<TItem, TValue>(
viewportData: WindowedListData<KeyedItem<TItem>>,
mapItem: (item: KeyedItem<TItem>) => TValue
mapItem: (item: KeyedItem<TItem>) => TValue,
getKey: (i: number) => string
): SelectionMaybeInverted<TValue> {
const { getItem, selectedKeys, items } = viewportData;

return useMemo(() => {
const { selection, isInverted } = optimizeSelection(
selectedKeys,
items.length
items.length,
getKey
);

return {
selection: mapSelection(selection, getItem, mapItem),
isInverted,
};
}, [selectedKeys, items.length, getItem, mapItem]);
}, [selectedKeys, items.length, getKey, getItem, mapItem]);
}

export default useMappedSelection;

0 comments on commit 4404894

Please sign in to comment.