-
Notifications
You must be signed in to change notification settings - Fork 3.8k
feat: add block drag strategy #7970
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.
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
Merged
BeksOmega
merged 4 commits into
RaspberryPiFoundation:rc/v11.0.0
from
BeksOmega:feat/drag-block-dragger
Mar 28, 2024
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,399 @@ | ||
| /** | ||
| * @license | ||
| * Copyright 2024 Google LLC | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| import {WorkspaceSvg} from '../workspace_svg.js'; | ||
| import {IDragStrategy} from '../interfaces/i_draggable.js'; | ||
| import {Coordinate} from '../utils.js'; | ||
| import * as eventUtils from '../events/utils.js'; | ||
| import {BlockSvg} from '../block_svg.js'; | ||
| import {RenderedConnection} from '../rendered_connection.js'; | ||
| import * as dom from '../utils/dom.js'; | ||
| import * as blockAnimation from '../block_animations.js'; | ||
| import {ConnectionType} from '../connection_type.js'; | ||
| import * as bumpObjects from '../bump_objects.js'; | ||
| import * as registry from '../registry.js'; | ||
| import {IConnectionPreviewer} from '../interfaces/i_connection_previewer.js'; | ||
| import {Connection} from '../connection.js'; | ||
| import type {Block} from '../block.js'; | ||
| import {config} from '../config.js'; | ||
| import type {BlockMove} from '../events/events_block_move.js'; | ||
| import {finishQueuedRenders} from '../render_management.js'; | ||
| import * as layers from '../layers.js'; | ||
|
|
||
| /** Represents a nearby valid connection. */ | ||
| interface ConnectionCandidate { | ||
| /** A connection on the dragging stack that is compatible with neighbour. */ | ||
| local: RenderedConnection; | ||
|
|
||
| /** A nearby connection that is compatible with local. */ | ||
| neighbour: RenderedConnection; | ||
|
|
||
| /** The distance between the local connection and the neighbour connection. */ | ||
| distance: number; | ||
| } | ||
|
|
||
| export class BlockDragStrategy implements IDragStrategy { | ||
| private workspace: WorkspaceSvg; | ||
|
|
||
| /** The parent block at the start of the drag. */ | ||
| private startParentConn: RenderedConnection | null = null; | ||
|
|
||
| /** | ||
| * The child block at the start of the drag. Only gets set if | ||
| * `healStack` is true. | ||
| */ | ||
| private startChildConn: RenderedConnection | null = null; | ||
|
|
||
| private startLoc: Coordinate | null = null; | ||
|
|
||
| private connectionCandidate: ConnectionCandidate | null = null; | ||
|
|
||
| private connectionPreviewer: IConnectionPreviewer | null = null; | ||
|
|
||
| private dragging = false; | ||
|
|
||
| constructor(private block: BlockSvg) { | ||
| this.workspace = block.workspace; | ||
| } | ||
|
|
||
| /** Returns true if the block is currently movable. False otherwise. */ | ||
| isMovable(): boolean { | ||
| return ( | ||
| this.block.isOwnMovable() && | ||
| !this.block.isShadow() && | ||
| !this.block.isDeadOrDying() && | ||
| !this.workspace.options.readOnly | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Handles any setup for starting the drag, including disconnecting the block | ||
| * from any parent blocks. | ||
| */ | ||
| startDrag(e?: PointerEvent): void { | ||
| this.dragging = true; | ||
| if (!eventUtils.getGroup()) { | ||
| eventUtils.setGroup(true); | ||
| } | ||
| this.fireDragStartEvent(); | ||
|
|
||
| this.startLoc = this.block.getRelativeToSurfaceXY(); | ||
|
|
||
| const previewerConstructor = registry.getClassFromOptions( | ||
| registry.Type.CONNECTION_PREVIEWER, | ||
| this.workspace.options, | ||
| ); | ||
| this.connectionPreviewer = new previewerConstructor!(this.block); | ||
|
|
||
| // During a drag there may be a lot of rerenders, but not field changes. | ||
| // Turn the cache on so we don't do spurious remeasures during the drag. | ||
| dom.startTextWidthCache(); | ||
| this.workspace.setResizesEnabled(false); | ||
| blockAnimation.disconnectUiStop(); | ||
|
|
||
| const healStack = !!e && (e.altKey || e.ctrlKey || e.metaKey); | ||
|
|
||
| if (this.shouldDisconnect(healStack)) { | ||
| this.disconnectBlock(healStack); | ||
| } | ||
| this.block.setDragging(true); | ||
| this.workspace.getLayerManager()?.moveToDragLayer(this.block); | ||
| } | ||
|
|
||
| /** | ||
| * Whether or not we should disconnect the block when a drag is started. | ||
| * | ||
| * @param healStack Whether or not to heal the stack after disconnecting. | ||
| * @returns True to disconnect the block, false otherwise. | ||
| */ | ||
| private shouldDisconnect(healStack: boolean): boolean { | ||
| return !!( | ||
| this.block.getParent() || | ||
| (healStack && | ||
| this.block.nextConnection && | ||
| this.block.nextConnection.targetBlock()) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Disconnects the block from any parents. If `healStack` is true and this is | ||
| * a stack block, we also disconnect from any next blocks and attempt to | ||
| * attach them to any parent. | ||
| * | ||
| * @param healStack Whether or not to heal the stack after disconnecting. | ||
| */ | ||
| private disconnectBlock(healStack: boolean) { | ||
| this.startParentConn = | ||
| this.block.outputConnection?.targetConnection ?? | ||
| this.block.previousConnection?.targetConnection; | ||
| if (healStack) { | ||
| this.startChildConn = this.block.nextConnection?.targetConnection; | ||
| } | ||
|
|
||
| this.block.unplug(healStack); | ||
| blockAnimation.disconnectUiEffect(this.block); | ||
| } | ||
|
|
||
| /** Fire a UI event at the start of a block drag. */ | ||
| private fireDragStartEvent() { | ||
| const event = new (eventUtils.get(eventUtils.BLOCK_DRAG))( | ||
| this.block, | ||
| true, | ||
| this.block.getDescendants(false), | ||
| ); | ||
| eventUtils.fire(event); | ||
| } | ||
|
|
||
| /** Fire a UI event at the end of a block drag. */ | ||
| private fireDragEndEvent() { | ||
| const event = new (eventUtils.get(eventUtils.BLOCK_DRAG))( | ||
| this.block, | ||
| false, | ||
| this.block.getDescendants(false), | ||
| ); | ||
| eventUtils.fire(event); | ||
| } | ||
|
|
||
| /** Fire a move event at the end of a block drag. */ | ||
| private fireMoveEvent() { | ||
| if (this.block.isDeadOrDying()) return; | ||
| const event = new (eventUtils.get(eventUtils.BLOCK_MOVE))( | ||
| this.block, | ||
| ) as BlockMove; | ||
| event.setReason(['drag']); | ||
| event.oldCoordinate = this.startLoc!; | ||
| event.recordNew(); | ||
| eventUtils.fire(event); | ||
| } | ||
|
|
||
| /** Moves the block and updates any connection previews. */ | ||
| drag(newLoc: Coordinate): void { | ||
| this.block.moveDuringDrag(newLoc); | ||
| this.updateConnectionPreview( | ||
| this.block, | ||
| Coordinate.difference(newLoc, this.startLoc!), | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @param draggingBlock The block being dragged. | ||
| * @param delta How far the pointer has moved from the position | ||
| * at the start of the drag, in workspace units. | ||
| */ | ||
| private updateConnectionPreview(draggingBlock: BlockSvg, delta: Coordinate) { | ||
| const currCandidate = this.connectionCandidate; | ||
| const newCandidate = this.getConnectionCandidate(draggingBlock, delta); | ||
| if (!newCandidate) { | ||
| this.connectionPreviewer!.hidePreview(); | ||
| this.connectionCandidate = null; | ||
| return; | ||
| } | ||
| const candidate = | ||
| currCandidate && | ||
| this.currCandidateIsBetter(currCandidate, delta, newCandidate) | ||
| ? currCandidate | ||
| : newCandidate; | ||
| this.connectionCandidate = candidate; | ||
|
|
||
| const {local, neighbour} = candidate; | ||
| const localIsOutputOrPrevious = | ||
| local.type === ConnectionType.OUTPUT_VALUE || | ||
| local.type === ConnectionType.PREVIOUS_STATEMENT; | ||
| const neighbourIsConnectedToRealBlock = | ||
| neighbour.isConnected() && !neighbour.targetBlock()!.isInsertionMarker(); | ||
| if ( | ||
| localIsOutputOrPrevious && | ||
| neighbourIsConnectedToRealBlock && | ||
| !this.orphanCanConnectAtEnd( | ||
| draggingBlock, | ||
| neighbour.targetBlock()!, | ||
| local.type, | ||
| ) | ||
| ) { | ||
| this.connectionPreviewer!.previewReplacement( | ||
| local, | ||
| neighbour, | ||
| neighbour.targetBlock()!, | ||
| ); | ||
| return; | ||
| } | ||
| this.connectionPreviewer!.previewConnection(local, neighbour); | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if the given orphan block can connect at the end of the | ||
| * top block's stack or row, false otherwise. | ||
| */ | ||
| private orphanCanConnectAtEnd( | ||
| topBlock: BlockSvg, | ||
| orphanBlock: BlockSvg, | ||
| localType: number, | ||
| ): boolean { | ||
| const orphanConnection = | ||
| localType === ConnectionType.OUTPUT_VALUE | ||
| ? orphanBlock.outputConnection | ||
| : orphanBlock.previousConnection; | ||
| return !!Connection.getConnectionForOrphanedConnection( | ||
| topBlock as Block, | ||
| orphanConnection as Connection, | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if the current candidate is better than the new candidate. | ||
| * | ||
| * We slightly prefer the current candidate even if it is farther away. | ||
| */ | ||
| private currCandidateIsBetter( | ||
| currCandiate: ConnectionCandidate, | ||
| delta: Coordinate, | ||
| newCandidate: ConnectionCandidate, | ||
| ): boolean { | ||
| const {local: currLocal, neighbour: currNeighbour} = currCandiate; | ||
| const localPos = new Coordinate(currLocal.x, currLocal.y); | ||
| const neighbourPos = new Coordinate(currNeighbour.x, currNeighbour.y); | ||
| const currDistance = Coordinate.distance( | ||
| Coordinate.sum(localPos, delta), | ||
| neighbourPos, | ||
| ); | ||
| return ( | ||
| newCandidate.distance > currDistance - config.currentConnectionPreference | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the closest valid candidate connection, if one can be found. | ||
| * | ||
| * Valid neighbour connections are within the configured start radius, with a | ||
| * compatible type (input, output, etc) and connection check. | ||
| */ | ||
| private getConnectionCandidate( | ||
| draggingBlock: BlockSvg, | ||
| delta: Coordinate, | ||
| ): ConnectionCandidate | null { | ||
| const localConns = this.getLocalConnections(draggingBlock); | ||
| let radius = this.connectionCandidate | ||
| ? config.connectingSnapRadius | ||
| : config.snapRadius; | ||
| let candidate = null; | ||
|
|
||
| for (const conn of localConns) { | ||
| const {connection: neighbour, radius: rad} = conn.closest(radius, delta); | ||
| if (neighbour) { | ||
| candidate = { | ||
| local: conn, | ||
| neighbour: neighbour, | ||
| distance: rad, | ||
| }; | ||
| radius = rad; | ||
| } | ||
| } | ||
|
|
||
| return candidate; | ||
| } | ||
|
|
||
| /** | ||
| * Returns all of the connections we might connect to blocks on the workspace. | ||
| * | ||
| * Includes any connections on the dragging block, and any last next | ||
| * connection on the stack (if one exists). | ||
| */ | ||
| private getLocalConnections(draggingBlock: BlockSvg): RenderedConnection[] { | ||
| const available = draggingBlock.getConnections_(false); | ||
| const lastOnStack = draggingBlock.lastConnectionInStack(true); | ||
| if (lastOnStack && lastOnStack !== draggingBlock.nextConnection) { | ||
| available.push(lastOnStack); | ||
| } | ||
| return available; | ||
| } | ||
|
|
||
| /** | ||
| * Cleans up any state at the end of the drag. Applies any pending | ||
| * connections. | ||
| */ | ||
| endDrag(): void { | ||
| this.fireDragEndEvent(); | ||
| this.fireMoveEvent(); | ||
|
|
||
| dom.stopTextWidthCache(); | ||
|
|
||
| blockAnimation.disconnectUiStop(); | ||
| this.connectionPreviewer!.hidePreview(); | ||
|
|
||
| if (!this.block.isDeadOrDying() && this.dragging) { | ||
| // These are expensive and don't need to be done if we're deleting, or | ||
| // if we've already stopped dragging because we moved back to the start. | ||
| this.workspace | ||
| .getLayerManager() | ||
| ?.moveOffDragLayer(this.block, layers.BLOCK); | ||
| this.block.setDragging(false); | ||
| } | ||
|
|
||
| if (this.connectionCandidate) { | ||
| // Applying connections also rerenders the relevant blocks. | ||
| this.applyConnections(this.connectionCandidate); | ||
| } else { | ||
| this.block.queueRender(); | ||
| } | ||
| this.block.snapToGrid(); | ||
|
|
||
| // Must dispose after connections are applied to not break the dynamic | ||
| // connections plugin. See #7859 | ||
| this.connectionPreviewer!.dispose(); | ||
| this.workspace.setResizesEnabled(true); | ||
|
|
||
| eventUtils.setGroup(false); | ||
| } | ||
|
|
||
| /** Connects the given candidate connections. */ | ||
| private applyConnections(candidate: ConnectionCandidate) { | ||
| const {local, neighbour} = candidate; | ||
| local.connect(neighbour); | ||
|
|
||
| const inferiorConnection = local.isSuperior() ? neighbour : local; | ||
| const rootBlock = this.block.getRootBlock(); | ||
|
|
||
| finishQueuedRenders().then(() => { | ||
| blockAnimation.connectionUiEffect(inferiorConnection.getSourceBlock()); | ||
| // bringToFront is incredibly expensive. Delay until the next frame. | ||
| setTimeout(() => { | ||
| rootBlock.bringToFront(); | ||
| }, 0); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Moves the block back to where it was at the beginning of the drag, | ||
| * including reconnecting connections. | ||
| */ | ||
| revertDrag(): void { | ||
| this.startChildConn?.connect(this.block.nextConnection); | ||
| if (this.startParentConn) { | ||
| switch (this.startParentConn.type) { | ||
| case ConnectionType.INPUT_VALUE: | ||
| this.startParentConn.connect(this.block.outputConnection); | ||
| break; | ||
| case ConnectionType.NEXT_STATEMENT: | ||
| this.startParentConn.connect(this.block.previousConnection); | ||
| } | ||
| } else { | ||
| this.block.moveTo(this.startLoc!, ['drag']); | ||
| // Blocks dragged directly from a flyout may need to be bumped into | ||
| // bounds. | ||
| bumpObjects.bumpIntoBounds( | ||
| this.workspace, | ||
| this.workspace.getMetricsManager().getScrollMetrics(true), | ||
| this.block, | ||
| ); | ||
| } | ||
|
|
||
| this.connectionPreviewer!.hidePreview(); | ||
| this.connectionCandidate = null; | ||
|
|
||
| this.block.setDragging(false); | ||
| this.dragging = false; | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.