devexpress-richedit 24.1.1-alpha-24085-0102 → 24.1.2-beta

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 24.1.1
+* Version: 24.1.2
 * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/index.js

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.js)
-* Version: 24.1.1
+* Version: 24.1.2
 * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/lib/client/bars/ribbon.js

@@ -5,6 +5,7 @@ import { ToolbarSubMenuItem } from '../ribbon/toolbar-items/toolbar-sub-menu-ite
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { StringMapUtils } from '@devexpress/utils/lib/utils/map/string';
 import { createInnerTab } from '../public/ribbon/creator';
+import { SizeUtils } from '../../common/utils/size-utils';
 export class ClientRibbonBar extends RibbonBarBase {
     constructor(ownerControl, ownerElement, apiRibbon, fonts) {
         var _a;
@@ -98,7 +99,7 @@ export class ClientRibbonBar extends RibbonBarBase {
     }
     getHeight() {
         const elem = this.ribbon.getTabPanel().element();
-        return elem.clientHeight || (elem[0] ? elem[0].clientHeight : 0);
+        return (elem[0] ? SizeUtils.getOffsetHeight(elem[0]) : SizeUtils.getOffsetHeight(elem));
     }
     setActiveTabIndex(index) {
         this.ribbon.getTabPanel().option('selectedIndex', index);

package/lib/client/bars/rich-edit-ribbon/ribbon-items-data.js

@@ -34,7 +34,8 @@ export class RibbonItemsData {
                 items: [
                     { text: formatMessage("ASPxRichEditStringId.Download_WordDocument"), name: Command.DownloadDocx },
                     { text: formatMessage("ASPxRichEditStringId.Download_RichTextFormat"), name: Command.DownloadRtf },
-                    { text: formatMessage("ASPxRichEditStringId.Download_PlainText"), name: Command.DownloadTxt }
+                    { text: formatMessage("ASPxRichEditStringId.Download_PlainText"), name: Command.DownloadTxt },
+                    { text: formatMessage("ASPxRichEditStringId.Download_Html"), name: Command.DownloadHtml },
                 ]
             },
             { type: 'Button', text: getTrimmedMessage("OfficeStringId.MenuCmd_Print"), icon: 'dxre-icon-Print', alwaysShowText: true, name: Command.PrintDocumentOnClient }

package/lib/client/client-rich-edit.js

@@ -31,6 +31,7 @@ import { ClientQuickSearchPanel } from './ui/client-quick-search-panel';
 import { RulerVisibility } from '../common/ui/ruler/settings';
 import { FullScreenHelper } from './ui/full-screen-helper';
 import config from 'devextreme/core/config';
+import { SizeUtils } from '../common/utils/size-utils';
 export class ClientRichEdit {
     constructor(element, options, publicRichEdit) {
         var _a;
@@ -334,7 +335,7 @@ export class ClientRichEdit {
             this.core.horizontalRulerControl.adjust();
             const rulerHeight = this.core.horizontalRulerControl.getHeight();
             this.core.viewManager.canvas.style.height = "0";
-            this.core.viewManager.canvas.style.height = this.element.clientHeight - rulerHeight - ribbonHeight + "px";
+            this.core.viewManager.canvas.style.height = SizeUtils.getClientHeight(this.element) - rulerHeight - ribbonHeight + "px";
             this.core.viewManager.adjust(true);
         }
     }

package/lib/client/commands/client-command-manager.js

@@ -1,6 +1,6 @@
 import { RichEditClientCommand } from '../../common/commands/client-command';
 import { CommandManager } from '../../common/commands/command-manager';
-import { DownloadDocumentCommand, DownloadDocxCommand, DownloadRtfCommand, DownloadTxtCommand } from './download-document-command';
+import { DownloadDocumentCommand, DownloadDocxCommand, DownloadHtmlCommand, DownloadRtfCommand, DownloadTxtCommand, } from './download-document-command';
 import { ExportDocumentCommand } from './export-document-command';
 import { InsertPictureCommand } from './insert-picture-command';
 import { MailMergeCommand } from './mail-merge-command';
@@ -17,6 +17,7 @@ export class ClientCommandManager extends CommandManager {
         this.createCommand(control, RichEditClientCommand.DownloadDocx, DownloadDocxCommand);
         this.createCommand(control, RichEditClientCommand.DownloadRtf, DownloadRtfCommand);
         this.createCommand(control, RichEditClientCommand.DownloadTxt, DownloadTxtCommand);
+        this.createCommand(control, RichEditClientCommand.DownloadHtml, DownloadHtmlCommand);
         this.createCommand(control, RichEditClientCommand.MailMergeOnClient, MailMergeCommand);
     }
 }

package/lib/client/commands/commands.js

@@ -32,6 +32,9 @@ export function executeApiCommandCore(commandManager, commandId, parameter) {
         case FileTabCommandId.DownloadTxt:
             parameter = undefined;
             break;
+        case FileTabCommandId.DownloadHtml:
+            parameter = undefined;
+            break;
         case FileTabCommandId.PrintDocument:
             parameter = undefined;
             break;

package/lib/client/commands/download-document-command.d.ts

@@ -19,6 +19,9 @@ export declare class DownloadRtfCommand extends DownloadDocumentCommand {
 export declare class DownloadTxtCommand extends DownloadDocumentCommand {
     executeCore(_state: SimpleCommandState, options: CommandSimpleOptions<DownloadDocumentParameters>): boolean;
 }
+export declare class DownloadHtmlCommand extends DownloadDocumentCommand {
+    executeCore(_state: SimpleCommandState, options: CommandSimpleOptions<DownloadDocumentParameters>): boolean;
+}
 export declare class DownloadDocumentParameters {
     fileName: string;
     documentFormat: DocumentFormat;

package/lib/client/commands/download-document-command.js

@@ -5,6 +5,7 @@ import { DocumentFormat } from '../../common/document-format';
 import { FileNameHelper } from '../../common/formats/file-name-helper';
 import { ControlOptions, DocumentCapability } from '../../common/model/options/control';
 import { FileUtils } from '@devexpress/utils/lib/utils/file';
+import { StringUtils } from '@devexpress/utils/lib/utils/string';
 import { exportModelToBlob } from '../model-api/formats/exporter';
 export class DownloadDocumentCommand extends CommandBase {
     getState() {
@@ -27,8 +28,12 @@ export class DownloadDocumentCommand extends CommandBase {
             return;
         if (fileName === "")
             fileName = DocumentInfo.defaultDocumentName;
-        const finalFileName = fileName + FileNameHelper.convertToString(documentFormat);
-        exportModelToBlob(this.control.modelManager.modelManipulator, documentFormat, blob => FileUtils.startDownloadFileLocal(blob, finalFileName));
+        const { documentExtension, documentFormat: currentDocumentFormat } = this.control.documentInfo;
+        const keepExtension = !StringUtils.isNullOrEmpty(documentExtension) && currentDocumentFormat === documentFormat;
+        const extension = keepExtension ? documentExtension : FileNameHelper.convertToString(documentFormat);
+        const finalFileName = fileName + extension;
+        const exportModelOptions = this.control.getExportModelOptions({ documentFormat });
+        exportModelToBlob(exportModelOptions, blob => FileUtils.startDownloadFileLocal(blob, finalFileName));
         core.fileDownloaded = true;
         setTimeout(() => {
             core.fileDownloaded = false;
@@ -62,6 +67,12 @@ export class DownloadTxtCommand extends DownloadDocumentCommand {
         return true;
     }
 }
+export class DownloadHtmlCommand extends DownloadDocumentCommand {
+    executeCore(_state, options) {
+        this.download(this.getFileName(options), DocumentFormat.Html);
+        return true;
+    }
+}
 export class DownloadDocumentParameters {
     constructor(documentFormat, fileName = "") {
         this.documentFormat = documentFormat;

package/lib/client/commands/export-document-command.js

@@ -2,6 +2,7 @@ import { CommandBase } from '../../common/commands/command-base';
 import { SimpleCommandState } from '../../common/commands/command-states';
 import { ControlOptions, DocumentCapability } from '../../common/model/options/control';
 import { exportModelToBase64 } from '../model-api/formats/exporter';
+import { isDefined } from '@devexpress/utils/lib/utils/common';
 export class ExportDocumentCommandOptions {
     constructor(documentFormat, reason, documentName) {
         this.documentFormat = documentFormat;
@@ -22,11 +23,10 @@ export class ExportDocumentCommand extends CommandBase {
         const richedit = this.control.owner;
         const param = options.param;
         const format = this.getExportDocumentFormat(richedit.core, param);
-        const fileName = param.documentName !== undefined && param.documentName !== null ?
-            param.documentName :
-            this.control.documentInfo.getFileNameForDownload();
+        const fileName = isDefined(param.documentName) ? param.documentName : this.control.documentInfo.getFileNameForDownload();
         const reason = param.reason ? param.reason : '';
-        exportModelToBase64(this.control.modelManager.modelManipulator, format, base64 => this.exportCore(richedit, base64, fileName, format, reason));
+        const exportModelOptions = this.control.getExportModelOptions({ documentFormat: format });
+        exportModelToBase64(exportModelOptions, base64 => this.exportCore(richedit, base64, fileName, format, reason));
         return true;
     }
     getExportDocumentFormat(core, param) {

package/lib/client/commands/mail-merge-command.js

@@ -45,7 +45,10 @@ export class MailMergeCommand extends CommandBase {
         docxExporter.exportToBlob((blob) => {
             const docxImporter = new Importer(new ImporterOptions());
             docxImporter.importFromFile(blob, this.control.modelManager.richOptions, (documentModel, formatImagesImporter) => {
-                const modelManager = this.createModelManager(documentModel);
+                const exportModelOptions = this.control.getExportModelOptions({
+                    documentFormat: options.param.documentFormat,
+                    modelManager: this.createModelManager(documentModel),
+                });
                 this.control.commandManager.formatImagesImporters.push(formatImagesImporter);
                 formatImagesImporter.whenAllPicturesLoaded((successLoadedAllPictures) => {
                     const index = this.control.commandManager.formatImagesImporters.indexOf(formatImagesImporter);
@@ -54,10 +57,10 @@ export class MailMergeCommand extends CommandBase {
                     if (!successLoadedAllPictures)
                         throw new Error(Errors.InternalException);
                     const param = options.param;
-                    this.prepareMergedDocument(modelManager, param);
-                    exportModelToBlob(modelManager.modelManipulator, param.documentFormat, blob => param.callback(blob));
+                    this.prepareMergedDocument(exportModelOptions.modelManager, param);
+                    exportModelToBlob(exportModelOptions, blob => param.callback(blob));
                 }, 3000);
-                formatImagesImporter.import(modelManager.modelManipulator);
+                formatImagesImporter.import(exportModelOptions.modelManager.modelManipulator);
             }, () => { });
         });
         return true;

package/lib/client/commands/open-document-command.d.ts

@@ -15,7 +15,8 @@ export declare class OpenDocumentCommand extends CommandBase<SimpleCommandState>
     isEnabledInReadOnlyMode(): boolean;
     private static getFileAndDocumentFormat;
     private static getDocumentFormatByFileName;
-    static getFileNameWithoutExtension(fileName: string, format: DocumentFormat): string;
+    private static getDocumentExtensionByFileName;
+    static getFileNameWithoutExtension(fileName: string): string;
 }
 export declare type ImportDocumentCallback = (importSuccess: boolean, importFailReason: string | null) => void;
 export declare class FileInfo {

package/lib/client/commands/open-document-command.js

@@ -38,28 +38,30 @@ export class OpenDocumentCommand extends CommandBase {
         const fileInfo = options.param;
         if (fileInfo) {
             const { file, documentFormat } = OpenDocumentCommand.getFileAndDocumentFormat(fileInfo);
-            const fileName = OpenDocumentCommand.getFileNameWithoutExtension(fileInfo.fileName, documentFormat);
-            return this.executeOpening(file, fileName, documentFormat, fileInfo.callback);
+            const extension = OpenDocumentCommand.getDocumentExtensionByFileName(file.name);
+            const fileName = OpenDocumentCommand.getFileNameWithoutExtension(fileInfo.fileName);
+            return this.executeOpening(file, fileName, documentFormat, extension, fileInfo.callback);
         }
         else {
             const input = document.createElement('input');
             input.type = 'file';
             input.accept = Browser.AndroidMobilePlatform ?
                 'text/plain,text/rtf,application/rtf,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-word.document.macroEnabled.12' :
-                '.txt,.docx,.rtf,.docm';
+                '.txt,.docx,.rtf,.docm,.html,.htm';
             input.addEventListener('change', (e) => {
                 const file = e.target.files[0];
                 if (file) {
                     const format = OpenDocumentCommand.getDocumentFormatByFileName(file.name);
-                    const fileName = OpenDocumentCommand.getFileNameWithoutExtension(file.name, format);
-                    this.executeOpening(file, fileName, format, null);
+                    const extension = OpenDocumentCommand.getDocumentExtensionByFileName(file.name);
+                    const fileName = OpenDocumentCommand.getFileNameWithoutExtension(file.name);
+                    this.executeOpening(file, fileName, format, extension, null);
                 }
             }, false);
             input.click();
         }
         return true;
     }
-    executeOpening(file, fileName, format, callback) {
+    executeOpening(file, fileName, format, extension, callback) {
         const core = this.control;
         const throwInvalidFile = reason => {
             throw new Error(Errors.InternalException + " " + reason);
@@ -70,7 +72,7 @@ export class OpenDocumentCommand extends CommandBase {
         this.beforeOpen();
         core.activeDocumentImporter.importFromFile(file, this.control.modelManager.richOptions, (documentModel, formatImagesImporter) => {
             core.activeDocumentImporter = null;
-            this.openCore(fileName, format, documentModel, formatImagesImporter);
+            this.openCore(fileName, format, documentModel, formatImagesImporter, extension);
             if (!this.suppressUpdateFields)
                 this.updateSomeFields();
             if (callback)
@@ -110,10 +112,10 @@ export class OpenDocumentCommand extends CommandBase {
         this.control.closeDocument();
         this.control.loadingPanelManager.loadingPanel.setVisible(true);
     }
-    openCore(fileName, documentFormat, documentModel, formatImagesImporter) {
+    openCore(fileName, documentFormat, documentModel, formatImagesImporter, documentExtension) {
         new ChunkSizeCorrector().correctChunkSizeAtChunkIndex(documentModel.mainSubDocument, 0);
         new FontCorrector(this.control.modelManager.modelManipulator, documentModel, this.control.modelManager.richOptions.fonts).correct();
-        const documentInfo = new DocumentInfo(fileName, true, documentFormat);
+        const documentInfo = new DocumentInfo(fileName, true, documentFormat, documentExtension);
         this.control.initialize('', documentInfo, NumberMapUtils.mapLength(documentModel.subDocuments), documentModel);
         updateFieldSequenceInfo(this.control.modelManager, this.control.layoutFormatterManager, this.control.createFieldRequestManager());
         formatImagesImporter.import(this.control.modelManager.modelManipulator);
@@ -203,9 +205,12 @@ export class OpenDocumentCommand extends CommandBase {
         const docFormatByFileName = FileNameHelper.convertToDocumentFormat(fileName);
         return docFormatByFileName === DocumentFormat.Undefined ? DocumentFormat.OpenXml : docFormatByFileName;
     }
-    static getFileNameWithoutExtension(fileName, format) {
-        const formatAsString = FileNameHelper.convertToString(format);
-        return StringUtils.endsAt(fileName, formatAsString) ? fileName.slice(0, -formatAsString.length) : fileName;
+    static getDocumentExtensionByFileName(fileName) {
+        return FileNameHelper.convertToDocumentExtension(fileName);
+    }
+    static getFileNameWithoutExtension(fileName) {
+        const extension = OpenDocumentCommand.getDocumentExtensionByFileName(fileName);
+        return !!extension && StringUtils.endsAt(fileName, extension) ? fileName.slice(0, -extension.length) : fileName;
     }
 }
 export class FileInfo {

package/lib/client/default-localization.js

@@ -2217,7 +2217,8 @@ export function loadDefaultMessages() {
             "RichEditExtensionsStringId.Caption_PageView": "View",
             "ASPxRichEditStringId.Download_WordDocument": "Word Document (*.docx)",
             "ASPxRichEditStringId.Download_RichTextFormat": "Rich Text Format (*.rtf)",
-            "ASPxRichEditStringId.Download_PlainText": "Plain Text (*.txt)"
+            "ASPxRichEditStringId.Download_PlainText": "Plain Text (*.txt)",
+            "ASPxRichEditStringId.Download_Html": "Html Document (*.html, *.htm)",
         }
     });
 }

package/lib/client/dialogs/finish-and-merge-dialog.js

@@ -84,6 +84,7 @@ export class FinishAndMergeDialog extends DialogBase {
                             { text: 'Word Document (*.docx)', value: DocumentFormat.OpenXml },
                             { text: 'Rich Text Format (*.rtf)', value: DocumentFormat.Rtf },
                             { text: 'Plain Text (*.txt)', value: DocumentFormat.PlainText },
+                            { text: 'Html Document (*.html, *.htm)', value: DocumentFormat.Html },
                         ],
                         valueExpr: 'value',
                         displayExpr: 'text',

package/lib/client/document-processor/processor.d.ts

@@ -7,16 +7,23 @@ import { FieldRequestManager } from '../../common/model/fields/field-request-man
 import { RichOptions } from '../../common/model/options/rich-options';
 import { IProcessor } from '../../common/processor';
 import { ISelectionBase } from '../../common/selection/selection-base';
+import { IExportModelOptions } from '../../common/formats/i-document-exporter';
 import { CalculateDocumentVariableEventArgs } from './docvar-args';
+import { IRichEditUnitConverter } from '../../common/utils/unit-converter';
+import { DocumentRenderer } from '../../common/canvas/renderes/common/document-renderer';
 export declare abstract class DocumentProcessorBase implements IProcessor {
     readonly selection: ISelectionBase;
     modelManager: IModelManager;
+    private documentRenderer;
+    private uiUnitConverter;
+    private sessionGuid;
+    private clientGuid;
     layoutFormatterManager: FormatterManager;
     onCalculateDocumentVariable: null | ((e: CalculateDocumentVariableEventArgs) => void);
     private readonly innerClientProperties;
     private readonly measurer;
     private activeDocumentImporter;
-    constructor(richOptions: RichOptions);
+    constructor(richOptions: RichOptions, documentRenderer: DocumentRenderer, uiUnitConverter: IRichEditUnitConverter, sessionGuid: string, clientGuid: string);
     abstract createFieldRequestManager(): FieldRequestManager;
     protected abstract createModelManager(model: DocumentModel, richOptions: RichOptions): IModelManager;
     dispose(): void;
@@ -26,9 +33,9 @@ export declare abstract class DocumentProcessorBase implements IProcessor {
     exportDocumentToBlob(callback: (blob: Blob) => void, documentFormat?: DocumentFormat): void;
     protected openDocumentInner(file: File, format: DocumentFormat, callback: (importSuccess: boolean) => void): void;
     protected importImages(formatImagesImporter: FormatImagesImporter): void;
-    protected exportFormat(documentFormat?: DocumentFormat): DocumentFormat;
     protected createModel(model: DocumentModel): void;
     beginUpdate(): void;
     endUpdate(): void;
     invalidateLayoutAfterFontsLoaded(): void;
+    getExportModelOptions(initOptions?: Partial<IExportModelOptions>): IExportModelOptions;
 }

package/lib/client/document-processor/processor.js

@@ -9,13 +9,18 @@ import { ViewSettings } from '../../common/view-settings/views-settings';
 import { Base64Utils } from '@devexpress/utils/lib/utils/base64';
 import { exportModelToBase64, exportModelToBlob } from '../model-api/formats/exporter';
 import { createImporter } from '../model-api/formats/importer';
+import { isDefined } from '@devexpress/utils/lib/utils/common';
 export class DocumentProcessorBase {
-    constructor(richOptions) {
+    constructor(richOptions, documentRenderer, uiUnitConverter, sessionGuid, clientGuid) {
         this.selection = new SelectionBase();
         this.onCalculateDocumentVariable = null;
         this.measurer = new Measurer('');
         this.modelManager = this.createModelManager(null, richOptions);
         this.innerClientProperties = new InnerClientProperties(new ViewSettings());
+        this.documentRenderer = documentRenderer;
+        this.uiUnitConverter = uiUnitConverter;
+        this.sessionGuid = sessionGuid;
+        this.clientGuid = clientGuid;
     }
     dispose() {
         this.measurer.dispose();
@@ -30,10 +35,10 @@ export class DocumentProcessorBase {
         this.createModel(model);
     }
     exportDocumentToBase64(callback, documentFormat) {
-        exportModelToBase64(this.modelManager.modelManipulator, this.exportFormat(documentFormat), callback);
+        exportModelToBase64(this.getExportModelOptions({ documentFormat }), callback);
     }
     exportDocumentToBlob(callback, documentFormat) {
-        exportModelToBlob(this.modelManager.modelManipulator, this.exportFormat(documentFormat), callback);
+        exportModelToBlob(this.getExportModelOptions({ documentFormat }), callback);
     }
     openDocumentInner(file, format, callback) {
         if (this.activeDocumentImporter) {
@@ -58,9 +63,6 @@ export class DocumentProcessorBase {
     importImages(formatImagesImporter) {
         formatImagesImporter.import(this.modelManager.modelManipulator);
     }
-    exportFormat(documentFormat) {
-        return documentFormat === undefined || documentFormat === null ? DocumentFormat.OpenXml : documentFormat;
-    }
     createModel(model) {
         this.modelManager = this.createModelManager(model, this.modelManager.richOptions);
         const layout = new DocumentLayout(new AnchorObjectsPositionInfo(model));
@@ -80,4 +82,14 @@ export class DocumentProcessorBase {
             this.layoutFormatterManager.invalidator.onChangedAllLayout();
         }
     }
+    getExportModelOptions(initOptions = {}) {
+        return {
+            modelManager: isDefined(initOptions.modelManager) ? initOptions.modelManager : this.modelManager,
+            pictureRenderer: this.documentRenderer,
+            uiUnitConverter: this.uiUnitConverter,
+            sessionGuid: this.sessionGuid,
+            clientGuid: this.clientGuid,
+            documentFormat: isDefined(initOptions.documentFormat) ? initOptions.documentFormat : DocumentFormat.OpenXml,
+        };
+    }
 }

package/lib/client/formats/docx/export/data.d.ts

@@ -54,6 +54,8 @@ export declare class Data {
     contentTypesExporter: ContentTypesExporter;
     subDocumentExporterStack: Stack<BaseSubDocumentExporter>;
     exportedImageTable: Record<number, boolean>;
+    footNotes: Map<SubDocument, number>;
+    endNotes: Map<SubDocument, number>;
     private writerStack;
     private relationExporters;
     constructor(model: DocumentModel, options: DocxExportOptions);
@@ -62,4 +64,6 @@ export declare class Data {
     popRelationExporter(): void;
     createTextBoxExporter(subDoc: SubDocument): TextBoxSubDocumentExporter;
     init(): void;
+    addFootNote(note: SubDocument): number;
+    addEndNote(note: SubDocument): number;
 }

package/lib/client/formats/docx/export/data.js

@@ -44,6 +44,8 @@ export class Data {
         this.styleExporter = new StylesExporter(this);
         this.contentTypesExporter = new ContentTypesExporter(this);
         this.exportedImageTable = {};
+        this.footNotes = new Map();
+        this.endNotes = new Map();
     }
     get writer() { return this.writerStack.last; }
     set writer(val) { this.writerStack.push(val); }
@@ -60,4 +62,14 @@ export class Data {
         this.headerCounter = 0;
         this.footerCounter = 0;
     }
+    addFootNote(note) {
+        const id = this.footNotes.size - 1;
+        this.footNotes.set(note, id);
+        return id;
+    }
+    addEndNote(note) {
+        const id = this.endNotes.size - 1;
+        this.endNotes.set(note, id);
+        return id;
+    }
 }

package/lib/client/formats/docx/export/exporter.d.ts

@@ -9,6 +9,8 @@ export declare class DocxExporter implements IDocumentExporter {
     exportToBlob(callback: (blob: Blob) => void): void;
     exportToBase64(callback: (base64: string) => void): void;
     private exportInner;
+    private addFootNoteSeparators;
+    private addEndNoteSeparators;
     private exportCustomProperties;
     private exportFootNotesAndEndNotes;
     private exportComments;

package/lib/client/formats/docx/export/exporter.js

@@ -7,6 +7,7 @@ import { StylesExporter } from './exporters/styles';
 import { HeaderFooterSubDocumentExporter } from './exporters/sub-document/header-footer-sub-document-exporter';
 import { MainSubDocumentExporter } from './exporters/sub-document/main-sub-document';
 import { ThemeExporter } from './exporters/theme';
+import { EndNoteExporter, FootNoteExporter } from './exporters/sub-document/note-sub-document-exporter';
 export class DocxExporter {
     constructor(modelManipulator, options) {
         this.modelManipulator = modelManipulator;
@@ -26,6 +27,8 @@ export class DocxExporter {
         });
     }
     exportInner() {
+        this.addFootNoteSeparators();
+        this.addEndNoteSeparators();
         new CorePropertiesExporter(this.data).export();
         this.exportCustomProperties();
         new MainSubDocumentExporter(this.data, this.data.model.mainSubDocument, 'word/document.xml').export();
@@ -44,9 +47,21 @@ export class DocxExporter {
         this.data.popRelationExporter();
         this.data.contentTypesExporter.export();
     }
+    addFootNoteSeparators() {
+        for (const separator of this.data.model.footNoteSeparators.getSeparatos())
+            this.data.addFootNote(separator);
+    }
+    addEndNoteSeparators() {
+        for (const separator of this.data.model.endNoteSeparators.getSeparatos())
+            this.data.addEndNote(separator);
+    }
     exportCustomProperties() {
     }
     exportFootNotesAndEndNotes() {
+        if (this.data.footNotes.size > 0)
+            new FootNoteExporter(this.data).export();
+        if (this.data.endNotes.size > 0)
+            new EndNoteExporter(this.data).export();
     }
     exportComments() {
     }

package/lib/client/formats/docx/export/exporters/base/sections.js

@@ -7,6 +7,7 @@ import { ContentType, DocxNsType } from '../../../utils/constants';
 import { WriterHelper } from '../../utils/writer-helper';
 import { BaseExporter } from '../base';
 import { LineNumberDefaults } from '../../../../../../common/model/section/line-numbering-properties';
+import { NotePropertiesExporter } from '../note-properties';
 export class SectionExporter extends BaseExporter {
     constructor(data, _section) {
         super(data);
@@ -60,6 +61,9 @@ export class SectionExporter extends BaseExporter {
         this.exportHeaderFooter(section.footers, HeaderFooterType.Odd);
     }
     exportSectionPropertiesCore(section) {
+        const noteExporter = new NotePropertiesExporter(this.data);
+        noteExporter.exportSectionLevelFootNoteProperties(section.sectionProperties.footNote);
+        noteExporter.exportSectionLevelEndNoteProperties(section.sectionProperties.endNote);
         const props = section.sectionProperties;
         this.writer.writeWpStringValue('type', WriterHelper.getValueFromTables(TranslationTables.sectionStartTypeTable, props.startType, SectionStartType.NextPage));
         this.exportSectionPage(props);
@@ -67,6 +71,7 @@ export class SectionExporter extends BaseExporter {
         this.exportSectionLineNumbering(props);
         this.exportSectionPageNumbering(props);
         this.exportSectionColumns(props);
+        noteExporter.exportSectionFootNoteColumnCount(section.sectionProperties.footNote);
         this.exportSectionGeneralSettings(props);
     }
     exportSectionPage(props) {

package/lib/client/formats/docx/export/exporters/note-properties.d.ts

@@ -0,0 +1,18 @@
+import { NoteProperties } from "../../../../../common/model/footnotes/footnote";
+import { BaseExporter } from "./base";
+export declare class NotePropertiesExporter extends BaseExporter {
+    private static readonly defaultProperties;
+    exportSectionLevelFootNoteProperties(properties: NoteProperties): void;
+    exportSectionLevelEndNoteProperties(properties: NoteProperties): void;
+    exportDocumentLevelFootNoteProperties(properties: NoteProperties): void;
+    exportDocumentLevelEndNoteProperties(properties: NoteProperties): void;
+    exportSectionFootNoteColumnCount(properties: NoteProperties): void;
+    private isDefault;
+    private exportNoteProperties;
+    private exportFootNoteSeparators;
+    private exportEndNoteSeparators;
+    private exportFootNoteSeparator;
+    private exportEndNoteSeparator;
+    private exportNoteSeparators;
+    private exportNoteSeparator;
+}

package/lib/client/formats/docx/export/exporters/note-properties.js

@@ -0,0 +1,83 @@
+import { NoteProperties } from "../../../../../common/model/footnotes/footnote";
+import { TranslationTables } from "../../translation-table/translation-tables";
+import { WriterHelper } from "../utils/writer-helper";
+import { BaseExporter } from "./base";
+import { DocxNsType } from "../../utils/constants";
+export class NotePropertiesExporter extends BaseExporter {
+    exportSectionLevelFootNoteProperties(properties) {
+        if (!this.isDefault(properties)) {
+            this.writer.writeWpStartElement('footnotePr');
+            this.exportNoteProperties(properties);
+            this.writer.endElement();
+        }
+    }
+    exportSectionLevelEndNoteProperties(properties) {
+        if (!this.isDefault(properties)) {
+            this.writer.writeWpStartElement('endnotePr');
+            this.exportNoteProperties(properties);
+            this.writer.endElement();
+        }
+    }
+    exportDocumentLevelFootNoteProperties(properties) {
+        if (!this.isDefault(properties) || this.data.footNotes.size > 0) {
+            this.writer.writeWpStartElement('footnotePr');
+            this.exportNoteProperties(properties);
+            this.exportFootNoteSeparators();
+            this.writer.endElement();
+        }
+    }
+    exportDocumentLevelEndNoteProperties(properties) {
+        if (!this.isDefault(properties) || this.data.endNotes.size > 0) {
+            this.writer.writeWpStartElement('endnotePr');
+            this.exportNoteProperties(properties);
+            this.exportEndNoteSeparators();
+            this.writer.endElement();
+        }
+    }
+    exportSectionFootNoteColumnCount(properties) {
+        if (properties && properties.columnCount !== NotePropertiesExporter.defaultProperties.columnCount) {
+            this.writer.elementStartNS(DocxNsType.w15, 'footnoteColumns');
+            this.writer.writeWpIntAttr('val', properties.columnCount);
+            this.writer.endElement();
+        }
+    }
+    isDefault(properties) {
+        return !properties || properties.equals(NotePropertiesExporter.defaultProperties);
+    }
+    exportNoteProperties(properties) {
+        const defaultPosition = NotePropertiesExporter.defaultProperties.position;
+        if (properties.position != defaultPosition)
+            this.writer.writeWpStringValue("pos", WriterHelper.getValueFromTables(TranslationTables.footNotePlacementTable, properties.position, defaultPosition));
+        if (properties.startingNumber != NotePropertiesExporter.defaultProperties.startingNumber)
+            this.writer.writeWpIntValue("numStart", properties.startingNumber);
+        const defaultNumberingFormat = NotePropertiesExporter.defaultProperties.numberingFormat;
+        if (properties.numberingFormat != defaultNumberingFormat)
+            this.writer.writeWpStringValue("numFmt", WriterHelper.getValueFromTables(TranslationTables.pageNumberingFormatTable, properties.numberingFormat, defaultNumberingFormat));
+        const defaultNumberingRestartType = NotePropertiesExporter.defaultProperties.numberingRestartType;
+        if (properties.numberingRestartType != defaultNumberingRestartType)
+            this.writer.writeWpStringValue("numRestart", WriterHelper.getValueFromTables(TranslationTables.noteNumberingRestartTypeTable, properties.numberingRestartType, defaultNumberingRestartType));
+    }
+    exportFootNoteSeparators() {
+        this.exportNoteSeparators(this.data.model.footNoteSeparators, this.exportFootNoteSeparator.bind(this));
+    }
+    exportEndNoteSeparators() {
+        this.exportNoteSeparators(this.data.model.endNoteSeparators, this.exportEndNoteSeparator.bind(this));
+    }
+    exportFootNoteSeparator(separator) {
+        this.exportNoteSeparator('footnote', separator, this.data.footNotes);
+    }
+    exportEndNoteSeparator(separator) {
+        this.exportNoteSeparator('endnote', separator, this.data.endNotes);
+    }
+    exportNoteSeparators(separators, exporter) {
+        for (const separator of separators.getSeparatos())
+            exporter(separator);
+    }
+    exportNoteSeparator(tag, note, notes) {
+        const id = notes.get(note);
+        this.writer.writeWpStartElement(tag);
+        this.writer.writeWpIntAttr('id', id);
+        this.writer.endElement();
+    }
+}
+NotePropertiesExporter.defaultProperties = NoteProperties.createDefault();

package/lib/client/formats/docx/export/exporters/settings.d.ts

@@ -13,4 +13,6 @@ export declare class SettingsExporter extends ExporterBaseWithRootElement {
     private exportDocumentProtectionSettings;
     private exportDocumentProtectionType;
     private exportDocumentProtectionSettingsCore;
+    private exportFootNoteProperties;
+    private exportEndNoteProperties;
 }