Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1027 from gzzhanghao/vscroll 

[web] fix virtual scroll range
This commit is contained in:
Maximilian Hils 2016-03-12 19:00:16 +01:00
parent e0f1f13c14 ae61025d5d
commit d3a55cd3f0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mitmproxy/web/static/app.js
View File

@ -2873,6 +2873,8 @@ var _react = require("react");
var _react2 = _interopRequireDefault(_react); var _react2 = _interopRequireDefault(_react);
var _common = require("./common.js");
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
Footer.propTypes = { Footer.propTypes = {
@ -2902,7 +2904,7 @@ function Footer(_ref) {
); );
} }
},{"react":"react"}],15:[function(require,module,exports){ },{"./common.js":4,"react":"react"}],15:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -3505,7 +3507,7 @@ function calcVScroll(opts) {
// Make sure that we start at an even row so that CSS `:nth-child(even)` is preserved // Make sure that we start at an even row so that CSS `:nth-child(even)` is preserved
start = Math.max(0, Math.floor(viewportTop / rowHeight) - 1) & ~1; start = Math.max(0, Math.floor(viewportTop / rowHeight) - 1) & ~1;
end = Math.min(itemCount, start + Math.ceil(viewportHeight / rowHeight) + 1); end = Math.min(itemCount, start + Math.ceil(viewportHeight / rowHeight) + 2);
// When a large trunk of elements is removed from the button, start may be far off the viewport. // When a large trunk of elements is removed from the button, start may be far off the viewport.
// To make this issue less severe, limit the top placeholder to the total number of rows. // To make this issue less severe, limit the top placeholder to the total number of rows.

2
web/src/js/components/helpers/VirtualScroll.js
View File

@ -57,7 +57,7 @@ export function calcVScroll(opts) {
start = Math.max(0, Math.floor(viewportTop / rowHeight) - 1) & ~1; start = Math.max(0, Math.floor(viewportTop / rowHeight) - 1) & ~1;
end = Math.min( end = Math.min(
itemCount, itemCount,
start + Math.ceil(viewportHeight / rowHeight) + 1 start + Math.ceil(viewportHeight / rowHeight) + 2
); );
// When a large trunk of elements is removed from the button, start may be far off the viewport. // When a large trunk of elements is removed from the button, start may be far off the viewport.