Skip to content

Inconsistent FormField state retrieval due to generic class instantiation #421

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

Closed
arku-mosai wants to merge 1 commit into from
Closed

Inconsistent FormField state retrieval due to generic class instantiation #421

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
90 changes: 75 additions & 15 deletions src/document/PDFDocument.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import {
WidgetAnnotation,
AnnotationAttachment} from '../annotations/AnnotationModels';
import { Annotation } from '../annotations/Annotation';
import { FormField } from '../forms/FormField';
import { FormElement } from '../forms/FormElement';
import { ButtonFormField, ChoiceFormField, FormField } from '../forms/FormField';
import { ButtonFormElement, ChoiceFormElement, FormElement } from '../forms/FormElement';
import { Forms } from '../forms/Forms';
import { PDFPageInfo } from './PDFPageInfo';
import { Bookmark } from './Bookmark';
Expand Down Expand Up @@ -250,15 +250,45 @@ export class PDFDocument {
return new UnderlineMarkupAnnotation(annotation);
case 'pspdfkit/widget':
case 'widget':
const widgetAnnotation = new WidgetAnnotation(annotation);
if (annotation.formElement) {
widgetAnnotation.formElement = new FormElement(annotation.formElement);
widgetAnnotation.formElement.pdfViewRef = findNodeHandle(this.pdfViewRef);
if (annotation.formElement.formField) {
widgetAnnotation.formElement.formField = new FormField(annotation.formElement.formField);
const widgetAnnotation = new WidgetAnnotation(annotation);
const formElement = annotation.formElement;
if (formElement) {
const formType = formElement.formTypeName?.toLowerCase();
let formElementInstance;
let formFieldInstance;

switch (formType) {
case 'button':
formElementInstance = new ButtonFormElement(formElement);
if (formElement.formField) {
formFieldInstance = new ButtonFormField(
formElement.formField,
);
}
break;
case 'choice':
formElementInstance = new ChoiceFormElement(formElement);
if (formElement.formField) {
formFieldInstance = new ChoiceFormField(
formElement.formField,
);
}
break;
default:
formElementInstance = new FormElement(formElement);
if (formElement.formField) {
formFieldInstance = new FormField(formElement.formField);
}
break;
}

formElementInstance.pdfViewRef = findNodeHandle(this.pdfViewRef);
if (formFieldInstance) {
formElementInstance.formField = formFieldInstance;
}
}
return widgetAnnotation;
widgetAnnotation.formElement = formElementInstance;
}
return widgetAnnotation;
default:
return undefined;
}
Expand Down Expand Up @@ -353,12 +383,42 @@ export class PDFDocument {
case 'pspdfkit/widget':
case 'widget':
const widgetAnnotation = new WidgetAnnotation(annotation);
if (annotation.formElement) {
widgetAnnotation.formElement = new FormElement(annotation.formElement);
widgetAnnotation.formElement.pdfViewRef = findNodeHandle(this.pdfViewRef);
if (annotation.formElement.formField) {
widgetAnnotation.formElement.formField = new FormField(annotation.formElement.formField);
const formElement = annotation.formElement;
if (formElement) {
const formType = formElement.formTypeName?.toLowerCase();
let formElementInstance;
let formFieldInstance;

switch (formType) {
case 'button':
formElementInstance = new ButtonFormElement(formElement);
if (formElement.formField) {
formFieldInstance = new ButtonFormField(
formElement.formField,
);
}
break;
case 'choice':
formElementInstance = new ChoiceFormElement(formElement);
if (formElement.formField) {
formFieldInstance = new ChoiceFormField(
formElement.formField,
);
}
break;
default:
formElementInstance = new FormElement(formElement);
if (formElement.formField) {
formFieldInstance = new FormField(formElement.formField);
}
break;
}

formElementInstance.pdfViewRef = findNodeHandle(this.pdfViewRef);
if (formFieldInstance) {
formElementInstance.formField = formFieldInstance;
}
widgetAnnotation.formElement = formElementInstance;
}
return widgetAnnotation;
default:
Expand Down