move file options.defaultStyles to options.styles.default

This commit is contained in:
Tom Hunkapiller
2020-11-30 10:25:58 -06:00
parent f3ba62fd88
commit 30ab92652c
5 changed files with 84 additions and 85 deletions

View File

@ -1,4 +1,3 @@
import { IDefaultStylesOptions } from "file/styles/factory";
import { XmlComponent } from "file/xml-components";
import { IDocumentBackgroundOptions } from "../document";
@ -29,7 +28,6 @@ export interface IPropertiesOptions {
readonly revision?: string;
readonly externalStyles?: string;
readonly styles?: IStylesOptions;
readonly defaultStyles?: IDefaultStylesOptions;
readonly numbering?: INumberingOptions;
readonly footnotes?: Paragraph[];
readonly hyperlinks?: {

View File

@ -106,14 +106,14 @@ export class File {
this.styles = stylesFactory.newInstance(options.externalStyles);
} else if (options.styles) {
const stylesFactory = new DefaultStylesFactory();
const defaultStyles = stylesFactory.newInstance(options.defaultStyles);
const defaultStyles = stylesFactory.newInstance(options.styles.default);
this.styles = new Styles({
...defaultStyles,
...options.styles,
});
} else {
const stylesFactory = new DefaultStylesFactory();
this.styles = new Styles(stylesFactory.newInstance(options.defaultStyles));
this.styles = new Styles(stylesFactory.newInstance());
}
this.addDefaultRelationships();

View File

@ -1,11 +1,12 @@
import { IDefaultStylesOptions } from "file/styles/factory";
import { BaseXmlComponent, ImportedXmlComponent, XmlComponent } from "file/xml-components";
import { StyleForCharacter, StyleForParagraph } from "./style";
import { ICharacterStyleOptions } from "./style/character-style";
import { IParagraphStyleOptions } from "./style/paragraph-style";
export * from "./border";
export interface IStylesOptions {
readonly default?: IDefaultStylesOptions;
readonly initialStyles?: BaseXmlComponent;
readonly paragraphStyles?: IParagraphStyleOptions[];
readonly characterStyles?: ICharacterStyleOptions[];