Skip to content

Commit ac3b02a

Browse files
committed
Merge branch 'flespi-software-master'
2 parents aa25f0c + 3b2cb51 commit ac3b02a

File tree

10 files changed

+22
-12
lines changed

10 files changed

+22
-12
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ According to the demos above, here are lists of approximate statistics:
197197
| Prop | Type | Required | Description |
198198
|---------------|---------------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
199199
| size | Number || Each list item height, in variable height, this prop just use to calculate the virtual-list outside container viewport fixed height. |
200-
| remain | Number || How many items should be shown in virtual-list viewport, so `size` and `remain` determine the outside container viewport height (`size × remian`). |
200+
| remain | Number || How many items should be shown in virtual-list viewport, so `size` and `remain` determine the outside container viewport height (`size × remain`). |
201201

202202
> Props of performance:
203203

demos/item-mode/build.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/page-mode/build.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/scroll-element/build.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/table-mode/build.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/variable-height/build.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/vfor-mode/build.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
327327
},
328328
// return the right zone info based on `start/index`.
329329
getZone: function getZone(index) {
330-
var start;
330+
var start, end;
331331
var delta = this.delta;
332332
index = parseInt(index, 10);
333333
index = Math.max(0, index);
@@ -340,8 +340,14 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
340340
start = index;
341341
}
342342

343+
end = start + delta.keeps - 1;
344+
345+
if (end > delta.total) {
346+
end = delta.total - 1;
347+
}
348+
343349
return {
344-
end: start + delta.keeps - 1,
350+
end: end,
345351
start: start,
346352
isLast: isLast
347353
};

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332

333333
// return the right zone info based on `start/index`.
334334
getZone (index) {
335-
let start
335+
let start, end
336336
const delta = this.delta
337337

338338
index = parseInt(index, 10)
@@ -346,9 +346,13 @@
346346
} else {
347347
start = index
348348
}
349+
end = start + delta.keeps - 1
350+
if (end > delta.total) {
351+
end = delta.total - 1
352+
}
349353

350354
return {
351-
end: start + delta.keeps - 1,
355+
end,
352356
start,
353357
isLast
354358
}

0 commit comments

Comments
 (0)