Skip to content

Commit a23b921

Browse files
fix(layout): remove duplicate displayNumber fields and fix page signature ref
Drop the redundant displayNumber declarations from HeaderFooterPage, ResolvedHeaderFooterPage, and the layout-bridge page builder, keeping the section-aware variant. Correct the renderer page context signature to read displayPageNumber instead of the nonexistent pageNumberDisplayNumber.
1 parent 9f67b02 commit a23b921

5 files changed

Lines changed: 3 additions & 13 deletions

File tree

packages/layout-engine/contracts/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2260,7 +2260,6 @@ export type HeaderFooterType = 'default' | 'first' | 'even' | 'odd';
22602260
export type HeaderFooterPage = {
22612261
number: number;
22622262
fragments: Fragment[];
2263-
displayNumber?: number;
22642263
numberText?: string;
22652264
/** Section-aware numeric page value before formatting. */
22662265
displayNumber?: number;

packages/layout-engine/contracts/src/resolved-layout.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,6 @@ export function isResolvedDrawingItem(item: ResolvedPaintItem): item is Resolved
452452
/** A resolved header/footer page — mirrors HeaderFooterPage but with resolved items. */
453453
export type ResolvedHeaderFooterPage = {
454454
number: number;
455-
/** Numeric page number after section numbering restart/offset. Used for OOXML odd/even parity. */
456-
displayNumber?: number;
457455
numberText?: string;
458456
/** Section-aware numeric page value before formatting. */
459457
displayNumber?: number;

packages/layout-engine/layout-bridge/src/layoutHeaderFooter.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ export async function layoutHeaderFooterWithCache(
350350
measures: Measure[];
351351
fragments: HeaderFooterLayout['pages'][0]['fragments'];
352352
numberText?: string;
353-
displayNumber?: number;
354353
}> = [];
355354

356355
for (const pageNum of pagesToLayout) {
@@ -392,7 +391,6 @@ export async function layoutHeaderFooterWithCache(
392391
measures,
393392
fragments: fragmentsWithLines,
394393
numberText: displayText,
395-
displayNumber,
396394
});
397395
}
398396

@@ -412,7 +410,6 @@ export async function layoutHeaderFooterWithCache(
412410
displayNumber: p.displayNumber,
413411
fragments: p.fragments,
414412
numberText: p.numberText,
415-
displayNumber: p.displayNumber,
416413
blocks: p.blocks,
417414
measures: p.measures,
418415
})),

packages/layout-engine/layout-resolved/src/resolveHeaderFooter.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export function resolveHeaderFooterLayout(
3131
number: page.number,
3232
displayNumber: page.displayNumber,
3333
numberText: page.numberText,
34-
displayNumber: page.displayNumber,
3534
items: page.fragments.map((fragment, fragmentIndex) =>
3635
resolveFragmentItem(fragment, fragmentIndex, page.number - 1, blockMap, blockVersionCache, story),
3736
),

packages/layout-engine/painters/dom/src/renderer.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,9 @@ type PageDomState = {
260260
};
261261

262262
function pageContextSignature(context: FragmentRenderContext): string {
263-
return [
264-
context.pageNumber,
265-
context.totalPages,
266-
context.pageNumberText ?? '',
267-
context.pageNumberDisplayNumber ?? '',
268-
].join('|');
263+
return [context.pageNumber, context.totalPages, context.pageNumberText ?? '', context.displayPageNumber ?? ''].join(
264+
'|',
265+
);
269266
}
270267

271268
function hasPageContextTokenInShapeText(textContent: ShapeTextContent | undefined): boolean {

0 commit comments

Comments
 (0)