CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-05 08:00:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove AnyDuringMigration from block animations (#6301)

Browse Source 
* fix: disconnectGroup

* fix: cloneNode

* fix: final AnyDuringMigration cleanup

* chore: change cast to toString instead

* chore: format
This commit is contained in:
Beka Westberg
2022-08-03 17:25:03 +00:00
committed by GitHub
parent 83a3e74ec9
commit 4535e84d3e
1 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/block_animations.ts
View File

@@ -32,8 +32,8 @@ interface CloneRect {
let disconnectPid: AnyDuringMigration = 0;
/** SVG group of wobbling block. There can only be one at a time. */
// AnyDuringMigration because: Type 'null' is not assignable to type 'Element'.
let disconnectGroup: Element = null as AnyDuringMigration;
let disconnectGroup: SVGElement|null = null;
/**
* Play some UI effects (sound, animation) when disposing of a block.
@@ -48,20 +48,12 @@ export function disposeUiEffect(block: BlockSvg) {
const xy = workspace.getSvgXY(svgGroup);
// Deeply clone the current block.
const clone = svgGroup.cloneNode(true);
// AnyDuringMigration because: Property 'setAttribute' does not exist on type
// 'Node'.
(clone as AnyDuringMigration)
.setAttribute('transform', 'translate(' + xy.x + ',' + xy.y + ')');
const clone: SVGGElement = svgGroup.cloneNode(true) as SVGGElement;
clone.setAttribute('transform', 'translate(' + xy.x + ',' + xy.y + ')');
workspace.getParentSvg().appendChild(clone);
const cloneRect =
{'x': xy.x, 'y': xy.y, 'width': block.width, 'height': block.height};
// Start the animation.
// AnyDuringMigration because: Argument of type 'Node' is not assignable to
// parameter of type 'Element'.
disposeUiStep(
clone as AnyDuringMigration, cloneRect, workspace.RTL, new Date(),
workspace.scale);
disposeUiStep(clone, cloneRect, workspace.RTL, new Date(), workspace.scale);
}
/**
* Animate a cloned block and eventually dispose of it.
@@ -143,9 +135,7 @@ function connectionUiStep(ripple: SVGElement, start: Date, scale: number) {
dom.removeNode(ripple);
} else {
ripple.setAttribute('r', (percent * 25 * scale).toString());
// AnyDuringMigration because: Type 'number' is not assignable to type
// 'string'.
ripple.style.opacity = (1 - percent) as AnyDuringMigration;
ripple.style.opacity = (1 - percent).toString();
disconnectPid = setTimeout(connectionUiStep, 10, ripple, start, scale);
}
}
@@ -157,6 +147,7 @@ function connectionUiStep(ripple: SVGElement, start: Date, scale: number) {
* @internal
*/
export function disconnectUiEffect(block: BlockSvg) {
disconnectUiStop();
block.workspace.getAudioManager().play('disconnect');
if (block.workspace.scale < 1) {
return; // Too small to care about visual effects.
@@ -170,7 +161,8 @@ export function disconnectUiEffect(block: BlockSvg) {
magnitude *= -1;
}
// Start the animation.
disconnectUiStep(block.getSvgRoot(), magnitude, new Date());
disconnectGroup = block.getSvgRoot();
disconnectUiStep(disconnectGroup, magnitude, new Date());
}
/**
@@ -186,19 +178,14 @@ function disconnectUiStep(group: SVGElement, magnitude: number, start: Date) {
const ms = new Date().getTime() - start.getTime();
const percent = ms / DURATION;
if (percent > 1) {
(group as AnyDuringMigration).skew_ = '';
} else {
const skew = Math.round(
let skew = '';
if (percent <= 1) {
const val = Math.round(
Math.sin(percent * Math.PI * WIGGLES) * (1 - percent) * magnitude);
(group as AnyDuringMigration).skew_ = 'skewX(' + skew + ')';
disconnectGroup = group;
skew = `skewX(${val})`;
disconnectPid = setTimeout(disconnectUiStep, 10, group, magnitude, start);
}
group.setAttribute(
'transform',
(group as AnyDuringMigration).translate_ +
(group as AnyDuringMigration).skew_);
group.setAttribute('transform', skew);
}
/**
@@ -209,11 +196,7 @@ function disconnectUiStep(group: SVGElement, magnitude: number, start: Date) {
export function disconnectUiStop() {
if (disconnectGroup) {
clearTimeout(disconnectPid);
const group = disconnectGroup;
(group as AnyDuringMigration).skew_ = '';
group.setAttribute('transform', (group as AnyDuringMigration).translate_);
// AnyDuringMigration because: Type 'null' is not assignable to type
// 'Element'.
disconnectGroup = null as AnyDuringMigration;
disconnectGroup.setAttribute('transform', '');
disconnectGroup = null;
}
}