Use next attribute component
This commit is contained in:
@ -38,9 +38,7 @@ describe("Table Float Properties", () => {
|
||||
expect(tree).to.deep.equal({
|
||||
"w:tblpPr": [
|
||||
{
|
||||
_attr: {
|
||||
overlap: "never",
|
||||
},
|
||||
_attr: {},
|
||||
},
|
||||
{
|
||||
"w:tblOverlap": {
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { StringEnumValueElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components";
|
||||
import { NextAttributeComponent, StringEnumValueElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components";
|
||||
import { PositiveUniversalMeasure, signedTwipsMeasureValue, twipsMeasureValue, UniversalMeasure } from "@util/values";
|
||||
|
||||
export enum TableAnchorType {
|
||||
@ -35,7 +35,7 @@ export enum OverlapType {
|
||||
OVERLAP = "overlap",
|
||||
}
|
||||
|
||||
export interface ITableFloatOptions {
|
||||
export type ITableFloatOptions = {
|
||||
/* cSpell:disable */
|
||||
/**
|
||||
* Specifies the horizontal anchor or the base object from which the horizontal positioning in the
|
||||
@ -124,7 +124,7 @@ export interface ITableFloatOptions {
|
||||
*/
|
||||
readonly rightFromText?: number | PositiveUniversalMeasure;
|
||||
readonly overlap?: OverlapType;
|
||||
}
|
||||
};
|
||||
|
||||
// <xsd:complexType name="CT_TblPPr">
|
||||
// <xsd:attribute name="leftFromText" type="s:ST_TwipsMeasure"/>
|
||||
@ -156,34 +156,63 @@ export class TableFloatOptionsAttributes extends XmlAttributeComponent<ITableFlo
|
||||
|
||||
export class TableFloatProperties extends XmlComponent {
|
||||
public constructor({
|
||||
horizontalAnchor,
|
||||
verticalAnchor,
|
||||
absoluteHorizontalPosition,
|
||||
relativeHorizontalPosition,
|
||||
absoluteVerticalPosition,
|
||||
relativeVerticalPosition,
|
||||
bottomFromText,
|
||||
topFromText,
|
||||
leftFromText,
|
||||
rightFromText,
|
||||
topFromText,
|
||||
bottomFromText,
|
||||
absoluteHorizontalPosition,
|
||||
absoluteVerticalPosition,
|
||||
...options
|
||||
overlap,
|
||||
}: ITableFloatOptions) {
|
||||
super("w:tblpPr");
|
||||
this.root.push(
|
||||
new TableFloatOptionsAttributes({
|
||||
leftFromText: leftFromText === undefined ? undefined : twipsMeasureValue(leftFromText),
|
||||
rightFromText: rightFromText === undefined ? undefined : twipsMeasureValue(rightFromText),
|
||||
topFromText: topFromText === undefined ? undefined : twipsMeasureValue(topFromText),
|
||||
bottomFromText: bottomFromText === undefined ? undefined : twipsMeasureValue(bottomFromText),
|
||||
absoluteHorizontalPosition:
|
||||
absoluteHorizontalPosition === undefined ? undefined : signedTwipsMeasureValue(absoluteHorizontalPosition),
|
||||
absoluteVerticalPosition:
|
||||
absoluteVerticalPosition === undefined ? undefined : signedTwipsMeasureValue(absoluteVerticalPosition),
|
||||
...options,
|
||||
new NextAttributeComponent<Omit<ITableFloatOptions, "overlap">>({
|
||||
leftFromText: { key: "w:leftFromText", value: leftFromText === undefined ? undefined : twipsMeasureValue(leftFromText) },
|
||||
rightFromText: {
|
||||
key: "w:rightFromText",
|
||||
value: rightFromText === undefined ? undefined : twipsMeasureValue(rightFromText),
|
||||
},
|
||||
topFromText: { key: "w:topFromText", value: topFromText === undefined ? undefined : twipsMeasureValue(topFromText) },
|
||||
bottomFromText: {
|
||||
key: "w:bottomFromText",
|
||||
value: bottomFromText === undefined ? undefined : twipsMeasureValue(bottomFromText),
|
||||
},
|
||||
absoluteHorizontalPosition: {
|
||||
key: "w:tblpX",
|
||||
value: absoluteHorizontalPosition === undefined ? undefined : signedTwipsMeasureValue(absoluteHorizontalPosition),
|
||||
},
|
||||
absoluteVerticalPosition: {
|
||||
key: "w:tblpY",
|
||||
value: absoluteVerticalPosition === undefined ? undefined : signedTwipsMeasureValue(absoluteVerticalPosition),
|
||||
},
|
||||
horizontalAnchor: {
|
||||
key: "w:horzAnchor",
|
||||
value: horizontalAnchor === undefined ? undefined : horizontalAnchor,
|
||||
},
|
||||
relativeHorizontalPosition: {
|
||||
key: "w:tblpXSpec",
|
||||
value: relativeHorizontalPosition,
|
||||
},
|
||||
relativeVerticalPosition: {
|
||||
key: "w:tblpYSpec",
|
||||
value: relativeVerticalPosition,
|
||||
},
|
||||
verticalAnchor: {
|
||||
key: "w:vertAnchor",
|
||||
value: verticalAnchor,
|
||||
},
|
||||
}),
|
||||
);
|
||||
|
||||
if (options.overlap) {
|
||||
if (overlap) {
|
||||
// <xsd:complexType name="CT_TblOverlap">
|
||||
// <xsd:attribute name="val" type="ST_TblOverlap" use="required"/>
|
||||
// </xsd:complexType>
|
||||
this.root.push(new StringEnumValueElement<OverlapType>("w:tblOverlap", options.overlap));
|
||||
this.root.push(new StringEnumValueElement<OverlapType>("w:tblOverlap", overlap));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user