Skip to content

List: Correctly measure pages when using display: none. #1582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dzearing merged 3 commits into from
May 2, 2017
Merged

List: Correctly measure pages when using display: none. #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab5efd1
Prevent hidden measurements.
Apr 24, 2017
ef5671e
Added public patch description.
Apr 24, 2017
85b725c
Merge branch 'master' into listToUpdatePagesFromDisplayNone
cschleiden Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions common/changes/listToUpdatePagesFromDisplayNone_2017-04-24-09-42.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "List: correctly measure pages when using display: none.",
"type": "patch"
},
{
"comment": "",
"packageName": "@uifabric/utilities",
"type": "none"
},
{
"comment": "",
"packageName": "@uifabric/styling",
"type": "none"
},
{
"comment": "",
"packageName": "@uifabric/example-app-base",
"type": "none"
}
],
"email": "v-panu@microsoft.com"
}
24 changes: 13 additions & 11 deletions packages/office-ui-fabric-react/src/components/List/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,22 +518,24 @@ export class List extends BaseComponent<IListProps, IListState> {
if (pageElement && (!cachedHeight || cachedHeight.measureVersion !== this._measureVersion)) {
let newClientRect = _measurePageRect(pageElement);

hasChangedHeight = page.height !== newClientRect.height;
if (newClientRect.height || newClientRect.width) {
hasChangedHeight = page.height !== newClientRect.height;

// console.warn(' *** expensive page measure', page.startIndex, page.height, newClientRect.height);
// console.warn(' *** expensive page measure', page.startIndex, page.height, newClientRect.height);

page.height = newClientRect.height;
page.height = newClientRect.height;

this._cachedPageHeights[page.startIndex] = {
height: newClientRect.height,
measureVersion: this._measureVersion
};
this._cachedPageHeights[page.startIndex] = {
height: newClientRect.height,
measureVersion: this._measureVersion
};

this._estimatedPageHeight = Math.round(
((this._estimatedPageHeight * this._totalEstimates) + newClientRect.height) /
(this._totalEstimates + 1));
this._estimatedPageHeight = Math.round(
((this._estimatedPageHeight * this._totalEstimates) + newClientRect.height) /
(this._totalEstimates + 1));

this._totalEstimates++;
this._totalEstimates++;
}
}

return hasChangedHeight;
Expand Down