Merge branch 'master' into xiaozhe/test/model2dom-in-batches

demo/scripts/controlsV2/demoButtons/setBulletedListStyleButton.ts

@@ -1,30 +1,29 @@
-import { BulletListType } from 'roosterjs-content-model-dom';
-import { setListStyle } from 'roosterjs-content-model-api';
-import type { RibbonButton } from 'roosterjs-react';
-
-const dropDownMenuItems = {
-    [BulletListType.Disc]: 'Disc',
-    [BulletListType.Dash]: 'Dash',
-    [BulletListType.Square]: 'Square',
-    [BulletListType.ShortArrow]: 'ShortArrow',
-    [BulletListType.LongArrow]: 'LongArrow',
-    [BulletListType.UnfilledArrow]: 'UnfilledArrow',
-    [BulletListType.Hyphen]: 'Hyphen',
-    [BulletListType.DoubleLongArrow]: 'DoubleLongArrow',
-    [BulletListType.Circle]: 'Circle',
-};
-
-export const setBulletedListStyleButton: RibbonButton<'ribbonButtonBulletedListStyle'> = {
-    key: 'ribbonButtonBulletedListStyle',
-    dropDownMenu: { items: dropDownMenuItems },
-    unlocalizedText: 'Set unordered list style',
-    iconName: 'BulletedList',
-    isDisabled: formatState => !formatState.isBullet,
-    onClick: (editor, key) => {
-        const value = parseInt(key);
-
-        setListStyle(editor, {
-            unorderedStyleType: value,
-        });
-    },
-};
+import { BulletListType } from 'roosterjs-content-model-dom';
+import { setListStyle } from 'roosterjs-content-model-api';
+import type { RibbonButton } from 'roosterjs-react';
+
+const dropDownMenuItems = {
+    [BulletListType.Disc]: 'Disc',
+    [BulletListType.Dash]: 'Dash',
+    [BulletListType.Square]: 'Square',
+    [BulletListType.ShortArrow]: 'ShortArrow',
+    [BulletListType.LongArrow]: 'LongArrow',
+    [BulletListType.UnfilledArrow]: 'UnfilledArrow',
+    [BulletListType.Hyphen]: 'Hyphen',
+    [BulletListType.Circle]: 'Circle',
+};
+
+export const setBulletedListStyleButton: RibbonButton<'ribbonButtonBulletedListStyle'> = {
+    key: 'ribbonButtonBulletedListStyle',
+    dropDownMenu: { items: dropDownMenuItems },
+    unlocalizedText: 'Set unordered list style',
+    iconName: 'BulletedList',
+    isDisabled: formatState => !formatState.isBullet,
+    onClick: (editor, key) => {
+        const value = parseInt(key);
+
+        setListStyle(editor, {
+            unorderedStyleType: value,
+        });
+    },
+};

package.json

@@ -49,7 +49,7 @@
         "coverage-istanbul-loader": "3.0.5",
         "css-loader": "3.5.3",
         "detect-port": "^1.3.0",
-        "dompurify": "2.3.0",
+        "dompurify": "2.5.4",
         "eslint": "^8.50.0",
         "eslint-plugin-etc": "^2.0.3",
         "eslint-plugin-react": "^7.33.2",
@@ -82,7 +82,7 @@
         "typedoc-plugin-remove-references": "0.0.5",
         "typescript": "4.4.4",
         "url-loader": "4.1.0",
-        "webpack": "5.84.1",
+        "webpack": "5.94.0",
         "webpack-cli": "3.3.11",
         "webpack-dev-server": "3.10.3"
     },