fix: viewport make dirty false

chore: eslint fix

packages/engine-render/src/basics/tools.ts

@@ -825,7 +825,6 @@ export function mergeRangeIfIntersects(mainRanges: IRange[], ranges: IRange[]) {
  return mainRanges;
 }
 
-
 export function clampRanges(range: IRange) {
  return {
  startRow: Math.max(0, range.startRow),

packages/engine-render/src/components/sheets/extensions/font.ts

@@ -128,7 +128,6 @@ export class Font extends SheetExtension {
  return true;
  }
 
-
  if (isMergedMainCell) {
  startY = mergeInfo.startY;
  endY = mergeInfo.endY;

packages/engine-render/src/components/sheets/extensions/marker.ts

@@ -42,7 +42,6 @@ export class Marker extends SheetExtension {
 
  const mergeCellRendered = new Set<string>();
 
-
  Range.foreach(rowColumnSegment, (row, col) => {
  let cellData = worksheet.getCell(row, col);
  const cellInfo = this.getCellIndex(

packages/engine-render/src/components/sheets/spreadsheet.ts

@@ -17,7 +17,6 @@
 import type { IRange, ISelectionCellWithCoord, Nullable, ObjectMatrix } from '@univerjs/core';
 import { BooleanNumber, sortRules } from '@univerjs/core';
 
-
 import { FIX_ONE_PIXEL_BLUR_OFFSET, RENDER_CLASS_TYPE } from '../../basics/const';
 
 // import { clearLineByBorderType } from '../../basics/draw';
@@ -204,7 +203,6 @@ export class Spreadsheet extends SheetComponent {
  };
  }
 
-
  isForceDirty(): boolean {
  return this._forceDirty;
  }
@@ -316,7 +314,6 @@ export class Spreadsheet extends SheetComponent {
  const h = diffBottom - diffTop + onePixelFix;
  cacheCtx.rectByPrecision(x, y, w, h);
 
-
  // 使用 clearRect 后, 很浅很细的白色线(even not zoom has blank line)
  const onePixelFix2 = FIX_ONE_PIXEL_BLUR_OFFSET;
  cacheCtx.clearRect(x + onePixelFix2, y + onePixelFix2, w - onePixelFix2 * 2, h - onePixelFix2 * 2);
@@ -338,7 +335,6 @@ export class Spreadsheet extends SheetComponent {
  this._refreshIncrementalState = false;
  }
 
-
  /**
  * 整个 viewport 重绘
  */
@@ -393,11 +389,9 @@ export class Spreadsheet extends SheetComponent {
  }
  mainCtx.save();
 
-
  const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;
  mainCtx.translateWithPrecision(rowHeaderWidth, columnHeaderHeight);
 
-
  const { viewPortKey } = viewportInfo;
  // scene --> layer, getObjects --> viewport.render(object) --> spreadsheet
  // zIndex 0 spreadsheet this.getObjectsByOrder() ---> [spreadsheet]

packages/engine-render/src/layer.ts

@@ -251,10 +251,15 @@ export class Layer extends Disposable {
  }
 
  private _draw(mainCtx: UniverRenderingContext, isMaxLayer: boolean) {
- const viewports = this._scene.getViewports();
- for (const [index, vp] of viewports.entries()) {
- vp.render(mainCtx, this.getObjectsByOrder(), isMaxLayer, index === viewports.length - 1);
+ const viewports = this._scene.getViewports().filter((vp) => vp.shouldIntoRender());
+ const objects = this.getObjectsByOrder();
+ for (const [_index, vp] of viewports.entries()) {
+ vp.render(mainCtx, objects, isMaxLayer);
  }
+ objects.forEach((o) => {
+ o.makeDirty(false);
+ (o as unknown as { makeForceDirty?: (state: boolean) => void }).makeForceDirty?.(false);
+ });
  }
 
  private _applyCache(ctx?: UniverRenderingContext) {

packages/engine-render/src/shape/shape.ts

@@ -304,7 +304,6 @@ export abstract class Shape<T> extends BaseObject {
  ctx.strokeStyle = stroke!;
  }
 
-
  override render(mainCtx: UniverRenderingContext, bounds?: IViewportInfo) {
  if (!this.visible) {
  this.makeDirty(false);

packages/engine-render/src/viewport.ts

@@ -27,7 +27,6 @@ import type { IBoundRectNoAngle, IViewportInfo } from './basics/vector2';
 import { Vector2 } from './basics/vector2';
 import { subtractViewportRange } from './basics/viewport-subtract';
 import { Canvas as UniverCanvas } from './canvas';
-import { Spreadsheet } from './components/sheets/spreadsheet';
 import type { UniverRenderingContext } from './context';
 import type { Scene } from './scene';
 import type { BaseScrollBar } from './shape/base-scroll-bar';
@@ -168,7 +167,6 @@ export class Viewport {
 
  private _preViewportInfo: Nullable<IViewportInfo>;
 
-
  /**
  * viewbound of cache area, cache area is slightly bigger than viewbound.
  */
@@ -202,7 +200,6 @@ export class Viewport {
  bufferEdgeX: number = 0;
  bufferEdgeY: number = 0;
 
-
  constructor(viewportKey: string, scene: ThinScene, props?: IViewProps) {
  this._viewportKey = viewportKey;
 
@@ -649,22 +646,29 @@ export class Viewport {
  return composeResult;
  }
 
- /**
- * engine.renderLoop ---> scene.render ---> layer.render ---> viewport.render
- * that means each layer call all viewports to render !!!
- * @param parentCtx 如果 layer._allowCache true, 那么 parentCtx 是 layer 中的 cacheCtx
- * @param objects
- * @param isMaxLayer
- * @param isLast
- */
- render(parentCtx?: UniverRenderingContext, objects: BaseObject[] = [], isMaxLayer = false, isLast = false) {
+ shouldIntoRender() {
  if (
  this.isActive === false ||
  this.width == null ||
  this.height == null ||
  this.width <= 1 ||
  this.height <= 1
  ) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * engine.renderLoop ---> scene.render ---> layer.render ---> viewport.render
+ * that means each layer call all viewports to render
+ * @param parentCtx 如果 layer._allowCache true, 那么 parentCtx 是 layer 中的 cacheCtx
+ * @param objects
+ * @param isMaxLayer
+ * @param isLast last viewport would
+ */
+ render(parentCtx?: UniverRenderingContext, objects: BaseObject[] = [], isMaxLayer = false) {
+ if (!this.shouldIntoRender()) {
  return;
  }
  const mainCtx = parentCtx || (this._scene.getEngine()?.getCanvas().getContext() as UniverRenderingContext);
@@ -694,12 +698,6 @@ export class Viewport {
  o.render(mainCtx, viewPortInfo);
  });
 
- if (isLast) {
- objects.forEach((o) => {
- o.makeDirty(false);
- if (o instanceof Spreadsheet) o.makeForceDirty?.(false);
- });
- }
  this.markDirty(false);
  this.markForceDirty(false);
 
@@ -721,7 +719,6 @@ export class Viewport {
  this._scrollRendered();
  }
 
-
  private _makeDefaultViewport() {
  return {
  viewBound: {
@@ -806,7 +803,6 @@ export class Viewport {
  const topLeft = this.getRelativeVector(Vector2.FromArray([xFrom, yFrom]));
  const bottomRight = this.getRelativeVector(Vector2.FromArray([xTo, yTo]));
 
-
  const viewBound = {
  left: topLeft.x,
  right: bottomRight.x,
@@ -880,7 +876,6 @@ export class Viewport {
  return svCoord;
  }
 
-
  // eslint-disable-next-line complexity, max-lines-per-function
  onMouseWheel(evt: IWheelEvent, state: EventState) {
  if (!this._scrollBar || this.isActive === false) {
@@ -1246,7 +1241,6 @@ export class Viewport {
  isTrigger,
  });
 
-
  if (this._scrollBar) {
  this._scrollBar.makeDirty(true);
  }
@@ -1311,7 +1305,6 @@ export class Viewport {
 
  const shouldCacheUpdate = nearEdge | viewBoundOutCacheArea;
 
-
  // 这样判断不足, 例如当 viewBound 在 cache top 的边缘但是往下滑动
  // 只要是在 cacheBounds 核心区域内就利用 cache
  // if (viewBound.left - edge > cacheBounds.left &&

packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts

@@ -731,7 +731,6 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderC
  return;
  }
 
-
  const {
  viewMain,
  viewMainLeftTop,

packages/sheets-ui/src/controllers/sheet-render.controller.ts

@@ -158,7 +158,6 @@ export class SheetRenderController extends RxDisposable {
  return;
  }
 
-
  if (command.id !== SetWorksheetActiveOperation.id) {
  this._sheetSkeletonManagerService.makeDirty(
  {