Skip to content

Commit 1f1e2c4

Browse files
authored
Revert "fix: Improve zoom animations (#9584)" (#9647)
This reverts commit 3acdf5e.
1 parent 92dd086 commit 1f1e2c4

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

packages/blockly/core/css.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,7 @@ let content = `
8484
8585
.blocklyBlockCanvas.blocklyCanvasTransitioning,
8686
.blocklyBubbleCanvas.blocklyCanvasTransitioning {
87-
transition: transform .15s;
88-
}
89-
90-
@media (prefers-reduced-motion) {
91-
.blocklyBlockCanvas.blocklyCanvasTransitioning,
92-
.blocklyBubbleCanvas.blocklyCanvasTransitioning {
93-
transition: none;
94-
}
87+
transition: transform .5s;
9588
}
9689
9790
.blocklyEmboss {

packages/blockly/core/layer_manager.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ export class LayerManager {
7373
* @internal
7474
*/
7575
appendToAnimationLayer(elem: IRenderedElement) {
76-
const currentTransform = this.dragLayer?.style.transform;
76+
const currentTransform = this.dragLayer?.getAttribute('transform');
7777
// Only update the current transform when appending, so animations don't
7878
// move if the workspace moves.
79-
if (currentTransform && this.animationLayer) {
80-
this.animationLayer.style.transform = currentTransform;
79+
if (currentTransform) {
80+
this.animationLayer?.setAttribute('transform', currentTransform);
8181
}
8282
this.animationLayer?.appendChild(elem.getSvgRoot());
8383
}
@@ -88,12 +88,10 @@ export class LayerManager {
8888
* @internal
8989
*/
9090
translateLayers(newCoord: Coordinate, newScale: number) {
91-
const translation = `translate(${newCoord.x}px, ${newCoord.y}px) scale(${newScale})`;
92-
if (this.dragLayer) {
93-
this.dragLayer.style.transform = translation;
94-
}
91+
const translation = `translate(${newCoord.x}, ${newCoord.y}) scale(${newScale})`;
92+
this.dragLayer?.setAttribute('transform', translation);
9593
for (const [_, layer] of this.layers) {
96-
layer.style.transform = translation;
94+
layer.setAttribute('transform', translation);
9795
}
9896
}
9997

packages/blockly/core/zoom_controls.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,8 @@ export class ZoomControls implements IPositionable {
373373
* @param e A mouse down event.
374374
*/
375375
private zoom(amount: number, e: PointerEvent) {
376-
this.workspace.beginCanvasTransition();
377376
this.workspace.markFocused();
378377
this.workspace.zoomCenter(amount);
379-
setTimeout(this.workspace.endCanvasTransition.bind(this.workspace), 150);
380378
this.fireZoomEvent();
381379
Touch.clearTouchIdentifier(); // Don't block future drags.
382380
e.stopPropagation(); // Don't start a workspace scroll.
@@ -461,7 +459,7 @@ export class ZoomControls implements IPositionable {
461459
this.workspace.zoomCenter(amount);
462460
this.workspace.scrollCenter();
463461

464-
setTimeout(this.workspace.endCanvasTransition.bind(this.workspace), 150);
462+
setTimeout(this.workspace.endCanvasTransition.bind(this.workspace), 500);
465463
this.fireZoomEvent();
466464
Touch.clearTouchIdentifier(); // Don't block future drags.
467465
e.stopPropagation(); // Don't start a workspace scroll.

0 commit comments

Comments
 (0)