diff --git a/src/mail-app/mail/view/MailView.ts b/src/mail-app/mail/view/MailView.ts index d0c7e937d755..3d6f95436e4a 100644 --- a/src/mail-app/mail/view/MailView.ts +++ b/src/mail-app/mail/view/MailView.ts @@ -6,7 +6,7 @@ import { Dialog } from "../../../common/gui/base/Dialog" import { FeatureType, Keys, MailSetKind } from "../../../common/api/common/TutanotaConstants" import { AppHeaderAttrs, Header } from "../../../common/gui/Header.js" import type { Mail, MailBox, MailFolder } from "../../../common/api/entities/tutanota/TypeRefs.js" -import { noOp, ofClass } from "@tutao/tutanota-utils" +import { isEmpty, noOp, ofClass } from "@tutao/tutanota-utils" import { MailListView } from "./MailListView" import { assertMainOrNode, isApp } from "../../../common/api/common/Env" import type { Shortcut } from "../../../common/misc/KeyManager" @@ -70,6 +70,7 @@ import { ButtonSize } from "../../../common/gui/base/ButtonSize" import { RowButton } from "../../../common/gui/base/buttons/RowButton" import { getLabelColor } from "../../../common/gui/base/Label.js" import { MAIL_PREFIX } from "../../../common/misc/RouteChange" +import { LabelsPopup } from "./LabelsPopup" assertMainOrNode() @@ -233,10 +234,9 @@ export class MailView extends BaseTopLevelView implements TopLevelView { + this.oncreate = (vnode) => { this.countersStream = mailLocator.mailModel.mailboxCounters.map(m.redraw) keyManager.registerShortcuts(shortcuts) this.cache.conversationViewPreference = deviceConfig.getConversationViewShowOnlySelectedMail() @@ -473,6 +473,14 @@ export class MailView extends BaseTopLevelView implements TopLevelView { + this.labels() + return true + }, + help: "labels_label", + }, { key: Keys.U, exec: () => { @@ -564,6 +572,27 @@ export class MailView extends BaseTopLevelView implements TopLevelView mailLocator.mailModel.applyLabels(selectedMails, addedLabels, removedLabels), + ) + popup.show() + } + private createFolderColumn(editingFolderForMailGroup: Id | null = null, drawerAttrs: DrawerMenuAttrs) { return new ViewColumn( {