Merge pull request #290 from vposham/sticky-loaded-thumbnails

This commit is contained in:
Alan Grainger
2026-09-17 22:04:16 +12:00
5 changed files with 60 additions and 4 deletions
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "immich-public-proxy", "name": "immich-public-proxy",
"version": "3.3.1", "version": "3.3.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "immich-public-proxy", "name": "immich-public-proxy",
"version": "3.3.1", "version": "3.3.2",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"archiver": "^7.0.1", "archiver": "^7.0.1",
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "immich-public-proxy", "name": "immich-public-proxy",
"version": "3.3.1", "version": "3.3.2",
"scripts": { "scripts": {
"dev": "concurrently -n server,client -c blue,green \"tsx watch src/index.ts\" \"tsc -w -p tsconfig.client.json\"", "dev": "concurrently -n server,client -c blue,green \"tsx watch src/index.ts\" \"tsc -w -p tsconfig.client.json\"",
"build": "tsc && tsc -p tsconfig.client.json", "build": "tsc && tsc -p tsconfig.client.json",
+17
View File
@@ -15,6 +15,13 @@ export const MOBILE_COLS = 3
export const IMAGE_LOAD_MARGIN_PX = 300 export const IMAGE_LOAD_MARGIN_PX = 300
export const SCROLL_SETTLE_MS = 100 export const SCROLL_SETTLE_MS = 100
export const BUFFER_VIEWPORTS = 1 export const BUFFER_VIEWPORTS = 1
// Upper bound on how many already-loaded tiles we keep permanently mounted
// (see state.stickyTiles). ~1500 covers dozens of screens of scroll-back so
// revisiting recently-seen thumbnails never flickers, while capping retained
// DOM / decoded-image memory so a 100k-photo album can't grow unbounded as
// the user scrolls. Least-recently-visible tiles past this count fall back to
// normal virtualisation and re-pin if scrolled back to.
export const STICKY_TILE_LIMIT = 1500
// Height reserved for each month header (must agree with .group-header CSS) // Height reserved for each month header (must agree with .group-header CSS)
export const HEADER_HEIGHT = 48 export const HEADER_HEIGHT = 48
// Vertical gap between groups // Vertical gap between groups
@@ -73,6 +80,16 @@ export const state = {
lastContainerW: 0, lastContainerW: 0,
renderedTiles: new Map<number, HTMLAnchorElement>(), renderedTiles: new Map<number, HTMLAnchorElement>(),
renderedHeaders: new Map<string, HTMLElement>(), renderedHeaders: new Map<string, HTMLElement>(),
// Tile indices whose <img> has fired `load` at least once. While an index
// is in this set virtualize() never removes its tile, so scrolling back to
// an already-seen thumbnail shows the cached image with no placeholder /
// fade-in flicker. Insertion order is maintained as most-recently-visible-
// last and the set is trimmed to STICKY_TILE_LIMIT each virtualize() pass,
// so a huge album can't accumulate unbounded mounted DOM. Tiles that have
// not loaded yet get the normal lazy create / remove treatment, so large
// albums still lazy-load on first scroll-into-view. Cleared on a layout
// recompute (see computeLayoutAndRender) because tile geometry changes.
stickyTiles: new Set<number>(),
// Selection mode (mode-toggle UX: hidden checkmarks until activated) // Selection mode (mode-toggle UX: hidden checkmarks until activated)
selectMode: false, selectMode: false,
selected: new Set<string>(), selected: new Set<string>(),
+11 -1
View File
@@ -73,7 +73,17 @@ export function createTile (index: number): HTMLAnchorElement {
// `#gallery img.loaded` fades opacity from 0 to 1 so the thumbhash blurs // `#gallery img.loaded` fades opacity from 0 to 1 so the thumbhash blurs
// into the sharp image instead of snapping (and masks Chrome/Edge's brief // into the sharp image instead of snapping (and masks Chrome/Edge's brief
// white flash between `img.src` being set and the bytes actually painting). // white flash between `img.src` being set and the bytes actually painting).
img.onload = () => img.classList.add('loaded') img.onload = () => {
img.classList.add('loaded')
// Pin this tile: once loaded it is never virtualised out again, so a
// scroll back up reuses this exact <img> instead of rebuilding it in a
// blank/placeholder state. See state.stickyTiles / virtualize().
// Guard: if this tile was virtualised out before its (in-flight) image
// finished, the load still fires on the now-detached <img>. Only pin the
// index while this <a> is still the live tile for it, so a stale request
// can't mark a not-yet-loaded replacement tile as sticky.
if (state.renderedTiles.get(index) === a) state.stickyTiles.add(index)
}
a.appendChild(img) a.appendChild(img)
if (item.type === 'VIDEO') { if (item.type === 'VIDEO') {
+29
View File
@@ -7,6 +7,7 @@ import {
IMAGE_LOAD_MARGIN_PX, IMAGE_LOAD_MARGIN_PX,
SCROLL_SETTLE_MS, SCROLL_SETTLE_MS,
BUFFER_VIEWPORTS, BUFFER_VIEWPORTS,
STICKY_TILE_LIMIT,
type HeaderEntry type HeaderEntry
} from './state.js' } from './state.js'
import { computeLayout } from './layout.js' import { computeLayout } from './layout.js'
@@ -56,6 +57,26 @@ export function virtualize () {
if (l.top > bottom) break if (l.top > bottom) break
neededTiles.add(l.index) neededTiles.add(l.index)
} }
// Sticky (already-loaded) tiles: keep them in the "needed" set so
// syncRendered never removes them and a scroll-back shows the cached image
// with no flicker. Bounded so a very large album can't grow unbounded DOM:
// 1. bump currently-visible sticky tiles to most-recently-used (set tail),
// 2. evict the oldest overflow that isn't on screen right now,
// 3. union whatever remains into neededTiles (all already rendered, so
// this only blocks removal - it never triggers a re-create).
for (const index of neededTiles) {
if (state.stickyTiles.delete(index)) state.stickyTiles.add(index)
}
if (state.stickyTiles.size > STICKY_TILE_LIMIT) {
let overflow = state.stickyTiles.size - STICKY_TILE_LIMIT
for (const index of state.stickyTiles) {
if (overflow <= 0) break
if (neededTiles.has(index)) continue
state.stickyTiles.delete(index)
overflow--
}
}
for (const index of state.stickyTiles) neededTiles.add(index)
syncRendered(neededTiles, state.renderedTiles, createTile) syncRendered(neededTiles, state.renderedTiles, createTile)
// Group headers (when grouping is enabled; headers is empty otherwise) // Group headers (when grouping is enabled; headers is empty otherwise)
@@ -128,6 +149,11 @@ export function computeLayoutAndRender () {
state.renderedTiles.clear() state.renderedTiles.clear()
for (const [, el] of state.renderedHeaders) el.remove() for (const [, el] of state.renderedHeaders) el.remove()
state.renderedHeaders.clear() state.renderedHeaders.clear()
// Tile positions/sizes have changed, so the old pinned <img> elements are
// gone. Drop the sticky set and let tiles re-pin themselves as they reload
// for the new layout - otherwise the virtualize() below would rebuild every
// previously-seen tile at once.
state.stickyTiles.clear()
virtualize() virtualize()
loadVisibleTiles() loadVisibleTiles()
@@ -149,6 +175,9 @@ export function loadVisibleTiles () {
for (const a of state.renderedTiles.values()) { for (const a of state.renderedTiles.values()) {
const img = a.firstElementChild const img = a.firstElementChild
if (!(img instanceof HTMLImageElement)) continue if (!(img instanceof HTMLImageElement)) continue
// Fast-path: a finished load with no parked data-src has nothing to
// toggle. Matters now that sticky tiles keep this map large.
if (img.complete && img.src && !img.dataset.src) continue
const aTopInVp = containerTop + parseFloat(a.style.top || '0') const aTopInVp = containerTop + parseFloat(a.style.top || '0')
const aHeight = parseFloat(a.style.height || '0') const aHeight = parseFloat(a.style.height || '0')
const isFar = aTopInVp + aHeight < -IMAGE_LOAD_MARGIN_PX || const isFar = aTopInVp + aHeight < -IMAGE_LOAD_MARGIN_PX ||