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

Fixes shift clicking on block (#2927)

Browse Source 
* Fixes shift clicking on block

* General cleanup

* Use new renderer api
This commit is contained in:
alschmiedt
2019-08-29 10:18:34 -07:00
committed by GitHub
parent 8beb060cf6
commit a27e059f2c
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/keyboard_nav/cursor_svg.js
View File

@@ -41,6 +41,8 @@ goog.require('Blockly.Cursor');
Blockly.CursorSvg = function(workspace, opt_marker) {
Blockly.CursorSvg.superClass_.constructor.call(this, opt_marker);
this.workspace_ = workspace;
this.constants = new Blockly.blockRendering.ConstantProvider();
this.constants.init();
};
goog.inherits(Blockly.CursorSvg, Blockly.Cursor);
@@ -118,9 +120,10 @@ Blockly.CursorSvg.prototype.getSvgRoot = function() {
* @return {!Element} The cursor controls SVG group.
*/
Blockly.CursorSvg.prototype.createDom = function() {
var className = this.isMarker_ ? 'blocklyMarker' : 'blocklyCursor';
this.svgGroup_ =
Blockly.utils.dom.createSvgElement('g', {
'class': 'blocklyCursor'
'class': className
}, null);
this.createCursorSvg_();
@@ -169,7 +172,6 @@ Blockly.CursorSvg.prototype.showWithCoordinates_ = function() {
* @private
*/
Blockly.CursorSvg.prototype.showWithBlock_ = function() {
//TODO: Change this from getLocation to something else
var block = this.getCurNode().getLocation();
this.currentCursorSvg = this.cursorSvgRect_;
@@ -187,7 +189,7 @@ Blockly.CursorSvg.prototype.showWithInputOutput_ = function() {
(this.getCurNode().getLocation());
this.currentCursorSvg = this.cursorInputOutput_;
var path = Blockly.utils.svgPaths.moveTo(0, 0) +
Blockly.blockRendering.constants.PUZZLE_TAB.pathDown;
this.constants.shapeFor(connection).pathDown;
this.cursorInputOutput_.setAttribute('d', path);
this.setParent_(connection.getSourceBlock().getSvgRoot());
this.positionInputOutput_(connection);

38
core/keyboard_nav/navigation.js
View File

@@ -146,6 +146,27 @@ Blockly.navigation.removeMark = function() {
Blockly.navigation.marker_.hide();
};
/**
* Gets the top node on a block.
* This is either the previous connection, output connection or the block.
* @param {Blockly.Block} block The block to find the top most ast node on.
* @return {Blockly.ASTNode} The ast node holding the top most node on the
* block.
* @package
*/
Blockly.navigation.getTopNode_ = function(block) {
var prevConnection = block.previousConnection;
var outConnection = block.outputConnection;
var topConnection = prevConnection ? prevConnection : outConnection;
var astNode = null;
if (topConnection) {
astNode = Blockly.ASTNode.createConnectionNode(topConnection);
} else {
astNode = Blockly.ASTNode.createBlockNode(block);
}
return astNode;
};
/************************/
/** Toolbox Navigation **/
/************************/
@@ -369,15 +390,8 @@ Blockly.navigation.insertFromFlyout = function() {
Blockly.navigation.warn('Something went wrong while inserting a block from the flyout.');
}
// Move the cursor to the right place on the inserted block.
Blockly.navigation.focusWorkspace();
var prevConnection = newBlock.previousConnection;
var outConnection = newBlock.outputConnection;
var topConnection = prevConnection ? prevConnection : outConnection;
// TODO: This will have to be fixed when we add in a block that does not have
// a previous or output connection
var astNode = Blockly.ASTNode.createConnectionNode(topConnection);
Blockly.navigation.cursor_.setLocation(astNode);
Blockly.navigation.cursor_.setLocation(Blockly.navigation.getTopNode_(newBlock));
Blockly.navigation.removeMark();
};
@@ -694,13 +708,7 @@ Blockly.navigation.focusWorkspace = function() {
Blockly.navigation.currentState_ = Blockly.navigation.STATE_WS;
Blockly.navigation.enableKeyboardAccessibility();
if (Blockly.selected) {
var previousConnection = Blockly.selected.previousConnection;
var outputConnection = Blockly.selected.outputConnection;
// TODO: This still needs to work with blocks that have neither previous
// or output connection.
var connection = previousConnection ? previousConnection : outputConnection;
var newAstNode = Blockly.ASTNode.createConnectionNode(connection);
cursor.setLocation(newAstNode);
cursor.setLocation(Blockly.navigation.getTopNode_(Blockly.selected));
Blockly.selected.unselect();
} else {
var ws = cursor.workspace_;