roosterjs 9.11.0 → 9.11.2

package/dist/rooster.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for roosterjs (Version 9.11.0)
+// Type definitions for roosterjs (Version 9.11.2)
 // Generated by dts tool from roosterjs
 // Project: https://github.com/Microsoft/roosterjs
 
@@ -9277,7 +9277,10 @@ class ImageEditPlugin implements ImageEditor, EditorPlugin  {
     private mouseDownHandler;
     private onDropHandler;
     private keyDownHandler;
-    private applyFormatWithContentModel;
+    /**
+     * EXPOSED FOR TESTING PURPOSE ONLY
+     */
+    protected applyFormatWithContentModel(editor: IEditor, isCropMode: boolean, shouldSelectImage: boolean, isApiOperation?: boolean): void;
     private startEditing;
     startRotateAndResize(editor: IEditor, image: HTMLImageElement): void;
     private updateRotateHandleState;
@@ -9286,7 +9289,10 @@ class ImageEditPlugin implements ImageEditor, EditorPlugin  {
     private startCropMode;
     cropImage(): void;
     private editImage;
-    private cleanInfo;
+    /**
+     * Exported for testing purpose only
+     */
+    cleanInfo(): void;
     private removeImageWrapper;
     flipImage(direction: 'horizontal' | 'vertical'): void;
     rotateImage(angleRad: number): void;

package/dist/rooster.js

@@ -10397,8 +10397,8 @@ var DomIndexerImpl = /** @class */ (function () {
     };
     DomIndexerImpl.prototype.reconcileTextSelection = function (textNode, startOffset, endOffset) {
         var _a;
-        var _b;
-        var _c = textNode.__roosterjsContentModel, paragraph = _c.paragraph, segments = _c.segments;
+        var _b, _c;
+        var _d = textNode.__roosterjsContentModel, paragraph = _d.paragraph, segments = _d.segments;
         var first = segments[0];
         var last = segments[segments.length - 1];
         var selectable;
@@ -10420,6 +10420,14 @@ var DomIndexerImpl = /** @class */ (function () {
                 if (endOffset === undefined) {
                     var marker = (0, roosterjs_content_model_dom_1.createSelectionMarker)(first.format);
                     newSegments.push(marker);
+                    if (startOffset < ((_b = textNode.nodeValue) !== null && _b !== void 0 ? _b : '').length) {
+                        if (first.link) {
+                            (0, roosterjs_content_model_dom_1.addLink)(marker, first.link);
+                        }
+                        if (first.code) {
+                            (0, roosterjs_content_model_dom_1.addCode)(marker, first.code);
+                        }
+                    }
                     selectable = marker;
                     endOffset = startOffset;
                 }
@@ -10461,7 +10469,7 @@ var DomIndexerImpl = /** @class */ (function () {
             var isBefore = wrapper.previousSibling == delimiter;
             var isAfter = wrapper.nextSibling == delimiter;
             if (index >= 0 && delimiter && (0, roosterjs_content_model_dom_1.isEntityDelimiter)(delimiter) && (isBefore || isAfter)) {
-                var marker = (0, roosterjs_content_model_dom_1.createSelectionMarker)(((_b = paragraph.segments[isAfter ? index + 1 : index - 1]) !== null && _b !== void 0 ? _b : first).format);
+                var marker = (0, roosterjs_content_model_dom_1.createSelectionMarker)(((_c = paragraph.segments[isAfter ? index + 1 : index - 1]) !== null && _c !== void 0 ? _c : first).format);
                 paragraph.segments.splice(isAfter ? index + 1 : index, 0, marker);
                 selectable = marker;
             }
@@ -10879,6 +10887,7 @@ var deleteEmptyList_1 = __webpack_require__(/*! ./utils/deleteEmptyList */ "./pa
 var pasteCopyBlockEntityParser_1 = __webpack_require__(/*! ../../override/pasteCopyBlockEntityParser */ "./packages/roosterjs-content-model-core/lib/override/pasteCopyBlockEntityParser.ts");
 var paste_1 = __webpack_require__(/*! ../../command/paste/paste */ "./packages/roosterjs-content-model-core/lib/command/paste/paste.ts");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
+var TEMP_DIV_ID = 'roosterJS_copyCutTempDiv';
 /**
  * Copy and paste plugin for handling onCopy and onPaste event
  */
@@ -11042,6 +11051,7 @@ var CopyPastePlugin = /** @class */ (function () {
         div.style.color = 'black';
         div.childNodes.forEach(function (node) { return div.removeChild(node); });
         div.style.display = '';
+        div.id = TEMP_DIV_ID;
         div.focus();
         return div;
     };
@@ -20978,8 +20988,6 @@ function isSegmentEmpty(segment) {
     switch (segment.segmentType) {
         case 'Text':
             return !segment.text;
-        case 'Image':
-            return !segment.src;
         default:
             return false;
     }
@@ -21193,6 +21201,7 @@ function normalizeParagraph(paragraph) {
                 (0, mutate_1.mutateBlock)(paragraph).segments.pop();
             }
         }
+        normalizeParagraphStyle(paragraph);
     }
     if (!(0, isWhiteSpacePreserved_1.isWhiteSpacePreserved)(paragraph.format.whiteSpace)) {
         (0, normalizeSegment_1.normalizeAllSegments)(paragraph);
@@ -21202,6 +21211,13 @@ function normalizeParagraph(paragraph) {
     moveUpSegmentFormat(paragraph);
 }
 exports.normalizeParagraph = normalizeParagraph;
+function normalizeParagraphStyle(paragraph) {
+    // New paragraph should not have white-space style
+    if (paragraph.format.whiteSpace &&
+        paragraph.segments.every(function (seg) { return seg.segmentType == 'Br' || seg.segmentType == 'SelectionMarker'; })) {
+        delete (0, mutate_1.mutateBlock)(paragraph).format.whiteSpace;
+    }
+}
 function removeEmptySegments(block) {
     for (var j = block.segments.length - 1; j >= 0; j--) {
         if ((0, isEmpty_1.isSegmentEmpty)(block.segments[j])) {
@@ -29622,14 +29638,22 @@ var ImageEditPlugin = /** @class */ (function () {
     };
     ImageEditPlugin.prototype.keyDownHandler = function (editor, event) {
         if (this.isEditing) {
-            if (event.rawEvent.key === 'Escape') {
-                this.removeImageWrapper();
+            if (event.rawEvent.key === 'Escape' ||
+                event.rawEvent.key === 'Delete' ||
+                event.rawEvent.key === 'Backspace') {
+                if (event.rawEvent.key === 'Escape') {
+                    this.removeImageWrapper();
+                }
+                this.cleanInfo();
             }
             else {
                 this.applyFormatWithContentModel(editor, this.isCropMode, true /** should selectImage */, false /* isApiOperation */);
             }
         }
     };
+    /**
+     * EXPOSED FOR TESTING PURPOSE ONLY
+     */
     ImageEditPlugin.prototype.applyFormatWithContentModel = function (editor, isCropMode, shouldSelectImage, isApiOperation) {
         var _this = this;
         var editingImageModel;
@@ -29656,6 +29680,15 @@ var ImageEditPlugin = /** @class */ (function () {
                         image.isSelected = shouldSelectImage;
                         image.isSelectedAsImageSelection = shouldSelectImage;
                         delete image.dataset.isEditing;
+                        if ((selection === null || selection === void 0 ? void 0 : selection.type) == 'range' && !selection.range.collapsed) {
+                            var selectedParagraphs = (0, roosterjs_content_model_dom_1.getSelectedParagraphs)(model, true);
+                            var isImageInRange = selectedParagraphs.some(function (paragraph) {
+                                return paragraph.segments.includes(image);
+                            });
+                            if (isImageInRange) {
+                                image.isSelected = true;
+                            }
+                        }
                     });
                     if (shouldSelectImage) {
                         (0, normalizeImageSelection_1.normalizeImageSelection)(previousSelectedImage);
@@ -29727,6 +29760,7 @@ var ImageEditPlugin = /** @class */ (function () {
         if (this.imageEditInfo) {
             this.startEditing(editor, image, ['resize', 'rotate']);
             if (this.selectedImage && this.imageEditInfo && this.wrapper && this.clonedImage) {
+                var isMobileOrTable = !!editor.getEnvironment().isMobileOrTablet;
                 this.dndHelpers = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.ResizeHandle, resizerContext_1.Resizer, function () {
                     if (_this.imageEditInfo &&
                         _this.selectedImage &&
@@ -29735,7 +29769,7 @@ var ImageEditPlugin = /** @class */ (function () {
                         (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper, _this.resizers);
                         _this.wasImageResized = true;
                     }
-                }, this.zoomScale)), false), (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.RotateHandle, rotatorContext_1.Rotator, function () {
+                }, this.zoomScale, isMobileOrTable)), false), (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.RotateHandle, rotatorContext_1.Rotator, function () {
                     var _a;
                     if (_this.imageEditInfo &&
                         _this.selectedImage &&
@@ -29744,7 +29778,7 @@ var ImageEditPlugin = /** @class */ (function () {
                         (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper);
                         _this.updateRotateHandleState(editor, _this.selectedImage, _this.wrapper, _this.rotators, (_a = _this.imageEditInfo) === null || _a === void 0 ? void 0 : _a.angleRad);
                     }
-                }, this.zoomScale)), false);
+                }, this.zoomScale, isMobileOrTable)), false);
                 (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper, this.resizers);
                 this.updateRotateHandleState(editor, this.selectedImage, this.wrapper, this.rotators, (_a = this.imageEditInfo) === null || _a === void 0 ? void 0 : _a.angleRad);
             }
@@ -29784,7 +29818,7 @@ var ImageEditPlugin = /** @class */ (function () {
                         (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper, undefined, _this.croppers);
                         _this.isCropMode = true;
                     }
-                }, this.zoomScale)), false);
+                }, this.zoomScale, !!editor.getEnvironment().isMobileOrTablet)), false);
                 (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper, undefined, this.croppers);
             }
         }
@@ -29810,6 +29844,9 @@ var ImageEditPlugin = /** @class */ (function () {
         (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper);
         this.applyFormatWithContentModel(editor, false /* isCrop */, true /* shouldSelect*/, true /* isApiOperation */);
     };
+    /**
+     * Exported for testing purpose only
+     */
     ImageEditPlugin.prototype.cleanInfo = function () {
         var _a, _b;
         (_a = this.editor) === null || _a === void 0 ? void 0 : _a.setEditorStyle(IMAGE_EDIT_CLASS, null);
@@ -30984,7 +31021,7 @@ var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-mo
 /**
  * @internal
  */
-function getDropAndDragHelpers(wrapper, editInfo, options, elementClass, helper, updateWrapper, zoomScale) {
+function getDropAndDragHelpers(wrapper, editInfo, options, elementClass, helper, updateWrapper, zoomScale, useTouch) {
     return getEditElements(wrapper, elementClass).map(function (element) {
         return new DragAndDropHelper_1.DragAndDropHelper(element, {
             editInfo: editInfo,
@@ -30992,7 +31029,7 @@ function getDropAndDragHelpers(wrapper, editInfo, options, elementClass, helper,
             elementClass: elementClass,
             x: element.dataset.x,
             y: element.dataset.y,
-        }, updateWrapper, helper, zoomScale);
+        }, updateWrapper, helper, zoomScale, useTouch);
     });
 }
 exports.getDropAndDragHelpers = getDropAndDragHelpers;