diff --git a/public/options.html b/public/options.html index 966fe28..b243202 100644 --- a/public/options.html +++ b/public/options.html @@ -910,6 +910,33 @@

ChatScribe Settings

Keep the latest-answer and message-selection options visible whenever ChatScribe opens.

+ +

+ Messages always stay in conversation order (oldest to newest). This setting only controls where the selector opens. +

diff --git a/src/locales/de.json b/src/locales/de.json index 02dfaea..7b0ab58 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -66,6 +66,10 @@ "options.title": "ChatScribe-Einstellungen", "options.subtitle": "Passen Sie Darstellung und Exportverhalten von ChatScribe an.", "options.preferences.legend": "Einstellungen", + "options.selectorOrder.label": "Startposition der Nachrichtenauswahl", + "options.selectorOrder.newestFirst": "Neueste Nachrichten (unten öffnen)", + "options.selectorOrder.oldestFirst": "Älteste Nachrichten (oben öffnen)", + "options.selectorOrder.hint": "Nachrichten bleiben immer in Gesprächsreihenfolge (älteste zuerst). Diese Einstellung legt nur fest, ob die Auswahl oben oder unten geöffnet wird.", "options.formatting.legend": "Nachrichtenformat", "options.headings.legend": "Nachrichtenüberschriften", "options.headings.transcript": "Gesprächsprotokoll mit Rollenlabels (empfohlen)", diff --git a/src/locales/en.json b/src/locales/en.json index 4461713..861e9b6 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -66,6 +66,10 @@ "options.title": "ChatScribe Settings", "options.subtitle": "Customize ChatScribe's appearance and export behavior.", "options.preferences.legend": "Preferences", + "options.selectorOrder.label": "Message selector opening position", + "options.selectorOrder.newestFirst": "Newest messages (open at bottom)", + "options.selectorOrder.oldestFirst": "Oldest messages (open at top)", + "options.selectorOrder.hint": "Messages always stay in conversation order (oldest to newest). This setting only controls where the selector opens.", "options.formatting.legend": "Message formatting", "options.headings.legend": "Message Headings", "options.headings.transcript": "Conversation transcript with speaker labels (recommended)", diff --git a/src/locales/es.json b/src/locales/es.json index 39d7d71..8602292 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -66,6 +66,10 @@ "options.title": "Configuración de ChatScribe", "options.subtitle": "Personaliza la apariencia y el comportamiento de exportación de ChatScribe.", "options.preferences.legend": "Preferencias", + "options.selectorOrder.label": "Posición inicial del selector de mensajes", + "options.selectorOrder.newestFirst": "Mensajes más recientes (abrir abajo)", + "options.selectorOrder.oldestFirst": "Mensajes más antiguos (abrir arriba)", + "options.selectorOrder.hint": "Los mensajes siempre mantienen el orden de la conversación (del más antiguo al más reciente). Esta opción solo controla dónde se abre el selector.", "options.formatting.legend": "Formato de mensajes", "options.headings.legend": "Encabezados de mensajes", "options.headings.transcript": "Transcripción con etiquetas de interlocutor (recomendada)", diff --git a/src/locales/fr.json b/src/locales/fr.json index e389d6f..f0150ab 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -66,6 +66,10 @@ "options.title": "Paramètres de ChatScribe", "options.subtitle": "Personnalisez l’apparence et le comportement d’exportation de ChatScribe.", "options.preferences.legend": "Préférences", + "options.selectorOrder.label": "Position d’ouverture du sélecteur de messages", + "options.selectorOrder.newestFirst": "Messages les plus récents (ouvrir en bas)", + "options.selectorOrder.oldestFirst": "Messages les plus anciens (ouvrir en haut)", + "options.selectorOrder.hint": "Les messages restent toujours dans l’ordre de la conversation (du plus ancien au plus récent). Ce réglage détermine uniquement où le sélecteur s’ouvre.", "options.formatting.legend": "Format des messages", "options.headings.legend": "En-têtes des messages", "options.headings.transcript": "Transcription avec les rôles (recommandée)", diff --git a/src/locales/ja.json b/src/locales/ja.json index a1914ec..51d0efd 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -66,6 +66,10 @@ "options.title": "ChatScribe の設定", "options.subtitle": "ChatScribe の表示とエクスポートの動作をカスタマイズします。", "options.preferences.legend": "設定", + "options.selectorOrder.label": "メッセージ選択画面の開始位置", + "options.selectorOrder.newestFirst": "最新のメッセージ(下部から表示)", + "options.selectorOrder.oldestFirst": "古いメッセージ(上部から表示)", + "options.selectorOrder.hint": "メッセージは常に古い順から新しい順に並びます。この設定では選択画面を上部と下部のどちらから開くかだけを指定します。", "options.formatting.legend": "メッセージの書式", "options.headings.legend": "メッセージの見出し", "options.headings.transcript": "話者ラベル付きの会話記録(推奨)", diff --git a/src/locales/ko.json b/src/locales/ko.json index e572c3a..7c80a2a 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -66,6 +66,10 @@ "options.title": "ChatScribe 설정", "options.subtitle": "ChatScribe의 모양과 내보내기 동작을 설정합니다.", "options.preferences.legend": "환경설정", + "options.selectorOrder.label": "메시지 선택 창 시작 위치", + "options.selectorOrder.newestFirst": "최신 메시지 (아래에서 열기)", + "options.selectorOrder.oldestFirst": "오래된 메시지 (위에서 열기)", + "options.selectorOrder.hint": "메시지는 항상 대화 순서(오래된 메시지부터 최신 메시지까지)로 표시됩니다. 이 설정은 선택 창이 위쪽과 아래쪽 중 어디에서 열릴지만 정합니다.", "options.formatting.legend": "메시지 서식", "options.headings.legend": "메시지 제목", "options.headings.transcript": "화자 레이블이 있는 대화 기록 (권장)", diff --git a/src/locales/pt-BR.json b/src/locales/pt-BR.json index ba5f88c..80baa16 100644 --- a/src/locales/pt-BR.json +++ b/src/locales/pt-BR.json @@ -66,6 +66,10 @@ "options.title": "Configurações do ChatScribe", "options.subtitle": "Personalize a aparência e o comportamento de exportação do ChatScribe.", "options.preferences.legend": "Preferências", + "options.selectorOrder.label": "Posição inicial do seletor de mensagens", + "options.selectorOrder.newestFirst": "Mensagens mais recentes (abrir embaixo)", + "options.selectorOrder.oldestFirst": "Mensagens mais antigas (abrir em cima)", + "options.selectorOrder.hint": "As mensagens permanecem na ordem da conversa (da mais antiga à mais recente). Esta configuração só controla onde o seletor é aberto.", "options.formatting.legend": "Formatação das mensagens", "options.headings.legend": "Títulos das mensagens", "options.headings.transcript": "Transcrição com identificação dos participantes (recomendada)", diff --git a/src/locales/ru.json b/src/locales/ru.json index d655c87..25e14ea 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -66,6 +66,10 @@ "options.title": "Настройки ChatScribe", "options.subtitle": "Настройте внешний вид ChatScribe и параметры экспорта.", "options.preferences.legend": "Настройки", + "options.selectorOrder.label": "Начальная позиция списка сообщений", + "options.selectorOrder.newestFirst": "Сначала новые (открывать внизу)", + "options.selectorOrder.oldestFirst": "Сначала старые (открывать вверху)", + "options.selectorOrder.hint": "Сообщения всегда идут в порядке беседы (от старых к новым). Эта настройка определяет только начальную позицию списка.", "options.formatting.legend": "Формат сообщений", "options.headings.legend": "Заголовки сообщений", "options.headings.transcript": "Запись беседы с метками собеседников (рекомендуется)", diff --git a/src/locales/zh-TW.json b/src/locales/zh-TW.json index 41f2ed3..57ca0ce 100644 --- a/src/locales/zh-TW.json +++ b/src/locales/zh-TW.json @@ -66,6 +66,10 @@ "options.title": "ChatScribe 設定", "options.subtitle": "自訂 ChatScribe 的外觀與匯出行為。", "options.preferences.legend": "偏好設定", + "options.selectorOrder.label": "訊息選擇視窗的開啟位置", + "options.selectorOrder.newestFirst": "最新訊息(開啟時捲至底部)", + "options.selectorOrder.oldestFirst": "最早訊息(開啟時捲至頂部)", + "options.selectorOrder.hint": "訊息一律依對話順序由早到晚排列;此設定只決定選擇視窗開啟時捲至頂部或底部。", "options.formatting.legend": "訊息格式", "options.headings.legend": "訊息標題", "options.headings.transcript": "含角色標籤的對話稿(建議)", diff --git a/src/locales/zh.json b/src/locales/zh.json index cd8b70e..264382f 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -66,6 +66,10 @@ "options.title": "ChatScribe 设置", "options.subtitle": "自定义 ChatScribe 的显示方式和导出行为。", "options.preferences.legend": "偏好设置", + "options.selectorOrder.label": "选择消息窗口的打开位置", + "options.selectorOrder.newestFirst": "最新消息(打开时滚到底部)", + "options.selectorOrder.oldestFirst": "最早消息(打开时滚到顶部)", + "options.selectorOrder.hint": "消息始终按对话顺序从早到晚排列;此设置只决定选择窗口打开时滚到顶部还是底部。", "options.formatting.legend": "消息格式", "options.headings.legend": "消息标题", "options.headings.transcript": "对话稿(显示角色标签,推荐)", diff --git a/src/options.ts b/src/options.ts index 700660b..4f333d6 100644 --- a/src/options.ts +++ b/src/options.ts @@ -66,6 +66,7 @@ const downloadImagesInput = $id("downloadImages"); const includeGeneratedImagesInput = $id("includeGeneratedImages"); const includeTimestampInput = $id("includeTimestamp"); const keepCopyOptionsOpenInput = $id("keepCopyOptionsOpen"); +const selectorOrderSelect = $id("selectorOrder"); const themeSelect = $id("theme-select"); const panelModeSelect = $id("panelMode"); const languageSelect = $id("language-select"); @@ -82,6 +83,15 @@ const FILENAME_PRESETS: Record = { // Save UI const saveBtn = $id("save-btn"); const savedLabel = $id("saved-label"); +let savedLabelTimer: number | undefined; + +function showSavedLabel(): void { + savedLabel.classList.add("visible"); + window.clearTimeout(savedLabelTimer); + savedLabelTimer = window.setTimeout(() => { + savedLabel.classList.remove("visible"); + }, 1800); +} // GitHub UI const githubStatus = $id("github-status"); @@ -138,6 +148,7 @@ function populateForm(settings: Settings): void { includeGeneratedImagesInput.checked = settings.includeGeneratedImages; includeTimestampInput.checked = settings.includeTimestamp; keepCopyOptionsOpenInput.checked = settings.keepCopyOptionsOpen; + selectorOrderSelect.value = settings.selectorOrder; themeSelect.value = settings.theme; panelModeSelect.value = settings.panelMode; @@ -169,6 +180,7 @@ function gatherSettings(): Settings { includeGeneratedImages: includeGeneratedImagesInput.checked, includeTimestamp: includeTimestampInput.checked, keepCopyOptionsOpen: keepCopyOptionsOpenInput.checked, + selectorOrder: selectorOrderSelect.value as Settings["selectorOrder"], theme: themeSelect.value as Settings["theme"], panelMode: panelModeSelect.value as Settings["panelMode"], language: languageSelect.value as Settings["language"], @@ -356,6 +368,13 @@ languageSelect.addEventListener("change", () => { void refreshGitHubStatus(); }); +selectorOrderSelect.addEventListener("change", async () => { + await chrome.storage.sync.set({ + selectorOrder: selectorOrderSelect.value as Settings["selectorOrder"], + }); + showSavedLabel(); +}); + promptToSaveInput.addEventListener("change", () => { updateDownloadLocationControls(); updateExportPreview(); @@ -390,10 +409,7 @@ saveBtn.addEventListener("click", async () => { const current = gatherSettings(); await saveSettings(current); - savedLabel.classList.add("visible"); - setTimeout(() => { - savedLabel.classList.remove("visible"); - }, 1800); + showSavedLabel(); }); downloadsSettingsLink.addEventListener("click", (e) => { diff --git a/src/popup.ts b/src/popup.ts index d76455d..d39e149 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -26,6 +26,7 @@ import { } from "./formatter.ts"; import { buildZipBlob, blobToBase64 } from "./zip.ts"; import { selectHydratedExport } from "./export-selection.ts"; +import { getInitialSelectorScrollPosition } from "./selector-scroll.ts"; import { CONTENT_LOAD_TYPE } from "./content-protocol.ts"; import type { ConversationData, @@ -571,13 +572,23 @@ document.addEventListener("keydown", (event) => { }); chrome.storage.onChanged.addListener((changes, areaName) => { - if (areaName !== "sync" || !changes.keepCopyOptionsOpen || !settings) return; - const wasExpanded = !copyOptions.hidden; - settings = { - ...settings, - keepCopyOptionsOpen: changes.keepCopyOptionsOpen.newValue === true, - }; - setCopyOptionsExpanded(wasExpanded); + if (areaName !== "sync" || !settings) return; + if (changes.keepCopyOptionsOpen) { + const wasExpanded = !copyOptions.hidden; + settings = { + ...settings, + keepCopyOptionsOpen: changes.keepCopyOptionsOpen.newValue === true, + }; + setCopyOptionsExpanded(wasExpanded); + } + if (changes.selectorOrder) { + settings = { + ...settings, + selectorOrder: changes.selectorOrder.newValue === "oldest-first" + ? "oldest-first" + : "newest-first", + }; + } }); // ----------------------------------------------------------------------- @@ -648,14 +659,23 @@ function openSelector( ): void { if (!conversationData) return; closeCopyOptions(); + const scrollPosition = getInitialSelectorScrollPosition( + settings?.selectorOrder ?? "newest-first", + ); populateSelector(conversationData.messages, selectAll, selectedIds); document.body.classList.add("overlay-open"); selectorOverlay.classList.add("open"); updateSelectorCount(); - const firstCheckbox = selList.querySelector( - "input[type='checkbox']", - ); - (firstCheckbox ?? selCancelBtn).focus(); + selList.scrollTop = scrollPosition === "bottom" ? selList.scrollHeight : 0; + const checkboxes = getCheckboxes(); + const focusCheckbox = scrollPosition === "bottom" + ? checkboxes.at(-1) + : checkboxes[0]; + if (focusCheckbox) { + focusCheckbox.focus({ preventScroll: true }); + } else { + selCancelBtn.focus(); + } } function closeSelector(): void { diff --git a/src/selector-scroll.ts b/src/selector-scroll.ts new file mode 100644 index 0000000..f5de394 --- /dev/null +++ b/src/selector-scroll.ts @@ -0,0 +1,9 @@ +import type { SelectorOrder } from "./types.ts"; + +export type SelectorScrollPosition = "top" | "bottom"; + +export function getInitialSelectorScrollPosition( + order: SelectorOrder, +): SelectorScrollPosition { + return order === "newest-first" ? "bottom" : "top"; +} diff --git a/src/settings.ts b/src/settings.ts index 8a16d99..d79caa7 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -22,6 +22,10 @@ function isPanelMode(value: unknown): value is Settings["panelMode"] { return value === "popup" || value === "sidebar"; } +function isSelectorOrder(value: unknown): value is Settings["selectorOrder"] { + return value === "newest-first" || value === "oldest-first"; +} + export async function loadSettings(): Promise { const defaults = await chrome.storage.sync.get( DEFAULT_SETTINGS as unknown as Record, @@ -71,6 +75,9 @@ export async function loadSettings(): Promise { keepCopyOptionsOpen: typeof stored.keepCopyOptionsOpen === "boolean" ? stored.keepCopyOptionsOpen : defaults.keepCopyOptionsOpen as boolean, + selectorOrder: isSelectorOrder(stored.selectorOrder) + ? stored.selectorOrder + : DEFAULT_SETTINGS.selectorOrder, panelMode: isPanelMode(stored.panelMode) ? stored.panelMode : defaults.panelMode as Settings["panelMode"], diff --git a/src/types.ts b/src/types.ts index 4c429de..e4fb11e 100644 --- a/src/types.ts +++ b/src/types.ts @@ -190,6 +190,7 @@ export type HeadingStyle = "transcript" | "bold" | "none"; export type SeparatorStyle = "single" | "double" | "rule"; export type ThemeStyle = "system" | "light" | "dark"; export type PanelMode = "popup" | "sidebar"; +export type SelectorOrder = "newest-first" | "oldest-first"; export type LanguageCode = | "auto" | "en" @@ -213,6 +214,7 @@ export interface Settings { downloadImages: boolean; includeGeneratedImages: boolean; keepCopyOptionsOpen: boolean; + selectorOrder: SelectorOrder; theme: ThemeStyle; panelMode: PanelMode; language: LanguageCode; @@ -228,6 +230,7 @@ export const DEFAULT_SETTINGS: Settings = { downloadImages: false, includeGeneratedImages: true, keepCopyOptionsOpen: false, + selectorOrder: "newest-first", theme: "system", panelMode: "popup", language: "auto", diff --git a/tests/selector-scroll.test.ts b/tests/selector-scroll.test.ts new file mode 100644 index 0000000..c18caca --- /dev/null +++ b/tests/selector-scroll.test.ts @@ -0,0 +1,12 @@ +import { describe, expect, it } from "vitest"; +import { getInitialSelectorScrollPosition } from "../src/selector-scroll.ts"; + +describe("getInitialSelectorScrollPosition", () => { + it("opens at the bottom when newest messages are selected", () => { + expect(getInitialSelectorScrollPosition("newest-first")).toBe("bottom"); + }); + + it("opens at the top when oldest messages are selected", () => { + expect(getInitialSelectorScrollPosition("oldest-first")).toBe("top"); + }); +}); diff --git a/tests/settings.test.ts b/tests/settings.test.ts new file mode 100644 index 0000000..980667a --- /dev/null +++ b/tests/settings.test.ts @@ -0,0 +1,40 @@ +import { afterEach, describe, expect, it, vi } from "vitest"; +import { loadSettings } from "../src/settings.ts"; + +function stubStoredSettings(stored: Record): void { + vi.stubGlobal("chrome", { + storage: { + sync: { + get: vi.fn(async (defaults: Record | null) => + defaults === null ? stored : { ...defaults, ...stored } + ), + }, + }, + }); +} + +afterEach(() => { + vi.unstubAllGlobals(); +}); + +describe("message selector order setting", () => { + it("defaults to newest-first for installs without a saved preference", async () => { + stubStoredSettings({}); + + const settings = await loadSettings(); + + expect(settings.selectorOrder).toBe("newest-first"); + }); + + it("keeps a valid saved order and defaults invalid values to newest-first", async () => { + stubStoredSettings({ selectorOrder: "oldest-first" }); + await expect(loadSettings()).resolves.toMatchObject({ + selectorOrder: "oldest-first", + }); + + stubStoredSettings({ selectorOrder: "invalid" }); + await expect(loadSettings()).resolves.toMatchObject({ + selectorOrder: "newest-first", + }); + }); +});