Content Model: Fix #209223 (#1879)

* Fix #209223 * fix build and test
microsoft · Jun 14, 2023 · 2c44dc5 · 2c44dc5
1 parent b8b7255
commit 2c44dc5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/packages/roosterjs-content-model/lib/editor/coreApi/switchShadowEdit.ts b/packages/roosterjs-content-model/lib/editor/coreApi/switchShadowEdit.ts
@@ -1,4 +1,5 @@
 import { ContentModelEditorCore } from '../../publicTypes/ContentModelEditorCore';
+import { getSelectionPath } from 'roosterjs-editor-dom';
 import { SwitchShadowEdit } from 'roosterjs-editor-types';
 
 /**
@@ -12,14 +13,23 @@ export const switchShadowEdit: SwitchShadowEdit = (editorCore, isOn): void => {
     const core = editorCore as ContentModelEditorCore;
 
     if (isOn != !!core.lifecycle.shadowEditFragment) {
-        if (isOn && !core.cachedModel) {
-            core.cachedModel = core.api.createContentModel(core);
-        }
+        if (isOn) {
+            if (!core.cachedModel) {
+                core.cachedModel = core.api.createContentModel(core);
+            }
+
+            const range = core.api.getSelectionRange(core, true /*tryGetFromCache*/);
 
-        core.originalApi.switchShadowEdit(editorCore, isOn);
+            core.lifecycle.shadowEditSelectionPath =
+                range && getSelectionPath(core.contentDiv, range);
+            core.lifecycle.shadowEditFragment = core.contentDiv.ownerDocument.createDocumentFragment();
+        } else {
+            if (core.cachedModel) {
+                core.api.setContentModel(core, core.cachedModel);
+            }
 
-        if (!isOn && core.cachedModel) {
-            core.api.setContentModel(core, core.cachedModel);
+            core.lifecycle.shadowEditFragment = null;
+            core.lifecycle.shadowEditSelectionPath = null;
         }
     }
 };
diff --git a/packages/roosterjs-content-model/test/editor/coreApi/switchShadowEditTest.ts b/packages/roosterjs-content-model/test/editor/coreApi/switchShadowEditTest.ts
@@ -8,22 +8,21 @@ describe('switchShadowEdit', () => {
     let core: ContentModelEditorCore;
     let createContentModel: jasmine.Spy;
     let setContentModel: jasmine.Spy;
-    let originalSwitchShadowEdit: jasmine.Spy;
+    let getSelectionRange: jasmine.Spy;
 
     beforeEach(() => {
         createContentModel = jasmine.createSpy('createContentModel').and.returnValue(mockedModel);
         setContentModel = jasmine.createSpy('setContentModel');
-        originalSwitchShadowEdit = jasmine.createSpy('originalSwitchShadowEdit');
+        getSelectionRange = jasmine.createSpy('getSelectionRange');
 
         core = ({
             api: {
                 createContentModel,
                 setContentModel,
-            },
-            originalApi: {
-                switchShadowEdit: originalSwitchShadowEdit,
+                getSelectionRange,
             },
             lifecycle: {},
+            contentDiv: document.createElement('div'),
         } as any) as ContentModelEditorCore;
     });
 
@@ -32,7 +31,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, true);
 
             expect(createContentModel).toHaveBeenCalledWith(core);
-            expect(originalSwitchShadowEdit).toHaveBeenCalledWith(core, true);
             expect(setContentModel).not.toHaveBeenCalled();
             expect(core.cachedModel).toBe(mockedModel);
         });
@@ -43,7 +41,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, true);
 
             expect(createContentModel).not.toHaveBeenCalled();
-            expect(originalSwitchShadowEdit).toHaveBeenCalledWith(core, true);
             expect(setContentModel).not.toHaveBeenCalled();
             expect(core.cachedModel).toBe(mockedCachedModel);
         });
@@ -52,7 +49,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, false);
 
             expect(createContentModel).not.toHaveBeenCalled();
-            expect(originalSwitchShadowEdit).not.toHaveBeenCalled();
             expect(setContentModel).not.toHaveBeenCalled();
             expect(core.cachedModel).toBe(undefined);
         });
@@ -63,7 +59,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, false);
 
             expect(createContentModel).not.toHaveBeenCalled();
-            expect(originalSwitchShadowEdit).not.toHaveBeenCalled();
             expect(setContentModel).not.toHaveBeenCalled();
             expect(core.cachedModel).toBe(mockedCachedModel);
         });
@@ -78,7 +73,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, true);
 
             expect(createContentModel).not.toHaveBeenCalled();
-            expect(originalSwitchShadowEdit).not.toHaveBeenCalled();
             expect(setContentModel).not.toHaveBeenCalled();
             expect(core.cachedModel).toBe(undefined);
         });
@@ -89,7 +83,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, true);
 
             expect(createContentModel).not.toHaveBeenCalled();
-            expect(originalSwitchShadowEdit).not.toHaveBeenCalled();
             expect(setContentModel).not.toHaveBeenCalled();
             expect(core.cachedModel).toBe(mockedCachedModel);
         });
@@ -98,7 +91,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, false);
 
             expect(createContentModel).not.toHaveBeenCalled();
-            expect(originalSwitchShadowEdit).toHaveBeenCalledWith(core, false);
             expect(setContentModel).not.toHaveBeenCalled();
             expect(core.cachedModel).toBe(undefined);
         });
@@ -109,7 +101,6 @@ describe('switchShadowEdit', () => {
             switchShadowEdit(core, false);
 
             expect(createContentModel).not.toHaveBeenCalled();
-            expect(originalSwitchShadowEdit).toHaveBeenCalledWith(core, false);
             expect(setContentModel).toHaveBeenCalledWith(core, mockedCachedModel);
             expect(core.cachedModel).toBe(mockedCachedModel);
         });