Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
199 changes: 101 additions & 98 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"express": "^5.2.1",
"fflate": "^0.8.1",
"igniteui-i18n-core": "^1.0.2",
"igniteui-theming": "^24.1.1",
"igniteui-theming": "^25.0.0-beta.1",
"igniteui-trial-watermark": "^3.1.0",
"jspdf": "^4.0.0",
"lodash-es": "^4.17.21",
Expand Down
70 changes: 36 additions & 34 deletions projects/igniteui-angular-elements/src/themes/_util.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@use 'sass:string';
@use 'sass:list';
@use '../../../igniteui-angular/core/src/core/styles/themes' as igx;
@use 'igniteui-theming/sass/themes/config' as theme;
@use './variables' as vars;

/// Prefix used for 'global' component CSS vars
Expand All @@ -25,52 +26,58 @@ $elements-selector-prefix: 'igc';
/// @access private
/// @param {Map} $theme_schema - The component's theme schema
/// @return {Map} - Updated component theme schema
@function updateElementName($theme_schema) {
$prefix: 'ig';
@function update-element($theme_schema) {
$result: $theme_schema;

@if map.has-key($theme_schema, "name") {
$name: map.get($theme_schema, "name");
$selector: map.get($theme_schema, "selector") or $name;
@if map.has-key($theme_schema, '_meta', 'name') {
$name: map.get($theme_schema, '_meta', 'name');
$selector: map.get($theme_schema, 'selector') or $name;
$modified: ();

// @debug "name: #{$name}";

@if string.index($name, 'igx-') {
$name: list.nth(string.split($name, 'igx-'), -1);
$name: '#{$elements-var-prefix}-#{$name}';
// @debug "name after: #{$name}";
$modified: map.merge($modified, (name: $name));
}

// For exposed components also modify selector with updated element prefix:
@if list.index(vars.$allowed, map.get($theme_schema, "name")) {
// @debug "selector before: #{$selector}";
$selector: updateSelectors($selector);
// @debug "selector after: #{$selector}";
// For exposed components also update the selector with updated element prefix
@if list.index(vars.$allowed, #{igx-#{$name}}) {
$selector: update-selectors($selector);
}

$modified: map.merge($modified, (selector: $selector));
$modified: map.merge(
$modified,
(
selector: $selector,
)
);

// INFO: Weird use case! I'm not aware of any component using this, but just in case...
@if map.has-key($theme_schema, 'themes') {
$themes: map.get($theme_schema, 'themes');
$newThemes: ();
$new: ();

@each $name, $sub_schema in $themes {
$newThemes: map.set($newThemes, $name, updateElementName($sub_schema));
$newThemes: map.set(
$newThemes,
$name,
update-element($sub_schema)
);
}
$modified: map.merge($modified, (themes: $newThemes));

$modified: map.deep-merge(
$modified,
(
themes: $new,
)
);
}

$result: map.merge($result, $modified);
}

@return $result;
}

/// Break down the selector and update `igx-` element selectors with matching `igc-` for exposed Elements
/// @access private
/// @param {String} $selector - The selector(s) to update
/// @return {String} - Updated selector(s) with `igc-` prefixed equivalents
@function updateSelectors($selector) {
@function update-selectors($selector) {
$result: ();

@each $sel in $selector {
Expand All @@ -83,7 +90,7 @@ $elements-selector-prefix: 'igc';
}
}

@return "#{$result}";
@return '#{$result}';
}

/// Generates an Ignite UI for Angular Elements global theme.
Expand All @@ -96,18 +103,13 @@ $elements-selector-prefix: 'igc';
/// @requires $light-material-schema
/// @requires {function} is-component
/// @requires {function} is-used
@mixin elements-theme(
$palette,
$schema,
$exclude,
// $roundness,
// $elevation,
// $elevations,
) {
@mixin elements-theme($palette, $schema, $exclude) {
@include theme.configure-variable-prefix($elements-var-prefix);

@include igx.theme-internal(
$palette: $palette,
$exclude: $exclude,
$schema: $schema,
$theme-handler: meta.get-function("updateElementName")
$theme-handler: meta.get-function('update-element')
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
igx-icon {
--component-size: var(--action-strip-size);

width: var(--igx-icon-size, rem(18px));
height: var(--igx-icon-size, rem(18px));
font-size: var(--igx-icon-size, rem(18px));
width: var(--ig-icon-size, rem(18px));
height: var(--ig-icon-size, rem(18px));
font-size: var(--ig-icon-size, rem(18px));
}

&%igx-drop-down__item {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
overflow: hidden;

igx-icon {
--size: var(--igx-icon-size, #{sizable(rem(12px), rem(14px), rem(16px))});
--size: var(--ig-icon-size, #{sizable(rem(12px), rem(14px), rem(16px))});
--component-size: var(--badge-size);

display: inline-flex;
Expand All @@ -42,7 +42,6 @@
$icon-size: sizable(rem(8px), rem(10px), rem(12px));

--ig-icon-size: #{$icon-size};
--igx-icon-size: #{$icon-size};
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
$icon-size: rem(18px);

--ig-icon-size: #{$icon-size};
--igx-icon-size: #{$icon-size};
}

&:active {
Expand All @@ -159,7 +158,6 @@
$icon-size: rem(16px);

--ig-icon-size: #{$icon-size};
--igx-icon-size: #{$icon-size};
}

&:hover {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,9 @@
--component-size: var(--ig-size, var(--ig-size-large));
display: flex;
justify-content: center;
width: var(--igx-icon-size, #{$icon-in-button-size});
height: var(--igx-icon-size, #{$icon-in-button-size});
font-size: var(--igx-icon-size, #{$icon-in-button-size});
width: var(--ig-icon-size, #{$icon-in-button-size});
height: var(--ig-icon-size, #{$icon-in-button-size});
font-size: var(--ig-icon-size, #{$icon-in-button-size});
transition: var(--_button-transition);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
// in order to override the !important rule of .igx-icon--inactive.
%igx-combo__case-icon {
igx-icon {
--igx-icon-disabled-color: var(--ig-gray-600);
--ig-icon-disabled-color: var(--ig-gray-600);

opacity: 1;
}
Expand Down Expand Up @@ -159,8 +159,8 @@

@if $variant == 'fluent' or $variant == 'bootstrap' {
%igx-combo__search {
--igx-input-group-input-suffix-background: transparent;
--igx-input-group-input-suffix-background--focused: transparent;
--ig-input-group-input-suffix-background: transparent;
--ig-input-group-input-suffix-background--focused: transparent;

.igx-input-group__bundle::after {
border-block-end-color: var(--border-color);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

@if $variant != 'indigo' {
igx-icon {
--size: var(--igx-icon-size, #{rem(15px)});
--size: var(--ig-icon-size, #{rem(15px)});
}
}
}
Expand Down Expand Up @@ -546,9 +546,9 @@
}

igx-icon {
width: var(--igx-icon-size, #{$tree-node-expander-size});
height: var(--igx-icon-size, #{$tree-node-expander-size});
font-size: var(--igx-icon-size, #{$tree-node-expander-size});
width: var(--ig-icon-size, #{$tree-node-expander-size});
height: var(--ig-icon-size, #{$tree-node-expander-size});
font-size: var(--ig-icon-size, #{$tree-node-expander-size});
}

> igx-checkbox,
Expand Down Expand Up @@ -694,9 +694,9 @@
}

igx-icon {
width: var(--igx-icon-size, #{rem(18px)});
height: var(--igx-icon-size, #{rem(18px)});
font-size: var(--igx-icon-size, #{rem(18px)});
width: var(--ig-icon-size, #{rem(18px)});
height: var(--ig-icon-size, #{rem(18px)});
font-size: var(--ig-icon-size, #{rem(18px)});
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,43 +436,43 @@
igx-tree-grid {
@if $variant == 'material' {
@if $theme-variant == 'light' {
--igx-chip-disabled-text-color: #{color($color: 'gray', $variant: 500)};
--igx-chip-disabled-background: #{color($color: 'gray', $variant: 300)};
--igx-chip-disabled-border-color: #{color($color: 'gray', $variant: 300)};
--ig-chip-disabled-text-color: #{color($color: 'gray', $variant: 500)};
--ig-chip-disabled-background: #{color($color: 'gray', $variant: 300)};
--ig-chip-disabled-border-color: #{color($color: 'gray', $variant: 300)};
}
@if $theme-variant == 'dark' {
--igx-chip-disabled-text-color: #{color($color: 'gray', $variant: 300)};
--igx-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--igx-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-text-color: #{color($color: 'gray', $variant: 300)};
--ig-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
}
}

@if $variant == 'fluent' {
@if $theme-variant == 'dark' {
--igx-chip-disabled-text-color: #{color($color: 'gray', $variant: 400)};
--igx-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--igx-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-text-color: #{color($color: 'gray', $variant: 400)};
--ig-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
}
}

@if $variant == 'bootstrap' {
@if $theme-variant == 'dark' {
--igx-chip-disabled-text-color: #{color($color: 'gray', $variant: 400)};
--igx-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--igx-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-text-color: #{color($color: 'gray', $variant: 400)};
--ig-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
}
}

@if $variant == 'indigo' {
@if $theme-variant == 'light' {
--igx-chip-disabled-text-color: #{color($color: 'gray', $variant: 500)};
--igx-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--igx-chip-disabled-border-color: #{color($color: 'gray', $variant: 300)};
--ig-chip-disabled-text-color: #{color($color: 'gray', $variant: 500)};
--ig-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-border-color: #{color($color: 'gray', $variant: 300)};
}
@if $theme-variant == 'dark' {
--igx-chip-disabled-text-color: #{color($color: 'gray', $variant: 300)};
--igx-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--igx-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-text-color: #{color($color: 'gray', $variant: 300)};
--ig-chip-disabled-background: #{color($color: 'gray', $variant: 200)};
--ig-chip-disabled-border-color: #{color($color: 'gray', $variant: 200)};
}
}
}
Expand Down Expand Up @@ -501,7 +501,7 @@
map.get($grouparea-min-height, 'comfortable')
)};

--igx-tree-indent-size: #{sizable(rem(12px), rem(16px), rem(24px))};
--ig-tree-indent-size: #{sizable(rem(12px), rem(16px), rem(24px))};

position: relative;
display: grid;
Expand Down Expand Up @@ -1283,9 +1283,9 @@

> igx-icon {
color: color($color: 'error');
width: var(--igx-icon-size, rem(18px));
height: var(--igx-icon-size, rem(18px));
font-size: var(--igx-icon-size, rem(18px));
width: var(--ig-icon-size, rem(18px));
height: var(--ig-icon-size, rem(18px));
font-size: var(--ig-icon-size, rem(18px));
}

%grid-cell-text {
Expand Down Expand Up @@ -1543,7 +1543,7 @@

@if $variant != 'indigo' {
igx-icon {
--size: var(--igx-icon-size, #{rem(15px)});
--size: var(--ig-icon-size, #{rem(15px)});
}
}

Expand Down Expand Up @@ -2174,9 +2174,9 @@
margin: 0 rem(4px);

igx-icon {
width: var(--igx-icon-size, #{rem(16px)});
height: var(--igx-icon-size, #{rem(16px)});
font-size: var(--igx-icon-size, #{rem(16px)});
width: var(--ig-icon-size, #{rem(16px)});
height: var(--ig-icon-size, #{rem(16px)});
font-size: var(--ig-icon-size, #{rem(16px)});
}

[dir='rtl'] & {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@
%selector-base,
%selector-item-ghost {
igx-icon {
width: var(--igx-icon-size, #{rem(18px)});
height: var(--igx-icon-size, #{rem(18px)});
font-size: var(--igx-icon-size, #{rem(18px)});
width: var(--ig-icon-size, #{rem(18px)});
height: var(--ig-icon-size, #{rem(18px)});
font-size: var(--ig-icon-size, #{rem(18px)});
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
--component-size: var(--ig-size, var(--ig-size-large));
display: flex;
justify-content: center;
width: var(--igx-icon-size, #{$icon-in-button-size});
height: var(--igx-icon-size, #{$icon-in-button-size});
font-size: var(--igx-icon-size, #{$icon-in-button-size});
width: var(--ig-icon-size, #{$icon-in-button-size});
height: var(--ig-icon-size, #{$icon-in-button-size});
font-size: var(--ig-icon-size, #{$icon-in-button-size});
}

@if $variant == 'fluent' {
Expand Down
Loading
Loading