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

Dropdown scrolls to selected element (#2897)

Browse Source 
* Dropdown scrolls to selected element
This commit is contained in:
mirandago
2019-08-26 10:23:41 -07:00
committed by Sam El-Husseini
parent 8800f70cb0
commit d9d234363c
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/field_dropdown.js
View File

@@ -57,6 +57,14 @@ Blockly.FieldDropdown = function(menuGenerator, opt_validator) {
if (typeof menuGenerator != 'function') {
Blockly.FieldDropdown.validateOptions_(menuGenerator);
}
/**
* A reference to the currently selected menu item.
* @type {Blockly.MenuItem}
* @private
*/
this.selectedMenuItem_ = null;
this.menuGenerator_ = menuGenerator;
this.trimOptions_();
@@ -179,7 +187,11 @@ Blockly.FieldDropdown.prototype.showEditor_ = function() {
/** @type {!Element} */ (this.menu_.getElement()), 'blocklyDropdownMenu');
this.positionMenu_(this.menu_);
// Scroll the dropdown to show the selected menu item.
if (this.selectedMenuItem_) {
Blockly.utils.style.scrollIntoContainerView(
this.selectedMenuItem_.getElement(), this.menu_.getElement());
}
// Focusing needs to be handled after the menu is rendered and positioned.
// Otherwise it will cause a page scroll to get the misplaced menu in
// view. See issue #1329.
@@ -197,7 +209,6 @@ Blockly.FieldDropdown.prototype.widgetCreate_ = function() {
menu.setRole('listbox');
var options = this.getOptions();
var selectedMenuItem;
for (var i = 0; i < options.length; i++) {
var content = options[i][0]; // Human-readable text or image.
var value = options[i][1]; // Language-neutral value.
@@ -216,14 +227,14 @@ Blockly.FieldDropdown.prototype.widgetCreate_ = function() {
menu.addChild(menuItem, true);
menuItem.setChecked(value == this.value_);
if (value == this.value_) {
selectedMenuItem = menuItem;
this.selectedMenuItem_ = menuItem;
}
menuItem.onAction(this.handleMenuActionEvent_, this);
}
Blockly.utils.aria.setState(/** @type {!Element} */ (menu.getElement()),
Blockly.utils.aria.State.ACTIVEDESCENDANT,
selectedMenuItem ? selectedMenuItem.getId() : '');
this.selectedMenuItem_ ? this.selectedMenuItem_.getId() : '');
return menu;
};