@univerjs/engine-render 0.2.14 → 0.2.15

package/lib/es/index.js

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { Tools, DEFAULT_STYLES, FontStyleType, BaselineOffset, getCellInfoInMergeData, Rectangle, ColorKit, Disposable, EventSubject, checkParagraphHasIndentByStyle, DataStreamTreeTokenType, BorderStyleTypes, BooleanNumber, DisposableCollection, toDisposable, sortRules, Registry, numberToABC, Inject, LocaleService, insertTextToContent, horizontalLineSegmentsSubtraction, deleteContent, DataStreamTreeNodeType, DocumentDataModel, PositionedObjectLayoutType, WrapTextType, ColumnSeparatorType, GridType, BulletAlignment, TableAlignmentType, ObjectRelativeFromV, TableTextWrapType, SpacingRule, CustomDecorationType, CustomRangeType, ObjectMatrix, SectionType, NumberUnitType, PageOrientType, HorizontalAlign, VerticalAlign, WrapStrategy, AlignTypeH, ObjectRelativeFromH, AlignTypeV, GlyphType as GlyphType$1, numberToListABC, PRESET_LIST_TYPE, searchArray, extractPureTextFromCell, CellValueType, isCellCoverable, isNullCell, getColorStyle, isWhiteColor, IContextService, BuildTextUtils, TextX, DEFAULT_EMPTY_DOCUMENT_VALUE, Range, TextDecoration, COLORS, DocumentFlavor, requestImmediateMacroTask, MOVE_BUFFER_VALUE, sortRulesByDesc, Injector, isClassDependencyItem, createIdentifier, remove, UniverInstanceType, IUniverInstanceService, Plugin, IConfigService } from "@univerjs/core";
+import { Tools, DEFAULT_STYLES, FontStyleType, BaselineOffset, getCellInfoInMergeData, Rectangle, ColorKit, Disposable, EventSubject, checkParagraphHasIndentByStyle, DataStreamTreeTokenType, BorderStyleTypes, BooleanNumber, DisposableCollection, toDisposable, sortRules, Registry, numberToABC, Inject, LocaleService, insertTextToContent, horizontalLineSegmentsSubtraction, deleteContent, DataStreamTreeNodeType, DocumentDataModel, GridType, BulletAlignment, PositionedObjectLayoutType, WrapTextType, ColumnSeparatorType, TableAlignmentType, ObjectRelativeFromV, TableTextWrapType, SpacingRule, CustomDecorationType, CustomRangeType, ObjectMatrix, SectionType, NumberUnitType, PageOrientType, HorizontalAlign, VerticalAlign, WrapStrategy, AlignTypeH, ObjectRelativeFromH, AlignTypeV, GlyphType as GlyphType$1, numberToListABC, PRESET_LIST_TYPE, searchArray, extractPureTextFromCell, CellValueType, isCellCoverable, isNullCell, getColorStyle, isWhiteColor, IContextService, BuildTextUtils, TextX, DEFAULT_EMPTY_DOCUMENT_VALUE, Range, TextDecoration, COLORS, DocumentFlavor, requestImmediateMacroTask, MOVE_BUFFER_VALUE, sortRulesByDesc, Injector, isClassDependencyItem, createIdentifier, remove, UniverInstanceType, IUniverInstanceService, Plugin, IConfigService } from "@univerjs/core";
 import { BehaviorSubject, Subject, startWith, distinctUntilChanged, Subscription, Observable, shareReplay } from "rxjs";
 var SHAPE_TYPE = /* @__PURE__ */ ((SHAPE_TYPE2) => (SHAPE_TYPE2.RECT = "rect", SHAPE_TYPE2.CIRCLE = "circle", SHAPE_TYPE2.PATH = "path", SHAPE_TYPE2))(SHAPE_TYPE || {}), LINK_VIEW_PORT_TYPE = /* @__PURE__ */ ((LINK_VIEW_PORT_TYPE2) => (LINK_VIEW_PORT_TYPE2[LINK_VIEW_PORT_TYPE2.XY = 0] = "XY", LINK_VIEW_PORT_TYPE2[LINK_VIEW_PORT_TYPE2.X = 1] = "X", LINK_VIEW_PORT_TYPE2[LINK_VIEW_PORT_TYPE2.Y = 2] = "Y", LINK_VIEW_PORT_TYPE2))(LINK_VIEW_PORT_TYPE || {});
 const MIDDLE_CELL_POS_MAGIC_NUMBER = 1, DEFAULT_FONTFACE_PLANE = '"Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif', DEFAULT_SKELETON_HEADER_FOOTER = {
@@ -4472,6 +4472,7 @@ const SHEET_EXTENSION_PREFIX = "sheet-ext-", _SheetExtension = class _SheetExten
     __publicField(this, "type", 0);
   }
   /**
+   * @deprecated The function maybe cause performance issue, use spreadsheetSkeleton.getCellByIndexWithNoHeader instead.
    * Get ISelectionCellWithMergeInfo by cell rowIndex and cell columnIndex.
    * The startXY in return value does not include rowHeader and columnHeader.
    * @param rowIndex
@@ -4644,7 +4645,7 @@ let Border$1 = (_a2 = class extends SheetExtension {
   }
   // eslint-disable-next-line max-lines-per-function
   draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
-    const { dataMergeCache, stylesCache, overflowCache, worksheet, rowHeightAccumulation, columnTotalWidth, columnWidthAccumulation, rowTotalHeight } = spreadsheetSkeleton;
+    const { stylesCache, overflowCache, worksheet, rowHeightAccumulation, columnTotalWidth, columnWidthAccumulation, rowTotalHeight } = spreadsheetSkeleton;
     if (!worksheet || !rowHeightAccumulation || !columnWidthAccumulation || columnTotalWidth === void 0 || rowTotalHeight === void 0)
       return;
     ctx.save();
@@ -4654,13 +4655,7 @@ let Border$1 = (_a2 = class extends SheetExtension {
     border == null || border.forValue((rowIndex, columnIndex, borderCaches) => {
       if (!borderCaches)
         return !0;
-      const cellInfo = this.getCellByIndex(
-        rowIndex,
-        columnIndex,
-        rowHeightAccumulation,
-        columnWidthAccumulation,
-        dataMergeCache
-      ), { startY: cellStartY, endY: cellEndY, startX: cellStartX, endX: cellEndX } = cellInfo, { isMerged, isMergedMainCell, mergeInfo } = cellInfo;
+      const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(rowIndex, columnIndex), { startY: cellStartY, endY: cellEndY, startX: cellStartX, endX: cellEndX } = cellInfo, { isMerged, isMergedMainCell, mergeInfo } = cellInfo;
       if (!isMerged) {
         const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(rowIndex), visibleCol = spreadsheetSkeleton.worksheet.getColVisible(columnIndex);
         if (!visibleRow || !visibleCol) return !0;
@@ -5440,6 +5435,226 @@ const _DocumentViewModel = class _DocumentViewModel {
 };
 __name(_DocumentViewModel, "DocumentViewModel");
 let DocumentViewModel = _DocumentViewModel;
+var BreakPointType = /* @__PURE__ */ ((BreakPointType2) => (BreakPointType2.Normal = "Normal", BreakPointType2.Mandatory = "Mandatory", BreakPointType2.Hyphen = "Hyphen", BreakPointType2.Link = "Link", BreakPointType2))(BreakPointType || {});
+const _Break = class _Break {
+  constructor(position, type = "Normal") {
+    this.position = position, this.type = type;
+  }
+};
+__name(_Break, "Break");
+let Break = _Break;
+function isSpace(char) {
+  return [" ", " ", "　"].includes(char);
+}
+__name(isSpace, "isSpace");
+function isJustifiable(content) {
+  return isSpace(content) || hasCJKText(content) || isCjkLeftAlignedPunctuation(content) || isCjkRightAlignedPunctuation(content) || isCjkCenterAlignedPunctuation(content);
+}
+__name(isJustifiable, "isJustifiable");
+function baseAdjustability(content, width) {
+  return isSpace(content) ? {
+    // The number for spaces is from Knuth-Plass' paper
+    stretchability: [0, width / 2],
+    shrinkability: [0, width / 3]
+  } : isCjkLeftAlignedPunctuation(content) ? {
+    stretchability: [0, 0],
+    shrinkability: [0, width / 2]
+  } : isCjkRightAlignedPunctuation(content) ? {
+    stretchability: [0, 0],
+    shrinkability: [width / 2, 0]
+  } : isCjkCenterAlignedPunctuation(content) ? {
+    stretchability: [0, 0],
+    shrinkability: [width / 4, width / 4]
+  } : {
+    stretchability: [0, 0],
+    shrinkability: [0, 0]
+  };
+}
+__name(baseAdjustability, "baseAdjustability");
+function createSkeletonWordGlyph(content, config, glyphWidth) {
+  return _createSkeletonWordOrLetter(GlyphType.WORD, content, config, glyphWidth);
+}
+__name(createSkeletonWordGlyph, "createSkeletonWordGlyph");
+function createSkeletonLetterGlyph(content, config, glyphWidth, glyphInfo) {
+  return _createSkeletonWordOrLetter(GlyphType.LETTER, content, config, glyphWidth, glyphInfo);
+}
+__name(createSkeletonLetterGlyph, "createSkeletonLetterGlyph");
+function createSkeletonTabGlyph(config, glyphWidth) {
+  return _createSkeletonWordOrLetter(GlyphType.TAB, DataStreamTreeTokenType.TAB, config, glyphWidth);
+}
+__name(createSkeletonTabGlyph, "createSkeletonTabGlyph");
+function createHyphenDashGlyph(config) {
+  const dashLetterGlyph = _createSkeletonWordOrLetter(GlyphType.LETTER, "-", config);
+  return dashLetterGlyph.count = 0, dashLetterGlyph;
+}
+__name(createHyphenDashGlyph, "createHyphenDashGlyph");
+function createSkeletonCustomBlockGlyph(config, glyphWidth = 0, glyphHeight = 0, drawingId = "") {
+  const { fontStyle, textStyle } = config, content = DataStreamTreeTokenType.CUSTOM_BLOCK;
+  return {
+    content: "",
+    raw: content,
+    ts: textStyle,
+    fontStyle,
+    width: glyphWidth,
+    bBox: {
+      width: 0,
+      ba: glyphHeight,
+      // Or 1/2 glyphHeight each for ba and bd.
+      bd: 0,
+      aba: 0,
+      abd: 0,
+      sp: 0,
+      sbr: 0,
+      sbo: 0,
+      spr: 0,
+      spo: 0
+    },
+    xOffset: 0,
+    left: 0,
+    isJustifiable: !1,
+    adjustability: baseAdjustability(content, 0),
+    glyphType: GlyphType.PLACEHOLDER,
+    streamType: content,
+    count: 1,
+    drawingId
+  };
+}
+__name(createSkeletonCustomBlockGlyph, "createSkeletonCustomBlockGlyph");
+function _createSkeletonWordOrLetter(glyphType, content, config, glyphWidth, glyphInfo) {
+  const { fontStyle, textStyle, charSpace = 1, gridType = GridType.LINES, snapToGrid = BooleanNumber.FALSE } = config, skipWidthList = [
+    DataStreamTreeTokenType.SECTION_BREAK,
+    DataStreamTreeTokenType.TABLE_START,
+    DataStreamTreeTokenType.TABLE_END,
+    DataStreamTreeTokenType.TABLE_ROW_START,
+    DataStreamTreeTokenType.TABLE_ROW_END,
+    DataStreamTreeTokenType.TABLE_CELL_START,
+    DataStreamTreeTokenType.TABLE_CELL_END,
+    DataStreamTreeTokenType.CUSTOM_RANGE_START,
+    DataStreamTreeTokenType.CUSTOM_RANGE_END,
+    DataStreamTreeTokenType.COLUMN_BREAK,
+    DataStreamTreeTokenType.PAGE_BREAK,
+    DataStreamTreeTokenType.DOCS_END,
+    DataStreamTreeTokenType.CUSTOM_BLOCK
+  ];
+  let streamType = DataStreamTreeTokenType.LETTER;
+  if (skipWidthList.indexOf(content) > -1)
+    return {
+      content: "",
+      raw: content,
+      ts: textStyle,
+      fontStyle,
+      width: 0,
+      bBox: {
+        width: 0,
+        ba: 0,
+        bd: 0,
+        aba: 0,
+        abd: 0,
+        sp: 0,
+        sbr: 0,
+        sbo: 0,
+        spr: 0,
+        spo: 0
+      },
+      xOffset: 0,
+      left: 0,
+      isJustifiable: !1,
+      adjustability: baseAdjustability(content, 0),
+      glyphType: GlyphType.PLACEHOLDER,
+      streamType: content,
+      count: 1
+    };
+  content === DataStreamTreeTokenType.PARAGRAPH && (streamType = DataStreamTreeTokenType.PARAGRAPH);
+  let bBox = null, xOffset = 0;
+  glyphInfo && glyphInfo.boundingBox && glyphInfo.font ? bBox = FontCache.getBBoxFromGlyphInfo(glyphInfo, fontStyle) : bBox = FontCache.getTextSize(content, fontStyle);
+  const { width: contentWidth = 0 } = bBox;
+  let width = glyphWidth != null ? glyphWidth : contentWidth;
+  if (validationGrid(gridType, snapToGrid) && (width = contentWidth + (hasCJK(content) ? charSpace : charSpace / 2), gridType === GridType.SNAP_TO_CHARS && (xOffset = (width - contentWidth) / 2)), glyphInfo && glyphInfo.kerning !== 0 && glyphInfo.font) {
+    const radio = ptToPixel(fontStyle.fontSize) / glyphInfo.font.unitsPerEm, delta = glyphInfo.kerning * radio;
+    width += delta, xOffset += delta;
+  }
+  return {
+    content,
+    ts: textStyle,
+    fontStyle,
+    width,
+    bBox,
+    xOffset,
+    left: 0,
+    glyphType,
+    streamType,
+    isJustifiable: isJustifiable(content),
+    adjustability: baseAdjustability(content, width),
+    count: content.length,
+    raw: content
+  };
+}
+__name(_createSkeletonWordOrLetter, "_createSkeletonWordOrLetter");
+function createSkeletonBulletGlyph(glyph, bulletSkeleton, charSpaceApply) {
+  const {
+    // bBox: boundingBox,
+    symbol: content,
+    // ts: textStyle,
+    // fontStyle,
+    bulletAlign = BulletAlignment.START,
+    bulletType = !1
+  } = bulletSkeleton, { fontStyle } = glyph, boundingBox = FontCache.getTextSize(content, fontStyle), contentWidth = boundingBox.width, multiple = Math.ceil(contentWidth / charSpaceApply);
+  let width = (multiple < 2 ? 2 : multiple) * charSpaceApply, left = 0;
+  bulletType && (bulletAlign === BulletAlignment.CENTER ? (left = -contentWidth / 2, width -= left) : bulletAlign === BulletAlignment.END && (left = -contentWidth, width -= left));
+  const bBox = _getMaxBoundingBox(glyph, boundingBox);
+  return {
+    content,
+    ts: {
+      ...glyph.ts,
+      // ...textStyle,
+      st: {
+        s: BooleanNumber.FALSE
+      }
+    },
+    fontStyle,
+    width,
+    xOffset: 0,
+    bBox,
+    left,
+    isJustifiable: isJustifiable(content),
+    adjustability: baseAdjustability(content, width),
+    glyphType: GlyphType.LIST,
+    streamType: DataStreamTreeTokenType.LETTER,
+    // Deliberately set to 0 so that there is no need to count when calculating the cursor.
+    count: 0,
+    raw: content
+  };
+}
+__name(createSkeletonBulletGlyph, "createSkeletonBulletGlyph");
+function setGlyphGroupLeft(glyphGroup, left = 0) {
+  const spanGroupLen = glyphGroup.length;
+  let preGlyph;
+  for (let i = 0; i < spanGroupLen; i++) {
+    const glyph = glyphGroup[i];
+    glyph.left = preGlyph ? preGlyph.left + preGlyph.width : left, preGlyph = glyph;
+  }
+}
+__name(setGlyphGroupLeft, "setGlyphGroupLeft");
+function addGlyphToDivide(divide, glyphGroup, offsetLeft = 0) {
+  setGlyphGroupLeft(glyphGroup, offsetLeft);
+  for (const glyph of glyphGroup)
+    glyph.parent = divide;
+  divide.glyphGroup.push(...glyphGroup);
+}
+__name(addGlyphToDivide, "addGlyphToDivide");
+function _getMaxBoundingBox(glyph, bulletBBox) {
+  const { ba: spanAscent, bd: spanDescent } = glyph.bBox, { ba: bulletAscent, bd: bulletDescent } = bulletBBox;
+  return spanAscent + spanDescent > bulletAscent + bulletDescent ? glyph.bBox : bulletBBox;
+}
+__name(_getMaxBoundingBox, "_getMaxBoundingBox");
+function glyphShrinkRight(glyph, amount) {
+  glyph.width -= amount, glyph.adjustability.shrinkability[1] -= amount;
+}
+__name(glyphShrinkRight, "glyphShrinkRight");
+function glyphShrinkLeft(glyph, amount) {
+  glyph.width -= amount, glyph.xOffset -= amount, glyph.adjustability.shrinkability[0] -= amount;
+}
+__name(glyphShrinkLeft, "glyphShrinkLeft");
 function createSkeletonLine(paragraphIndex, lineType, lineBoundingBox, columnWidth, lineIndex = 0, isParagraphStart = !1, paragraphConfig, page, headerPage, footerPage) {
   var _a10;
   const {
@@ -5797,226 +6012,6 @@ function _getSkeletonColumn(left, width, spaceWidth, columnSeparatorType) {
   };
 }
 __name(_getSkeletonColumn, "_getSkeletonColumn");
-function isSpace(char) {
-  return [" ", " ", "　"].includes(char);
-}
-__name(isSpace, "isSpace");
-function isJustifiable(content) {
-  return isSpace(content) || hasCJKText(content) || isCjkLeftAlignedPunctuation(content) || isCjkRightAlignedPunctuation(content) || isCjkCenterAlignedPunctuation(content);
-}
-__name(isJustifiable, "isJustifiable");
-function baseAdjustability(content, width) {
-  return isSpace(content) ? {
-    // The number for spaces is from Knuth-Plass' paper
-    stretchability: [0, width / 2],
-    shrinkability: [0, width / 3]
-  } : isCjkLeftAlignedPunctuation(content) ? {
-    stretchability: [0, 0],
-    shrinkability: [0, width / 2]
-  } : isCjkRightAlignedPunctuation(content) ? {
-    stretchability: [0, 0],
-    shrinkability: [width / 2, 0]
-  } : isCjkCenterAlignedPunctuation(content) ? {
-    stretchability: [0, 0],
-    shrinkability: [width / 4, width / 4]
-  } : {
-    stretchability: [0, 0],
-    shrinkability: [0, 0]
-  };
-}
-__name(baseAdjustability, "baseAdjustability");
-function createSkeletonWordGlyph(content, config, glyphWidth) {
-  return _createSkeletonWordOrLetter(GlyphType.WORD, content, config, glyphWidth);
-}
-__name(createSkeletonWordGlyph, "createSkeletonWordGlyph");
-function createSkeletonLetterGlyph(content, config, glyphWidth, glyphInfo) {
-  return _createSkeletonWordOrLetter(GlyphType.LETTER, content, config, glyphWidth, glyphInfo);
-}
-__name(createSkeletonLetterGlyph, "createSkeletonLetterGlyph");
-function createSkeletonTabGlyph(config, glyphWidth) {
-  return _createSkeletonWordOrLetter(GlyphType.TAB, DataStreamTreeTokenType.TAB, config, glyphWidth);
-}
-__name(createSkeletonTabGlyph, "createSkeletonTabGlyph");
-function createHyphenDashGlyph(config) {
-  const dashLetterGlyph = _createSkeletonWordOrLetter(GlyphType.LETTER, "-", config);
-  return dashLetterGlyph.count = 0, dashLetterGlyph;
-}
-__name(createHyphenDashGlyph, "createHyphenDashGlyph");
-function createSkeletonCustomBlockGlyph(config, glyphWidth = 0, glyphHeight = 0, drawingId = "") {
-  const { fontStyle, textStyle } = config, content = DataStreamTreeTokenType.CUSTOM_BLOCK;
-  return {
-    content: "",
-    raw: content,
-    ts: textStyle,
-    fontStyle,
-    width: glyphWidth,
-    bBox: {
-      width: 0,
-      ba: glyphHeight,
-      // Or 1/2 glyphHeight each for ba and bd.
-      bd: 0,
-      aba: 0,
-      abd: 0,
-      sp: 0,
-      sbr: 0,
-      sbo: 0,
-      spr: 0,
-      spo: 0
-    },
-    xOffset: 0,
-    left: 0,
-    isJustifiable: !1,
-    adjustability: baseAdjustability(content, 0),
-    glyphType: GlyphType.PLACEHOLDER,
-    streamType: content,
-    count: 1,
-    drawingId
-  };
-}
-__name(createSkeletonCustomBlockGlyph, "createSkeletonCustomBlockGlyph");
-function _createSkeletonWordOrLetter(glyphType, content, config, glyphWidth, glyphInfo) {
-  const { fontStyle, textStyle, charSpace = 1, gridType = GridType.LINES, snapToGrid = BooleanNumber.FALSE } = config, skipWidthList = [
-    DataStreamTreeTokenType.SECTION_BREAK,
-    DataStreamTreeTokenType.TABLE_START,
-    DataStreamTreeTokenType.TABLE_END,
-    DataStreamTreeTokenType.TABLE_ROW_START,
-    DataStreamTreeTokenType.TABLE_ROW_END,
-    DataStreamTreeTokenType.TABLE_CELL_START,
-    DataStreamTreeTokenType.TABLE_CELL_END,
-    DataStreamTreeTokenType.CUSTOM_RANGE_START,
-    DataStreamTreeTokenType.CUSTOM_RANGE_END,
-    DataStreamTreeTokenType.COLUMN_BREAK,
-    DataStreamTreeTokenType.PAGE_BREAK,
-    DataStreamTreeTokenType.DOCS_END,
-    DataStreamTreeTokenType.CUSTOM_BLOCK
-  ];
-  let streamType = DataStreamTreeTokenType.LETTER;
-  if (skipWidthList.indexOf(content) > -1)
-    return {
-      content: "",
-      raw: content,
-      ts: textStyle,
-      fontStyle,
-      width: 0,
-      bBox: {
-        width: 0,
-        ba: 0,
-        bd: 0,
-        aba: 0,
-        abd: 0,
-        sp: 0,
-        sbr: 0,
-        sbo: 0,
-        spr: 0,
-        spo: 0
-      },
-      xOffset: 0,
-      left: 0,
-      isJustifiable: !1,
-      adjustability: baseAdjustability(content, 0),
-      glyphType: GlyphType.PLACEHOLDER,
-      streamType: content,
-      count: 1
-    };
-  content === DataStreamTreeTokenType.PARAGRAPH && (streamType = DataStreamTreeTokenType.PARAGRAPH);
-  let bBox = null, xOffset = 0;
-  glyphInfo && glyphInfo.boundingBox && glyphInfo.font ? bBox = FontCache.getBBoxFromGlyphInfo(glyphInfo, fontStyle) : bBox = FontCache.getTextSize(content, fontStyle);
-  const { width: contentWidth = 0 } = bBox;
-  let width = glyphWidth != null ? glyphWidth : contentWidth;
-  if (validationGrid(gridType, snapToGrid) && (width = contentWidth + (hasCJK(content) ? charSpace : charSpace / 2), gridType === GridType.SNAP_TO_CHARS && (xOffset = (width - contentWidth) / 2)), glyphInfo && glyphInfo.kerning !== 0 && glyphInfo.font) {
-    const radio = ptToPixel(fontStyle.fontSize) / glyphInfo.font.unitsPerEm, delta = glyphInfo.kerning * radio;
-    width += delta, xOffset += delta;
-  }
-  return {
-    content,
-    ts: textStyle,
-    fontStyle,
-    width,
-    bBox,
-    xOffset,
-    left: 0,
-    glyphType,
-    streamType,
-    isJustifiable: isJustifiable(content),
-    adjustability: baseAdjustability(content, width),
-    count: content.length,
-    raw: content
-  };
-}
-__name(_createSkeletonWordOrLetter, "_createSkeletonWordOrLetter");
-function createSkeletonBulletGlyph(glyph, bulletSkeleton, charSpaceApply) {
-  const {
-    bBox: boundingBox,
-    symbol: content,
-    ts: textStyle,
-    fontStyle,
-    bulletAlign = BulletAlignment.START,
-    bulletType = !1
-  } = bulletSkeleton, contentWidth = boundingBox.width, multiple = Math.ceil(contentWidth / charSpaceApply);
-  let width = (multiple < 2 ? 2 : multiple) * charSpaceApply, left = 0;
-  bulletType && (bulletAlign === BulletAlignment.CENTER ? (left = -contentWidth / 2, width -= left) : bulletAlign === BulletAlignment.END && (left = -contentWidth, width -= left));
-  const bBox = _getMaxBoundingBox(glyph, bulletSkeleton);
-  return {
-    content,
-    ts: {
-      ...glyph.ts,
-      ...textStyle,
-      st: {
-        s: BooleanNumber.FALSE
-      }
-    },
-    fontStyle,
-    width,
-    xOffset: 0,
-    bBox,
-    left,
-    isJustifiable: isJustifiable(content),
-    adjustability: baseAdjustability(content, width),
-    glyphType: GlyphType.LIST,
-    streamType: DataStreamTreeTokenType.LETTER,
-    // Deliberately set to 0 so that there is no need to count when calculating the cursor.
-    count: 0,
-    raw: content
-  };
-}
-__name(createSkeletonBulletGlyph, "createSkeletonBulletGlyph");
-function setGlyphGroupLeft(glyphGroup, left = 0) {
-  const spanGroupLen = glyphGroup.length;
-  let preGlyph;
-  for (let i = 0; i < spanGroupLen; i++) {
-    const glyph = glyphGroup[i];
-    glyph.left = preGlyph ? preGlyph.left + preGlyph.width : left, preGlyph = glyph;
-  }
-}
-__name(setGlyphGroupLeft, "setGlyphGroupLeft");
-function addGlyphToDivide(divide, glyphGroup, offsetLeft = 0) {
-  setGlyphGroupLeft(glyphGroup, offsetLeft);
-  for (const glyph of glyphGroup)
-    glyph.parent = divide;
-  divide.glyphGroup.push(...glyphGroup);
-}
-__name(addGlyphToDivide, "addGlyphToDivide");
-function _getMaxBoundingBox(glyph, bulletSkeleton) {
-  const { ba: spanAscent, bd: spanDescent } = glyph.bBox, { ba: bulletAscent, bd: bulletDescent } = bulletSkeleton.bBox;
-  return spanAscent + spanDescent > bulletAscent + bulletDescent ? glyph.bBox : bulletSkeleton.bBox;
-}
-__name(_getMaxBoundingBox, "_getMaxBoundingBox");
-function glyphShrinkRight(glyph, amount) {
-  glyph.width -= amount, glyph.adjustability.shrinkability[1] -= amount;
-}
-__name(glyphShrinkRight, "glyphShrinkRight");
-function glyphShrinkLeft(glyph, amount) {
-  glyph.width -= amount, glyph.xOffset -= amount, glyph.adjustability.shrinkability[0] -= amount;
-}
-__name(glyphShrinkLeft, "glyphShrinkLeft");
-var BreakPointType = /* @__PURE__ */ ((BreakPointType2) => (BreakPointType2.Normal = "Normal", BreakPointType2.Mandatory = "Mandatory", BreakPointType2.Hyphen = "Hyphen", BreakPointType2.Link = "Link", BreakPointType2))(BreakPointType || {});
-const _Break = class _Break {
-  constructor(position, type = "Normal") {
-    this.position = position, this.type = type;
-  }
-};
-__name(_Break, "Break");
-let Break = _Break;
 function createTableSkeleton(ctx, curPage, viewModel, tableNode, sectionBreakConfig) {
   const { startIndex, endIndex, children: rowNodes } = tableNode, table2 = viewModel.getTable(startIndex);
   if (table2 == null)
@@ -6105,10 +6100,8 @@ __name(getTableIdAndSliceIndex, "getTableIdAndSliceIndex");
 function layoutParagraph(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = BreakPointType.Normal) {
   if (isParagraphFirstShapedText)
     if (paragraphConfig.bulletSkeleton) {
-      const { bulletSkeleton, paragraphStyle = {} } = paragraphConfig, { gridType = GridType.LINES, charSpace = 0, defaultTabStop = 10.5 } = sectionBreakConfig, paragraphProperties = bulletSkeleton.paragraphProperties || {};
-      paragraphConfig.paragraphStyle = mergeByV(paragraphConfig.paragraphStyle, paragraphProperties);
-      const { snapToGrid = BooleanNumber.TRUE } = paragraphStyle, charSpaceApply = getCharSpaceApply(charSpace, defaultTabStop, gridType, snapToGrid), bulletGlyph = createSkeletonBulletGlyph(glyphGroup[0], bulletSkeleton, charSpaceApply);
-      _lineOperator(ctx, [bulletGlyph, ...glyphGroup], pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType);
+      const { bulletSkeleton, paragraphStyle = {} } = paragraphConfig, { gridType = GridType.LINES, charSpace = 0, defaultTabStop = 10.5 } = sectionBreakConfig, { snapToGrid = BooleanNumber.TRUE } = paragraphStyle, charSpaceApply = getCharSpaceApply(charSpace, defaultTabStop, gridType, snapToGrid), bulletGlyph = createSkeletonBulletGlyph(glyphGroup[0], bulletSkeleton, charSpaceApply), paragraphProperties = bulletSkeleton.paragraphProperties || {};
+      paragraphConfig.paragraphStyle = mergeByV(paragraphConfig.paragraphStyle, { ...paragraphProperties, hanging: { v: bulletGlyph.width } }), _lineOperator(ctx, [bulletGlyph, ...glyphGroup], pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType);
     } else
       _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType);
   else
@@ -22704,18 +22697,18 @@ function getDefaultBulletSke(listId, startIndex = 1) {
     },
     // 文字样式
     startIndexItem: startIndex,
-    bBox: {
-      width: 8.4560546875,
-      ba: 7,
-      bd: -1,
-      aba: 7,
-      abd: -1,
-      sp: -2,
-      sbr: 0.5,
-      sbo: 0,
-      spr: 0.5,
-      spo: 0
-    },
+    // bBox: {
+    //     width: 8.4560546875,
+    //     ba: 7,
+    //     bd: -1,
+    //     aba: 7,
+    //     abd: -1,
+    //     sp: -2,
+    //     sbr: 0.5,
+    //     sbo: 0,
+    //     spr: 0.5,
+    //     spo: 0,
+    // },
     paragraphProperties: {
       indentFirstLine: { v: 0 },
       hanging: { v: 21 },
@@ -22730,13 +22723,13 @@ function _getBulletSke(listId, nestingLevel, nestings, listLevelAncestors, textS
     bulletAlignment,
     glyphFormat,
     textStyle: textStyleFirst = {},
-    startNumber,
+    // startNumber,
     glyphType,
     glyphSymbol
   } = nesting, textStyle = { ...textStyleConfig, ...textStyleFirst }, fontStyle = getFontStyleString(textStyle);
   let symbolContent;
   glyphSymbol ? symbolContent = glyphSymbol : symbolContent = __generateOrderedListSymbol(glyphFormat, nestingLevel, nestings, listLevelAncestors);
-  const bBox = FontCache.getTextSize(symbolContent, fontStyle), startIndex = (_b = (_a10 = listLevelAncestors == null ? void 0 : listLevelAncestors[nestingLevel]) == null ? void 0 : _a10.startIndexItem) != null ? _b : 1;
+  const startIndex = (_b = (_a10 = listLevelAncestors == null ? void 0 : listLevelAncestors[nestingLevel]) == null ? void 0 : _a10.startIndexItem) != null ? _b : 1;
   return {
     listId,
     symbol: symbolContent,
@@ -22746,7 +22739,7 @@ function _getBulletSke(listId, nestingLevel, nestings, listLevelAncestors, textS
     fontStyle,
     //
     startIndexItem: startIndex + 1,
-    bBox,
+    // bBox,
     nestingLevel: nesting,
     bulletAlign: bulletAlignment,
     bulletType: glyphSymbol ? !1 : !!glyphType,
@@ -24522,8 +24515,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       startColumn: -1,
       endColumn: -1
     });
-    __publicField(this, "_dataMergeCache", []);
-    __publicField(this, "_dataMergeCacheMap", /* @__PURE__ */ new Map());
+    // private _dataMergeCache: IRange[] = [];
     __publicField(this, "_overflowCache", new ObjectMatrix());
     __publicField(this, "_stylesCache", {
       background: {},
@@ -24563,9 +24555,9 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
   get rowColumnSegment() {
     return this._rowColumnSegment;
   }
-  get dataMergeCache() {
-    return this._dataMergeCache;
-  }
+  // get dataMergeCache(): IRange[] {
+  //     return this._dataMergeCache;
+  // }
   get stylesCache() {
     return this._stylesCache;
   }
@@ -24585,7 +24577,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     return this.columnHeaderHeight + this._marginTop;
   }
   dispose() {
-    super.dispose(), this._rowHeightAccumulation = [], this._columnWidthAccumulation = [], this._rowTotalHeight = 0, this._columnTotalWidth = 0, this._rowHeaderWidth = 0, this._columnHeaderHeight = 0, this._rowColumnSegment = null, this._dataMergeCache = [], this._stylesCache = {
+    super.dispose(), this._rowHeightAccumulation = [], this._columnWidthAccumulation = [], this._rowTotalHeight = 0, this._columnTotalWidth = 0, this._rowHeaderWidth = 0, this._columnHeaderHeight = 0, this._rowColumnSegment = null, this._stylesCache = {
       background: {},
       backgroundPositions: new ObjectMatrix(),
       font: {},
@@ -24644,10 +24636,8 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     return !this._worksheetData || (this._updateLayout(), !this._rowHeightAccumulation || !this._columnWidthAccumulation) ? !1 : (bounds != null && (this._rowColumnSegment = this.getRowColumnSegment(bounds)), !0);
   }
   calculateWithoutClearingCache(bounds) {
-    if (!this.calculateSegment(bounds))
-      return;
-    const { mergeData } = this._worksheetData;
-    return this._dataMergeCache = mergeData && this._getMergeCells(mergeData, this._rowColumnSegment), this._dataMergeCacheMap = mergeData && this._getMergeCellsCache(mergeData), this._calculateStylesCache(), this;
+    if (this.calculateSegment(bounds))
+      return this._calculateStylesCache(), this;
   }
   calculate(bounds) {
     return this._resetCache(), this.calculateWithoutClearingCache(bounds), this;
@@ -24656,13 +24646,13 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     var _a10;
     if (!Tools.isArray(ranges))
       return [];
-    const results = [], { mergeData, rowData } = this._worksheetData, rowObjectArray = rowData, calculatedRows = /* @__PURE__ */ new Set();
+    const results = [], { rowData } = this._worksheetData, rowObjectArray = rowData, calculatedRows = /* @__PURE__ */ new Set();
     for (const range of ranges) {
       const { startRow, endRow, startColumn, endColumn } = range;
       for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) {
         if (calculatedRows.has(rowIndex) || ((_a10 = rowObjectArray[rowIndex]) == null ? void 0 : _a10.ia) === BooleanNumber.FALSE)
           continue;
-        if (hasUnMergedCellInRow(rowIndex, startColumn, endColumn, mergeData)) {
+        if (this._hasUnMergedCellInRow(rowIndex, startColumn, endColumn)) {
           const autoHeight = this._calculateRowAutoHeight(rowIndex);
           calculatedRows.add(rowIndex), results.push({
             row: rowIndex,
@@ -24673,16 +24663,26 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     }
     return results;
   }
+  _hasUnMergedCellInRow(rowIndex, startColumn, endColumn) {
+    if (!this.worksheet.getMergeData())
+      return !1;
+    for (let i = startColumn; i <= endColumn; i++) {
+      const { isMerged, isMergedMainCell } = this._getCellMergeInfo(rowIndex, i);
+      if (!isMerged && !isMergedMainCell)
+        return !0;
+    }
+    return !1;
+  }
   // TODO: auto height
   _calculateRowAutoHeight(rowNum) {
     var _a10, _b, _c;
-    const { columnCount, columnData, mergeData, defaultRowHeight, defaultColumnWidth } = this._worksheetData;
+    const { columnCount, columnData, defaultRowHeight, defaultColumnWidth } = this._worksheetData;
     let height = defaultRowHeight;
     const worksheet = this.worksheet;
     if (!worksheet)
       return height;
     for (let i = 0; i < columnCount; i++) {
-      const { isMerged, isMergedMainCell } = this._getCellMergeInfo(rowNum, i, mergeData);
+      const { isMerged, isMergedMainCell } = this._getCellMergeInfo(rowNum, i);
       if (isMerged || isMergedMainCell)
         continue;
       const cell = worksheet.getCell(rowNum, i);
@@ -24954,7 +24954,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       column,
       rowHeightAccumulation,
       columnWidthAccumulation,
-      this._getCellMergeInfo(row, column, this._worksheetData.mergeData)
+      this._getCellMergeInfo(row, column)
     ), { isMerged, isMergedMainCell } = primary;
     let { startY, endY, startX, endX, mergeInfo } = primary;
     return startY += columnHeaderHeightAndMarginTop, endY += columnHeaderHeightAndMarginTop, startX += rowHeaderWidthAndMarginLeft, endX += rowHeaderWidthAndMarginLeft, mergeInfo = mergeInfoOffset(mergeInfo, rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop), {
@@ -24975,7 +24975,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       column,
       rowHeightAccumulation,
       columnWidthAccumulation,
-      this._getCellMergeInfo(row, column, this._worksheetData.mergeData)
+      this._getCellMergeInfo(row, column)
     ), { isMerged, isMergedMainCell } = primary, { startY, endY, startX, endX, mergeInfo } = primary, newMergeInfo = mergeInfoOffset(mergeInfo, 0, 0);
     return {
       actualRow: row,
@@ -25112,7 +25112,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
           column,
           this.rowHeightAccumulation,
           this.columnWidthAccumulation,
-          this._getCellMergeInfo(row, column, this._worksheetData.mergeData)
+          this._getCellMergeInfo(row, column)
         ), cellWidth = endX - startX, cellHeight = endY - startY;
         contentSize.height > cellHeight && (contentSize = {
           width: cellHeight / Math.tan(Math.abs(vertexAngle)) + cellWidth,
@@ -25131,7 +25131,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
         column,
         this.rowHeightAccumulation,
         this.columnWidthAccumulation,
-        this._getCellMergeInfo(row, column, this._worksheetData.mergeData)
+        this._getCellMergeInfo(row, column)
       ), cellHeight = endY - startY;
       documentSkeleton.getViewModel().getDataModel().updateDocumentDataPageSize(cellHeight), documentSkeleton.calculate();
       const contentSize = getDocsSkeletonPageSize(documentSkeleton, vertexAngle);
@@ -25252,18 +25252,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     return endColumn;
   }
   intersectMergeRange(row, column) {
-    const dataMergeCache = this.dataMergeCache;
-    for (const dataCache of dataMergeCache) {
-      const {
-        startRow: startRowMargeIndex,
-        endRow: endRowMargeIndex,
-        startColumn: startColumnMargeIndex,
-        endColumn: endColumnMargeIndex
-      } = dataCache;
-      if (row >= startRowMargeIndex && row <= endRowMargeIndex && column >= startColumnMargeIndex && column <= endColumnMargeIndex)
-        return !0;
-    }
-    return !1;
+    return !!this.worksheet.getMergedCell(row, column);
   }
   // private _getMergeRangeCache() {
   //     const dataMergeCache = this.dataMergeCache;
@@ -25278,24 +25267,37 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
   //     });
   //     return mergeRangeCache;
   // }
+  /**
+   * get the current row and column segment visible merge data
+   * @returns {IRange} The visible merge data
+   */
+  getCurrentRowColumnSegmentMergeData(range) {
+    const endColumnLast = this.columnWidthAccumulation.length - 1;
+    return range ? range = {
+      startRow: range.startRow,
+      endRow: range.endRow,
+      endColumn: endColumnLast,
+      startColumn: 0
+    } : range = { startRow: 0, startColumn: 0, endRow: this.rowHeightAccumulation.length - 1, endColumn: endColumnLast }, this.worksheet.getSpanModel().getMergedCellRangeForSkeleton(range.startRow, range.startColumn, range.endRow, range.endColumn);
+  }
   _calculateStylesCache() {
-    const dataMergeCaches = this._dataMergeCache, rowColumnSegment = this._rowColumnSegment, columnWidthAccumulation = this.columnWidthAccumulation, { startRow, endRow, startColumn, endColumn } = rowColumnSegment;
-    if (!(endColumn === -1 || endRow === -1)) {
-      for (const mergeRange of dataMergeCaches)
-        this._setStylesCache(mergeRange.startRow, mergeRange.startColumn, {
-          mergeRange
-        });
-      for (let r = startRow; r <= endRow; r++)
-        if (this.worksheet.getRowVisible(r) !== !1) {
-          for (let c = startColumn; c <= endColumn; c++)
-            this._setStylesCache(r, c, { cacheItem: { bg: !0, border: !0 } });
-          for (let c = 0; c < startColumn; c++)
+    const rowColumnSegment = this._rowColumnSegment, columnWidthAccumulation = this.columnWidthAccumulation, { startRow, endRow, startColumn, endColumn } = rowColumnSegment;
+    if (endColumn === -1 || endRow === -1) return;
+    const mergeRanges = this.getCurrentRowColumnSegmentMergeData(this._rowColumnSegment);
+    for (const mergeRange of mergeRanges)
+      this._setStylesCache(mergeRange.startRow, mergeRange.startColumn, {
+        mergeRange
+      });
+    for (let r = startRow; r <= endRow; r++)
+      if (this.worksheet.getRowVisible(r) !== !1) {
+        for (let c = startColumn; c <= endColumn; c++)
+          this._setStylesCache(r, c, { cacheItem: { bg: !0, border: !0 } });
+        for (let c = 0; c < startColumn; c++)
+          this._setStylesCache(r, c, { cacheItem: { bg: !1, border: !1 } });
+        if (endColumn !== 0)
+          for (let c = endColumn + 1; c < columnWidthAccumulation.length; c++)
             this._setStylesCache(r, c, { cacheItem: { bg: !1, border: !1 } });
-          if (endColumn !== 0)
-            for (let c = endColumn + 1; c < columnWidthAccumulation.length; c++)
-              this._setStylesCache(r, c, { cacheItem: { bg: !1, border: !1 } });
-        }
-    }
+      }
   }
   /**
    * Any changes to sheet model would reset cache.
@@ -25341,11 +25343,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     const cell = this.worksheet.getCell(row, col) || this.worksheet.getCellRaw(row, col);
     if (!cell) return;
     if (this.worksheet.getColVisible(col) === !1 || this.worksheet.getRowVisible(row) === !1) {
-      const { isMerged, isMergedMainCell } = this._getCellMergeInfo(
-        row,
-        col,
-        this._dataMergeCache
-      );
+      const { isMerged, isMergedMainCell } = this._getCellMergeInfo(row, col);
       if (isMerged && !isMergedMainCell)
         return;
       if (!isMergedMainCell)
@@ -25548,28 +25546,8 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       paddingData
     };
   }
-  _getMergeCellsCache(mergeData) {
-    const map = /* @__PURE__ */ new Map();
-    return mergeData.forEach((range) => {
-      for (let r = range.startRow; r <= range.endRow; r++)
-        for (let c = range.startColumn; c <= range.endColumn; c++)
-          map.set(`${r}-${c}`, range);
-    }), map;
-  }
-  _getCellMergeInfo(row, column, mergeData) {
-    this._dataMergeCacheMap || (this._dataMergeCacheMap = this._getMergeCellsCache(mergeData));
-    const key = `${row}-${column}`, mergeRange = this._dataMergeCacheMap.get(key);
-    let isMerged = !1, isMergedMainCell = !1, newEndRow = row, newEndColumn = column, mergeRow = row, mergeColumn = column;
-    return mergeRange && (isMergedMainCell = mergeRange.startRow === row && mergeRange.startColumn === column, isMergedMainCell ? (newEndRow = mergeRange.endRow, newEndColumn = mergeRange.endColumn, mergeRow = mergeRange.startRow, mergeColumn = mergeRange.startColumn) : row > mergeRange.startRow && row <= mergeRange.endRow && column > mergeRange.startColumn && column <= mergeRange.endColumn && (isMerged = !0, newEndRow = mergeRange.endRow, newEndColumn = mergeRange.endColumn, mergeRow = mergeRange.startRow, mergeColumn = mergeRange.startColumn)), {
-      actualRow: row,
-      actualColumn: column,
-      isMergedMainCell,
-      isMerged,
-      endRow: newEndRow,
-      endColumn: newEndColumn,
-      startRow: mergeRow,
-      startColumn: mergeColumn
-    };
+  _getCellMergeInfo(row, column) {
+    return this.worksheet.getCellInfoInMergeData(row, column);
   }
   /**
    * Cache the merged cells on the current screen to improve computational performance.
@@ -25626,7 +25604,7 @@ const UNIQUE_KEY$7 = "DefaultFontExtension", EXTENSION_Z_INDEX = 45, _Font = cla
     return parent == null ? void 0 : parent.getDocuments();
   }
   draw(ctx, parentScale, spreadsheetSkeleton, diffRanges, moreBoundsInfo) {
-    const { stylesCache, dataMergeCache, overflowCache, worksheet } = spreadsheetSkeleton, { font: fontList } = stylesCache;
+    const { stylesCache, overflowCache, worksheet } = spreadsheetSkeleton, { font: fontList } = stylesCache;
     if (!spreadsheetSkeleton || !worksheet || !fontList)
       return;
     const { rowHeightAccumulation, columnTotalWidth, columnWidthAccumulation, rowTotalHeight } = spreadsheetSkeleton;
@@ -25639,12 +25617,9 @@ const UNIQUE_KEY$7 = "DefaultFontExtension", EXTENSION_Z_INDEX = 45, _Font = cla
         var _a10, _b, _c, _d, _e;
         if (!checkOutOfViewBound && !inViewRanges(viewRanges, rowIndex, columnIndex))
           return !0;
-        const cellInfo = this.getCellByIndex(
+        const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(
           rowIndex,
-          columnIndex,
-          rowHeightAccumulation,
-          columnWidthAccumulation,
-          dataMergeCache
+          columnIndex
         );
         let { startY, endY, startX, endX } = cellInfo;
         const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;
@@ -25844,13 +25819,7 @@ const UNIQUE_KEY$5 = "DefaultMarkerExtension", Z_INDEX$1 = 60, stringifyRange$1
       if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col))
         return;
       let cellData = worksheet.getCell(row, col);
-      const cellInfo = this.getCellByIndex(
-        row,
-        col,
-        skeleton.rowHeightAccumulation,
-        skeleton.columnWidthAccumulation,
-        skeleton.dataMergeCache
-      ), { isMerged, isMergedMainCell, mergeInfo } = cellInfo;
+      const cellInfo = skeleton.getCellByIndexWithNoHeader(row, col), { isMerged, isMergedMainCell, mergeInfo } = cellInfo;
       let { startY, endY, startX, endX } = cellInfo;
       if ((isMergedMainCell || isMerged) && (startY = mergeInfo.startY, endY = mergeInfo.endY, startX = mergeInfo.startX, endX = mergeInfo.endX), isMerged) {
         const mainCell = {
@@ -25905,7 +25874,7 @@ const UNIQUE_KEY$4 = "DefaultCustomExtension", Z_INDEX = 55, stringifyRange = /*
     __publicField(this, "uKey", UNIQUE_KEY$4);
   }
   draw(ctx, _parentScale, skeleton, diffRanges) {
-    const { rowHeightAccumulation, columnWidthAccumulation, worksheet, dataMergeCache, rowColumnSegment } = skeleton;
+    const { worksheet, rowColumnSegment } = skeleton;
     if (!worksheet)
       return;
     const mergeCellRendered = /* @__PURE__ */ new Set(), subUnitId = worksheet.getSheetId();
@@ -25915,7 +25884,7 @@ const UNIQUE_KEY$4 = "DefaultCustomExtension", Z_INDEX = 55, stringifyRange = /*
       let cellData = worksheet.getCell(row, col);
       if (!(cellData != null && cellData.customRender))
         return;
-      let primaryWithCoord = this.getCellByIndex(row, col, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+      let primaryWithCoord = skeleton.getCellByIndexWithNoHeader(row, col);
       const { mergeInfo } = primaryWithCoord;
       if (!this.isRenderDiffRangesByRow(mergeInfo.startRow, mergeInfo.endRow, diffRanges))
         return !0;
@@ -25932,7 +25901,7 @@ const UNIQUE_KEY$4 = "DefaultCustomExtension", Z_INDEX = 55, stringifyRange = /*
         };
         if (cellData = worksheet.getCell(mainCell.row, mainCell.col), !(cellData != null && cellData.customRender))
           return;
-        primaryWithCoord = this.getCellByIndex(mainCell.row, mainCell.col, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+        primaryWithCoord = skeleton.getCellByIndex(mainCell.row, mainCell.col);
       }
       const renderInfo = {
         data: cellData,
@@ -27418,9 +27387,9 @@ const _BaseScrollBar = class _BaseScrollBar extends Disposable {
     __publicField(this, "verticalThumbHeight", 0);
     __publicField(this, "verticalBarHeight", 0);
     __publicField(this, "verticalMinusMiniThumb", 0);
-    __publicField(this, "horizonBarRect");
+    __publicField(this, "horizonScrollTrack");
     __publicField(this, "horizonThumbRect");
-    __publicField(this, "verticalBarRect");
+    __publicField(this, "verticalScrollTrack");
     __publicField(this, "verticalThumbRect");
     __publicField(this, "placeholderBarRect");
   }
@@ -27460,11 +27429,11 @@ const _BaseScrollBar = class _BaseScrollBar extends Disposable {
   }
   pick(coord) {
     var _a10, _b, _c, _d;
-    return (_a10 = this.horizonThumbRect) != null && _a10.isHit(coord) ? this.horizonThumbRect : (_b = this.verticalThumbRect) != null && _b.isHit(coord) ? this.verticalThumbRect : (_c = this.horizonBarRect) != null && _c.isHit(coord) ? this.horizonBarRect : (_d = this.verticalBarRect) != null && _d.isHit(coord) ? this.verticalBarRect : null;
+    return (_a10 = this.horizonThumbRect) != null && _a10.isHit(coord) ? this.horizonThumbRect : (_b = this.verticalThumbRect) != null && _b.isHit(coord) ? this.verticalThumbRect : (_c = this.horizonScrollTrack) != null && _c.isHit(coord) ? this.horizonScrollTrack : (_d = this.verticalScrollTrack) != null && _d.isHit(coord) ? this.verticalScrollTrack : null;
   }
   dispose() {
     var _a10, _b, _c, _d, _e;
-    (_a10 = this.horizonBarRect) == null || _a10.dispose(), (_b = this.horizonThumbRect) == null || _b.dispose(), (_c = this.verticalBarRect) == null || _c.dispose(), (_d = this.verticalThumbRect) == null || _d.dispose(), (_e = this.placeholderBarRect) == null || _e.dispose(), this.horizonBarRect = null, this.horizonThumbRect = null, this.verticalBarRect = null, this.verticalThumbRect = null, this.placeholderBarRect = null;
+    (_a10 = this.horizonScrollTrack) == null || _a10.dispose(), (_b = this.horizonThumbRect) == null || _b.dispose(), (_c = this.verticalScrollTrack) == null || _c.dispose(), (_d = this.verticalThumbRect) == null || _d.dispose(), (_e = this.placeholderBarRect) == null || _e.dispose(), this.horizonScrollTrack = null, this.horizonThumbRect = null, this.verticalScrollTrack = null, this.verticalThumbRect = null, this.placeholderBarRect = null;
   }
   hasHorizonThumb() {
     var _a10;
@@ -27480,7 +27449,7 @@ let BaseScrollBar = _BaseScrollBar;
 const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar {
   constructor(view, props) {
     super();
-    __publicField(this, "_view");
+    __publicField(this, "_viewport");
     __publicField(this, "_mainScene");
     __publicField(this, "_lastX", -1);
     __publicField(this, "_lastY", -1);
@@ -27503,20 +27472,20 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
     __publicField(this, "barBackgroundColor", "rgba(255,255,255,0.5)");
     __publicField(this, "barBorderColor", "rgba(255,255,255,0.7)");
     __publicField(this, "_eventSub", new Subscription());
-    view || console.warn("Missing viewport"), this.setProps(props), this._view = view, this._initialScrollRect(), this._initialVerticalEvent(), this._initialHorizontalEvent(), this._view.setScrollBar(this);
+    view || console.warn("Missing viewport"), this.setProps(props), this._viewport = view, this._initialScrollRect(), this._initialVerticalEvent(), this._initialHorizontalEvent(), this._viewport.setScrollBar(this);
   }
   static attachTo(view, props) {
     return new _ScrollBar(view, props);
   }
   dispose() {
     var _a10, _b, _c, _d;
-    super.dispose(), (_a10 = this._horizonPointerMoveSub) == null || _a10.unsubscribe(), (_b = this._horizonPointerUpSub) == null || _b.unsubscribe(), (_c = this._verticalPointerMoveSub) == null || _c.unsubscribe(), (_d = this._verticalPointerUpSub) == null || _d.unsubscribe(), this._eventSub.unsubscribe(), this._mainScene = null, this._view.removeScrollBar();
+    super.dispose(), (_a10 = this._horizonPointerMoveSub) == null || _a10.unsubscribe(), (_b = this._horizonPointerUpSub) == null || _b.unsubscribe(), (_c = this._verticalPointerMoveSub) == null || _c.unsubscribe(), (_d = this._verticalPointerUpSub) == null || _d.unsubscribe(), this._eventSub.unsubscribe(), this._mainScene = null, this._viewport.removeScrollBar();
   }
   render(ctx, left = 0, top = 0) {
-    const { scrollX, scrollY } = this._view;
+    const { scrollX, scrollY } = this._viewport;
     ctx.save();
     const m = new Transform([1, 0, 0, 1, left, top]).getMatrix();
-    ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]), this.enableHorizontal && (this.horizonBarRect.render(ctx), this.horizonThumbRect.translate(scrollX).render(ctx)), this.enableVertical && (this.verticalBarRect.render(ctx), this.verticalThumbRect.translate(void 0, scrollY).render(ctx)), this.enableHorizontal && this.enableVertical && this.placeholderBarRect.render(ctx), ctx.restore();
+    ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]), this.enableHorizontal && (this.horizonScrollTrack.render(ctx), this.horizonThumbRect.translate(scrollX).render(ctx)), this.enableVertical && (this.verticalScrollTrack.render(ctx), this.verticalThumbRect.translate(void 0, scrollY).render(ctx)), this.enableHorizontal && this.enableVertical && this.placeholderBarRect.render(ctx), ctx.restore();
   }
   resize(parentWidth = 0, parentHeight = 0, contentWidth = 0, contentHeight = 0) {
     var _a10;
@@ -27529,14 +27498,14 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
   }
   makeDirty(state) {
     var _a10, _b, _c, _d, _e;
-    (_a10 = this.horizonBarRect) == null || _a10.makeDirty(state), (_b = this.horizonThumbRect) == null || _b.makeDirty(state), (_c = this.verticalBarRect) == null || _c.makeDirty(state), (_d = this.verticalThumbRect) == null || _d.makeDirty(state), (_e = this.placeholderBarRect) == null || _e.makeDirty(state), this.makeViewDirty(state);
+    (_a10 = this.horizonScrollTrack) == null || _a10.makeDirty(state), (_b = this.horizonThumbRect) == null || _b.makeDirty(state), (_c = this.verticalScrollTrack) == null || _c.makeDirty(state), (_d = this.verticalThumbRect) == null || _d.makeDirty(state), (_e = this.placeholderBarRect) == null || _e.makeDirty(state), this.makeViewDirty(state);
   }
   makeViewDirty(state) {
-    (this._mainScene || this._view.scene).makeDirty(state);
+    (this._mainScene || this._viewport.scene).makeDirty(state);
   }
   pick(coord) {
     var _a10, _b, _c, _d;
-    return (_a10 = this.horizonThumbRect) != null && _a10.isHit(coord) ? this.horizonThumbRect : (_b = this.verticalThumbRect) != null && _b.isHit(coord) ? this.verticalThumbRect : (_c = this.horizonBarRect) != null && _c.isHit(coord) ? this.horizonBarRect : (_d = this.verticalBarRect) != null && _d.isHit(coord) ? this.verticalBarRect : null;
+    return (_a10 = this.horizonThumbRect) != null && _a10.isHit(coord) ? this.horizonThumbRect : (_b = this.verticalThumbRect) != null && _b.isHit(coord) ? this.verticalThumbRect : (_c = this.horizonScrollTrack) != null && _c.isHit(coord) ? this.horizonScrollTrack : (_d = this.verticalScrollTrack) != null && _d.isHit(coord) ? this.verticalScrollTrack : null;
   }
   setProps(props) {
     if (!props)
@@ -27548,7 +27517,7 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
   }
   _resizeHorizontal(parentWidth, parentHeight, contentWidth) {
     var _a10, _b, _c, _d, _e;
-    this.enableHorizontal && (this.horizontalMinusMiniThumb = 0, this.horizontalBarWidth = parentWidth - (this.enableVertical ? this.barSize : 0) - this.barBorder, this.horizontalThumbWidth = this.horizontalBarWidth * (this.horizontalBarWidth - this.barBorder) / contentWidth * this.thumbLengthRatio, this.horizontalThumbWidth < MINI_THUMB_SIZE && (this.horizontalMinusMiniThumb = MINI_THUMB_SIZE - this.horizontalThumbWidth, this.horizontalThumbWidth = MINI_THUMB_SIZE), (_a10 = this.horizonBarRect) == null || _a10.transformByState({
+    this.enableHorizontal && (this.horizontalMinusMiniThumb = 0, this.horizontalBarWidth = parentWidth - (this.enableVertical ? this.barSize : 0) - this.barBorder, this.horizontalThumbWidth = this.horizontalBarWidth * (this.horizontalBarWidth - this.barBorder) / contentWidth * this.thumbLengthRatio, this.horizontalThumbWidth < MINI_THUMB_SIZE && (this.horizontalMinusMiniThumb = MINI_THUMB_SIZE - this.horizontalThumbWidth, this.horizontalThumbWidth = MINI_THUMB_SIZE), (_a10 = this.horizonScrollTrack) == null || _a10.transformByState({
       left: 0,
       top: parentHeight - this.barSize,
       width: this.horizontalBarWidth,
@@ -27558,7 +27527,7 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
     }) : ((_c = this.horizonThumbRect) != null && _c.visible || (_d = this.horizonThumbRect) == null || _d.setProps({
       visible: !0
     }), (_e = this.horizonThumbRect) == null || _e.transformByState({
-      left: this._view.scrollX,
+      left: this._viewport.scrollX,
       top: parentHeight - this.barSize + this.thumbMargin,
       width: this.horizontalThumbWidth,
       height: this.barSize - this.thumbMargin * 2
@@ -27566,7 +27535,7 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
   }
   _resizeVertical(parentWidth, parentHeight, contentHeight) {
     var _a10, _b, _c, _d, _e;
-    this.enableVertical && (this.verticalMinusMiniThumb = 0, this.verticalBarHeight = parentHeight - (this.enableHorizontal ? this.barSize : 0) - this.barBorder, this.verticalThumbHeight = this.verticalBarHeight * this.verticalBarHeight / contentHeight * this.thumbLengthRatio, this.verticalThumbHeight < MINI_THUMB_SIZE && (this.verticalMinusMiniThumb = MINI_THUMB_SIZE - this.verticalThumbHeight, this.verticalThumbHeight = MINI_THUMB_SIZE), (_a10 = this.verticalBarRect) == null || _a10.transformByState({
+    this.enableVertical && (this.verticalMinusMiniThumb = 0, this.verticalBarHeight = parentHeight - (this.enableHorizontal ? this.barSize : 0) - this.barBorder, this.verticalThumbHeight = this.verticalBarHeight * this.verticalBarHeight / contentHeight * this.thumbLengthRatio, this.verticalThumbHeight < MINI_THUMB_SIZE && (this.verticalMinusMiniThumb = MINI_THUMB_SIZE - this.verticalThumbHeight, this.verticalThumbHeight = MINI_THUMB_SIZE), (_a10 = this.verticalScrollTrack) == null || _a10.transformByState({
       left: parentWidth - this.barSize,
       top: 0,
       width: this.barSize - this.barBorder,
@@ -27577,20 +27546,20 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
       visible: !0
     }), (_e = this.verticalThumbRect) == null || _e.transformByState({
       left: parentWidth - this.barSize + this.thumbMargin,
-      top: this._view.scrollY,
+      top: this._viewport.scrollY,
       width: this.barSize - this.thumbMargin * 2,
       height: this.verticalThumbHeight
     })));
   }
   _initialScrollRect() {
-    this.enableHorizontal && (this.horizonBarRect = new Rect("__horizonBarRect__", {
+    this.enableHorizontal && (this.horizonScrollTrack = new Rect("__horizonBarRect__", {
       fill: this.barBackgroundColor,
       strokeWidth: this.barBorder,
       stroke: this.barBorderColor
     }), this.horizonThumbRect = new Rect("__horizonThumbRect__", {
       radius: 6,
       fill: this.thumbBackgroundColor
-    })), this.enableVertical && (this.verticalBarRect = new Rect("__verticalBarRect__", {
+    })), this.enableVertical && (this.verticalScrollTrack = new Rect("__verticalBarRect__", {
       fill: this.barBackgroundColor,
       strokeWidth: this.barBorder,
       stroke: this.barBorderColor
@@ -27606,15 +27575,15 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
   _initialVerticalEvent() {
     if (!this.enableVertical)
       return;
-    const mainScene = this._mainScene || this._view.scene;
+    const mainScene = this._mainScene || this._viewport.scene;
     this.verticalThumbRect && this._eventSub.add(this.verticalThumbRect.onPointerEnter$.subscribeEvent((_evt, _state) => {
       this._hoverFunc(this.thumbHoverBackgroundColor, this.verticalThumbRect);
     })), this.verticalThumbRect && this._eventSub.add(this.verticalThumbRect.onPointerLeave$.subscribeEvent((_evt, _state) => {
       this._hoverFunc(this.thumbHoverBackgroundColor, this.verticalThumbRect);
-    })), this.verticalBarRect && this._eventSub.add(this.verticalBarRect.onPointerDown$.subscribeEvent((evt, state) => {
+    })), this.verticalScrollTrack && this._eventSub.add(this.verticalScrollTrack.onPointerDown$.subscribeEvent((evt, state) => {
       const e = evt;
-      this._view.scrollToBarPos({
-        y: e.offsetY - this._view.top - this.verticalThumbHeight / 2
+      this._viewport.scrollToBarPos({
+        y: e.offsetY - this._viewport.top - this.verticalThumbHeight / 2
       }), state.stopPropagation();
     })), this.verticalThumbRect && this._eventSub.add(this.verticalThumbRect.onPointerDown$.subscribeEvent((evt, state) => {
       const e = evt, srcElement = this.verticalThumbRect;
@@ -27624,8 +27593,8 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
     })), this._verticalPointerMoveSub = mainScene.onPointerMove$.subscribeEvent((evt, _state) => {
       var _a10;
       const e = evt;
-      this._isVerticalMove && (this._view.scrollByBar({
-        y: e.offsetY - this._lastY
+      this._isVerticalMove && (this._viewport.scrollToBarPos({
+        y: e.offsetY
       }), this._lastY = e.offsetY, (_a10 = mainScene.getEngine()) == null || _a10.setRemainCapture());
     }), this._verticalPointerUpSub = mainScene.onPointerUp$.subscribeEvent((_evt, _state) => {
       const srcElement = this.verticalThumbRect;
@@ -27646,15 +27615,15 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
   _initialHorizontalEvent() {
     if (!this.enableHorizontal)
       return;
-    const mainScene = this._mainScene || this._view.scene;
+    const mainScene = this._mainScene || this._viewport.scene;
     this.horizonThumbRect && this._eventSub.add(this.horizonThumbRect.onPointerEnter$.subscribeEvent((_evt, _state) => {
       this._hoverFunc(this.thumbHoverBackgroundColor, this.horizonThumbRect);
     })), this.horizonThumbRect && this._eventSub.add(this.horizonThumbRect.onPointerLeave$.subscribeEvent((_evt, _state) => {
       this._hoverFunc(this.thumbHoverBackgroundColor, this.horizonThumbRect);
-    })), this.horizonBarRect && this._eventSub.add(this.horizonBarRect.onPointerDown$.subscribeEvent((evt, state) => {
+    })), this.horizonScrollTrack && this._eventSub.add(this.horizonScrollTrack.onPointerDown$.subscribeEvent((evt, state) => {
       const e = evt;
-      this._view.scrollToBarPos({
-        x: e.offsetX - this._view.left - this.horizontalThumbWidth / 2
+      this._viewport.scrollToBarPos({
+        x: e.offsetX - this._viewport.left - this.horizontalThumbWidth / 2
       }), state.stopPropagation();
     })), this.horizonThumbRect && this._eventSub.add(this.horizonThumbRect.onPointerDown$.subscribeEvent((evt, state) => {
       var _a10;
@@ -27665,8 +27634,8 @@ const MINI_THUMB_SIZE = 17, _ScrollBar = class _ScrollBar extends BaseScrollBar
     })), this._horizonPointerMoveSub = mainScene.onPointerMove$.subscribeEvent((evt, _state) => {
       var _a10;
       const e = evt;
-      this._isHorizonMove && (this._view.scrollByBar({
-        x: e.offsetX - this._lastX
+      this._isHorizonMove && (this._viewport.scrollToBarPos({
+        x: e.offsetX
       }), this._lastX = e.offsetX, (_a10 = mainScene.getEngine()) == null || _a10.setRemainCapture());
     }), this._horizonPointerUpSub = mainScene.onPointerUp$.subscribeEvent((evt, state) => {
       const srcElement = this.horizonThumbRect;
@@ -27764,8 +27733,8 @@ const UNIQUE_KEY$1 = "DefaultDocsFontAndBaseLineExtension", DOC_EXTENSION_Z_INDE
       const CHECKED_GLYPH = "☑";
       if ((content === "☐" || content === CHECKED_GLYPH) && glyph.glyphType === GlyphType.LIST) {
         ctx.save();
-        const size = (_b = (_a10 = glyph.ts) == null ? void 0 : _a10.fs) != null ? _b : 16;
-        ctx.translate(spanPointWithFont.x, spanPointWithFont.y - (bBox.aba + bBox.abd) - 3), Checkbox.drawWith(ctx, {
+        const size = Math.ceil(((_b = (_a10 = glyph.ts) == null ? void 0 : _a10.fs) != null ? _b : 12) * 1.2);
+        ctx.translate(spanPointWithFont.x, spanPointWithFont.y - size), Checkbox.drawWith(ctx, {
           width: size,
           height: size,
           checked: content === CHECKED_GLYPH
@@ -28684,7 +28653,7 @@ const OBJECT_KEY = "__SHEET_EXTENSION_FONT_DOCUMENT_INSTANCE__", _Spreadsheet =
     const spreadsheetSkeleton = this.getSkeleton();
     if (spreadsheetSkeleton == null)
       return;
-    const { rowColumnSegment, dataMergeCache: mergeCellRanges, overflowCache, showGridlines } = spreadsheetSkeleton, { startRow, endRow, startColumn, endColumn } = rowColumnSegment;
+    const { rowColumnSegment, overflowCache, showGridlines } = spreadsheetSkeleton, mergeCellRanges = spreadsheetSkeleton.getCurrentRowColumnSegmentMergeData(rowColumnSegment), { startRow, endRow, startColumn, endColumn } = rowColumnSegment;
     if (!spreadsheetSkeleton || showGridlines === BooleanNumber.FALSE || this._forceDisableGridlines)
       return;
     const { rowHeightAccumulation, columnTotalWidth, columnWidthAccumulation, rowTotalHeight } = spreadsheetSkeleton;
@@ -32405,7 +32374,7 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
     __publicField(this, "_sceneHeightAfterScale");
     __publicField(this, "onMouseWheel$", new EventSubject());
     __publicField(this, "onScrollAfter$", new EventSubject());
-    __publicField(this, "onScrollBefore$", new EventSubject());
+    // onScrollBefore$ = new EventSubject<IScrollObserverParam>();
     __publicField(this, "onScrollEnd$", new EventSubject());
     __publicField(this, "onScrollByBar$", new EventSubject());
     __publicField(this, "_viewportKey", "");
@@ -32551,7 +32520,7 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
   }
   set height(height) {
     const maxHeight = this.scene.getParent().height;
-    height != null ? this._height = Tools.clamp(height, 0, maxHeight) : this._height = height;
+    Tools.isDefine(height) ? this._height = Tools.clamp(height, 0, maxHeight) : this._height = height;
   }
   get isActive() {
     return this._active === !1 || (this.height || 0) <= 0 || (this.width || 0) <= 0 ? !1 : this._active;
@@ -32661,14 +32630,14 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
   // 2. changing curr skeleton
   // 3. changing selection which cross viewport
   // 4. changing the viewport size (also include change window size)
-  // 5. changing the scroll bar position
+  // 5. changing the scroll bar position(click at certain pos of scrolltrack)
   // Debug
   // window.scene.getViewports()[0].scrollTo({x: 14.2, y: 1.8}, true)
   scrollToBarPos(pos) {
     return this._scrollToBarPosCore(pos);
   }
   /**
-   * scrolling by current position plus offset
+   * Srolling by current position plus delta.
    * the most common case is triggered by scroll-timer(in sheet)
    * @param delta
    * @returns isLimited
@@ -32677,23 +32646,6 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
     const x = this.scrollX + (delta.x || 0), y = this.scrollY + (delta.y || 0);
     return this._scrollToBarPosCore({ x, y }, isTrigger);
   }
-  scrollByBar(delta, isTrigger = !0) {
-    var _a10, _b;
-    this.scrollByBarDeltaValue(delta, isTrigger);
-    const { x, y } = delta;
-    this.onScrollByBar$.emitEvent({
-      viewport: this,
-      scrollX: this.scrollX,
-      scrollY: this.scrollY,
-      rawScrollX: x,
-      rawScrollY: y,
-      viewportScrollX: this.viewportScrollX,
-      viewportScrollY: this.viewportScrollY,
-      limitX: (_a10 = this._scrollBar) == null ? void 0 : _a10.limitX,
-      limitY: (_b = this._scrollBar) == null ? void 0 : _b.limitY,
-      isTrigger
-    });
-  }
   /**
    * Viewport scroll to certain position.
    * @param pos
@@ -32712,19 +32664,6 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
     const viewportScrollX = this.viewportScrollX + (delta.viewportScrollX || 0), viewportScrollY = this.viewportScrollY + (delta.viewportScrollY || 0);
     return this._scrollToViewportPosCore({ viewportScrollX, viewportScrollY }, isTrigger);
   }
-  /**
-   * current position plus offset relatively
-   * the caller no need to deal with the padding when frozen
-   * @param offsetX
-   * @param offsetY
-   * @param isTrigger
-   */
-  scrollByOffset(offsetX = 0, offsetY = 0, isTrigger = !0) {
-    if (!this._scrollBar || this.isActive === !1)
-      return;
-    const x = offsetX + this._paddingStartX, y = offsetY + this._paddingStartY, param = this.transViewportScroll2ScrollValue(x, y);
-    return this.scrollByBarDeltaValue(param, isTrigger);
-  }
   transViewportScroll2ScrollValue(viewportScrollX, viewportScrollY) {
     let x = viewportScrollX - this._paddingStartX, y = viewportScrollY - this._paddingStartY;
     if (this._scrollBar) {
@@ -32965,7 +32904,7 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
   }
   dispose() {
     var _a10, _b;
-    this.onMouseWheel$.complete(), this.onScrollAfter$.complete(), this.onScrollBefore$.complete(), this.onScrollEnd$.complete(), (_a10 = this._scrollBar) == null || _a10.dispose(), (_b = this._cacheCanvas) == null || _b.dispose(), this._scene.removeViewport(this._viewportKey);
+    this.onMouseWheel$.complete(), this.onScrollAfter$.complete(), this.onScrollEnd$.complete(), (_a10 = this._scrollBar) == null || _a10.dispose(), (_b = this._cacheCanvas) == null || _b.dispose(), this._scene.removeViewport(this._viewportKey);
   }
   limitedScroll(scrollX, scrollY) {
     var _a10, _b;
@@ -33059,6 +32998,10 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
    */
   _afterRender() {
   }
+  /**
+   * mock scrollend.
+   * @param scrollSubParam
+   */
   _emitScrollEnd$(scrollSubParam) {
     clearTimeout(this._scrollStopNum), this._scrollStopNum = setTimeout(() => {
       var _a10, _b;
@@ -33083,7 +33026,7 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
    * @param isTrigger
    */
   _scrollToBarPosCore(rawScrollXY, isTrigger = !0) {
-    var _a10, _b, _c;
+    var _a10, _b, _c, _d, _e;
     if (this._scrollBar == null)
       return;
     let scrollX = rawScrollXY.x, scrollY = rawScrollXY.y;
@@ -33101,7 +33044,16 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
       limitY: (_b = this._scrollBar) == null ? void 0 : _b.limitY,
       isTrigger
     };
-    return (_c = this._scrollBar) == null || _c.makeDirty(!0), this.onScrollBefore$.emitEvent(scrollSubParam), this.onScrollAfter$.emitEvent(scrollSubParam), this._emitScrollEnd$(scrollSubParam), afterLimit;
+    return (_c = this._scrollBar) == null || _c.makeDirty(!0), this.onScrollAfter$.emitEvent(scrollSubParam), this._emitScrollEnd$(scrollSubParam), this.onScrollByBar$.emitEvent({
+      viewport: this,
+      scrollX: this.scrollX,
+      scrollY: this.scrollY,
+      viewportScrollX: this.viewportScrollX,
+      viewportScrollY: this.viewportScrollY,
+      limitX: (_d = this._scrollBar) == null ? void 0 : _d.limitX,
+      limitY: (_e = this._scrollBar) == null ? void 0 : _e.limitY,
+      isTrigger
+    }), afterLimit;
   }
   /**
    * Scroll to position in viewport.
@@ -33130,7 +33082,7 @@ const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3, _Viewport = class _Viewport {
       limitX: (_c = this._scrollBar) == null ? void 0 : _c.limitX,
       limitY: (_d = this._scrollBar) == null ? void 0 : _d.limitY
     };
-    return (_e = this._scrollBar) == null || _e.makeDirty(!0), this.onScrollBefore$.emitEvent(scrollSubParam), this.onScrollAfter$.emitEvent(scrollSubParam), this._emitScrollEnd$(scrollSubParam), afterLimitViewportXY;
+    return (_e = this._scrollBar) == null || _e.makeDirty(!0), this.onScrollAfter$.emitEvent(scrollSubParam), this._emitScrollEnd$(scrollSubParam), afterLimitViewportXY;
   }
   expandBounds(value) {
     const onePixelFix = FIX_ONE_PIXEL_BLUR_OFFSET * 2;