fix: pin foliate-js e16530a — desktop double-click zoom toggle

Bump the linuxhg mirror pin from 1305a52 to e16530a (mirror main is already synced). The fork adds a desktop double-click zoom to the fixed-layout renderer for all fixed-layout content (comics, manga, PDFs, fixed EPUBs): - at fit scale, double-click zooms to 2.5x at the clicked location - zoomed or panned, double-click resets to 100% centered - PDF text-layer spans and annotation links keep native double-click (word selection) in Smart/Text modes; Pan mode zooms anywhere - mirrors the existing touch double-tap; disabled in panel-zoom mode like the other gestures Also closes the gap where node_modules was serving a stale tarball older than the previous 1305a52 pin (missing the toolbar-resize debounce and selection-drag fixes); a fresh install now resolves the full set.
feat(reader): comic treatment for fixed-layout items in comics/manga libraries
2026-09-17 14:37:05 -04:00 · 2026-09-17 14:36:58 -04:00 · 2026-09-17 11:47:25 -04:00 · 2026-09-17 10:55:21 -04:00 · 2026-09-17 10:40:12 -04:00 · 2026-09-17 10:17:34 -04:00
8 changed files with 301 additions and 190 deletions
@@ -15,7 +15,10 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \

 # Copy package files and install npm dependencies (cached unless package.json changes)
 COPY package*.json ./
-RUN --mount=type=cache,target=/root/.npm \
+# npm cache mount renamed from /root/.npm: the old volume held a stale
+# foliate-js tarball (name@version reuse) that --no-cache and builder prune
+# could not evict; a new mount id guarantees a clean fetch.
+RUN --mount=type=cache,target=/root/.npm-cache2 \
  npm install 

 # Copy Go mod files (cached unless go.mod changes)
@@ -102,6 +102,7 @@ func (h *ReaderHandler) ShowReader(c *echo.Context) error {

 	// Determine if panel detection should be enabled
 	enablePanelDetection := shouldEnablePanelDetection(libraryWithType.TypeName, mediaItem.FormatGroup)
+	treatAsComic := ShouldTreatAsComic(libraryWithType.TypeName, mediaItem.FormatGroup)

 	// Get reading progress
 	var progress database.ReadingProgress
@@ -133,6 +134,7 @@ func (h *ReaderHandler) ShowReader(c *echo.Context) error {
 		"progress":               progress,
 		"bookmarks":              bookmarks,
 		"enable_panel_detection": enablePanelDetection,
+		"treat_as_comic":         treatAsComic,
 		"format_group":           mediaItem.FormatGroup,
 		"manga_type":             mediaItem.MangaType,
 		"reading_direction":      mediaItem.ReadingDirection,
@@ -639,6 +641,25 @@ func (h *ReaderHandler) ParseEbook(c *echo.Context) error {
 	})
 }

