Skip to content

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.

fix: fix slide rendering (#2127)

Wenzhao Hu300d5d6959b4
diff --git a/packages/engine-render/src/components/docs/layout/tools.ts b/packages/engine-render/src/components/docs/layout/tools.ts
index 2123916b61..71b163aadb 100644
--- a/packages/engine-render/src/components/docs/layout/tools.ts
+++ b/packages/engine-render/src/components/docs/layout/tools.ts
@@ -353,6 +353,10 @@ export function updateBlockIndex(pages: IDocumentSkeletonPage[], start: number =
// Use to fix issue: https://github.com/dream-num/univer/issues/2002
// Because the Chinese punctuation marks at the beginning and end of the line are squeezed and narrowed,
// the extruded width needs to be added when calculating the overall width.
+ if (glyphGroup.length === 0) {
+ continue;
+ }
+
if (glyphGroup[0].xOffset !== 0 && i === divideLength - 1) {
actualWidth -= glyphGroup[0].xOffset;
}
@@ -366,10 +370,6 @@ export function updateBlockIndex(pages: IDocumentSkeletonPage[], start: number =
actualWidth += divide.left;
}
- if (glyphGroup.length === 0) {
- continue;
- }
-
divide.st = divStartIndex + 1;
divide.ed = divEndIndex >= divide.st ? divEndIndex : divide.st;
diff --git a/packages/engine-render/src/render-manager/render-manager.service.ts b/packages/engine-render/src/render-manager/render-manager.service.ts
index 31ecd78144..ebc4b81781 100644
--- a/packages/engine-render/src/render-manager/render-manager.service.ts
+++ b/packages/engine-render/src/render-manager/render-manager.service.ts
@@ -172,15 +172,30 @@ export class RenderManagerService extends Disposable implements IRenderManagerSe
});
const unit = this._univerInstanceService.getUnit(unitId)!;
- const type = this._univerInstanceService.getUnitType(unitId);
- const ctors = this._getRenderControllersForType(type);
- const renderUnit = new RenderUnit(this._injector, {
- unit,
- engine,
- scene,
- isMainScene,
- });
- renderUnit.addRenderControllers(ctors);
+ let renderUnit: IRender;
+
+ if (unit) {
+ const type = this._univerInstanceService.getUnitType(unitId);
+ const ctors = this._getRenderControllersForType(type);
+ renderUnit = new RenderUnit(this._injector, {
+ unit,
+ engine,
+ scene,
+ isMainScene,
+ });
+
+ (renderUnit as RenderUnit).addRenderControllers(ctors);
+ } else {
+ // For slide pages
+ renderUnit = {
+ unitId,
+ engine,
+ scene,
+ mainComponent: null,
+ components: new Map(),
+ isMainScene,
+ };
+ }
this.addRenderItem(unitId, renderUnit);
return renderUnit;
@@ -194,7 +209,7 @@ export class RenderManagerService extends Disposable implements IRenderManagerSe
const item = this._renderMap.get(unitId);
if (item != null) {
this._disposeItem(item);
- (item as RenderUnit).dispose();
+ (item as RenderUnit).dispose?.();
}
this._renderMap.delete(unitId);
diff --git a/packages/slides-ui/src/views/slide-bar/SlideBar.tsx b/packages/slides-ui/src/views/slide-bar/SlideBar.tsx
index 9de5d3b863..4d23c49249 100644
--- a/packages/slides-ui/src/views/slide-bar/SlideBar.tsx
+++ b/packages/slides-ui/src/views/slide-bar/SlideBar.tsx
@@ -35,7 +35,12 @@ export function SlideSideBar() {
const renderManagerService = useDependency(IRenderManagerService);
const slideBarRef = useRef<HTMLDivElement>(null);
- const currentSlide = useObservable(univerInstanceService.getCurrentTypeOfUnit$<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE));
+ const currentSlide = useObservable(
+ () => univerInstanceService.getCurrentTypeOfUnit$<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE),
+ undefined,
+ undefined,
+ []
+ );
const pages = currentSlide?.getPages();
const pageOrder = currentSlide?.getPageOrder();