Revert "Turn heading into a lit component"

This reverts commit 969b2f2e11d7ede5b91ab28cf879c280bb281f81.

src/plugins/chatview/heading.js

@@ -1,38 +1,36 @@
 import UserDetailsModal from 'modals/user-details.js';
+import debounce from 'lodash-es/debounce';
 import tpl_chatbox_head from './templates/chat-head.js';
-import { CustomElement } from 'shared/components/element.js';
+import { ElementView } from '@converse/skeletor/src/element.js';
 import { __ } from 'i18n';
 import { _converse, api } from "@converse/headless/core";
+import { getHeadingDropdownItem, getHeadingStandaloneButton } from 'plugins/chatview/utils.js';
+import { render } from 'lit';
 
 import './styles//chat-head.scss';
 
 
-export default class ChatHeading extends CustomElement {
+export default class ChatHeading extends ElementView {
 
-    connectedCallback () {
-        super.connectedCallback();
-        this.initialize();
+    async render () {
+        const tpl = await this.generateHeadingTemplate();
+        render(tpl, this);
     }
 
-    initialize () {
+    connectedCallback () {
+        super.connectedCallback();
         this.model = _converse.chatboxes.get(this.getAttribute('jid'));
-        this.listenTo(this.model, 'change:status', this.requestUpdate);
-        this.listenTo(this.model, 'vcard:change', this.requestUpdate);
+        this.debouncedRender = debounce(this.render, 100);
+        this.listenTo(this.model, 'change:status', this.debouncedRender);
+        this.listenTo(this.model, 'vcard:change', this.debouncedRender);
         if (this.model.contact) {
-            this.listenTo(this.model.contact, 'destroy', this.requestUpdate);
+            this.listenTo(this.model.contact, 'destroy', this.debouncedRender);
         }
         this.model.rosterContactAdded?.then(() => {
-            this.listenTo(this.model.contact, 'change:nickname', this.requestUpdate);
-            this.requestUpdate();
+            this.listenTo(this.model.contact, 'change:nickname', this.debouncedRender);
+            this.debouncedRender();
         });
-    }
-
-    render () {
-        return tpl_chatbox_head(Object.assign(this.model.toJSON(), {
-            'heading_buttons_promise': this.getHeadingButtons(),
-            'model': this.model,
-            'showUserDetailsModal': ev => this.showUserDetailsModal(ev),
-        }));
+        this.render();
     }
 
     showUserDetailsModal (ev) {
@@ -96,6 +94,33 @@ export default class ChatHeading extends CustomElement {
             return buttons; // Happens during tests
         }
     }
+
+    async generateHeadingTemplate () {
+        const vcard = this.model?.vcard;
+        const vcard_json = vcard ? vcard.toJSON() : {};
+        const i18n_profile = __("The User's Profile Image");
+        const avatar_data = Object.assign(
+            {
+                'alt_text': i18n_profile,
+                'extra_classes': '',
+                'height': 40,
+                'width': 40
+            },
+            vcard_json
+        );
+        const heading_btns = await this.getHeadingButtons();
+        const standalone_btns = heading_btns.filter(b => b.standalone);
+        const dropdown_btns = heading_btns.filter(b => !b.standalone);
+        return tpl_chatbox_head(
+            Object.assign(this.model.toJSON(), {
+                avatar_data,
+                'display_name': this.model.getDisplayName(),
+                'dropdown_btns': dropdown_btns.map(b => getHeadingDropdownItem(b)),
+                'showUserDetailsModal': ev => this.showUserDetailsModal(ev),
+                'standalone_btns': standalone_btns.map(b => getHeadingStandaloneButton(b))
+            })
+        );
+    }
 }
 
 api.elements.define('converse-chat-heading', ChatHeading);

src/plugins/chatview/templates/chat-head.js

@@ -1,44 +1,13 @@
-import { __ } from 'i18n';
 import { _converse } from '@converse/headless/core';
-import { getHeadingDropdownItem, getHeadingStandaloneButton } from 'plugins/chatview/utils.js';
 import { html } from "lit";
 import { renderAvatar } from 'shared/directives/avatar.js';
 import { until } from 'lit/directives/until.js';
 
 
-async function getStandaloneButtons (promise) {
-    const heading_btns = await promise;
-    const standalone_btns = heading_btns.filter(b => b.standalone);
-    return standalone_btns.map(b => getHeadingStandaloneButton(b))
-}
-
-async function getDropdownButtons (promise) {
-    const heading_btns = await promise;
-    const dropdown_btns = heading_btns.filter(b => !b.standalone);
-    return dropdown_btns.map(b => getHeadingDropdownItem(b));
-}
-
 export default (o) => {
-    const vcard = o.model?.vcard;
-    const vcard_json = vcard ? vcard.toJSON() : {};
-    const i18n_profile = __("The User's Profile Image");
-    const avatar_data = Object.assign(
-        {
-            'alt_text': i18n_profile,
-            'extra_classes': '',
-            'height': 40,
-            'width': 40
-        },
-        vcard_json
-    );
-    const avatar = html`<span class="mr-2">${renderAvatar(avatar_data)}</span>`;
-    const display_name = o.model.getDisplayName();
-
-    const tpl_dropdown_btns = () => getDropdownButtons(o.heading_buttons_promise)
-        .then(btns => btns.length ? html`<converse-dropdown .items=${btns}></converse-dropdown>` : '');
+    const tpl_standalone_btns = (o) => o.standalone_btns.reverse().map(b => until(b, ''));
 
-    const tpl_standalone_btns = () => getStandaloneButtons(o.heading_buttons_promise)
-        .then(btns => btns.reverse().map(b => until(b, '')));
+    const avatar = html`<span class="mr-2">${renderAvatar(o.avatar_data)}</span>`;
 
     return html`
         <div class="chatbox-title ${ o.status ? '' :  "chatbox-title--no-desc"}">
@@ -46,12 +15,12 @@ export default (o) => {
                 ${ (!_converse.api.settings.get("singleton")) ?  html`<converse-controlbox-navback jid="${o.jid}"></converse-controlbox-navback>` : '' }
                 ${ (o.type !== _converse.HEADLINES_TYPE) ? html`<a class="show-msg-author-modal" @click=${o.showUserDetailsModal}>${ avatar }</a>` : '' }
                 <div class="chatbox-title__text" title="${o.jid}">
-                    ${ (o.type !== _converse.HEADLINES_TYPE) ? html`<a class="user show-msg-author-modal" @click=${o.showUserDetailsModal}>${ display_name }</a>` : display_name }
+                    ${ (o.type !== _converse.HEADLINES_TYPE) ? html`<a class="user show-msg-author-modal" @click=${o.showUserDetailsModal}>${ o.display_name }</a>` : o.display_name }
                 </div>
             </div>
             <div class="chatbox-title__buttons row no-gutters">
-                ${ until(tpl_dropdown_btns(), '') }
-                ${ until(tpl_standalone_btns(), '') }
+                ${ o.dropdown_btns.length ? html`<converse-dropdown .items=${o.dropdown_btns}></converse-dropdown>` : '' }
+                ${ o.standalone_btns.length ? tpl_standalone_btns(o) : '' }
             </div>
         </div>
         ${ o.status ? html`<p class="chat-head__desc">${ o.status }</p>` : '' }