Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(sheets): render stacked cell text upright (#8109)
白熱db7cece6ffac
diff --git a/packages/engine-render/src/basics/interfaces.ts b/packages/engine-render/src/basics/interfaces.tsindex 8a5a3cc563..53c2ac6958 100644--- a/packages/engine-render/src/basics/interfaces.ts+++ b/packages/engine-render/src/basics/interfaces.ts@@ -171,6 +171,7 @@ export interface IParagraphConfig {}export interface IFontCreateConfig {+ stackedText?: boolean;fontStyle: IDocumentSkeletonFontStyle;textStyle: IDocumentLayoutTextStyle;charSpace: number;diff --git a/packages/engine-render/src/components/docs/__tests__/document.spec.ts b/packages/engine-render/src/components/docs/__tests__/document.spec.tsindex 9173eac089..3e00fd9741 100644--- a/packages/engine-render/src/components/docs/__tests__/document.spec.ts+++ b/packages/engine-render/src/components/docs/__tests__/document.spec.ts@@ -15,11 +15,10 @@*/import type { IDocumentBody, IParagraphStyle, IScale, ITable } from '@univerjs/core';-import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';-import type { IExtensionConfig } from '../../extension';import {BooleanNumber,ColumnSeparatorType,+ createDocumentModelWithStyle,CustomRangeType,DashStyleType,DataStreamTreeTokenType,@@ -38,6 +37,8 @@ import {WrapStrategy,} from '@univerjs/core';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';+import type { IExtensionConfig } from '../../extension';import { setupRenderTestEnv } from '../../../__tests__/render-test-utils';import { BORDER_TYPE } from '../../../basics/const';import {@@ -52,8 +53,11 @@ import { UniverRenderingContext } from '../../../context';import { DrawingGroupObject } from '../../../drawing-group';import { Engine } from '../../../engine';import { MAIN_VIEW_PORT_KEY, Scene } from '../../../scene';-import { Image, Path, Rect } from '../../../shape';+import { Image } from '../../../shape/image';+import { Path } from '../../../shape/path';+import { Rect } from '../../../shape/rect';import { Viewport } from '../../../viewport';+import { SheetCellDocumentViewModel } from '../../sheets/sheet-cell-document-view-model';import { DocBackground } from '../doc-background';import { DOCS_EXTENSION_TYPE } from '../doc-extension';import { Documents, drawSectionColumnSeparators } from '../document';@@ -2054,6 +2058,36 @@ describe('documents render', () => {univer.dispose();});+ it('centers upright stacked ink of different widths on one vertical axis', () => {+ const univer = new Univer();+ const model = createDocumentModelWithStyle('Wi中é', { ff: 'Arial', fs: 14 }, { textRotation: { a: 0, v: BooleanNumber.TRUE } });+ const skeleton = DocumentSkeleton.create(new SheetCellDocumentViewModel(model), univer.__getInjector().get(LocaleService));+ const documents = new Documents('stacked-ink', skeleton);+ try {+ skeleton.calculate();+ scene.addObject(documents, 1);+ documents.transformByState({ width: 100, height: 200 });+ const context = canvas.getContext();+ const fill = vi.spyOn(context, 'fillText');+ documents.draw(context);+ const glyphs = skeleton.getSkeletonData()!.pages[0].sections[0].columns[0].lines[0].divides.flatMap((divide) => divide.glyphGroup).filter((glyph) => glyph.content && glyph.content !== '\r');+ const calls = fill.mock.calls.filter(([content]) => content && content !== '\r');+ expect(calls.map(([content]) => content)).toEqual(['W', 'i', '中', 'é']);+ const centerX = calls[0][1] + glyphs[0].bBox.width / 2;+ for (let index = 0; index < calls.length; index++) {+ expect(calls[index][1] + glyphs[index].bBox.width / 2).toBeCloseTo(centerX);+ if (index > 0) {+ expect(calls[index][2] - calls[index - 1][2]).toBeGreaterThanOrEqual(glyphs[index - 1].bBox.aba + glyphs[index].bBox.abd);+ }+ }+ } finally {+ documents.dispose();+ skeleton.dispose();+ model.dispose();+ univer.dispose();+ }+ });+it('draws vertical cell glyphs down the physical cell and restores its parent origin', () => {const parent = createPage(DocumentSkeletonPageType.CELL, 'outer');const cell = createPage(DocumentSkeletonPageType.CELL, 'vertical');diff --git a/packages/engine-render/src/components/docs/document-layout-presentation.ts b/packages/engine-render/src/components/docs/document-layout-presentation.tsindex fd42792e21..959ec14d4b 100644--- a/packages/engine-render/src/components/docs/document-layout-presentation.ts+++ b/packages/engine-render/src/components/docs/document-layout-presentation.ts@@ -62,6 +62,7 @@ export interface IDocumentLayoutTextStyle extends ITextStyle {}export interface IDocumentLayoutRenderConfig extends IDocumentRenderConfig {+ stackedText?: boolean;topAlignExactLineSpacing?: BooleanNumber;useTextInkForHitTesting?: BooleanNumber;preservePunctuationSpacing?: BooleanNumber;diff --git a/packages/engine-render/src/components/docs/document.ts b/packages/engine-render/src/components/docs/document.tsindex 64fdf95aa0..91b27c13fe 100644--- a/packages/engine-render/src/components/docs/document.ts+++ b/packages/engine-render/src/components/docs/document.ts@@ -23,6 +23,20 @@ import type {ITableCellBorder,Nullable,} from '@univerjs/core';+import {+ BooleanNumber,+ CellValueType,+ ColumnSeparatorType,+ DashStyleType,+ DocumentFlavor,+ HorizontalAlign,+ TableTextWrapType,+ TabStopAlignment,+ toDisposable,+ VerticalAlign,+ WrapStrategy,+} from '@univerjs/core';+import { Subject } from 'rxjs';import type {IDocumentSkeletonColumn,IDocumentSkeletonColumnGroup,@@ -45,20 +59,6 @@ import type { IDocumentLayoutRenderConfig } from './document-layout-presentationimport type { DocumentSkeleton } from './layout/doc-skeleton';import type { IDocsTableRenderViewport } from './table-render-viewport';import type { DocumentViewModel } from './view-model/document-view-model';-import {- BooleanNumber,- CellValueType,- ColumnSeparatorType,- DashStyleType,- DocumentFlavor,- HorizontalAlign,- TableTextWrapType,- TabStopAlignment,- toDisposable,- VerticalAlign,- WrapStrategy,-} from '@univerjs/core';-import { Subject } from 'rxjs';import { BORDER_TYPE, COLOR_BLACK_RGB } from '../../basics/const';import { calculateRectRotate, drawLineByBorderType, getRotateOffsetAndFarthestHypotenuse } from '../../basics/draw';import { DocumentSkeletonPageType, GlyphType, LineType } from '../../basics/i-document-skeleton-cached';@@ -972,13 +972,18 @@ export class Documents extends DocComponent {vertexAngle,alignOffset);- const spanPointWithFont = calculateRectRotate(- originTranslate.addByPoint(spanLeft + maxLineAscSin + xOffset, maxLineAscCos),- centerPoint,- centerAngle,- vertexAngle,- alignOffset- );+ const spanPointWithFont = renderConfig.stackedText+ ? Vector2.create(+ spanStartPoint.x + centerPoint.x - glyph.bBox.width / 2,+ spanStartPoint.y + centerPoint.y + (glyph.bBox.aba - glyph.bBox.abd) / 2+ )+ : calculateRectRotate(+ originTranslate.addByPoint(spanLeft + maxLineAscSin + xOffset, maxLineAscCos),+ centerPoint,+ centerAngle,+ vertexAngle,+ alignOffset+ );const extensionOffset: IExtensionConfig = {originTranslate,spanStartPoint,diff --git a/packages/engine-render/src/components/docs/extensions/__tests__/font-and-base-line.spec.ts b/packages/engine-render/src/components/docs/extensions/__tests__/font-and-base-line.spec.tsindex 64faeecad5..eac4bea244 100644--- a/packages/engine-render/src/components/docs/extensions/__tests__/font-and-base-line.spec.ts+++ b/packages/engine-render/src/components/docs/extensions/__tests__/font-and-base-line.spec.ts@@ -15,10 +15,10 @@*/import type { IScale } from '@univerjs/core';-import type { IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';-import type { IExtensionConfig } from '../../../extension';import { BaselineOffset, BooleanNumber } from '@univerjs/core';import { describe, expect, it, vi } from 'vitest';+import type { IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';+import type { IExtensionConfig } from '../../../extension';import { COLOR_BLACK_RGB } from '../../../../basics/const';import { GlyphType } from '../../../../basics/i-document-skeleton-cached';import { getFontStyleString } from '../../../../basics/tools';@@ -146,6 +146,26 @@ function createGlyph(content: string, overrides?: GlyphOverrides): IDocumentSkel}describe('docs font and baseline extension', () => {+ it('paints stacked scripts and graphemes upright while preserving ordinary vertical text', () => {+ const extension = new FontAndBaseLine();+ const context = createContext();+ extension.extensionOffset = {+ spanPointWithFont: Vector2.create(12, 20),+ spanStartPoint: Vector2.create(10, 10),+ centerPoint: Vector2.create(8, 8),+ renderConfig: { vertexAngle: 90, centerAngle: 90, stackedText: true },+ };+ for (const content of ['A', '1', '(', 'ー', '한', 'é', '👩💻']) {+ extension.draw(context, DEFAULT_SCALE, createGlyph(content));+ expect(context.fillText).toHaveBeenCalledWith(content, 12, 20);+ }+ expect(context.rotate).not.toHaveBeenCalled();++ extension.extensionOffset.renderConfig = { vertexAngle: 90, centerAngle: 90 };+ extension.draw(context, DEFAULT_SCALE, createGlyph('A'));+ expect(context.rotate).toHaveBeenCalledWith(Math.PI / 2);+ });+it.each([90, 200])('paints character width scaling at the glyph origin without changing baseline: %s', (sa) => {const extension = new FontAndBaseLine();const context = createContext();diff --git a/packages/engine-render/src/components/docs/extensions/font-and-base-line.ts b/packages/engine-render/src/components/docs/extensions/font-and-base-line.tsindex 129127ac0d..d50d04dd3a 100644--- a/packages/engine-render/src/components/docs/extensions/font-and-base-line.ts+++ b/packages/engine-render/src/components/docs/extensions/font-and-base-line.ts@@ -15,11 +15,11 @@*/import type { IDocTextFill, IDocTextFillGradientStop, IScale, TabStopLeader } from '@univerjs/core';+import { BaselineOffset, BooleanNumber } from '@univerjs/core';import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';import type { IBoundRectNoAngle } from '../../../basics/vector2';import type { UniverRenderingContext } from '../../../context';import type { IDrawInfo } from '../../extension';-import { BaselineOffset, BooleanNumber } from '@univerjs/core';import { cjk } from '../../../basics/cjk-regexp';import { COLOR_BLACK_RGB } from '../../../basics/const';import { resolveGlowEffect, resolveOuterShadowEffect } from '../../../basics/drawing-effect';@@ -449,7 +449,7 @@ export class FontAndBaseLine extends docExtension {const isVertical = vertexAngle === VERTICAL_DEG && centerAngle === VERTICAL_DEG;const horizontalScale = getTextHorizontalScale(glyph.ts?.sa);- if (isVertical && !cjk.hasCJK(content)) {+ if (isVertical && !renderConfig?.stackedText && !cjk.hasCJK(content)) {ctx.save();ctx.translate(spanStartPoint.x + centerPoint.x, spanStartPoint.y + centerPoint.y);ctx.rotate(Math.PI / 2);@@ -477,7 +477,7 @@ export class FontAndBaseLine extends docExtension {} else {let x_offset = 0;let y_offset = 0;- if (isVertical) {+ if (isVertical && !renderConfig?.stackedText) {const fontHeight = glyph.bBox.aba - glyph.bBox.abd;x_offset = (glyph.width - glyph.bBox.width) / 2;y_offset = -(glyph.width - fontHeight) / 2;diff --git a/packages/engine-render/src/components/docs/layout/__tests__/tools.spec.ts b/packages/engine-render/src/components/docs/layout/__tests__/tools.spec.tsindex e269241bb7..427efc7c86 100644--- a/packages/engine-render/src/components/docs/layout/__tests__/tools.spec.ts+++ b/packages/engine-render/src/components/docs/layout/__tests__/tools.spec.ts@@ -14,13 +14,14 @@* limitations under the License.*/-import type { IParagraphConfig, ISectionBreakConfig } from '../../../../basics/interfaces';+import type { IDocumentStyle, ISectionBreak } from '@univerjs/core';import {AlignTypeH,AlignTypeV,BooleanNumber,CustomRangeType,DataStreamTreeTokenType,+ DocumentDataModel,DocumentFlavor,GridType,NumberUnitType,@@ -29,9 +30,11 @@ import {SectionType,SpacingRule,} from '@univerjs/core';-import { describe, expect, it, vi } from 'vitest';+import { describe, expect, it, onTestFinished, vi } from 'vitest';+import type { IParagraphConfig, ISectionBreakConfig } from '../../../../basics/interfaces';import { GlyphType } from '../../../../basics/i-document-skeleton-cached';import { getDocumentCompatibilityPolicy } from '../../document-compatibility';+import { DocumentViewModel } from '../../view-model/document-view-model';import { createParagraphLayoutTestBed } from '../block/paragraph/__tests__/create-paragraph-layout-test-bed';import {clearFontCreateConfigCache,@@ -80,6 +83,24 @@ import {validationGrid,} from '../tools';+function createSectionLayoutContext(documentStyle: IDocumentStyle, sections: Array<Omit<ISectionBreak, 'startIndex'>>) {+ const dataModel = new DocumentDataModel({+ id: 'section-layout',+ documentStyle,+ body: {+ dataStream: 'abc\r\n'.repeat(sections.length),+ paragraphs: sections.map((_, index) => ({ startIndex: index * 5 + 3, paragraphId: `paragraph-${index}` })),+ sectionBreaks: sections.map((section, index) => ({ ...section, startIndex: index * 5 + 4 })),+ },+ });+ const viewModel = new DocumentViewModel(dataModel);+ onTestFinished(() => {+ viewModel.dispose();+ dataModel.dispose();+ });+ return { dataModel, viewModel, docsConfig: {} };+}+function createPageSkeleton() {const divide1 = {isFull: false,@@ -777,44 +798,33 @@ describe('docs layout tools extra', () => {expect(pages[0].parent).toBe(skeleton);const ctx = {- docsConfig: { locale: 'zh-CN' },+ ...createSectionLayoutContext({+ documentFlavor: DocumentFlavor.MODERN,+ pageSize: { width: 800, height: 1000 },+ balanceSingleByteDoubleByteWidth: BooleanNumber.TRUE,+ marginLeft: 20,+ marginRight: 20,+ marginTop: 20,+ marginBottom: 20,+ renderConfig: {},+ defaultHeaderId: 'document-header',+ defaultFooterId: 'document-footer',+ }, [{+ sectionId: 'first',+ sectionType: SectionType.CONTINUOUS,+ pageSize: { width: 900, height: 1200 },+ marginLeft: 30,+ marginRight: 40,+ renderConfig: { isRenderStyle: BooleanNumber.TRUE },+ defaultHeaderId: 'section-header',+ defaultFooterId: 'section-footer',+ evenPageHeaderId: 'section-even-header',+ evenPageFooterId: 'section-even-footer',+ firstPageHeaderId: 'section-first-header',+ firstPageFooterId: 'section-first-footer',+ }, { sectionId: 'second', sectionType: SectionType.CONTINUOUS }]),modernPageWidth: 390,modernHorizontalMargin: 20,- viewModel: {- getChildren: () => [{ endIndex: 9 }, { endIndex: 19 }],- getSectionBreak: vi.fn((endIndex: number) => {- if (endIndex === 9) {- return {- sectionType: SectionType.CONTINUOUS,- pageSize: { width: 900, height: 1200 },- marginLeft: 30,- marginRight: 40,- renderConfig: { isRenderStyle: BooleanNumber.TRUE },- defaultHeaderId: 'section-header',- defaultFooterId: 'section-footer',- evenPageHeaderId: 'section-even-header',- evenPageFooterId: 'section-even-footer',- firstPageHeaderId: 'section-first-header',- firstPageFooterId: 'section-first-footer',- };- }- return { sectionType: SectionType.CONTINUOUS };- }),- },- dataModel: {- documentStyle: {- documentFlavor: DocumentFlavor.MODERN,- pageSize: { width: 800, height: 1000 },- balanceSingleByteDoubleByteWidth: BooleanNumber.TRUE,- marginLeft: 20,- marginRight: 20,- marginTop: 20,- marginBottom: 20,- renderConfig: {},- defaultHeaderId: 'document-header',- defaultFooterId: 'document-footer',- },- },};const sectionConfig = prepareSectionBreakConfig(ctx as any, 0);@@ -883,19 +893,7 @@ describe('docs layout tools extra', () => {{ sectionId: 'section_1', defaultHeaderId: 'header-section-1' },{ sectionId: 'section_2' },];- const ctx = {- docsConfig: {},- viewModel: {- getChildren: () => [{ endIndex: 4 }, { endIndex: 9 }],- getSectionBreak: (endIndex: number) => endIndex === 4 ? sections[0] : sections[1],- },- dataModel: {- documentStyle: {- documentFlavor: DocumentFlavor.TRADITIONAL,- defaultHeaderId: 'header-global',- },- },- };+ const ctx = createSectionLayoutContext({ documentFlavor: DocumentFlavor.TRADITIONAL, defaultHeaderId: 'header-global' }, sections);expect(prepareSectionBreakConfig(ctx as any, 1).headerIds?.defaultHeaderId).toBe('header-section-1');});@@ -905,38 +903,14 @@ describe('docs layout tools extra', () => {{ sectionId: 'cover', useFirstPageHeaderFooter: BooleanNumber.TRUE },{ sectionId: 'body' },];- const ctx = {- docsConfig: {},- viewModel: {- getChildren: () => [{ endIndex: 4 }, { endIndex: 9 }],- getSectionBreak: (endIndex: number) => endIndex === 4 ? sections[0] : sections[1],- },- dataModel: {- documentStyle: {- documentFlavor: DocumentFlavor.TRADITIONAL,- useFirstPageHeaderFooter: BooleanNumber.TRUE,- },- },- };+ const ctx = createSectionLayoutContext({ documentFlavor: DocumentFlavor.TRADITIONAL, useFirstPageHeaderFooter: BooleanNumber.TRUE }, sections);expect(prepareSectionBreakConfig(ctx as any, 0).useFirstPageHeaderFooter).toBe(BooleanNumber.TRUE);expect(prepareSectionBreakConfig(ctx as any, 1).useFirstPageHeaderFooter).toBe(BooleanNumber.FALSE);});it('keeps a traditional section without an explicit grid off the line grid', () => {- const ctx = {- docsConfig: {},- viewModel: {- getChildren: () => [{ endIndex: 4 }],- getSectionBreak: () => ({ sectionId: 'section_1', linePitch: 24 }),- },- dataModel: {- documentStyle: {- documentFlavor: DocumentFlavor.TRADITIONAL,- linePitch: 24,- },- },- };+ const ctx = createSectionLayoutContext({ documentFlavor: DocumentFlavor.TRADITIONAL }, [{ sectionId: 'section_1', linePitch: 24 }]);const sectionConfig = prepareSectionBreakConfig(ctx as any, 0);expect(sectionConfig.linePitch).toBe(24);diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.tsindex d0959364fb..ad4f856172 100644--- a/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.ts+++ b/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.ts@@ -754,7 +754,7 @@ export function shaping(}// Preserve the legacy default, but honor documents that explicitly disable mixed-script spacing.- if (sectionBreakConfig.spaceWidthEastAsian !== BooleanNumber.FALSE) {+ if (!sectionBreakConfig.renderConfig?.stackedText && sectionBreakConfig.spaceWidthEastAsian !== BooleanNumber.FALSE) {addCJKLatinSpacing(shapedTextList);}diff --git a/packages/engine-render/src/components/docs/layout/model/glyph.ts b/packages/engine-render/src/components/docs/layout/model/glyph.tsindex c0d2ddb76f..05cc0dd6dc 100644--- a/packages/engine-render/src/components/docs/layout/model/glyph.ts+++ b/packages/engine-render/src/components/docs/layout/model/glyph.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import { BooleanNumber, BulletAlignment, DataStreamTreeTokenType, GridType } from '@univerjs/core';import type {IAdjustability,IDocumentSkeletonBoundingBox,@@ -24,7 +25,6 @@ import type {} from '../../../../basics/i-document-skeleton-cached';import type { IFontCreateConfig } from '../../../../basics/interfaces';import type { IDocumentCompatibilityPolicy } from '../../document-compatibility';-import { BooleanNumber, BulletAlignment, DataStreamTreeTokenType, GridType } from '@univerjs/core';import { cjk } from '../../../../basics/cjk-regexp';import { GlyphType } from '../../../../basics/i-document-skeleton-cached';import {@@ -542,7 +542,20 @@ export function _createSkeletonWordOrLetter(xOffset = 0;}- const adjustability = hasFixedTextAdvance+ if (config.stackedText) {+ // Layout runs along the future vertical axis; keep the ink width for upright painting.+ // Zero-width glyphs must not reserve a vertical slot.+ width = streamType === DataStreamTreeTokenType.PARAGRAPH || contentWidth === 0+ ? 0+ : bBox.ba + bBox.bd;+ xOffset = 0;+ if (contentWidth > bBox.ba + bBox.bd) {+ bBox.ba = contentWidth / 2;+ bBox.bd = contentWidth / 2;+ }+ }++ const adjustability = hasFixedTextAdvance || config.stackedText? {stretchability: [0, 0] as [number, number],shrinkability: [0, 0] as [number, number],@@ -565,7 +578,7 @@ export function _createSkeletonWordOrLetter(adjustability,count: raw.length,raw,- ...(!hasFixedTextAdvance && glyphWidth == null && !validationGrid(gridType, snapToGrid) && fontStyle.fontKerning === 'normal'+ ...(!config.stackedText && !hasFixedTextAdvance && glyphWidth == null && !validationGrid(gridType, snapToGrid) && fontStyle.fontKerning === 'normal'? { kerningAdjustment: 0 }: {}),...(spacing && spacing.segments.length > 1 ? { textSpacing: spacing } : {}),diff --git a/packages/engine-render/src/components/docs/layout/tools.ts b/packages/engine-render/src/components/docs/layout/tools.tsindex 152fa4d862..903e033a5f 100644--- a/packages/engine-render/src/components/docs/layout/tools.ts+++ b/packages/engine-render/src/components/docs/layout/tools.ts@@ -1681,6 +1681,7 @@ export function getGlyphGroupWidth(divide: IDocumentSkeletonDivide, excludeTrail}interface IFontCreateConfig {+ stackedText?: boolean;documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;fontStyle: IDocumentSkeletonFontStyle;textStyle: IDocumentLayoutTextStyle;@@ -1718,6 +1719,7 @@ export function getFontConfigFromLastGlyph(const result = {documentCompatibilityPolicy: sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy(),+ stackedText: sectionBreakConfig.renderConfig?.stackedText,fontStyle: fontStyle!,textStyle: ts!,balanceSingleByteDoubleByteWidth: sectionBreakConfig.balanceSingleByteDoubleByteWidth,@@ -1816,6 +1818,7 @@ export function getFontCreateConfig(const result = {fontStyle,+ stackedText: renderConfig.stackedText,textStyle: mixTextStyle,balanceSingleByteDoubleByteWidth: sectionBreakConfig.balanceSingleByteDoubleByteWidth,charSpace,@@ -2232,7 +2235,7 @@ export function prepareSectionBreakConfig(ctx: ILayoutContext, nodeIndex: numbersectionType,sectionTypeNext,textDirection,- renderConfig,+ renderConfig: viewModel.getLayoutRenderConfig(renderConfig),autoHyphenation,spaceWidthEastAsian,diff --git a/packages/engine-render/src/components/docs/view-model/document-view-model.ts b/packages/engine-render/src/components/docs/view-model/document-view-model.tsindex cfc0734ee9..27ba15afc9 100644--- a/packages/engine-render/src/components/docs/view-model/document-view-model.ts+++ b/packages/engine-render/src/components/docs/view-model/document-view-model.ts@@ -45,6 +45,7 @@ import type {IDocumentLayoutColumnGroup,IDocumentLayoutCustomColumnGroup,IDocumentLayoutParagraph,+ IDocumentLayoutRenderConfig,IDocumentLayoutSectionBreak,IDocumentLayoutSnapshot,IDocumentLayoutTextRun,@@ -712,6 +713,10 @@ export class DocumentViewModel implements IDisposable {return paragraphStyle.wordWrap ?? BooleanNumber.FALSE;}+ getLayoutRenderConfig(config: IDocumentLayoutRenderConfig): IDocumentLayoutRenderConfig {+ return config;+ }+createLineBreaker(content: string, paragraphStyle: IParagraphStyle, start: number) {return createDocumentLineBreaker(this.getSnapshot(), paragraphStyle, content, start, this.getBody());}diff --git a/packages/engine-render/src/components/sheets/__tests__/sheet.render-skeleton.spec.ts b/packages/engine-render/src/components/sheets/__tests__/sheet.render-skeleton.spec.tsindex 03b2b9649e..1f6766744c 100644--- a/packages/engine-render/src/components/sheets/__tests__/sheet.render-skeleton.spec.ts+++ b/packages/engine-render/src/components/sheets/__tests__/sheet.render-skeleton.spec.ts@@ -22,6 +22,7 @@ import {DocumentFlavor,HorizontalAlign,IConfigService,+ LocaleService,LocaleType,RANGE_TYPE,SHEET_TEXT_LINE_GAP,@@ -34,8 +35,10 @@ import { afterEach, describe, expect, it, vi } from 'vitest';import { setupRenderTestEnv } from '../../../__tests__/render-test-utils';import { BORDER_TYPE } from '../../../basics/const';import { DocSimpleSkeleton } from '../../docs/layout/doc-simple-skeleton';+import { DocumentSkeleton } from '../../docs/layout/doc-skeleton';import { FontCache } from '../../docs/layout/shaping-engine/font-cache';-import { getCustomNumberDisplayText, getGeneralNumberDisplayText, SpreadsheetSkeleton } from '../sheet.render-skeleton';+import { DocumentViewModel } from '../../docs/view-model/document-view-model';+import { getCustomNumberDisplayText, getDocsSkeletonPageSize, getGeneralNumberDisplayText, SpreadsheetSkeleton } from '../sheet.render-skeleton';describe('Rich-text render snapshot isolation', () => {it.each(['font cache', 'row height', 'column width'])(@@ -101,6 +104,148 @@ describe('Rich-text render snapshot isolation', () => {});describe('Cell layout and merged styles', () => {+ it.each([+ { merged: false, rowHeight: 65, padding: 0, columns: ['ABC', 'DEF', 'GHI', 'JKL'] },+ { merged: true, rowHeight: 65, padding: 0, columns: ['ABCDEF', 'GHIJKL'] },+ { merged: true, rowHeight: 1, padding: 4, columns: Array.from('ABCDEFGHIJKL') },+ { merged: false, rowHeight: 40, padding: 0, content: 'A\u200BB', columns: ['A\u200BB'] },+ { merged: false, rowHeight: 40, padding: 0, content: 'A\u2060B', columns: ['A\u2060B'] },+ ])('wraps and measures stacked cells, including rows smaller than padding (merged: $merged, height: $rowHeight)', ({ merged, rowHeight, padding, columns, content = 'ABCDEFGHIJKL' }) => {+ const environment = setupRenderTestEnv();+ const measure = vi.spyOn(FontCache, 'getMeasureText').mockImplementation((text) => ({+ width: text.replace(/[\u200B\u2060]/g, '').length * 4,+ fontBoundingBoxAscent: 16,+ fontBoundingBoxDescent: 4,+ actualBoundingBoxAscent: 14,+ actualBoundingBoxDescent: 2,+ }));+ const univer = new Univer({ locale: LocaleType.EN_US });+ const workbook = univer.createUnit<IWorkbookData, Workbook>(UniverInstanceType.UNIVER_SHEET, {+ id: 'wrapped-stack',+ sheetOrder: ['sheet'],+ sheets: { sheet: {+ id: 'sheet',+ name: 'Sheet',+ rowCount: 5,+ columnCount: 5,+ defaultRowHeight: rowHeight,+ defaultColumnWidth: 30,+ mergeData: merged ? [{ startRow: 0, endRow: 1, startColumn: 0, endColumn: 1 }] : [],+ cellData: { 0: { 0: {+ v: content,+ s: { tr: { a: 0, v: BooleanNumber.TRUE }, tb: WrapStrategy.WRAP, pd: { t: padding, b: padding, l: padding, r: padding } },+ } } },+ } },+ });+ const worksheet = workbook.getActiveSheet()!;+ const skeleton = univer.__getInjector().createInstance(SpreadsheetSkeleton, worksheet, workbook.getStyles());+ try {+ skeleton.calculate();+ const cell = worksheet.getCellRaw(0, 0)!;+ const style = worksheet.getComposedCellStyleByCellData(0, 0, cell);+ skeleton._setFontStylesCache(0, 0, cell, style, true);+ const document = skeleton.stylesCache.fontMatrix.getValue(0, 0)!.documentSkeleton!;+ const renderedColumns = document.getSkeletonData()!.pages[0].sections[0].columns[0].lines.map((line) => line.divides.flatMap((divide) => divide.glyphGroup)+ .filter((glyph) => glyph.content && glyph.content !== '\r')+ .map((glyph) => glyph.content)+ .join(''));+ expect(renderedColumns.filter((column) => column.length > 0)).toEqual(columns);+ const size = getDocsSkeletonPageSize(document, 90)!;+ expect(size.height).toBeLessThanOrEqual(Math.max(20, rowHeight * (merged ? 2 : 1)));+ expect(skeleton._getMeasuredWidthByCell(cell, 0, 0, 30)).toBeCloseTo(size.width + padding * 2);+ } finally {+ skeleton.dispose();+ univer.dispose();+ measure.mockRestore();+ environment.restore();+ }+ });++ it.each([false, true])('stacks mixed scripts by font height without splitting graphemes or changing stored data (rich text: %s)', (richText) => {+ const environment = setupRenderTestEnv();+ const measure = vi.spyOn(FontCache, 'getMeasureText').mockImplementation((text) => ({+ width: text.length * 4,+ fontBoundingBoxAscent: 16,+ fontBoundingBoxDescent: 4,+ actualBoundingBoxAscent: 14,+ actualBoundingBoxDescent: 2,+ }));+ const univer = new Univer({ locale: LocaleType.EN_US });+ const content = 'Ai()ー한é👩💻';+ const workbook = univer.createUnit<IWorkbookData, Workbook>(UniverInstanceType.UNIVER_SHEET, {+ id: 'stacked-cell',+ sheetOrder: ['sheet'],+ sheets: { sheet: {+ id: 'sheet',+ name: 'Sheet',+ rowCount: 10,+ columnCount: 10,+ defaultColumnWidth: 100,+ defaultRowHeight: 80,+ cellData: { 0: { 0: {+ v: content,+ s: { tr: { a: 0, v: BooleanNumber.TRUE }, pd: { t: 0, b: 0, l: 0, r: 0 }, tb: WrapStrategy.CLIP },+ p: richText+ ? {+ id: 'rich-stack',+ documentStyle: {},+ body: {+ dataStream: `${content}\r\n`,+ paragraphs: [{ startIndex: content.length, paragraphId: 'stacked-paragraph' }],+ textRuns: [{ st: 0, ed: content.length, ts: { bl: BooleanNumber.TRUE } }],+ },+ }+ : undefined,+ } } },+ } },+ });+ const worksheet = workbook.getActiveSheet()!;+ const injector = univer.__getInjector();+ const skeleton = injector.createInstance(SpreadsheetSkeleton, worksheet, workbook.getStyles());+ try {+ const before = Tools.deepClone(workbook.getSnapshot());+ skeleton.calculate();+ const cell = worksheet.getCellRaw(0, 0)!;+ const style = worksheet.getComposedCellStyleByCellData(0, 0, cell);+ skeleton._setFontStylesCache(0, 0, cell, style, true);+ const documentSkeleton = skeleton.stylesCache.fontMatrix.getValue(0, 0)!.documentSkeleton!;+ const glyphs = documentSkeleton.getSkeletonData()!.pages[0].sections[0].columns[0].lines.flatMap((line) => line.divides.flatMap((divide) => divide.glyphGroup)).filter((glyph) => glyph.content && glyph.content !== '\r');+ expect(glyphs.map((glyph) => glyph.content)).toEqual(['A', 'i', '(', ')', 'ー', '한', 'é', '👩💻']);+ expect(glyphs.reduce((count, glyph) => count + glyph.count, 0)).toBe(content.length);+ expect(glyphs.map((glyph) => glyph.width)).toEqual(new Array(8).fill(20));+ const size = getDocsSkeletonPageSize(documentSkeleton, 90)!;+ expect(size.height).toBeCloseTo(160);+ expect(skeleton.calculateAutoHeightForCell(0, 0)).toBeCloseTo(size.height);+ expect(skeleton._getMeasuredWidthByCell(cell, 0, 0, 100)).toBeCloseTo(size.width);++ documentSkeleton.getViewModel().getDataModel().updateDocumentDataPageSize(65);+ documentSkeleton.getViewModel().getDataModel().updateDocumentRenderConfig({ wrapStrategy: WrapStrategy.WRAP });+ documentSkeleton.makeDirty(true);+ documentSkeleton.calculate();+ const columns = documentSkeleton.getSkeletonData()!.pages[0].sections[0].columns[0].lines.map((line) => line.divides.flatMap((divide) => divide.glyphGroup)+ .filter((glyph) => glyph.content && glyph.content !== '\r'));+ expect(columns.map((column) => column.map((glyph) => glyph.content).join(''))).toEqual(['Ai(', ')ー한', 'é👩💻']);+ expect(getDocsSkeletonPageSize(documentSkeleton, 90)!.height).toBeLessThanOrEqual(65);++ const editor = worksheet.getCellDocumentModelWithFormula(cell, 0, 0)!.documentModel!;+ const editorSkeleton = DocumentSkeleton.create(new DocumentViewModel(editor), injector.get(LocaleService));+ try {+ editorSkeleton.calculate();+ const editorGlyph = editorSkeleton.getSkeletonData()!.pages[0].sections[0].columns[0].lines[0].divides[0].glyphGroup[0];+ expect(editorGlyph.width).toBe(4);+ } finally {+ editorSkeleton.dispose();+ editor.dispose();+ }+ expect(workbook.getSnapshot()).toEqual(before);+ } finally {+ skeleton.dispose();+ univer.dispose();+ measure.mockRestore();+ environment.restore();+ }+ });+it.each([{ documentFlavor: undefined, wordWrap: undefined },...[DocumentFlavor.TRADITIONAL, DocumentFlavor.MODERN].flatMap((documentFlavor) => [undefined, BooleanNumber.FALSE, BooleanNumber.TRUE].map((wordWrap) => ({ documentFlavor, wordWrap }))),diff --git a/packages/engine-render/src/components/sheets/sheet-cell-document-view-model.ts b/packages/engine-render/src/components/sheets/sheet-cell-document-view-model.tsindex a0a013514a..1e2f30b790 100644--- a/packages/engine-render/src/components/sheets/sheet-cell-document-view-model.ts+++ b/packages/engine-render/src/components/sheets/sheet-cell-document-view-model.ts@@ -15,10 +15,18 @@*/import type { DocumentDataModel, ITable } from '@univerjs/core';+import type { IDocumentLayoutRenderConfig } from '../docs/document-layout-presentation';import { LineBreaker } from '../docs/layout/line-breaker/line-breaker';import { DocumentViewModel } from '../docs/view-model/document-view-model';export class SheetCellDocumentViewModel extends DocumentViewModel {+ override getLayoutRenderConfig(config: IDocumentLayoutRenderConfig): IDocumentLayoutRenderConfig {+ // Only cell stacking uses upright Latin glyphs; Docs and shapes retain their own vertical text rules.+ return config.centerAngle === 90 && config.vertexAngle === 90+ ? { ...config, stackedText: true }+ : config;+ }+override getParagraphWordWrap(): undefined {// Cell layout ignores paragraph word splitting, including formatting pasted from Docs.return undefined;diff --git a/packages/engine-render/src/components/sheets/sheet.render-skeleton.ts b/packages/engine-render/src/components/sheets/sheet.render-skeleton.tsindex d62f52e542..2f185483b2 100644--- a/packages/engine-render/src/components/sheets/sheet.render-skeleton.ts+++ b/packages/engine-render/src/components/sheets/sheet.render-skeleton.ts@@ -241,6 +241,13 @@ function updateDocumentPageWidth(documentModel: DocumentDataModel, cellInfo: ICedocumentModel.updateDocumentDataPageSize(endX - startX, Infinity);}+function updateStackedDocumentPageWidth(documentModel: DocumentDataModel, cellInfo: ICellWithCoord): void {+ const { startY, endY } = cellInfo.isMergedMainCell ? cellInfo.mergeInfo : cellInfo;+ const { marginLeft = 0, marginRight = 0 } = documentModel.getSnapshot().documentStyle;+ // Tiny rows still need a positive layout width; cell clipping handles the invisible ink.+ documentModel.updateDocumentDataPageSize(Math.max(endY - startY, marginLeft + marginRight + 1), Infinity);+}+function pushRowRange(ranges: IRange[], row: number, startColumn: number, endColumn: number): void {if (endColumn < startColumn) {return;@@ -1017,7 +1024,11 @@ export class SpreadsheetSkeleton extends SheetSkeleton {const { vertexAngle: angle } = convertTextRotation(textRotation);if (style?.tb === WrapStrategy.WRAP) {- documentModel.updateDocumentDataPageSize(currColWidth, Infinity);+ if (textRotation.v === BooleanNumber.TRUE) {+ updateStackedDocumentPageWidth(documentModel, this.getCellWithCoordByIndex(row, column));+ } else {+ documentModel.updateDocumentDataPageSize(currColWidth, Infinity);+ }} else {documentModel.updateDocumentDataPageSize(Infinity, Infinity);}@@ -1226,19 +1237,24 @@ export class SpreadsheetSkeleton extends SheetSkeleton {this.appendToOverflowCache(row, column, startColumn, endColumn);} else if (wrapStrategy === WrapStrategy.WRAP && vertexAngle !== 0) {- // Merged cells do not support overflow.- if (hasMergeData && this.intersectMergeRange(row, column)) {+ const isMerged = hasMergeData && this.intersectMergeRange(row, column);+ if (isMerged && centerAngle !== VERTICAL_ROTATE_ANGLE) {return true;}- const { startY, endY } = this.getCellWithCoordByIndex(- row,- column- );-- const cellHeight = endY - startY;- documentSkeleton!.getViewModel().getDataModel().updateDocumentDataPageSize(cellHeight);+ const cellInfo = this.getCellWithCoordByIndex(row, column);+ const documentModel = documentSkeleton!.getViewModel().getDataModel();+ if (centerAngle === VERTICAL_ROTATE_ANGLE) {+ updateStackedDocumentPageWidth(documentModel, cellInfo);+ } else {+ documentModel.updateDocumentDataPageSize(cellInfo.endY - cellInfo.startY);+ }documentSkeleton!.calculate();++ // Merged stacked cells wrap within their full height without overflowing adjacent cells.+ if (isMerged) {+ return true;+ }const contentSize = getDocsSkeletonPageSize(documentSkeleton!, vertexAngle);if (!contentSize) {@@ -1550,7 +1566,10 @@ export class SpreadsheetSkeleton extends SheetSkeleton {const documentViewModel = new SheetCellDocumentViewModel(documentModel);if (documentViewModel) {const documentSkeleton = DocumentSkeleton.create(documentViewModel, this._localeService, { lineGap: this.textLineGap });- documentSkeleton.calculate();+ // Wrapped stacks are laid out once their physical cell height is available below.+ if (wrapStrategy !== WrapStrategy.WRAP || centerAngle !== VERTICAL_ROTATE_ANGLE || style.stf === BooleanNumber.TRUE) {+ documentSkeleton.calculate();+ }config = {documentSkeleton,