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.

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

[Annotation] A combo can have a value other than one in the options #16035

Merged
merged 1 commit into from
Feb 9, 2023
Merged

[Annotation] A combo can have a value other than one in the options #16035

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
15 changes: 7 additions & 8 deletions src/core/annotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1981,15 +1981,14 @@ class WidgetAnnotation extends Annotation {
}

assert(typeof value === "string", "Expected `value` to be a string.");
value = value.trim();

if (!this.data.combo) {
value = value.trim();
} else {
// The value is supposed to be one of the exportValue.
const option =
this.data.options.find(({ exportValue }) => value === exportValue) ||
this.data.options[0];
value = (option && option.displayValue) || "";
if (this.data.combo) {
// The value can be one of the exportValue or any other values.
const option = this.data.options.find(
({ exportValue }) => value === exportValue
);
value = (option && option.displayValue) || value;
}

if (value === "") {
Expand Down