Speedup listChecked().length to hasChecked()

This commit is contained in:
the-djmaze 2022-09-09 10:02:40 +02:00
parent 7ec3d70c60
commit 47a861a243
8 changed files with 28 additions and 20 deletions

View file

@ -216,12 +216,8 @@ export class Selector {
}); });
} }
isListChecked() {
return this.list.find(item => item.checked());
}
itemSelected(item) { itemSelected(item) {
if (this.isListChecked()) { if (this.list.hasChecked()) {
item || this.oCallbacks.ItemSelect?.(null); item || this.oCallbacks.ItemSelect?.(null);
} else if (item) { } else if (item) {
this.oCallbacks.ItemSelect?.(item); this.oCallbacks.ItemSelect?.(item);
@ -373,7 +369,7 @@ export class Selector {
if (result) { if (result) {
this.focusedItem(result); this.focusedItem(result);
if ((this.autoSelect() || bForceSelect) && !this.isListChecked()) { if ((this.autoSelect() || bForceSelect) && !this.list.hasChecked()) {
this.selectedItem(result); this.selectedItem(result);
} }
this.scrollToFocused(); this.scrollToFocused();

View file

@ -81,9 +81,11 @@ export class ContactModel extends AbstractModel {
this.jCard = ['vcard',[]]; this.jCard = ['vcard',[]];
this.addObservables({ this.addObservables({
// Also used by Selector
focused: false, focused: false,
selected: false, selected: false,
checked: false, checked: false,
deleted: false, deleted: false,
readOnly: false, readOnly: false,

View file

@ -127,6 +127,7 @@ export class MessageModel extends AbstractModel {
deleted: false, deleted: false,
// Also used by Selector
focused: false, focused: false,
selected: false, selected: false,
checked: false, checked: false,

View file

@ -1,7 +1,7 @@
import ko from 'ko'; import ko from 'ko';
import { SettingsGet } from 'Common/Globals'; import { SettingsGet } from 'Common/Globals';
import { pInt } from 'Common/Utils'; import { pInt } from 'Common/Utils';
import { addObservablesTo, koArrayWithDestroy } from 'External/ko'; import { koComputable, addObservablesTo, koArrayWithDestroy } from 'External/ko';
import Remote from 'Remote/User/Fetch'; import Remote from 'Remote/User/Fetch';
export const ContactUserStore = koArrayWithDestroy(); export const ContactUserStore = koArrayWithDestroy();
@ -18,6 +18,12 @@ addObservablesTo(ContactUserStore, {
syncPass: '' syncPass: ''
}); });
// Also used by Selector
ContactUserStore.hasChecked = koComputable(
// Issue: not all are observed?
() => !!ContactUserStore.find(item => item.checked())
);
/** /**
* @param {Function} fResultFunc * @param {Function} fResultFunc
* @returns {void} * @returns {void}

View file

@ -120,17 +120,20 @@ addComputablesTo(MessagelistUserStore, {
}); });
MessagelistUserStore.listChecked = koComputable( MessagelistUserStore.listChecked = koComputable(
() => MessagelistUserStore.filter(isChecked)).extend({ rateLimit: 0 } () => MessagelistUserStore.filter(isChecked)
); ).extend({ rateLimit: 0 });
MessagelistUserStore.hasCheckedMessages = koComputable( // Also used by Selector
MessagelistUserStore.hasChecked = koComputable(
// Issue: not all are observed?
() => !!MessagelistUserStore.find(isChecked) () => !!MessagelistUserStore.find(isChecked)
).extend({ rateLimit: 0 }); ).extend({ rateLimit: 0 });
MessagelistUserStore.hasCheckedOrSelected = koComputable(() => MessagelistUserStore.hasCheckedOrSelected = koComputable(() =>
!!(MessagelistUserStore.selectedMessage() !!(MessagelistUserStore.selectedMessage()
|| MessagelistUserStore.focusedMessage() | MessagelistUserStore.focusedMessage()
|| MessagelistUserStore.find(item => item.checked())) // Issue: not all are observed?
| MessagelistUserStore.find(isChecked))
).extend({ rateLimit: 50 }); ).extend({ rateLimit: 50 });
MessagelistUserStore.notifyNewMessages = (folder, newMessages) => { MessagelistUserStore.notifyNewMessages = (folder, newMessages) => {

View file

@ -71,7 +71,7 @@ export class ContactsPopupView extends AbstractViewPopup {
), ),
contactsCheckedOrSelected: () => { contactsCheckedOrSelected: () => {
const checked = ContactUserStore.filter(item => item.checked?.()), const checked = ContactUserStore.filter(item => item.checked()),
selected = this.selectorContact(); selected = this.selectorContact();
return checked.length ? checked : (selected ? [selected] : []); return checked.length ? checked : (selected ? [selected] : []);
}, },

View file

@ -118,7 +118,7 @@ export class MailMessageList extends AbstractViewRight {
MessagelistUserStore.pageCount), MessagelistUserStore.pageCount),
checkAll: { checkAll: {
read: () => 0 < MessagelistUserStore.listChecked().length, read: () => MessagelistUserStore.hasChecked(),
write: (value) => { write: (value) => {
value = !!value; value = !!value;
MessagelistUserStore.forEach(message => message.checked(value)); MessagelistUserStore.forEach(message => message.checked(value));
@ -135,9 +135,9 @@ export class MailMessageList extends AbstractViewRight {
return c && MessagelistUserStore().length > c; return c && MessagelistUserStore().length > c;
}, },
mobileCheckedStateShow: () => ThemeStore.isMobile() ? MessagelistUserStore.listChecked().length : 1, mobileCheckedStateShow: () => ThemeStore.isMobile() ? MessagelistUserStore.hasChecked() : 1,
mobileCheckedStateHide: () => ThemeStore.isMobile() ? !MessagelistUserStore.listChecked().length : 1, mobileCheckedStateHide: () => ThemeStore.isMobile() ? !MessagelistUserStore.hasChecked() : 1,
sortText: () => { sortText: () => {
let mode = FolderUserStore.sortMode(), let mode = FolderUserStore.sortMode(),
@ -323,7 +323,7 @@ export class MailMessageList extends AbstractViewRight {
} }
goToUpOrDown(up) { goToUpOrDown(up) {
if (MessagelistUserStore.listChecked().length) { if (MessagelistUserStore.hasChecked()) {
return false; return false;
} }

View file

@ -111,7 +111,7 @@ export class MailMessageView extends AbstractViewRight {
const attachmentsActions = Settings.app('attachmentsActions'); const attachmentsActions = Settings.app('attachmentsActions');
this.attachmentsActions = ko.observableArray(arrayLength(attachmentsActions) ? attachmentsActions : []); this.attachmentsActions = ko.observableArray(arrayLength(attachmentsActions) ? attachmentsActions : []);
this.hasCheckedMessages = MessagelistUserStore.hasCheckedMessages; this.hasCheckedMessages = MessagelistUserStore.hasChecked;
this.archiveAllowed = MessagelistUserStore.archiveAllowed; this.archiveAllowed = MessagelistUserStore.archiveAllowed;
this.canMarkAsSpam = MessagelistUserStore.canMarkAsSpam; this.canMarkAsSpam = MessagelistUserStore.canMarkAsSpam;
this.isDraftFolder = MessagelistUserStore.isDraftFolder; this.isDraftFolder = MessagelistUserStore.isDraftFolder;