This commit is contained in:
2026-02-17 22:50:57 -08:00
parent ffeef9c136
commit f20d019c11
315 changed files with 9876 additions and 12537 deletions

View File

@@ -2,75 +2,64 @@ import type {
KikuDuplicateCardInfo,
KikuFieldGroupingChoice,
KikuMergePreviewResponse,
} from "../../types";
import type { ModalStateReader, RendererContext } from "../context";
} from '../../types';
import type { ModalStateReader, RendererContext } from '../context';
export function createKikuModal(
ctx: RendererContext,
options: {
modalStateReader: Pick<ModalStateReader, "isAnyModalOpen">;
modalStateReader: Pick<ModalStateReader, 'isAnyModalOpen'>;
syncSettingsModalSubtitleSuppression: () => void;
},
) {
function formatMediaMeta(card: KikuDuplicateCardInfo): string {
const parts: string[] = [];
parts.push(card.hasAudio ? "Audio: Yes" : "Audio: No");
parts.push(card.hasImage ? "Image: Yes" : "Image: No");
return parts.join(" | ");
parts.push(card.hasAudio ? 'Audio: Yes' : 'Audio: No');
parts.push(card.hasImage ? 'Image: Yes' : 'Image: No');
return parts.join(' | ');
}
function updateKikuCardSelection(): void {
ctx.dom.kikuCard1.classList.toggle(
"active",
ctx.state.kikuSelectedCard === 1,
);
ctx.dom.kikuCard2.classList.toggle(
"active",
ctx.state.kikuSelectedCard === 2,
);
ctx.dom.kikuCard1.classList.toggle('active', ctx.state.kikuSelectedCard === 1);
ctx.dom.kikuCard2.classList.toggle('active', ctx.state.kikuSelectedCard === 2);
}
function setKikuModalStep(step: "select" | "preview"): void {
function setKikuModalStep(step: 'select' | 'preview'): void {
ctx.state.kikuModalStep = step;
const isSelect = step === "select";
ctx.dom.kikuSelectionStep.classList.toggle("hidden", !isSelect);
ctx.dom.kikuPreviewStep.classList.toggle("hidden", isSelect);
const isSelect = step === 'select';
ctx.dom.kikuSelectionStep.classList.toggle('hidden', !isSelect);
ctx.dom.kikuPreviewStep.classList.toggle('hidden', isSelect);
ctx.dom.kikuHint.textContent = isSelect
? "Press 1 or 2 to select · Enter to continue · Esc to cancel"
: "Enter to confirm merge · Backspace to go back · Esc to cancel";
? 'Press 1 or 2 to select · Enter to continue · Esc to cancel'
: 'Enter to confirm merge · Backspace to go back · Esc to cancel';
}
function updateKikuPreviewToggle(): void {
ctx.dom.kikuPreviewCompactButton.classList.toggle(
"active",
ctx.state.kikuPreviewMode === "compact",
);
ctx.dom.kikuPreviewFullButton.classList.toggle(
"active",
ctx.state.kikuPreviewMode === "full",
'active',
ctx.state.kikuPreviewMode === 'compact',
);
ctx.dom.kikuPreviewFullButton.classList.toggle('active', ctx.state.kikuPreviewMode === 'full');
}
function renderKikuPreview(): void {
const payload =
ctx.state.kikuPreviewMode === "compact"
ctx.state.kikuPreviewMode === 'compact'
? ctx.state.kikuPreviewCompactData
: ctx.state.kikuPreviewFullData;
ctx.dom.kikuPreviewJson.textContent = payload
? JSON.stringify(payload, null, 2)
: "{}";
ctx.dom.kikuPreviewJson.textContent = payload ? JSON.stringify(payload, null, 2) : '{}';
updateKikuPreviewToggle();
}
function setKikuPreviewError(message: string | null): void {
if (!message) {
ctx.dom.kikuPreviewError.textContent = "";
ctx.dom.kikuPreviewError.classList.add("hidden");
ctx.dom.kikuPreviewError.textContent = '';
ctx.dom.kikuPreviewError.classList.add('hidden');
return;
}
ctx.dom.kikuPreviewError.textContent = message;
ctx.dom.kikuPreviewError.classList.remove("hidden");
ctx.dom.kikuPreviewError.classList.remove('hidden');
}
function openKikuFieldGroupingModal(data: {
@@ -86,30 +75,28 @@ export function createKikuModal(
ctx.state.kikuSelectedCard = 1;
ctx.dom.kikuCard1Expression.textContent = data.original.expression;
ctx.dom.kikuCard1Sentence.textContent =
data.original.sentencePreview || "(no sentence)";
ctx.dom.kikuCard1Sentence.textContent = data.original.sentencePreview || '(no sentence)';
ctx.dom.kikuCard1Meta.textContent = formatMediaMeta(data.original);
ctx.dom.kikuCard2Expression.textContent = data.duplicate.expression;
ctx.dom.kikuCard2Sentence.textContent =
data.duplicate.sentencePreview || "(current subtitle)";
ctx.dom.kikuCard2Sentence.textContent = data.duplicate.sentencePreview || '(current subtitle)';
ctx.dom.kikuCard2Meta.textContent = formatMediaMeta(data.duplicate);
ctx.dom.kikuDeleteDuplicateCheckbox.checked = true;
ctx.state.kikuPendingChoice = null;
ctx.state.kikuPreviewCompactData = null;
ctx.state.kikuPreviewFullData = null;
ctx.state.kikuPreviewMode = "compact";
ctx.state.kikuPreviewMode = 'compact';
renderKikuPreview();
setKikuPreviewError(null);
setKikuModalStep("select");
setKikuModalStep('select');
updateKikuCardSelection();
options.syncSettingsModalSubtitleSuppression();
ctx.dom.overlay.classList.add("interactive");
ctx.dom.kikuModal.classList.remove("hidden");
ctx.dom.kikuModal.setAttribute("aria-hidden", "false");
ctx.dom.overlay.classList.add('interactive');
ctx.dom.kikuModal.classList.remove('hidden');
ctx.dom.kikuModal.setAttribute('aria-hidden', 'false');
}
function closeKikuFieldGroupingModal(): void {
@@ -118,25 +105,22 @@ export function createKikuModal(
ctx.state.kikuModalOpen = false;
options.syncSettingsModalSubtitleSuppression();
ctx.dom.kikuModal.classList.add("hidden");
ctx.dom.kikuModal.setAttribute("aria-hidden", "true");
ctx.dom.kikuModal.classList.add('hidden');
ctx.dom.kikuModal.setAttribute('aria-hidden', 'true');
setKikuPreviewError(null);
ctx.dom.kikuPreviewJson.textContent = "";
ctx.dom.kikuPreviewJson.textContent = '';
ctx.state.kikuPendingChoice = null;
ctx.state.kikuPreviewCompactData = null;
ctx.state.kikuPreviewFullData = null;
ctx.state.kikuPreviewMode = "compact";
setKikuModalStep("select");
ctx.state.kikuPreviewMode = 'compact';
setKikuModalStep('select');
ctx.state.kikuOriginalData = null;
ctx.state.kikuDuplicateData = null;
if (
!ctx.state.isOverSubtitle &&
!options.modalStateReader.isAnyModalOpen()
) {
ctx.dom.overlay.classList.remove("interactive");
if (!ctx.state.isOverSubtitle && !options.modalStateReader.isAnyModalOpen()) {
ctx.dom.overlay.classList.remove('interactive');
}
}
@@ -144,13 +128,9 @@ export function createKikuModal(
if (!ctx.state.kikuOriginalData || !ctx.state.kikuDuplicateData) return;
const keepData =
ctx.state.kikuSelectedCard === 1
? ctx.state.kikuOriginalData
: ctx.state.kikuDuplicateData;
ctx.state.kikuSelectedCard === 1 ? ctx.state.kikuOriginalData : ctx.state.kikuDuplicateData;
const deleteData =
ctx.state.kikuSelectedCard === 1
? ctx.state.kikuDuplicateData
: ctx.state.kikuOriginalData;
ctx.state.kikuSelectedCard === 1 ? ctx.state.kikuDuplicateData : ctx.state.kikuOriginalData;
const choice: KikuFieldGroupingChoice = {
keepNoteId: keepData.noteId,
@@ -164,23 +144,22 @@ export function createKikuModal(
ctx.dom.kikuConfirmButton.disabled = true;
try {
const preview: KikuMergePreviewResponse =
await window.electronAPI.kikuBuildMergePreview({
keepNoteId: choice.keepNoteId,
deleteNoteId: choice.deleteNoteId,
deleteDuplicate: choice.deleteDuplicate,
});
const preview: KikuMergePreviewResponse = await window.electronAPI.kikuBuildMergePreview({
keepNoteId: choice.keepNoteId,
deleteNoteId: choice.deleteNoteId,
deleteDuplicate: choice.deleteDuplicate,
});
if (!preview.ok) {
setKikuPreviewError(preview.error || "Failed to build merge preview");
setKikuPreviewError(preview.error || 'Failed to build merge preview');
return;
}
ctx.state.kikuPreviewCompactData = preview.compact || {};
ctx.state.kikuPreviewFullData = preview.full || {};
ctx.state.kikuPreviewMode = "compact";
ctx.state.kikuPreviewMode = 'compact';
renderKikuPreview();
setKikuModalStep("preview");
setKikuModalStep('preview');
} finally {
ctx.dom.kikuConfirmButton.disabled = false;
}
@@ -194,7 +173,7 @@ export function createKikuModal(
function goBackFromKikuPreview(): void {
setKikuPreviewError(null);
setKikuModalStep("select");
setKikuModalStep('select');
}
function cancelKikuFieldGrouping(): void {
@@ -210,18 +189,18 @@ export function createKikuModal(
}
function handleKikuKeydown(e: KeyboardEvent): boolean {
if (ctx.state.kikuModalStep === "preview") {
if (e.key === "Escape") {
if (ctx.state.kikuModalStep === 'preview') {
if (e.key === 'Escape') {
e.preventDefault();
cancelKikuFieldGrouping();
return true;
}
if (e.key === "Backspace") {
if (e.key === 'Backspace') {
e.preventDefault();
goBackFromKikuPreview();
return true;
}
if (e.key === "Enter") {
if (e.key === 'Enter') {
e.preventDefault();
confirmKikuMerge();
return true;
@@ -229,34 +208,34 @@ export function createKikuModal(
return true;
}
if (e.key === "Escape") {
if (e.key === 'Escape') {
e.preventDefault();
cancelKikuFieldGrouping();
return true;
}
if (e.key === "1") {
if (e.key === '1') {
e.preventDefault();
ctx.state.kikuSelectedCard = 1;
updateKikuCardSelection();
return true;
}
if (e.key === "2") {
if (e.key === '2') {
e.preventDefault();
ctx.state.kikuSelectedCard = 2;
updateKikuCardSelection();
return true;
}
if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
if (e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
e.preventDefault();
ctx.state.kikuSelectedCard = ctx.state.kikuSelectedCard === 1 ? 2 : 1;
updateKikuCardSelection();
return true;
}
if (e.key === "Enter") {
if (e.key === 'Enter') {
e.preventDefault();
void confirmKikuSelection();
return true;
@@ -266,46 +245,46 @@ export function createKikuModal(
}
function wireDomEvents(): void {
ctx.dom.kikuCard1.addEventListener("click", () => {
ctx.dom.kikuCard1.addEventListener('click', () => {
ctx.state.kikuSelectedCard = 1;
updateKikuCardSelection();
});
ctx.dom.kikuCard1.addEventListener("dblclick", () => {
ctx.dom.kikuCard1.addEventListener('dblclick', () => {
ctx.state.kikuSelectedCard = 1;
void confirmKikuSelection();
});
ctx.dom.kikuCard2.addEventListener("click", () => {
ctx.dom.kikuCard2.addEventListener('click', () => {
ctx.state.kikuSelectedCard = 2;
updateKikuCardSelection();
});
ctx.dom.kikuCard2.addEventListener("dblclick", () => {
ctx.dom.kikuCard2.addEventListener('dblclick', () => {
ctx.state.kikuSelectedCard = 2;
void confirmKikuSelection();
});
ctx.dom.kikuConfirmButton.addEventListener("click", () => {
ctx.dom.kikuConfirmButton.addEventListener('click', () => {
void confirmKikuSelection();
});
ctx.dom.kikuCancelButton.addEventListener("click", () => {
ctx.dom.kikuCancelButton.addEventListener('click', () => {
cancelKikuFieldGrouping();
});
ctx.dom.kikuBackButton.addEventListener("click", () => {
ctx.dom.kikuBackButton.addEventListener('click', () => {
goBackFromKikuPreview();
});
ctx.dom.kikuFinalConfirmButton.addEventListener("click", () => {
ctx.dom.kikuFinalConfirmButton.addEventListener('click', () => {
confirmKikuMerge();
});
ctx.dom.kikuFinalCancelButton.addEventListener("click", () => {
ctx.dom.kikuFinalCancelButton.addEventListener('click', () => {
cancelKikuFieldGrouping();
});
ctx.dom.kikuPreviewCompactButton.addEventListener("click", () => {
ctx.state.kikuPreviewMode = "compact";
ctx.dom.kikuPreviewCompactButton.addEventListener('click', () => {
ctx.state.kikuPreviewMode = 'compact';
renderKikuPreview();
});
ctx.dom.kikuPreviewFullButton.addEventListener("click", () => {
ctx.state.kikuPreviewMode = "full";
ctx.dom.kikuPreviewFullButton.addEventListener('click', () => {
ctx.state.kikuPreviewMode = 'full';
renderKikuPreview();
});
}