Skip to content
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.

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

Allow message_progress_bar to be a function #3201

Merged
merged 8 commits into from
Feb 2, 2024
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
5 changes: 5 additions & 0 deletions .changeset/stupid-baboons-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"jspsych": minor
---

Allow message_progress_bar to be a function
2 changes: 1 addition & 1 deletion docs/reference/jspsych.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The settings object can contain several parameters. None of the parameters are r
| on_close | function | Function to execute when the user leaves the page. Can be used, for example, to save data before the page is closed. |
| exclusions | object | Specifies restrictions on the browser the participant can use to complete the experiment. See list of options below. *This feature is deprecated as of v7.1 and will be removed in v8.0. The [browser-check plugin](../plugins/browser-check.md) is an improved way to handle exclusions.* |
| show_progress_bar | boolean | If `true`, then [a progress bar](../overview/progress-bar.md) is shown at the top of the page. Default is `false`. |
| message_progress_bar | string | Message to display next to the progress bar. The default is 'Completion Progress'. |
| message_progress_bar | string or function | Message to display next to the progress bar or a function that returns that message. The default is 'Completion Progress'. If `message_progress_bar` is a function, it receives one single argument which is the current progress, ranging from 0 to 1; the function gets called on every progress bar update automatically. |
| auto_update_progress_bar | boolean | If true, then the progress bar at the top of the page will automatically update as every top-level timeline or trial is completed. |
| use_webaudio | boolean | If false, then jsPsych will not attempt to use the WebAudio API for audio playback. Instead, HTML5 Audio objects will be used. The WebAudio API offers more precise control over the timing of audio events, and should be used when possible. The default value is `true`. |
| default_iti | numeric | The default inter-trial interval in ms. The default value if none is specified is 0ms. |
Expand Down
12 changes: 12 additions & 0 deletions packages/jspsych/src/ProgressBar.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,17 @@ describe("ProgressBar", () => {
'"jsPsych.progressBar.progress must be a number between 0 and 1"'
);
});

it("should work when message is a function", () => {
// Override default container element and progress bar
containerElement = document.createElement("div");
progressBar = new ProgressBar(containerElement, (progress: number) => String(progress));
let messageSpan: HTMLSpanElement = containerElement.querySelector("span");

expect(messageSpan.innerHTML).toEqual("0");

progressBar.progress = 0.5;
expect(messageSpan.innerHTML).toEqual("0.5");
});
});
});
12 changes: 10 additions & 2 deletions packages/jspsych/src/ProgressBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
* Maintains a visual progress bar using HTML and CSS
*/
export class ProgressBar {
constructor(private readonly containerElement: HTMLDivElement, private readonly message: string) {
constructor(
private readonly containerElement: HTMLDivElement,
private readonly message: string | ((progress: number) => string)
) {
this.setupElements();
}

Expand All @@ -14,7 +17,6 @@ export class ProgressBar {
/** Adds the progress bar HTML code into `this.containerElement` */
private setupElements() {
this.messageSpan = document.createElement("span");
this.messageSpan.innerHTML = this.message;

this.innerDiv = document.createElement("div");
this.innerDiv.id = "jspsych-progressbar-inner";
Expand All @@ -31,6 +33,12 @@ export class ProgressBar {
/** Updates the progress bar according to `this.progress` */
private update() {
this.innerDiv.style.width = this._progress * 100 + "%";

if (typeof this.message === "function") {
this.messageSpan.innerHTML = this.message(this._progress);
} else {
this.messageSpan.innerHTML = this.message;
}
}

/**
Expand Down
Loading