Skip to content

fix(dirtyRect): text dirty rect considered when text in host #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linghaoSu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(dirtyRect): text dirty rect considered when text in host #891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
458d111
fix text dirty rect considered when text in host
linghaoSu Feb 21, 2022
5963bfa
treat host target as special parent
linghaoSu Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/canvas/Layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ export default class Layer extends Eventful {
* if it's currently on the canvas and needs repaint this frame
* or not painted this frame.
*/
const shouldPaint = el.shouldBePainted(viewWidth, viewHeight, true, true);
const shouldPaint = el.shouldBePainted(viewWidth, viewHeight, true, true, true);
const prevRect = el.__isRendered && ((el.__dirty & REDRAW_BIT) || !shouldPaint)
? el.getPrevPaintRect()
: null;
Expand Down Expand Up @@ -311,7 +311,7 @@ export default class Layer extends Eventful {
* rect if and only if it's not painted this frame and was
* previously painted on the canvas.
*/
const shouldPaint = el.shouldBePainted(viewWidth, viewHeight, true, true);
const shouldPaint = el.shouldBePainted(viewWidth, viewHeight, true, true, true);
if (el && (!shouldPaint || !el.__zr) && el.__isRendered) {
// el was removed
const prevRect = el.getPrevPaintRect();
Expand Down
2 changes: 1 addition & 1 deletion src/canvas/graphic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ export function brush(
) {
const m = el.transform;

if (!el.shouldBePainted(scope.viewWidth, scope.viewHeight, false, false)) {
if (!el.shouldBePainted(scope.viewWidth, scope.viewHeight, false, false, false)) {
// Needs to mark el rendered.
// Or this element will always been rendered in progressive rendering.
// But other dirty bit should not be cleared, otherwise it cause the shape
Expand Down
20 changes: 19 additions & 1 deletion src/graphic/Displayable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ class Displayable<Props extends DisplayableProps = DisplayableProps> extends Ele
viewWidth: number,
viewHeight: number,
considerClipPath: boolean,
considerAncestors: boolean
considerAncestors: boolean,
considerHostTarget: boolean
) {
const m = this.transform;
if (
Expand Down Expand Up @@ -234,6 +235,23 @@ class Displayable<Props extends DisplayableProps = DisplayableProps> extends Ele
}
}

// consider host target
if (
Copy link
Contributor

@pissang pissang Feb 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can treat __hostTarget as a special parent and doing both check in the

zrender/src/graphic/Displayable.ts

Line 229 in 458d111

let parent = this.parent; 

if (considerAncestors) {
      let node = this;
      while (node) {
          if (node.ignore) {
              return false;
          }
          node = node.parent || node.__hostTarget;
      }
  }

Copy link
Author

@linghaoSu linghaoSu Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, I agree with this way, we don't need to modify the api of shouldBePainted, I have fixed this using these codes. Please review again.

considerAncestors
&& considerHostTarget
&& this.parent
&& this.parent.__hostTarget
) {
let hostTarget = this.parent.__hostTarget;
let parent = hostTarget;
while (parent) {
if (parent.ignore) {
return false;
}
parent = parent.parent;
}
}

return true;
}

Expand Down