Skip to content

feat(dropdown): improve dropdown theme #15647

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
simeonoff merged 2 commits into from
Apr 25, 2025
Merged

feat(dropdown): improve dropdown theme #15647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd2569a
feat(dropdown): improve dropdown theme
didimmova Apr 2, 2025
e482cd9
feat(dropdown): replace text-contrast with adaptive-contrast
didimmova Apr 22, 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
80 changes: 48 additions & 32 deletions projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,68 +91,88 @@
}

$theme: digest-schema($drop-down-schema);
$meta: map.get($theme, '_meta');
$variant: map.get($theme, '_meta', 'theme');

@if not($item-text-color) and $background-color {
$item-text-color: text-contrast($background-color);
$item-text-color: adaptive-contrast(var(--background-color));
}

@if not($item-icon-color) and $item-text-color {
$item-icon-color: hsla(from var(--item-text-color) h s l / 0.8);
}

@if not($hover-item-background) and $background-color {
$hover-item-text-color: text-contrast($background-color);
$hover-item-background: hsla(from adaptive-contrast(var(--background-color)) h s l / .12);
}

@if meta.type-of($background-color) == 'color' {
$hover-item-background: rgba(text-contrast($background-color), .12);
}
@if not($hover-item-text-color) and $item-text-color {
$hover-item-text-color: var(--item-text-color);
}

@if not($hover-item-text-color) and $background-color {
$hover-item-text-color: text-contrast($background-color);
@if not($hover-item-icon-color) and $hover-item-text-color {
$hover-item-icon-color: hsla(from var(--hover-item-text-color) h s l / 0.8);
}

@if not($focused-item-background) and $background-color {
$focused-item-text-color: text-contrast($background-color);

@if meta.type-of($background-color) == 'color' {
$focused-item-background: rgba(text-contrast($background-color), .12);
}
$focused-item-background: hsl(from var(--background-color) h s calc(l * 0.8));
}

@if not($focused-item-text-color) and $focused-item-background {
$focused-item-text-color: text-contrast($focused-item-background);
$focused-item-text-color: adaptive-contrast(var(--focused-item-background));
}

@if not($selected-item-background) and $background-color {
$selected-item-background: hsl(from var(--background-color) h s calc(l * 1.2));
}

@if not($selected-item-text-color) and $selected-item-background {
$selected-item-text-color: text-contrast($selected-item-background);
$selected-item-text-color: adaptive-contrast(var(--selected-item-background));
}

@if not($selected-item-icon-color) and $selected-item-text-color {
$selected-item-icon-color: hsla(from var(--selected-item-text-color) h s l / 0.8);
}

@if not($selected-hover-item-background) and $selected-item-background {
$selected-hover-item-background: hsl(from var(--selected-item-background) h s calc(l * 0.7));
}

@if not($selected-hover-item-text-color) and $selected-hover-item-background {
$selected-hover-item-text-color: text-contrast($selected-hover-item-background);
$selected-hover-item-text-color: adaptive-contrast(var(--selected-hover-item-background));
}

@if not($selected-hover-item-icon-color) and $selected-hover-item-text-color {
$selected-hover-item-icon-color: hsla(from var(--selected-hover-item-text-color) h s l / 0.8);
}

@if not($selected-focus-item-background) and $selected-item-background {
$selected-focus-item-background: hsl(from var(--selected-item-background) h s calc(l * 0.7));
}

@if not($selected-focus-item-text-color) and $selected-focus-item-background {
$selected-focus-item-text-color: text-contrast($selected-focus-item-background);
$selected-focus-item-text-color: adaptive-contrast(var(--selected-focus-item-background));
}

@if not($selected-focus-item-text-color) and $selected-focus-item-background {
$selected-focus-item-text-color: text-contrast($selected-focus-item-background);
$selected-focus-item-text-color: adaptive-contrast(var(--selected-focus-item-background));
}

@if not($disabled-item-text-color) and $background-color {
@if meta.type-of($background-color) == 'color' {
$disabled-item-text-color: rgba(text-contrast($background-color), .36);
@if $variant == 'indigo' {
@if not($focused-item-border-color) and $selected-item-background {
$focused-item-border-color: var(--selected-item-background);
}
}

@if not($disabled-item-text-color) and $background-color {
$disabled-item-text-color: hsla(from adaptive-contrast(var(--background-color)) h s l / .36);
}

@if not($disabled-item-text-color) and $disabled-item-background {
@if meta.type-of($disabled-item-background) == 'color' {
$disabled-item-text-color: rgba(text-contrast($disabled-item-background), .36);
}
$disabled-item-text-color: hsla(from adaptive-contrast(var(--disabled-item-background)) h s l / .36);
}

@if not($header-text-color) and $background-color {
@if meta.type-of($background-color) == 'color' {
$header-text-color: rgba(text-contrast($background-color), .7);
}
$header-text-color: hsla(from adaptive-contrast(var(--background-color)) h s l / .7);
}

@if not($shadow) {
Expand Down Expand Up @@ -189,10 +209,6 @@
border-color: $border-color,
border-width: $border-width,
size: $size,
theme: map.get($schema, '_meta', 'theme'),
_meta: map.merge(if($meta, $meta, ()), (
variant: map.get($schema, '_meta', 'theme')
)),
));
}

Expand All @@ -201,7 +217,7 @@
/// @param {Map} $theme - The theme used to style the component.
@mixin drop-down($theme) {
@include css-vars($theme);
$variant: map.get($theme, '_meta', 'variant');
$variant: map.get($theme, '_meta', 'theme');

%igx-drop-down {
position: absolute;
Expand Down