CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-04-26 23:20:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix!: Fix types on BlockSvg connections (#9669)

Browse Source
This commit is contained in:
Aaron Dodson
2026-04-02 11:01:29 -07:00
committed by GitHub
parent 15a4d5050e
commit 43be0edf5d
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/blockly/blocks/text.ts
+4 -2
View File
@@ -757,13 +757,15 @@ const JOIN_MUTATOR_MIXIN = {
'text_create_join_container',
) as BlockSvg;
containerBlock.initSvg();
let connection = containerBlock.getInput('STACK')!.connection!;
let connection = containerBlock.getInput('STACK')?.connection;
for (let i = 0; i < this.itemCount_; i++) {
const itemBlock = workspace.newBlock(
'text_create_join_item',
) as JoinItemBlock;
itemBlock.initSvg();
connection.connect(itemBlock.previousConnection);
if (itemBlock.previousConnection) {
connection?.connect(itemBlock.previousConnection);
}
connection = itemBlock.nextConnection;
}
return containerBlock;
packages/blockly/core/block_svg.ts
+3 -6
View File
@@ -160,12 +160,9 @@ export class BlockSvg
private visuallyDisabled = false;
override workspace: WorkspaceSvg;
// TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
override outputConnection!: RenderedConnection;
// TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
override nextConnection!: RenderedConnection;
// TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
override previousConnection!: RenderedConnection;
override outputConnection: RenderedConnection | null = null;
override nextConnection: RenderedConnection | null = null;
override previousConnection: RenderedConnection | null = null;
private translation = '';
packages/blockly/core/dragging/block_drag_strategy.ts
+11 -5
View File
@@ -366,7 +366,7 @@ export class BlockDragStrategy implements IDragStrategy {
};
}
this.startChildConn = nextTargetConn;
this.startChildConn = nextTargetConn ?? null;
}
}
}
@@ -627,7 +627,7 @@ export class BlockDragStrategy implements IDragStrategy {
draggingBlock.outputConnection,
draggingBlock.previousConnection,
draggingBlock.nextConnection,
].filter(Boolean); // Removes falsy (null) values.
].filter((c) => !!c); // Removes falsy (null) values.
const inputConnections: RenderedConnection[] = [];
for (const conn of available) {
@@ -727,14 +727,20 @@ export class BlockDragStrategy implements IDragStrategy {
this.connectionPreviewer?.hidePreview();
this.connectionCandidate = null;
this.startChildConn?.connect(this.block.nextConnection);
if (this.block.nextConnection) {
this.startChildConn?.connect(this.block.nextConnection);
}
if (this.startParentConn) {
switch (this.startParentConn.type) {
case ConnectionType.INPUT_VALUE:
this.startParentConn.connect(this.block.outputConnection);
if (this.block.outputConnection) {
this.startParentConn.connect(this.block.outputConnection);
}
break;
case ConnectionType.NEXT_STATEMENT:
this.startParentConn.connect(this.block.previousConnection);
if (this.block.previousConnection) {
this.startParentConn.connect(this.block.previousConnection);
}
}
} else {
this.block.moveTo(this.startLoc!, ['drag']);
packages/blockly/core/renderers/common/drawer.ts
+1 -1
View File
@@ -422,7 +422,7 @@ export class Drawer {
const x =
this.info_.startX + this.info_.outputConnection.connectionOffsetX;
const connX = this.info_.RTL ? -x : x;
this.block_.outputConnection.setOffsetInBlock(
this.block_.outputConnection?.setOffsetInBlock(
connX,
this.info_.outputConnection.connectionOffsetY,
);