create-pixi-vn 2.0.14 → 2.0.15

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

@@ -1,6 +1,9 @@
 import { INTERFACE_DATA_USE_QUERY_KEY } from "@/constants";
+import { TextDisplaySettings } from "@/lib/stores/text-display-settings-store";
 import { type CharacterInterface, narration, stepHistory } from "@drincs/pixi-vn";
 import { keepPreviousData, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useSelector } from "@tanstack/react-store";
+import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 
 const CAN_GO_BACK_USE_QUERY_KEY = "can_go_back_use_query_key";
@@ -24,7 +27,6 @@ export function useQueryChoiceMenuOptions() {
                         ? t(option.text)
                         : option.text.map((text) => t(text)).join(" "),
             })) || [],
-        placeholderData: keepPreviousData,
     });
 }
 
@@ -45,13 +47,30 @@ type DialogueModel = {
     animatedText?: string;
     text?: string;
     character?: CharacterInterface;
+    lastText?: string;
 };
 const DIALOGUE_USE_QUERY_KEY = "dialogue_use_query_key";
 export function useQueryDialogue() {
     const { t } = useTranslation(["narration"]);
     const queryClient = useQueryClient();
+    const forceComplete = useSelector(TextDisplaySettings.store, (state) => state.forceComplete);
 
-    return useQuery<DialogueModel>({
+    const finalizeDialogue = useCallback(() => {
+        queryClient.setQueryData<DialogueModel>(
+            [INTERFACE_DATA_USE_QUERY_KEY, DIALOGUE_USE_QUERY_KEY],
+            (prev) => {
+                if (!prev) return prev;
+                const fullText = (prev.text || "") + (prev.animatedText || "");
+                return {
+                    ...prev,
+                    text: fullText || undefined,
+                    animatedText: undefined,
+                };
+            },
+        );
+    }, [queryClient]);
+
+    const query = useQuery<DialogueModel>({
         queryKey: [INTERFACE_DATA_USE_QUERY_KEY, DIALOGUE_USE_QUERY_KEY],
         queryFn: async ({ queryKey }) => {
             const dialogue = narration.dialogue;
@@ -78,6 +97,7 @@ export function useQueryDialogue() {
                 }
                 return {
                     animatedText: newText,
+                    lastText: newText,
                     text: oldText,
                     character: character,
                 };
@@ -85,11 +105,21 @@ export function useQueryDialogue() {
 
             return {
                 animatedText: text,
+                lastText: text,
                 character: character,
             };
         },
         placeholderData: keepPreviousData,
+        select: forceComplete
+            ? (data) => ({
+                  ...data,
+                  text: (data.text || "") + (data.animatedText || "") || undefined,
+                  animatedText: undefined,
+              })
+            : undefined,
     });
+
+    return { ...query, finalizeDialogue };
 }
 
 const CAN_GO_NEXT_USE_QUERY_KEY = "can_go_next_use_query_key";

package/template-react-vite-muijoy/src/lib/stores/alert-dialog-store.ts

@@ -0,0 +1,13 @@
+import { Store } from "@tanstack/store";
+
+export namespace AlertDialogState {
+    export const store = new Store<{ count: number }>({ count: 0 });
+
+    export function increment() {
+        store.setState((state) => ({ count: state.count + 1 }));
+    }
+
+    export function decrement() {
+        store.setState((state) => ({ count: Math.max(0, state.count - 1) }));
+    }
+}

package/template-react-vite-muijoy/src/lib/stores/text-display-settings-store.ts

@@ -9,6 +9,10 @@ type TextDisplayStorage = {
      * Whether the typewriter effect is in progress
      */
     inProgress: boolean;
+    /**
+     * Whether the typewriter effect should be force-completed instantly
+     */
+    forceComplete: boolean;
     /**
      * The font size in percent (100 = default)
      */
@@ -22,6 +26,7 @@ export namespace TextDisplaySettings {
     export const store = new Store<TextDisplayStorage>({
         delay: Number(localStorage.getItem("typewriter_delay_millisecond") ?? 10),
         inProgress: false,
+        forceComplete: false,
         fontSize: initialFontSize,
     });
 
@@ -57,6 +62,20 @@ export namespace TextDisplaySettings {
      * End the typewriter effect
      */
     export function end() {
-        store.setState((state) => ({ ...state, inProgress: false }));
+        store.setState((state) => ({ ...state, inProgress: false, forceComplete: false }));
+    }
+
+    /**
+     * Force the typewriter effect to complete instantly
+     */
+    export function complete() {
+        store.setState((state) => ({ ...state, forceComplete: true, inProgress: false }));
+    }
+
+    /**
+     * Clear the forceComplete flag before advancing to the next step
+     */
+    export function resetForNext() {
+        store.setState((state) => ({ ...state, forceComplete: false }));
     }
 }

package/template-react-vite-muijoy/src/locales/en.json

@@ -81,6 +81,8 @@
     "menu_navigation_up_description": "Focus the previous menu item.",
     "menu_navigation_home_description": "Focus the first menu item.",
     "menu_navigation_end_description": "Focus the last menu item.",
+    "choice_navigation": "Choices",
+    "choice_navigation_description": "Use ↑ / ↓ to select an choice, then Enter to run it.",
     "success_delete": "Delete successful",
     "success_load": "Load successful",
     "success_save": "Save successful",

package/template-react-vite-muijoy/src/routes/__root.tsx

@@ -11,13 +11,12 @@ import { defineAssets } from "@/lib/utils/assets-utility";
 import { initializeIndexedDB } from "@/lib/utils/db-utility";
 import { loadRefreshSave } from "@/lib/utils/save-utility";
 import type { RouterContext } from "@/router";
+import { narration } from "@drincs/pixi-vn";
 import { setupPixivnViteData } from "@drincs/pixi-vn/vite-listener";
 import { createRootRouteWithContext, ErrorComponent, Outlet } from "@tanstack/react-router";
 import { lazy, Suspense } from "react";
 
-const DevDevtools = import.meta.env.DEV
-    ? lazy(() => import("@/components/dev-devtools"))
-    : null;
+const DevDevtools = import.meta.env.DEV ? lazy(() => import("@/components/dev-devtools")) : null;
 
 export const Route = createRootRouteWithContext<RouterContext>()({
     validateSearch: (search) => SearchParams.setMany(search),
@@ -27,7 +26,7 @@ export const Route = createRootRouteWithContext<RouterContext>()({
         // Game.onNavigate(async (to) => redirect({ to }));
         await Promise.all([import("@/content"), initializeIndexedDB(), defineAssets(), useI18n()]);
         await setupPixivnViteData();
-        if (location.pathname !== "/") {
+        if (location.pathname !== "/" && narration.stepCounter === 0) {
             const isRefreshSaveExist = await loadRefreshSave();
             if (isRefreshSaveExist) {
                 await context.queryClient.invalidateQueries({

package/template-react-vite-muijoy-ink/package-lock.json

@@ -35,7 +35,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",
@@ -10108,6 +10108,7 @@
       "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.38.0.tgz",
       "integrity": "sha512-rFYkY/pigbcswl1XQSb7q424kSTQ8q6eAC+YUsSKooHQYuLdzdHjrt6uxUC+PRAO++q5IS7+TamgIw1AphxR+g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "motion-dom": "^12.38.0",
         "motion-utils": "^12.36.0",
@@ -13771,6 +13772,7 @@
       "resolved": "https://registry.npmjs.org/motion/-/motion-12.38.0.tgz",
       "integrity": "sha512-uYfXzeHlgThchzwz5Te47dlv5JOUC7OB4rjJ/7XTUgtBZD8CchMN8qEJ4ZVsUmTyYA44zjV0fBwsiktRuFnn+w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "framer-motion": "^12.38.0",
         "tslib": "^2.4.0"
@@ -13797,6 +13799,7 @@
       "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.38.0.tgz",
       "integrity": "sha512-pdkHLD8QYRp8VfiNLb8xIBJis1byQ9gPT3Jnh2jqfFtAsWUA3dEepDlsWe/xMpO8McV+VdpKVcp+E+TGJEtOoA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "motion-utils": "^12.36.0"
       }
@@ -13805,7 +13808,8 @@
       "version": "12.36.0",
       "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.36.0.tgz",
       "integrity": "sha512-eHWisygbiwVvf6PZ1vhaHCLamvkSbPIeAYxWUuL3a2PD/TROgE7FvfHWTIH4vMl798QLfMw15nRqIaRDXTlYRg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/ms": {
       "version": "2.1.3",
@@ -14892,12 +14896,12 @@
       }
     },
     "node_modules/react-markdown-typewriter": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-markdown-typewriter/-/react-markdown-typewriter-1.2.0.tgz",
-      "integrity": "sha512-jztq8XBfYB+CwG/fRk3VxE8A63LhVbcO7ZqjCYCg97cbn3Kl+hUFyA57LJ4vxG2b7z/FCqCuE/9hzBOhNiyzeA==",
-      "dependencies": {
-        "motion": "^12.38.0"
-      },
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/react-markdown-typewriter/-/react-markdown-typewriter-1.3.4.tgz",
+      "integrity": "sha512-LE/7xzyta4A6Gz6CfeTP0saCgVsxbCEVj4le4xobrkM/IG9MVWdrpyGFGFdsKmZ1k5otnRF3HP52YXbMv7P1rg==",
+      "workspaces": [
+        "playground"
+      ],
       "peerDependencies": {
         "motion": ">=12.9.0",
         "react": ">=18.0.0",

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

@@ -44,7 +44,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-ink/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-ink/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-ink/src/components/menus/main-menu.tsx

@@ -26,7 +26,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");
@@ -147,11 +146,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-ink/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-ink/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-ink/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-ink/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-ink/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,9 +63,13 @@ 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 }) => {
@@ -74,7 +78,6 @@ export function Text({ paragraphRef }: { paragraphRef: RefObject<HTMLDivElement
             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 +90,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 +134,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 (