extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-15 18:38:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2Select layout improvements

Browse Source 
- Better sizing when row is set
- Always show contact / + for EmailTag instead of just on hover
This commit is contained in:
nathan 2022-07-12 10:50:11 -06:00
parent 9a40db5e51
commit e8e3d2fc38
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/Et2Select/Et2Select.ts
View File

@ -102,7 +102,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
gap: 0.1rem 0.5rem;
}
:host([rows]) .select__tags {
max-height: calc(var(--rows, 5) * 1.3rem);
max-height: calc(var(--rows, 5) * 1.35rem);
}
/* Keep overflow tag right-aligned. It's the only sl-tag. */
.select__tags sl-tag {

37
api/js/etemplate/Et2Select/Tag/Et2EmailTag.ts
View File

@ -32,32 +32,34 @@ export class Et2EmailTag extends Et2Tag
.tag {
position: relative;
}
.tag__prefix {
display: none;
.tag__prefix {
width: 20px;
height: 20px;
height: 80%;
background-color: white;
background-color: initial;
background-repeat: no-repeat;
background-size: contain;
opacity: 30%;
cursor: pointer;
}
.contact_plus .tag__prefix {
display: block;
order: 2;
opacity: 100%;
}
.tag__prefix.loading {
width: 16px;
opacity: 100%;
background-image: ${cssImage("loading")};
}
.tag__prefix.contact_plus_add, .tag__prefix.contact_plus_contact {
width: 16px;
.tag__prefix.contact_plus_add {
height: 80%;
background-image: ${cssImage("add")};
cursor: pointer;
}
/* Address is for a contact - always show */
.tag__prefix.contact_plus_contact {
background-image: ${cssImage("contact")}
opacity: 100%;
background-image: ${cssImage("contact")};
}
.tag__remove {
order: 3;
@ -98,6 +100,15 @@ export class Et2EmailTag extends Et2Tag
{
this.addEventListener("mouseenter", this.handleMouseEnter);
this.addEventListener("mouseleave", this.handleMouseLeave);
// If the data is already cached, add it in (after nodes are there)
if(typeof Et2EmailTag.email_cache[this.value] !== "undefined")
{
this.updateComplete.then(() =>
{
return this.handleContactResponse(Et2EmailTag.email_cache[this.value]);
});
}
}
}
@ -130,7 +141,6 @@ export class Et2EmailTag extends Et2Tag
this.checkContact(this.value).then((result) =>
{
this._contactPlusNode.classList.remove("loading");
this.handleContactResponse(result);
})
}
@ -146,6 +156,7 @@ export class Et2EmailTag extends Et2Tag
*/
handleContactResponse(data : false | ContactInfo)
{
this._contactPlusNode.classList.remove("loading");
if(data)
{
this._contactPlusNode.classList.add("contact_plus_contact");