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

Speedup listChecked().length to hasChecked()

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
dev/Common/Selector.js
View file

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

2
dev/Model/Contact.js
View file

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

1
dev/Model/Message.js
View file

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

8
dev/Stores/User/Contact.js
View file

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

13
dev/Stores/User/Messagelist.js
View file

@ -120,17 +120,20 @@ addComputablesTo(MessagelistUserStore, {
});
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)
).extend({ rateLimit: 0 });
MessagelistUserStore.hasCheckedOrSelected = koComputable(() =>
!!(MessagelistUserStore.selectedMessage()
|| MessagelistUserStore.focusedMessage()
|| MessagelistUserStore.find(item => item.checked()))
| MessagelistUserStore.focusedMessage()
// Issue: not all are observed?
| MessagelistUserStore.find(isChecked))
).extend({ rateLimit: 50 });
MessagelistUserStore.notifyNewMessages = (folder, newMessages) => {

2
dev/View/Popup/Contacts.js
View file

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

8
dev/View/User/MailBox/MessageList.js
View file

@ -118,7 +118,7 @@ export class MailMessageList extends AbstractViewRight {
MessagelistUserStore.pageCount),
checkAll: {
read: () => 0 < MessagelistUserStore.listChecked().length,
read: () => MessagelistUserStore.hasChecked(),
write: (value) => {
value = !!value;
MessagelistUserStore.forEach(message => message.checked(value));
@ -135,9 +135,9 @@ export class MailMessageList extends AbstractViewRight {
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: () => {
let mode = FolderUserStore.sortMode(),
@ -323,7 +323,7 @@ export class MailMessageList extends AbstractViewRight {
}
goToUpOrDown(up) {
if (MessagelistUserStore.listChecked().length) {
if (MessagelistUserStore.hasChecked()) {
return false;
}

2
dev/View/User/MailBox/MessageView.js
View file

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