Skip to content

fix: calculate progress text after spread merge with current step #597

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

Open
FarbrorGarbo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: calculate progress text after spread merge with current step #597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 37 additions & 31 deletions src/driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,6 @@ export function driver(options: Config = {}): Driver {
? currentStep.popover?.showProgress
: getConfig("showProgress");
const progressText = currentStep.popover?.progressText || getConfig("progressText") || "{{current}} of {{total}}";
const progressTextReplaced = progressText
.replace("{{current}}", `${stepIndex + 1}`)
.replace("{{total}}", `${steps.length}`);

const configuredButtons = currentStep.popover?.showButtons || getConfig("showButtons");
const calculatedButtons: AllowedButtons[] = [
"next",
Expand All @@ -220,35 +216,45 @@ export function driver(options: Config = {}): Driver {
const onPrevClick = currentStep.popover?.onPrevClick || getConfig("onPrevClick");
const onCloseClick = currentStep.popover?.onCloseClick || getConfig("onCloseClick");

// --- Merge global config with current step config ---
const mergedConfig = {
showButtons: calculatedButtons,
nextBtnText: !hasNextStep ? doneBtnText : undefined,
disableButtons: [...(!hasPreviousStep ? ["previous" as AllowedButtons] : [])],
showProgress: showProgress,
progressText: progressText, // Use the first template
onNextClick: onNextClick
? onNextClick
: () => {
if (!hasNextStep) {
destroy();
} else {
drive(stepIndex + 1);
}
},
onPrevClick: onPrevClick
? onPrevClick
: () => {
drive(stepIndex - 1);
},
onCloseClick: onCloseClick
? onCloseClick
: () => {
destroy();
},
...(currentStep?.popover || {}),
};

// --- Create correct rendering of progressText AFTER merge ---
if (mergedConfig.progressText) {
mergedConfig.progressText = mergedConfig.progressText
.replace("{{current}}", `${stepIndex + 1}`)
.replace("{{total}}", `${steps.length}`);
}

highlight({
...currentStep,
popover: {
showButtons: calculatedButtons,
nextBtnText: !hasNextStep ? doneBtnText : undefined,
disableButtons: [...(!hasPreviousStep ? ["previous" as AllowedButtons] : [])],
showProgress: showProgress,
progressText: progressTextReplaced,
onNextClick: onNextClick
? onNextClick
: () => {
if (!hasNextStep) {
destroy();
} else {
drive(stepIndex + 1);
}
},
onPrevClick: onPrevClick
? onPrevClick
: () => {
drive(stepIndex - 1);
},
onCloseClick: onCloseClick
? onCloseClick
: () => {
destroy();
},
...(currentStep?.popover || {}),
},
popover: mergedConfig,
});
}

Expand Down