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

Fix ordering of elements in table, table-cell, table-properties, table-cell-properties, table-cell-margin

Browse Source
This commit is contained in:
Tom Hunkapiller
2021-05-20 01:03:09 +03:00
parent 45130bed0b
commit d0a675fde6
9 changed files with 94 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/file/table/table-properties/table-cell-margin.ts
View File

@ -35,10 +35,6 @@ export class TableCellMargin extends IgnoreIfEmptyXmlComponent {
constructor(options: ITableCellMarginOptions) {
super("w:tblCellMar");
if (options.bottom) {
this.root.push(new BaseTableCellMargin("w:bottom", options.bottom));
}
if (options.top) {
this.root.push(new BaseTableCellMargin("w:top", options.top));
}
@ -47,6 +43,10 @@ export class TableCellMargin extends IgnoreIfEmptyXmlComponent {
this.root.push(new BaseTableCellMargin("w:left", options.left));
}
if (options.bottom) {
this.root.push(new BaseTableCellMargin("w:bottom", options.bottom));
}
if (options.right) {
this.root.push(new BaseTableCellMargin("w:right", options.right));
}

26
src/file/table/table-properties/table-properties.ts
View File

@ -35,34 +35,34 @@ export class TableProperties extends IgnoreIfEmptyXmlComponent {
this.root.push(new TableStyle(options.style));
}
this.root.push(new TableCellMargin(options.cellMargin || {}));
if (options.float) {
this.root.push(new TableFloatProperties(options.float));
}
if (options.borders) {
this.root.push(new TableBorders(options.borders));
if (options.visuallyRightToLeft) {
this.root.push(new VisuallyRightToLeft());
}
if (options.width) {
this.root.push(new PreferredTableWidth(options.width.type, options.width.size));
}
if (options.float) {
this.root.push(new TableFloatProperties(options.float));
}
if (options.layout) {
this.root.push(new TableLayout(options.layout));
}
if (options.alignment) {
this.root.push(new Alignment(options.alignment));
}
if (options.borders) {
this.root.push(new TableBorders(options.borders));
}
if (options.shading) {
this.root.push(new TableShading(options.shading));
}
if (options.visuallyRightToLeft) {
this.root.push(new VisuallyRightToLeft());
if (options.layout) {
this.root.push(new TableLayout(options.layout));
}
this.root.push(new TableCellMargin(options.cellMargin || {}));
}
}