Skip to content

Commit

Permalink
Remove _treeOrder member from TreeViewItem (#287)
Browse files Browse the repository at this point in the history
  • Loading branch information
willeastcott committed Jan 21, 2023
1 parent e8e0ad9 commit d7952c8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
13 changes: 7 additions & 6 deletions src/components/TreeView/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -523,13 +523,15 @@ class TreeView extends Container {
* is above the other. Performance wise this means it traverses
* all tree items every time however seems to be pretty fast even with 15 - 20 K entities.
*/
protected _updateTreeOrder() {
protected _getTreeOrder(): Map<TreeViewItem, number> {
const treeOrder = new Map<TreeViewItem, number>();
let order = 0;

this._traverseDepthFirst((item: TreeViewItem) => {
// @ts-ignore
item._treeOrder = order++;
treeOrder.set(item, order++);
});

return treeOrder;
}

protected _getChildIndex(item: TreeViewItem, parent: TreeViewItem) {
Expand Down Expand Up @@ -613,10 +615,9 @@ class TreeView extends Container {
if (!isRootDragged && this._dragOverItem) {
if (this._dragItems.length > 1) {
// sort items based on order in the hierarchy
this._updateTreeOrder();
const treeOrder = this._getTreeOrder();
this._dragItems.sort((a, b) => {
// @ts-ignore
return a._treeOrder - b._treeOrder;
return treeOrder.get(a) - treeOrder.get(b);
});
}

Expand Down
2 changes: 0 additions & 2 deletions src/components/TreeViewItem/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ class TreeViewItem extends Container {

protected _numChildren = 0;

protected _treeOrder = -1;

protected _treeView: any;

protected _allowDrag: boolean;
Expand Down

0 comments on commit d7952c8

Please sign in to comment.