Skip to content

Commit b79d122

Browse files
ChronosSFChronosSF
authored
Merge branch '17.2.x' into mkirova/fix-14138-17.2.x-new
2 parents fcc488a + a7dc814 commit b79d122

File tree

17 files changed

+333
-27
lines changed

17 files changed

+333
-27
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ All notable changes for each version of this project will be documented in this
2424
- Removed `leftButtonColor`, `leftButtonBackgroundColor` `rightButtonColor`, and `rightButtonBackgroundColor` properties.
2525
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
2626
- Enhanced the advanced filtering to emit the `filtering` event when filters are applied.
27+
28+
### General
29+
- `IgxSimpleCombo`
30+
- **Behavioral Change** When bound to `ngModel` and `formControlName` directives, the model would not be updated when the user types into the input and will only be updated on selection.
31+
2732

2833
## 17.1.0
2934
### New Features

‎projects/igniteui-angular/migrations/migration-collection.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,11 @@
186186
"version": "17.2.3",
187187
"description": "Updates Ignite UI for Angular from v17.2.2 to v17.2.3",
188188
"factory": "./update-17_2_3"
189+
},
190+
"migration-38": {
191+
"version": "17.2.6",
192+
"description": "Updates Ignite UI for Angular from v17.2.3 to v17.2.6",
193+
"factory": "./update-17_2_6"
189194
}
190195
}
191196
}

‎projects/igniteui-angular/migrations/update-17_2_6/changes/theme-changes.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "../../common/schema/theme-changes.schema.json",
3+
"changes": [
4+
{
5+
"name": "$active-item-color",
6+
"replaceWith": "$icon-selected-color",
7+
"owner": "bottom-nav-theme",
8+
"type": "property"
9+
}
10+
]
11+
}

‎projects/igniteui-angular/migrations/update-17_2_6/index.spec.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import * as path from 'path';
2+
3+
import { EmptyTree } from '@angular-devkit/schematics';
4+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
5+
6+
const version = '17.2.6';
7+
8+
describe(`Update to ${version}`, () => {
9+
let appTree: UnitTestTree;
10+
const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
11+
12+
const configJson = {
13+
projects: {
14+
testProj: {
15+
root: '/',
16+
sourceRoot: '/testSrc'
17+
}
18+
},
19+
schematics: {
20+
'@schematics/angular:component': {
21+
prefix: 'appPrefix'
22+
}
23+
}
24+
};
25+
26+
beforeEach(() => {
27+
appTree = new UnitTestTree(new EmptyTree());
28+
appTree.create('/angular.json', JSON.stringify(configJson));
29+
});
30+
31+
const migrationName = 'migration-38';
32+
33+
it('should rename the $active-item-color property to the $icon-selected-color', async () => {
34+
appTree.create(
35+
`/testSrc/appPrefix/component/test.component.scss`,
36+
`$custom-bottom-nav: bottom-nav-theme($active-item-color: red);`
37+
);
38+
39+
const tree = await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
40+
41+
expect(tree.readContent('/testSrc/appPrefix/component/test.component.scss')).toEqual(
42+
`$custom-bottom-nav: bottom-nav-theme($icon-selected-color: red);`
43+
);
44+
});
45+
});

‎projects/igniteui-angular/migrations/update-17_2_6/index.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
2+
import { BoundPropertyObject, InputPropertyType, UpdateChanges } from "../common/UpdateChanges";
3+
4+
const version = "17.2.6";
5+
6+
export default (): Rule => async (host: Tree, context: SchematicContext) => {
7+
context.logger.info(
8+
`Applying migration for Ignite UI for Angular to version ${version}`,
9+
);
10+
const update = new UpdateChanges(__dirname, host, context);
11+
12+
update.addValueTransform('vertical_to_orientation', (args: BoundPropertyObject): void => {
13+
args.bindingType = InputPropertyType.STRING;
14+
15+
switch (args.value) {
16+
case 'true':
17+
args.value = 'vertical';
18+
break;
19+
case 'false':
20+
args.value = 'horizontal';
21+
break;
22+
default:
23+
args.value += ` ? 'vertical' : 'horizontal' `;
24+
}
25+
});
26+
27+
update.applyChanges();
28+
};

‎projects/igniteui-angular/src/lib/core/styles/components/bottom-nav/_bottom-nav-theme.scss‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,33 +61,45 @@
6161
}
6262
}
6363

64+
@if not($icon-color) and $background {
65+
@if meta.type-of($background) == 'color' {
66+
$icon-color: text-contrast($background);
67+
}
68+
}
69+
6470
@if not($icon-color) and $label-color {
6571
@if meta.type-of($label-color) == 'color' {
6672
$icon-color: $label-color;
6773
}
6874
}
6975

