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: dispose and createUnit cause viewport height collapse (#3598)
lumix36b676f44f40
diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.tsindex ec01acb75f..2aa5e9aa16 100644--- a/packages/engine-render/src/engine.ts+++ b/packages/engine-render/src/engine.ts@@ -807,7 +807,6 @@ export class Engine extends ThinEngine<Scene> {this._pointer[PointerInput.Vertical] = evt.clientY;this._pointer[PointerInput.DeltaHorizontal] = evt.movementX;this._pointer[PointerInput.DeltaVertical] = evt.movementY;- // console.log('pointerMoveEvent_1', previousHorizontal, evt.clientX, previousVertical, evt.clientY, this._pointer);const deviceEvent = evt as IPointerEvent;deviceEvent.deviceType = deviceType;diff --git a/packages/engine-render/src/viewport.ts b/packages/engine-render/src/viewport.tsindex 505eb66f5d..312ebf547b 100644--- a/packages/engine-render/src/viewport.ts+++ b/packages/engine-render/src/viewport.ts@@ -852,7 +852,7 @@ export class Viewport {let width = this._width;let height = this._height;- const size = this._getViewPortSize();+ const size = this._calcViewPortSize();// if (m[0] > 1) {width = size.width;@@ -1064,7 +1064,7 @@ export class Viewport {if (this.isActive === false) {return;}- const { width, height } = this._getViewPortSize();+ const { width, height } = this._calcViewPortSize();// const pixelRatio = this.getPixelRatio();// coord = Transform.create([pixelRatio, 0, 0, pixelRatio, 0, 0]).applyPoint(// coord@@ -1120,7 +1120,7 @@ export class Viewport {scrollX = scrollX ?? this.scrollX;scrollY = scrollY ?? this.scrollY;- const { height, width } = this._getViewPortSize();+ const { height, width } = this._calcViewPortSize();if (this._sceneWCurrVpAfterScale <= width) {scrollX = 0;}@@ -1159,7 +1159,7 @@ export class Viewport {* @returns*/_limitViewportScroll(viewportScrollX: number, viewportScrollY: number) {- const { width, height } = this._getViewPortSize();+ const { width, height } = this._calcViewPortSize();// Not enough! freeze row & col should also take into consideration.const freezeHeight = this._paddingEndY - this._paddingStartY;const freezeWidth = this._paddingEndX - this._paddingStartX;@@ -1206,7 +1206,7 @@ export class Viewport {* resize canvas & use viewportScrollXY to scrollTo*/private _resizeCacheCanvas() {- const { width, height } = this._getViewPortSize();+ const { width, height } = this._calcViewPortSize();this.width = width;this.height = height;const scaleX = this.scene.scaleX;@@ -1228,7 +1228,7 @@ export class Viewport {// viewport width is negative when canvas container has not been set to engine.if (!this.width || this.width < 0) return;if (!this.height || this.height < 0) return;- const { width, height } = this._getViewPortSize();+ const { width, height } = this._calcViewPortSize();const sceneWidthCurrVpAfterScale = (this._scene.width - this._paddingEndX) * this._scene.scaleX;const sceneHeightCurrVpAfterScale = (this._scene.height - this._paddingEndY) * this._scene.scaleY;this._sceneWCurrVpAfterScale = sceneWidthCurrVpAfterScale;@@ -1248,11 +1248,9 @@ export class Viewport {this.markForceDirty(true);}- private _getViewPortSize() {+ private _calcViewPortSize() {const parent = this._scene.getParent();-const { width: parentWidth, height: parentHeight } = parent;-const { scaleX = 1, scaleY = 1 } = this._scene;let width;@@ -1264,7 +1262,7 @@ export class Viewport {this._left = left;this._top = top;- if (this._explicitViewportWidthSet) {+ if (Tools.isDefine(this._widthOrigin) || this._explicitViewportWidthSet) {// viewMainLeft viewMainLeftTop ---> width is specific by freezelinewidth = (this._widthOrigin || 0) * scaleX;} else {@@ -1272,7 +1270,7 @@ export class Viewport {width = parentWidth - (this._left + this._right);}- if (this._explicitViewportHeightSet) {+ if (Tools.isDefine(this._heightOrigin) || this._explicitViewportHeightSet) {//viewMainLeftTop viewMainTop ---> height is specific by freezelineheight = (this._heightOrigin || 0) * scaleY;} else {@@ -1590,17 +1588,17 @@ export class Viewport {this.right = props.right;}- if (Tools.isDefine(props?.width) && this._explicitViewportWidthSet) {+ if (Tools.isDefine(props?.width)) {this.width = props?.width;- this._widthOrigin = this.width;+ this._widthOrigin = props?.width;} else {this.width = null;this._widthOrigin = null;}- if (Tools.isDefine(props?.height) && this._explicitViewportHeightSet) {+ if (Tools.isDefine(props?.height)) {this.height = props?.height;- this._heightOrigin = this.height;+ this._heightOrigin = props?.height;} else {this.height = null;this._heightOrigin = null;diff --git a/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.tsindex 922465b977..d52a814421 100644--- a/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts@@ -248,8 +248,6 @@ export class SheetRenderController extends RxDisposable implements IRenderModulebottom: 0,right: 0,isWheelPreventDefaultX: true,- explicitViewportWidthSet: false,- explicitViewportHeightSet: false,allowCache: true,bufferEdgeX,bufferEdgeY,@@ -257,8 +255,6 @@ export class SheetRenderController extends RxDisposable implements IRenderModuleconst viewMainLeftTop = new Viewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP, scene, {isWheelPreventDefaultX: true,active: false,- explicitViewportWidthSet: true,- explicitViewportHeightSet: true,allowCache: true,bufferEdgeX: 0,bufferEdgeY: 0,@@ -267,8 +263,6 @@ export class SheetRenderController extends RxDisposable implements IRenderModuleconst viewMainLeft = new Viewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT, scene, {isWheelPreventDefaultX: true,active: false,- explicitViewportWidthSet: true,- explicitViewportHeightSet: false,allowCache: true,bufferEdgeX: 0,bufferEdgeY,@@ -277,8 +271,6 @@ export class SheetRenderController extends RxDisposable implements IRenderModuleconst viewMainTop = new Viewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP, scene, {isWheelPreventDefaultX: true,active: false,- explicitViewportWidthSet: false,- explicitViewportHeightSet: true,allowCache: true,bufferEdgeX,bufferEdgeY: 0,@@ -287,8 +279,6 @@ export class SheetRenderController extends RxDisposable implements IRenderModuleconst viewRowTop = new Viewport(SHEET_VIEWPORT_KEY.VIEW_ROW_TOP, scene, {active: false,isWheelPreventDefaultX: true,- explicitViewportWidthSet: true,- explicitViewportHeightSet: true,});const viewRowBottom = new Viewport(SHEET_VIEWPORT_KEY.VIEW_ROW_BOTTOM, scene, {@@ -297,15 +287,11 @@ export class SheetRenderController extends RxDisposable implements IRenderModulebottom: 0,width: rowHeader.width,isWheelPreventDefaultX: true,- explicitViewportWidthSet: true,- explicitViewportHeightSet: false,});const viewColumnLeft = new Viewport(SHEET_VIEWPORT_KEY.VIEW_COLUMN_LEFT, scene, {active: false,isWheelPreventDefaultX: true,- explicitViewportWidthSet: true,- explicitViewportHeightSet: true,});const viewColumnRight = new Viewport(SHEET_VIEWPORT_KEY.VIEW_COLUMN_RIGHT, scene, {@@ -314,8 +300,6 @@ export class SheetRenderController extends RxDisposable implements IRenderModuleheight: columnHeader.height,right: 0,isWheelPreventDefaultX: true,- explicitViewportWidthSet: false,- explicitViewportHeightSet: true,});const viewLeftTop = new Viewport(SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP, scene, {@@ -324,8 +308,6 @@ export class SheetRenderController extends RxDisposable implements IRenderModulewidth: rowHeader.width,height: columnHeader.height,isWheelPreventDefaultX: true,- explicitViewportWidthSet: true,- explicitViewportHeightSet: true,});return {