Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue that paste will remove cache #2900

Merged
merged 3 commits into from
Dec 10, 2024
Merged

Fix issue that paste will remove cache #2900

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cb73c8
Fix issue that paste will remove cache
JiuqingSong Dec 7, 2024
47230a0
improve
JiuqingSong Dec 7, 2024
c75fc91
Merge branch 'master' into u/jisong/fixpaste
JiuqingSong Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/roosterjs-content-model-core/lib/command/paste/mergePasteContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}
Expand Down
5 changes: 4 additions & 1 deletion packages/roosterjs-content-model-core/lib/command/paste/paste.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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(
Expand Down
Loading
Loading