From 6b3d1d55795d099e7b28f1ad2954ea74b8c54942 Mon Sep 17 00:00:00 2001 From: SoapyD Date: Thu, 16 Jul 2020 12:37:24 +0000 Subject: [PATCH] modifications make to table-row files to correct table-row height property. Code was previously using height.height ini setHeight but should instead be using value. --- src/file/table/table-row/table-row-height.ts | 6 +++--- src/file/table/table-row/table-row-properties.ts | 4 ++-- src/file/table/table-row/table-row.spec.ts | 2 +- src/file/table/table-row/table-row.ts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/file/table/table-row/table-row-height.ts b/src/file/table/table-row/table-row-height.ts index 71e2c36aa1..79e4266201 100644 --- a/src/file/table/table-row/table-row-height.ts +++ b/src/file/table/table-row/table-row-height.ts @@ -10,12 +10,12 @@ export enum HeightRule { } interface ITableRowHeight { - readonly height: number; + readonly value: number; readonly rule: HeightRule; } export class TableRowHeightAttributes extends XmlAttributeComponent { - protected readonly xmlKeys = { height: "w:val", rule: "w:hRule" }; + protected readonly xmlKeys = { value: "w:val", rule: "w:hRule" }; } export class TableRowHeight extends XmlComponent { @@ -24,7 +24,7 @@ export class TableRowHeight extends XmlComponent { this.root.push( new TableRowHeightAttributes({ - height: value, + value: value, rule: rule, }), ); diff --git a/src/file/table/table-row/table-row-properties.ts b/src/file/table/table-row/table-row-properties.ts index c9b60c13f4..041fb2b640 100644 --- a/src/file/table/table-row/table-row-properties.ts +++ b/src/file/table/table-row/table-row-properties.ts @@ -18,8 +18,8 @@ export class TableRowProperties extends IgnoreIfEmptyXmlComponent { return this; } - public setHeight(height: number, rule: HeightRule): TableRowProperties { - this.root.push(new TableRowHeight(height, rule)); + public setHeight(value: number, rule: HeightRule): TableRowProperties { + this.root.push(new TableRowHeight(value, rule)); return this; } diff --git a/src/file/table/table-row/table-row.spec.ts b/src/file/table/table-row/table-row.spec.ts index 90f6ad4937..16a08e10ae 100644 --- a/src/file/table/table-row/table-row.spec.ts +++ b/src/file/table/table-row/table-row.spec.ts @@ -92,7 +92,7 @@ describe("TableRow", () => { const tableRow = new TableRow({ children: [], height: { - height: 100, + value: 100, rule: HeightRule.EXACT, }, }); diff --git a/src/file/table/table-row/table-row.ts b/src/file/table/table-row/table-row.ts index 11ea0bb2e2..5f2e03105a 100644 --- a/src/file/table/table-row/table-row.ts +++ b/src/file/table/table-row/table-row.ts @@ -7,7 +7,7 @@ export interface ITableRowOptions { readonly cantSplit?: boolean; readonly tableHeader?: boolean; readonly height?: { - readonly height: number; + readonly value: number; readonly rule: HeightRule; }; readonly children: TableCell[]; @@ -34,7 +34,7 @@ export class TableRow extends XmlComponent { } if (options.height) { - this.properties.setHeight(options.height.height, options.height.rule); + this.properties.setHeight(options.height.value, options.height.rule); } }