@talrace/ngx-noder 0.0.11 → 0.0.12

package/fesm2022/talrace-ngx-noder.mjs

@@ -1629,10 +1629,10 @@ class OperationHistory {
     }
     pushInsertText(insertIndex, text) {
         const redoStep = new InsertTextModel({ insertIndex, text });
-        const undoStep = new DeleteModel({ startIndex: insertIndex, endIndex: insertIndex + text.length });
+        const undoStep = new DeleteModel({ startIndex: insertIndex, count: text.length });
         this.addToHistory(undoStep, redoStep);
     }
-    pushInsertParagraph(model, paragraphs) {
+    pushInsertParagraph(content, model, paragraphs) {
         const currentParagraph = paragraphs
             .slice()
             .sort((a, b) => a.insertIndex - b.insertIndex)
@@ -1642,52 +1642,50 @@ class OperationHistory {
             .sort((a, b) => b.insertIndex - a.insertIndex)
             .find(x => x.insertIndex < currentParagraph.insertIndex);
         let startIndex = model.insertIndex;
-        let endIndex = model.insertIndex;
+        let count = content.length;
         if (model.insertIndex === 0 || previousParagraph?.insertIndex === model.insertIndex - 1) {
-            endIndex++;
+            count++;
         }
         else if (currentParagraph.insertIndex === model.insertIndex) {
             startIndex++;
-            endIndex++;
         }
         else {
-            endIndex = startIndex + 2;
+            count = count + 2;
         }
-        endIndex = endIndex + (model.insertText ? model.insertText.text.length : 1);
-        const undoStep = new DeleteModel({ startIndex, endIndex });
+        const undoStep = new DeleteModel({ startIndex, count });
         this.addToHistory(undoStep, model);
     }
     pushInsertElement(model) {
-        const undoStep = new DeleteModel({ startIndex: model.element.insertIndex, endIndex: model.element.insertIndex + 1 });
+        const undoStep = new DeleteModel({ startIndex: model.element.insertIndex, count: CUSTOM_ELEMENT_MARKER.length });
         this.addToHistory(undoStep, model);
     }
-    pushInsertBreak(model, endIndex) {
-        const undoStep = new DeleteModel({ startIndex: model.insertIndex, endIndex });
+    pushInsertBreak(model, count) {
+        const undoStep = new DeleteModel({ startIndex: model.insertIndex, count });
         this.addToHistory(undoStep, model);
     }
     pushInsertTab(model) {
-        const undoStep = new DeleteModel({ startIndex: model.insertIndex, endIndex: model.insertIndex + 1 });
+        const undoStep = new DeleteModel({ startIndex: model.insertIndex, count: CUSTOM_ELEMENT_MARKER.length });
         this.addToHistory(undoStep, model);
     }
     pushInsertImage(model) {
-        const undoStep = new DeleteModel({ startIndex: model.insertIndex, endIndex: model.insertIndex + 1 });
+        const undoStep = new DeleteModel({ startIndex: model.insertIndex, count: CUSTOM_ELEMENT_MARKER.length });
         this.addToHistory(undoStep, model);
     }
     pushInsertLink(model) {
-        const undoStep = new DeleteModel({ startIndex: model.insertIndex, endIndex: model.endIndex });
+        const undoStep = new DeleteModel({ startIndex: model.insertIndex, count: model.linkDataModel.text.length });
         this.addToHistory(undoStep, model);
     }
     pushInsertTable(model) {
-        const undoStep = new DeleteModel({ startIndex: model.insertIndex, endIndex: model.insertIndex + model.content.length });
+        const undoStep = new DeleteModel({ startIndex: model.insertIndex, count: model.content.length });
         this.addToHistory(undoStep, model);
     }
     pushInsertStyledText(insertIndex, text, style) {
         const redoStep = new InsertStyledTextModel({ insertIndex, text, textStyle: style });
-        const undoStep = new DeleteModel({ startIndex: insertIndex, endIndex: insertIndex + text.length });
+        const undoStep = new DeleteModel({ startIndex: insertIndex, count: text.length });
         this.addToHistory(undoStep, redoStep);
     }
     pushDelete(model) {
-        const redoStep = new DeleteModel({ startIndex: model.startIndex, endIndex: model.startIndex + model.text.length });
+        const redoStep = new DeleteModel({ startIndex: model.startIndex, count: model.text.length });
         this.addToHistory(model, redoStep);
     }
     pushApplyTextStyle(startIndex, endIndex, style, formats) {
@@ -3236,7 +3234,7 @@ class SaveCommandsHelper {
         return new CommandModel({ commandType: CommandType.RemoveNumberings, removeNumberings, targets });
     }
     static getRestoreNumberingsCommand(restoreNumberings, targets) {
-        return new CommandModel({ commandType: CommandType.AddNumbering, restoreNumberings, targets });
+        return new CommandModel({ commandType: CommandType.RestoreNumberings, restoreNumberings, targets });
     }
     static getApplyImageStyleCommand(height, width, insertIndex, targets) {
         const applyImageStyle = new ApplyImageStyleModel({ height, width, insertIndex });
@@ -3250,8 +3248,8 @@ class SaveCommandsHelper {
         const applyTextStyle = new ApplyTextStyleModel({ startIndex, endIndex, textStyle });
         return new CommandModel({ commandType: CommandType.ApplyTextStyle, applyTextStyle, targets });
     }
-    static getDeleteCommand(startIndex, endIndex, targets) {
-        const deleteModel = new DeleteModel({ startIndex, endIndex });
+    static getDeleteCommand(startIndex, count, targets) {
+        const deleteModel = new DeleteModel({ startIndex, count });
         return new CommandModel({ commandType: CommandType.Delete, delete: deleteModel, targets });
     }
     static getInsertTextCommand(text, insertIndex, targets) {
@@ -4161,7 +4159,7 @@ class Editor {
             this.replaceBy(new ReplaceModel({ insertParagraph }));
             return;
         }
-        this.saveInsertParagraphToHistory(insertParagraph);
+        this.saveInsertParagraphToHistory(insertTable.content, insertParagraph);
         const endPoint = this.session.insertParagraph(this.selection.cursor, insertParagraph);
         let lastRow = this.selection.cursor.row === endPoint.row ? endPoint.row : Infinity;
         this.renderer.updateLines(this.selection.cursor.row, lastRow);
@@ -4182,7 +4180,7 @@ class Editor {
     }
     replaceBy(model) {
         const partIndexes = ContentHelper.getSelectedPartDocumentIndexes(this.session.displayData.paragraphs, this.selection.range);
-        model.delete = new DeleteModel({ startIndex: partIndexes.startIndex, endIndex: partIndexes.endIndex });
+        model.delete = new DeleteModel({ startIndex: partIndexes.startIndex, count: partIndexes.endIndex - partIndexes.startIndex + 1 });
         this.saveReplaceToHistory(this.selection.range, model);
         this.removeCustomElementsData();
         const endPosition = this.session.replace(model);
@@ -4383,8 +4381,8 @@ class Editor {
             command = SaveCommandsHelper.getInsertParagraphCommand(operation, this.targets);
         }
         else if (operation instanceof DeleteModel) {
-            this.session.removeByDocumentIndexes(operation.startIndex, operation.endIndex);
-            command = SaveCommandsHelper.getDeleteCommand(operation.startIndex, operation.endIndex, this.targets);
+            this.session.removeByDocumentIndexes(operation.startIndex, operation.startIndex + operation.count);
+            command = SaveCommandsHelper.getDeleteCommand(operation.startIndex, operation.count, this.targets);
         }
         else if (operation instanceof InsertStyledTextModel) {
             this.session.insertTextByDocumentIndex(operation.insertIndex, operation.text, new TextStyleModel(operation.textStyle));
@@ -4506,18 +4504,18 @@ class Editor {
     }
     saveRemoveToHistory(range) {
         const restoreModel = this.createRestoreFromSlice(range.start.row, range.start.column, range.end.row, range.end.column);
-        const endIndex = restoreModel.endIndex;
+        const count = restoreModel.endIndex - restoreModel.startIndex + 1;
         restoreModel.endIndex = restoreModel.startIndex; // this is to restore in position without deleting/replacing anything in range
         this.history.pushDelete(restoreModel);
-        this.commandsService.createCommand(SaveCommandsHelper.getDeleteCommand(restoreModel.startIndex, endIndex, this.targets));
+        this.commandsService.createCommand(SaveCommandsHelper.getDeleteCommand(restoreModel.startIndex, count, this.targets));
     }
     saveInsertTextToHistory(paragraph, indexInParagraph, text) {
         const index = ContentHelper.paragraphToDocumentIndex(this.session.displayData.paragraphs, paragraph, indexInParagraph);
         this.history.pushInsertText(index, text);
         this.commandsService.createCommand(SaveCommandsHelper.getInsertTextCommand(text, index, this.targets));
     }
-    saveInsertParagraphToHistory(model) {
-        this.history.pushInsertParagraph(model, this.session.model.paragraphs);
+    saveInsertParagraphToHistory(content, model) {
+        this.history.pushInsertParagraph(content, model, this.session.model.paragraphs);
         this.commandsService.createCommand(SaveCommandsHelper.getInsertParagraphCommand(model, this.targets));
     }
     saveInsertStyledTextToHistory(paragraph, indexInParagraph, text, style) {
@@ -4533,8 +4531,8 @@ class Editor {
         model.isOnNewParagraph =
             model.breakType === BreakTypes.Page &&
                 BreakHelper.getBreakType(this.session.model, CUSTOM_ELEMENT_MARKER, model.insertIndex - 1) !== BreakTypes.Page;
-        const endIndex = model.isOnNewParagraph ? model.insertIndex + NEW_LINE_MARKUP.length + 1 : model.insertIndex + 1;
-        this.history.pushInsertBreak(model, endIndex);
+        const count = model.isOnNewParagraph ? NEW_LINE_MARKUP.length + 1 : 1;
+        this.history.pushInsertBreak(model, count);
         this.commandsService.createCommand(SaveCommandsHelper.getInsertBreakCommand(model, this.targets));
     }
     saveInsertTabToHistory(model) {
@@ -4604,7 +4602,7 @@ class Editor {
         const paragraphs = IndexedElementHelper.sliceSection(this.session.model.paragraphs, startIndex, endIndex).map(x => new ParagraphModel(x));
         const images = IndexedElementHelper.sliceSection(this.session.model.images, startIndex, endIndex).map(x => new ImageModel(x));
         const tables = IndexedElementHelper.sliceSection(this.session.model.tables, startIndex, endIndex).map(x => new TableModel(x));
-        const elements = IndexedElementHelper.sliceSection(this.session.model.elements, startIndex, endIndex).map(x => new ElementModel({ ...x, guid: '' }));
+        const elements = IndexedElementHelper.sliceSection(this.session.model.elements, startIndex, endIndex).map(x => new ElementModel({ ...x, id: 0, guid: '' }));
         const breaks = IndexedElementHelper.sliceSection(this.session.model.breaks, startIndex, endIndex).map(x => new BreakModel(x));
         const tabs = IndexedElementHelper.sliceSection(this.session.model.tabs, startIndex, endIndex).map(x => new TabModel(x));
         const links = LinkHelper.sliceSection(this.session.model.links, startIndex, endIndex).map(x => new LinkModel(x));
@@ -8614,8 +8612,8 @@ class CellModel {
 }
 
 class ContentOperationsHelper {
-    static removeContent(content, startIndex, endIndex) {
-        return `${content.slice(0, startIndex)}${content.slice(endIndex + 1, content.length)}`;
+    static removeContent(content, startIndex, count) {
+        return `${content.slice(0, startIndex)}${content.slice(startIndex + count, content.length)}`;
     }
     static insertContent(content, text, index) {
         const before = content.slice(0, index);
@@ -8623,7 +8621,7 @@ class ContentOperationsHelper {
         return `${before}${text}${after}`;
     }
     static replaceContent(content, startIndex, endIndex, text) {
-        const reduced = this.removeContent(content, startIndex, endIndex);
+        const reduced = this.removeContent(content, startIndex, endIndex - startIndex + 1);
         return this.insertContent(reduced, text, startIndex);
     }
 }
@@ -9411,7 +9409,7 @@ class OperationsHelper {
                     this.deleteRestore(contents, command.restore);
                     break;
                 case CommandType.Delete:
-                    this.delete(contents, command.delete.startIndex, command.delete.endIndex);
+                    this.delete(contents, command.delete.startIndex, command.delete.count);
                     break;
                 case CommandType.ReplaceByText: {
                     const model = command.replaceByText;
@@ -9699,7 +9697,7 @@ class OperationsHelper {
     }
     static deleteRestore(document, model) {
         if (model.startIndex !== model.endIndex) {
-            this.delete(document, model.startIndex, model.endIndex);
+            this.delete(document, model.startIndex, model.endIndex - model.startIndex + 1);
         }
         this.restore(document, model);
     }
@@ -9715,9 +9713,10 @@ class OperationsHelper {
         IndexedElementOperationsHelper.restore(document.tabs, model.startIndex, model.text.length, model.tabs);
         LinkOperationsHelper.restore(document.links, model.startIndex, model.text.length, model.links);
     }
-    static delete(document, startIndex, endIndex) {
-        document.content = ContentOperationsHelper.removeContent(document.content, startIndex, endIndex);
+    static delete(document, startIndex, count) {
+        document.content = ContentOperationsHelper.removeContent(document.content, startIndex, count);
         document.contentLength = document.content.length;
+        const endIndex = startIndex + count - 1;
         FormatOperationsHelper.removeContent(document.formats, startIndex, endIndex);
         IndexedElementOperationsHelper.removeContent(document.paragraphs, startIndex, endIndex);
         IndexedElementOperationsHelper.removeContent(document.images, startIndex, endIndex);
@@ -9740,7 +9739,7 @@ class OperationsHelper {
         LinkOperationsHelper.replaceContent(document.links, startIndex, endIndex, text.length);
     }
     static replace(document, model, contentWidth) {
-        this.delete(document, model.delete.startIndex, model.delete.endIndex);
+        this.delete(document, model.delete.startIndex, model.delete.count);
         if (model.insertText) {
             this.insertText(document, model.insertText.text, model.insertText.insertIndex);
         }
@@ -10079,7 +10078,7 @@ class EditSession {
         CustomComponentHelper.applyRemovingComponents(this.customComponents.images, partIndexes.startIndex, partIndexes.endIndex);
         CustomComponentHelper.applyRemovingComponents(this.customComponents.customElements, partIndexes.startIndex, partIndexes.endIndex);
         CustomComponentHelper.applyRemovingComponents(this.customComponents.tabs, partIndexes.startIndex, partIndexes.endIndex);
-        OperationsHelper.delete(this.model, partIndexes.startIndex, partIndexes.endIndex);
+        OperationsHelper.delete(this.model, partIndexes.startIndex, partIndexes.endIndex - partIndexes.startIndex + 1);
         this.selection.placeCursor(range.start);
         this.displayData.resetAllNumberingInfo(range.start.row);
         this.displayData.updateNextLineIndexes(range.start.row, range.start.row);
@@ -10089,7 +10088,7 @@ class EditSession {
         this.applyToolbarStyles();
     }
     replace(model) {
-        this.removeByDocumentIndexes(model.delete.startIndex, model.delete.endIndex + 1);
+        this.removeByDocumentIndexes(model.delete.startIndex, model.delete.startIndex + model.delete.count);
         let endPoint;
         if (model.insertText) {
             endPoint = this.insertTextByDocumentIndex(model.insertText.insertIndex, model.insertText.text);
@@ -13627,7 +13626,7 @@ class FontComponent {
     constructor() {
         this.isDisabled = false;
         this.selectFont = new EventEmitter();
-        this.fonts = [DEFAULT_FONT_FAMILY, 'Verdana', 'Arial', 'Times New Roman'];
+        this.fonts = ['Arial', DEFAULT_FONT_FAMILY, 'Times New Roman', 'Verdana'];
         this.font = DEFAULT_FONT_FAMILY;
     }
     set styles(value) {