Skip to content

fix!: Rename blocklyTreeRow and blocklyToolboxCategory CSS classes #8357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BeksOmega merged 3 commits into from
Jul 16, 2024
Merged

fix!: Rename blocklyTreeRow and blocklyToolboxCategory CSS classes #8357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf76f1
fix!: #8345 rename css class
Abhinav-Chdhary Jul 14, 2024
1446c85
Update category.ts
Abhinav-Chdhary Jul 16, 2024
f248e94
fix: css class conflicts
Abhinav-Chdhary Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions core/toolbox/category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -659,27 +659,27 @@ 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;
padding-right: 8px;
white-space: nowrap;
}

.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {
.blocklyToolboxDiv[dir="RTL"] .blocklyToolboxCategory {
margin-left: 8px;
padding-right: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/mocha/comment_deserialization_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
);
Expand Down
4 changes: 3 additions & 1 deletion tests/mocha/toolbox_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down