Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(frontend:spaces): remove tap directive keyboard handler blocking spaces in edit input and preserve whitespace in displayed file name

johavene0b328b4222b
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index a24164b5..0fc8c41d 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -79,7 +79,7 @@
</span>
</div>
<div class="card-footer text-center text-truncate p-1">
- <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events" draggable="false">{{ s.name }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
</div>
</div>
}
@@ -131,7 +131,7 @@
<div class="d-flex align-items-center">
<img [src]="s.mimeUrl" alt="" draggable="false" height="30" width="30" (error)="s.fallBackMimeUrl()">
<div class="d-flex flex-column text-truncate">
- <span class="no-pointer-events" draggable="false">{{ s.name }}</span>
+ <span class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
<span class="no-pointer-events text-muted fs-xxxs" draggable="false">{{ s.description }}</span>
</div>
</div>
diff --git a/frontend/src/app/applications/shares/components/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index 4695620c..98c873c6 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -93,7 +93,7 @@
</span>
</div>
<div class="card-footer text-center text-truncate p-1">
- <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events" draggable="false">{{ s.name }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
</div>
</div>
}
@@ -145,7 +145,7 @@
<div class="d-flex align-items-center">
<img [src]="s.mimeUrl" alt="" draggable="false" height="30" width="30" (error)="s.fallBackMimeUrl()">
<div class="d-flex flex-column text-truncate">
- <span class="no-pointer-events" draggable="false">{{ s.name }}</span>
+ <span class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
<span class="no-pointer-events text-muted fs-xxxs" draggable="false">{{ s.description }}</span>
</div>
</div>
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
index 29c6e5fc..b9252137 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -302,7 +302,7 @@
type="text"
required>
} @else {
- <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events" draggable="false">{{ f.name }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events text-file-name-preserve" draggable="false">{{ f.name }}</span>
}
</div>
</div>
@@ -357,15 +357,15 @@
<div class="d-flex align-items-center" draggable="true">
<img [src]="f.mimeUrl" alt="" draggable="false" height="30" width="30" (error)="f.fallBackMimeUrl()">
@if (f.isRenamed) {
- <input (renamingInProgress)="setRenamingInProgress($event)"
+ <input appInputEdit
+ (renamingInProgress)="setRenamingInProgress($event)"
(updateObject)="renameFile($event)"
[inputObject]="f"
- appInputEdit
required
type="text">
} @else {
<div class="d-flex flex-column text-truncate">
- <span class="no-pointer-events" draggable="false">{{ f.name }}</span>
+ <span class="no-pointer-events text-file-name-preserve" draggable="false">{{ f.name }}</span>
@if (inSharesList && f.root?.description) {
<span class="no-pointer-events text-muted fs-xxxs" draggable="false">{{ f.root.description }}</span>
}
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index 7da30d09..3b01b2e7 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -96,7 +96,7 @@
}
</div>
<div class="card-footer text-center text-truncate p-1">
- <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events" draggable="false">{{ s.name }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
</div>
</div>
}
@@ -148,7 +148,7 @@
<div class="d-flex align-items-center">
<fa-icon [icon]="icons.SPACES" class="circle-primary-icon" [fixedWidth]="false"></fa-icon>
<div class="d-flex flex-column text-truncate">
- <span class="no-pointer-events" draggable="false">{{ s.name }}</span>
+ <span class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
<span class="no-pointer-events text-muted fs-xxxs" draggable="false">{{ s.description }}</span>
</div>
</div>
diff --git a/frontend/src/app/applications/spaces/components/trash.component.html b/frontend/src/app/applications/spaces/components/trash.component.html
index b161405e..0e2d0107 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.html
+++ b/frontend/src/app/applications/spaces/components/trash.component.html
@@ -58,7 +58,7 @@
</span>
</div>
<div class="card-footer text-center text-truncate p-1">
- <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events" draggable="false">
+ <span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events text-file-name-preserve" draggable="false">
@if (t.isPersonal) {
{{ t.name | translate:locale.language }}
} @else {
@@ -114,7 +114,7 @@
@case ('name') {
<div class="d-flex align-items-center">
<fa-icon [icon]="t.isPersonal ? icons.PERSONAL : icons.SPACES" class="circle-primary-icon"></fa-icon>
- <span class="no-pointer-events" draggable="false">
+ <span class="no-pointer-events text-file-name-preserve" draggable="false">
@if (t.isPersonal) {
{{ t.name | translate:locale.language }}
} @else {
diff --git a/frontend/src/app/common/directives/tap.directive.ts b/frontend/src/app/common/directives/tap.directive.ts
index 9bcb0af2..7a915b86 100644
--- a/frontend/src/app/common/directives/tap.directive.ts
+++ b/frontend/src/app/common/directives/tap.directive.ts
@@ -5,7 +5,7 @@ interface TapEvent {
x: number
y: number
type: TapKind
- sourceEvent?: PointerEvent | KeyboardEvent
+ sourceEvent?: PointerEvent
}
@Directive({
@@ -62,7 +62,6 @@ export class TapDirective implements OnDestroy {
this.add('pointerup', this.onUp, { passive: false })
this.add('pointercancel', this.onCancel, { passive: true })
this.add('pointerleave', this.onCancel, { passive: true })
- this.add('keydown', this.onKey, { passive: false })
this.add('contextmenu', this.onContextMenu, { passive: false })
this.add('click', this.onNativeClick, { passive: false, capture: true })
})
@@ -142,16 +141,6 @@ export class TapDirective implements OnDestroy {
private onCancel = () => this.resetGesture()
- private onKey = (ev: KeyboardEvent) => {
- if (this.disabled) return
- const k = ev.key.toLowerCase()
- if (k === 'enter' || k === ' ') {
- ev.preventDefault()
- if (this.enableDoubleTap && !this.emitSingleWhenNoDouble) return
- this.emit('single', 0, 0, ev)
- }
- }
-
private onContextMenu = (ev: MouseEvent) => {
if (this.preventDefault) ev.preventDefault()
}
@@ -165,7 +154,7 @@ export class TapDirective implements OnDestroy {
}
}
- private emit(type: TapKind, x: number, y: number, sourceEvent?: PointerEvent | KeyboardEvent) {
+ private emit(type: TapKind, x: number, y: number, sourceEvent?: PointerEvent) {
this.lastEmitTs = performance.now()
this.zone.run(() => this.appTap.emit({ x, y, type, sourceEvent }))
}
diff --git a/frontend/src/styles/components/_texts.scss b/frontend/src/styles/components/_texts.scss
index a00de6d8..fb9c8840 100644
--- a/frontend/src/styles/components/_texts.scss
+++ b/frontend/src/styles/components/_texts.scss
@@ -24,6 +24,10 @@
text-overflow: ellipsis;
}
+.text-file-name-preserve {
+ white-space: pre !important;
+}
+
.text-gray {
color: $gray !important;
}