mirror of
https://github.com/google/blockly.git
synced 2026-01-10 18:37:09 +01:00
fix!: Rename blocklyTreeRow and blocklyToolboxCategory CSS classes (#8357)
* fix!: #8345 rename css class This commit renames the blocklyTreeRow CSS class to blocklyToolboxCategory * Update category.ts * fix: css class conflicts Rename original blocklyToolboxCategory to blocklyToolboxCategoryContainer
This commit is contained in:
committed by
GitHub
parent
aecfe34c38
commit
ae2fea484f
@@ -131,8 +131,8 @@ export class ToolboxCategory
|
||||
*/
|
||||
protected makeDefaultCssConfig_(): CssConfig {
|
||||
return {
|
||||
'container': 'blocklyToolboxCategory',
|
||||
'row': 'blocklyTreeRow',
|
||||
'container': 'blocklyToolboxCategoryContainer',
|
||||
'row': 'blocklyToolboxCategory',
|
||||
'rowcontentcontainer': 'blocklyTreeRowContentContainer',
|
||||
'icon': 'blocklyTreeIcon',
|
||||
'label': 'blocklyTreeLabel',
|
||||
@@ -659,19 +659,19 @@ export type CssConfig = ToolboxCategory.CssConfig;
|
||||
|
||||
/** CSS for Toolbox. See css.js for use. */
|
||||
Css.register(`
|
||||
.blocklyTreeRow:not(.blocklyTreeSelected):hover {
|
||||
.blocklyToolboxCategory:not(.blocklyTreeSelected):hover {
|
||||
background-color: rgba(255, 255, 255, .2);
|
||||
}
|
||||
|
||||
.blocklyToolboxDiv[layout="h"] .blocklyToolboxCategory {
|
||||
.blocklyToolboxDiv[layout="h"] .blocklyToolboxCategoryContainer {
|
||||
margin: 1px 5px 1px 0;
|
||||
}
|
||||
|
||||
.blocklyToolboxDiv[dir="RTL"][layout="h"] .blocklyToolboxCategory {
|
||||
.blocklyToolboxDiv[dir="RTL"][layout="h"] .blocklyToolboxCategoryContainer {
|
||||
margin: 1px 0 1px 5px;
|
||||
}
|
||||
|
||||
.blocklyTreeRow {
|
||||
.blocklyToolboxCategory {
|
||||
height: 22px;
|
||||
line-height: 22px;
|
||||
margin-bottom: 3px;
|
||||
@@ -679,7 +679,7 @@ Css.register(`
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {
|
||||
.blocklyToolboxDiv[dir="RTL"] .blocklyToolboxCategory {
|
||||
margin-left: 8px;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ suite('Comment Deserialization', function () {
|
||||
test('Toolbox', function () {
|
||||
// Place from toolbox.
|
||||
const toolbox = this.workspace.getToolbox();
|
||||
simulateClick(toolbox.HtmlDiv.querySelector('.blocklyTreeRow'));
|
||||
simulateClick(toolbox.HtmlDiv.querySelector('.blocklyToolboxCategory'));
|
||||
simulateClick(
|
||||
toolbox.getFlyout().svgGroup_.querySelector('.blocklyPath'),
|
||||
);
|
||||
|
||||
@@ -201,7 +201,9 @@ suite('Toolbox', function () {
|
||||
sinon.assert.calledOnce(hideChaffStub);
|
||||
});
|
||||
test('Category clicked -> Should select category', function () {
|
||||
const categoryXml = document.getElementsByClassName('blocklyTreeRow')[0];
|
||||
const categoryXml = document.getElementsByClassName(
|
||||
'blocklyToolboxCategory',
|
||||
)[0];
|
||||
const evt = {
|
||||
'target': categoryXml,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user