70-
@if not($icon-disabled-color) and $label-disabled-color {
71-
@if meta.type-of($label-disabled-color) == 'color' {
72-
$icon-disabled-color: $label-disabled-color;
76+
@if not($label-color) and $icon-color {
77+
@if meta.type-of($icon-color) == 'color' {
78+
$label-color: $icon-color;
7379
}
7480
}
7581

76-
@if not($label-disabled-color) and $icon-disabled-color {
77-
@if meta.type-of($icon-disabled-color) == 'color' {
78-
$label-disabled-color: $icon-disabled-color;
82+
@if not($icon-selected-color) and $label-selected-color {
83+
@if meta.type-of($label-selected-color) == 'color' {
84+
$icon-selected-color: $label-selected-color;
7985
}
8086
}
8187

82-
@if not($icon-selected-color) and $label-selected-color {
83-
@if meta.type-of($background) == 'color' {
84-
$icon-selected-color: $label-selected-color;
88+
@if not($label-selected-color) and $icon-selected-color {
89+
@if meta.type-of($icon-selected-color) == 'color' {
90+
$label-selected-color: $icon-selected-color;
8591
}
8692
}
8793

88-
@if not($icon-color) and $background {
89-
@if meta.type-of($background) == 'color' {
90-
$icon-color: text-contrast($background);
94+
@if not($icon-disabled-color) and $label-disabled-color {
95+
@if meta.type-of($label-disabled-color) == 'color' {
96+
$icon-disabled-color: $label-disabled-color;
97+
}
98+
}
99+
100+
@if not($label-disabled-color) and $icon-disabled-color {
101+
@if meta.type-of($icon-disabled-color) == 'color' {
102+
$label-disabled-color: $icon-disabled-color;
91103
}
92104
}
93105

‎projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@
139139
}
140140
}
141141

142+
@if not($icon-color) and $background {
143+
@if meta.type-of($background) == 'color' {
144+
$icon-color: text-contrast($background);
145+
}
146+
}
147+
142148
@if not($icon-color-hover) and $hover-foreground {
143149
@if meta.type-of($hover-background) == 'color' {
144150
$icon-color-hover: $hover-foreground;
@@ -577,7 +583,7 @@
577583
background: var-get($flat-theme, 'focus-visible-background');
578584
color: var-get($flat-theme, 'focus-visible-foreground');
579585
border-color: var-get($flat-theme, 'focus-visible-border-color');
580-
586+
581587
igx-icon {
582588
color: var-get($flat-theme, 'icon-color');
583589
}
@@ -599,7 +605,7 @@
599605
color: var-get($flat-theme, 'focus-foreground');
600606
}
601607
}
602-
608+
603609
@if ($variant == 'bootstrap') {
604610
box-shadow: 0 0 0 rem(4px) var-get($flat-theme, 'shadow-color');
605611
}
@@ -780,7 +786,7 @@
780786
map.get($items-gap, 'cosy'),
781787
$items-gap-indigo-comfortable
782788
);
783-
789+
784790
&:active {
785791
igx-icon {
786792
color: var-get($outlined-theme, 'icon-color-hover');

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,35 @@
9898
--item-hover-background: #{color($color: 'gray', $variant: 100)};
9999
--item-selected-background: #{color($color: 'gray', $variant: 100)};
100100
--item-text-color: #{color($color: 'gray', $variant: 700)};
101+
--item-icon-color: #{color($color: 'gray', $variant: 700)};
101102
--item-hover-text-color: #{color($color: 'gray', $variant: 800)};
103+
--item-hover-icon-color: #{color($color: 'gray', $variant: 800)};
102104
--item-selected-text-color: #{if(
103105
$variant == 'indigo-design',
104106
contrast-color($color: 'surface'),
105107
color($color: 'secondary', $variant: 500)
106108
)};
109+
--item-selected-icon-color: #{if(
110+
$variant == 'indigo-design',
111+
contrast-color($color: 'surface'),
112+
color($color: 'secondary', $variant: 500)
113+
)};
114+
--item-selected-hover-icon-color: #{if(
115+
$variant == 'fluent',
116+
color($color: 'secondary', $variant: 500),
117+
contrast-color($color: 'gray', $variant: 50)
118+
)};
107119
--item-border-color: transparent;
120+
--item-hover-border-color: transparent;
121+
--item-focused-border-color: #{if(
122+
$variant == 'fluent',
123+
color($color: 'gray', $variant: 700),
124+
transparent
125+
)};
108126
--item-selected-border-color: transparent;
127+
--item-selected-hover-border-color: transparent;
109128
--item-disabled-border: transparent;
129+
--disabled-selected-border-color: transparent;
110130
}
111131

112132
@include tree(tree-theme(

‎projects/igniteui-angular/src/lib/core/styles/components/overlay/_overlay-theme.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@
102102
// WARN: This is a workaround around a bug in Safari.
103103
position: absolute;
104104
visibility: hidden;
105+
// width/height/min-width to 0 needed for bug #14303
106+
width: 0;
107+
min-width: 0;
108+
height: 0;
109+
// needed for bug #14302
110+
padding: 0 !important;
105111
top: 0;
106112
left: 0;
107113
margin: -1px;

‎projects/igniteui-angular/src/lib/directives/tooltip/tooltip-target.directive.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class IgxTooltipTargetDirective extends IgxToggleActionDirective implemen
9999
*/
100100
@Input('igxTooltipTarget')
101101
public override set target(target: any) {
102-
if (target !== null && target !== '') {
102+
if (target instanceof IgxTooltipDirective) {
103103
this._target = target;
104104
}
105105
}

0 commit comments

Comments
 (0)