Allow indent to use other options than left and hanging
This is a breaking change. Existing code using indent will break when padding in the number for left.
This commit is contained in:
@ -3,22 +3,25 @@ import { XmlAttributeComponent, XmlComponent } from "../xml-components";
|
|||||||
interface IIndentAttributesProperties {
|
interface IIndentAttributesProperties {
|
||||||
left?: number;
|
left?: number;
|
||||||
hanging?: number;
|
hanging?: number;
|
||||||
|
firstLine?: number;
|
||||||
|
start?: number;
|
||||||
|
end?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
class IndentAttributes extends XmlAttributeComponent<IIndentAttributesProperties> {
|
class IndentAttributes extends XmlAttributeComponent<IIndentAttributesProperties> {
|
||||||
protected xmlKeys = {
|
protected xmlKeys = {
|
||||||
left: "w:left",
|
left: "w:left",
|
||||||
hanging: "w:hanging",
|
hanging: "w:hanging",
|
||||||
|
firstLine: "w:firstLine",
|
||||||
|
start: "w:start",
|
||||||
|
end: "w:end",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Indent extends XmlComponent {
|
export class Indent extends XmlComponent {
|
||||||
|
|
||||||
constructor(left: number, hanging?: number) {
|
constructor(attrs: object) {
|
||||||
super("w:ind");
|
super("w:ind");
|
||||||
this.root.push(new IndentAttributes({
|
this.root.push(new IndentAttributes(attrs));
|
||||||
left: left,
|
|
||||||
hanging: hanging,
|
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -134,8 +134,8 @@ export class Paragraph extends XmlComponent {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public indent(start: number, hanging?: number): Paragraph {
|
public indent(attrs: object): Paragraph {
|
||||||
this.properties.push(new Indent(start, hanging));
|
this.properties.push(new Indent(attrs));
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -241,7 +241,7 @@ describe("Paragraph", () => {
|
|||||||
|
|
||||||
describe("#indent", () => {
|
describe("#indent", () => {
|
||||||
it("should set the paragraph indent to the given values", () => {
|
it("should set the paragraph indent to the given values", () => {
|
||||||
paragraph.indent(720);
|
paragraph.indent({ left: 720 });
|
||||||
const tree = new Formatter().format(paragraph);
|
const tree = new Formatter().format(paragraph);
|
||||||
expect(tree).to.deep.equal({
|
expect(tree).to.deep.equal({
|
||||||
"w:p": [
|
"w:p": [
|
||||||
|
@ -35,39 +35,39 @@ export class Numbering extends XmlComponent {
|
|||||||
const abstractNumbering = this.createAbstractNumbering();
|
const abstractNumbering = this.createAbstractNumbering();
|
||||||
|
|
||||||
abstractNumbering.createLevel(0, "bullet", "•", "left")
|
abstractNumbering.createLevel(0, "bullet", "•", "left")
|
||||||
.addParagraphProperty(new Indent(720, 360))
|
.addParagraphProperty(new Indent({ left: 720, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Symbol", "default"));
|
.addRunProperty(new RunFonts("Symbol", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(1, "bullet", "o", "left")
|
abstractNumbering.createLevel(1, "bullet", "o", "left")
|
||||||
.addParagraphProperty(new Indent(1440, 360))
|
.addParagraphProperty(new Indent({ left: 1440, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Courier New", "default"));
|
.addRunProperty(new RunFonts("Courier New", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(2, "bullet", "•", "left")
|
abstractNumbering.createLevel(2, "bullet", "•", "left")
|
||||||
.addParagraphProperty(new Indent(2160, 360))
|
.addParagraphProperty(new Indent({ left: 2160, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Wingdings", "default"));
|
.addRunProperty(new RunFonts("Wingdings", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(3, "bullet", "•", "left")
|
abstractNumbering.createLevel(3, "bullet", "•", "left")
|
||||||
.addParagraphProperty(new Indent(2880, 360))
|
.addParagraphProperty(new Indent({ left: 2880, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Symbol", "default"));
|
.addRunProperty(new RunFonts("Symbol", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(4, "bullet", "o", "left")
|
abstractNumbering.createLevel(4, "bullet", "o", "left")
|
||||||
.addParagraphProperty(new Indent(3600, 360))
|
.addParagraphProperty(new Indent({ left: 3600, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Courier New", "default"));
|
.addRunProperty(new RunFonts("Courier New", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(5, "bullet", "•", "left")
|
abstractNumbering.createLevel(5, "bullet", "•", "left")
|
||||||
.addParagraphProperty(new Indent(4320, 360))
|
.addParagraphProperty(new Indent({ left: 4320, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Wingdings", "default"));
|
.addRunProperty(new RunFonts("Wingdings", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(6, "bullet", "•", "left")
|
abstractNumbering.createLevel(6, "bullet", "•", "left")
|
||||||
.addParagraphProperty(new Indent(5040, 360))
|
.addParagraphProperty(new Indent({ left: 5040, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Symbol", "default"));
|
.addRunProperty(new RunFonts("Symbol", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(7, "bullet", "o", "left")
|
abstractNumbering.createLevel(7, "bullet", "o", "left")
|
||||||
.addParagraphProperty(new Indent(5760, 360))
|
.addParagraphProperty(new Indent({ left: 5760, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Courier New", "default"));
|
.addRunProperty(new RunFonts("Courier New", "default"));
|
||||||
|
|
||||||
abstractNumbering.createLevel(8, "bullet", "•", "left")
|
abstractNumbering.createLevel(8, "bullet", "•", "left")
|
||||||
.addParagraphProperty(new Indent(6480, 360))
|
.addParagraphProperty(new Indent({ left: 6480, hanging: 360 }))
|
||||||
.addRunProperty(new RunFonts("Wingdings", "default"));
|
.addRunProperty(new RunFonts("Wingdings", "default"));
|
||||||
|
|
||||||
this.createConcreteNumbering(abstractNumbering);
|
this.createConcreteNumbering(abstractNumbering);
|
||||||
|
@ -196,8 +196,8 @@ export class LevelBase extends XmlComponent {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public indent(left: number, hanging?: number): Level {
|
public indent(attrs: object): Level {
|
||||||
this.addParagraphProperty(new paragraph.Indent(left, hanging));
|
this.addParagraphProperty(new paragraph.Indent(attrs));
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ describe("AbstractNumbering", () => {
|
|||||||
it("#indent", () => {
|
it("#indent", () => {
|
||||||
const abstractNumbering = new AbstractNumbering(1);
|
const abstractNumbering = new AbstractNumbering(1);
|
||||||
const level = abstractNumbering.createLevel(0, "lowerLetter", "%0.")
|
const level = abstractNumbering.createLevel(0, "lowerLetter", "%0.")
|
||||||
.indent(720);
|
.indent({ left: 720 });
|
||||||
const tree = new Formatter().format(level);
|
const tree = new Formatter().format(level);
|
||||||
expect(tree["w:lvl"]).to.include({
|
expect(tree["w:lvl"]).to.include({
|
||||||
"w:pPr": [{"w:ind": [{_attr: {"w:left": 720}}]}],
|
"w:pPr": [{"w:ind": [{_attr: {"w:left": 720}}]}],
|
||||||
|
@ -171,8 +171,8 @@ export class ParagraphStyle extends Style {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public indent(left: number, hanging?: number): ParagraphStyle {
|
public indent(attrs: object): ParagraphStyle {
|
||||||
this.addParagraphProperty(new paragraph.Indent(left, hanging));
|
this.addParagraphProperty(new paragraph.Indent(attrs));
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -185,7 +185,7 @@ describe("ParagraphStyle", () => {
|
|||||||
describe("formatting methods: paragraph properties", () => {
|
describe("formatting methods: paragraph properties", () => {
|
||||||
it("#indent", () => {
|
it("#indent", () => {
|
||||||
const style = new ParagraphStyle("myStyleId")
|
const style = new ParagraphStyle("myStyleId")
|
||||||
.indent(720);
|
.indent({ left: 720 });
|
||||||
const tree = new Formatter().format(style);
|
const tree = new Formatter().format(style);
|
||||||
expect(tree).to.deep.equal({
|
expect(tree).to.deep.equal({
|
||||||
"w:style": [
|
"w:style": [
|
||||||
|
Reference in New Issue
Block a user