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-ui): hover service error (#4804)
ZhangWei5d82419fa97b
diff --git a/packages/core/src/common/request-immediate-macro-task.ts b/packages/core/src/common/request-immediate-macro-task.tsindex a6ba01439f..9ec0b91ac8 100644--- a/packages/core/src/common/request-immediate-macro-task.ts+++ b/packages/core/src/common/request-immediate-macro-task.ts@@ -18,18 +18,19 @@ export function requestImmediateMacroTask(callback: (value?: unknown) => void):const channel = new MessageChannel();let cancelled = false;- const hanlder = () => {+ const handler = () => {if (!cancelled) {callback();}};// This would cause memory leak. But we cannot use addEventListener because it won't work in web worker.- channel.port1.onmessage = hanlder;+ channel.port1.onmessage = handler;channel.port2.postMessage(null);return () => {cancelled = true;+ channel.port1.onmessage = null;channel.port1.close();channel.port2.close();};diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.tsindex 1119a3a825..01efc66d90 100644--- a/packages/engine-render/src/engine.ts+++ b/packages/engine-render/src/engine.ts@@ -415,7 +415,7 @@ export class Engine extends Disposable {const scenes = { ...this.getScenes() };const sceneKeys = Object.keys(scenes);sceneKeys.forEach((key) => {- (scenes[key] as any).dispose();+ (scenes[key] as IDisposable).dispose();});this._scenes = {};@@ -438,11 +438,14 @@ export class Engine extends Disposable {this._renderFrameTasks = [];this._performanceMonitor.dispose();this.getCanvas().dispose();- this.onTransformChange$.complete();++ this._resizeObserver?.disconnect();this.onTransformChange$.complete();this._beginFrame$.complete();this._endFrame$.complete();+ this.renderFrameTags$.complete();+ this.renderFrameTimeMetric$.complete();this._clearResizeListener();this._container = null;diff --git a/packages/sheets-ui/src/services/hover-manager.service.ts b/packages/sheets-ui/src/services/hover-manager.service.tsindex 21f18e10b2..fe9dc30cce 100644--- a/packages/sheets-ui/src/services/hover-manager.service.ts+++ b/packages/sheets-ui/src/services/hover-manager.service.ts@@ -248,6 +248,7 @@ export class HoverManagerService extends Disposable {return { currentRender, workbook, worksheet, skeletonParam };}+ // eslint-disable-next-line complexityprivate _calcActiveCell(currentRender: IRender, workbook: Workbook, worksheet: Worksheet, skeletonParam: ISheetSkeletonManagerParam, offsetX: number, offsetY: number) {const hoverPosition = getHoverCellPosition(currentRender, workbook, worksheet, skeletonParam, offsetX, offsetY);const skeleton = skeletonParam.skeleton;@@ -274,7 +275,7 @@ export class HoverManagerService extends Disposable {const cell = skeleton.getCellWithCoordByIndex(overflowLocation.row, overflowLocation.col);const cellData = worksheet.getCell(overflowLocation.row, overflowLocation.col);const { topOffset = 0, leftOffset = 0 } = cellData?.fontRenderExtension ?? {};- if (font) {+ if (font?.documentSkeleton) {const { paddingLeft, paddingTop } = calcPadding(cell, font, (cellData?.v !== null && cellData?.v !== undefined) ? !Number.isNaN(+cellData.v) : false);const rects = calculateDocSkeletonRects(font.documentSkeleton, paddingLeft, paddingTop);diff --git a/packages/sheets-ui/src/services/utils/doc-skeleton-util.ts b/packages/sheets-ui/src/services/utils/doc-skeleton-util.tsindex 087ff2a5bb..0db06d4413 100644--- a/packages/sheets-ui/src/services/utils/doc-skeleton-util.ts+++ b/packages/sheets-ui/src/services/utils/doc-skeleton-util.ts@@ -156,8 +156,8 @@ export const calculateDocSkeletonRects = (docSkeleton: DocumentSkeleton, padding};export function calcPadding(cell: ICellWithCoord, font: IFontCacheItem, isNum: boolean) {- const height = font.documentSkeleton.getSkeletonData()?.pages[0].height ?? 0;- const width = font.documentSkeleton.getSkeletonData()?.pages[0].width ?? 0;+ const height = font.documentSkeleton?.getSkeletonData()?.pages[0].height ?? 0;+ const width = font.documentSkeleton?.getSkeletonData()?.pages[0].width ?? 0;const vt = font.verticalAlign;const ht = font.horizontalAlign;