roosterjs 9.7.0 → 9.8.0

package/dist/rooster-amd.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for roosterjs (Version 9.7.0)
+// Type definitions for roosterjs (Version 9.8.0)
 // Generated by dts tool from roosterjs
 // Project: https://github.com/Microsoft/roosterjs
 
@@ -8328,6 +8328,11 @@ export class PastePlugin implements EditorPlugin  {
     private setEventSanitizers;
 }
 
+/**
+ * Default style sanitizers for PastePlugin.
+ */
+export const DefaultSanitizers: Record<string, ValueSanitizer>;
+
 /**
  * Edit plugins helps editor to do editing operation on top of content model.
  * This includes:

package/dist/rooster-amd.js

@@ -3461,6 +3461,15 @@ function setListType(model, listType, removeMargins) {
                     }
                     (0, roosterjs_content_model_dom_1.mutateBlock)(parent).blocks.splice(index, 1, newListItem);
                     existingListItems.push(newListItem);
+                    var levelIndex = newListItem.levels.length - 1;
+                    var level = (0, roosterjs_content_model_dom_1.mutateBlock)(newListItem).levels[levelIndex];
+                    if (level) {
+                        (0, roosterjs_content_model_dom_1.updateListMetadata)(level, function (metadata) {
+                            return Object.assign({}, metadata, {
+                                applyListStyleFromLevel: true,
+                            });
+                        });
+                    }
                 }
                 else {
                     existingListItems.forEach(function (x) { return ((0, roosterjs_content_model_dom_1.mutateBlock)(x).levels[0].format.marginBottom = '0px'); });
@@ -8302,12 +8311,14 @@ exports.getPath = getPath;
 /*!********************************************************************************!*\
   !*** ./packages/roosterjs-content-model-core/lib/coreApi/announce/announce.ts ***!
   \********************************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.announce = void 0;
+var createAriaLiveElement_1 = __webpack_require__(/*! ../../utils/createAriaLiveElement */ "./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts");
+var DOT_STRING = '.';
 /**
  * @internal
  * Announce the given data
@@ -8315,17 +8326,17 @@ exports.announce = void 0;
  * @param announceData Data to announce
  */
 var announce = function (core, announceData) {
-    var _a;
-    var text = announceData.text, defaultStrings = announceData.defaultStrings, _b = announceData.formatStrings, formatStrings = _b === void 0 ? [] : _b;
+    var text = announceData.text, defaultStrings = announceData.defaultStrings, _a = announceData.formatStrings, formatStrings = _a === void 0 ? [] : _a;
     var announcerStringGetter = core.lifecycle.announcerStringGetter;
     var template = defaultStrings && (announcerStringGetter === null || announcerStringGetter === void 0 ? void 0 : announcerStringGetter(defaultStrings));
     var textToAnnounce = formatString(template || text, formatStrings);
-    if (textToAnnounce) {
+    if (!core.lifecycle.announceContainer) {
+        core.lifecycle.announceContainer = (0, createAriaLiveElement_1.createAriaLiveElement)(core.physicalRoot.ownerDocument);
+    }
+    if (textToAnnounce && core.lifecycle.announceContainer) {
         var announceContainer = core.lifecycle.announceContainer;
-        if (!announceContainer || textToAnnounce == announceContainer.textContent) {
-            (_a = announceContainer === null || announceContainer === void 0 ? void 0 : announceContainer.parentElement) === null || _a === void 0 ? void 0 : _a.removeChild(announceContainer);
-            announceContainer = createAriaLiveElement(core.physicalRoot.ownerDocument);
-            core.lifecycle.announceContainer = announceContainer;
+        if (textToAnnounce == announceContainer.textContent) {
+            textToAnnounce += DOT_STRING;
         }
         if (announceContainer) {
             announceContainer.textContent = textToAnnounce;
@@ -8344,19 +8355,6 @@ function formatString(text, formatStrings) {
     });
     return text;
 }
-function createAriaLiveElement(document) {
-    var div = document.createElement('div');
-    div.style.clip = 'rect(0px, 0px, 0px, 0px)';
-    div.style.clipPath = 'inset(100%)';
-    div.style.height = '1px';
-    div.style.overflow = 'hidden';
-    div.style.position = 'absolute';
-    div.style.whiteSpace = 'nowrap';
-    div.style.width = '1px';
-    div.ariaLive = 'assertive';
-    document.body.appendChild(div);
-    return div;
-}
 
 
 /***/ }),
@@ -9574,7 +9572,7 @@ function ensureUniqueId(element, idPrefix) {
     idPrefix = element.id || idPrefix;
     var doc = element.ownerDocument;
     var i = 0;
-    while (!element.id || doc.querySelectorAll('#' + element.id).length > 1) {
+    while (!element.id || doc.querySelectorAll("[id=\"" + element.id + "\"]").length > 1) {
         element.id = idPrefix + '_' + i++;
     }
     return element.id;
@@ -12277,6 +12275,7 @@ exports.applyPendingFormat = applyPendingFormat;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createLifecyclePlugin = void 0;
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
+var createAriaLiveElement_1 = __webpack_require__(/*! ../../utils/createAriaLiveElement */ "./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts");
 var ContentEditableAttributeName = 'contenteditable';
 var DefaultTextColor = '#000000';
 var DefaultBackColor = '#ffffff';
@@ -12336,6 +12335,8 @@ var LifecyclePlugin = /** @class */ (function () {
         this.adjustColor();
         // Let other plugins know that we are ready
         this.editor.triggerEvent('editorReady', {}, true /*broadcast*/);
+        // Initialize the Announce container.
+        this.state.announceContainer = (0, createAriaLiveElement_1.createAriaLiveElement)(editor.getDocument());
     };
     /**
      * Dispose this plugin
@@ -14471,6 +14472,37 @@ function shouldUseTableProcessor(element, context) {
 }
 
 
+/***/ }),
+
+/***/ "./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts":
+/*!**********************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts ***!
+  \**********************************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.createAriaLiveElement = void 0;
+/**
+ * @internal
+ */
+function createAriaLiveElement(document) {
+    var div = document.createElement('div');
+    div.style.clip = 'rect(0px, 0px, 0px, 0px)';
+    div.style.clipPath = 'inset(100%)';
+    div.style.height = '1px';
+    div.style.overflow = 'hidden';
+    div.style.position = 'absolute';
+    div.style.whiteSpace = 'nowrap';
+    div.style.width = '1px';
+    div.ariaLive = 'assertive';
+    document.body.appendChild(div);
+    return div;
+}
+exports.createAriaLiveElement = createAriaLiveElement;
+
+
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-dom/lib/config/defaultContentModelFormatMap.ts":
@@ -26813,7 +26845,9 @@ function canAppendList(index, previousListIndex) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.keyboardListTrigger = void 0;
+var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
 var getListTypeStyle_1 = __webpack_require__(/*! ./getListTypeStyle */ "./packages/roosterjs-content-model-plugins/lib/autoFormat/list/getListTypeStyle.ts");
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
 /**
  * @internal
@@ -26827,6 +26861,7 @@ function keyboardListTrigger(model, paragraph, context, shouldSearchForBullet, s
         var listType = listStyleType.listType, styleType = listStyleType.styleType, index = listStyleType.index;
         triggerList(model, listType, styleType, index);
         context.canUndoByBackspace = true;
+        setAnnounceData(model, context);
         return true;
     }
     return false;
@@ -26841,11 +26876,21 @@ var triggerList = function (model, listType, styleType, index) {
     (0, roosterjs_content_model_api_1.setModelListStyle)(model, isOrderedList
         ? {
             orderedStyleType: styleType,
+            applyListStyleFromLevel: false,
         }
         : {
             unorderedStyleType: styleType,
+            applyListStyleFromLevel: false,
         });
 };
+function setAnnounceData(model, context) {
+    var _a = (0, tslib_1.__read)((0, roosterjs_content_model_dom_1.getOperationalBlocks)(model, ['ListItem'], [] // Set stop types to be empty so we can find list items even cross the boundary of table, then we can always operation on the list item if any
+    ), 1), paragraphOrListItems = _a[0];
+    if (paragraphOrListItems && (0, roosterjs_content_model_dom_1.isBlockGroupOfType)(paragraphOrListItems.block, 'ListItem')) {
+        var path = paragraphOrListItems.path, block = paragraphOrListItems.block;
+        context.announceData = (0, roosterjs_content_model_api_1.getListAnnounceData)((0, tslib_1.__spreadArray)([block], (0, tslib_1.__read)(path), false));
+    }
+}
 
 
 /***/ }),
