Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,16 @@ export const useStoryStore = create<StoryState>()(
const startPassage = storyData.passagesById.get(storyData.startNode);
if (!startPassage) return;

// Reset renderDeferred before firing beforerestart so we can detect
// if a handler called deferRender() during the callback.
set((state) => {
state.renderDeferred = false;
});

fireBeforeRestart();

const keepDeferred = get().renderDeferred;

resetPRNG();
resetTriggers();
const initialVars = deepClone(variableDefaults);
Expand All @@ -535,7 +544,9 @@ export const useStoryStore = create<StoryState>()(
state.historyIndex = 0;
state.visitCounts = { [startPassage.name]: 1 };
state.renderCounts = { [startPassage.name]: 1 };
state.renderDeferred = false;
if (!keepDeferred) {
state.renderDeferred = false;
}
});

lastNavigationVars = get().variables;
Expand Down
13 changes: 12 additions & 1 deletion test/unit/store.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @vitest-environment happy-dom
import { describe, it, expect, beforeEach } from 'vitest';
import { useStoryStore } from '../../src/store';
import { useStoryStore, onBeforeRestart } from '../../src/store';
import { executeStoryInit } from '../../src/story-init';
import type { StoryData, Passage } from '../../src/parser';
import { registerClass, clearRegistry } from '../../src/class-registry';
Expand Down Expand Up @@ -870,5 +870,16 @@ describe('useStoryStore', () => {
useStoryStore.getState().restart();
expect(useStoryStore.getState().renderDeferred).toBe(false);
});

it('restart() preserves renderDeferred if set during beforerestart', () => {
const story = makeStoryData([makePassage(1, 'Start', '')]);
useStoryStore.getState().init(story);
const unsub = onBeforeRestart(() => {
useStoryStore.getState().deferRender();
});
useStoryStore.getState().restart();
expect(useStoryStore.getState().renderDeferred).toBe(true);
unsub();
});
});
});
Loading