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

Merge pull request #1199 from anti-the-social/table-width-percent-unit-handling

Browse Source 
Table width percent unit handling
This commit is contained in:
Dolan
2021-09-28 18:54:30 +01:00
committed by GitHub
parent f1627c378d 705b1f7cfc
commit 1f078e0687
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/file/table/table-width.ts
View File

@ -38,6 +38,10 @@ export class TableWidthElement extends XmlComponent {
constructor(name: string, { type = WidthType.AUTO, size }: ITableWidthProperties) {
super(name);
// super("w:tblW");
this.root.push(new TableWidthAttributes({ type: type, size: measurementOrPercentValue(size) }));
let tableWidthValue = size;
if (type === WidthType.PERCENTAGE && typeof size === "number") {
tableWidthValue = `${size}%`;
}
this.root.push(new TableWidthAttributes({ type: type, size: measurementOrPercentValue(tableWidthValue) }));
}
}

39
src/file/table/table.spec.ts
View File

@ -257,7 +257,7 @@ describe("Table", () => {
});
});
it("should set the table to provided width", () => {
it("should set the table to provided 100% width", () => {
const table = new Table({
rows: [
new TableRow({
@ -282,7 +282,42 @@ describe("Table", () => {
"w:tblW": {
_attr: {
"w:type": "pct",
"w:w": 100,
"w:w": "100%",
},
},
},
BORDERS,
{ "w:tblLayout": { _attr: { "w:type": "fixed" } } },
],
});
});
it("should set the table to provided 1000 DXA", () => {
const table = new Table({
rows: [
new TableRow({
children: [
new TableCell({
children: [new Paragraph("hello")],
}),
],
}),
],
width: {
size: 1000,
type: WidthType.DXA,
},
layout: TableLayoutType.FIXED,
});
const tree = new Formatter().format(table);
expect(tree).to.have.property("w:tbl").which.is.an("array").with.has.length.at.least(1);
expect(tree["w:tbl"][0]).to.deep.equal({
"w:tblPr": [
{
"w:tblW": {
_attr: {
"w:type": "dxa",
"w:w": 1000,
},
},
},