fix(slide): image loaded (#1653)

* fix(slide): image loaded for thumb * fix(doc): scroll disappear * fix(slide): null checking
dream-num · Mar 21, 2024 · 9cecaaa · 9cecaaa
1 parent 599ed71
commit 9cecaaa
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.ts
@@ -749,7 +749,7 @@ export abstract class BaseObject {
     getEngine(): any {
         let parent: any = this.getParent();
         while (parent != null) {
-            if (parent === RENDER_CLASS_TYPE.ENGINE) {
+            if (parent.classType === RENDER_CLASS_TYPE.ENGINE) {
                 return parent;
             }
             parent = parent.getParent();

diff --git a/packages/engine-render/src/components/docs/document.ts b/packages/engine-render/src/components/docs/document.ts
@@ -555,11 +555,11 @@ export class Documents extends DocComponent {
             return false;
         }
 
-        const { pageWidth, pageHeight } = page;
+        const { pageWidth, pageHeight, marginBottom, marginTop, marginLeft, marginRight } = page;
 
-        const pageRight = pageLeft + pageWidth;
+        const pageRight = pageLeft + pageWidth + marginLeft + marginRight;
 
-        const pageBottom = pageTop + pageHeight;
+        const pageBottom = pageTop + pageHeight + marginBottom + marginTop;
 
         const { left, top, right, bottom } = bounds.viewBound;
 

diff --git a/packages/engine-render/src/shape/picture.ts b/packages/engine-render/src/shape/picture.ts
@@ -53,6 +53,7 @@ export class Picture extends Shape<IPictureProps> {
                 config.success?.();
                 this._init();
                 this.makeDirty(true);
+                this.getEngine()?.activeScene?.onFileLoadedObservable.notifyObservers(id);
             };
             this._native.onerror = () => {
                 if (config.fail) {

diff --git a/packages/engine-render/src/thin-scene.ts b/packages/engine-render/src/thin-scene.ts
@@ -29,6 +29,8 @@ import type { UniverRenderingContext } from './context';
 export abstract class ThinScene extends Disposable {
     onTransformChangeObservable = new Observable<ITransformChangeState>();
 
+    onFileLoadedObservable = new Observable<string>();
+
     onPointerDownObserver = new Observable<IPointerEvent | IMouseEvent>();
 
     onPointerMoveObserver = new Observable<IPointerEvent | IMouseEvent>();

diff --git a/packages/slides/src/views/render/canvas-view.ts b/packages/slides/src/views/render/canvas-view.ts
@@ -15,7 +15,7 @@
  */
 
 import type { EventState, IColorStyle, ISlidePage, Nullable, SlideDataModel } from '@univerjs/core';
-import { getColorStyle, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable } from '@univerjs/core';
+import { debounce, getColorStyle, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable } from '@univerjs/core';
 import type { IWheelEvent } from '@univerjs/engine-render';
 import {
     EVENT_TYPE,
@@ -217,6 +217,10 @@ export class CanvasView extends RxDisposable {
             }
         });
 
+        scene.onFileLoadedObservable.add(() => {
+            this._refreshThumb();
+        });
+
         ScrollBar.attachTo(viewMain);
 
         this._renderManagerService.setCurrent(unitId);
@@ -250,6 +254,10 @@ export class CanvasView extends RxDisposable {
         });
     }
 
+    private _refreshThumb = debounce(() => {
+        this.createThumbs();
+    }, 300);
+
     private _createSlide(mainScene: Scene) {
         const model = this._currentUniverService.getCurrentUniverSlideInstance();