Fix TypeError when logging out

Author: jcbrand

CHANGES.md

@@ -6,6 +6,7 @@
 - Remove modal from the DOM when it's closed
 - Fix login form style for `classic` theme
 - Properly handle OGP metadata that doesn't have an image
+- Fix TypeError which prevents logging out
 
 ## 11.0.0 (2025-05-21)
 

src/shared/chat/baseview.js

@@ -7,27 +7,25 @@ import { onScrolledDown } from './utils.js';
 
 const { CHATROOMS_TYPE, INACTIVE } = constants;
 
-
 export default class BaseChatView extends CustomElement {
-
-    static get properties () {
+    static get properties() {
         return {
-            jid: { type: String }
-        }
+            jid: { type: String },
+        };
     }
 
-    constructor () {
+    constructor() {
         super();
         this.jid = /** @type {string} */ null;
         this.model = /** @type {Model} */ null;
     }
 
-    disconnectedCallback () {
+    disconnectedCallback() {
         super.disconnectedCallback();
         _converse.state.chatboxviews.remove(this.jid, this);
     }
 
-    updated () {
+    updated() {
         if (this.model && this.jid !== this.model.get('jid')) {
             this.stopListening();
             _converse.state.chatboxviews.remove(this.model.get('jid'), this);
@@ -37,32 +35,35 @@ export default class BaseChatView extends CustomElement {
         }
     }
 
-    close (ev) {
+    /**
+     * @param {MouseEvent} ev
+     */
+    close(ev) {
         ev?.preventDefault?.();
-        return this.model.close(ev);
+        return this.model?.close(ev);
     }
 
-    maybeFocus () {
+    maybeFocus() {
         api.settings.get('auto_focus') && this.focus();
     }
 
-    focus () {
+    focus() {
         const textarea_el = this.getElementsByClassName('chat-textarea')[0];
         if (textarea_el && document.activeElement !== textarea_el) {
-            /** @type {HTMLTextAreaElement} */(textarea_el).focus();
+            /** @type {HTMLTextAreaElement} */ (textarea_el).focus();
         }
         return this;
     }
 
-    getBottomPanel () {
+    getBottomPanel() {
         if (this.model.get('type') === CHATROOMS_TYPE) {
             return this.querySelector('converse-muc-bottom-panel');
         } else {
             return this.querySelector('converse-chat-bottom-panel');
         }
     }
 
-    getMessageForm () {
+    getMessageForm() {
         if (this.model.get('type') === CHATROOMS_TYPE) {
             return this.querySelector('converse-muc-message-form');
         } else {
@@ -77,7 +78,7 @@ export default class BaseChatView extends CustomElement {
      * whether the user scrolled up manually or not.
      * @param { Event } [ev] - An optional event that is the cause for needing to scroll down.
      */
-    scrollDown (ev) {
+    scrollDown(ev) {
         ev?.preventDefault?.();
         ev?.stopPropagation?.();
         if (this.model.ui.get('scrolled')) {
@@ -86,7 +87,7 @@ export default class BaseChatView extends CustomElement {
         onScrolledDown(this.model);
     }
 
-    onWindowStateChanged () {
+    onWindowStateChanged() {
         if (document.hidden) {
             this.model.setChatState(INACTIVE, { 'silent': true });
         } else {

src/types/shared/chat/baseview.d.ts

@@ -7,7 +7,10 @@ export default class BaseChatView extends CustomElement {
     jid: any;
     model: any;
     updated(): void;
-    close(ev: any): any;
+    /**
+     * @param {MouseEvent} ev
+     */
+    close(ev: MouseEvent): any;
     maybeFocus(): void;
     focus(): this;
     getBottomPanel(): Element;