Merge branch 'master' into skrastev/fix-9158

ChronosSF · web-flow · commit f44e44ef515d · 2021-04-01T19:20:57.000+03:00
diff --git a/projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts b/projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts
@@ -65,6 +65,10 @@ describe('UpdateChanges', () => {
             'test2.component.html',
             '<igx-remove attr></igx-remove><igx-component>'
         );
+        appTree.create(
+            'test3.component.html',
+            '<igx-remove-me-not attr></igx-remove-me-not> <igx-component> <igx-component-child></igx-component-child> </igx-component>'
+        );
 
         const update = new UnitUpdateChanges(__dirname, appTree);
         expect(fs.existsSync).toHaveBeenCalledWith(jsonPath);
@@ -74,6 +78,9 @@ describe('UpdateChanges', () => {
         update.applyChanges();
         expect(appTree.readContent('test.component.html')).toEqual('<igx-replaced> <content>  </igx-replaced> ');
         expect(appTree.readContent('test2.component.html')).toEqual('<igx-replaced>');
+        expect(appTree.readContent('test3.component.html')).toEqual(
+            '<igx-remove-me-not attr></igx-remove-me-not> <igx-replaced> <igx-component-child></igx-component-child> </igx-replaced>'
+        );
         done();
     });
 
@@ -175,7 +182,7 @@ describe('UpdateChanges', () => {
         });
         spyOn<any>(fs, 'readFileSync').and.callFake(() => JSON.stringify(inputJson));
 
-        const fileContent = `<one [replaceMe]="a"> <comp\r\ntag [replaceMe]="dwdw" [oldProp]=''> </other> <another oldProp="b" />`;
+        let fileContent = `<one [replaceMe]="a"> <comp\r\ntag [replaceMe]="dwdw" [oldProp]=''> </other> <another oldProp="b" />`;
         appTree.create('test.component.html', fileContent);
 
         const update = new UnitUpdateChanges(__dirname, appTree);
@@ -213,6 +220,15 @@ describe('UpdateChanges', () => {
         update4.applyChanges();
         expect(appTree.readContent('test.component.html')).toEqual(
             `<comp\r\ntag [oldProp]="g" [replaced]="NOT.replaceMe" ><another [otherProp]="oldProp" /></comp>`);
+
+
+        fileContent = `<span [bait]="replaceMe"><ng-container ngProjectAs="comp"> sike! </ng-container></span>`;
+        appTree.overwrite('test.component.html', fileContent);
+        update4.applyChanges();
+        expect(appTree.readContent('test.component.html')).toEqual(
+            `<span [bait]="replaceMe"><ng-container ngProjectAs="comp"> sike! </ng-container></span>`
+        );
+
         done();
     });
 
diff --git a/projects/igniteui-angular/migrations/common/UpdateChanges.ts b/projects/igniteui-angular/migrations/common/UpdateChanges.ts
@@ -198,7 +198,7 @@ export class UpdateChanges {
                     regSource = String.raw`\<${change.selector}[\s\S]*?\<\/${change.selector}\>`;
                     replace = '';
                 } else {
-                    regSource = String.raw`\<(\/?)${change.selector}`;
+                    regSource = String.raw`\<(\/?)${change.selector}(?=[\s\>])`;
                     replace = `<$1${change.replaceWith}`;
                 }
                 break;
@@ -276,6 +276,9 @@ export class UpdateChanges {
             }
 
             const matches = fileContent.match(new RegExp(searchPattern, 'g'));
+            if (!matches) {
+                continue;
+            }
 
             for (const match of matches) {
                 let replaceStatement = replace;
diff --git a/projects/igniteui-angular/src/lib/core/styles/base/utilities/_mixins.scss b/projects/igniteui-angular/src/lib/core/styles/base/utilities/_mixins.scss
@@ -161,14 +161,16 @@
 ///
 @mixin igx-palette-vars($palette, $contrast: true) {
     $scope: if(is-root(), ':root', '&');
-    $theme: map-get(map-get($palette, '_meta'), 'variant');
+    $_meta: map-get($palette, '_meta');
+    $theme: if($_meta, map-get($_meta, 'variant'), null);
 
     #{$scope} {
         @each $name, $color in $palette {
             @each $variant, $value in $color {
-                $valid: not(str-index(#{$variant}, 'contrast')) and not(str-index(#{$variant}, 'variant'));
+                $_valid-base: type-of(map-get($color, 500)) == 'color' and $theme;
+                $_valid-variant: not(str-index(#{$variant}, 'contrast')) and not(str-index(#{$variant}, 'variant')) and $theme;
 
-                @if($variant == 500) {
+                @if $_valid-base and $variant == 500 {
                     --igx-#{$name}-h: #{round(hue($value))};
                     --igx-#{$name}-s: #{round(saturation($value))};
                     --igx-#{$name}-l: #{round(lightness($value))};
@@ -180,7 +182,7 @@
                     }
                 }
 
-                @if $valid {
+                @if $_valid-base and $_valid-variant {
                     --igx-#{$name}-#{$variant}: #{_gen-hsla-color($name, $variant, $theme)};
                 } @else if $name != '_meta' {
                     --igx-#{$name}-#{$variant}: #{$value};
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -3255,7 +3255,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
                 ((event.target === this.tbody.nativeElement && this.navigation.activeNode.row >= 0 &&
                     this.navigation.activeNode.row < this.dataView.length)
                     || (event.target === this.theadRow.nativeElement && this.navigation.activeNode.row === -1)
-                    || (event.target === this.tfoot.nativeElement && this.navigation.activeNode.row === this.dataView.length)) &&
+                    || (event.target === this.tfoot.nativeElement.children[0] &&
+                        this.navigation.activeNode.row === this.dataView.length)) &&
                 !(this.rowEditable && this.crudService.rowEditingBlocked && this.crudService.rowInEditMode)) {
                 this.navigation.lastActiveNode = this.navigation.activeNode;
                 this.navigation.activeNode = {} as IActiveNode;
diff --git a/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts b/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts
@@ -529,6 +529,7 @@ export class IgxGridNavigationService {
             this.grid.getNextCell(this.activeNode.row, this.activeNode.column, col => col.editable);
         if (!this.grid.crudService.rowInEditMode && this.isActiveNode(next.rowIndex, next.visibleColumnIndex)) {
             this.grid.crudService.endEdit(true, event);
+            this.grid.tbody.nativeElement.focus();
             return;
         }
         event.preventDefault();
diff --git a/src/styles/_demo-theme.scss b/src/styles/_demo-theme.scss
@@ -9,6 +9,10 @@ body {
     color: $igx-foreground-color;
 }
 
+:root {
+    --some-dynamic-color: hsl(#{random(360)}, 100%, 50%);
+}
+
 @include igx-core($direction: $direction);
 @include igx-typography($font-family: $typeface, $type-scale: $type-scale);
 @include igx-theme($palette: $palette, $schema: $schema, $legacy-support: $legacy-support);
diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss
@@ -73,26 +73,26 @@ $handmade-palette: (
         'A700-contrast': white
     ),
     grays: (
-        50: rgba(0, 0, 0, .02),
-        '50-contrast': black,
-        100: rgba(0, 0, 0, .04),
-        '100-contrast': black,
-        200: rgba(0, 0, 0, .08),
-        '200-contrast': black,
-        300: rgba(0, 0, 0, .12),
-        '300-contrast': black,
-        400: rgba(0, 0, 0, .26),
-        '400-contrast': black,
-        500: rgba(0, 0, 0, .38),
+        50: rgba(255, 255, 255, .02),
+        '50-contrast': white,
+        100: rgba(255, 255, 255, .04),
+        '100-contrast': white,
+        200: rgba(255, 255, 255, .08),
+        '200-contrast': white,
+        300: rgba(255, 255, 255, .12),
+        '300-contrast': white,
+        400: rgba(255, 255, 255, .26),
+        '400-contrast': white,
+        500: rgba(255, 255, 255, .38),
         '500-contrast': black,
-        600: rgba(0, 0, 0, .54),
-        '600-contrast': white,
-        700: rgba(0, 0, 0, .62),
-        '700-contrast': white,
-        800: rgba(0, 0, 0, .74),
-        '800-contrast': white,
-        900: rgba(0, 0, 0, .87),
-        '900-contrast': white
+        600: rgba(255, 255, 255, .54),
+        '600-contrast': black,
+        700: rgba(255, 255, 255, .62),
+        '700-contrast': black,
+        800: rgba(255, 255, 255, .74),
+        '800-contrast': black,
+        900: rgba(255, 255, 255, .87),
+        '900-contrast': black
     ),
     info: (
         500: #1377d5,
@@ -111,7 +111,9 @@ $handmade-palette: (
         '500-contrast': black
     ),
     surface: (
-        500: #fff,
-        '500-contrast': black
+        500: #222,
+        '500-contrast': white
     )
 );
+
+// $palette: $handmade-palette;

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,7 @@ export class IgxGridNavigationService {`
`529`	`529`	`this.grid.getNextCell(this.activeNode.row, this.activeNode.column, col => col.editable);`
`530`	`530`	`if (!this.grid.crudService.rowInEditMode && this.isActiveNode(next.rowIndex, next.visibleColumnIndex)) {`
`531`	`531`	`this.grid.crudService.endEdit(true, event);`
	`532`	`+ this.grid.tbody.nativeElement.focus();`
`532`	`533`	`return;`
`533`	`534`	`}`
`534`	`535`	`event.preventDefault();`