smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ordering of elements in paragraph-properties

Browse Source
This commit is contained in:
Tom Hunkapiller
2021-05-20 01:06:07 +03:00
parent d0a675fde6
commit 56b18d3793
3 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/file/paragraph/paragraph.ts
View File

@ -43,7 +43,7 @@ export class Paragraph extends XmlComponent {
this.properties = new ParagraphProperties({}); this.properties = new ParagraphProperties({});
this.root.push(this.properties); this.root.push(this.properties);
this.root.push(new TextRun(options)); this.root.push(new TextRun(options));
return; return this;
} }
this.properties = new ParagraphProperties(options); this.properties = new ParagraphProperties(options);

135
src/file/paragraph/properties.ts
View File

@ -66,70 +66,15 @@ export class ParagraphProperties extends IgnoreIfEmptyXmlComponent {
super("w:pPr"); super("w:pPr");
if (!options) { if (!options) {
return; return this;
}
if (options.border) {
this.push(new Border(options.border));
}
if (options.spacing) {
this.push(new Spacing(options.spacing));
}
if (options.outlineLevel !== undefined) {
this.push(new OutlineLevel(options.outlineLevel));
}
if (options.alignment) {
this.push(new Alignment(options.alignment));
} }
if (options.heading) { if (options.heading) {
this.push(new Style(options.heading)); this.push(new Style(options.heading));
} }
if (options.bidirectional) {
this.push(new Bidirectional());
}
if (options.thematicBreak) {
this.push(new ThematicBreak());
}
if (options.pageBreakBefore) {
this.push(new PageBreakBefore());
}
if (options.contextualSpacing) {
this.push(new ContextualSpacing(options.contextualSpacing));
}
if (options.indent) {
this.push(new Indent(options.indent));
}
if (options.keepLines) {
this.push(new KeepLines());
}
if (options.keepNext) {
this.push(new KeepNext());
}
if (options.tabStops) {
for (const tabStop of options.tabStops) {
this.push(new TabStop(tabStop.type, tabStop.position, tabStop.leader));
}
}
if (options.style) {
this.push(new Style(options.style));
}
if (options.bullet) { if (options.bullet) {
this.push(new Style("ListParagraph")); this.push(new Style("ListParagraph"));
this.push(new NumberProperties(1, options.bullet.level));
} }
if (options.numbering) { if (options.numbering) {
@ -138,6 +83,37 @@ export class ParagraphProperties extends IgnoreIfEmptyXmlComponent {
this.push(new Style("ListParagraph")); this.push(new Style("ListParagraph"));
} }
} }
}
if (options.style) {
this.push(new Style(options.style));
}
if (options.keepNext) {
this.push(new KeepNext());
}
if (options.keepLines) {
this.push(new KeepLines());
}
if (options.pageBreakBefore) {
this.push(new PageBreakBefore());
}
if (options.frame) {
this.push(new FrameProperties(options.frame));
}
if (options.widowControl) {
this.push(new WidowControl(options.widowControl));
}
if (options.bullet) {
this.push(new NumberProperties(1, options.bullet.level));
}
if (options.numbering) {
this.numberingReferences.push({ this.numberingReferences.push({
reference: options.numbering.reference, reference: options.numbering.reference,
instance: options.numbering.instance ?? 0, instance: options.numbering.instance ?? 0,
@ -146,24 +122,55 @@ export class ParagraphProperties extends IgnoreIfEmptyXmlComponent {
this.push(new NumberProperties(`${options.numbering.reference}-${options.numbering.instance ?? 0}`, options.numbering.level)); this.push(new NumberProperties(`${options.numbering.reference}-${options.numbering.instance ?? 0}`, options.numbering.level));
} }
if (options.rightTabStop) { if (options.border) {
this.push(new TabStop(TabStopType.RIGHT, options.rightTabStop)); this.push(new Border(options.border));
} }
if (options.leftTabStop) { if (options.thematicBreak) {
this.push(new TabStop(TabStopType.LEFT, options.leftTabStop)); this.push(new ThematicBreak());
} }
if (options.shading) { if (options.shading) {
this.push(new Shading(options.shading.type, options.shading.fill, options.shading.color)); this.push(new Shading(options.shading.type, options.shading.fill, options.shading.color));
} }
if (options.widowControl) { if (options.rightTabStop) {
this.push(new WidowControl(options.widowControl)); this.push(new TabStop(TabStopType.RIGHT, options.rightTabStop));
} }
if (options.frame) { if (options.tabStops) {
this.push(new FrameProperties(options.frame)); for (const tabStop of options.tabStops) {
this.push(new TabStop(tabStop.type, tabStop.position, tabStop.leader));
}
}
if (options.leftTabStop) {
this.push(new TabStop(TabStopType.LEFT, options.leftTabStop));
}
if (options.bidirectional) {
this.push(new Bidirectional());
}
if (options.spacing) {
this.push(new Spacing(options.spacing));
}
if (options.indent) {
this.push(new Indent(options.indent));
}
if (options.contextualSpacing) {
this.push(new ContextualSpacing(options.contextualSpacing));
}
if (options.alignment) {
this.push(new Alignment(options.alignment));
}
if (options.outlineLevel !== undefined) {
this.push(new OutlineLevel(options.outlineLevel));
} }
} }

2
src/file/paragraph/run/text-run.ts
View File

@ -6,7 +6,7 @@ export class TextRun extends Run {
if (typeof options === "string") { if (typeof options === "string") {
super({}); super({});
this.root.push(new Text(options)); this.root.push(new Text(options));
return; return this;
} }
super(options); super(options);