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

Use next attribute component

Browse Source
This commit is contained in:
Dolan Miu
2023-02-04 22:11:47 +00:00
parent 46ded68369
commit 3077ca96a7
2 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/file/table/table-properties/table-float-properties.spec.ts
View File

@ -38,9 +38,7 @@ describe("Table Float Properties", () => {
expect(tree).to.deep.equal({ expect(tree).to.deep.equal({
"w:tblpPr": [ "w:tblpPr": [
{ {
_attr: { _attr: {},
overlap: "never",
},
}, },
{ {
"w:tblOverlap": { "w:tblOverlap": {

69
src/file/table/table-properties/table-float-properties.ts
View File

@ -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"; import { PositiveUniversalMeasure, signedTwipsMeasureValue, twipsMeasureValue, UniversalMeasure } from "@util/values";
export enum TableAnchorType { export enum TableAnchorType {
@ -35,7 +35,7 @@ export enum OverlapType {
OVERLAP = "overlap", OVERLAP = "overlap",
} }
export interface ITableFloatOptions { export type ITableFloatOptions = {
/* cSpell:disable */ /* cSpell:disable */
/** /**
* Specifies the horizontal anchor or the base object from which the horizontal positioning in the * 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 rightFromText?: number | PositiveUniversalMeasure;
readonly overlap?: OverlapType; readonly overlap?: OverlapType;
} };
// <xsd:complexType name="CT_TblPPr"> // <xsd:complexType name="CT_TblPPr">
// <xsd:attribute name="leftFromText" type="s:ST_TwipsMeasure"/> // <xsd:attribute name="leftFromText" type="s:ST_TwipsMeasure"/>
@ -156,34 +156,63 @@ export class TableFloatOptionsAttributes extends XmlAttributeComponent<ITableFlo
export class TableFloatProperties extends XmlComponent { export class TableFloatProperties extends XmlComponent {
public constructor({ public constructor({
horizontalAnchor,
verticalAnchor,
absoluteHorizontalPosition,
relativeHorizontalPosition,
absoluteVerticalPosition,
relativeVerticalPosition,
bottomFromText,
topFromText,
leftFromText, leftFromText,
rightFromText, rightFromText,
topFromText, overlap,
bottomFromText,
absoluteHorizontalPosition,
absoluteVerticalPosition,
...options
}: ITableFloatOptions) { }: ITableFloatOptions) {
super("w:tblpPr"); super("w:tblpPr");
this.root.push( this.root.push(
new TableFloatOptionsAttributes({ new NextAttributeComponent<Omit<ITableFloatOptions, "overlap">>({
leftFromText: leftFromText === undefined ? undefined : twipsMeasureValue(leftFromText), leftFromText: { key: "w:leftFromText", value: leftFromText === undefined ? undefined : twipsMeasureValue(leftFromText) },
rightFromText: rightFromText === undefined ? undefined : twipsMeasureValue(rightFromText), rightFromText: {
topFromText: topFromText === undefined ? undefined : twipsMeasureValue(topFromText), key: "w:rightFromText",
bottomFromText: bottomFromText === undefined ? undefined : twipsMeasureValue(bottomFromText), value: rightFromText === undefined ? undefined : twipsMeasureValue(rightFromText),
absoluteHorizontalPosition: },
absoluteHorizontalPosition === undefined ? undefined : signedTwipsMeasureValue(absoluteHorizontalPosition), topFromText: { key: "w:topFromText", value: topFromText === undefined ? undefined : twipsMeasureValue(topFromText) },
absoluteVerticalPosition: bottomFromText: {
absoluteVerticalPosition === undefined ? undefined : signedTwipsMeasureValue(absoluteVerticalPosition), key: "w:bottomFromText",
...options, 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:complexType name="CT_TblOverlap">
// <xsd:attribute name="val" type="ST_TblOverlap" use="required"/> // <xsd:attribute name="val" type="ST_TblOverlap" use="required"/>
// </xsd:complexType> // </xsd:complexType>
this.root.push(new StringEnumValueElement<OverlapType>("w:tblOverlap", options.overlap)); this.root.push(new StringEnumValueElement<OverlapType>("w:tblOverlap", overlap));
} }
} }
} }