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

Merge pull request #1285 from erlend-axelsson/master

Browse Source 
Dont set background color if none is provided in options
This commit is contained in:
Dolan
2021-11-15 11:05:37 +00:00
committed by GitHub
parent 0757295213 ba963b0360
commit c28e6ac22e
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/file/document/document-background/document-background.spec.ts
View File

@ -6,14 +6,12 @@ import { DocumentBackground } from "./document-background";
describe("DocumentBackground", () => { describe("DocumentBackground", () => {
describe("#constructor()", () => { describe("#constructor()", () => {
it("should create a DocumentBackground with no options and set color to auto", () => { it("should create a DocumentBackground with no options", () => {
const documentBackground = new DocumentBackground({}); const documentBackground = new DocumentBackground({});
const tree = new Formatter().format(documentBackground); const tree = new Formatter().format(documentBackground);
expect(tree).to.deep.equal({ expect(tree).to.deep.equal({
"w:background": { "w:background": {
_attr: { _attr: {},
"w:color": "FFFFFF",
},
}, },
}); });
}); });

4
src/file/document/document-background/document-background.ts
View File

@ -26,7 +26,7 @@ import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
// </xsd:simpleType> // </xsd:simpleType>
export class DocumentBackgroundAttributes extends XmlAttributeComponent<{ export class DocumentBackgroundAttributes extends XmlAttributeComponent<{
readonly color: string; readonly color?: string;
readonly themeColor?: string; readonly themeColor?: string;
readonly themeShade?: string; readonly themeShade?: string;
readonly themeTint?: string; readonly themeTint?: string;
@ -68,7 +68,7 @@ export class DocumentBackground extends XmlComponent {
this.root.push( this.root.push(
new DocumentBackgroundAttributes({ new DocumentBackgroundAttributes({
color: hexColorValue(options.color ? options.color : "FFFFFF"), color: options.color === undefined ? undefined : hexColorValue(options.color),
themeColor: options.themeColor, themeColor: options.themeColor,
themeShade: options.themeShade === undefined ? undefined : uCharHexNumber(options.themeShade), themeShade: options.themeShade === undefined ? undefined : uCharHexNumber(options.themeShade),
themeTint: options.themeTint === undefined ? undefined : uCharHexNumber(options.themeTint), themeTint: options.themeTint === undefined ? undefined : uCharHexNumber(options.themeTint),

4
src/file/document/document.spec.ts
View File

@ -40,9 +40,7 @@ describe("Document", () => {
}, },
{ {
"w:background": { "w:background": {
_attr: { _attr: {},
"w:color": "FFFFFF",
},
}, },
}, },
{ "w:body": {} }, { "w:body": {} },