create-pixi-vn 2.0.14 → 2.1.0

package/template-react-vite-muijoy-tauri/package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@base-ui/react": "^1.6.0",
-    "@drincs/pixi-vn": "^1.8.16",
+    "@drincs/pixi-vn": "^1.8.21",
     "@tailwindcss/vite": "^4.3.0",
     "@tanstack/hotkeys": "^0.8.0",
     "@tanstack/react-hotkeys": "^0.10.0",
@@ -50,7 +50,7 @@
     "react-dom": "^19.2.6",
     "react-i18next": "^17.0.8",
     "react-markdown": "^10.1.0",
-    "react-markdown-typewriter": "^1.2.0",
+    "react-markdown-typewriter": "^1.3.4",
     "react-resizable-panels": "^4.11.2",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.1",

package/template-react-vite-muijoy-tauri/src/components/loading.tsx

@@ -1,4 +1,5 @@
 import { Spinner } from "@/components/ui/spinner";
+import { useEffect, useState } from "react";
 
 export function PendingComponent() {
     return (
@@ -12,10 +13,19 @@ export function PendingComponent() {
 
 export function AnimatedDots() {
     return (
-        <span className="flex pointer-events-none select-none">
+        <span className="inline-flex pointer-events-none select-none">
             <span className="animate-bounce [animation-delay:0s]">.</span>
             <span className="animate-bounce [animation-delay:0.2s]">.</span>
             <span className="animate-bounce [animation-delay:0.4s]">.</span>
         </span>
     );
 }
+
+export function DelayedAnimatedDots({ delay = 300 }: { delay?: number }) {
+    const [visible, setVisible] = useState(false);
+    useEffect(() => {
+        const id = setTimeout(() => setVisible(true), delay);
+        return () => clearTimeout(id);
+    }, [delay]);
+    return visible ? <AnimatedDots /> : null;
+}

package/template-react-vite-muijoy-tauri/src/components/menus/choice-menus.tsx

@@ -1,4 +1,5 @@
 import { Button } from "@/components/ui/button";
+import { useChoiceMenuHotkeys } from "@/lib/hooks/hotkeys-hooks";
 import { useNarrationFunctions } from "@/lib/hooks/narration-hooks";
 import { useQueryChoiceMenuOptions } from "@/lib/query/narration-query";
 import { GameStatus } from "@/lib/stores/game-status-store";
@@ -13,9 +14,11 @@ export function ChoiceMenu() {
     const isTyping = useSelector(TextDisplaySettings.store, (state) => state.inProgress);
     const { selectChoice } = useNarrationFunctions();
     const [debouncedMenu] = useDebouncedValue(isTyping ? [] : menu, { wait: 50 });
+    const { menuRef } = useChoiceMenuHotkeys(debouncedMenu.length);
 
     return (
         <div
+            ref={menuRef}
             className="flex flex-col items-center justify-center gap-2 w-full h-full overflow-auto"
             role="menu"
         >
@@ -28,6 +31,7 @@ export function ChoiceMenu() {
                     style={{ animationDelay: `${index * 150}ms` }}
                 >
                     <Button
+                        role="menuitem"
                         disabled={loading}
                         onClick={() => selectChoice(item)}
                         size="sm"

package/template-react-vite-muijoy-tauri/src/components/menus/main-menu.tsx

@@ -27,7 +27,6 @@ const menuButtonClass =
     "justify-start hover:scale-105 focus-visible:scale-105 transition-transform duration-150 ease-out";
 
 export function MainMenu() {
-    const queryClient = useQueryClient();
     const gameProps = useGameProps();
     const { uiTransition: t, navigate } = gameProps;
     const setSettings = useSetSearchParamState<boolean>("settings");
@@ -149,11 +148,7 @@ export function MainMenu() {
                             setLoading(true);
                             await navigate({ to: "/game/narration" });
                             Game.start("start", gameProps)
-                                .then(() =>
-                                    queryClient.invalidateQueries({
-                                        queryKey: [INTERFACE_DATA_USE_QUERY_KEY],
-                                    }),
-                                )
+                                .then(() => gameProps.invalidateInterfaceData())
                                 .finally(() => setLoading(false));
                         }}
                         disabled={loading}

package/template-react-vite-muijoy-tauri/src/components/menus/save-menu/save-slots.tsx

@@ -22,7 +22,7 @@ export function SaveSlot({ saveId }: { saveId: number }) {
 
     if (isLoading) {
         return (
-            <AspectRatio ratio={16 / 9} className="m-2 sm:m-4 md:m-2 lg:m-4">
+            <AspectRatio ratio={16 / 9} className="m-2 sm:m-4 md:m-2 lg:m-4 rounded">
                 <Skeleton className="absolute inset-0" />
             </AspectRatio>
         );
@@ -30,7 +30,7 @@ export function SaveSlot({ saveId }: { saveId: number }) {
 
     if (!saveData || isError) {
         return (
-            <AspectRatio ratio={16 / 9} className="m-2 sm:m-4 md:m-2 lg:m-4">
+            <AspectRatio ratio={16 / 9} className="m-2 sm:m-4 md:m-2 lg:m-4 rounded">
                 <Button
                     variant="ghost"
                     className="absolute inset-0 h-full w-full ring-1 ring-border"
@@ -47,14 +47,14 @@ export function SaveSlot({ saveId }: { saveId: number }) {
     return (
         <AspectRatio
             ratio={16 / 9}
-            className="m-2 overflow-hidden sm:m-4 md:m-2 lg:m-4 cursor-pointer"
+            className="m-2 overflow-hidden sm:m-4 md:m-2 lg:m-4 rounded cursor-pointer"
             onClick={() => handleLoad({ ...saveData, id: saveId })}
         >
             <Image
                 src={saveData.image}
                 layout="fullWidth"
                 alt={saveData.name}
-                className="absolute inset-0 size-full object-contain rounded-lg pointer-events-none select-none"
+                className="absolute inset-0 size-full object-contain pointer-events-none select-none rounded-lg"
             />
             {/* top-left metadata */}
             <div className="absolute top-2.5 left-2.5 flex flex-col gap-0.5 pointer-events-none">

package/template-react-vite-muijoy-tauri/src/components/menus/settings/index.tsx

@@ -208,7 +208,9 @@ export function SettingsDialogue() {
             onOpenChange={(isOpen) => {
                 setOpen(isOpen || undefined);
                 if (!isOpen) {
-                    setSettingsTab(undefined);
+                    // Delay clearing the tab until after the 100ms close animation
+                    // to avoid briefly flashing the main settings view during close.
+                    setTimeout(() => setSettingsTab(undefined), 150);
                 }
             }}
         >

package/template-react-vite-muijoy-tauri/src/components/menus/settings/menus/history.tsx

@@ -36,8 +36,15 @@ export function HistoryList({ searchString }: { searchString?: string }) {
     const bottomRef = useRef<HTMLDivElement>(null);
 
     useEffect(() => {
-        if (data.length > 0) {
-            bottomRef.current?.scrollIntoView();
+        if (data.length === 0 || !bottomRef.current) return;
+        let parent = bottomRef.current.parentElement;
+        while (parent) {
+            const { overflowY } = window.getComputedStyle(parent);
+            if (overflowY === "auto" || overflowY === "scroll") {
+                parent.scrollTop = parent.scrollHeight;
+                break;
+            }
+            parent = parent.parentElement;
         }
     }, [data]);
 

package/template-react-vite-muijoy-tauri/src/components/modals/input-request-dialogues.tsx

@@ -14,7 +14,7 @@ import rehypeRaw from "rehype-raw";
 import remarkGfm from "remark-gfm";
 
 export function InputRequestDialog() {
-    const { data: { animatedText: text } = {} } = useQueryDialogue();
+    const { data: { lastText: text } = {} } = useQueryDialogue();
     const {
         data: { isRequired, type, currentValue } = { currentValue: undefined, isRequired: false },
     } = useQueryInputValue<string | number>();

package/template-react-vite-muijoy-tauri/src/components/modals/quick-actions-wheel.tsx

@@ -223,7 +223,9 @@ function QuickActionsWheelContent({
                         >
                             <span className="font-semibold">{registration.label}</span>
                             <span className="text-[11px] opacity-85">
-                                {registration.hotkeyLabel}
+                                {registration.hotkeyLabel.length > 15
+                                    ? `${registration.hotkeyLabel.slice(0, 12)}…`
+                                    : registration.hotkeyLabel}
                             </span>
                         </button>
                     );

package/template-react-vite-muijoy-tauri/src/components/providers/alert-dialog-provider.tsx

@@ -1,3 +1,4 @@
+import { AlertDialogState } from "@/lib/stores/alert-dialog-store";
 import { createContext, type ReactNode, useCallback, useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
@@ -47,6 +48,7 @@ export function AlertDialogProvider({ children }: { children: ReactNode }) {
 
     const closeDialog = useCallback((id: string) => {
         setDialogs((prev) => prev.map((d) => (d.id === id ? { ...d, open: false } : d)));
+        AlertDialogState.decrement();
         setTimeout(() => {
             setDialogs((prev) => prev.filter((d) => d.id !== id));
         }, DIALOG_CLOSE_ANIMATION_DURATION_MS);
@@ -54,6 +56,7 @@ export function AlertDialogProvider({ children }: { children: ReactNode }) {
 
     const openAlertDialog = useCallback((options: AlertDialogOptions) => {
         const id = generateId();
+        AlertDialogState.increment();
         setDialogs((prev) => [...prev, { id, open: true, loading: false, options }]);
     }, []);
 

package/template-react-vite-muijoy-tauri/src/components/quick-tools.tsx

@@ -41,7 +41,7 @@ export function QuickTools() {
     return (
         <div
             className={cn(
-                "flex flex-nowrap items-center justify-end gap-0.5 overflow-x-auto sm:flex-wrap sm:justify-end sm:gap-1 sm:overflow-visible",
+                "flex flex-wrap items-center justify-end gap-0.5 sm:gap-1",
             )}
         >
             <Button

package/template-react-vite-muijoy-tauri/src/components/screens/narration/narration-cards.tsx

@@ -1,4 +1,4 @@
-import { AnimatedDots } from "@/components/loading";
+import { DelayedAnimatedDots } from "@/components/loading";
 import { QuickTools } from "@/components/quick-tools";
 import { Card, CardContent } from "@/components/ui/card";
 import { Image } from "@/components/ui/image";
@@ -8,7 +8,7 @@ import { useNarrationPointerHandlers } from "@/lib/hooks/narration-hooks";
 import { useQueryDialogue } from "@/lib/query/narration-query";
 import { TextDisplaySettings } from "@/lib/stores/text-display-settings-store";
 import { useSelector } from "@tanstack/react-store";
-import { type RefObject, useCallback, useRef } from "react";
+import { type RefObject, memo, useCallback, useMemo, useRef } from "react";
 import Markdown from "react-markdown";
 import { MarkdownTypewriterHooks } from "react-markdown-typewriter";
 import rehypeRaw from "rehype-raw";
@@ -63,18 +63,23 @@ export function NarrationCards() {
     );
 }
 
-export function Text({ paragraphRef }: { paragraphRef: RefObject<HTMLDivElement | null> }) {
+export const Text = memo(function Text({
+    paragraphRef,
+}: {
+    paragraphRef: RefObject<HTMLDivElement | null>;
+}) {
     const typewriterDelay = useSelector(TextDisplaySettings.store, (state) => state.delay);
-    const { data: { animatedText, text } = {} } = useQueryDialogue();
+    const { data: { animatedText, text } = {}, finalizeDialogue } = useQueryDialogue();
 
     const handleCharacterAnimationComplete = useCallback(
         (ref: { current: HTMLSpanElement | null }) => {
-            const container = paragraphRef.current;
+            const container = paragraphRef.current?.querySelector<HTMLElement>(
+                '[data-slot="scroll-area-viewport"]',
+            );
             const char = ref.current;
             if (container && char) {
                 const containerRect = container.getBoundingClientRect();
                 const charRect = char.getBoundingClientRect();
-                // Position of the character relative to the top of the scroll container
                 const charOffsetInContainer =
                     charRect.top - containerRect.top + container.scrollTop;
                 const scrollTop = charOffsetInContainer - container.clientHeight / 2;
@@ -87,15 +92,40 @@ export function Text({ paragraphRef }: { paragraphRef: RefObject<HTMLDivElement
         [paragraphRef],
     );
 
+    const markdownComponents = useMemo(() => ({ p: (props: object) => <span {...props} /> }), []);
+
+    const motionProps = useMemo(
+        () => ({
+            onAnimationStart: TextDisplaySettings.start,
+            onAnimationComplete: (definition: "visible" | "hidden") => {
+                if (definition === "visible") {
+                    finalizeDialogue();
+                    TextDisplaySettings.end();
+                }
+            },
+            onCharacterAnimationComplete: handleCharacterAnimationComplete,
+        }),
+        [finalizeDialogue, handleCharacterAnimationComplete],
+    );
+
+    const specialCharacters = useMemo(
+        () => ({
+            ".": { delayAfter: typewriterDelay + 300 },
+            "!": { delayAfter: typewriterDelay + 300 },
+            "?": { delayAfter: typewriterDelay + 300 },
+            ",": { delayAfter: typewriterDelay + 75 },
+            ":": { delay: typewriterDelay + 50, delayAfter: typewriterDelay + 150 },
+        }),
+        [typewriterDelay],
+    );
+
     return (
         <p className="prose dark:prose-invert m-0 max-w-full p-0">
             <span>
                 <Markdown
                     remarkPlugins={[remarkGfm]}
                     rehypePlugins={[rehypeRaw]}
-                    components={{
-                        p: (props) => <span {...props} />,
-                    }}
+                    components={markdownComponents}
                 >
                     {text}
                 </Markdown>
@@ -106,23 +136,16 @@ export function Text({ paragraphRef }: { paragraphRef: RefObject<HTMLDivElement
                     remarkPlugins={[remarkGfm]}
                     rehypePlugins={[rehypeRaw]}
                     delay={typewriterDelay}
-                    motionProps={{
-                        onAnimationStart: TextDisplaySettings.start,
-                        onAnimationComplete: (definition: "visible" | "hidden") => {
-                            if (definition === "visible") {
-                                TextDisplaySettings.end();
-                            }
-                        },
-                        onCharacterAnimationComplete: handleCharacterAnimationComplete,
-                    }}
-                    fallback={<AnimatedDots />}
+                    motionProps={motionProps}
+                    fallback={<DelayedAnimatedDots />}
+                    specialCharacters={specialCharacters}
                 >
                     {animatedText}
                 </MarkdownTypewriterHooks>
             </span>
         </p>
     );
-}
+});
 
 export function CharacterIcon({ alt, icon }: { icon: string; alt: string }) {
     return (

package/template-react-vite-muijoy-tauri/src/lib/hooks/hotkeys-hooks.ts

@@ -2,22 +2,47 @@ import { useAlertDialog } from "@/components/providers/alert-dialog-provider";
 import { useNarrationFunctions } from "@/lib/hooks/narration-hooks";
 import { useSetSearchParamState } from "@/lib/hooks/navigation-hooks";
 import { useGameProps } from "@/lib/hooks/props-hooks";
-import { useQueryInputValue } from "@/lib/query/narration-query";
+import { useQueryCanGoNext, useQueryInputValue } from "@/lib/query/narration-query";
 import {
     LAST_SAVE_USE_QUERY_KEY,
     SAVES_USE_QUERY_KEY,
     useQueryLastSave,
 } from "@/lib/query/save-query";
+import { AlertDialogState } from "@/lib/stores/alert-dialog-store";
 import { QuickActionsWheelState } from "@/lib/stores/quick-actions-wheel-store";
+import { SearchParams } from "@/lib/stores/search-param-store";
 import { SkipSettings } from "@/lib/stores/skip-settings-store";
+import { TextDisplaySettings } from "@/lib/stores/text-display-settings-store";
 import { loadSave, saveGameToIndexDB } from "@/lib/utils/save-utility";
+import { narration } from "@drincs/pixi-vn";
 import { useHotkeys } from "@tanstack/react-hotkeys";
 import { useQueryClient } from "@tanstack/react-query";
 import { useLocation } from "@tanstack/react-router";
-import { useCallback } from "react";
+import { useSelector } from "@tanstack/react-store";
+import { useCallback, useMemo, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
+function useMenuDialogState() {
+    const searchParams = useSelector(SearchParams.store, (state) => state);
+    const alertDialogCount = useSelector(AlertDialogState.store, (state) => state.count);
+    const { data: { isRequired } = {} } = useQueryInputValue<string | number>();
+
+    /** true when the settings menu (or any sub-page) is open */
+    const isSettingsOpen = useMemo(
+        () => Object.values(searchParams).some((v) => v !== undefined),
+        [searchParams],
+    );
+
+    /** true when an alert confirmation dialog or the input-request dialog is blocking interaction */
+    const isAlertOrInputOpen = alertDialogCount > 0 || !!isRequired;
+
+    /** true when any menu or dialog that should disable hotkeys is open */
+    const isAnyMenuOrDialogOpen = isSettingsOpen || isAlertOrInputOpen;
+
+    return { isAnyMenuOrDialogOpen, isSettingsOpen, isAlertOrInputOpen };
+}
+
 /**
  * useSaveHotkeys
  *
@@ -40,6 +65,7 @@ export function useSaveHotkeys(): null {
     const { data: lastSave = null } = useQueryLastSave();
     const { openAlertDialog } = useAlertDialog();
     const gameProps = useGameProps();
+    const { isSettingsOpen } = useMenuDialogState();
 
     const quickSave = useCallback(() => {
         if (location.pathname === "/") {
@@ -87,6 +113,7 @@ export function useSaveHotkeys(): null {
             hotkey: "F5",
             callback: quickSave,
             options: {
+                enabled: !isSettingsOpen,
                 meta: {
                     name: t("quick_save"),
                     description: t("quick_save_hotkey_description"),
@@ -97,6 +124,7 @@ export function useSaveHotkeys(): null {
             hotkey: "Control+S",
             callback: quickSave,
             options: {
+                enabled: !isSettingsOpen,
                 meta: {
                     name: t("quick_save"),
                     description: t("quick_save_hotkey_alternative_description"),
@@ -107,6 +135,7 @@ export function useSaveHotkeys(): null {
             hotkey: "F9",
             callback: quickLoad,
             options: {
+                enabled: !isSettingsOpen,
                 meta: {
                     name: t("load_last_save"),
                     description: t("quick_load_hotkey_description"),
@@ -117,6 +146,7 @@ export function useSaveHotkeys(): null {
             hotkey: "Control+L",
             callback: quickLoad,
             options: {
+                enabled: !isSettingsOpen,
                 meta: {
                     name: t("load_last_save"),
                     description: t("quick_load_hotkey_alternative_description"),
@@ -132,6 +162,7 @@ export function useSettingsHotkeys(): null {
     const { t } = useTranslation(["ui"]);
     const setSettingsOpen = useSetSearchParamState<boolean>("settings");
     const setSettingsTab = useSetSearchParamState<string>("settings_tab");
+    const { isAnyMenuOrDialogOpen } = useMenuDialogState();
 
     const openControlsPage = useCallback(() => {
         setSettingsOpen(true);
@@ -150,9 +181,10 @@ export function useSettingsHotkeys(): null {
             },
         },
         {
-            hotkey: "Control+K",
+            hotkey: "K",
             callback: openControlsPage,
             options: {
+                enabled: !isAnyMenuOrDialogOpen,
                 meta: {
                     name: t("hotkeys_menu"),
                     description: t("hotkeys_menu_shortcut_description"),
@@ -169,6 +201,7 @@ export function useGameHotkeys(): null {
     const setSettingsTab = useSetSearchParamState<string>("settings_tab");
     const setHistory = useSetSearchParamState<boolean>("history");
     const { t } = useTranslation(["ui"]);
+    const { isAnyMenuOrDialogOpen } = useMenuDialogState();
 
     const openHistoryPage = useCallback(() => {
         setHistory(undefined);
@@ -187,9 +220,10 @@ export function useGameHotkeys(): null {
 
     useHotkeys([
         {
-            hotkey: "Control+H",
+            hotkey: "H",
             callback: openHistoryPage,
             options: {
+                enabled: !isAnyMenuOrDialogOpen,
                 meta: {
                     name: t("history"),
                     description: t("history_hotkey_description"),
@@ -200,6 +234,7 @@ export function useGameHotkeys(): null {
             hotkey: "Tab",
             callback: toggleQuickActionsWheel,
             options: {
+                enabled: !isAnyMenuOrDialogOpen,
                 meta: {
                     name: t("quick_actions"),
                     description: t("quick_actions_open_description"),
@@ -211,38 +246,104 @@ export function useGameHotkeys(): null {
     return null;
 }
 
+export function useChoiceMenuHotkeys(menuLength: number) {
+    const { t } = useTranslation(["ui"]);
+    const menuRef = useRef<HTMLDivElement>(null);
+
+    function getMenuItems(): HTMLButtonElement[] {
+        if (!menuRef.current) return [];
+        return Array.from(
+            menuRef.current.querySelectorAll<HTMLButtonElement>(
+                "button[role='menuitem']:not(:disabled)",
+            ),
+        );
+    }
+
+    function focusMenuItem(direction: "up" | "down") {
+        const items = getMenuItems();
+        if (!items.length) return;
+        const active = document.activeElement as HTMLElement;
+        const currentIndex = items.indexOf(active as HTMLButtonElement);
+        let next: number;
+        if (direction === "down") {
+            next = currentIndex < items.length - 1 ? currentIndex + 1 : 0;
+        } else {
+            next = currentIndex > 0 ? currentIndex - 1 : items.length - 1;
+        }
+        items[next].focus();
+    }
+
+    useHotkeys([
+        {
+            hotkey: "ArrowDown",
+            callback: () => focusMenuItem("down"),
+            options: {
+                enabled: menuLength > 0,
+                preventDefault: true,
+                meta: {
+                    name: t("choice_navigation"),
+                    description: t("choice_navigation_description"),
+                },
+            },
+        },
+        {
+            hotkey: "ArrowUp",
+            callback: () => focusMenuItem("up"),
+            options: {
+                enabled: menuLength > 0,
+                preventDefault: true,
+                meta: {
+                    name: t("choice_navigation"),
+                    description: t("choice_navigation_description"),
+                },
+            },
+        },
+    ]);
+
+    return { menuRef };
+}
+
 export function useNarrationHotkeys(): null {
     const { t } = useTranslation(["ui"]);
     const { goNext } = useNarrationFunctions();
-    const { data: { isRequired } = {} } = useQueryInputValue<string | number>();
+    const typewriterInProgress = useSelector(
+        TextDisplaySettings.store,
+        (state) => state.inProgress,
+    );
+    const { isAnyMenuOrDialogOpen } = useMenuDialogState();
+    const { data: canGoNext } = useQueryCanGoNext();
 
     const onSkipKeyDown = useCallback(() => SkipSettings.setEnabled(true), []);
     const onSkipKeyUp = useCallback(() => {
         SkipSettings.setEnabled(false);
+        if (typewriterInProgress && !narration.dialogGlue) {
+            TextDisplaySettings.complete();
+            return;
+        }
         goNext();
-    }, [goNext]);
+    }, [goNext, typewriterInProgress]);
 
     useHotkeys([
         {
             hotkey: "Enter",
             callback: onSkipKeyDown,
             options: {
+                enabled: !isAnyMenuOrDialogOpen && canGoNext,
                 meta: {
                     name: t("skip"),
                     description: t("skip_hold_description"),
                 },
-                enabled: !isRequired,
             },
         },
         {
             hotkey: "Space",
             callback: onSkipKeyDown,
             options: {
+                enabled: !isAnyMenuOrDialogOpen && canGoNext,
                 meta: {
                     name: t("skip"),
                     description: t("skip_hold_space_description"),
                 },
-                enabled: !isRequired,
             },
         },
         {
@@ -251,11 +352,11 @@ export function useNarrationHotkeys(): null {
             options: {
                 eventType: "keyup",
                 conflictBehavior: "allow",
+                enabled: !isAnyMenuOrDialogOpen && canGoNext,
                 meta: {
                     name: t("next"),
                     description: t("skip_release_description"),
                 },
-                enabled: !isRequired,
             },
         },
         {
@@ -264,11 +365,11 @@ export function useNarrationHotkeys(): null {
             options: {
                 eventType: "keyup",
                 conflictBehavior: "allow",
+                enabled: !isAnyMenuOrDialogOpen && canGoNext,
                 meta: {
                     name: t("next"),
                     description: t("skip_release_space_description"),
                 },
-                enabled: !isRequired,
             },
         },
     ]);

package/template-react-vite-muijoy-tauri/src/lib/hooks/narration-hooks.ts

@@ -22,6 +22,7 @@ export function useNarrationFunctions() {
 
     const goNext = useCallback(async () => {
         if (hasOpenMenu) return;
+        TextDisplaySettings.resetForNext();
         GameStatus.setLoading(true);
         try {
             if (!narration.canContinue) {
@@ -94,6 +95,7 @@ const isDragGesture = (dx: number, dy: number) =>
 export function useNarrationPointerHandlers() {
     const { goNext } = useNarrationFunctions();
     const skipEnabled = useSelector(SkipSettings.store, (state) => state.enabled);
+    const typewriterInProgress = useSelector(TextDisplaySettings.store, (state) => state.inProgress);
     const pointerDownPos = useRef<{ x: number; y: number } | null>(null);
     const longPressTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
     const longPressTriggered = useRef(false);
@@ -166,9 +168,13 @@ export function useNarrationPointerHandlers() {
             if (skipEnabled) {
                 SkipSettings.setEnabled(false);
             }
+            if (typewriterInProgress && !narration.dialogGlue) {
+                TextDisplaySettings.complete();
+                return;
+            }
             goNext();
         },
-        [clearLongPressTimer, goNext, skipEnabled],
+        [clearLongPressTimer, goNext, skipEnabled, typewriterInProgress],
     );
 
     const handlePointerMove = useCallback(