Skip to content

Commit d474b02

Browse files
committed
Merge branch 'aahmedov/fix-touched-ivalid-color-not-applied-#14900-18.1.x' of https://github.com/IgniteUI/igniteui-angular into aahmedov/fix-touched-ivalid-color-not-applied-#14900-18.1.x
2 parents 9e06d6b + 5e63939 commit d474b02

37 files changed

+760
-157
lines changed

.vscode/launch.json

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,13 @@
2727
// "cwd": "<absolute directory of the project, having an old version of igniteui-angular, on which the migrations are applied>",
2828
"cwd": "C:\\Users\\User\\Desktop\\ng_proj\\test_migrations",
2929
"args": [
30-
"-r",
31-
32-
// you need to install ts-node for the test project
33-
"ts-node/register",
34-
3530
// "<path/to/ng>", "g",
3631
"${env:AppData}/npm/node_modules/@angular/cli/bin/ng", "g",
3732

38-
// "<../../relative/path/from/cwd/to>/igniteui-angular/projects/igniteui-angular/migrations/migration-collection.json:migration-<number>
39-
"../../../../../work/git/igniteui-angular/projects/igniteui-angular/migrations/migration-collection.json:migration-24"
33+
// "<../../relative/path/from/cwd/to>/igniteui-angular/dist/igniteui-angular/migrations/migration-collection.json:migration-<number>
34+
"../../../../../work/git/igniteui-angular/dist/igniteui-angular/migrations/migration-collection.json:migration-23"
4035
],
41-
"env": {
42-
"TS_NODE_PROJECT": "${workspaceFolder}/projects/igniteui-angular/migrations/tsconfig.json"
43-
}
36+
"preLaunchTask": "buildMigrations"
4437
},
4538
{
4639
"name": "Run schematics",

.vscode/tasks.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "npm",
6+
"script": "build:schematics",
7+
"problemMatcher": [],
8+
"label": "buildSchematics",
9+
"detail": "Build schematics"
10+
},
11+
{
12+
"type": "npm",
13+
"script": "build:migrations -- --sourceMap",
14+
"dependsOn": [
15+
"buildSchematics"
16+
],
17+
"problemMatcher": [],
18+
"label": "buildMigrationsSourceMap",
19+
"detail": "Build migrations with sourceMap for debugging"
20+
},
21+
{
22+
"type": "shell",
23+
"command": "node ./scripts/migrations-sourcemap-shift.mjs",
24+
"dependsOn": [
25+
"buildMigrationsSourceMap"
26+
],
27+
"problemMatcher": [],
28+
"label": "buildMigrations",
29+
"detail": "Build migrations with sourceMap for debugging"
30+
},
31+
]
32+
}

projects/igniteui-angular/migrations/common/ServerHost.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type { Tree } from '@angular-devkit/schematics';
22
import * as pathFs from 'path';
33
import * as ts from 'typescript/lib/tsserverlibrary';
44
import { CUSTOM_TS_PLUGIN_NAME, CUSTOM_TS_PLUGIN_PATH } from './tsUtils';
5+
import { createRequire } from 'module';
56

67
/**
78
* Language server host is responsible for **most** of the FS operations / checks
@@ -11,6 +12,8 @@ export class ServerHost implements ts.server.ServerHost {
1112
public readonly args: string[];
1213
public readonly newLine: string;
1314
public readonly useCaseSensitiveFileNames: boolean;
15+
/** Cached because Angular schematics encapsulation's customRequire doesn't provide `resolve` */
16+
private nativeRequire = createRequire(__filename);
1417

1518
constructor(private host: Tree) {
1619
this.args = ts.sys.args;
@@ -126,7 +129,7 @@ export class ServerHost implements ts.server.ServerHost {
126129
moduleName = CUSTOM_TS_PLUGIN_PATH;
127130
paths.push(__dirname);
128131
}
129-
const modulePath = require.resolve(moduleName, { paths });
132+
const modulePath = this.nativeRequire.resolve(moduleName, { paths });
130133
return {
131134
module: require(modulePath),
132135
error: undefined,

projects/igniteui-angular/migrations/common/UpdateChanges.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ export class UpdateChanges {
682682
}
683683

684684
// attempt to find a main tsconfig from workspace:
685-
const wsProject = this.workspace.projects[0];
685+
const wsProject = Object.values(this.workspace.projects)[0];
686686
// technically could be per-project, but assuming there's at least one main tsconfig for IDE support
687687
const projectConfig = wsProject.architect?.build?.options['tsConfig'];
688688

@@ -847,8 +847,8 @@ export class UpdateChanges {
847847
for (const key of projectKeys) {
848848
const wsProject = this.workspace.projects[key];
849849
// intentionally compare against string values of the enum to avoid hard import
850-
if (wsProject.projectType == "application" && wsProject.architect?.build?.options['main']) {
851-
return wsProject.architect.build.options['main'];
850+
if (wsProject.projectType == "application" && wsProject.architect?.build?.options) {
851+
return wsProject.architect.build.options['browser'] || wsProject.architect.build.options['main'];
852852
} else if (wsProject.projectType == "library") {
853853
// TODO: attempt to resolve from project ng-package.json or tsConfig
854854
}

projects/igniteui-angular/src/lib/core/styles/components/badge/_badge-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
--size: #{rem(22px)};
9999
--_badge-size: var(--size);
100100

101-
display: flex;
101+
display: inline-flex;
102102
justify-content: center;
103103
align-items: center;
104104
min-width: var(--_badge-size);
@@ -138,7 +138,7 @@
138138

139139
%igx-badge-value {
140140
white-space: nowrap;
141-
padding: $badge-value-padding;
141+
padding-inline: $badge-value-padding;
142142
}
143143

144144
%igx-badge--success {

projects/igniteui-angular/src/lib/core/styles/components/banner/_banner-theme.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,11 @@
146146
flex-wrap: wrap;
147147
align-self: flex-end;
148148
gap: rem(8px);
149+
150+
> a {
151+
display: inline-flex;
152+
align-items: center;
153+
}
149154
}
150155
}
151156

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3093,8 +3093,11 @@
30933093
max-height: 100%;
30943094
}
30953095
}
3096-
}
30973096

3097+
%igx-grid__tr-pivot--row-area {
3098+
padding-bottom: rem(4px);
3099+
}
3100+
}
30983101

