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

fix: added unique numeric id creator to avoid numbering render errors

Browse Source
This commit is contained in:
Lentyaev Pavel
2023-04-18 15:15:38 +03:00
parent accb1d44d0
commit c59c5350fd
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/file/numbering/numbering.ts
View File

@ -2,7 +2,7 @@
// https://stackoverflow.com/questions/58622437/purpose-of-abstractnum-and-numberinginstance
import { AlignmentType } from "@file/paragraph";
import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components";
import { convertInchesToTwip, uniqueNumericId } from "@util/convenience-functions";
import { convertInchesToTwip, uniqueNumericIdCreator } from "@util/convenience-functions";
import { DocumentAttributes } from "../document/document-attributes";
import { AbstractNumbering } from "./abstract-numbering";
@ -16,6 +16,9 @@ export interface INumberingOptions {
}[];
}
const abstractNumUniqueNumericId = uniqueNumericIdCreator();
const concreteNumUniqueNumericId = uniqueNumericIdCreator(1); // Setting initial to 1 as we have numId = 1 for "default-bullet-numbering"
// <xsd:element name="numbering" type="CT_Numbering"/>
//
// <xsd:complexType name="CT_Numbering">
@ -55,7 +58,7 @@ export class Numbering extends XmlComponent {
}),
);
const abstractNumbering = new AbstractNumbering(uniqueNumericId(), [
const abstractNumbering = new AbstractNumbering(abstractNumUniqueNumericId(), [
{
level: 0,
format: LevelFormat.BULLET,
@ -176,7 +179,7 @@ export class Numbering extends XmlComponent {
this.abstractNumberingMap.set("default-bullet-numbering", abstractNumbering);
for (const con of options.config) {
this.abstractNumberingMap.set(con.reference, new AbstractNumbering(uniqueNumericId(), con.levels));
this.abstractNumberingMap.set(con.reference, new AbstractNumbering(abstractNumUniqueNumericId(), con.levels));
this.referenceConfigMap.set(con.reference, con.levels);
}
}
@ -209,7 +212,7 @@ export class Numbering extends XmlComponent {
const firstLevelStartNumber = referenceConfigLevels && referenceConfigLevels[0].start;
const concreteNumberingSettings = {
numId: uniqueNumericId(),
numId: concreteNumUniqueNumericId(),
abstractNumId: abstractNumbering.id,
reference,
instance,