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

fix: change getCandidate_ and showInsertionMarker_ to be more dynamic (#5722)

Browse Source 
* Change getCandidate_ and showInsertionMarker_ to be more dynamic

* Ran clang formatter

* Fix typos

* Fix issue with dragging stacks

* From PR comment
This commit is contained in:
Mark Friedman
2021-12-15 15:46:17 -08:00
committed by GitHub
parent da07cbdcbf
commit 68d81132b8
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/insertion_marker_manager.js
View File

@@ -431,6 +431,16 @@ InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
let candidateClosest = null;
let candidateLocal = null;
// It's possible that a block has added or removed connections during a drag,
// (e.g. in a drag/move event handler), so let's update the available
// connections. Note that this will be called on every move while dragging, so
// it might cause slowness, especially if the block stack is large. If so,
// maybe it could be made more efficient. Also note that we won't update the
// connections if we've already connected the insertion marker to a block.
if (!this.markerConnection_ || !this.markerConnection_.isConnected()) {
this.updateAvailableConnections();
}
for (let i = 0; i < this.availableConnections_.length; i++) {
const myConnection = this.availableConnections_[i];
const neighbour = myConnection.closest(radius, dxy);
@@ -617,8 +627,21 @@ InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
const closest = this.closestConnection_;
const isLastInStack = this.lastOnStack_ && local === this.lastOnStack_;
const imBlock = isLastInStack ? this.lastMarker_ : this.firstMarker_;
const imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
let imBlock = isLastInStack ? this.lastMarker_ : this.firstMarker_;
let imConn;
try {
imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
} catch (e) {
// It's possible that the number of connections on the local block has
// changed since the insertion marker was originally created. Let's
// recreate the insertion marker and try again. In theory we could probably
// recreate the marker block (e.g. in getCandidate_), which is called more
// often during the drag, but creating a block that often might be too slow,
// so we only do it if necessary.
this.firstMarker_ = this.createMarkerBlock_(this.topBlock_);
imBlock = isLastInStack ? this.lastMarker_ : this.firstMarker_;
imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
}
if (imConn === this.markerConnection_) {
throw Error(