Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-03 22:47:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Faster Selector.autoSelect

Browse source
This commit is contained in:
the-djmaze 2022-09-09 17:04:52 +02:00
parent 44ac2626ec
commit 0c87bbac21
4 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dev/Common/Selector.js
View file

@ -55,17 +55,15 @@ export class Selector {
this.listChecked.subscribe(items => {
if (items.length) {
if (null === koSelectedItem()) {
if (koSelectedItem.valueHasMutated) {
koSelectedItem.valueHasMutated();
}
} else {
if (koSelectedItem()) {
koSelectedItem(null);
} else {
koSelectedItem.valueHasMutated?.();
}
} else if (this.autoSelect() && koFocusedItem()) {
} else if (this.autoSelect()) {
koSelectedItem(koFocusedItem());
}
}, this);
});
let selectedItemUseCallback = true;
@ -78,9 +76,9 @@ export class Selector {
} else if (selectedItemUseCallback) {
this.itemSelected();
}
}, this);
});
koFocusedItem.subscribe(item => item && (this.sLastUid = this.getItemUid(item)), this);
koFocusedItem.subscribe(item => item && (this.sLastUid = this.getItemUid(item)));
/**
* Below code is used to keep checked/focused/selected states when array is refreshed.
@ -176,7 +174,7 @@ export class Selector {
this.iFocusedNextHelper = 0;
}
if (!isChecked && !koSelectedItem() && koFocusedItem() && this.autoSelect()) {
if (this.autoSelect() && !isChecked && !koSelectedItem()) {
koSelectedItem(koFocusedItem());
}
}
@ -262,7 +260,7 @@ export class Selector {
* @returns {boolean}
*/
autoSelect() {
return !!(this.oCallbacks.AutoSelect || (()=>1))();
return !!(this.oCallbacks.AutoSelect || (()=>1))() && this.focusedItem();
}
/**