Skip to content

Umb-icon color setting optimization #22433

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
engijlr merged 5 commits into from
Apr 15, 2026
Merged

Umb-icon color setting optimization #22433

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca7e307
use currentColor as color fallback
nielslyngsoe Apr 10, 2026
368ae40
clean up necessary prop
nielslyngsoe Apr 10, 2026
7d463ee
Merge branch 'main' into v17/improvement/umb-icon-color-inheritance
engijlr Apr 15, 2026
5d4bb11
Add test color behavior coverage for umb-icon
Apr 15, 2026
fb99ac0
Merge branch 'main' into v17/improvement/umb-icon-color-inheritance
engijlr Apr 15, 2026
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: 4 additions & 8 deletions src/Umbraco.Web.UI.Client/src/packages/core/components/icon/icon.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { extractUmbColorVariable } from '../../resources/extractUmbColorVariable.function.js';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { html, customElement, property, state, ifDefined, css, styleMap } from '@umbraco-cms/backoffice/external/lit';
import type { StyleInfo } from '@umbraco-cms/backoffice/external/lit';
import { html, customElement, property, state, ifDefined, css } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';

/**
Expand All @@ -17,9 +16,6 @@ export class UmbIconElement extends UmbLitElement {
@state()
private _icon?: string;

@state()
private _style: StyleInfo = {};

/**
* Color alias or a color code directly.
* If a color has been set via the name property, this property will override it.
Expand Down Expand Up @@ -53,19 +49,19 @@ export class UmbIconElement extends UmbLitElement {
const value = this.#color || this.#fallbackColor;

if (!value) {
this._style = { '--uui-icon-color': 'inherit' };
this.style.removeProperty('--uui-icon-color');
Comment thread
engijlr marked this conversation as resolved.
Comment thread
engijlr marked this conversation as resolved.
return;
}

const color = value.replace('color-', '');
const variable = extractUmbColorVariable(color);
const styling = variable ? `var(${variable})` : color;

this._style = { '--uui-icon-color': styling };
this.style.setProperty('--uui-icon-color', styling);
Comment thread
engijlr marked this conversation as resolved.
}

override render() {
return html`<uui-icon name=${ifDefined(this._icon)} style=${styleMap(this._style)}></uui-icon>`;
return html`<uui-icon name=${ifDefined(this._icon)}></uui-icon>`;
}

static override styles = [
Expand Down
Loading