Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13165 from Snuffleupagus/Annotation-rm-defaultAppearance-export

Browse Source 
[api-minor] Stop exposing the *raw* `defaultAppearance`-string on Annotation-instances
This commit is contained in:
Tim van der Meij 2021-03-31 21:30:50 +02:00 committed by GitHub
commit 1a4af17d07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/annotation.js
View File

@ -128,9 +128,7 @@ class AnnotationFactory {
return new ChoiceWidgetAnnotation(parameters); return new ChoiceWidgetAnnotation(parameters);
} }
warn( warn(
'Unimplemented widget field type "' + `Unimplemented widget field type "${fieldType}", ` +
fieldType +
'", ' +
"falling back to base field type." "falling back to base field type."
); );
return new WidgetAnnotation(parameters); return new WidgetAnnotation(parameters);
@ -186,9 +184,7 @@ class AnnotationFactory {
warn("Annotation is missing the required /Subtype."); warn("Annotation is missing the required /Subtype.");
} else { } else {
warn( warn(
'Unimplemented annotation type "' + `Unimplemented annotation type "${subtype}", ` +
subtype +
'", ' +
"falling back to base annotation." "falling back to base annotation."
); );
} }
@ -1119,14 +1115,15 @@ class WidgetAnnotation extends Annotation {
data.defaultFieldValue = this._decodeFormValue(defaultFieldValue); data.defaultFieldValue = this._decodeFormValue(defaultFieldValue);
data.alternativeText = stringToPDFString(dict.get("TU") || ""); data.alternativeText = stringToPDFString(dict.get("TU") || "");
const defaultAppearance = const defaultAppearance =
getInheritableProperty({ dict, key: "DA" }) || getInheritableProperty({ dict, key: "DA" }) || params.acroForm.get("DA");
params.acroForm.get("DA") || this._defaultAppearance = isString(defaultAppearance)
"";
data.defaultAppearance = isString(defaultAppearance)
? defaultAppearance ? defaultAppearance
: ""; : "";
data.defaultAppearanceData = parseDefaultAppearance(data.defaultAppearance); data.defaultAppearanceData = parseDefaultAppearance(
this._defaultAppearance
);
const fieldType = getInheritableProperty({ dict, key: "FT" }); const fieldType = getInheritableProperty({ dict, key: "FT" });
data.fieldType = isName(fieldType) ? fieldType.name : null; data.fieldType = isName(fieldType) ? fieldType.name : null;
@ -1232,7 +1229,7 @@ class WidgetAnnotation extends Annotation {
// Even if there is an appearance stream, ignore it. This is the // Even if there is an appearance stream, ignore it. This is the
// behaviour used by Adobe Reader. // behaviour used by Adobe Reader.
if (!this.data.defaultAppearance || content === null) { if (!this._defaultAppearance || content === null) {
return operatorList; return operatorList;
} }
@ -1378,15 +1375,14 @@ class WidgetAnnotation extends Annotation {
const totalHeight = this.data.rect[3] - this.data.rect[1]; const totalHeight = this.data.rect[3] - this.data.rect[1];
const totalWidth = this.data.rect[2] - this.data.rect[0]; const totalWidth = this.data.rect[2] - this.data.rect[0];
if (!this.data.defaultAppearance) { if (!this._defaultAppearance) {
// The DA is required and must be a string. // The DA is required and must be a string.
// If there is no font named Helvetica in the resource dictionary, // If there is no font named Helvetica in the resource dictionary,
// the evaluator will fall back to a default font. // the evaluator will fall back to a default font.
// Doing so prevents exceptions and allows saving/printing // Doing so prevents exceptions and allows saving/printing
// the file as expected. // the file as expected.
this.data.defaultAppearance = "/Helvetica 0 Tf 0 g";
this.data.defaultAppearanceData = parseDefaultAppearance( this.data.defaultAppearanceData = parseDefaultAppearance(
this.data.defaultAppearance (this._defaultAppearance = "/Helvetica 0 Tf 0 g")
); );
} }
@ -1487,7 +1483,7 @@ class WidgetAnnotation extends Annotation {
_computeFontSize(height, lineCount) { _computeFontSize(height, lineCount) {
let { fontSize } = this.data.defaultAppearanceData; let { fontSize } = this.data.defaultAppearanceData;
if (fontSize === null || fontSize === 0) { if (!fontSize) {
// A zero value for size means that the font shall be auto-sized: // A zero value for size means that the font shall be auto-sized:
// its size shall be computed as a function of the height of the // its size shall be computed as a function of the height of the
// annotation rectangle (see 12.7.3.3). // annotation rectangle (see 12.7.3.3).
@ -1516,13 +1512,13 @@ class WidgetAnnotation extends Annotation {
} }
const { fontName, fontColor } = this.data.defaultAppearanceData; const { fontName, fontColor } = this.data.defaultAppearanceData;
this.data.defaultAppearance = createDefaultAppearance({ this._defaultAppearance = createDefaultAppearance({
fontSize, fontSize,
fontName, fontName,
fontColor, fontColor,
}); });
} }
return [this.data.defaultAppearance, fontSize]; return [this._defaultAppearance, fontSize];
} }
_renderText(text, font, fontSize, totalWidth, alignment, hPadding, vPadding) { _renderText(text, font, fontSize, totalWidth, alignment, hPadding, vPadding) {