Skip to content

Zoom out: Correctly scale canvas in non-iframe editor #71351

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

Closed
t-hamano wants to merge 2 commits into from
Closed

Zoom out: Correctly scale canvas in non-iframe editor #71351

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e563f8
Zoom out: Correctly scale canvas in non-iframe editor
t-hamano Aug 26, 2025
0dbaf38
Update trigger logic
t-hamano Aug 27, 2025
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
Next Next commit
Zoom out: Correctly scale canvas in non-iframe editor
  • Loading branch information
@t-hamano
t-hamano committed Aug 26, 2025
commit 9e563f81ba0d701b600ac34274367ab122077be7
3 changes: 1 addition & 2 deletions packages/block-editor/src/components/iframe/use-scale-canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,11 @@ export function useScaleCanvas( {
const trigger =
iframeDocument && previousIsZoomedOut.current !== isZoomedOut;

previousIsZoomedOut.current = isZoomedOut;

if ( ! trigger ) {
return;
}

previousIsZoomedOut.current = isZoomedOut;
Copy link
Contributor

@jeryj jeryj Aug 26, 2025

Choose a reason for hiding this comment

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

This is testing well for me. I think I'd prefer to keep the previous previousIsZoomedOut.current !== isZoomedOut alongside the setting of the ref though. I think it will be easier to understand why we don't want the animation to run when the iframeDocument is false. What do you think of this instead?

// If we don't have an iframe document, we don't run or track the animation.
if ( ! iframeDocument ) {
	return;
}

const triggerAnimation = isZoomedOut !== previousIsZoomedOut.current;
previousIsZoomedOut.current = isZoomedOut;

// Zoom state has not changed, so we don't need to run the animation.
if ( ! triggerAnimation ) {
	return;
}

Copy link
Contributor Author

@t-hamano t-hamano Aug 27, 2025

Choose a reason for hiding this comment

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

Updated in 0dbaf38

The suggested logic seems to work correctly!

startAnimationRef.current = true;

if ( ! isZoomedOut ) {
Expand Down
Loading