Skip to content

Commit

Permalink
Merge pull request #18566 from calixteman/issue18561
Browse files Browse the repository at this point in the history
Don't stop calculating field values when a Calculate callback throws
  • Loading branch information
timvandermeij authored Aug 6, 2024
2 parents af012c7 + ad12f33 commit 341a0b6
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/scripting_api/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/

import {
serializeError,
USERACTIVATION_CALLBACKID,
USERACTIVATION_MAXTIME_VALIDITY,
} from "./app_utils.js";
Expand Down Expand Up @@ -344,7 +345,15 @@ class EventDispatcher {
event.value = null;
const target = this._objects[targetId];
let savedValue = target.obj._getValue();
this.runActions(source, target, event, "Calculate");
try {
this.runActions(source, target, event, "Calculate");
} catch (error) {
const fieldId = target.obj._id;
const serializedError = serializeError(error);
serializedError.value = `Error when calculating value for field "${fieldId}"\n${serializedError.value}`;
this._externalCall("send", [serializedError]);
continue;
}
if (!event.rc) {
continue;
}
Expand Down
28 changes: 28 additions & 0 deletions test/integration/scripting_spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2461,4 +2461,32 @@ describe("Interaction", () => {
);
});
});

describe("Calculate field value even if one callback throws", () => {
let pages;

beforeAll(async () => {
pages = await loadAndWait("issue18561.pdf", getSelector("24R"));
});

afterAll(async () => {
await closePages(pages);
});

it("must check that the product is computed although a callback threw", async () => {
await Promise.all(
pages.map(async ([browserName, page], i) => {
await waitForScripting(page);

const inputSelector = getSelector("24R");
await page.click(inputSelector);
await page.type(inputSelector, "123");
await page.click(getSelector("25R"));
await page.waitForFunction(
`${getQuerySelector("28R")}.value === "12300"`
);
})
);
});
});
});
1 change: 1 addition & 0 deletions test/pdfs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -660,3 +660,4 @@
!issue18099_reduced.pdf
!file_pdfjs_test.pdf
!issue18536.pdf
!issue18561.pdf
Binary file added test/pdfs/issue18561.pdf
Binary file not shown.

0 comments on commit 341a0b6

Please sign in to comment.