Skip to content

fix: share line completion in layout template data #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
han4wluc merged 2 commits into from
Mar 30, 2026
Merged

fix: share line completion in layout template data #212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41beb6b
fix: share line completion in layout template data
han4wluc Mar 30, 2026
617838c
Merge remote-tracking branch 'origin/main' into fix/shared-line-compl…
han4wluc Mar 30, 2026
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
58 changes: 52 additions & 6 deletions src/stores/constructRenderState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,13 +748,15 @@ const getStoryContainer = (elements = []) => {
const createLayoutTemplateData = ({
variables,
saveSlots = [],
isLineCompleted,
autoMode,
skipMode,
canRollback,
} = {}) => {
return {
variables,
saveSlots,
isLineCompleted,
autoMode,
skipMode,
canRollback,
Expand Down Expand Up @@ -1030,6 +1032,10 @@ export const addBackgroundOrCg = (
isLineCompleted,
skipTransitionsAndAnimations,
variables,
autoMode,
skipMode,
canRollback,
saveSlots = [],
},
) => {
const { elements, animations } = state;
Expand Down Expand Up @@ -1084,7 +1090,14 @@ export const addBackgroundOrCg = (
};
const processedContainer = parseAndRender(
bgContainer,
{ variables },
createLayoutTemplateData({
variables,
saveSlots,
isLineCompleted,
autoMode,
skipMode,
canRollback,
}),
{ functions: jemplFunctions },
);
storyContainer.children.push(
Expand Down Expand Up @@ -1271,6 +1284,10 @@ export const addVisuals = (
isLineCompleted,
skipTransitionsAndAnimations,
variables,
autoMode,
skipMode,
canRollback,
saveSlots = [],
},
) => {
const { elements, animations } = state;
Expand Down Expand Up @@ -1373,7 +1390,14 @@ export const addVisuals = (
};
const processedContainer = parseAndRender(
visualContainer,
{ variables },
createLayoutTemplateData({
variables,
saveSlots,
isLineCompleted,
autoMode,
skipMode,
canRollback,
}),
{ functions: jemplFunctions },
);
storyContainer.children.push(
Expand Down Expand Up @@ -1582,6 +1606,11 @@ export const addChoices = (
isLineCompleted,
skipTransitionsAndAnimations,
screen,
variables,
autoMode,
skipMode,
canRollback,
saveSlots = [],
},
) => {
const { elements, animations } = state;
Expand All @@ -1608,11 +1637,25 @@ export const addChoices = (
const layout = resources?.layouts[presentationState.choice.resourceId];
if (layout && layout.elements) {
const wrappedTemplate = { elements: layout.elements };
const result = parseAndRender(wrappedTemplate, {
choice: {
items: presentationState.choice?.items ?? [],
const result = parseAndRender(
wrappedTemplate,
{
...createLayoutTemplateData({
variables,
saveSlots,
isLineCompleted,
autoMode,
skipMode,
canRollback,
}),
choice: {
items: presentationState.choice?.items ?? [],
},
},
});
{
functions: jemplFunctions,
},
);
const choiceElements = resolveLayoutResourceIds(
settleTextRevealIfCompleted(result?.elements, {
isLineCompleted,
Expand Down Expand Up @@ -1662,6 +1705,7 @@ export const addControl = (
presentationState,
resources = {},
variables,
isLineCompleted,
autoMode,
skipMode,
canRollback,
Expand Down Expand Up @@ -1708,6 +1752,7 @@ export const addControl = (
templateData: createLayoutTemplateData({
variables,
saveSlots,
isLineCompleted,
autoMode,
skipMode,
canRollback,
Expand Down Expand Up @@ -1850,6 +1895,7 @@ export const addLayout = (
templateData: createLayoutTemplateData({
variables,
saveSlots,
isLineCompleted,
autoMode,
skipMode,
canRollback,
Expand Down
Loading