fix: #1929 #1924

dream-num · Aug 5, 2024 · 2ce4dea · 2ce4dea
1 parent 50735d3
commit 2ce4dea
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/packages/engine-render/src/components/docs/layout/doc-skeleton.ts b/packages/engine-render/src/components/docs/layout/doc-skeleton.ts
@@ -15,7 +15,7 @@
  */
 
 import type { ColumnSeparatorType, ISectionColumnProperties, LocaleService, Nullable } from '@univerjs/core';
-import { PRESET_LIST_TYPE, SectionType } from '@univerjs/core';
+import { DataStreamTreeTokenType, PRESET_LIST_TYPE, SectionType } from '@univerjs/core';
 import type {
     IDocumentSkeletonCached,
     IDocumentSkeletonGlyph,
@@ -761,6 +761,16 @@ export class DocumentSkeleton extends Skeleton {
                                 const { x: startX } = this._findLiquid;
 
                                 for (const glyph of glyphGroup) {
+                                    const gi = glyphGroup.indexOf(glyph);
+                                    const nextGlyph = glyphGroup[gi + 1];
+                                    // Should not select the last paragraph break.
+                                    if (
+                                        glyph.streamType === DataStreamTreeTokenType.PARAGRAPH &&
+                                        nextGlyph?.streamType === DataStreamTreeTokenType.SECTION_BREAK
+                                    ) {
+                                        continue;
+                                    }
+
                                     if (!glyph.content || glyph.content.length === 0) {
                                         continue;
                                     }