@@ -28937,6 +28982,7 @@ var getHTMLImageOptions_1 = __webpack_require__(/*! ./utils/getHTMLImageOptions
 var getSelectedImage_1 = __webpack_require__(/*! ./utils/getSelectedImage */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedImage.ts");
 var updateImageEditInfo_1 = __webpack_require__(/*! ./utils/updateImageEditInfo */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/updateImageEditInfo.ts");
 var ImageEditElementClass_1 = __webpack_require__(/*! ./types/ImageEditElementClass */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/types/ImageEditElementClass.ts");
+var normalizeImageSelection_1 = __webpack_require__(/*! ./utils/normalizeImageSelection */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/normalizeImageSelection.ts");
 var resizerContext_1 = __webpack_require__(/*! ./Resizer/resizerContext */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Resizer/resizerContext.ts");
 var rotatorContext_1 = __webpack_require__(/*! ./Rotator/rotatorContext */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Rotator/rotatorContext.ts");
 var updateRotateHandle_1 = __webpack_require__(/*! ./Rotator/updateRotateHandle */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Rotator/updateRotateHandle.ts");
@@ -29119,6 +29165,9 @@ var ImageEditPlugin = /** @class */ (function () {
                         image.isSelected = shouldSelectImage;
                         image.isSelectedAsImageSelection = shouldSelectImage;
                     });
+                    if (shouldSelectImage) {
+                        (0, normalizeImageSelection_1.normalizeImageSelection)(previousSelectedImage);
+                    }
                     _this.cleanInfo();
                     result = true;
                 }
@@ -30601,6 +30650,48 @@ function isFixedNumberValue(value) {
 }
 
 
+/***/ }),
+
+/***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/normalizeImageSelection.ts":
+/*!*************************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/normalizeImageSelection.ts ***!
+  \*************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.normalizeImageSelection = void 0;
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
+/**
+ * Selecting directly on the image will only capture the image segment.
+ * However, if the selection is made while the image is within a wrapper, it will capture the span that encloses the image.
+ * In the last case, the selection will be marked as <---SelectionMarker---><---Image---><---SelectionMarker--->.
+ * To fix this behavior the extra selection markers are removed.
+ * @internal
+ */
+function normalizeImageSelection(imageAndParagraph) {
+    var paragraph = imageAndParagraph.paragraph;
+    var index = paragraph.segments.indexOf(imageAndParagraph.image);
+    if (index > 0) {
+        var markerBefore = paragraph.segments[index - 1];
+        var markerAfter = paragraph.segments[index + 1];
+        if (markerBefore &&
+            markerAfter &&
+            markerAfter.segmentType == 'SelectionMarker' &&
+            markerBefore.segmentType == 'SelectionMarker' &&
+            markerAfter.isSelected &&
+            markerBefore.isSelected) {
+            var mutatedParagraph = (0, roosterjs_content_model_dom_1.mutateBlock)(paragraph);
+            mutatedParagraph.segments.splice(index - 1, 1);
+            mutatedParagraph.segments.splice(index, 1);
+        }
+        return imageAndParagraph;
+    }
+}
+exports.normalizeImageSelection = normalizeImageSelection;
+
+
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/updateHandleCursor.ts":
@@ -30816,11 +30907,13 @@ exports.updateWrapper = updateWrapper;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ImageEditPlugin = exports.CustomReplacePlugin = exports.PickerPlugin = exports.HyperlinkPlugin = exports.MarkdownPlugin = exports.WatermarkPlugin = exports.ContextMenuPluginBase = exports.ShortcutPlugin = exports.ShortcutOutdentList = exports.ShortcutIndentList = exports.ShortcutDecreaseFont = exports.ShortcutIncreaseFont = exports.ShortcutNumbering = exports.ShortcutBullet = exports.ShortcutRedoMacOS = exports.ShortcutRedoAlt = exports.ShortcutRedo = exports.ShortcutUndo2 = exports.ShortcutUndo = exports.ShortcutClearFormat = exports.ShortcutUnderline = exports.ShortcutItalic = exports.ShortcutBold = exports.AutoFormatPlugin = exports.EditPlugin = exports.PastePlugin = exports.TableEditPlugin = void 0;
+exports.ImageEditPlugin = exports.CustomReplacePlugin = exports.PickerPlugin = exports.HyperlinkPlugin = exports.MarkdownPlugin = exports.WatermarkPlugin = exports.ContextMenuPluginBase = exports.ShortcutPlugin = exports.ShortcutOutdentList = exports.ShortcutIndentList = exports.ShortcutDecreaseFont = exports.ShortcutIncreaseFont = exports.ShortcutNumbering = exports.ShortcutBullet = exports.ShortcutRedoMacOS = exports.ShortcutRedoAlt = exports.ShortcutRedo = exports.ShortcutUndo2 = exports.ShortcutUndo = exports.ShortcutClearFormat = exports.ShortcutUnderline = exports.ShortcutItalic = exports.ShortcutBold = exports.AutoFormatPlugin = exports.EditPlugin = exports.DefaultSanitizers = exports.PastePlugin = exports.TableEditPlugin = void 0;
 var TableEditPlugin_1 = __webpack_require__(/*! ./tableEdit/TableEditPlugin */ "./packages/roosterjs-content-model-plugins/lib/tableEdit/TableEditPlugin.ts");
 Object.defineProperty(exports, "TableEditPlugin", ({ enumerable: true, get: function () { return TableEditPlugin_1.TableEditPlugin; } }));
 var PastePlugin_1 = __webpack_require__(/*! ./paste/PastePlugin */ "./packages/roosterjs-content-model-plugins/lib/paste/PastePlugin.ts");
 Object.defineProperty(exports, "PastePlugin", ({ enumerable: true, get: function () { return PastePlugin_1.PastePlugin; } }));
+var DefaultSanitizers_1 = __webpack_require__(/*! ./paste/DefaultSanitizers */ "./packages/roosterjs-content-model-plugins/lib/paste/DefaultSanitizers.ts");
+Object.defineProperty(exports, "DefaultSanitizers", ({ enumerable: true, get: function () { return DefaultSanitizers_1.DefaultSanitizers; } }));
 var EditPlugin_1 = __webpack_require__(/*! ./edit/EditPlugin */ "./packages/roosterjs-content-model-plugins/lib/edit/EditPlugin.ts");
 Object.defineProperty(exports, "EditPlugin", ({ enumerable: true, get: function () { return EditPlugin_1.EditPlugin; } }));
 var AutoFormatPlugin_1 = __webpack_require__(/*! ./autoFormat/AutoFormatPlugin */ "./packages/roosterjs-content-model-plugins/lib/autoFormat/AutoFormatPlugin.ts");
@@ -31125,7 +31218,7 @@ exports.setFormat = setFormat;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.divParagraphSanitizer = exports.DefaultSanitizers = void 0;
 /**
- * @internal
+ * Default style sanitizers for PastePlugin.
  */
 exports.DefaultSanitizers = {
     width: divParagraphSanitizer,