postext 1.48.1 → 1.49.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/dist/__tests__/composed/connectorCaps.test.d.ts +2 -0
  2. package/dist/__tests__/composed/connectorCaps.test.d.ts.map +1 -0
  3. package/dist/__tests__/composed/connectorCaps.test.js +217 -0
  4. package/dist/__tests__/composed/connectorCaps.test.js.map +1 -0
  5. package/dist/__tests__/composed/emptyTabFrame.test.d.ts +2 -0
  6. package/dist/__tests__/composed/emptyTabFrame.test.d.ts.map +1 -0
  7. package/dist/__tests__/composed/emptyTabFrame.test.js +122 -0
  8. package/dist/__tests__/composed/emptyTabFrame.test.js.map +1 -0
  9. package/dist/__tests__/composed/gridVertical.test.d.ts +2 -0
  10. package/dist/__tests__/composed/gridVertical.test.d.ts.map +1 -0
  11. package/dist/__tests__/composed/gridVertical.test.js +107 -0
  12. package/dist/__tests__/composed/gridVertical.test.js.map +1 -0
  13. package/dist/__tests__/composed/pillWord.test.d.ts +2 -0
  14. package/dist/__tests__/composed/pillWord.test.d.ts.map +1 -0
  15. package/dist/__tests__/composed/pillWord.test.js +93 -0
  16. package/dist/__tests__/composed/pillWord.test.js.map +1 -0
  17. package/dist/__tests__/exports.test.js +2 -0
  18. package/dist/__tests__/exports.test.js.map +1 -1
  19. package/dist/canvas-backend/headerFooter.d.ts.map +1 -1
  20. package/dist/canvas-backend/headerFooter.js +15 -0
  21. package/dist/canvas-backend/headerFooter.js.map +1 -1
  22. package/dist/composed/labels.d.ts.map +1 -1
  23. package/dist/composed/labels.js +9 -6
  24. package/dist/composed/labels.js.map +1 -1
  25. package/dist/composed/validate.d.ts +3 -0
  26. package/dist/composed/validate.d.ts.map +1 -1
  27. package/dist/composed/validate.js +19 -1
  28. package/dist/composed/validate.js.map +1 -1
  29. package/dist/composed/wrap.d.ts.map +1 -1
  30. package/dist/composed/wrap.js +22 -5
  31. package/dist/composed/wrap.js.map +1 -1
  32. package/dist/configWarnings.d.ts.map +1 -1
  33. package/dist/configWarnings.js +4 -1
  34. package/dist/configWarnings.js.map +1 -1
  35. package/dist/design/connector.d.ts +8 -3
  36. package/dist/design/connector.d.ts.map +1 -1
  37. package/dist/design/connector.js +56 -18
  38. package/dist/design/connector.js.map +1 -1
  39. package/dist/design/pathBlock.d.ts +36 -4
  40. package/dist/design/pathBlock.d.ts.map +1 -1
  41. package/dist/design/pathBlock.js +72 -2
  42. package/dist/design/pathBlock.js.map +1 -1
  43. package/dist/html-backend.js +2 -2
  44. package/dist/html-backend.js.map +1 -1
  45. package/dist/index.d.ts +1 -1
  46. package/dist/index.d.ts.map +1 -1
  47. package/dist/index.js +1 -1
  48. package/dist/index.js.map +1 -1
  49. package/dist/pipeline/calloutLayout.d.ts.map +1 -1
  50. package/dist/pipeline/calloutLayout.js +9 -3
  51. package/dist/pipeline/calloutLayout.js.map +1 -1
  52. package/dist/pipeline/composedLayout.d.ts.map +1 -1
  53. package/dist/pipeline/composedLayout.js +66 -5
  54. package/dist/pipeline/composedLayout.js.map +1 -1
  55. package/dist/types.d.ts +23 -7
  56. package/dist/types.d.ts.map +1 -1
  57. package/dist/vdt.d.ts +14 -6
  58. package/dist/vdt.d.ts.map +1 -1
  59. package/dist/vdt.js.map +1 -1
  60. package/package.json +1 -1
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=connectorCaps.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"connectorCaps.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/composed/connectorCaps.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,217 @@
1
+ /**
2
+ * Translucent connector and leader lines, ring and bar caps (#1079): a
3
+ * line's colour may carry an alpha channel (`#rrggbbaa`) or an `opacity`,
4
+ * and a line may end in a hollow dot (a ring) or a stroke across it (a
5
+ * bar), stroked in the line's width.
6
+ */
7
+ import { describe, it, expect } from 'vitest';
8
+ import { buildDocument } from '../../pipeline/build';
9
+ import { createMeasurementCache } from '../../measure';
10
+ import { collectConfigWarnings } from '../../configWarnings';
11
+ import { validatePageTemplates } from '../../composed/validate';
12
+ import { figureLabelLeaderPath } from '../../composed/labels';
13
+ import { renderToHtmlIndexed } from '../../html-backend';
14
+ import { renderPageToCanvas } from '../../index';
15
+ import { colorWithOpacity, markerSvgElement, pathHit, pathInkBox, pathMarkerOutline } from '../../design/pathBlock';
16
+ import { flowRectToPage } from '../../vdt';
17
+ import { CONNECTOR_CONFIG, mm } from './fixtures/connectors';
18
+ import { mapPartsFixture } from './fixtures/mapParts';
19
+ class StubCtx {
20
+ font = '';
21
+ measureText(s) {
22
+ return { width: s.length * 7 };
23
+ }
24
+ }
25
+ globalThis.OffscreenCanvas = class {
26
+ getContext() {
27
+ return new StubCtx();
28
+ }
29
+ };
30
+ const PT = 300 / 72;
31
+ const hex = (h) => ({ hex: h, model: 'hex' });
32
+ const two = {
33
+ id: 'dos',
34
+ header: false,
35
+ frames: [
36
+ { name: 'izq', width: mm(40), height: mm(20), placement: { anchor: { to: 'container', edge: 'top-left' } } },
37
+ { name: 'der', width: mm(40), height: mm(20), placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(100) } } },
38
+ ],
39
+ };
40
+ const md = '::::page{template="dos"}\n:::frame{slot="izq"}\nLeft\n:::\n:::frame{slot="der"}\nRight\n:::\n::::\n';
41
+ const build = (c, extra = {}) => {
42
+ const t = { ...two, decoration: { elements: [{ kind: 'connector', id: 'c', routing: 'straight', from: { to: '#izq' }, to: { to: '#der' }, ...c }] } };
43
+ const doc = buildDocument({ markdown: md }, { ...CONNECTOR_CONFIG, pageTemplates: [t], ...extra }, createMeasurementCache());
44
+ return { doc, page: doc.pages.find((p) => p.composed) };
45
+ };
46
+ const pathOf = (page, id = 'c') => page.composed.decoration.blocks.find((b) => b.elementId === id);
47
+ const pointsOf = (b) => b.subpaths.flat().filter((c) => c.op !== 'Z');
48
+ const box = (page, name) => flowRectToPage(page, page.composed.frames.find((f) => f.name === name).rect);
49
+ describe('ring and bar marks (#1079)', () => {
50
+ const ring = { kind: 'ring', x: 50, y: 50, angle: 0, sizePx: 12, color: '#000', widthPx: 2 };
51
+ const bar = { kind: 'bar', x: 50, y: 50, angle: 0, sizePx: 10, color: '#000', widthPx: 2 };
52
+ it('a ring is a circle stroked in the line width, its outer edge sizePx across; a bar a segment across the line', () => {
53
+ expect(pathMarkerOutline(ring)).toEqual({ kind: 'ring', cx: 50, cy: 50, r: 5, widthPx: 2 });
54
+ const b = pathMarkerOutline(bar);
55
+ expect(b.kind).toBe('bar');
56
+ if (b.kind !== 'bar')
57
+ return;
58
+ expect(b.points[0].x).toBeCloseTo(50, 6);
59
+ expect(b.points[1].x).toBeCloseTo(50, 6);
60
+ expect(Math.abs(b.points[0].y - b.points[1].y)).toBeCloseTo(10, 6);
61
+ expect(b.widthPx).toBe(2);
62
+ });
63
+ it('as SVG: a stroked path with no fill', () => {
64
+ expect(markerSvgElement(ring, 0, 0, (v) => v)).toBe('<path d="M45 50A5 5 0 1 0 55 50A5 5 0 1 0 45 50Z" fill="none" stroke="#000" stroke-width="2"/>');
65
+ expect(markerSvgElement(bar, 0, 0, (v) => v)).toBe('<path d="M50 55L50 45" fill="none" stroke="#000" stroke-width="2"/>');
66
+ expect(markerSvgElement({ ...ring, kind: 'dot' }, 0, 0, (v) => v)).toBe('<path d="M44 50A6 6 0 1 0 56 50A6 6 0 1 0 44 50Z" fill="#000"/>');
67
+ });
68
+ it('ink box and hits: on the ring, not in its hole; on the bar', () => {
69
+ const block = { kind: 'path', bbox: { x: 0, y: 0, width: 0, height: 0 }, subpaths: [], markers: [ring] };
70
+ const ink = pathInkBox(block);
71
+ expect(ink.x).toBeCloseTo(44, 6);
72
+ expect(ink.width).toBeCloseTo(12, 6);
73
+ expect(pathHit(block, { x: 55.5, y: 50 }, 0.5)).toBe(true);
74
+ expect(pathHit(block, { x: 50, y: 50 }, 0.5)).toBe(false);
75
+ const barBlock = { ...block, markers: [bar] };
76
+ expect(pathHit(barBlock, { x: 50.8, y: 53 }, 0.5)).toBe(true);
77
+ expect(pathHit(barBlock, { x: 53, y: 50 }, 0.5)).toBe(false);
78
+ });
79
+ it('colorWithOpacity multiplies the alpha the colour has', () => {
80
+ expect(colorWithOpacity('#2a6f97', 0.4)).toBe('#2a6f9766');
81
+ expect(colorWithOpacity('#2a6f9780', 0.5)).toBe('#2a6f9740');
82
+ expect(colorWithOpacity('#abc', 0.5)).toBe('#aabbcc80');
83
+ expect(colorWithOpacity('#2a6f97', 1)).toBe('#2a6f97');
84
+ expect(colorWithOpacity('#2a6f97', undefined)).toBe('#2a6f97');
85
+ expect(colorWithOpacity('rgb(1, 2, 3)', 0.5)).toBe('rgb(1, 2, 3)');
86
+ });
87
+ });
88
+ describe('connector caps ring and bar (#1079)', () => {
89
+ it('a ring at the end, the line stopping where its corners meet the ring\'s outer edge', () => {
90
+ const { page } = build({ endCap: 'ring', width: { value: 1, unit: 'pt' }, capSize: mm(3) });
91
+ const c = pathOf(page);
92
+ const m = c.markers[0];
93
+ expect(m).toMatchObject({ kind: 'ring', widthPx: expect.closeTo(PT, 6), sizePx: expect.closeTo(3 * 300 / 25.4, 6) });
94
+ const der = box(page, 'der');
95
+ expect(m.x).toBeCloseTo(der.x, 3);
96
+ const end = pointsOf(c).at(-1);
97
+ const R = m.sizePx / 2;
98
+ expect(m.x - end.x).toBeCloseTo(Math.sqrt(R * R - (PT / 2) ** 2), 3);
99
+ });
100
+ it('a bar at the start, the line from its inner side; the tree drops of a timeline end in rings', () => {
101
+ const { page } = build({ startCap: 'bar', endCap: 'ring' });
102
+ const c = pathOf(page);
103
+ expect(c.markers.map((m) => m.kind)).toEqual(['bar', 'ring']);
104
+ const izq = box(page, 'izq');
105
+ const w = 0.75 * PT;
106
+ expect(pointsOf(c)[0].x - (izq.x + izq.width)).toBeCloseTo(w / 2, 3);
107
+ });
108
+ it('dots and arrows in an opaque colour lay out as before', () => {
109
+ const { page } = build({ startCap: 'dot', endCap: 'arrow', capSize: mm(3) });
110
+ const c = pathOf(page);
111
+ const izq = box(page, 'izq');
112
+ const der = box(page, 'der');
113
+ expect(pointsOf(c)[0].x).toBeCloseTo(izq.x + izq.width, 3);
114
+ expect(der.x - pointsOf(c).at(-1).x).toBeCloseTo(0.6 * 3 * 300 / 25.4, 3);
115
+ expect(c.markers.every((m) => m.widthPx === undefined)).toBe(true);
116
+ });
117
+ });
118
+ describe('translucent connector lines (#1079)', () => {
119
+ it('a #rrggbbaa colour goes to the stroke and the marks as it is; the line stops at a translucent dot\'s edge and an arrow\'s base', () => {
120
+ const { page } = build({ color: hex('#ffffff99'), width: mm(3), startCap: 'dot', endCap: 'arrow', capSize: mm(5) });
121
+ const c = pathOf(page);
122
+ expect(c.stroke.color).toBe('#ffffff99');
123
+ expect(c.markers.map((m) => m.color)).toEqual(['#ffffff99', '#ffffff99']);
124
+ const izq = box(page, 'izq');
125
+ const der = box(page, 'der');
126
+ const R = 2.5 * 300 / 25.4;
127
+ const half = 1.5 * 300 / 25.4;
128
+ expect(pointsOf(c)[0].x - (izq.x + izq.width)).toBeCloseTo(Math.sqrt(R * R - half * half), 3);
129
+ expect(der.x - pointsOf(c).at(-1).x).toBeCloseTo(5 * 300 / 25.4, 3);
130
+ });
131
+ it('opacity multiplies a palette-linked colour, and follows a part palette', () => {
132
+ const linked = { hex: '#2a6f97', model: 'hex', paletteId: 'tinta' };
133
+ const { page } = build({ color: linked, opacity: 0.4, endCap: 'ring' });
134
+ expect(pathOf(page).stroke.color).toBe('#2a6f9766');
135
+ expect(pathOf(page).markers[0].color).toBe('#2a6f9766');
136
+ const t = { ...two, decoration: { elements: [{ kind: 'connector', id: 'c', routing: 'straight', from: { to: '#izq' }, to: { to: '#der' }, color: linked, opacity: 0.4 }] } };
137
+ const doc = buildDocument({ markdown: `:::part{palette="tinta=#aa0000"}\n# One\n:::\n\n${md}` }, { ...CONNECTOR_CONFIG, pageTemplates: [t] }, createMeasurementCache());
138
+ const composed = doc.pages.find((p) => p.composed);
139
+ expect(pathOf(composed).stroke.color.toLowerCase()).toBe('#aa000066');
140
+ });
141
+ it('a cased line: a wide translucent casing under a dashed line, both painted on the canvas and in HTML', () => {
142
+ const casing = { kind: 'connector', id: 'casing', routing: 'straight', from: { to: '#izq' }, to: { to: '#der' }, color: hex('#ffffff'), opacity: 0.6, width: mm(2.5) };
143
+ const line = { kind: 'connector', id: 'line', routing: 'straight', from: { to: '#izq' }, to: { to: '#der' }, color: hex('#c0392b'), width: mm(0.8), dash: [mm(3), mm(1.5)], startCap: 'ring', endCap: 'bar', capSize: mm(4) };
144
+ const t = { ...two, decoration: { elements: [casing, line] } };
145
+ const doc = buildDocument({ markdown: md }, { ...CONNECTOR_CONFIG, pageTemplates: [t] }, createMeasurementCache());
146
+ const page = doc.pages.find((p) => p.composed);
147
+ // Canvas: the casing stroked first, translucent; the ring and the bar
148
+ // stroked solid in the line's width, the dash undone.
149
+ const ops = [];
150
+ const ctx = new Proxy({ font: '', fillStyle: '#000000', strokeStyle: '#000000', lineWidth: 1 }, {
151
+ get(target, key) {
152
+ if (key === 'stroke')
153
+ return () => ops.push(`stroke:${String(target.strokeStyle)}:${Number(target.lineWidth).toFixed(2)}:${String(target.dash ?? '')}`);
154
+ if (key === 'setLineDash')
155
+ return (d) => { target.dash = d.length; };
156
+ if (key === 'arc')
157
+ return () => ops.push('arc');
158
+ if (key === 'measureText')
159
+ return (s) => ({ width: [...s].length * 7 });
160
+ if (key in target)
161
+ return target[key];
162
+ return () => undefined;
163
+ },
164
+ set(target, key, value) { target[key] = value; return true; },
165
+ });
166
+ renderPageToCanvas(page, doc, { width: 0, height: 0, getContext: () => ctx });
167
+ const w = (v) => (v * 300 / 25.4).toFixed(2);
168
+ const strokes = ops.filter((o) => o.startsWith('stroke:#ffffff99') || o.startsWith('stroke:#c0392b'));
169
+ expect(strokes).toEqual([`stroke:#ffffff99:${w(2.5)}:0`, `stroke:#c0392b:${w(0.8)}:2`, `stroke:#c0392b:${w(0.8)}:0`, `stroke:#c0392b:${w(0.8)}:0`]);
170
+ // HTML: the casing's stroke with its alpha, the ring and the bar as
171
+ // stroked paths with no fill.
172
+ const html = JSON.stringify(renderToHtmlIndexed(doc)).replace(/\\"/g, '"');
173
+ expect(html).toContain('stroke="#ffffff99"');
174
+ const svg = html.match(/<svg[^>]*>(?:(?!<\/svg>).)*#c0392b(?:(?!<\/svg>).)*<\/svg>/)[0];
175
+ expect(svg.match(/fill="none" stroke="#c0392b" stroke-width="[\d.]+"/g)?.length).toBe(3);
176
+ });
177
+ });
178
+ describe('leaders with rings and opacity (#1079)', () => {
179
+ it('a label style\'s leader look ends in a ring, translucent', () => {
180
+ const f = mapPartsFixture('en', {});
181
+ const config = {
182
+ ...f.config,
183
+ labelStyles: (f.config.labelStyles ?? []).map((s) => (s.leader ? { ...s, leader: { ...s.leader, endCap: 'ring', opacity: 0.5 } } : s)),
184
+ };
185
+ const doc = buildDocument({ markdown: f.markdown, resources: f.resources }, config, createMeasurementCache());
186
+ let block;
187
+ for (const p of doc.pages)
188
+ block ??= (p.floats ?? []).find((b) => b.resourceBlock?.resource.id === 'varenia');
189
+ const rb = block.resourceBlock;
190
+ const peaks = rb.labels.find((l) => 'anchor' in l.at && l.at.anchor === 'peaks');
191
+ expect(peaks.layout.leader).toMatchObject({ endCap: 'ring', opacity: 0.5 });
192
+ // The colour stays the look's in the layout (part palettes read it).
193
+ expect(peaks.layout.leader.stroke.color).toBe('#3b2a1a');
194
+ const path = figureLabelLeaderPath(peaks.layout, block.bbox.x + rb.bodyRect.x, block.bbox.y + rb.bodyRect.y);
195
+ expect(path.stroke.color).toBe('#3b2a1a80');
196
+ expect(path.markers).toEqual([expect.objectContaining({ kind: 'ring', color: '#3b2a1a80', widthPx: expect.closeTo(0.6 * PT, 6) })]);
197
+ });
198
+ });
199
+ describe('validation of caps and opacity (#1079)', () => {
200
+ const template = (c) => ({ ...two, decoration: { elements: [{ kind: 'connector', id: 'c', from: { to: '#izq' }, to: { to: '#der' }, ...c }] } });
201
+ const warnings = (c) => collectConfigWarnings({ pageTemplates: [template(c)] }).filter((w) => w.kind === 'unknownConfigValue');
202
+ it('ring and bar are caps; another word is not', () => {
203
+ expect(warnings({ startCap: 'ring', endCap: 'bar' })).toEqual([]);
204
+ expect(warnings({ endCap: 'rings' })).toEqual([expect.objectContaining({ path: 'pageTemplates[0].decoration.elements[0].endCap', suggestion: 'ring' })]);
205
+ });
206
+ it('an opacity outside 0…1 is held; one that is not a number is opaque', () => {
207
+ expect(warnings({ opacity: 0.3 })).toEqual([]);
208
+ expect(warnings({ opacity: 2 })).toEqual([expect.objectContaining({ path: 'pageTemplates[0].decoration.elements[0].opacity', value: '2', used: '1' })]);
209
+ expect(warnings({ opacity: -1 })).toEqual([expect.objectContaining({ used: '0' })]);
210
+ expect(warnings({ opacity: 'half' })).toEqual([expect.objectContaining({ value: 'half', used: '1' })]);
211
+ });
212
+ it('a leader look takes the new caps and checks its opacity', () => {
213
+ const out = validatePageTemplates({ labelStyles: [{ id: 'n', leader: { endCap: 'ring', startCap: 'bar', opacity: 1.5 } }] });
214
+ expect(out).toEqual([expect.objectContaining({ kind: 'unknownConfigValue', path: '/labelStyles/0/leader/opacity', used: '1' })]);
215
+ });
216
+ });
217
+ //# sourceMappingURL=connectorCaps.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"connectorCaps.test.js","sourceRoot":"","sources":["../../../src/__tests__/composed/connectorCaps.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=emptyTabFrame.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"emptyTabFrame.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/composed/emptyTabFrame.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,122 @@
1
+ import { describe, it, expect } from 'vitest';
2
+ import { buildDocument } from '../../pipeline/build';
3
+ import { createMeasurementCache } from '../../measure';
4
+ import { renderToHtmlIndexed } from '../../html-backend';
5
+ import { renderPageToCanvas } from '../../index';
6
+ // #1084: a `:::frame` fence with nothing in it, for a frame with a callout
7
+ // style, draws the style's box (fill, border, the tab with its `label`) at
8
+ // the frame's size: a labelled inset over a map, a ruled answer box.
9
+ class StubCtx {
10
+ font = '';
11
+ measureText(s) {
12
+ return { width: s.length * 7 };
13
+ }
14
+ }
15
+ globalThis.OffscreenCanvas = class {
16
+ getContext() {
17
+ return new StubCtx();
18
+ }
19
+ };
20
+ const mm = (value) => ({ value, unit: 'mm' });
21
+ const pt = (value) => ({ value, unit: 'pt' });
22
+ const hex = (h) => ({ hex: h, model: 'hex' });
23
+ const CONFIG = {
24
+ page: { width: mm(200), height: mm(260), dpi: 300, margins: { top: mm(20), bottom: mm(20), left: mm(20), right: mm(20) } },
25
+ headings: { balancing: { enabled: false }, levels: [{ level: 1, breakBefore: { enabled: false } }] },
26
+ bodyText: { fontSize: pt(11), lineHeight: pt(16), firstLineIndent: pt(0) },
27
+ calloutStyles: [{
28
+ id: 'caja', backgroundEnabled: true, background: hex('#ffeb99'),
29
+ border: { enabled: true, color: hex('#222222') }, padding: { top: mm(3), right: mm(5), bottom: mm(3), left: mm(5) },
30
+ label: { color: hex('#ffffff'), background: hex('#333333'), height: mm(6), paddingX: mm(3) },
31
+ }],
32
+ };
33
+ const at = { anchor: { to: 'container', edge: 'top-left' } };
34
+ const below = { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(0), y: mm(120) } };
35
+ const caja = (extra = {}) => ({ name: 'caja', style: 'caja', placement: at, width: mm(100), minHeight: mm(30), ...extra });
36
+ const texto = { name: 'texto', placement: below, width: mm(100) };
37
+ const build = (md, frames = [caja(), texto]) => buildDocument({ markdown: md }, { ...CONFIG, pageTemplates: [{ id: 'ficha', frames }] }, createMeasurementCache());
38
+ const pageMd = (...lines) => ['::::page{template="ficha"}', '', ...lines, '', ':::frame{slot="texto"}', 'Words of the page.', ':::', '', '::::'].join('\n');
39
+ const EMPTY = pageMd(':::frame{slot="caja" label="Tab"}', ':::');
40
+ const page = (doc) => doc.pages.find((p) => p.composed);
41
+ const frame = (doc, name = 'caja') => page(doc).composed.frames.find((f) => f.name === name);
42
+ const box = (doc, name = 'caja') => page(doc).floats?.find((b) => b.id === frame(doc, name).blockIds[0]);
43
+ const overlay = (doc) => box(doc)?.designOverlay?.blocks ?? [];
44
+ const boxes = (doc) => overlay(doc).filter((b) => b.kind === 'box');
45
+ const texts = (doc) => overlay(doc).filter((b) => b.kind === 'text');
46
+ describe('an empty frame with a style draws its box (#1084)', () => {
47
+ it('the fill and border at the frame’s size, the tab with its label', () => {
48
+ const doc = build(EMPTY);
49
+ const f = frame(doc);
50
+ expect(f.blockIds).toHaveLength(1);
51
+ const [fill, tab] = boxes(doc);
52
+ expect(fill.box.backgroundColor).toBe('#ffeb99');
53
+ expect(fill.box.borderColor).toBe('#222222');
54
+ expect(fill.bbox).toEqual(f.rect);
55
+ expect(tab.box.backgroundColor).toBe('#333333');
56
+ const label = texts(doc);
57
+ expect(label.map((t) => t.lines[0].text)).toEqual(['Tab']);
58
+ expect(label[0].color).toBe('#ffffff');
59
+ // The tab keeps the label's source: a click on it reaches the fence.
60
+ expect(EMPTY.slice(label[0].sourceStart, label[0].sourceEnd)).toBe('Tab');
61
+ // The box has no lines and overflows nothing.
62
+ expect(f.overflowPx).toBe(0);
63
+ expect((doc.contentWarnings ?? []).filter((w) => w.kind === 'frameOverflow' || w.kind === 'slotEmpty')).toEqual([]);
64
+ });
65
+ it('the same box and tab as a frame with words would draw', () => {
66
+ const full = build(pageMd(':::frame{slot="caja" label="Tab"}', 'Word.', ':::'));
67
+ const empty = build(EMPTY);
68
+ expect(frame(empty).rect).toEqual(frame(full).rect);
69
+ expect(boxes(empty)).toEqual(boxes(full));
70
+ expect(texts(empty).map((t) => t.bbox)).toEqual(texts(full).filter((t) => t.lines[0].text === 'Tab').map((t) => t.bbox));
71
+ });
72
+ it('a fence without a label draws the box alone', () => {
73
+ const doc = build(pageMd(':::frame{slot="caja"}', ':::'));
74
+ expect(boxes(doc).map((b) => b.box.backgroundColor)).toEqual(['#ffeb99']);
75
+ expect(texts(doc)).toEqual([]);
76
+ });
77
+ it('as before: no fence leaves the frame empty (slotEmpty); a frame with no style draws nothing', () => {
78
+ const none = build(pageMd());
79
+ expect(frame(none).blockIds).toEqual([]);
80
+ expect((none.contentWarnings ?? []).filter((w) => w.kind === 'slotEmpty').map((w) => w.frame)).toEqual(['caja']);
81
+ const plain = build(EMPTY, [caja({ style: undefined }), texto]);
82
+ expect(frame(plain).blockIds).toEqual([]);
83
+ });
84
+ it('on the canvas: the fill, the tab and its word are painted', () => {
85
+ const doc = build(EMPTY);
86
+ const fills = [];
87
+ const words = [];
88
+ const ctx = new Proxy({ font: '', fillStyle: '#000000' }, {
89
+ get(target, key) {
90
+ if (key === 'fillText')
91
+ return (text) => words.push(text);
92
+ if (key === 'fill' || key === 'fillRect')
93
+ return () => fills.push(String(target.fillStyle));
94
+ if (key === 'measureText')
95
+ return (s) => ({ width: [...s].length * 7 });
96
+ if (key in target)
97
+ return target[key];
98
+ return () => undefined;
99
+ },
100
+ set(target, key, value) {
101
+ target[key] = value;
102
+ return true;
103
+ },
104
+ });
105
+ renderPageToCanvas(page(doc), doc, { width: 0, height: 0, getContext: () => ctx });
106
+ expect(fills).toContain('#ffeb99');
107
+ expect(fills).toContain('#333333');
108
+ expect(words).toContain('Tab');
109
+ });
110
+ it('in HTML: the frame holds the box and the tab', () => {
111
+ const doc = build(EMPTY);
112
+ const html = renderToHtmlIndexed(doc).pages[page(doc).index].innerHtml;
113
+ const start = html.indexOf('data-frame-id="cp0:caja"');
114
+ expect(start).toBeGreaterThan(-1);
115
+ const next = html.indexOf('data-frame-id="cp0:texto"');
116
+ const own = html.slice(start, next > start ? next : undefined);
117
+ expect(own.toLowerCase()).toContain('#ffeb99');
118
+ expect(own.toLowerCase()).toContain('#333333');
119
+ expect(own).toContain('>Tab<');
120
+ });
121
+ });
122
+ //# sourceMappingURL=emptyTabFrame.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"emptyTabFrame.test.js","sourceRoot":"","sources":["../../../src/__tests__/composed/emptyTabFrame.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,2EAA2E;AAC3E,2EAA2E;AAC3E,qEAAqE;AAErE,MAAM,OAAO;IACX,IAAI,GAAG,EAAE,CAAC;IACV,WAAW,CAAC,CAAS;QACnB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;IACjC,CAAC;CACF;AACA,UAAsD,CAAC,eAAe,GAAG;IACxE,UAAU;QACR,OAAO,IAAI,OAAO,EAAE,CAAC;IACvB,CAAC;CACF,CAAC;AAEF,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAa,EAAE,CAAC,CAAC;AAC/D,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAa,EAAE,CAAC,CAAC;AAC/D,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,KAAc,EAAE,CAAC,CAAC;AAC/D,MAAM,MAAM,GAAkB;IAC5B,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAW;IACnI,QAAQ,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,EAAW;IAC7G,QAAQ,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,EAAW;IACnF,aAAa,EAAE,CAAC;YACd,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC;YAC/D,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;YACnH,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;SAC7F,CAAU;CACZ,CAAC;AACF,MAAM,EAAE,GAA6B,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC;AACvF,MAAM,KAAK,GAA6B,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;AAC5H,MAAM,IAAI,GAAG,CAAC,QAA8B,EAAE,EAAe,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;AAC9J,MAAM,KAAK,GAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;AAC/E,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,SAAwB,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,EAAe,EAAE,CACjF,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAkB,CAAC,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAC;AACrI,MAAM,MAAM,GAAG,CAAC,GAAG,KAAe,EAAU,EAAE,CAAC,CAAC,4BAA4B,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9K,MAAM,KAAK,GAAG,MAAM,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;AACjE,MAAM,IAAI,GAAG,CAAC,GAAgB,EAAW,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAE,CAAC;AAC/E,MAAM,KAAK,GAAG,CAAC,GAAgB,EAAE,IAAI,GAAG,MAAM,EAAY,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAE,CAAC;AACtH,MAAM,GAAG,GAAG,CAAC,GAAgB,EAAE,IAAI,GAAG,MAAM,EAAwB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5I,MAAM,OAAO,GAAG,CAAC,GAAgB,EAAoB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,MAAM,IAAI,EAAE,CAAC;AAC9F,MAAM,KAAK,GAAG,CAAC,GAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAA0B,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;AACzG,MAAM,KAAK,GAAG,CAAC,GAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAA2B,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;AAE3G,QAAQ,CAAC,mDAAmD,EAAE,GAAG,EAAE;IACjE,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACrB,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,IAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,CAAC,IAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,CAAC,IAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,CAAC,GAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,qEAAqE;QACrE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,WAAY,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,SAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9E,8CAA8C;QAC9C,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACtH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,mCAAmC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAChF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5H,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6FAA6F,EAAE,GAAG,EAAE;QACrG,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAuB,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACxI,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAsC,EAAE;YAC5F,GAAG,CAAC,MAAM,EAAE,GAAG;gBACb,IAAI,GAAG,KAAK,UAAU;oBAAE,OAAO,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClE,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,UAAU;oBAAE,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5F,IAAI,GAAG,KAAK,aAAa;oBAAE,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;gBAChF,IAAI,GAAG,IAAI,MAAM;oBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;gBACtC,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;YACzB,CAAC;YACD,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK;gBACpB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC,CAAC;QACH,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,GAAG,EAAkC,CAAC,CAAC;QACnH,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAE,CAAC,SAAS,CAAC;QACxE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC/D,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=gridVertical.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gridVertical.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/composed/gridVertical.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,107 @@
1
+ /**
2
+ * A grid on a vertical page (#1078): a frame set of a box and a picture
3
+ * anchored inside it, repeated down a vertical-rl composed page. The
4
+ * picture of a frame of the page's own mode stands upright (#971); the
5
+ * frame was laid as tall (across the lines) as the picture measured, but
6
+ * the picture was set two lines smaller in it, so a grid row, which counts
7
+ * the frame, was wider than what it showed, and the last row ran past the
8
+ * grid's foot, where the ladder scaled its picture down.
9
+ */
10
+ import { describe, it, expect } from 'vitest';
11
+ import { buildDocument } from '../../pipeline/build';
12
+ import { createMeasurementCache } from '../../measure';
13
+ import { installSizedStub } from '../vertical/stub';
14
+ installSizedStub();
15
+ const mm = (value) => ({ value, unit: 'mm' });
16
+ const pt = (value) => ({ value, unit: 'pt' });
17
+ const hex = (h) => ({ hex: h, model: 'hex' });
18
+ const DPI = 150;
19
+ const MM = DPI / 25.4;
20
+ /** Three 4:3 paintings of 720 × 540 px at 330 ppi: 55.4 × 41.6 mm. */
21
+ const PICTURES = ['uno', 'dos', 'tres'].map((id) => ({
22
+ id, typeId: 'dibujo', kind: 'bitmap', altText: 'A painting', caption: '', createdAt: 0, updatedAt: 0,
23
+ bitmap: { fileId: `${id}.jpg`, format: 'jpeg', width: 720, height: 540, resolution: 330 },
24
+ }));
25
+ const item = (k) => `:::frame{slot="uso" label="第${k}"}\n${'河水流进一行行庄稼中间。'.repeat(4)}\n\n:::figure{resource="${PICTURES[k - 1].id}" slot="uso-foto"}\n:::\n:::\n`;
26
+ const MARKDOWN = `::::page{template="usos"}\n${[1, 2, 3].map(item).join('\n')}::::\n`;
27
+ /** The page: 210 × 280 mm, its type area 184 mm across the lines of a
28
+ * vertical page and 244 mm along them. A box per use, a picture `pic` mm
29
+ * along the lines at the end of its first lines (8 mm in from the box's
30
+ * start), the grid 8 mm between rows. */
31
+ const config = (mode, pic, extra = {}) => {
32
+ const measure = mode === 'vertical-rl' ? 244 : 184;
33
+ return {
34
+ page: { sizePreset: 'custom', width: mm(210), height: mm(280), dpi: DPI, margins: { top: mm(18), bottom: mm(18), left: mm(14), right: mm(12) } },
35
+ layout: { layoutType: 'single', writingMode: mode },
36
+ bodyText: { fontFamily: 'Test Serif', fontSize: pt(12), lineHeight: pt(21), textAlign: 'left' },
37
+ headings: { balancing: { enabled: false }, levels: [{ level: 1, breakBefore: { enabled: false } }] },
38
+ locale: 'zh-Hans',
39
+ resourceTypes: [{ id: 'dibujo', name: 'Dibujo', shortLabel: '', numberingTemplate: '', resetOn: 'never', counterFormat: 'decimal', captionPrefix: '', defaultPlacement: { position: 'here' } }],
40
+ calloutStyles: [{ id: 'dato', backgroundEnabled: true, background: hex('#fcefd2'), border: { enabled: false }, padding: { top: mm(3.4), right: mm(5), bottom: mm(4), left: mm(5) } }],
41
+ pageTemplates: [{
42
+ id: 'usos',
43
+ frames: [
44
+ { name: 'uso', style: 'dato', width: mm(measure), minHeight: mm(52), padding: { right: mm(pic + 8) } },
45
+ { name: 'uso-foto', layer: 2, width: mm(pic), exclude: 'push', placement: { anchor: { to: '#uso', edge: 'top-right' }, offset: { x: mm(-5), y: mm(8) } } },
46
+ ],
47
+ groups: [{
48
+ name: 'usos', kind: 'grid', columns: 1, rowGap: mm(extra.rowGap ?? 8), rowAlign: 'start', repeat: { frames: ['uso', 'uso-foto'] },
49
+ placement: { anchor: { to: 'container', edge: 'top-left' }, size: { width: mm(measure), height: 'fill' } },
50
+ }],
51
+ }],
52
+ };
53
+ };
54
+ const build = (mode, pic, extra) => buildDocument({ markdown: MARKDOWN, resources: PICTURES }, config(mode, pic, extra), createMeasurementCache());
55
+ const composedPage = (doc) => doc.pages.find((p) => p.composed);
56
+ const frameOf = (page, name) => page.composed.frames.find((f) => f.name === name);
57
+ const pictureOf = (page, name) => frameOf(page, name).blockIds.map((id) => page.floats.find((b) => b.id === id)).find((b) => b?.resourceBlock);
58
+ describe('a grid of boxes with a picture on a vertical page (#1078)', () => {
59
+ it('sets each picture as large as its frame measured it: the frame shows what it takes', () => {
60
+ const page = composedPage(build('vertical-rl', 44));
61
+ for (const n of [1, 2]) {
62
+ const frame = frameOf(page, `uso-foto[${n}]`);
63
+ const picture = pictureOf(page, `uso-foto[${n}]`);
64
+ // In the flow, the picture's extent across the lines is the frame's.
65
+ expect(picture.bbox.height).toBeCloseTo(frame.rect.height, 1);
66
+ // Upright, at its own size (55.4 × 41.6 mm): the 44 mm along the
67
+ // lines hold its height.
68
+ expect(picture.resourceBlock.rotation.width / MM).toBeCloseTo(720 / 330 * 25.4, 0);
69
+ }
70
+ });
71
+ it('lays its rows at the template\'s rowGap, each as wide as its box and picture, and scales no picture', () => {
72
+ // A picture 30 mm along the lines stands 40 mm across them, inside its
73
+ // 52 mm box: three rows and two gaps of 8 mm fit the 184 mm.
74
+ const page = composedPage(build('vertical-rl', 30));
75
+ const boxes = [1, 2, 3].map((n) => frameOf(page, `uso[${n}]`));
76
+ const pictures = [1, 2, 3].map((n) => pictureOf(page, `uso-foto[${n}]`));
77
+ for (let k = 1; k < 3; k++) {
78
+ const prev = boxes[k - 1].rect;
79
+ expect(boxes[k].rect.y - (prev.y + prev.height)).toBeCloseTo(8 * MM, 1);
80
+ }
81
+ for (const [k, p] of pictures.entries()) {
82
+ const box = boxes[k].rect;
83
+ expect(p.bbox.y + p.bbox.height).toBeLessThanOrEqual(box.y + box.height + 0.5);
84
+ expect(p.bbox.height).toBeCloseTo(pictures[0].bbox.height, 3);
85
+ expect(p.resourceBlock.rotation.width / MM).toBeCloseTo(40, 0);
86
+ }
87
+ for (const n of [1, 2, 3])
88
+ expect(frameOf(page, `uso-foto[${n}]`).overflowPx).toBe(0);
89
+ });
90
+ it('a row counts a picture that hangs past its box, as on a horizontal page', () => {
91
+ // 44 mm along the lines leave the picture its own size, 55.4 mm across
92
+ // them: 8 + 55.4 mm, past the 52 mm box. The next row starts past it.
93
+ const page = composedPage(build('vertical-rl', 44));
94
+ const pic1 = frameOf(page, 'uso-foto[1]').rect;
95
+ expect(frameOf(page, 'uso[2]').rect.y).toBeCloseTo(pic1.y + pic1.height + 8 * MM, 1);
96
+ });
97
+ it('leaves a horizontal page as it was: the picture inside its box, rows a box and a gap apart', () => {
98
+ const page = composedPage(build('horizontal-tb', 56));
99
+ const boxes = [1, 2, 3].map((n) => frameOf(page, `uso[${n}]`).rect);
100
+ for (let k = 1; k < 3; k++)
101
+ expect(boxes[k].y - (boxes[k - 1].y + boxes[k - 1].height)).toBeCloseTo(8 * MM, 1);
102
+ const picture = pictureOf(page, 'uso-foto[1]');
103
+ expect(picture.resourceBlock.rotation).toBeUndefined();
104
+ expect(picture.bbox.height).toBeCloseTo(frameOf(page, 'uso-foto[1]').rect.height, 1);
105
+ });
106
+ });
107
+ //# sourceMappingURL=gridVertical.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gridVertical.test.js","sourceRoot":"","sources":["../../../src/__tests__/composed/gridVertical.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=pillWord.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pillWord.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/composed/pillWord.test.ts"],"names":[],"mappings":""}