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

unify Shading; breaking change: Paragraph/Run shading option key type changed to val, and shadow alias removed

Browse Source
This commit is contained in:
Tom Hunkapiller
2021-05-23 04:25:07 +03:00
parent fcc393aca2
commit 496fcb55fa
22 changed files with 70 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/file/styles/style/character-style.spec.ts
View File

@ -3,7 +3,7 @@ import { expect } from "chai";
import { Formatter } from "export/formatter";
import { EmphasisMarkType } from "file/paragraph/run/emphasis-mark";
import { UnderlineType } from "file/paragraph/run/underline";
import { ShadingType } from "file/table";
import { ShadingType } from "file/shading";
import { EMPTY_OBJECT } from "file/xml-components";
import { StyleForCharacter } from "./character-style";
@ -777,8 +777,8 @@ describe("CharacterStyle", () => {
const shadingTests = [
{
shadow: {
type: ShadingType.PERCENT_10,
shading: {
val: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
@ -786,42 +786,18 @@ describe("CharacterStyle", () => {
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
val: ShadingType.SOLID,
fill: "AA0000",
color: "DD0000",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
expected: [{ "w:shd": { _attr: { "w:val": "solid", "w:fill": "AA0000", "w:color": "DD0000" } } }],
},
];
shadingTests.forEach(({ shadow, shading, expected }) => {
shadingTests.forEach(({ shading, expected }) => {
it("#shadow correctly", () => {
const style = new StyleForCharacter({
id: "myStyleId",
run: { shadow, shading },
run: { shading },
});
const tree = new Formatter().format(style);
expect(tree).to.deep.equal({

44
src/file/styles/style/paragraph-style.spec.ts
View File

@ -3,7 +3,7 @@ import { expect } from "chai";
import { Formatter } from "export/formatter";
import { AlignmentType, EmphasisMarkType, TabStopPosition } from "file/paragraph";
import { UnderlineType } from "file/paragraph/run/underline";
import { ShadingType } from "file/table";
import { ShadingType } from "file/shading";
import { EMPTY_OBJECT } from "file/xml-components";
import { StyleForParagraph } from "./paragraph-style";
@ -653,8 +653,8 @@ describe("ParagraphStyle", () => {
const shadingTests = [
{
shadow: {
type: ShadingType.PERCENT_10,
shading: {
val: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
@ -662,42 +662,18 @@ describe("ParagraphStyle", () => {
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
val: ShadingType.DIAGONAL_CROSS,
fill: "0066FF",
color: "0000FF",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
},
{
shading: {
type: ShadingType.PERCENT_10,
fill: "00FFFF",
color: "FF0000",
},
expected: [{ "w:shd": { _attr: { "w:val": "pct10", "w:fill": "00FFFF", "w:color": "FF0000" } } }],
expected: [{ "w:shd": { _attr: { "w:val": "diagCross", "w:fill": "0066FF", "w:color": "0000FF" } } }],
},
];
shadingTests.forEach(({ shadow, shading, expected }) => {
it("#shadow correctly", () => {
shadingTests.forEach(({ shading, expected }) => {
it("#shade correctly", () => {
const style = new StyleForParagraph({
id: "myStyleId",
run: { shadow, shading },
run: { shading },
});
const tree = new Formatter().format(style);
expect(tree).to.deep.equal({