Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix onAdd

Browse source 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
This commit is contained in:
RMidhunSuresh 2021-08-10 14:37:33 +05:30 committed by Bruno Windels
parent 587dd3848e
commit 83ff2dd810
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/platform/web/ui/general/LazyListView.js
View file

@ -43,6 +43,8 @@ class ItemRange {
} }
containsIndex(idx) { containsIndex(idx) {
// TODO: Replace by lastIndex
// TODO: Should idx be <= since lastIndex is not rendered?
return idx >= this.topCount && idx <= (this.topCount + this.renderCount); return idx >= this.topCount && idx <= (this.topCount + this.renderCount);
} }
@ -170,7 +172,7 @@ export class LazyListView extends ListView {
if (this._height === 0) { console.error("LazyListView could not calculate parent height."); } if (this._height === 0) { console.error("LazyListView could not calculate parent height."); }
const initialRange = this._getVisibleRange(); const initialRange = this._getVisibleRange();
const initialRenderRange = initialRange.expand(this._overflowItems); const initialRenderRange = initialRange.expand(this._overflowItems);
this._renderRange = new ItemRange(0, 0, 0); this._renderRange = new ItemRange(0, 0, initialRange.bottomCount + 1);
this._renderElementsInRange(initialRenderRange); this._renderElementsInRange(initialRenderRange);
} }
@ -219,7 +221,6 @@ export class LazyListView extends ListView {
const diff = this._renderRange.diff(range); const diff = this._renderRange.diff(range);
const renderedItems = this._itemsFromList(diff.toAdd); const renderedItems = this._itemsFromList(diff.toAdd);
this._adjustPadding(range); this._adjustPadding(range);
const {start, end} = diff.toRemove; const {start, end} = diff.toRemove;
const normalizedStart = this._renderRange.normalize(start); const normalizedStart = this._renderRange.normalize(start);
this._childInstances.splice(normalizedStart, end - start + 1).forEach(child => this._removeChild(child)); this._childInstances.splice(normalizedStart, end - start + 1).forEach(child => this._removeChild(child));
@ -265,9 +266,27 @@ export class LazyListView extends ListView {
child.unmount(); child.unmount();
} }
// If size of the list changes, re-render onAdd(idx, value) {
onAdd() { const {topCount, renderCount, bottomCount} = this._renderRange;
this._renderIfNeeded(true); if (this._renderRange.containsIndex(idx)) {
const normalizedIdx = this._renderRange.normalize(idx);
if (bottomCount === 0) {
// We're completely scrolled; so the extra element needs to be removed from top
this._removeChild(this._childInstances.shift());
this._renderRange = new ItemRange(topCount + 1, renderCount, bottomCount);
}
else {
// Remove the last element, render the new element
this._removeChild(this._childInstances.pop());
this._renderRange = new ItemRange(topCount, renderCount, bottomCount + 1);
}
super.onAdd(normalizedIdx, value);
}
else {
this._renderRange = idx < topCount ? new ItemRange(topCount + 1, renderCount, bottomCount):
new ItemRange(topCount, renderCount, bottomCount + 1);
}
this._adjustPadding(this._renderRange);
} }
onRemove() { onRemove() {