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

fix: collapsed toolbox categories being expanded (#6942)

Browse Source
This commit is contained in:
Beka Westberg
2023-04-06 09:09:34 -07:00
committed by GitHub
parent ce4260c373
commit 7c17ab9931
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/toolbox/collapsible_category.ts
View File

@@ -113,7 +113,7 @@ export class CollapsibleToolboxCategory extends ToolboxCategory implements
this.setExpanded(
this.toolboxItemDef_['expanded'] === 'true' ||
!!this.toolboxItemDef_['expanded']);
this.toolboxItemDef_['expanded'] === true);
}
override createDom_() {
@@ -123,6 +123,8 @@ export class CollapsibleToolboxCategory extends ToolboxCategory implements
this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
aria.setRole(this.subcategoriesDiv_, aria.Role.GROUP);
this.htmlDiv_!.appendChild(this.subcategoriesDiv_);
this.closeIcon_(this.iconDom_);
aria.setState(this.htmlDiv_ as HTMLDivElement, aria.State.EXPANDED, false);
return this.htmlDiv_!;
}
@@ -150,6 +152,7 @@ export class CollapsibleToolboxCategory extends ToolboxCategory implements
protected createSubCategoriesDom_(subcategories: IToolboxItem[]):
HTMLDivElement {
const contentsContainer = document.createElement('div');
contentsContainer.style.display = 'none';
const className = this.cssConfig_['contents'];
if (className) {
dom.addClass(contentsContainer, className);
@@ -173,9 +176,8 @@ export class CollapsibleToolboxCategory extends ToolboxCategory implements
* @param isExpanded True to expand the category, false to close.
*/
setExpanded(isExpanded: boolean) {
if (this.expanded_ === isExpanded) {
return;
}
if (this.expanded_ === isExpanded) return;
this.expanded_ = isExpanded;
if (isExpanded) {
this.subcategoriesDiv_!.style.display = 'block';