From bc3c3345a8a7bc16b118a5d55c50ec2389ea95d5 Mon Sep 17 00:00:00 2001 From: zhangw Date: Sat, 1 Mar 2025 10:49:10 +0800 Subject: [PATCH] fix(docs-ui): error display doc-toolbar on sheet (#4751) --- e2e/memory/memory.spec.ts | 2 +- packages/docs-ui/src/controllers/doc-ui.controller.ts | 4 +--- packages/docs-ui/src/views/doc-footer/DocFooter.tsx | 8 ++++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/e2e/memory/memory.spec.ts b/e2e/memory/memory.spec.ts index 6b6574c0e4..0cd6ca8be8 100644 --- a/e2e/memory/memory.spec.ts +++ b/e2e/memory/memory.spec.ts @@ -28,7 +28,7 @@ const MAX_UNIT_MEMORY_OVERFLOW = 1_000_000; // 1MB const MAX_UNIVER_MEMORY_OVERFLOW = 6_000_000; // TODO@wzhudev: temporarily added 300KB // there is a memory leak in the univer object, so we need to make sure that -const MAX_SECOND_INSTANCE_OVERFLOW = 100_000; // Only 100 KB +const MAX_SECOND_INSTANCE_OVERFLOW = 110_000; // Only 100 KB interface HeapSnapshotChunk { chunk: string; diff --git a/packages/docs-ui/src/controllers/doc-ui.controller.ts b/packages/docs-ui/src/controllers/doc-ui.controller.ts index d5d96e4f59..a491fd6b93 100644 --- a/packages/docs-ui/src/controllers/doc-ui.controller.ts +++ b/packages/docs-ui/src/controllers/doc-ui.controller.ts @@ -88,11 +88,9 @@ export class DocUIController extends Disposable { this.disposeWithMe(componentManager.register('TodoList', TodoList)); } - // TODO: @zhangwei, why add workbook to docs-ui? private _initUiParts() { - const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET); const config = this._configService.getConfig(DOCS_UI_PLUGIN_CONFIG_KEY); - if (config?.layout?.docContainerConfig?.footer && !workbook) { + if (config?.layout?.docContainerConfig?.footer) { this.disposeWithMe(this._uiPartsService.registerComponent(BuiltInUIPart.FOOTER, () => connectInjector(DocFooter, this._injector))); } } diff --git a/packages/docs-ui/src/views/doc-footer/DocFooter.tsx b/packages/docs-ui/src/views/doc-footer/DocFooter.tsx index c63b7d475e..349899e6ac 100644 --- a/packages/docs-ui/src/views/doc-footer/DocFooter.tsx +++ b/packages/docs-ui/src/views/doc-footer/DocFooter.tsx @@ -14,12 +14,16 @@ * limitations under the License. */ -import React from 'react'; import { CountBar } from '../count-bar'; import styles from './index.module.less'; +import { useDependency, useObservable } from '@univerjs/ui'; +import { IUniverInstanceService, UniverInstanceType, type Workbook } from '@univerjs/core'; export const DocFooter = () => { - return ( + const univerInstanceService = useDependency(IUniverInstanceService); + const workbook = useObservable(() => univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET), undefined, undefined, []); + + return workbook ? null : (