Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

feat(web): fully resizable reading workspace panels + focus preset (#1310)

flower-moon849ab287160a
diff --git a/web/components/reading/workspace/ReadingPanelSeparator.tsx b/web/components/reading/workspace/ReadingPanelSeparator.tsx
new file mode 100644
index 000000000..801be3b90
--- /dev/null
+++ b/web/components/reading/workspace/ReadingPanelSeparator.tsx
@@ -0,0 +1,83 @@
+'use client'
+
+import { useEffect, useRef, useState, type PointerEvent } from 'react'
+
+/** Pointer capture keeps drag cleanup local, including cancel, removal, and unmount. */
+export function ReadingPanelSeparator({
+ label,
+ width,
+ min,
+ max,
+ direction,
+ onResize,
+}: {
+ label: string
+ width: number
+ min: number
+ max: number
+ direction: 1 | -1
+ onResize: (width: number) => void
+}) {
+ const drag = useRef<{ id: number; x: number; width: number } | null>(null)
+ const [resizing, setResizing] = useState(false)
+ const resize = (next: number) => onResize(Math.round(Math.min(max, Math.max(min, next))))
+ const finish = (event: PointerEvent<HTMLDivElement>) => {
+ if (drag.current?.id !== event.pointerId) return
+ drag.current = null
+ setResizing(false)
+ if (event.currentTarget.hasPointerCapture(event.pointerId)) {
+ event.currentTarget.releasePointerCapture(event.pointerId)
+ }
+ }
+
+ useEffect(() => {
+ if (!resizing) return
+ const { cursor, userSelect } = document.body.style
+ document.body.style.cursor = 'col-resize'
+ document.body.style.userSelect = 'none'
+ return () => {
+ document.body.style.cursor = cursor
+ document.body.style.userSelect = userSelect
+ }
+ }, [resizing])
+
+ return (
+ <div
+ role="separator"
+ tabIndex={0}
+ aria-orientation="vertical"
+ aria-label={label}
+ aria-valuemin={min}
+ aria-valuemax={Math.floor(max)}
+ aria-valuenow={width}
+ onPointerDown={event => {
+ if (event.button !== 0) return
+ event.preventDefault()
+ event.currentTarget.focus()
+ event.currentTarget.setPointerCapture(event.pointerId)
+ drag.current = { id: event.pointerId, x: event.clientX, width }
+ setResizing(true)
+ }}
+ onPointerMove={event => {
+ const current = drag.current
+ if (!current || current.id !== event.pointerId) return
+ resize(current.width + direction * (event.clientX - current.x))
+ }}
+ onPointerUp={finish}
+ onPointerCancel={finish}
+ onLostPointerCapture={finish}
+ onKeyDown={event => {
+ const step = (event.shiftKey ? 40 : 10) * direction
+ const next = { ArrowLeft: width - step, ArrowRight: width + step, Home: min, End: max }[
+ event.key
+ ]
+ if (next === undefined) return
+ event.preventDefault()
+ resize(next)
+ }}
+ className="group/resize relative z-10 hidden cursor-col-resize touch-none focus-visible:outline-2 focus-visible:outline-[var(--primary)] xl:block"
+ >
+ <span className="absolute inset-y-0 left-1/2 w-px -translate-x-1/2 bg-[var(--border)] transition-colors group-hover/resize:bg-[var(--primary)] group-active/resize:bg-[var(--primary)]" />
+ </div>
+ )
+}
diff --git a/web/components/reading/workspace/ReadingWorkspace.tsx b/web/components/reading/workspace/ReadingWorkspace.tsx
index e477153ed..a3ed2a89a 100644
--- a/web/components/reading/workspace/ReadingWorkspace.tsx
+++ b/web/components/reading/workspace/ReadingWorkspace.tsx
@@ -3,7 +3,6 @@
import { scopedUrl } from "@/lib/workspace-scope";
import { READING_HOME, readingFolderRoute, readingSessionIdFromPath } from "@/lib/learning-routes";
-import { browserStorage } from "@/shared/storage";
import Tooltip from "@/shared/ui/Tooltip";
import Link from "next/link";
@@ -20,6 +19,7 @@ import {
Expand,
GraduationCap,
Loader2,
+ Maximize2,
Minimize2,
NotebookPen,
PanelLeftClose,
@@ -68,6 +68,8 @@ import {
type ReadingLibraryMaterial,
} from "@/lib/reading-workspace-api";
import { SourceNavigator } from "./SourceNavigator";
+import { ReadingPanelSeparator } from "./ReadingPanelSeparator";
+import { useReadingPanelLayout } from "./useReadingPanelLayout";
import {
EmptyWorkspace,
MaterialFailure,
@@ -178,25 +180,6 @@ export function ReadingWorkspacePage() {
locator: number;
} | null>(null);
const prefillInputRef = useRef<((text: string) => void) | null>(null);
- // Persisted so a reader who likes a wider (or narrower) companion does not
- // have to redo it every session; the default mirrors the fixed width the
- // panel used before it became resizable. Lazy-initialized (not an effect)
- // because it never reaches server-rendered markup — `gridStyle` below stays
- // `undefined` until `isDesktopWide` flips true on the client — so there is
- // no hydration mismatch to guard against.
- const [companionWidth, setCompanionWidth] = useState(() => {
- if (typeof window === "undefined") return 380;
- try {
- const stored = Number(
- browserStorage.readRaw("local", "dt.reader.companionWidth"),
- );
- return Number.isFinite(stored) && stored >= 300 && stored <= 640
- ? stored
- : 380;
- } catch {
- return 380;
- }
- });
const [isDesktopWide, setIsDesktopWide] = useState(false);
// A Course Study hand-off may have written the opening line before sending
@@ -253,11 +236,25 @@ export function ReadingWorkspacePage() {
companionOpen,
learning,
mainRef,
- navigatorOpen,
+ navigatorOpen: preferredNavigatorOpen,
openLearning,
- setCompanionOpen,
+ setCompanionOpen: setPreferredCompanionOpen,
setNavigatorOpen,
} = useReadingLearningMode(workspaceId);
+ const { gridRef, ...panels } = useReadingPanelLayout({
+ enabled: isDesktopWide,
+ navigatorOpen: preferredNavigatorOpen,
+ companionOpen,
+ });
+ const { navigatorOpen, exitFocus } = panels;
+ const setCompanionOpen = useCallback(
+ (open: boolean) => {
+ if (!open) exitFocus();
+ setPreferredCompanionOpen(open);
+ },
+ [exitFocus, setPreferredCompanionOpen],
+ );
+
const [documentJump, setDocumentJump] = useState<JumpRequest | null>(null);
const [pageHeadings, setPageHeadings] = useState<ReaderHeading[]>([]);
const [activeHeadingId, setActiveHeadingId] = useState<string | null>(null);
@@ -286,12 +283,13 @@ export function ReadingWorkspacePage() {
// sheets over the document, and two sheets at once is just a mess.
const toggleNavigator = useCallback(
(open: boolean) => {
+ exitFocus();
if (open && !window.matchMedia("(min-width: 1024px)").matches) {
setCompanionOpen(false);
}
setNavigatorOpen(open);
},
- [setCompanionOpen, setNavigatorOpen],
+ [exitFocus, setCompanionOpen, setNavigatorOpen],
);
const toggleCompanion = useCallback(
(open: boolean) => {
@@ -373,39 +371,6 @@ export function ReadingWorkspacePage() {
toggleCompanion,
]);
- const startCompanionResize = useCallback(
- (event: React.PointerEvent<HTMLDivElement>) => {
- event.preventDefault();
- const startX = event.clientX;
- const startWidth = companionWidth;
- const reserved = navigatorOpen ? 650 : 420;
- const max = Math.max(300, Math.min(640, window.innerWidth - reserved));
- const onMove = (moveEvent: PointerEvent) => {
- const next = startWidth + (startX - moveEvent.clientX);
- setCompanionWidth(Math.min(max, Math.max(300, Math.round(next))));
- };
- const onUp = () => {
- window.removeEventListener("pointermove", onMove);
- window.removeEventListener("pointerup", onUp);
- setCompanionWidth((current) => {
- try {
- browserStorage.writeRaw(
- "local",
- "dt.reader.companionWidth",
- String(current),
- );
- } catch {
- // A blocked or private store just resets to default next time.
- }
- return current;
- });
- };
- window.addEventListener("pointermove", onMove);
- window.addEventListener("pointerup", onUp);
- },
- [companionWidth, navigatorOpen],
- );
-
if (loading) {
return (
<div className="flex h-full items-center justify-center gap-2 bg-[var(--background)] text-[12px] text-[var(--muted-foreground)] dark:bg-[var(--background)]">
@@ -445,19 +410,6 @@ export function ReadingWorkspacePage() {
activeTab?.material.render_mode === "video" ||
activeTab?.material.render_mode === "audio";
- // At desktop width the companion column is drag-resizable, so its track is
- // driven by JS state rather than the Tailwind classes below — a narrow
- // hairline "handle" track sits between the reader and the companion only
- // in this case. The navigator has no grid track when it is closed.
- const showResizeHandle = isDesktopWide && companionOpen;
- const gridStyle: React.CSSProperties | undefined = showResizeHandle
- ? {
- gridTemplateColumns: navigatorOpen
- ? `minmax(184px,230px) minmax(360px,1fr) 5px ${companionWidth}px`
- : `minmax(360px,1fr) 5px ${companionWidth}px`,
- }
- : undefined;
-
// Panels below their docking width are sheets over the document, and a
// sheet needs a scrim to close it by. The navigator docks at `lg`, the
// companion at `xl`; the scrim used to key on either one being open with a
@@ -596,10 +548,32 @@ export function ReadingWorkspacePage() {
<PanelRightOpen size={14} />
)}
</button>
+ {isDesktopWide && companionOpen && (
+ <Tooltip
+ label={
+ panels.companionFocus ? t("Exit companion focus") : t("Focus reading companion")
+ }
+ >
+ <button
+ type="button"
+ onClick={panels.toggleFocus}
+ className="flex size-7 items-center justify-center rounded-md text-[var(--muted-foreground)] transition hover:bg-[var(--muted)] hover:text-[var(--primary)]"
+ aria-label={
+ panels.companionFocus
+ ? t("Exit companion focus")
+ : t("Focus reading companion")
+ }
+ aria-pressed={panels.companionFocus}
+ >
+ {panels.companionFocus ? <Minimize2 size={14} /> : <Maximize2 size={14} />}
+ </button>
+ </Tooltip>
+ )}
</div>
</header>
<div
+ ref={gridRef}
className={`relative grid min-h-0 flex-1 grid-rows-[minmax(0,1fr)] overflow-hidden ${
companionOpen
? navigatorOpen
@@ -609,7 +583,7 @@ export function ReadingWorkspacePage() {
? "grid-cols-[minmax(0,1fr)] lg:grid-cols-[minmax(184px,230px)_minmax(0,1fr)]"
: "grid-cols-[minmax(0,1fr)]"
}`}
- style={gridStyle}
+ style={panels.gridStyle}
>
{scrimClass && (
<button
@@ -678,6 +652,17 @@ export function ReadingWorkspacePage() {
}}
/>
+ {panels.showNavigatorHandle && (
+ <ReadingPanelSeparator
+ label={t("Resize contents navigator")}
+ width={panels.navigatorWidth}
+ min={panels.navigatorMin}
+ max={panels.navigatorMax}
+ direction={1}
+ onResize={panels.resizeNavigator}
+ />
+ )}
+
<section className="relative min-h-0 min-w-0 overflow-hidden border-r border-[var(--border)] bg-[var(--secondary)] dark:border-[var(--border)] dark:bg-[var(--secondary)]">
{!activeTab ? (
<EmptyWorkspace onAdd={() => setShowAddSource(true)} />
@@ -731,16 +716,15 @@ export function ReadingWorkspacePage() {
</section>
- {showResizeHandle && (
- <div
- role="separator"
- aria-orientation="vertical"
- aria-label={t("Resize reading companion")}
- onPointerDown={startCompanionResize}
- className="group/resize relative z-10 hidden cursor-col-resize xl:block"
- >
- <span className="absolute inset-y-0 left-1/2 w-px -translate-x-1/2 bg-[var(--border)] transition-colors group-hover/resize:bg-[var(--primary)] group-active/resize:bg-[var(--primary)]" />
- </div>
+ {panels.showCompanionHandle && (
+ <ReadingPanelSeparator
+ label={t("Resize reading companion")}
+ width={panels.companionWidth}
+ min={panels.companionMin}
+ max={panels.companionMax}
+ direction={-1}
+ onResize={panels.resizeCompanion}
+ />
)}
{companionOpen && (
diff --git a/web/components/reading/workspace/useReadingPanelLayout.ts b/web/components/reading/workspace/useReadingPanelLayout.ts
new file mode 100644
index 000000000..7aeb15b78
--- /dev/null
+++ b/web/components/reading/workspace/useReadingPanelLayout.ts
@@ -0,0 +1,128 @@
+'use client'
+
+import { useCallback, useEffect, useState } from 'react'
+import { browserStorage } from '@/shared/storage'
+
+const NAVIGATOR_MIN = 184
+const NAVIGATOR_MAX = 400
+const COMPANION_MIN = 300
+const READER_MIN = 360
+const HANDLE = 5
+const clamp = (value: number, min: number, max: number) =>
+ Math.round(Math.min(max, Math.max(min, value)))
+
+/** Reserve the reader first; shrink side-panel floors only if the frame cannot fit them. */
+export function readingPanelBounds(
+ frame: number,
+ navigatorOpen: boolean,
+ companionOpen: boolean,
+ preferredNavigator: number,
+ preferredCompanion: number
+) {
+ const handles = (Number(navigatorOpen) + Number(companionOpen)) * HANDLE
+ const available = Math.max(0, Math.floor(frame - handles - Math.min(READER_MIN, frame / 2)))
+ const floors = (navigatorOpen ? NAVIGATOR_MIN : 0) + (companionOpen ? COMPANION_MIN : 0)
+ const scale = floors ? Math.min(1, available / floors) : 1
+ const navigatorMin = navigatorOpen ? Math.floor(NAVIGATOR_MIN * scale) : 0
+ const companionMin = companionOpen ? Math.floor(COMPANION_MIN * scale) : 0
+ const navigatorMax = navigatorOpen ? Math.min(NAVIGATOR_MAX, available - companionMin) : 0
+ const navigatorWidth = navigatorOpen ? clamp(preferredNavigator, navigatorMin, navigatorMax) : 0
+ const companionMax = companionOpen ? available - navigatorWidth : 0
+ const companionWidth = companionOpen ? clamp(preferredCompanion, companionMin, companionMax) : 0
+ return {
+ navigatorWidth,
+ companionWidth,
+ navigatorMin,
+ // A drag may consume free reader space, but never displaces the other panel.
+ navigatorMax: navigatorOpen ? Math.min(NAVIGATOR_MAX, available - companionWidth) : 0,
+ companionMin,
+ companionMax,
+ }
+}
+
+function readWidth(key: string, fallback: number, min: number, max: number) {
+ if (typeof window === 'undefined') return fallback
+ const value = Number(browserStorage.readRaw('local', key))
+ return Number.isFinite(value) && value >= min && value <= max ? value : fallback
+}
+
+export function useReadingPanelLayout({
+ enabled,
+ navigatorOpen: preferredNavigatorOpen,
+ companionOpen,
+}: {
+ enabled: boolean
+ navigatorOpen: boolean
+ companionOpen: boolean
+}) {
+ const [element, gridRef] = useState<HTMLDivElement | null>(null)
+ const [frame, setFrame] = useState(0)
+ const [navigatorWidth, setNavigatorWidth] = useState(() =>
+ readWidth('dt.reader.navigatorWidth', 210, NAVIGATOR_MIN, NAVIGATOR_MAX)
+ )
+ const [companionWidth, setCompanionWidth] = useState(() =>
+ readWidth('dt.reader.companionWidth', 380, COMPANION_MIN, 2400)
+ )
+ const [focus, setFocus] = useState<{ width?: number } | null>(null)
+ const companionFocus = focus !== null && enabled && companionOpen
+ const navigatorOpen = companionFocus ? false : preferredNavigatorOpen
+
+ // A callback ref also observes a grid that appears after the loading screen.
+ useEffect(() => {
+ if (!element) return
+ const measure = () => setFrame(element.clientWidth)
+ const scheduled = requestAnimationFrame(measure)
+ const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(measure)
+ observer?.observe(element)
+ if (!observer) window.addEventListener("resize", measure)
+ return () => {
+ cancelAnimationFrame(scheduled)
+ observer?.disconnect()
+ if (!observer) window.removeEventListener("resize", measure)
+ }
+ }, [element])
+
+ const bounds = readingPanelBounds(
+ frame,
+ navigatorOpen,
+ companionOpen,
+ navigatorWidth,
+ companionFocus ? (focus.width ?? frame / 2) : companionWidth
+ )
+ const exitFocus = useCallback(() => setFocus(null), [])
+ const toggleFocus = useCallback(() => setFocus(current => (current ? null : {})), [])
+ const resizeNavigator = (width: number) => {
+ setNavigatorWidth(width)
+ browserStorage.writeRaw('local', 'dt.reader.navigatorWidth', String(width))
+ }
+ const resizeCompanion = (width: number) => {
+ if (companionFocus) {
+ setFocus({ width })
+ } else {
+ setCompanionWidth(width)
+ browserStorage.writeRaw('local', 'dt.reader.companionWidth', String(width))
+ }
+ }
+ const measured = enabled && frame > 0
+ const gridTemplateColumns = measured
+ ? [
+ ...(navigatorOpen ? [`${bounds.navigatorWidth}px`, `${HANDLE}px`] : []),
+ 'minmax(0,1fr)',
+ ...(companionOpen ? [`${HANDLE}px`, `${bounds.companionWidth}px`] : []),
+ ].join(' ')
+ : undefined
+
+ return {
+ ...bounds,
+ gridRef,
+ gridStyle: gridTemplateColumns ? { gridTemplateColumns } : undefined,
+ navigatorOpen,
+ showNavigatorHandle: measured && navigatorOpen,
+ showCompanionHandle: measured && companionOpen,
+ companionFocus,
+ toggleFocus,
+ exitFocus,
+ resizeNavigator,
+ resizeCompanion,
+ }
+}
diff --git a/web/locales/de/app.json b/web/locales/de/app.json
index f694035cb..3bfc84706 100644
--- a/web/locales/de/app.json
+++ b/web/locales/de/app.json
@@ -5332,6 +5332,9 @@
"Qwen-Audio TTS requires a Beijing API key. You can set a Beijing workspace URL in the provider connection; the speech endpoint is selected automatically.": "Qwen-Audio TTS erfordert einen API-Schlüssel für Peking. In der Anbieterverbindung kannst du eine Arbeitsbereichs-URL für Peking angeben; der Sprachendpunkt wird automatisch gewählt.",
"Speech was generated, but the audio download failed. Try again or check the network connection.": "Die Sprache wurde erzeugt, aber der Audiodownload ist fehlgeschlagen. Versuche es erneut oder prüfe die Netzwerkverbindung.",
"Request timeout (seconds)": "Zeitlimit für Anfragen (Sekunden)",
+ "Focus reading companion": "Lesebegleiter fokussieren",
+ "Resize contents navigator": "Breite des Inhaltsverzeichnisses ändern",
+ "Exit companion focus": "Fokusmodus des Begleiters beenden",
"Show API token": "API-Token anzeigen",
"Hide API token": "API-Token ausblenden",
"Failed to link this follow-up chat to its notebook entry.": "Dieser Folgechat konnte nicht mit seinem Notizbucheintrag verknüpft werden."
diff --git a/web/locales/en/app.json b/web/locales/en/app.json
index f756131fa..291a2ae07 100644
--- a/web/locales/en/app.json
+++ b/web/locales/en/app.json
@@ -3147,6 +3147,9 @@
"Reading conversations": "Reading conversations",
"Jump to a question": "Jump to a question",
"Resize reading companion": "Resize reading companion",
+ "Focus reading companion": "Focus reading companion",
+ "Resize contents navigator": "Resize contents navigator",
+ "Exit companion focus": "Exit companion focus",
"Delete “{{title}}”? The transcript cannot be recovered.": "Delete “{{title}}”? The transcript cannot be recovered.",
"New reading conversation": "New reading conversation",
"Reading conversation": "Reading conversation",
diff --git a/web/locales/fr/app.json b/web/locales/fr/app.json
index adcf607be..10f3d80ac 100644
--- a/web/locales/fr/app.json
+++ b/web/locales/fr/app.json
@@ -5775,6 +5775,9 @@
"Qwen3 TTS uses voices such as Cherry and outputs WAV audio. Match the API key region to the provider URL.": "Qwen3 TTS utilise des voix comme Cherry et produit un audio WAV. Faites correspondre la région de la clé API à l’URL du fournisseur.",
"Qwen-Audio TTS requires a Beijing API key. You can set a Beijing workspace URL in the provider connection; the speech endpoint is selected automatically.": "Qwen-Audio TTS nécessite une clé API pour la région de Pékin. Vous pouvez définir une URL d’espace de travail de Pékin dans la connexion au fournisseur ; le point de terminaison vocal est sélectionné automatiquement.",
"Fetching the model list does not test speech synthesis. Use Preview voice to test this model and voice.": "Récupérer la liste des modèles ne teste pas la synthèse vocale. Utilisez l’aperçu vocal pour tester ce modèle et cette voix.",
+ "Focus reading companion": "Se concentrer sur le compagnon de lecture",
+ "Resize contents navigator": "Redimensionner la table des matières",
+ "Exit companion focus": "Quitter le mode concentration du compagnon",
"Show API token": "Afficher le jeton API",
"Hide API token": "Masquer le jeton API",
"Failed to link this follow-up chat to its notebook entry.": "Impossible de lier cette conversation de suivi à son entrée dans le carnet."
diff --git a/web/locales/pl/app.json b/web/locales/pl/app.json
index 5d9d6b3a2..ca6bc5910 100644
--- a/web/locales/pl/app.json
+++ b/web/locales/pl/app.json
@@ -5348,6 +5348,9 @@
"Qwen3 TTS uses voices such as Cherry and outputs WAV audio. Match the API key region to the provider URL.": "Qwen3 TTS używa głosów takich jak Cherry i generuje audio WAV. Dopasuj region klucza API do adresu URL dostawcy.",
"Qwen-Audio TTS requires a Beijing API key. You can set a Beijing workspace URL in the provider connection; the speech endpoint is selected automatically.": "Qwen-Audio TTS wymaga klucza API z regionu Pekin. W połączeniu z dostawcą możesz ustawić adres URL przestrzeni roboczej z regionu Pekin; punkt końcowy mowy zostanie wybrany automatycznie.",
"Fetching the model list does not test speech synthesis. Use Preview voice to test this model and voice.": "Pobranie listy modeli nie sprawdza syntezy mowy. Użyj podglądu głosu, aby przetestować model i głos.",
+ "Focus reading companion": "Skup się na asystencie czytania",
+ "Resize contents navigator": "Zmień szerokość spisu treści",
+ "Exit companion focus": "Wyłącz tryb skupienia na asystencie",
"Show API token": "Pokaż token API",
"Hide API token": "Ukryj token API",
"Failed to link this follow-up chat to its notebook entry.": "Nie udało się powiązać tej rozmowy uzupełniającej z wpisem w notatniku."
diff --git a/web/locales/uk/app.json b/web/locales/uk/app.json
index 5619c8038..243fc1050 100644
--- a/web/locales/uk/app.json
+++ b/web/locales/uk/app.json
@@ -5348,6 +5348,9 @@
"Qwen3 TTS uses voices such as Cherry and outputs WAV audio. Match the API key region to the provider URL.": "Qwen3 TTS використовує голоси на кшталт Cherry та створює аудіо WAV. Регіон ключа API має відповідати URL провайдера.",
"Qwen-Audio TTS requires a Beijing API key. You can set a Beijing workspace URL in the provider connection; the speech endpoint is selected automatically.": "Qwen-Audio TTS потребує ключа API для регіону Пекін. У підключенні провайдера можна задати URL робочого простору для регіону Пекін; кінцева точка мовлення вибирається автоматично.",
"Fetching the model list does not test speech synthesis. Use Preview voice to test this model and voice.": "Отримання списку моделей не перевіряє синтез мовлення. Скористайтеся попереднім прослуховуванням голосу, щоб перевірити модель і голос.",
+ "Focus reading companion": "Зосередитися на помічнику з читання",
+ "Resize contents navigator": "Змінити ширину змісту",
+ "Exit companion focus": "Вийти з режиму зосередження на помічнику",
"Show API token": "Показати токен API",
"Hide API token": "Приховати токен API",
"Failed to link this follow-up chat to its notebook entry.": "Не вдалося пов’язати цей додатковий чат із відповідним записом у нотатнику."
diff --git a/web/locales/zh/app.json b/web/locales/zh/app.json
index df2bc4b3e..bec0c6539 100644
--- a/web/locales/zh/app.json
+++ b/web/locales/zh/app.json
@@ -3147,6 +3147,9 @@
"Reading conversations": "阅读对话",
"Jump to a question": "跳到某个提问",
"Resize reading companion": "调整阅读伙伴宽度",
+ "Focus reading companion": "对话专注模式",
+ "Resize contents navigator": "调整目录宽度",
+ "Exit companion focus": "退出专注模式",
"Delete “{{title}}”? The transcript cannot be recovered.": "删除「{{title}}」?对话记录将无法恢复。",
"New reading conversation": "新建阅读对话",
"Reading conversation": "阅读对话",
diff --git a/web/tests/reading-panel-layout.spec.tsx b/web/tests/reading-panel-layout.spec.tsx
new file mode 100644
index 000000000..1e20015f6
--- /dev/null
+++ b/web/tests/reading-panel-layout.spec.tsx
@@ -0,0 +1,190 @@
+import React, { useState } from 'react'
+import { act, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { ReadingPanelSeparator } from '@/components/reading/workspace/ReadingPanelSeparator'
+import {
+ readingPanelBounds,
+ useReadingPanelLayout,
+} from '@/components/reading/workspace/useReadingPanelLayout'
+
+let frame = 1200
+let observers: { resize: () => void; disconnect: ReturnType<typeof vi.fn> }[] = []
+
+function Harness({
+ loading = false,
+ navigatorOpen = true,
+}: {
+ loading?: boolean
+ navigatorOpen?: boolean
+}) {
+ const { gridRef, ...panels } = useReadingPanelLayout({ enabled: true, navigatorOpen, companionOpen: true })
+ if (loading) return <div>Loading</div>
+ return (
+ <div ref={gridRef} style={panels.gridStyle} data-testid="grid">
+ <output data-testid="navigator">{String(panels.navigatorOpen)}</output>
+ <button onClick={panels.toggleFocus}>Focus</button>
+ {panels.showNavigatorHandle && (
+ <ReadingPanelSeparator
+ label="Navigator"
+ width={panels.navigatorWidth}
+ min={panels.navigatorMin}
+ max={panels.navigatorMax}
+ direction={1}
+ onResize={panels.resizeNavigator}
+ />
+ )}
+ {panels.showCompanionHandle && (
+ <ReadingPanelSeparator
+ label="Companion"
+ width={panels.companionWidth}
+ min={panels.companionMin}
+ max={panels.companionMax}
+ direction={-1}
+ onResize={panels.resizeCompanion}
+ />
+ )}
+ </div>
+ )
+}
+
+beforeEach(() => {
+ frame = 1200
+ observers = []
+ vi.spyOn(HTMLElement.prototype, 'clientWidth', 'get').mockImplementation(() => frame)
+ vi.stubGlobal(
+ 'ResizeObserver',
+ class {
+ disconnect = vi.fn()
+ constructor(resize: () => void) {
+ observers.push({ resize, disconnect: this.disconnect })
+ }
+ observe() {}
+ }
+ )
+ vi.stubGlobal(
+ 'PointerEvent',
+ class extends MouseEvent {
+ pointerId: number
+ constructor(type: string, options: PointerEventInit) {
+ super(type, options)
+ this.pointerId = options.pointerId ?? 1
+ }
+ }
+ )
+ Object.defineProperties(HTMLElement.prototype, {
+ setPointerCapture: { configurable: true, value: vi.fn() },
+ hasPointerCapture: { configurable: true, value: vi.fn(() => true) },
+ releasePointerCapture: { configurable: true, value: vi.fn() },
+ })
+})
+afterEach(() => vi.unstubAllGlobals())
+
+function measure() {
+ act(() => observers.at(-1)?.resize())
+}
+
+describe('reading panel layout', () => {
+ it('observes a grid appearing after loading and disconnects on removal', () => {
+ const view = render(<Harness loading />)
+ expect(observers).toHaveLength(0)
+ view.rerender(<Harness />)
+ expect(observers).toHaveLength(1)
+ measure()
+ expect(screen.getByRole('separator', { name: 'Companion' })).toHaveAttribute(
+ 'aria-valuenow',
+ '380'
+ )
+ frame = 900
+ measure()
+ expect(screen.getByRole('separator', { name: 'Companion' })).toHaveAttribute(
+ 'aria-valuenow',
+ '320'
+ )
+ view.rerender(<Harness loading />)
+ expect(observers[0].disconnect).toHaveBeenCalledOnce()
+ })
+
+ it.each([500, 700, 854, 900, 1600])('fits both panels inside a %ipx container', width => {
+ const bounds = readingPanelBounds(width, true, true, 400, 2200)
+ const reader = width - bounds.navigatorWidth - bounds.companionWidth - 10
+ expect(reader).toBeGreaterThanOrEqual(Math.min(360, width / 2))
+ expect(bounds.navigatorWidth).toBeLessThanOrEqual(bounds.navigatorMax)
+ expect(bounds.companionWidth).toBeLessThanOrEqual(bounds.companionMax)
+ if (width >= 854) {
+ expect(bounds.navigatorWidth).toBeGreaterThanOrEqual(184)
+ expect(bounds.companionWidth).toBeGreaterThanOrEqual(300)
+ }
+ })
+
+ it.each([true, false])(
+ 'restores widths and the previous navigator state (%s) after focus',
+ navigatorOpen => {
+ localStorage.setItem('dt.reader.companionWidth', '420')
+ render(<Harness navigatorOpen={navigatorOpen} />)
+ measure()
+ fireEvent.click(screen.getByRole('button', { name: 'Focus' }))
+ expect(screen.getByTestId('navigator')).toHaveTextContent('false')
+ const handle = screen.getByRole('separator', { name: 'Companion' })
+ expect(handle).toHaveAttribute('aria-valuenow', '600')
+ fireEvent.keyDown(handle, { key: 'ArrowLeft' })
+ expect(handle).toHaveAttribute('aria-valuenow', '610')
+ expect(localStorage.getItem('dt.reader.companionWidth')).toBe('420')
+ fireEvent.click(screen.getByRole('button', { name: 'Focus' }))
+ expect(screen.getByTestId('navigator')).toHaveTextContent(String(navigatorOpen))
+ expect(handle).toHaveAttribute('aria-valuenow', '420')
+ }
+ )
+
+ it('supports keyboard limits and coordinates both separator widths', () => {
+ render(<Harness />)
+ measure()
+ const nav = screen.getByRole('separator', { name: 'Navigator' })
+ const companion = screen.getByRole('separator', { name: 'Companion' })
+ fireEvent.keyDown(companion, { key: 'End' })
+ expect(companion).toHaveAttribute('aria-valuenow', '620')
+ fireEvent.keyDown(nav, { key: 'End' })
+ expect(nav).toHaveAttribute('aria-valuenow', '210')
+ fireEvent.keyDown(companion, { key: 'Home' })
+ fireEvent.keyDown(nav, { key: 'End' })
+ expect(nav).toHaveAttribute('aria-valuenow', '400')
+ expect(companion).toHaveAttribute('aria-valuenow', '300')
+ expect(nav).toHaveAttribute('tabindex', '0')
+ })
+
+ it('ends a captured drag on cancel and restores body styles on unmount', () => {
+ function Resizable() {
+ const [width, resize] = useState(300)
+ return (
+ <ReadingPanelSeparator
+ label="Resize"
+ width={width}
+ min={100}
+ max={600}
+ direction={1}
+ onResize={resize}
+ />
+ )
+ }
+ document.body.style.cursor = 'crosshair'
+ document.body.style.userSelect = 'text'
+ const view = render(<Resizable />)
+ const handle = screen.getByRole('separator')
+ fireEvent.pointerDown(handle, { button: 0, pointerId: 7, clientX: 200 })
+ fireEvent.pointerMove(handle, { pointerId: 8, clientX: 250 })
+ expect(handle).toHaveAttribute('aria-valuenow', '300')
+ fireEvent.pointerMove(handle, { pointerId: 7, clientX: 250 })
+ expect(handle).toHaveAttribute('aria-valuenow', '350')
+ fireEvent.pointerCancel(handle, { pointerId: 7 })
+ fireEvent.pointerMove(handle, { pointerId: 7, clientX: 400 })
+ expect(handle).toHaveAttribute('aria-valuenow', '350')
+ expect(document.body.style.cursor).toBe('crosshair')
+ expect(handle.releasePointerCapture).toHaveBeenCalledWith(7)
+ fireEvent.pointerDown(handle, { button: 0, pointerId: 9, clientX: 200 })
+ expect(document.body.style.cursor).toBe('col-resize')
+ view.unmount()
+ expect(document.body.style.cursor).toBe('crosshair')
+ expect(document.body.style.userSelect).toBe('text')
+ document.body.style.cursor = ''
+ document.body.style.userSelect = ''
+ })
+})