Fix issue that paste will remove cache

microsoft · Dec 7, 2024 · 9cb73c8 · 9cb73c8
1 parent 0d6f734
commit 9cb73c8
Show file tree

Hide file tree

Showing 5 changed files with 295 additions and 53 deletions.
diff --git a/demo/scripts/controlsV2/sidePane/eventViewer/EventViewPlugin.ts b/demo/scripts/controlsV2/sidePane/eventViewer/EventViewPlugin.ts
@@ -10,6 +10,13 @@ export class EventViewPlugin extends SidePanePluginImpl<EventViewPane, SidePaneE
 
     onPluginEvent(e: PluginEvent) {
         this.getComponent(component => component.addEvent(e));
+
+        if (e.eventType == 'rewriteFromModel') {
+            console.log('-----Removed-----');
+            e.removedBlockElements.map(console.log);
+            console.log('-----Added-----');
+            e.addedBlockElements.map(console.log);
+        }
     }
 
     getComponentProps(base: SidePaneElementProps) {

diff --git a/packages/roosterjs-content-model-core/lib/command/paste/mergePasteContent.ts b/packages/roosterjs-content-model-core/lib/command/paste/mergePasteContent.ts
@@ -36,7 +36,11 @@ export function cloneModelForPaste(model: ReadonlyContentModelDocument) {
 /**
  * @internal
  */
-export function mergePasteContent(editor: IEditor, eventResult: BeforePasteEvent) {
+export function mergePasteContent(
+    editor: IEditor,
+    eventResult: BeforePasteEvent,
+    isFirstPaste: boolean
+) {
     const {
         fragment,
         domToModelOption,
@@ -48,7 +52,7 @@ export function mergePasteContent(editor: IEditor, eventResult: BeforePasteEvent
 
     editor.formatContentModel(
         (model, context) => {
-            if (clipboardData.modelBeforePaste) {
+            if (!isFirstPaste && clipboardData.modelBeforePaste) {
                 const clonedModel = cloneModelForPaste(clipboardData.modelBeforePaste);
                 model.blocks = clonedModel.blocks;
             }

diff --git a/packages/roosterjs-content-model-core/lib/command/paste/paste.ts b/packages/roosterjs-content-model-core/lib/command/paste/paste.ts
@@ -24,8 +24,11 @@ export function paste(
     editor.focus();
 
     const trustedHTMLHandler = editor.getTrustedHTMLHandler();
+    let isFirstPaste = false;
 
     if (!clipboardData.modelBeforePaste) {
+        isFirstPaste = true;
+
         editor.formatContentModel(model => {
             clipboardData.modelBeforePaste = cloneModelForPaste(model);
 
@@ -67,7 +70,7 @@ export function paste(
     convertInlineCss(eventResult.fragment, htmlFromClipboard.globalCssRules);
 
     // 6. Merge pasted content into main Content Model
-    mergePasteContent(editor, eventResult);
+    mergePasteContent(editor, eventResult, isFirstPaste);
 }
 
 function createDOMFromHtml(