Skip to content

feat(input-group): improve input-group theme #15728

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
merged 3 commits into from
Apr 28, 2025
Merged

feat(input-group): improve input-group theme #15728

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89f7020
feat(input-group): improve input-group theme
didimmova Apr 16, 2025
6654ba6
Merge remote-tracking branch 'origin/didimmova/improve-component-them…
didimmova Apr 25, 2025
81c468a
feat(input): fix input problems
didimmova Apr 25, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
272 changes: 254 additions & 18 deletions projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,24 +141,228 @@
}

$theme: digest-schema($input-group-schema);
$variant: map.get($theme, '_meta', 'theme');

$search-resting-elevation: map.get($input-group-schema, 'search-resting-elevation');
$search-hover-elevation: map.get($input-group-schema, 'search-hover-elevation');
$search-disabled-elevation: map.get($input-group-schema, 'search-disabled-elevation');

@if not($placeholder-color) and $box-background {
$placeholder-color: text-contrast($box-background);
@if $variant == 'material' {
@if not($box-background-hover) and $box-background {
$box-background-hover: var(--box-background);
}

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

@if not($box-disabled-background) and $box-background {
$box-disabled-background: hsla(from var(--box-background) h s l / 0.4);
}

@if not($disabled-placeholder-color) and $box-disabled-background {
$disabled-placeholder-color: adaptive-contrast(var(--box-disabled-background));
}

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

@if not($placeholder-color) and $box-background {
$placeholder-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
}

@if not($hover-placeholder-color) and $box-background-hover {
$hover-placeholder-color: hsla(from adaptive-contrast(var(--box-background-hover)) h s l / 0.6);
}

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

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

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

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

@if not($idle-bottom-line-color) and $box-background {
$idle-bottom-line-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
}

@if not($hover-bottom-line-color) and $box-background {
$hover-bottom-line-color: adaptive-contrast(var(--box-background));
}

@if not($idle-secondary-color) and $box-background {
$idle-secondary-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
}

@if not($focused-secondary-color) and $box-background-focus {
$focused-secondary-color: adaptive-contrast(var(--box-background-focus));
}

@if not($input-prefix-color) and $box-background {
$input-prefix-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
}

@if not($input-prefix-color--filled) and $box-background {
$input-prefix-color--filled: adaptive-contrast(var(--box-background));
}

@if not($input-prefix-color--focused) and $box-background-focus {
$input-prefix-color--focused: adaptive-contrast(var(--box-background-focus));
}

@if not($input-suffix-color) and $box-background {
$input-suffix-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
}

@if not($input-suffix-color--filled) and $box-background {
$input-suffix-color--filled: adaptive-contrast(var(--box-background));
}

@if not($input-suffix-color--focused) and $box-background-focus {
$input-suffix-color--focused: adaptive-contrast(var(--box-background-focus));
}
}

@if $variant == 'fluent' or $variant == 'bootstrap' {
@if not($input-prefix-background) and $input-suffix-background {
$input-prefix-background: var(--input-suffix-background);
}

@if not($input-suffix-background) and $input-prefix-background {
$input-suffix-background: var(--input-prefix-background);
}
}

@if not($placeholder-color) and $box-background-hover {
$placeholder-color: text-contrast($box-background-hover);
@if $variant == 'material' or $variant == 'indigo' {
//bottom line color
@if not($hover-bottom-line-color) and $idle-bottom-line-color {
$hover-bottom-line-color: hsl(from var(--idle-bottom-line-color) h s calc(l * 0.8));
}

@if not($focused-bottom-line-color) and $hover-bottom-line-color {
$focused-bottom-line-color: var(--hover-bottom-line-color);
}

@if $variant == 'material' {
@if not($focused-secondary-color) and $focused-bottom-line-color {
$focused-secondary-color: var(--focused-bottom-line-color);
}

@if not($border-color) and $idle-bottom-line-color {
$border-color: var(--idle-bottom-line-color);
}
}
}

//border-color
@if $variant == 'bootstrap' {
@if not($focused-border-color) and $border-color {
$focused-border-color: hsl(from var(--border-color) h s calc(l * 0.8));
}

@if not($focused-secondary-color) and $focused-border-color {
$focused-secondary-color: hsla(from var(--focused-border-color) h s l / 0.4);
}
} @else {
@if not($hover-border-color) and $border-color {
$hover-border-color: hsl(from var(--border-color) h s calc(l * 0.8));
}

@if not($focused-border-color) and $hover-border-color {
$focused-border-color: var(--hover-border-color);
}

@if $variant != 'indigo' {
@if not($focused-secondary-color) and $focused-border-color {
$focused-secondary-color: var(--focused-border-color);
}
}
}

@if not($placeholder-color) and $box-background-focus {
$placeholder-color: text-contrast($box-background-focus);
@if $variant == 'material' {
@if not($focused-bottom-line-color) and $focused-border-color {
$focused-bottom-line-color: var(--focused-border-color);
}
}

//material search input

@if not($placeholder-color) and $search-background {
$placeholder-color: text-contrast($search-background);
$placeholder-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.6);
}

@if not($hover-placeholder-color) and $placeholder-color {
$hover-placeholder-color: var(--placeholder-color);
}

@if not($idle-secondary-color) and $placeholder-color {
$idle-secondary-color: var(--placeholder-color);
}

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

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

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

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

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

@if not($input-prefix-color) and $search-background {
$input-prefix-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.6);
}

@if not($input-prefix-color--filled) and $search-background {
$input-prefix-color--filled: adaptive-contrast(var(--search-background));
}

@if not($input-prefix-color--focused) and $search-background {
$input-prefix-color--focused: adaptive-contrast(var(--search-background));
}

@if not($input-suffix-color) and $search-background {
$input-suffix-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.6);
}

