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

move file options.defaultStyles to options.styles.default

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
demo/11-declaritive-styles-2.ts
View File

@ -17,7 +17,8 @@ import {
} from "../build";
const doc = new Document({
defaultStyles: {
styles: {
default: {
heading1: {
run: {
font: "Calibri",
@ -65,7 +66,6 @@ const doc = new Document({
},
},
},
styles: {
paragraphStyles: [
{
id: "normalPara",

4
demo/2-declaritive-styles.ts
View File

@ -7,7 +7,8 @@ const doc = new Document({
creator: "Clippy",
title: "Sample Document",
description: "A brief example of using docx",
defaultStyles: {
styles: {
default: {
heading1: {
run: {
size: 28,
@ -43,7 +44,6 @@ const doc = new Document({
}
}
},
styles: {
paragraphStyles: [
{
id: "aside",

2
src/file/core-properties/properties.ts
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?: {

4
src/file/file.ts
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();

3
src/file/styles/styles.ts
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[];