Skip to content

Commit 9f0cee9

Browse files
authored
refactor: update cached keys to use computed properties (#3868)
1 parent 8cb21c9 commit 9f0cee9

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎packages/grid/src/vaadin-grid-data-provider-mixin.js‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,13 @@ export const DataProviderMixin = (superClass) =>
219219
*/
220220
__expandedKeys: {
221221
type: Object,
222-
value: () => new Set(),
222+
computed: '__computeExpandedKeys(itemIdPath, expandedItems.*)',
223223
},
224224
};
225225
}
226226

227227
static get observers() {
228-
return ['_sizeChanged(size)', '_itemIdPathChanged(itemIdPath)', '_expandedItemsChanged(expandedItems.*)'];
228+
return ['_sizeChanged(size)', '_expandedItemsChanged(expandedItems.*)'];
229229
}
230230

231231
/** @private */
@@ -282,25 +282,20 @@ export const DataProviderMixin = (superClass) =>
282282

283283
/** @private */
284284
_expandedItemsChanged() {
285-
this.__cacheExpandedKeys();
286285
this._cache.updateSize();
287286
this._effectiveSize = this._cache.effectiveSize;
288287
this.__updateVisibleRows();
289288
}
290289

291290
/** @private */
292-
_itemIdPathChanged() {
293-
this.__cacheExpandedKeys();
294-
}
291+
__computeExpandedKeys(itemIdPath, expandedItems) {
292+
const expanded = expandedItems.base || [];
293+
const expandedKeys = new Set();
294+
expanded.forEach((item) => {
295+
expandedKeys.add(this.getItemId(item));
296+
});
295297

296-
/** @private */
297-
__cacheExpandedKeys() {
298-
if (this.expandedItems) {
299-
this.__expandedKeys = new Set();
300-
this.expandedItems.forEach((item) => {
301-
this.__expandedKeys.add(this.getItemId(item));
302-
});
303-
}
298+
return expandedKeys;
304299
}
305300

306301
/**

‎packages/grid/src/vaadin-grid-selection-mixin.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ export const SelectionMixin = (superClass) =>
2727
*/
2828
__selectedKeys: {
2929
type: Object,
30-
value: () => new Set(),
30+
computed: '__computeSelectedKeys(itemIdPath, selectedItems.*)',
3131
},
3232
};
3333
}
3434

3535
static get observers() {
36-
return ['_updateSelectedKeys(itemIdPath, selectedItems.*)'];
36+
return ['__selectedItemsChanged(itemIdPath, selectedItems.*)'];
3737
}
3838

3939
/**
@@ -85,14 +85,19 @@ export const SelectionMixin = (superClass) =>
8585
}
8686

8787
/** @private */
88-
_updateSelectedKeys() {
89-
const selectedItems = this.selectedItems || [];
90-
this.__selectedKeys = new Set();
91-
selectedItems.forEach((item) => {
92-
this.__selectedKeys.add(this.getItemId(item));
88+
__selectedItemsChanged() {
89+
this.requestContentUpdate();
90+
}
91+
92+
/** @private */
93+
__computeSelectedKeys(itemIdPath, selectedItems) {
94+
const selected = selectedItems.base || [];
95+
const selectedKeys = new Set();
96+
selected.forEach((item) => {
97+
selectedKeys.add(this.getItemId(item));
9398
});
9499

95-
this.requestContentUpdate();
100+
return selectedKeys;
96101
}
97102

98103
/**

0 commit comments

Comments
 (0)