Skip to content

Commit 86cfc52

Browse files
fix: allow undefined in activeItem and corresponding event (#5419) (#5421)
Co-authored-by: Serhii Kulykov <iamkulykov@gmail.com>
1 parent 2065a59 commit 86cfc52

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

packages/grid-pro/test/typings/grid-pro.types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ narrowedGrid.addEventListener('item-property-changed', (event) => {
4646

4747
narrowedGrid.addEventListener('active-item-changed', (event) => {
4848
assertType<GridActiveItemChangedEvent<TestGridItem>>(event);
49-
assertType<TestGridItem>(event.detail.value);
49+
assertType<TestGridItem | null | undefined>(event.detail.value);
5050
});
5151

5252
narrowedGrid.addEventListener('cell-activate', (event) => {

packages/grid/src/vaadin-grid-active-item-mixin.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export declare class ActiveItemMixinClass<TItem> {
1414
* The item user has last interacted with. Turns to `null` after user deactivates
1515
* the item by re-interacting with the currently active item.
1616
*/
17-
activeItem: TItem | null;
17+
activeItem: TItem | null | undefined;
1818
}
1919

2020
export declare function isFocusable(target: Element): boolean;

packages/grid/src/vaadin-grid.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export interface GridItemModel<TItem> {
6464
/**
6565
* Fired when the `activeItem` property changes.
6666
*/
67-
export type GridActiveItemChangedEvent<TItem> = CustomEvent<{ value: TItem }>;
67+
export type GridActiveItemChangedEvent<TItem> = CustomEvent<{ value: TItem | null | undefined }>;
6868

6969
/**
7070
* Fired when the cell is activated with click or keyboard.

packages/grid/test/typings/grid.types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ assertType<DragAndDropMixinClass<TestGridItem>>(narrowedGrid);
8888

8989
narrowedGrid.addEventListener('active-item-changed', (event) => {
9090
assertType<GridActiveItemChangedEvent<TestGridItem>>(event);
91-
assertType<TestGridItem>(event.detail.value);
91+
assertType<TestGridItem | null | undefined>(event.detail.value);
9292
});
9393

9494
narrowedGrid.addEventListener('cell-activate', (event) => {
@@ -165,7 +165,7 @@ assertType<string | null | undefined>(narrowedGrid.itemIdPath);
165165
assertType<string>(narrowedGrid.itemHasChildrenPath);
166166

167167
assertType<TestGridItem[] | null | undefined>(narrowedGrid.items);
168-
assertType<TestGridItem | null>(narrowedGrid.activeItem);
168+
assertType<TestGridItem | null | undefined>(narrowedGrid.activeItem);
169169
assertType<boolean>(narrowedGrid.columnReorderingAllowed);
170170

171171
assertType<TestGridItem[]>(narrowedGrid.selectedItems);

0 commit comments

Comments
 (0)