Skip to content

Do not set icon color if the item is selected #19404

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
AndyButland merged 4 commits into from
May 28, 2025
Merged

Do not set icon color if the item is selected #19404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3503de
Do not set icon color if the item is selected
lauraneto May 23, 2025
d48a32f
Added helper method for icon version to render.
AndyButland May 26, 2025
e07b38a
Fixed naming of protected helper method.
AndyButland May 28, 2025
6e0b9d8
Move further logic into helper method.
AndyButland May 28, 2025
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
12 changes: 8 additions & 4 deletions ...o.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export abstract class UmbTreeItemElementBase<
private _isSelectable = false;

@state()
private _isSelected = false;
protected _isSelected = false;

@state()
private _hasChildren = false;
Expand Down Expand Up @@ -165,10 +165,9 @@ export abstract class UmbTreeItemElementBase<
#renderIcon() {
const icon = this._item?.icon;
const isFolder = this._item?.isFolder;
const iconWithoutColor = icon?.split(' ')[0];

if (icon && iconWithoutColor) {
return html`<umb-icon slot="icon" name="${this._isActive ? iconWithoutColor : icon}"></umb-icon>`;
if (icon) {
return html`<umb-icon slot="icon" name="${this._getIconToRender(icon)}"></umb-icon>`;
}

if (isFolder) {
Expand All @@ -178,6 +177,11 @@ export abstract class UmbTreeItemElementBase<
return html`<umb-icon slot="icon" name="icon-circle-dotted"></umb-icon>`;
}

protected _getIconToRender(icon: string) {
const iconWithoutColor = icon.split(' ')[0];
return this._isActive || this._isSelected ? iconWithoutColor : icon;
}

renderLabel() {
return html`<slot name="label" slot="label"></slot>`;
}
Expand Down
5 changes: 2 additions & 3 deletions ...b.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ export class UmbDocumentTreeItemElement extends UmbTreeItemElementBase<

override renderIconContainer() {
const icon = this._icon;
const iconWithoutColor = icon?.split(' ')[0];

return html`
<span id="icon-container" slot="icon" class=${classMap({ draft: this._isDraft })}>
${icon && iconWithoutColor
${icon
? html`
<umb-icon id="icon" slot="icon" name="${this._isActive ? iconWithoutColor : icon}"></umb-icon>
<umb-icon id="icon" slot="icon" name="${this._getIconToRender(icon)}"></umb-icon>
${this.#renderStateIcon()}
`
: nothing}
Expand Down
5 changes: 2 additions & 3 deletions src/Umbraco.Web.UI.Client/src/packages/media/media/tree/tree-item/media-tree-item.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ const elementName = 'umb-media-tree-item';
export class UmbMediaTreeItemElement extends UmbTreeItemElementBase<UmbMediaTreeItemModel> {
override renderIconContainer() {
const icon = this.item?.mediaType.icon;
const iconWithoutColor = icon?.split(' ')[0];

return html`
<span id="icon-container" slot="icon">
${icon && iconWithoutColor
${icon
? html`
<umb-icon id="icon" slot="icon" name="${this._isActive ? iconWithoutColor : icon}"></umb-icon>
<umb-icon id="icon" slot="icon" name="${this._getIconToRender(icon)}"></umb-icon>
${this.#renderStateIcon()}
`
: nothing}
Expand Down
Loading