From b6954a44f57f1f4b0038312683d9734291f05d0b Mon Sep 17 00:00:00 2001 From: BearToCode Date: Fri, 16 Feb 2024 17:14:56 +0100 Subject: [PATCH] fix: incorrect merge --- .../core/src/lib/internal/editor/actions.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/core/src/lib/internal/editor/actions.ts b/packages/core/src/lib/internal/editor/actions.ts index f2e34fc..26510ee 100644 --- a/packages/core/src/lib/internal/editor/actions.ts +++ b/packages/core/src/lib/internal/editor/actions.ts @@ -44,23 +44,24 @@ export function mergeComponent(data: { return; } - const wrapper = correspondingComponentElem.parentElement; - if (!wrapper) { + const correspondingWrapper = correspondingComponentElem.parentElement; + if (!correspondingWrapper) { if (dev) console.error('Failed to merge component: parent element is null'); return; } - const textarea = wrapper.parentElement?.querySelector('textarea'); + const textarea = correspondingWrapper.parentElement?.querySelector('textarea'); if (!textarea) { if (dev) console.error('Failed to merge component: failed to find textarea'); return; } - const { - prevLines: prevLines, - compLines: sourceLines, - nextLines: nextLines - } = getContentAroundComponent(wrapper, data.source); + const { prevLines, nextLines } = getContentAroundComponent( + correspondingWrapper, + correspondingComponent + ); + + const sourceLines = getLinesFromElem(sourceElem as HTMLDivElement); textarea.value = Array.prototype.concat(prevLines, sourceLines, nextLines).join('\n');