+// ShouldTreatAsComic reports whether a fixed-layout item that lives in a
+// comics or manga library should get comic reader treatment: bookmarks
+// only — no text-selection highlights, no annotations, no in-book search.
+// Comic archives already behave this way; this flag extends it to fixed-
+// layout PDFs shelved in comic libraries (scanned or official manga PDFs).
+func ShouldTreatAsComic(libraryType string, formatGroup string) bool {
+	comicLibraries := map[string]bool{
+		"manga":  true,
+		"comics": true,
+	}
+
+	fixedFormats := map[string]bool{
+		"fixed_layout":  true,
+		"comic_archive": true,
+	}
+
+	return comicLibraries[libraryType] && fixedFormats[formatGroup]
+}
+
 // shouldEnablePanelDetection determines if panel detection should be enabled
 // based on library type and format group
 func shouldEnablePanelDetection(libraryType string, formatGroup string) bool {
@@ -66,6 +66,13 @@ func registerReaderRoutes(cfg *Config) {
 		if !visible {
 			return renderErrorPage(c, "Access denied", "access_denied")
 		}
+		// Library type decides comic reader treatment: fixed-layout items
+		// (e.g. manga PDFs) shelved in comics/manga libraries are paged
+		// through like comics — bookmarks only, no highlights or search.
+		libraryWithType, err := cfg.Queries.GetLibraryWithType(c.Request().Context(), mediaItem.LibraryID)
+		if err != nil {
+			return renderErrorPage(c, "Failed to get library info", "library_error")
+		}
 		// Convert to template types. Reading state is deliberately NOT
 		// fetched or embedded: the reader pulls position, bookmarks, and
 		// annotations from the APIs at open time so the page can never
@@ -89,6 +96,7 @@ func registerReaderRoutes(cfg *Config) {
 			FileURL:          utils.ResolveMediaURL(mediaItem.LibraryID, pgtype.Text{String: mediaItem.FilePath, Valid: true}),
 			TotalCharacters:  mediaItem.TotalCharacters.Int64,
 			EstimatedPages:   sync.EstimatedPages(mediaItem.TotalCharacters.Int64),
+			TreatAsComic:     handlers.ShouldTreatAsComic(libraryWithType.TypeName, mediaItem.FormatGroup),
 		}
 		// Render template
 		var buf bytes.Buffer
@@ -12,7 +12,7 @@
    "dev": "npm run build:ts:dev && npm run build:css"
  },
  "dependencies": {
-    "@bookhoard/foliate-js": "git+https://git.linuxhg.com/Bookhoard/foliate-js.git#8a20399",
+    "@bookhoard/foliate-js": "git+https://git.linuxhg.com/Bookhoard/foliate-js.git#e16530a",
    "alpinejs": "^3.15.8",
    "chart.js": "^4.5.1",
    "highlight.js": "^11.11.1",
@@ -16,6 +16,7 @@ func readerInitExpr(metadata ReaderMetadata) string {
 		"formatGroup":      metadata.FormatGroup,
 		"readingDirection": metadata.ReadingDirection,
 		"mangaType":        metadata.MangaType,
+		"treatAsComic":     metadata.TreatAsComic,
 	}
 	jsonBytes, _ := json.Marshal(config)
 	return fmt.Sprintf("initReader(%s)", string(jsonBytes))
@@ -68,9 +69,7 @@ templ Reader(user User, metadata ReaderMetadata) {
 					</svg>
 				</div>
 			</div>
-
 			@ReaderChrome(metadata)
-
 			<!-- Drawer scrim -->
 			<div
 				x-show="tocOpen || settingsOpen || bookmarksOpen || searchOpen"
@@ -79,7 +78,6 @@ templ Reader(user User, metadata ReaderMetadata) {
 				class="drawer-scrim"
 				aria-hidden="true"
 			></div>
-
 			<!-- TOC drawer (left) -->
 			<div
 				id="toc-drawer"
@@ -96,7 +94,6 @@ templ Reader(user User, metadata ReaderMetadata) {
 			>
 				@ReaderTOCDrawer()
 			</div>
-
 			<!-- Settings drawer (right) -->
 			<div
 				id="settings-drawer"
@@ -113,7 +110,6 @@ templ Reader(user User, metadata ReaderMetadata) {
 			>
 				@ReaderSettingsDrawer()
 			</div>
-
 			<!-- Selection popover (highlights) -->
 			<div
 				id="selection-popover"
@@ -139,7 +135,13 @@ templ Reader(user User, metadata ReaderMetadata) {
 							:style="'background-color:' + c"
 							:title="selectionPopover.mode === 'create' ? 'Highlight' : 'Set color'"
 							:aria-label="'Highlight color ' + c"
-							@click="selectionPopover.mode === 'create' ? createHighlight(c) : (selectionPopover.color = c, saveHighlightChanges())"
+							@click="selectionPopover.noteOpen
+							? (selectionPopover.mode === 'create'
+								? (selectionPopover.color = c)
+								: (selectionPopover.color = c, saveHighlightChanges(true)))
+							: (selectionPopover.mode === 'create'
+								? createHighlight(c)
+								: (selectionPopover.color = c, saveHighlightChanges()))"
 						></button>
 					</template>
 					<div class="w-px h-5 reader-sep"></div>
@@ -188,12 +190,11 @@ templ Reader(user User, metadata ReaderMetadata) {
 							type="button"
 							class="flex-1 py-1 text-xs border rounded hover:opacity-80"
 							style="border-color: var(--border);"
-							@click="selectionPopover.noteOpen = false"
+							@click="hideSelectionPopover()"
 						>Cancel</button>
 					</div>
 				</div>
 			</div>
-
 			<!-- Annotations drawer (right): highlights / notes / bookmarks -->
 			<div
 				id="annotations-drawer"
@@ -210,7 +211,6 @@ templ Reader(user User, metadata ReaderMetadata) {
 			>
 				@ReaderAnnotationsDrawer()
 			</div>
-
 			<!-- Search drawer (right, reflowable only) -->
 			<div
 				id="search-drawer"
@@ -227,7 +227,6 @@ templ Reader(user User, metadata ReaderMetadata) {
 			>
 				@ReaderSearchDrawer()
 			</div>
-
 			<!-- Shortcuts & gestures help modal -->
 			<div
 				x-show="helpOpen"
@@ -263,17 +262,14 @@ templ Reader(user User, metadata ReaderMetadata) {
 					<div class="help-row"><span>Settings</span><span class="help-keys"><kbd class="kbd">s</kbd></span></div>
 					<div class="help-row"><span>Add bookmark</span><span class="help-keys"><kbd class="kbd">b</kbd></span></div>
 					<div class="help-row"><span>Close menus / toggle chrome</span><span class="help-keys"><kbd class="kbd">Esc</kbd></span></div>
-
 					<h4 class="reader-help-section" x-show="isFixedLayout">Zoom &amp; pan <span class="help-note">(comics, PDFs)</span></h4>
 					<div class="help-row" x-show="isFixedLayout"><span>Zoom in / out / reset</span><span class="help-keys"><kbd class="kbd">+</kbd><kbd class="kbd">−</kbd><kbd class="kbd">0</kbd> or wheel</span></div>
 					<div class="help-row" x-show="isFixedLayout"><span>Move the page</span><span class="help-keys">drag with the mouse</span></div>
 					<div class="help-row" x-show="isFixedLayout"><span>Recenter <span class="help-note">(keeps zoom)</span></span><span class="help-keys">⊙ button</span></div>
 					<div class="help-row" x-show="isPDF"><span>Select text in a PDF</span><span class="help-keys">Smart mode: drag over text · <kbd class="kbd">Shift</kbd>+drag anywhere · Text mode</span></div>
-
 					<h4 class="reader-help-section">Highlights</h4>
 					<div class="help-row"><span>Create</span><span class="help-keys">select text → pick a color</span></div>
 					<div class="help-row"><span>Edit / delete</span><span class="help-keys">click the highlight</span></div>
-
 					<h4 class="reader-help-section">Touch</h4>
 					<div class="help-row"><span>Page turn</span><span class="help-keys">swipe, or tap outer edges</span></div>
 					<div class="help-row"><span>Toggle chrome</span><span class="help-keys">tap center</span></div>
@@ -295,7 +291,7 @@ templ ReaderChrome(metadata ReaderMetadata) {
 				<h1 class="text-base sm:text-lg font-semibold hidden sm:block sm:truncate">{ metadata.Title }</h1>
 				<div class="flex items-center gap-1">
 					<button @click="addBookmark()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Bookmark this position (b)">🏷️</button>
-					<button x-show="!isFixedLayout || isPDF" @click="toggleSearch()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Search (/)">🔍</button>
+					<button x-show="(!isFixedLayout || isPDF) && !treatAsComic" @click="toggleSearch()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Search (/)">🔍</button>
 					<button @click="toggleBookmarks()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Annotations">📝</button>
 					<button @click="toggleSettings()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Settings (s)">Aa</button>
 					<button @click="toggleHelp()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700 text-sm font-bold" title="Shortcuts & gestures (?)" aria-label="Shortcuts and gestures">?</button>
@@ -338,7 +334,7 @@ templ ReaderChrome(metadata ReaderMetadata) {
 				<div class="flex items-center gap-1">
 					<div class="w-px h-6 reader-sep"></div>
 					<div id="progress-display" @click="cycleProgressMode()" :title="progressTooltip()" class="text-sm min-w-[4rem] max-w-[5rem] sm:max-w-none text-center cursor-pointer truncate whitespace-nowrap overflow-hidden">
-					<span class="hidden sm:inline" x-text="progressLabel"></span><span x-text="progressMain">—</span>
+						<span class="hidden sm:inline" x-text="progressLabel"></span><span x-text="progressMain">—</span>
 					</div>
 					<div class="w-px h-6 reader-sep"></div>
 					<button @click="toggleTOC()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Table of Contents (t)">📖</button>
@@ -348,92 +344,93 @@ templ ReaderChrome(metadata ReaderMetadata) {
 			<div x-show="isFixedLayout">
 				<!-- Full toolbar: desktop/tablet (>= 768px, md). Wraps gracefully in between. -->
 				<div class="hidden md:flex flex-wrap items-center gap-x-1 gap-y-1 px-1.5 py-1.5 sm:px-2 sm:py-2 sm:gap-1">
-				<div class="flex items-center gap-0.5">
-					<button @click="goLeft()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Go Left (←)" aria-label="Go left">
+					<div class="flex items-center gap-0.5">
+						<button @click="goLeft()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Go Left (←)" aria-label="Go left">
+							<svg class="reader-icon" width="24" height="24" aria-hidden="true">
+								<path d="M 15 6 L 9 12 L 15 18"></path>
+							</svg>
+						</button>
+						<button x-show="backStack.length > 0" @click="goBackToLocation()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Return to previous location (Alt+←)" aria-label="Return to previous location">
+							<svg class="reader-icon" width="20" height="20" aria-hidden="true">
+								<path d="M 12 21 C 9 18 5 14.4 5 9.5 C 5 6.5 8 4 12 4 C 16 4 19 6.5 19 9.5 C 19 14.4 15 18 12 21 Z"></path>
+								<circle cx="12" cy="9.5" r="2"></circle>
+							</svg>
+						</button>
+					</div>
+					<input
+						id="progress-slider-fx"
+						type="range"
+						min="0"
+						max="1"
+						step="any"
+						@input="goToFraction($event.target.value)"
+						class="grow min-w-[3rem]"
+					/>
+					<button @click="goRight()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Go Right (→)" aria-label="Go right">
 						<svg class="reader-icon" width="24" height="24" aria-hidden="true">
-							<path d="M 15 6 L 9 12 L 15 18"></path>
+							<path d="M 9 6 L 15 12 L 9 18"></path>
 						</svg>
 					</button>
-					<button x-show="backStack.length > 0" @click="goBackToLocation()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Return to previous location (Alt+←)" aria-label="Return to previous location">
+					<div class="w-px h-6 mx-1 reader-sep"></div>
+					<!-- Fit mode + zoom cluster (not applicable in webtoon flow) -->
+					<div class="flex items-center gap-1" x-show="comicFlow !== 'webtoon'">
+						<select
+							@change="applyFitMode($event.target.value)"
+							class="reader-select text-xs px-1.5 py-1 rounded-lg shrink-0"
+							title="Fit mode"
+							aria-label="Fit mode"
+						>
+							<option value="fit-page">Fit Page</option>
+							<option value="fit-width">Fit Width</option>
+						</select>
+						<button @click="zoomOut()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Zoom Out (-)" aria-label="Zoom out">
+							<svg class="reader-icon" width="20" height="20" aria-hidden="true">
+								<path d="M 5 10 L 15 10"></path>
+							</svg>
+						</button>
+						<button @click="resetZoom()" class="text-xs px-1 rounded-lg hover:bg-gray-700 min-w-[3rem]" title="Reset Zoom (0)" aria-label="Reset zoom">
+							<span x-text="zoomPercent + '%'">100%</span>
+						</button>
+						<button @click="zoomIn()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Zoom In (+)" aria-label="Zoom in">
+							<svg class="reader-icon" width="20" height="20" aria-hidden="true">
+								<path d="M 10 5 L 10 15 M 5 10 L 15 10"></path>
+							</svg>
+						</button>
+						<!-- Recenter: reset pan, keep zoom -->
+						<button @click="recenterView()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Recenter page (reset pan, keep zoom)" aria-label="Recenter page">
+							<svg class="reader-icon" width="20" height="20" aria-hidden="true">
+								<circle cx="12" cy="12" r="4"></circle>
+								<path d="M 12 2 V 5 M 12 19 V 22 M 2 12 H 5 M 19 12 H 22"></path>
+							</svg>
+						</button>
+						<!-- Magnifier -->
+						<button @click="toggleMagnifier()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" :class="magnifierEnabled ? 'bg-blue-600 hover:bg-blue-700' : ''" title="Magnifier" aria-label="Toggle magnifier">
+							<svg class="reader-icon" width="20" height="20" aria-hidden="true">
+								<circle cx="9" cy="9" r="5"></circle>
+								<path d="M 13 13 L 18 18"></path>
+							</svg>
+						</button>
+					</div>
+					<!-- Pointer mode (PDF only): Smart / Pan / Text — hidden for
+				     comic-treated PDFs: no text selection, pan only -->
+					<div class="reader-seg shrink-0" x-show="isPDF && !treatAsComic" role="group" aria-label="Pointer mode" title="Smart: drag text to select, drag blank to pan · Pan: drag anywhere to move · Text: selection only. Shift always force-pans.">
+						<button :class="interactionMode === 'select' ? 'active' : ''" @click="setInteractionMode('select')" title="Smart: drag text to select, drag blank to pan">Smart</button>
+						<button :class="interactionMode === 'pan' ? 'active' : ''" @click="setInteractionMode('pan')" title="Pan: drag anywhere to move">Pan</button>
+						<button :class="interactionMode === 'text' ? 'active' : ''" @click="setInteractionMode('text')" title="Text: selection only, never pan (Shift overrides)">Text</button>
+					</div>
+					<!-- Double page spread (not applicable in webtoon flow) -->
+					<button x-show="comicFlow !== 'webtoon'" @click="toggleSpread()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" :class="doublePageSpread ? 'bg-blue-600 hover:bg-blue-700' : ''" title="Double Page Spread" aria-label="Toggle double page spread">
 						<svg class="reader-icon" width="20" height="20" aria-hidden="true">
-							<path d="M 12 21 C 9 18 5 14.4 5 9.5 C 5 6.5 8 4 12 4 C 16 4 19 6.5 19 9.5 C 19 14.4 15 18 12 21 Z"></path>
-							<circle cx="12" cy="9.5" r="2"></circle>
+							<path d="M 3 5 h 6 v 14 h -6 z M 15 5 h 6 v 14 h -6 z"></path>
 						</svg>
 					</button>
-				</div>
-				<input
-					id="progress-slider-fx"
-					type="range"
-					min="0"
-					max="1"
-					step="any"
-					@input="goToFraction($event.target.value)"
-					class="grow min-w-[3rem]"
-				/>
-				<button @click="goRight()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Go Right (→)" aria-label="Go right">
-					<svg class="reader-icon" width="24" height="24" aria-hidden="true">
-						<path d="M 9 6 L 15 12 L 9 18"></path>
-					</svg>
-				</button>
-				<div class="w-px h-6 mx-1 reader-sep"></div>
-				<!-- Fit mode + zoom cluster (not applicable in webtoon flow) -->
-				<div class="flex items-center gap-1" x-show="comicFlow !== 'webtoon'">
-					<select
-						@change="applyFitMode($event.target.value)"
-						class="reader-select text-xs px-1.5 py-1 rounded-lg shrink-0"
-						title="Fit mode"
-						aria-label="Fit mode"
-					>
-						<option value="fit-page">Fit Page</option>
-						<option value="fit-width">Fit Width</option>
-					</select>
-					<button @click="zoomOut()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Zoom Out (-)" aria-label="Zoom out">
-						<svg class="reader-icon" width="20" height="20" aria-hidden="true">
-							<path d="M 5 10 L 15 10"></path>
-						</svg>
-					</button>
-					<button @click="resetZoom()" class="text-xs px-1 rounded-lg hover:bg-gray-700 min-w-[3rem]" title="Reset Zoom (0)" aria-label="Reset zoom">
-						<span x-text="zoomPercent + '%'">100%</span>
-					</button>
-					<button @click="zoomIn()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Zoom In (+)" aria-label="Zoom in">
-						<svg class="reader-icon" width="20" height="20" aria-hidden="true">
-							<path d="M 10 5 L 10 15 M 5 10 L 15 10"></path>
-						</svg>
-					</button>
-					<!-- Recenter: reset pan, keep zoom -->
-					<button @click="recenterView()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Recenter page (reset pan, keep zoom)" aria-label="Recenter page">
-						<svg class="reader-icon" width="20" height="20" aria-hidden="true">
-							<circle cx="12" cy="12" r="4"></circle>
-							<path d="M 12 2 V 5 M 12 19 V 22 M 2 12 H 5 M 19 12 H 22"></path>
-						</svg>
-					</button>
-					<!-- Magnifier -->
-					<button @click="toggleMagnifier()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" :class="magnifierEnabled ? 'bg-blue-600 hover:bg-blue-700' : ''" title="Magnifier" aria-label="Toggle magnifier">
-						<svg class="reader-icon" width="20" height="20" aria-hidden="true">
-							<circle cx="9" cy="9" r="5"></circle>
-							<path d="M 13 13 L 18 18"></path>
-						</svg>
-					</button>
-				</div>
-				<!-- Pointer mode (PDF only): Smart / Pan / Text -->
-				<div class="reader-seg shrink-0" x-show="isPDF" role="group" aria-label="Pointer mode" title="Smart: drag text to select, drag blank to pan · Pan: drag anywhere to move · Text: selection only. Shift always force-pans.">
-					<button :class="interactionMode === 'select' ? 'active' : ''" @click="setInteractionMode('select')" title="Smart: drag text to select, drag blank to pan">Smart</button>
-					<button :class="interactionMode === 'pan' ? 'active' : ''" @click="setInteractionMode('pan')" title="Pan: drag anywhere to move">Pan</button>
-					<button :class="interactionMode === 'text' ? 'active' : ''" @click="setInteractionMode('text')" title="Text: selection only, never pan (Shift overrides)">Text</button>
-				</div>
-				<!-- Double page spread (not applicable in webtoon flow) -->
-				<button x-show="comicFlow !== 'webtoon'" @click="toggleSpread()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" :class="doublePageSpread ? 'bg-blue-600 hover:bg-blue-700' : ''" title="Double Page Spread" aria-label="Toggle double page spread">
-					<svg class="reader-icon" width="20" height="20" aria-hidden="true">
-						<path d="M 3 5 h 6 v 14 h -6 z M 15 5 h 6 v 14 h -6 z"></path>
-					</svg>
-				</button>
-				<!-- Progress + TOC -->
-				<div class="flex items-center gap-1">
-					<div id="progress-display-fx" @click="cycleProgressMode()" :title="progressTooltip()" class="text-sm min-w-[3.5rem] text-center cursor-pointer truncate whitespace-nowrap overflow-hidden">
-						<span x-text="progressMain">—</span>
+					<!-- Progress + TOC -->
+					<div class="flex items-center gap-1">
+						<div id="progress-display-fx" @click="cycleProgressMode()" :title="progressTooltip()" class="text-sm min-w-[3.5rem] text-center cursor-pointer truncate whitespace-nowrap overflow-hidden">
+							<span x-text="progressMain">—</span>
+						</div>
+						<button @click="toggleTOC()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Table of Contents (t)">📖</button>
 					</div>
-					<button @click="toggleTOC()" class="p-1.5 sm:p-2 rounded-lg hover:bg-gray-700" title="Table of Contents (t)">📖</button>
-				</div>
 				</div>
 				<!-- Compact row (phone-sized windows): single line + ⋯ overflow.
 				     Standard mobile-reader pattern: paging, slider, progress stay;
@@ -528,7 +525,7 @@ templ ReaderChrome(metadata ReaderMetadata) {
 						<span>Night mode</span>
 						<button @click="fxInvert = !fxInvert; applyFxFilter(true)" class="reader-popover-btn text-xs px-2" :class="fxInvert ? 'text-blue-400' : ''" x-text="fxInvert ? 'On' : 'Off'">Off</button>
 					</div>
-					<div class="reader-tools-row" x-show="isPDF">
+					<div class="reader-tools-row" x-show="isPDF && !treatAsComic">
 						<span>Pointer</span>
 						<div class="reader-seg" role="group" aria-label="Pointer mode">
 							<button :class="interactionMode === 'select' ? 'active' : ''" @click="setInteractionMode('select')">Smart</button>
@@ -700,7 +697,7 @@ templ ReaderAnnotationsDrawer() {
 							@keydown.enter="renameBookmark(bookmark)"
 							@keydown.escape="bookmark.renameOpen = false"
 							placeholder="Bookmark name…"
-						></input>
+						/>
 						<div class="flex gap-2 mt-1">
 							<button @click="renameBookmark(bookmark)" class="flex-1 py-1 text-xs bg-blue-600 text-white rounded hover:bg-blue-700">Save</button>
 							<button @click="bookmark.renameOpen = false" class="flex-1 py-1 text-xs border rounded hover:opacity-80" style="border-color: var(--border);">Cancel</button>
@@ -243,6 +243,9 @@ type ReaderMetadata struct {
 	LibraryID        string `json:"library_id"`
 	TotalCharacters  int64  `json:"total_characters"`
 	EstimatedPages   int    `json:"estimated_pages"`
+	// TreatAsComic: fixed-layout item in a comics/manga library gets
+	// comic reader treatment (bookmarks only — no highlights, no search).
+	TreatAsComic bool `json:"treat_as_comic"`
 }

 type ReadingProgress struct {
@@ -398,6 +398,10 @@ document.addEventListener("alpine:init", () => {
    isFixedLayout: false,
    isPDF: false,
    isComic: false,
+    // Fixed-layout item in a comics/manga library (e.g. a manga PDF):
+    // comic reader treatment — bookmarks only, no text-selection
+    // highlights, no in-book search.
+    treatAsComic: false as boolean,
    comicFlow: "paged" as string,
    fxBrightness: 1 as number,
    fxContrast: 1 as number,
@@ -588,8 +592,10 @@ document.addEventListener("alpine:init", () => {
      formatGroup: string;
      readingDirection: string;
      mangaType: string;
+      treatAsComic: boolean;
    }) {
      this.mediaItemId = config.mediaItemId;
+      this.treatAsComic = config.treatAsComic;
      // Reading state (position, bookmarks, annotations) is never baked
      // into the rendered page: the web reader is intrinsically tied to
      // the server, so it reads all of it from the APIs at open time —
@@ -724,10 +730,30 @@ document.addEventListener("alpine:init", () => {
            // drags, so the popover's pointerup trigger never fires for
            // them; a selection that has been stable for a moment is the
            // settled gesture — open the popover for it.
-            if (!this.isFixedLayout)
+            if (
+              this.isFixedLayout &&
+              !this.treatAsComic &&
+              doc.querySelector(".textLayer")
+            )
+              this.schedulePDFSelectionPopover(doc, index);
+            else if (!this.isFixedLayout)
              this.scheduleSelectionPopover(doc, index);
          });
        }
+        // Clicks in the book dismiss the popover in ANY mode and for ANY
+        // content doc (EPUB sections and fixed-layout pages alike): iframe
+        // events never bubble to the host document (so the host
+        // outside-click dismiss never sees them). Clicking a painted
+        // highlight still works: this hides, then foliate's
+        // show-annotation re-opens it in edit mode.
+        doc.addEventListener(
+          "pointerdown",
+          () => {
+            if (this.selectionPopover.open)
+              this.hideSelectionPopover();
+          },
+          { passive: true },
+        );
        // Text selection → highlight popover (reflowable EPUB only;
        // fixed-layout highlight overlays are a later milestone).
        if (!this.isFixedLayout) {
@@ -757,21 +783,6 @@ document.addEventListener("alpine:init", () => {
            (e: PointerEvent) => setTimeout(() => checkSelection(e), 0),
            { passive: true },
          );
-          // Clicks in the book dismiss the popover in ANY mode: iframe
-          // events never bubble to the host document (so the host
-          // outside-click dismiss never sees them), and the collapsed
-          // check above only covers create mode — edit mode had no
-          // outside-click path at all, leaving Esc as the only way out.
-          // Clicking a painted highlight still works: this hides, then
-          // foliate's show-annotation re-opens it in edit mode.
-          doc.addEventListener(
-            "pointerdown",
-            () => {
-              if (this.selectionPopover.open)
-                this.hideSelectionPopover();
-            },
-            { passive: true },
-          );
          doc.addEventListener(
            "keyup",
            (ev: KeyboardEvent) => {
@@ -784,66 +795,29 @@ document.addEventListener("alpine:init", () => {
        // Detected structurally: renderer.isPDF isn't set until the first
        // spread renders (during view.init), which is after this listener
        // attaches — the stale copy here would always be falsy.
-        if (this.isFixedLayout && doc.querySelector(".textLayer")) {
-          const checkPDFSelection = () => {
-            const sel = doc.getSelection();
-            if (!sel || sel.isCollapsed || !sel.rangeCount) return;
-            const range = sel.getRangeAt(0);
-            const text = sel.toString().replace(/\s+/g, " ").trim();
-            if (!text) return;
-            // Denominator: the element whose post-transform screen rect IS
-            // the visible page. For PDFs that's the rendered canvas — pdf.js
-            // scales <html> by 1/devicePixelRatio, so documentElement's rect
-            // is dpr× too small and would inflate every fraction (highlight
-            // shifted right/oversized on any dpr != 1 display). The canvas's
-            // rect is in the same transform-inclusive space as the textLayer
-            // span rects, so the dpr scaling cancels exactly.
-            const denom =
-              (doc.querySelector("#canvas canvas") as HTMLElement) ||
-              (doc.querySelector("img") as HTMLElement);
-            let dr = denom?.getBoundingClientRect();
-            if (!dr || !dr.width || !dr.height) {
-              const vw = doc.defaultView;
-              dr = {
-                left: 0,
-                top: 0,
-                width: vw?.innerWidth || 1,
-                height: vw?.innerHeight || 1,
-              } as DOMRect;
-            }
-            const rects: number[][] = [];
-            for (const r of range.getClientRects()) {
-              const x = (r.left - dr.left) / dr.width;
-              const y = (r.top - dr.top) / dr.height;
-              const w = r.width / dr.width;
-              const h = r.height / dr.height;
-              if (w > 0 && h > 0) rects.push([x, y, w, h]);
-            }
-            if (!rects.length) return;
-            // Map the first rect to host-space for popover placement.
-            // The canvas's screen rect maps 1:1 onto the host iframe box
-            // (the visible page fills the iframe), so sx/sy are 1 for PDFs;
-            // kept general for the comic img fallback.
-            const frame = doc.defaultView?.frameElement as HTMLElement | null;
-            if (!frame) return;
-            const fr = frame.getBoundingClientRect();
-            const first = range.getBoundingClientRect();
-            const sx = fr.width / dr.width;
-            const sy = fr.height / dr.height;
-            this.pdfSelDoc = doc;
-            this.openSelectionPopover({
-              mode: "create",
-              x: fr.left + first.left * sx + (first.width * sx) / 2,
-              y: fr.top + first.top * sy,
-              text,
-              cfi: "",
-              pdfPage: index,
-              pdfRects: rects,
-            });
-          };
+        // Comic-treated PDFs never attach it: no highlights, like comics.
+        if (
+          this.isFixedLayout &&
+          !this.treatAsComic &&
+          doc.querySelector(".textLayer")
+        ) {
          doc.addEventListener(
            "pointerup",
-            () => setTimeout(checkPDFSelection, 0),
+            (e: PointerEvent) =>
+              setTimeout(() => {
+                // Chrome on touch selects the word under a quick tap —
+                // that is a page-turn tap, not a selection gesture; clear
+                // it and show nothing (same guard as the reflowable path).
+                if (
+                  e.pointerType === "touch" &&
+                  this.lastTouchDownT &&
+                  Date.now() - this.lastTouchDownT < 300
+                ) {
+                  doc.getSelection()?.removeAllRanges();
+                  return;
+                }
+                this.checkPDFSelectionFor(doc, index);
+              }, 0),
            { passive: true },
          );
        }
@@ -980,6 +954,9 @@ document.addEventListener("alpine:init", () => {
      // Smart|Pan|Text control appear for PDFs.
      this.isPDF = !!this.renderer?.isPDF;
      if (this.isPDF) {
+        // Comic-treated PDFs are paged through like comics: no text
+        // selection, so pointer interactions stay in pan mode.
+        if (this.treatAsComic) this.interactionMode = "pan";
        this.renderer.setAttribute("interaction-mode", this.interactionMode);
      }
      this.fxZoomed = this.isFixedLayout && this.renderer?.zoom != null;
@@ -1332,6 +1309,94 @@ document.addEventListener("alpine:init", () => {
        this.openPopoverForSelection(sel, doc, index);
      }, 400);
    },
+    // PDF mirror of scheduleSelectionPopover: the gesture takeover
+    // swallows pointerup for touch selection drags in the fx iframe too,
+    // so a selection that has been stable for a moment is the settled
+    // gesture — open the popover for it.
+    schedulePDFSelectionPopover(doc: any, index: number) {
+      if (this.selPopTimer) clearTimeout(this.selPopTimer);
+      this.selPopTimer = setTimeout(() => {
+        this.selPopTimer = null;
+        // A tap on a painted highlight re-opens the popover in edit mode
+        // via its own path — never clobber it.
+        if (this.selectionPopover.open && this.selectionPopover.mode === "edit")
+          return;
+        const sel = doc.getSelection();
+        if (!sel || sel.isCollapsed || !sel.rangeCount) {
+          if (
+            this.selectionPopover.open &&
+            this.selectionPopover.mode === "create"
+          )
+            this.hideSelectionPopover();
+          return;
+        }
+        this.checkPDFSelectionFor(doc, index);
+      }, 400);
+    },
+    checkPDFSelectionFor(doc: any, index: number) {
+      const sel = doc.getSelection();
+      if (!sel || sel.isCollapsed || !sel.rangeCount) return;
+      const range = sel.getRangeAt(0);
+      const text = sel.toString().replace(/\s+/g, " ").trim();
+      if (!text) return;
+      // Denominator: the element whose post-transform screen rect IS
+      // the visible page. For PDFs that's the rendered canvas — pdf.js
+      // scales <html> by 1/devicePixelRatio, so documentElement's rect
+      // is dpr× too small and would inflate every fraction (highlight
+      // shifted right/oversized on any dpr != 1 display). The canvas's
+      // rect is in the same transform-inclusive space as the textLayer
+      // span rects, so the dpr scaling cancels exactly.
+      const denom =
+        (doc.querySelector("#canvas canvas") as HTMLElement) ||
+        (doc.querySelector("img") as HTMLElement);
+      let dr = denom?.getBoundingClientRect();
+      if (!dr || !dr.width || !dr.height) {
+        const vw = doc.defaultView;
+        dr = {
+          left: 0,
+          top: 0,
+          width: vw?.innerWidth || 1,
+          height: vw?.innerHeight || 1,
+        } as DOMRect;
+      }
+      const rects: number[][] = [];
+      for (const r of range.getClientRects()) {
+        const x = (r.left - dr.left) / dr.width;
+        const y = (r.top - dr.top) / dr.height;
+        const w = r.width / dr.width;
+        const h = r.height / dr.height;
+        if (w > 0 && h > 0) rects.push([x, y, w, h]);
+      }
+      if (!rects.length) return;
+      // Map the first rect to host-space for popover placement.
+      // The canvas's screen rect maps 1:1 onto the host iframe box
+      // (the visible page fills the iframe), so sx/sy are 1 for PDFs;
+      // kept general for the comic img fallback.
+      const frame = doc.defaultView?.frameElement as HTMLElement | null;
+      if (!frame) return;
+      const fr = frame.getBoundingClientRect();
+      const first = range.getBoundingClientRect();
+      const sx = fr.width / dr.width;
+      const sy = fr.height / dr.height;
+      // On touch the browser's own selection menu attaches ABOVE the
+      // selection and its drag handles sit just below it — place ours
+      // below both (same +90 clearance the reflowable path uses). Fine
+      // pointers (desktop) keep the above-the-selection placement.
+      const coarse = window.matchMedia("(pointer: coarse)").matches;
+      const y = coarse
+        ? fr.top + first.bottom * sy + 90
+        : fr.top + first.top * sy;
+      this.pdfSelDoc = doc;
+      this.openSelectionPopover({
+        mode: "create",
+        x: fr.left + first.left * sx + (first.width * sx) / 2,
+        y,
+        text,
+        cfi: "",
+        pdfPage: index,
+        pdfRects: rects,
+      });
+    },
    // Trim a touch selection to the visible page. The visible column
    // occupies content x [start - size, start]; endpoints beyond it are
    // re-mapped to the page edge on their own line via caretRangeFromPoint.
@@ -1560,7 +1625,12 @@ document.addEventListener("alpine:init", () => {
          const rows = await hlResp.json();
          this.highlightItems = (rows as any[])
            .map((r) => this.mapHighlightRow(r))
-            .filter((hl: any) => hl.cfi || hl.pdfPage >= 0);
+            // Comic-treated items show no highlights (bookmarks only),
+            // and previously-created PDF highlights stop rendering.
+            .filter(
+              (hl: any) =>
+                !this.treatAsComic && (hl.cfi || hl.pdfPage >= 0),
+            );
          this.renderAllHighlights();
        }
        if (noteResp.ok) {
@@ -1579,6 +1649,9 @@ document.addEventListener("alpine:init", () => {
      const p = this.selectionPopover;
      const token = getToken();
      if (!token || !this.mediaItemId || (!p.cfi && p.pdfPage < 0)) return;
+      // The note editor writes into p.note live; "Highlight with note"
+      // creates the highlight AND its note in one POST.
+      const note = p.note.trim();
      const pdfAnchor =
        p.pdfPage >= 0
          ? JSON.stringify({ v: 1, page: p.pdfPage, rects: p.pdfRects })
@@ -1599,7 +1672,7 @@ document.addEventListener("alpine:init", () => {
              epubcfi_start: p.pdfPage >= 0 ? pdfAnchor : p.cfi,
              epubcfi_end: p.pdfPage >= 0 ? pdfAnchor : p.cfiEnd,
              color,
-              note_text: "",
+              note_text: note,
              percentage_start: this.lastRelocateDetail?.fraction ?? 0,
            }),
          },
@@ -1628,7 +1701,7 @@ document.addEventListener("alpine:init", () => {
                ? ""
                : this.toRangeCfi(p.cfi, p.cfiEnd, p.text) || p.cfi,
            color,
-            note: "",
+            note,
            id: row.id,
          });
          // Clear the DOM selection: the gesture is consumed, and it is
@@ -1644,7 +1717,7 @@ document.addEventListener("alpine:init", () => {
        /* ignore highlight errors */
      }
    },
-    async saveHighlightChanges() {
+    async saveHighlightChanges(keepNoteOpen = false) {
      const p = this.selectionPopover;
      const token = getToken();
      if (!token || !this.mediaItemId || !p.id) return;
@@ -1708,7 +1781,9 @@ document.addEventListener("alpine:init", () => {
            id: p.id,
          });
        }
-        p.noteOpen = false;
+        // Explicit saves (the Save button) close the whole popover; color
+        // tweaks made while the note editor is open keep everything open.
+        if (!keepNoteOpen) this.hideSelectionPopover();
      } catch (_e) {
        /* ignore highlight errors */
      }
@@ -2091,6 +2166,8 @@ document.addEventListener("alpine:init", () => {
    },
    setInteractionMode(mode: string) {
      if (!this.isFixedLayout || !this.isPDF) return;
+      // Comic-treated PDFs have no text selection: pan only.
+      if (this.treatAsComic) return;
      if (mode !== "select" && mode !== "pan" && mode !== "text") return;
      this.renderer.setAttribute("interaction-mode", mode);
      this.interactionMode = mode;
@@ -2185,8 +2262,9 @@ document.addEventListener("alpine:init", () => {
    },
    toggleSearch() {
      // Reflowable books use foliate's DOM search; PDFs use extracted text.
-      // Comics have no text at all.
-      if (this.isFixedLayout && !this.isPDF) return;
+      // Comics have no text at all — and comic-treated PDFs (manga scans)
+      // opt out of search to match comic treatment: bookmarks only.
+      if ((this.isFixedLayout && !this.isPDF) || this.treatAsComic) return;
      const opening = !this.searchOpen;
      this.closeDrawers();
      this.searchOpen = opening;
@@ -2594,8 +2672,8 @@ document.addEventListener("alpine:init", () => {
      this.hyphenate = true;
      this.chromeBehavior = "auto-hide";
      this.applyChromeBehavior();
-      this.interactionMode = "select";
-      this.setInteractionMode("select");
+      this.interactionMode = this.treatAsComic ? "pan" : "select";
+      this.setInteractionMode(this.interactionMode);
      this.fxBrightness = 1;
      this.fxContrast = 1;
      this.fxInvert = false;
Author	SHA1	Message	Date
john-okeefe	5329bf35a9	fix: pin foliate-js e16530a — desktop double-click zoom toggle Release / build-and-push (push) Successful in 3m20s Details Bump the linuxhg mirror pin from 1305a52 to e16530a (mirror main is already synced). The fork adds a desktop double-click zoom to the fixed-layout renderer for all fixed-layout content (comics, manga, PDFs, fixed EPUBs): - at fit scale, double-click zooms to 2.5x at the clicked location - zoomed or panned, double-click resets to 100% centered - PDF text-layer spans and annotation links keep native double-click (word selection) in Smart/Text modes; Pan mode zooms anywhere - mirrors the existing touch double-tap; disabled in panel-zoom mode like the other gestures Also closes the gap where node_modules was serving a stale tarball older than the previous 1305a52 pin (missing the toolbar-resize debounce and selection-drag fixes); a fresh install now resolves the full set.	2026-09-17 14:37:05 -04:00
john-okeefe	80e5d5b0d1	feat(reader): comic treatment for fixed-layout items in comics/manga libraries PDFs shelved in comics or manga libraries (scanned manga, official manga PDFs with text layers) now get comic reader treatment: bookmarks only — no text-selection highlights, no annotations, no in-book search. Items in ebooks libraries are completely unaffected, and EPUBs keep their existing behavior everywhere. - handlers: new exported ShouldTreatAsComic(libraryType, formatGroup) — true for fixed_layout/comic_archive in manga/comics libraries; the reader JSON API also exposes it as treat_as_comic - router: the SSR reader page fetches the library type and passes TreatAsComic through ReaderMetadata into the init config - reader: when treatAsComic is set, the PDF textLayer selection listener (mouse and touch paths) never attaches so no highlight popover can open; pointer mode is forced to pan (Smart/Text segment hidden); search button and toggleSearch are disabled; previously-created PDF highlights stop rendering - bookmarks are unchanged (already page-index based for fixed layout), and device sync / OPDS / format classification are untouched since format_group stays fixed_layout	2026-09-17 14:36:58 -04:00
John O'Keefe	b3a429d7e1	fix(reader): Save/Cancel in the note editor closes the whole popover Release / build-and-push (push) Successful in 2m46s Details Cancel only collapsed the editor section, and edit-mode saves only set noteOpen=false — the minimized popover (colors/pencil/copy/delete) stayed up. Explicit Save and Cancel now call hideSelectionPopover; color tweaks with the editor open still keep it open.	2026-09-17 11:47:25 -04:00
John O'Keefe	d8179bb066	fix(reader): popover dismiss on PDF taps; notes save on create; colors don't close editor - The in-book pointerdown dismiss listener lived in the reflowable-only block, so PDF taps never closed the selection popover — hoist it so every content doc (EPUB, PDF, comics) dismisses on tap. - createHighlight hardcoded note_text: '' — 'Highlight with note' saved the highlight but silently dropped the note. Send p.note (and pass it to the EPUB overlayer). - saveHighlightChanges collapsed the note editor on every save; color dots in create mode created a highlight outright. With the editor open, color dots now just recolor (create) or recolor-and-save with the editor kept open (edit).	2026-09-17 10:55:21 -04:00
John O'Keefe	960305dfa9	fix(reader): PDF selection popover shows reliably on touch, below selection Chromium's touch selection takeover swallows pointerup in the fx iframe, so the PDF popover's only trigger never fired on real phones — it only appeared when timing happened to deliver the event. Mirror the EPUB path: a selectionchange debounce (400ms settle) opens the popover, with the pointerup path kept for desktop plus the quick-tap word-select guard. Also place the popover BELOW the selection on coarse pointers (+90px clearing the native selection menu and drag handles), matching the reflowable path; desktop keeps above-placement.	2026-09-17 10:40:12 -04:00
John O'Keefe	16bbeec5a3	fix: fresh npm cache mount id to evict stale foliate-js tarball	2026-09-17 10:17:34 -04:00
John O'Keefe	39f9c39360	fix: pin foliate-js 1305a52 via linuxhg mirror GitHub-pinned builds silently reused a stale foliate-js tarball from Docker's npm cache mount (name@version never changed from 0.0.0); every build since the GitHub pin shipped pre-94bb384 code. Repin to the mirror and bust the cache mount.	2026-09-17 10:13:33 -04:00
John O'Keefe	011b6d14e4	fix: pin foliate-js 1305a52 — fx renderer ignores toolbar resizes during selection The fx renderer re-rendered the PDF on every viewport resize; mobile browser toolbar transitions (7-17% height change) during a text selection drag caused the old canvas to be cleared for re-rendering while the async pdf.js render raced with the next resize, blanking the page. Now gated by the same 25% threshold as the paginator.	2026-09-16 17:30:00 -04:00
John O'Keefe	d4661e7f04	fix: pin foliate-js 94bb384 — PDF selection drags no longer blank the page The fx renderer's gesture classifier only checked whether the touch started on a .textLayer span; Chromium's long-press selects the nearest word even when the finger landed between spans, so the classifier saw a non-selectable target and classified the drag as swipe/pan — preventDefault on the iframe's touchmove then cancelled the native selection extension mid-drag and could blank the PDF canvas. If any frame already has a non-collapsed selection, the drag is now classified as native.	2026-09-16 17:13:24 -04:00