Skip to content

Commit e95aa69

Browse files
committed
fix: Ensure core changes work on this branch.
Per RaspberryPiFoundation/blockly#9280.
1 parent f34d85b commit e95aa69

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

src/actions/mover.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,9 @@ export class Mover {
244244
this.patchDragger(info.dragger as dragging.Dragger, dragStrategy.moveType);
245245

246246
// Save the position so we can put the cursor in a reasonable spot.
247-
// @ts-expect-error Access to private property connectionCandidate.
248247
const target = dragStrategy.connectionCandidate?.neighbour;
249248

250249
// Prevent the strategy connecting the block so we just delete one block.
251-
// @ts-expect-error Access to private property connectionCandidate.
252250
dragStrategy.connectionCandidate = null;
253251

254252
info.dragger.onDragEnd(

src/keyboard_drag_strategy.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
5050
// to the top left of the workspace.
5151
// @ts-expect-error block and startLoc are private.
5252
this.block.moveDuringDrag(this.startLoc);
53-
// @ts-expect-error connectionCandidate is private.
5453
this.connectionCandidate = this.createInitialCandidate();
5554
this.forceShowPreview();
5655
this.block.addIcon(new MoveIcon(this.block));
@@ -62,9 +61,7 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
6261
super.drag(newLoc);
6362

6463
// Handle the case when an unconstrained drag found a connection candidate.
65-
// @ts-expect-error connectionCandidate is private.
6664
if (this.connectionCandidate) {
67-
// @ts-expect-error connectionCandidate is private.
6865
const neighbour = (this.connectionCandidate as ConnectionCandidate)
6966
.neighbour;
7067
// The next constrained move will resume the search from the current
@@ -253,7 +250,6 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
253250
private forceShowPreview() {
254251
// @ts-expect-error connectionPreviewer is private
255252
const previewer = this.connectionPreviewer;
256-
// @ts-expect-error connectionCandidate is private
257253
const candidate = this.connectionCandidate as ConnectionCandidate;
258254
if (!candidate || !previewer) return;
259255
const block = this.block;

0 commit comments

Comments
 (0)