@if not($input-suffix-color--filled) and $search-background {
$input-suffix-color--filled: adaptive-contrast(var(--search-background));
}

@if not($input-suffix-color--focused) and $search-background {
$input-suffix-color--focused: adaptive-contrast(var(--search-background));
}

@if not($search-disabled-background) and $search-background {
$search-disabled-background: hsla(from var(--search-background) h s l / 0.4);
}

@if not($disabled-placeholder-color) and $search-disabled-background {
$disabled-placeholder-color: adaptive-contrast(var(--search-disabled-background));
}

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

@if not($search-resting-shadow) {
Expand All @@ -173,36 +377,70 @@
$search-disabled-shadow: elevation($search-disabled-elevation);
}

//end material search input

@if not($input-prefix-color) and $input-suffix-color {
$input-prefix-color: var(--input-suffix-color);
}

@if not($input-suffix-color) and $input-prefix-color {
$input-suffix-color: var(--input-prefix-color);
}

@if not($input-prefix-background--filled) and $input-prefix-background {
$input-prefix-background--filled: $input-prefix-background;
$input-prefix-background--filled: var(--input-prefix-background);
}

@if not($input-prefix-background--focused) and $input-prefix-background {
$input-prefix-background--focused: $input-prefix-background;
$input-prefix-background--focused: var(--input-prefix-background);
}

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

@if not($input-prefix-color--filled) and $input-prefix-color {
$input-prefix-color--filled: var(--input-prefix-color);
}

@if not($input-prefix-color--focused) and $input-prefix-color--filled {
$input-prefix-color--focused: var(--input-prefix-color--filled);
}

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

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

@if not($input-suffix-background--filled) and $input-suffix-background {
$input-suffix-background--filled: var(--input-suffix-background);
}

@if not($input-suffix-background--focused) and $input-suffix-background {
$input-suffix-background--focused: var(--input-suffix-background);
}

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

@if not($input-suffix-color--filled) and $input-suffix-color {
$input-suffix-color--filled: var(--input-suffix-color);
}

@if not($input-suffix-color--focused) and $input-suffix-color--filled {
$input-suffix-color--focused: var(--input-suffix-color--filled);
}

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

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

@if not($box-border-radius) {
Expand Down Expand Up @@ -271,8 +509,6 @@
input-suffix-background--filled: $input-suffix-background--filled,
input-suffix-color--focused: $input-suffix-color--focused,
input-suffix-background--focused: $input-suffix-background--focused,
theme: map.get($schema, '_meta', 'theme'),
variant: map.get($schema, '_meta', 'theme'),
size: $size,
));
}
Expand All @@ -285,7 +521,7 @@
// when dynamically switching between the input `type` attribute.
@include css-vars($theme);

$variant: map.get($theme, 'variant');
$variant: map.get($theme, '_meta', 'theme');
$transition-timing: .25s $out-cubic;
$material-theme: $variant == 'material';
$indigo-theme: $variant == 'indigo';
Expand Down