refactor: refactor doc view model cache (#4130)

dream-num · Nov 23, 2024 · 2c3efff · 2c3efff
1 parent e1d7713
commit 2c3efff
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 436 deletions.
diff --git a/examples/src/docs/main.ts b/examples/src/docs/main.ts
@@ -25,7 +25,7 @@ import { UniverDocsThreadCommentUIPlugin } from '@univerjs/docs-thread-comment-u
 import { UniverDocsUIPlugin } from '@univerjs/docs-ui';
 import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
 import { UniverRenderEnginePlugin } from '@univerjs/engine-render';
-import { DEFAULT_DOCUMENT_DATA_SIMPLE } from '@univerjs/mockdata';
+import { DEFAULT_DOCUMENT_DATA_CN } from '@univerjs/mockdata';
 import { UniverUIPlugin } from '@univerjs/ui';
 import { enUS, faIR, ruRU, zhCN } from '../locales';
 
@@ -69,7 +69,7 @@ univer.registerPlugin(UniverDocsHyperLinkUIPlugin);
 univer.registerPlugin(UniverDocsMentionUIPlugin);
 
 if (!IS_E2E) {
-    univer.createUnit(UniverInstanceType.UNIVER_DOC, DEFAULT_DOCUMENT_DATA_SIMPLE);
+    univer.createUnit(UniverInstanceType.UNIVER_DOC, DEFAULT_DOCUMENT_DATA_CN);
 }
 
 // use for console test

diff --git a/packages/docs-ui/src/commands/commands/table/table.ts b/packages/docs-ui/src/commands/commands/table/table.ts
@@ -276,7 +276,7 @@ export function getInsertRowActionsParams(rangeInfo: IRangeInfo, position: INSER
     let rowIndex = 0;
 
     // TODO: handle nested tables
-    for (const section of vm.children) {
+    for (const section of vm.getChildren()) {
         for (const paragraph of section.children) {
             const { children } = paragraph;
             const table = children[0];
@@ -324,7 +324,7 @@ export function getInsertColumnActionsParams(rangeInfo: IRangeInfo, position: IN
     let table: Nullable<DataStreamTreeNode> = null;
     let columnIndex = -1;
 
-    for (const section of vm.children) {
+    for (const section of vm.getChildren()) {
         for (const paragraph of section.children) {
             const { children } = paragraph;
             const tableNode = children[0];
@@ -418,7 +418,7 @@ export function getDeleteRowsActionsParams(rangeInfo: IRangeInfo, viewModel: Doc
     let cursor = -1;
     let selectWholeTable = false;
 
-    for (const section of vm.children) {
+    for (const section of vm.getChildren()) {
         for (const paragraph of section.children) {
             const { children } = paragraph;
             const table = children[0];
@@ -494,7 +494,7 @@ export function getDeleteColumnsActionParams(rangeInfo: IRangeInfo, viewModel: D
     let startColumnIndex = -1;
     let endColumnIndex = -1;
 
-    for (const section of vm.children) {
+    for (const section of vm.getChildren()) {
         for (const paragraph of section.children) {
             const { children } = paragraph;
             const tableNode = children[0];
@@ -573,7 +573,7 @@ export function getDeleteTableActionParams(rangeInfo: IRangeInfo, viewModel: Doc
     let len = 0;
     let cursor = -1;
 
-    for (const section of vm.children) {
+    for (const section of vm.getChildren()) {
         for (const paragraph of section.children) {
             const { children } = paragraph;
             const table = children[0];
@@ -624,7 +624,7 @@ export function getDeleteRowContentActionParams(rangeInfo: IRangeInfo, viewModel
     let startColumnIndex = -1;
     let endColumnIndex = -1;
 
-    for (const section of vm.children) {
+    for (const section of vm.getChildren()) {
         for (const paragraph of section.children) {
             const { children } = paragraph;
             const tableNode = children[0];
@@ -706,7 +706,7 @@ export function getCellOffsets(viewModel: DocumentViewModel, range: ITextRangeWi
 
     let targetTable = null;
 
-    for (const section of viewModel.children) {
+    for (const section of viewModel.getChildren()) {
         for (const paragraph of section.children) {
             const table = paragraph.children[0];
             if (table) {

diff --git a/packages/docs-ui/src/services/selection/selection-utils.ts b/packages/docs-ui/src/services/selection/selection-utils.ts
@@ -194,7 +194,7 @@ export function getRangeListFromSelection(
     let end = endOffset;
 
     // TODO: @JOCS handle in header and footer.
-    for (const section of viewModel.children) {
+    for (const section of viewModel.getChildren()) {
         for (const paragraph of section.children) {
             const { startIndex, endIndex, children } = paragraph;
             const table = children[0];

diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/line-adjustment.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/line-adjustment.ts
@@ -276,7 +276,7 @@ export function lineAdjustment(
     sectionBreakConfig: ISectionBreakConfig
 ) {
     const { endIndex } = paragraphNode;
-    const paragraph = viewModel.getParagraph(endIndex, true) || { startIndex: 0 };
+    const paragraph = viewModel.getParagraph(endIndex) || { startIndex: 0 };
 
     lineIterator(pages, (line) => {
         // Only need to adjust the current paragraph.

diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/linebreaking.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/linebreaking.ts
@@ -146,7 +146,7 @@ export function lineBreaking(
     const { endIndex, blocks = [], children } = paragraphNode;
     const { segmentId } = curPage;
 
-    const paragraph = viewModel.getParagraph(endIndex, true) || { startIndex: 0 };
+    const paragraph = viewModel.getParagraph(endIndex) || { startIndex: 0 };
 
     const { paragraphStyle = {}, bullet } = paragraph;
 

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.ts
@@ -123,7 +123,7 @@ export function shaping(
     const shapedTextList: IShapedText[] = [];
     let breaker = new LineBreaker(content);
     const { endIndex } = paragraphNode;
-    const paragraph = viewModel.getParagraph(endIndex, true) || { startIndex: 0 };
+    const paragraph = viewModel.getParagraph(endIndex) || { startIndex: 0 };
     const { paragraphStyle = {} } = paragraph;
     const { snapToGrid = BooleanNumber.TRUE } = paragraphStyle;
     let last = 0;

diff --git a/packages/engine-render/src/components/docs/layout/block/table.ts b/packages/engine-render/src/components/docs/layout/block/table.ts
@@ -30,7 +30,7 @@ export function createTableSkeleton(
     sectionBreakConfig: ISectionBreakConfig
 ): IDocumentSkeletonTable {
     const { startIndex, endIndex, children: rowNodes } = tableNode;
-    const table = viewModel.getTable(startIndex);
+    const table = viewModel.getTableByStartIndex(startIndex)?.tableSource;
     if (table == null) {
         throw new Error('Table not found');
     }
@@ -166,7 +166,7 @@ export function createTableSkeletons(
     const pageContentHeight = pageHeight - marginTop - marginBottom;
 
     const { startIndex, endIndex, children: rowNodes } = tableNode;
-    const table = viewModel.getTable(startIndex);
+    const table = viewModel.getTableByStartIndex(startIndex)?.tableSource;
     if (table == null) {
         throw new Error('Table not found when creating table skeletons');
     }

diff --git a/packages/engine-render/src/components/docs/layout/doc-skeleton.ts b/packages/engine-render/src/components/docs/layout/doc-skeleton.ts
@@ -1001,7 +1001,7 @@ export class DocumentSkeleton extends Skeleton {
     private _prepareLayoutContext(): ILayoutContext {
         const viewModel = this.getViewModel();
         const dataModel = viewModel.getDataModel();
-        const { headerTreeMap, footerTreeMap } = viewModel;
+        const { headerTreeMap, footerTreeMap } = viewModel.getHeaderFooterTreeMap();
         const { documentStyle, drawings, lists: customLists = {} } = dataModel;
         const lists = {
             ...PRESET_LIST_TYPE,
@@ -1089,8 +1089,6 @@ export class DocumentSkeleton extends Skeleton {
 
         const allSkeletonPages = skeleton.pages;
 
-        viewModel.resetCache();
-
         let startSectionIndex = 0;
 
         const layoutAnchor = ctx.layoutStartPointer[''];
@@ -1099,8 +1097,8 @@ export class DocumentSkeleton extends Skeleton {
         ctx.layoutStartPointer[''] = null;
 
         if (layoutAnchor != null) {
-            for (let sectionIndex = 0; sectionIndex < viewModel.children.length; sectionIndex++) {
-                const sectionNode = viewModel.children[sectionIndex];
+            for (let sectionIndex = 0; sectionIndex < viewModel.getChildren().length; sectionIndex++) {
+                const sectionNode = viewModel.getChildren()[sectionIndex];
                 const { endIndex, startIndex } = sectionNode;
                 if (layoutAnchor >= startIndex && layoutAnchor <= endIndex) {
                     startSectionIndex = sectionIndex;
@@ -1110,8 +1108,8 @@ export class DocumentSkeleton extends Skeleton {
         }
 
         // Loop the sections with the start section index.
-        for (let i = startSectionIndex, len = viewModel.children.length; i < len; i++) {
-            const sectionNode = viewModel.children[i];
+        for (let i = startSectionIndex, len = viewModel.getChildren().length; i < len; i++) {
+            const sectionNode = viewModel.getChildren()[i];
             const sectionBreakConfig = prepareSectionBreakConfig(ctx, i);
             const { sectionType, columnProperties, columnSeparatorType, sectionTypeNext, pageNumberStart = 1 } = sectionBreakConfig;
 

diff --git a/packages/engine-render/src/components/docs/layout/model/page.ts b/packages/engine-render/src/components/docs/layout/model/page.ts
@@ -239,7 +239,7 @@ function _createSkeletonHeaderFooter(
     const page = dealWithSection(
         ctx,
         headerOrFooterViewModel,
-        headerOrFooterViewModel.children[0],
+        headerOrFooterViewModel.getChildren()[0],
         areaPage,
         headerFooterConfig,
         layoutAnchor
@@ -248,7 +248,6 @@ function _createSkeletonHeaderFooter(
     if (ctx.isDirty && count < 10) {
         count++;
         resetContext(ctx);
-        headerOrFooterViewModel.resetCache();
 
         return _createSkeletonHeaderFooter(
             ctx,

diff --git a/packages/engine-render/src/components/docs/layout/tools.ts b/packages/engine-render/src/components/docs/layout/tools.ts
@@ -1004,7 +1004,7 @@ const DEFAULT_MODERN_SECTION_BREAK: Partial<ISectionBreak> = {
 
 export function prepareSectionBreakConfig(ctx: ILayoutContext, nodeIndex: number) {
     const { viewModel, dataModel, docsConfig } = ctx;
-    const sectionNode = viewModel.children[nodeIndex];
+    const sectionNode = viewModel.getChildren()[nodeIndex];
     let { documentStyle } = dataModel;
     const { documentFlavor } = documentStyle;
     let sectionBreak = viewModel.getSectionBreak(sectionNode.endIndex) || DEFAULT_SECTION_BREAK;
@@ -1081,7 +1081,7 @@ export function prepareSectionBreakConfig(ctx: ILayoutContext, nodeIndex: number
         renderConfig = global_renderConfig,
     } = sectionBreak;
 
-    const sectionNodeNext = viewModel.children[nodeIndex + 1];
+    const sectionNodeNext = viewModel.getChildren()[nodeIndex + 1];
     const sectionTypeNext = viewModel.getSectionBreak(sectionNodeNext?.endIndex)?.sectionType;
 
     const headerIds = { defaultHeaderId, evenPageHeaderId, firstPageHeaderId };