Use client-side Et2LAvatar instead of image for Et2SelectEmail options & tags

Should now be only avatar.php image when provided
This commit is contained in:
nathan 2023-01-27 13:26:50 -07:00
parent a5739072e9
commit f503743956
3 changed files with 109 additions and 90 deletions

View File

@ -8,7 +8,7 @@
*/
import {Et2Select} from "./Et2Select";
import {css} from "@lion/core";
import {css, html, nothing} from "@lion/core";
import {IsEmail} from "../Validators/IsEmail";
import interact from "@interactjs/interact";
@ -32,9 +32,6 @@ export class Et2SelectEmail extends Et2Select
flex: 1 1 auto;
min-width: 200px;
}
::part(icon), .select__icon {
display: none;
}
::slotted(sl-icon[slot="suffix"]) {
display: none;
}
@ -192,6 +189,26 @@ export class Et2SelectEmail extends Et2Select
return tag;
}
/**
* Override icon for the select option to use lavatar, same as Et2SelectAccount
*
* @param option
* @protected
*/
protected _iconTemplate(option)
{
// lavatar uses a size property, not a CSS variable
let style = getComputedStyle(this);
return html`
<et2-lavatar slot="prefix" part="icon" .size=${style.getPropertyValue("--icon-width")}
lname=${option.lname || nothing}
fname=${option.fname || nothing}
image=${option.icon || nothing}
>
</et2-lavatar>`;
}
/**
* Override image to skip it, we add images in Et2EmailTag using CSS
* @param item

View File

@ -6,10 +6,9 @@
* @link https://www.egroupware.org
* @author Nathan Gray
*/
import {css, PropertyValues} from "@lion/core";
import {classMap, css, html, nothing, PropertyValues, TemplateResult} from "@lion/core";
import shoelace from "../../Styles/shoelace";
import {Et2Tag} from "./Et2Tag";
import {cssImage} from "../../Et2Widget/Et2Widget";
/**
* Display a single email address
@ -32,37 +31,28 @@ export class Et2EmailTag extends Et2Tag
.tag {
position: relative;
}
.tag__prefix {
width: 20px;
height: 20px;
flex: 0 1 auto;
background-color: initial;
background-repeat: no-repeat;
background-size: contain;
background-position-y: center;
.tag__prefix {
flex: 0 1 auto;
opacity: 30%;
cursor: pointer;
}
.contact_plus .tag__prefix {
opacity: 100%;
}
.tag__prefix.loading {
opacity: 100%;
background-image: ${cssImage("loading")};
.tag__has_plus et2-button-icon {
visibility: visible;
}
.tag__prefix.contact_plus_add {
height: 80%;
background-image: ${cssImage("add")};
}
/* Address is for a contact - always show */
.tag__prefix.contact_plus_contact {
:host(:hover) .tag__has_plus {
opacity: 100%;
background-image: ${cssImage("contact")};
}
/* Address is for a contact - always show */
.tag__prefix.tag__has_contact {
opacity: 100%;
}
.tag__remove {
order: 3;
}
@ -143,37 +133,6 @@ export class Et2EmailTag extends Et2Tag
this.shadowRoot.querySelector(".tag").classList.remove("contact_plus");
}
/**
* We either have a contact ID, or false. If false, show the add button.
* @param {false | ContactInfo} data
*/
handleContactResponse(data : false | ContactInfo)
{
this._contactPlusNode.classList.remove("loading");
if(data)
{
this._contactPlusNode.classList.add("contact_plus_contact");
// Add name in if missing
if(!this.fullEmail && data.n_fn && !this.splitEmail(this.value).name)
{
// Append current value as email, data may have work & home email in it
this.textContent = data.n_fn + " <" + this.value + ">"
}
if(data.photo)
{
this._contactPlusNode.style.backgroundImage = "url(" + data.photo + ")";
}
this._contactPlusNode.addEventListener("click", this.handleContactClick);
this.egw().tooltipBind(this._contactPlusNode, this.egw().lang("Open existing contact") + ":\n" + data.n_fn, false, {});
}
else
{
this._contactPlusNode.classList.add("contact_plus_add");
this._contactPlusNode.addEventListener("click", this.handleClick);
this.egw().tooltipBind(this._contactPlusNode, this.egw().lang("Add a new contact"), false, {});
}
}
handleClick(e : MouseEvent)
{
e.stopPropagation();
@ -216,37 +175,74 @@ export class Et2EmailTag extends Et2Tag
// Send the request
this.checkContact(this.value).then((result) =>
{
this.handleContactResponse(result);
this.requestUpdate();
});
}
}
/**
* Check the content for name <email>.
* If there's a name, just show the name, otherwise show the email
*
* @param {string} new_content
*/
set textContent(new_content)
public _contentTemplate() : TemplateResult
{
if(this.fullEmail)
let content = this.value;
// If there's a name, just show the name, otherwise show the email
if(Et2EmailTag.email_cache[this.value])
{
super.textContent = new_content;
return;
// Append current value as email, data may have work & home email in it
content = (Et2EmailTag.email_cache[this.value]?.n_fn || "") + " <" + this.value + ">"
}
if(!this.fullEmail)
{
const split = this.splitEmail(content);
content = split.name || split.email;
}
return html`
<span part="content" class="tag__content">
${content}
</span>`;
}
const split = this.splitEmail(new_content);
super.textContent = split.name || split.email;
public _prefixTemplate() : TemplateResult
{
let classes = {
"tag__prefix": true,
}
let button_or_avatar;
// Show full email in tooltip.
// We could do better here for known contacts
this.egw().tooltipBind(this, new_content.trim(), false, {});
// Show the lavatar for the contact
if(this.value && Et2EmailTag.email_cache[this.value])
{
classes['tag__has_contact'] = true;
// lavatar uses a size property, not a CSS variable
let style = getComputedStyle(this);
const option = Et2EmailTag.email_cache[this.value];
button_or_avatar = html`
<et2-lavatar slot="prefix" part="icon"
@click=${this.handleContactClick}
.size=${style.getPropertyValue("--icon-width")}
lname=${option.lname || nothing}
fname=${option.fname || nothing}
image=${option.photo || nothing}
statustext="${this.egw().lang("Open existing contact") + ":<br/>" + option.n_fn}"
>
</et2-lavatar>`;
}
else
{
// Show a button to add as new contact
classes['tag__has_plus'] = true;
button_or_avatar = html`
<et2-button-icon image="add" @click=${this.handleClick}
label="${this.egw().lang("Add a new contact")}"
statustext="${this.egw().lang("Add a new contact")}">
</et2-button-icon>`;
}
get textContent()
{
return super.textContent;
return html`
<span part="prefix" class=${classMap(classes)}>
<slot name="prefix">
</slot>
${button_or_avatar}
</span>`;
}
/**

View File

@ -147,9 +147,7 @@ export class Et2Tag extends Et2Widget(SlTag)
'tag--removable': this.removable
})}
>
<span part="prefix" class="tag__prefix">
<slot name="prefix"></slot>
</span>
${this._prefixTemplate()}
${content}
</span>
`;
@ -177,6 +175,14 @@ export class Et2Tag extends Et2Widget(SlTag)
`;
}
_prefixTemplate() : TemplateResult
{
return html`
<span part="prefix" class="tag__prefix">
<slot name="prefix"></slot>
</span>`;
}
startEdit(event? : MouseEvent)
{
if(event)