extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2VfsPath: Fix unable to click on separators, so couldn't get to root

Browse Source
This commit is contained in:
nathan 2024-04-05 15:14:41 -06:00
parent d87ef46eea
commit 0a5c5a432b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/Et2Vfs/Et2VfsPath.styles.ts
View File

@ -64,7 +64,9 @@ export default css`
sl-breadcrumb-item::part(separator) { sl-breadcrumb-item::part(separator) {
color: var(--input-text-color); color: var(--input-text-color);
margin: 0 var(--sl-spacing-2x-small); margin: 0;
padding: 0 var(--sl-spacing-2x-small);
cursor: pointer;
} }
/* Sizes */ /* Sizes */

20
api/js/etemplate/Et2Vfs/Et2VfsPath.ts
View File

@ -169,13 +169,18 @@ export class Et2VfsPath extends Et2InputWidget(LitElement)
protected handlePathClick(event : MouseEvent) protected handlePathClick(event : MouseEvent)
{ {
if(event.target instanceof SlBreadcrumbItem && event.composedPath().includes(this)) let target = event.target;
if(target.slot == "separator")
{
target = target.parentNode;
}
if(target instanceof SlBreadcrumbItem && event.composedPath().includes(this))
{ {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
const dirs = Array.from(event.target.parentElement.querySelectorAll('sl-breadcrumb-item')) ?? []; const dirs = Array.from(target.parentElement.querySelectorAll('sl-breadcrumb-item')) ?? [];
let stopIndex = dirs.indexOf(event.target) + 1; let stopIndex = dirs.indexOf(target) + 1;
let newPath = dirs.slice(0, stopIndex) let newPath = dirs.slice(0, stopIndex)
// Strip out any extra space // Strip out any extra space
.map(d => d.textContent.trim().replace(/\/*$/, '').trim() + "/") .map(d => d.textContent.trim().replace(/\/*$/, '').trim() + "/")
@ -188,8 +193,13 @@ export class Et2VfsPath extends Et2InputWidget(LitElement)
if(!(this.disabled || this.readonly)) if(!(this.disabled || this.readonly))
{ {
const oldValue = this.value; const oldValue = this.value;
this.value = newPath.join("")
// No trailing slash in the value // No trailing slash in the value
this.value = newPath.join("").replace(/\/*$/, ''); if(this.value !== "/" && this.value.endsWith("/"))
{
this.value = this.value.replace(/\/*$/, '');
}
if(oldValue != this.value) if(oldValue != this.value)
{ {
this.updateComplete.then(() => this.updateComplete.then(() =>
@ -217,7 +227,7 @@ export class Et2VfsPath extends Et2InputWidget(LitElement)
const hasLabel = this.label ? true : !!hasLabelSlot; const hasLabel = this.label ? true : !!hasLabelSlot;
const hasHelpText = this.helpText ? true : !!hasHelpTextSlot; const hasHelpText = this.helpText ? true : !!hasHelpTextSlot;
// No trailing slash in the path // No trailing slash in the path
const pathParts = this.value === "/" ? [""] : this.value const pathParts = this.value === "/" ? ["/"] : this.value
// Remove trailing / // Remove trailing /
.replace(/\/*$/, '') .replace(/\/*$/, '')
.split('/'); .split('/');