Skip to content

Scrollable pane sort stickies #4111

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
ThomasMichon merged 2 commits into from
Feb 27, 2018
Merged

Scrollable pane sort stickies #4111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
655e6c9
Make ScrollablePane._sortStickies change elements only when needed
warmsea Feb 27, 2018
a375722
Add change file.
warmsea Feb 27, 2018
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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/ScrollablePane-sortStickies_2018-02-27-12-25.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Make ScrollablePane._sortStickies change elements only when needed.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "s@warmsea.net"
}
21 changes: 16 additions & 5 deletions packages/office-ui-fabric-react/src/components/ScrollablePane/ScrollablePane.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,23 @@ export class ScrollablePaneBase extends BaseComponent<IScrollablePaneProps, {}>
const bOffset = this._calculateOffsetParent(b.root);
return aOffset - bOffset;
});
while (container.lastChild) {
container.removeChild(container.lastChild);
// Get number of elements that is already in order.
let elementsInOrder = 0;
while (elementsInOrder < container.children.length && elementsInOrder < stickyArr.length) {
if (container.children[elementsInOrder] === stickyArr[elementsInOrder].content) {
++elementsInOrder;
} else {
break;
}
}
// Remove elements that is not in order if exist.
for (let i = container.children.length - 1; i >= elementsInOrder; --i) {
container.removeChild(container.children[i]);
}
// Append further elements if needed.
for (let i = elementsInOrder; i < stickyArr.length; ++i) {
container.appendChild(stickyArr[i].content);
}
stickyArr.forEach((sticky) => {
container.appendChild(sticky.content);
});
}

private _calculateOffsetParent(ele: HTMLElement): number {
Expand Down