Bump Content Model version to 0.21.2 (#2244)

* margin in lists * remove code * type * refactor * fixes * remove parameter * refactor * remove file change * Use Content Model to handle Delete/Backspace key in more cases (#2162) * Do not set focus when quite shadow edit (#2163) * Fix #237217 (#2164) * Fix #237735 (#2165) * Fix #236416 (#2166) * wip * fixes * Fix #2160 (#2167) * Fix #2160 * fix build * test * remove test * remove test * remove test * Rearrange parameters of iterateSelections (#2180) * Rearrange parameters of iterateSelections * improve * Standalone editor step 0: Create a copy of Editor class (#2175) * Standalone editor step 0: Create a copy of Editor class * remove unnecessary change * improve * Fix #2061, apply pending format on Android (#2172) * Fix #2061 * Fix for Android * Fix #2080 (#2173) * Standalone editor Step 0.5: Create test page for adapter editor (#2176) * Standalone editor step 0: Create a copy of Editor class * Standalone editor Step 0.5: Create test page for adapter editor * Add Content Model functionality to AdapterEditor * remove unnecessary change * remove unnecessary change * improve * toggleListType * type * Fix Mouseout behavior to hide table editors (#2181) * init * init * fix build * Add comment * Fix apply Table Inside borders operation and Demo site (#2184) * fix cases * fix demo * Add image size checkmarks to context menu (#2168) * Allow a max error un percentage size check * Allow a checkmark to be shown in ctx menu * Add checkmark to image sizes * Add missing type * Fix types * Add comment * Attempt to fix image selection * Revert unneeded changes in image selection * Use attr as backup in resize calc * Rely entirely on image selection * Revert changes to domeventplugin * Copy changes into content model adapter * Revert previous standalone editor change (#2189) * Revert previous standalone change * fix build * Move formatWithContentModel to be a core API (#2185) * Content Model: Allow clear cache from formatContentModel (#2186) * Move formatWithContentModel to be a core API * Content Model: Allow clear cache from formatContentModel * Content Model: Potential perf improvement in getFormatState (#2187) * Content Model: Move pending format into editor core (#2188) * Move formatWithContentModel to be a core API * Content Model: Allow clear cache from formatContentModel * Content Model: Move pending format into editor core * Convert DeleteResult from const enum to string literal type (#2191) * Move paste plugin to roosterjs-content-model-plugins package (#2192) * image selection plugin * check image parent node * Adding module entry to package.json (#2197) * Move ContentModelEdit plugin to plugins package (#2195) * Move ContentModelEdit plugin to plugins package * improve --------- Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> * Move type files to roosterjs-content-model-types package (#2196) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * fix build * fix build * Move core API to roosterjs-content-model-core package (#2198) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * Move core API to core package * fix build * improve * fix build * fix build * Move corePlugins to roosterjs-content-model-core package (#2199) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * Move core API to core package * fix build * improve * Move corePlugins to roosterjs-content-model-core package * fix build * improve * fix build * fix build * Move format API to roosterjs-content-model-api package (#2200) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * Move core API to core package * fix build * improve * Move corePlugins to roosterjs-content-model-core package * fix build * improve * fix build * Move format API to roosterjs-content-model-api package * fix build * Improve * Decouple ContentModelEditor from roosterjs-editor-core (#2201) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * Move core API to core package * fix build * improve * Move corePlugins to roosterjs-content-model-core package * fix build * improve * fix build * Move format API to roosterjs-content-model-api package * fix build * Improve * Decouple ContentModelEditor from roosterjs-editor-core * improve * Remove public enum from Content Model (#2204) * Directly create Content Model editor (#2206) * Fix Delimiter Nested Entity Scenario (#2207) * init * comment * Standalone editor: Remove dependency to EditorCore (#2208) * Remove dependency to EditorCore * fix test * improve --------- Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> * Standalone Editor: Remove legacy plugin: PendingFormatStatePlugin (#2209) * Remove dependency to EditorCore * fix test * improve * Standalone editor: Remove PendingFormatStatePlugin * fix build * Standalone editor: Merge DOMEventPlugin and MouseUpPlugin (#2210) * Remove dependency to EditorCore * fix test * improve * Standalone editor: Remove PendingFormatStatePlugin * fix build * Merge DOMEventPlugin and MouseUpPlugin * Standalone Editor: CreateStandaloneEditorCore (#2218) * Standalone Editor: Port LifecyclePlugin (#2219) * Standalone Editor: CreateStandaloneEditorCore * Standalone Editor: Port LifecyclePlugin * fix build * fix test * improve * fix test * fix comment * select on click * test * Standalone Editor: Support keyboard input (init step) (#2221) * apply table format fix * remove console.log * fix comments * Standalone Editor: Port EntityPlugin (#2223) * Standalone Editor: CreateStandaloneEditorCore * Standalone Editor: Port LifecyclePlugin * fix build * fix test * improve * fix test * Standalone Editor: Support keyboard input (init step) * Standalone Editor: Port EntityPlugin * improve * Add test * improve * test * Content Model: Keep image port if exist (#2226) * add color spectrum check * auto format test * remove empty line * Allow each package has its own version when publish (#2233) * Allow each package has its own version when publish * remove unnecessary change * Content Model: Fix #2230 (#2231) * Content Model: keep default format when paste into empty editor (#2232) * Standalone Editor: Add a SelectionPlugin (#2228) * Content Model: Go back to getDarkColor (#2239) * Content Model: go back to getDarkColor * fix test * Content Model: Fix overwrite table cell bug (#2240) * ContentModel: Set readonly for new entity (#2243) --------- Co-authored-by: Júlia Roldi <juliaroldi@microsoft.com> Co-authored-by: Julia Roldi <87443959+juliaroldi@users.noreply.github.com> Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> Co-authored-by: Andres-CT98 <107568016+Andres-CT98@users.noreply.github.com> Co-authored-by: Ian Elizondo <ianeli@microsoft.com> Co-authored-by: Keven Arroyo <dake.3601@gmail.com>
microsoft · Dec 6, 2023 · dc72777 · dc72777
1 parent 14cd466
commit dc72777
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages-content-model/roosterjs-content-model-core/lib/corePlugin/EntityPlugin.ts b/packages-content-model/roosterjs-content-model-core/lib/corePlugin/EntityPlugin.ts
@@ -148,6 +148,10 @@ class EntityPlugin implements PluginWithState<EntityPluginState> {
                     entity.entityFormat.id = this.ensureUniqueId(entityType, id ?? '', wrapper);
                     wrapper.className = generateEntityClassNames(entity.entityFormat);
 
+                    if (entity.entityFormat.isReadonly) {
+                        wrapper.contentEditable = 'false';
+                    }
+
                     const eventResult = this.triggerEvent(editor, wrapper, operation, rawEvent);
 
                     this.state.entityMap[entity.entityFormat.id] = {

diff --git a/packages-content-model/roosterjs-content-model-core/test/corePlugin/EntityPluginTest.ts b/packages-content-model/roosterjs-content-model-core/test/corePlugin/EntityPluginTest.ts
@@ -83,7 +83,7 @@ describe('EntityPlugin', () => {
                 },
             });
             expect(wrapper.outerHTML).toBe(
-                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(1);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {
@@ -125,7 +125,7 @@ describe('EntityPlugin', () => {
                 },
             });
             expect(wrapper.outerHTML).toBe(
-                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(1);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {
@@ -166,7 +166,7 @@ describe('EntityPlugin', () => {
                 },
             });
             expect(wrapper.outerHTML).toBe(
-                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(1);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {
@@ -206,7 +206,7 @@ describe('EntityPlugin', () => {
                 },
             });
             expect(wrapper.outerHTML).toBe(
-                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(1);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {
@@ -260,7 +260,7 @@ describe('EntityPlugin', () => {
                 },
             });
             expect(wrapper.outerHTML).toBe(
-                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(2);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {
@@ -344,7 +344,7 @@ describe('EntityPlugin', () => {
                 },
             });
             expect(wrapper.outerHTML).toBe(
-                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_Entity1 _EId_Entity1 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(1);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {
@@ -408,7 +408,7 @@ describe('EntityPlugin', () => {
                 '<div class="_Entity _EType_E1 _EId_E1 _EReadonly_1"></div>'
             );
             expect(wrapper2.outerHTML).toBe(
-                '<div class="_Entity _EType_E2 _EId_E2 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_E2 _EId_E2 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(2);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {
@@ -475,7 +475,7 @@ describe('EntityPlugin', () => {
                 '<div class="_Entity _EType_E1 _EId_E1 _EReadonly_1"></div>'
             );
             expect(wrapper2.outerHTML).toBe(
-                '<div class="_Entity _EType_E2 _EId_E1_1 _EReadonly_1"></div>'
+                '<div class="_Entity _EType_E2 _EId_E1_1 _EReadonly_1" contenteditable="false"></div>'
             );
             expect(triggerPluginEventSpy).toHaveBeenCalledTimes(1);
             expect(triggerPluginEventSpy).toHaveBeenCalledWith(PluginEventType.EntityOperation, {

diff --git a/versions.json b/versions.json
@@ -1,7 +1,7 @@
 {
     "packages": "8.59.0",
     "packages-ui": "8.54.0",
-    "packages-content-model": "0.21.1",
+    "packages-content-model": "0.21.2",
     "overrides": {
         "roosterjs-editor-core": "8.59.1",
         "roosterjs-editor-plugins": "8.59.1"