30993102
%grid-thead--pivot {
31003103
display: flex;

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-component.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@
158158
}
159159

160160
@include mx(textarea-group, placeholder) {
161+
@extend %form-group-placeholder !optional;
162+
161163
@include e(notch) {
162164
@extend %textarea-group-notch--focused !optional;
163165
}
@@ -178,6 +180,8 @@
178180
}
179181

180182
@include mx(textarea-group, placeholder, border) {
183+
@extend %form-group-placeholder !optional;
184+
181185
@include e(notch) {
182186
@extend %textarea-group-notch--focused !optional;
183187
}
@@ -212,6 +216,8 @@
212216
}
213217

214218
@include m(placeholder) {
219+
@extend %form-group-placeholder !optional;
220+
215221
@include e(label) {
216222
@extend %form-group-label--float !optional;
217223
@extend %form-group-label--fixed !optional;
@@ -381,6 +387,8 @@
381387
}
382388

383389
@include mx(box, textarea-group, placeholder) {
390+
@extend %form-group-placeholder !optional;
391+
384392
@include e(notch) {
385393
@extend %form-group-notch--box-textarea !optional;
386394
}
@@ -460,6 +468,7 @@
460468

461469
@include mx(border, placeholder) {
462470
@extend %form-group-label--placeholder-border !optional;
471+
@extend %form-group-placeholder !optional;
463472

464473
@include e(label) {
465474
@extend %form-group-label--float-border !optional;
@@ -580,6 +589,8 @@
580589
}
581590

582591
@include mx(fluent, placeholder) {
592+
@extend %form-group-placeholder !optional;
593+
583594
@include e(label) {
584595
@extend %fluent-placeholder-label !optional;
585596
}

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,18 @@
462462
}
463463
}
464464

465+
%form-group-placeholder {
466+
%form-group-label {
467+
transition: none !important;
468+
}
469+
}
470+
471+
%form-group-display:not(%form-group-display--filled) {
472+
%form-group-label {
473+
transition: all $transition-timing;
474+
}
475+
}
476+
465477
%form-group-display--no-margin {
466478
margin-block-start: 0;
467479
}
@@ -883,7 +895,6 @@
883895
backface-visibility: hidden;
884896
will-change: transform;
885897
transform-origin: top left;
886-
transition: all $transition-timing;
887898
margin-inline-start: pad-inline(0, rem(-2px), rem(-4px));
888899
}
889900

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
}
203203

204204
%navdrawer-display-mini-pinned {
205-
flex-basis: var(--igx-mini-nav-drawer-size, #{$item-mini-size});
205+
flex-basis: calc(var(--igx-mini-nav-drawer-size, #{$item-mini-size}) + rem(1px));
206206
}
207207

208208
%aside {
@@ -217,7 +217,7 @@
217217
inset-inline-start: 0;
218218
z-index: 999;
219219
transition: width, padding, transform;
220-
transition-timing-function: $in-out-quad, $in-out-quad;
220+
transition-timing-function: $in-out-quad;
221221
box-shadow: var-get($theme, 'shadow');
222222
padding: $aside-padding;
223223

@@ -279,16 +279,23 @@
279279
}
280280

281281
%aside--mini {
282-
transition-duration: .2s, .2s;
282+
transition-duration: .3s;
283283
width: var(--igx-nav-drawer-size--mini);
284+
min-width: fit-content;
284285

285286
%item {
286287
justify-content: center;
288+
min-width: fit-content;
289+
290+
@if $variant == 'bootstrap' {
291+
width: rem(56px);
292+
}
287293

288294
@if $variant == 'indigo' {
289-
//max-width: rem(32px);
295+
width: rem(32px);
296+
290297
// important is needed to override the typography margins
291-
margin: rem(14px) auto !important;
298+
margin: rem(4px) auto !important;
292299
}
293300

294301
igx-icon {
@@ -298,15 +305,15 @@
298305
}
299306

300307
%aside--normal {
301-
transition-duration: .3s, .3s;
308+
transition-duration: .3s;
302309
width: var(--igx-nav-drawer-size);
303310
}
304311

305312
%overlay {
306313
opacity: 1;
307314
background: color(null, 'gray', 500, .54);
308315
transition: opacity, visibility;
309-
transition-duration: .25s, .25s;
316+
transition-duration: .3s, .3s;
310317
transition-timing-function: ease-in, step-start;
311318
transition-delay: 0s, 0s;
312319
position: absolute;

0 commit comments

Comments
 (0)