Skip to content

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

feat(frontend:navigation): improve list and gallery view selector

johavenffe1164cf6a2
diff --git a/frontend/src/app/applications/shares/components/utils/share-repository.component.ts b/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
index eb2819ec..27adc5d3 100644
--- a/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
+++ b/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
@@ -2,7 +2,7 @@ import { Component, inject, Input, OnChanges, OnInit } from '@angular/core'
import type { LucideIcon } from '@lucide/angular'
import { LucideCircleQuestionMark, LucideDynamicIcon } from '@lucide/angular'
import { L10N_LOCALE, L10nLocale, L10nTranslatePipe } from 'angular-l10n'
-import { ViewMode } from '../../../../common/components/navigation-view/navigation-view.component'
+import type { ViewMode } from '../../../../common/components/navigation-view/navigation-view.component'
import { ShareLinkModel } from '../../../links/models/share-link.model'
import { SPACES_ICON, SPACES_TITLE } from '../../../spaces/spaces.constants'
import { ShareFileModel } from '../../models/share-file.model'
@@ -19,7 +19,7 @@ interface ShareRepository {
selector: 'app-share-repository',
imports: [L10nTranslatePipe, LucideDynamicIcon],
template: `
- @if (galleryMode) {
+ @if (galleryMode?.enabled) {
<span
[class]="repository.class"
[style.min-width.px]="galleryMode.dimensions / 3.5"
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.scss b/frontend/src/app/applications/spaces/components/spaces-browser.component.scss
index b917b028..ccb97f5d 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.scss
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.scss
@@ -64,9 +64,12 @@
.file-selection-control .file-selection-indicator {
top: calc((var(--app-table-row-height) - 30px) / 2);
left: var(--app-table-cell-inline-padding);
- width: 16px;
+ width: 15px;
height: 16px;
- font-size: .55rem;
+
+ .lucide {
+ font-size: .78rem;
+ }
}
.gallery-file-selection-overlay {
@@ -80,8 +83,8 @@
.file-selection-indicator {
top: .25em;
left: .25em;
- width: 1.85em;
- height: 1.85em;
+ width: 1.75em;
+ height: 1.75em;
font-size: inherit;
.lucide {
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
index 4f4132b5..42ed1998 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
@@ -116,7 +116,12 @@ const keyboardNavigationKeys: ReadonlySet<string> = new Set<KeyboardNavigationKe
styleUrl: 'spaces-browser.component.scss'
})
export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy {
- @ViewChild(VirtualScrollComponent) scrollView: { element: ElementRef; viewPortItems: FileModel[]; scrollInto: (arg: FileModel | number) => void }
+ @ViewChild(VirtualScrollComponent) scrollView: {
+ element: ElementRef
+ viewPortItems: FileModel[]
+ scrollInto: (arg: FileModel | number) => void
+ itemsPerRow: number
+ }
@ViewChild(FilterComponent, { static: true }) inputFilter: FilterComponent
@ViewChild(NavigationViewComponent, { static: true }) btnNavigationView: any
@ViewChild('MainContextMenu', { static: true }) mainContextMenu: ContextMenuComponent<any>
@@ -878,9 +883,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
direction = 'ArrowDown'
}
const referenceIndexes = this.getSelectionReferenceIndexes(files, extendSelection)
- const step = useGalleryColumns
- ? Math.ceil(this.scrollView.element.nativeElement.offsetWidth / (this.galleryMode.dimensions + this.galleryMode.margins))
- : 1
+ const step = useGalleryColumns ? this.scrollView.itemsPerRow : 1
let index: number
if (!referenceIndexes.length) {
index = direction === 'ArrowUp' ? files.length - 1 : 0
diff --git a/frontend/src/app/common/components/navigation-view/interfaces/view-mode.interface.ts b/frontend/src/app/common/components/navigation-view/interfaces/view-mode.interface.ts
new file mode 100644
index 00000000..e5dc7092
--- /dev/null
+++ b/frontend/src/app/common/components/navigation-view/interfaces/view-mode.interface.ts
@@ -0,0 +1,24 @@
+interface ListViewMode {
+ readonly enabled: false
+ // Keep gallery properties visible to Angular's template type checker while forbidding values in list mode.
+ readonly dimensions?: never
+ readonly maxBadges?: never
+ readonly badgeSize?: never
+ readonly image?: never
+ readonly imageRes?: never
+ readonly iconSize?: never
+ readonly textSize?: never
+}
+
+interface GalleryViewMode {
+ readonly enabled: true
+ readonly dimensions: number
+ readonly maxBadges: number
+ readonly badgeSize: number
+ readonly image: number
+ readonly imageRes: number
+ readonly iconSize: number
+ readonly textSize: number
+}
+
+export type ViewMode = ListViewMode | GalleryViewMode
diff --git a/frontend/src/app/common/components/navigation-view/navigation-view.component.html b/frontend/src/app/common/components/navigation-view/navigation-view.component.html
index 8892d959..0d6aadb4 100644
--- a/frontend/src/app/common/components/navigation-view/navigation-view.component.html
+++ b/frontend/src/app/common/components/navigation-view/navigation-view.component.html
@@ -1,44 +1,50 @@
-<div [insideClick]="true" class="btn-group" dropdown>
- <button aria-label="Display" class="btn btn-default dropdown-toggle" dropdownToggle type="button">
- <svg [lucideIcon]="galleryModeEnabled ? icons.LucideGrid2X2 : icons.LucideList"></svg>
+<div #viewDropdown="bs-dropdown" [insideClick]="true" aria-label="Display mode" class="btn-group" dropdown role="group">
+ <button (click)="setView('tl'); viewDropdown.hide()"
+ [attr.aria-pressed]="!galleryModeEnabled"
+ [class.active]="!galleryModeEnabled"
+ aria-label="List view"
+ class="btn btn-default navigation-view-direct-option"
+ type="button">
+ <svg [lucideIcon]="icons.LucideList"></svg>
+ </button>
+ <button (click)="selectGalleryMode()"
+ [attr.aria-pressed]="galleryModeEnabled"
+ [class.active]="galleryModeEnabled"
+ aria-label="Gallery view and size options"
+ class="btn btn-default dropdown-toggle navigation-view-direct-option"
+ dropdownToggle
+ type="button">
+ <svg [lucideIcon]="icons.LucideGrid2X2"></svg>
</button>
<ul *dropdownMenu class="dropdown-menu dropdown-menu-right navigation-view-menu">
- <li class="dropdown-header text-bold" l10nTranslate>Display</li>
+ <li class="dropdown-header text-bold" l10nTranslate>Size</li>
<li class="px-1">
- <div aria-label="Display mode" class="navigation-view-mode-selector" role="group">
- <button (click)="setView('tl')"
- [attr.aria-pressed]="!galleryModeEnabled"
- [class.active]="!galleryModeEnabled"
- class="dropdown-item navigation-view-option"
- type="button">
- <svg [lucideIcon]="icons.LucideList"></svg>
- <span l10nTranslate>List</span>
- </button>
- <button (click)="selectGalleryMode()"
- [attr.aria-pressed]="galleryModeEnabled"
- [class.active]="galleryModeEnabled"
- class="dropdown-item navigation-view-option"
- type="button">
+ <div class="navigation-view-size-selector">
+ <span aria-hidden="true" class="navigation-view-size-preview is-small">
+ <svg [lucideIcon]="icons.LucideGrid2X2"></svg>
+ </span>
+ <div class="navigation-view-size-range-wrapper">
+ <input (input)="setGallerySize($event)"
+ [attr.aria-valuetext]="gallerySizeLabel"
+ [value]="gallerySizeIndex"
+ aria-label="Gallery size"
+ class="form-range navigation-view-size-range text-primary"
+ max="4"
+ min="0"
+ step="1"
+ type="range">
+ <div aria-hidden="true" class="navigation-view-size-scale">
+ @for (view of galleryViewOptions; track view.key) {
+ <span [class.text-bold]="viewMode === view.key"
+ [class.text-primary]="viewMode === view.key"
+ [style.left.%]="$index * 100 / (galleryViewOptions.length - 1)">{{ view.label }}</span>
+ }
+ </div>
+ </div>
+ <span aria-hidden="true" class="navigation-view-size-preview is-large">
<svg [lucideIcon]="icons.LucideGrid2X2"></svg>
- <span l10nTranslate>Gallery</span>
- </button>
+ </span>
</div>
</li>
- @if (galleryModeEnabled) {
- <li class="dropdown-header text-bold mt-1" l10nTranslate>Size</li>
- <li class="px-1">
- <div aria-label="Gallery size" class="navigation-view-size-selector" role="group">
- @for (view of galleryViewOptions; track view.key) {
- <button (click)="setView(view.key)"
- [attr.aria-pressed]="viewMode === view.key"
- [class.active]="viewMode === view.key"
- class="dropdown-item navigation-view-size-option"
- type="button">
- {{ view.label }}
- </button>
- }
- </div>
- </li>
- }
</ul>
</div>
diff --git a/frontend/src/app/common/components/navigation-view/navigation-view.component.scss b/frontend/src/app/common/components/navigation-view/navigation-view.component.scss
index 7e9a1e0c..78df98fb 100644
--- a/frontend/src/app/common/components/navigation-view/navigation-view.component.scss
+++ b/frontend/src/app/common/components/navigation-view/navigation-view.component.scss
@@ -1,44 +1,90 @@
.navigation-view-menu {
- min-width: 12.5rem !important;
+ min-width: 15rem !important;
+ padding: .5rem;
}
-.navigation-view-mode-selector,
-.navigation-view-size-selector {
- display: grid;
- gap: .25rem;
+.btn.navigation-view-direct-option.active,
+.btn.navigation-view-direct-option.active:hover:not(:disabled) {
+ background-color: rgba(var(--bs-primary-rgb), .12) !important;
}
-.navigation-view-mode-selector {
- grid-template-columns: repeat(2, minmax(0, 1fr));
+.navigation-view-size-selector {
+ display: grid;
+ grid-template-columns: 1rem minmax(7rem, 1fr) 1.25rem;
+ align-items: start;
+ gap: .5rem;
+ padding: .25rem .25rem .35rem;
}
-.navigation-view-option,
-.navigation-view-size-option {
+.navigation-view-size-preview {
display: flex;
align-items: center;
justify-content: center;
+ height: 1.25rem;
+
+ &.is-small .lucide {
+ font-size: .8rem;
+ }
+
+ &.is-large .lucide {
+ font-size: 1.15rem;
+ }
+}
+
+.navigation-view-size-range-wrapper {
min-width: 0;
+}
+
+.navigation-view-size-range {
+ display: block;
+ height: 1.25rem;
margin: 0;
+ cursor: default !important;
+
+ &::-webkit-slider-thumb {
+ background-color: currentColor;
+ cursor: default !important;
+ }
+
+ &::-moz-range-thumb {
+ background-color: currentColor;
+ cursor: default !important;
+ }
+
+ &::-webkit-slider-runnable-track {
+ background-color: var(--bs-white);
+ }
+
+ &::-moz-range-track {
+ background-color: var(--bs-white);
+ }
&:focus-visible {
outline: 2px solid var(--bs-primary);
- outline-offset: -2px;
+ outline-offset: 2px;
}
}
-.navigation-view-option {
- gap: .4rem;
- padding: .4rem .5rem;
+.navigation-view-size-scale {
+ position: relative;
+ height: .65rem;
+ margin: .1rem .5rem 0;
+ color: var(--bs-secondary-color);
+ font-size: .7rem;
+ line-height: 1;
+ user-select: none;
- .lucide {
- font-size: .9rem;
+ span {
+ position: absolute;
+ top: 0;
+ transform: translateX(-50%);
+ transition: color .15s ease;
}
}
-.navigation-view-size-selector {
- grid-template-columns: repeat(5, minmax(0, 1fr));
-}
-
-.navigation-view-size-option {
- padding: .35rem .15rem;
+:host-context(body.theme-dark) {
+ .navigation-view-size-preview,
+ .navigation-view-size-scale {
+ color: var(--bs-white);
+ }
}
diff --git a/frontend/src/app/common/components/navigation-view/navigation-view.component.ts b/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
index aee1286f..ff10eb18 100644
--- a/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
+++ b/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
@@ -2,23 +2,11 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Output } from '@angul
import { LucideDynamicIcon, LucideGrid2X2, LucideList } from '@lucide/angular'
import { L10nTranslateDirective } from 'angular-l10n'
import { BsDropdownModule } from 'ngx-bootstrap/dropdown'
+import type { ViewMode } from './interfaces/view-mode.interface'
-const DEFAULT_GALLERY_VIEW_MODE = 'thM'
const GALLERY_VIEW_MODE_STORAGE_KEY = 'galleryViewMode'
const VIEW_MODE_STORAGE_KEY = 'viewMode'
-export interface ViewMode {
- enabled: boolean
- dimensions?: number
- maxBadges?: number
- badgeSize?: number
- image?: number
- imageRes?: number
- iconSize?: number
- textSize?: number
- margins?: number
-}
-
const GALLERY_VIEW_OPTIONS = [
{ key: 'th', label: 'S' },
{ key: 'thM', label: 'M' },
@@ -27,12 +15,18 @@ const GALLERY_VIEW_OPTIONS = [
{ key: 'thXxl', label: 'XXL' }
] as const
-const VIEW_MODES: Record<string, ViewMode> = {
+type GalleryViewModeKey = (typeof GALLERY_VIEW_OPTIONS)[number]['key']
+type ViewModeKey = 'tl' | GalleryViewModeKey
+
+const DEFAULT_GALLERY_VIEW_MODE: GalleryViewModeKey = 'thM'
+const DEFAULT_GALLERY_VIEW_MODE_INDEX = GALLERY_VIEW_OPTIONS.findIndex(({ key }) => key === DEFAULT_GALLERY_VIEW_MODE)
+
+const VIEW_MODES = {
tl: { enabled: false },
- th: { enabled: true, maxBadges: 0, badgeSize: 10, dimensions: 96, image: 56, imageRes: 128, iconSize: 30, textSize: 12, margins: 18 },
- thM: { enabled: true, maxBadges: 1, badgeSize: 11, dimensions: 112, image: 72, imageRes: 192, iconSize: 34, textSize: 12, margins: 18 },
- thL: { enabled: true, maxBadges: 2, badgeSize: 12, dimensions: 152, image: 112, imageRes: 256, iconSize: 50, textSize: 13, margins: 18 },
- thXl: { enabled: true, maxBadges: 6, badgeSize: 13, dimensions: 192, image: 152, imageRes: 512, iconSize: 65, textSize: 13, margins: 18 },
+ th: { enabled: true, maxBadges: 0, badgeSize: 10, dimensions: 96, image: 56, imageRes: 128, iconSize: 30, textSize: 12 },
+ thM: { enabled: true, maxBadges: 1, badgeSize: 11, dimensions: 112, image: 72, imageRes: 192, iconSize: 34, textSize: 12 },
+ thL: { enabled: true, maxBadges: 2, badgeSize: 12, dimensions: 152, image: 112, imageRes: 256, iconSize: 50, textSize: 13 },
+ thXl: { enabled: true, maxBadges: 6, badgeSize: 13, dimensions: 192, image: 152, imageRes: 512, iconSize: 65, textSize: 13 },
thXxl: {
enabled: true,
maxBadges: 6,
@@ -41,11 +35,16 @@ const VIEW_MODES: Record<string, ViewMode> = {
image: 192,
imageRes: 1024,
iconSize: 80,
- textSize: 14,
- margins: 18
+ textSize: 14
}
+} satisfies Record<ViewModeKey, ViewMode>
+
+function isViewModeKey(value: string | null): value is ViewModeKey {
+ return !!value && Object.hasOwn(VIEW_MODES, value)
}
+export type { ViewMode } from './interfaces/view-mode.interface'
+
@Component({
selector: 'app-navigation-view',
templateUrl: 'navigation-view.component.html',
@@ -59,14 +58,14 @@ export class NavigationViewComponent {
protected readonly galleryViewOptions = GALLERY_VIEW_OPTIONS
protected viewMode = this.getStoredViewMode()
- currentView() {
+ currentView(): ViewMode {
return VIEW_MODES[this.viewMode]
}
- setView(view: string) {
+ protected setView(view: ViewModeKey) {
const currentViewMode = this.viewMode
const selectedView = VIEW_MODES[view]
- if (!selectedView || view === currentViewMode) return
+ if (view === currentViewMode) return
if (selectedView.enabled) {
localStorage.setItem(GALLERY_VIEW_MODE_STORAGE_KEY, view)
} else if (VIEW_MODES[currentViewMode].enabled) {
@@ -81,15 +80,30 @@ export class NavigationViewComponent {
return this.currentView().enabled
}
+ protected get gallerySizeIndex() {
+ const index = GALLERY_VIEW_OPTIONS.findIndex(({ key }) => key === this.viewMode)
+ return index === -1 ? DEFAULT_GALLERY_VIEW_MODE_INDEX : index
+ }
+
+ protected get gallerySizeLabel() {
+ return GALLERY_VIEW_OPTIONS[this.gallerySizeIndex].label
+ }
+
+ protected setGallerySize(event: Event) {
+ const option = GALLERY_VIEW_OPTIONS[Number((event.target as HTMLInputElement).value)]
+ if (option) this.setView(option.key)
+ }
+
protected selectGalleryMode() {
if (this.galleryModeEnabled) return
const storedGalleryViewMode = localStorage.getItem(GALLERY_VIEW_MODE_STORAGE_KEY)
- const galleryViewMode = storedGalleryViewMode && VIEW_MODES[storedGalleryViewMode]?.enabled ? storedGalleryViewMode : DEFAULT_GALLERY_VIEW_MODE
+ const galleryViewMode =
+ isViewModeKey(storedGalleryViewMode) && VIEW_MODES[storedGalleryViewMode].enabled ? storedGalleryViewMode : DEFAULT_GALLERY_VIEW_MODE
this.setView(galleryViewMode)
}
- private getStoredViewMode() {
+ private getStoredViewMode(): ViewModeKey {
const storedViewMode = localStorage.getItem(VIEW_MODE_STORAGE_KEY)
- return storedViewMode && VIEW_MODES[storedViewMode] ? storedViewMode : 'tl'
+ return isViewModeKey(storedViewMode) ? storedViewMode : 'tl'
}
}
diff --git a/frontend/src/app/common/components/virtual-scroll.component.ts b/frontend/src/app/common/components/virtual-scroll.component.ts
index f7116c66..ca7f20b8 100644
--- a/frontend/src/app/common/components/virtual-scroll.component.ts
+++ b/frontend/src/app/common/components/virtual-scroll.component.ts
@@ -86,6 +86,10 @@ export class VirtualScrollComponent<T> implements OnInit, OnChanges, OnDestroy {
return !this.galleryMode
}
+ get itemsPerRow(): number {
+ return this.dimensionsView?.itemsPerRow || 1
+ }
+
ngOnInit() {
this.resizeOffsetHeight(true)
this.addParentEventHandlers()
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 9a7a750c..6b3fd7a5 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -239,7 +239,7 @@
.badge {
font-size: 0.7rem;
> .lucide {
- font-size: $font-size-md;
+ font-size: 0.90625rem;
}
}
}
diff --git a/frontend/src/styles/components/_gallery.scss b/frontend/src/styles/components/_gallery.scss
index 3445d1a7..4adcade6 100644
--- a/frontend/src/styles/components/_gallery.scss
+++ b/frontend/src/styles/components/_gallery.scss
@@ -88,7 +88,7 @@
font-size: var(--gallery-badge-size, var(--gallery-text-size));
.lucide {
- font-size: 1.15em;
+ font-size: 1.2em;
}
}
diff --git a/frontend/src/styles/components/_recents.scss b/frontend/src/styles/components/_recents.scss
index 8917c8ef..ee8430d2 100644
--- a/frontend/src/styles/components/_recents.scss
+++ b/frontend/src/styles/components/_recents.scss
@@ -279,6 +279,15 @@ app-recents {
width: 100%;
}
+ .recents-days {
+ margin-top: 0.7rem;
+ }
+
+ .recents-day__label {
+ align-items: center;
+ text-align: center;
+ }
+
.recents-timeline--with-content {
> .view-switch {
position: static;
@@ -295,9 +304,6 @@ app-recents {
flex: 1;
}
- .recents-day__grid {
- grid-template-columns: minmax(0, 1fr);
- }
}
}