Merge branch '18.2.x' into mkirkova-fix-15113-18.2.x

Author: gedinakova

projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts

@@ -235,8 +235,8 @@ export const GridResourceStringsEN: IGridResourceStrings = {
     igx_grid_excel_custom_dialog_add: 'add filter',
     igx_grid_excel_custom_dialog_clear: 'Clear filter',
     igx_grid_excel_custom_dialog_header: 'Custom auto-filter on column: ',
-    igx_grid_excel_cancel: 'cancel',
-    igx_grid_excel_apply: 'apply',
+    igx_grid_excel_cancel: 'Cancel',
+    igx_grid_excel_apply: 'Apply',
     igx_grid_excel_search_placeholder: 'Search',
     igx_grid_excel_select_all: 'Select All',
     igx_grid_excel_select_all_search_results: 'Select all search results',

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-component.scss

@@ -232,10 +232,6 @@
             @extend %igx-checkbox--indeterminate-fluent !optional;
         }
 
-        @include mx(material, indeterminate) {
-            @extend %igx-checkbox--indeterminate-material !optional;
-        }
-
         @include mx(invalid, indeterminate) {
             @extend %igx-checkbox--indeterminate--invalid !optional;
 
@@ -246,6 +242,14 @@
             }
         }
 
+        @include mx(material, disabled, indeterminate) {
+            @extend %igx-checkbox--disabled-indeterminate-material !optional;
+        }
+
+        @include mx(fluent, disabled, indeterminate) {
+            @extend %igx-checkbox--disabled-indeterminate-fluent !optional;
+        }
+
         @include mx(indigo, focused, indeterminate) {
             @extend %igx-checkbox--focused-checked-indigo !optional;
         }

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss

@@ -377,6 +377,12 @@
                 z-index: 1;
             }
         }
+    }
+
+    %igx-checkbox--disabled-indeterminate-fluent {
+        %cbx-composite-mark {
+            stroke: transparent;
+        }
 
         %cbx-composite--x--disabled {
             background: transparent;
@@ -387,7 +393,7 @@
         }
     }
 
-    %igx-checkbox--indeterminate-material {
+    %igx-checkbox--disabled-indeterminate-material {
         %cbx-composite--x--disabled {
             border-color: var-get($theme, 'disabled-indeterminate-color');
             background: var-get($theme, 'disabled-indeterminate-color');

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

@@ -3248,6 +3248,14 @@
         }
     }
 
+    igx-child-grid-row {
+        igx-child-grid-row {
+            %igx-grid__tr-action {
+                border-inline-end: var-get($theme, 'header-border-width') var-get($theme, 'header-border-style') var-get($theme, 'header-border-color');
+            }
+        }
+    }
+
     // Pivot grid
     %igx-grid__pivot--super-compact {
         --ig-size: 1 !important;

projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss

@@ -153,13 +153,6 @@
         } @else if $variant == 'fluent' {
             gap: rem(2px);
         }
-
-        &[dir='rtl'],
-        [dir='rtl'] & {
-            %linear-bar {
-                transform: rotateY(180deg);
-            }
-        }
     }
 
     %linear-bar {
@@ -225,6 +218,13 @@
         &::after {
             animation: indeterminate-primary-scale 2000ms infinite linear;
         }
+
+        [dir="rtl"] & {
+            animation: indeterminate-primary-rtl 2000ms infinite linear;
+            left: auto;
+            right: -145.166611%;
+            transform-origin: top right;
+        }
     }
 
     %linear-indicator--indeterminate-secondary {
@@ -236,6 +236,13 @@
             width: 100%;
             height: inherit;
         }
+
+        [dir="rtl"] & {
+            animation: indeterminate-secondary-rtl 2000ms infinite linear;
+            left: auto;
+            right: -54.888891%;
+            transform-origin: top right;
+        }
     }
 
     %linear-indicator--default {
@@ -317,6 +324,26 @@
         }
     }
 
+    @keyframes indeterminate-primary-rtl {
+        0% {
+          transform: translateX(0);
+        }
+
+        20% {
+          animation-timing-function: $indeterminate-primary-translate-step-2;
+          transform: translateX(0);
+        }
+
+        59.15% {
+          animation-timing-function: $indeterminate-primary-translate-step-3;
+          transform: translateX(-83.67142%);
+        }
+
+        100% {
+          transform: translateX(-200.611057%);
+        }
+    }
+
     @keyframes indeterminate-primary-scale {
         0% {
             transform: scaleX(.08);
@@ -359,6 +386,27 @@
         }
     }
 
+    @keyframes indeterminate-secondary-rtl {
+        0% {
+          animation-timing-function: $indeterminate-secondary-translate-step-1;
+          transform: translateX(0);
+        }
+
+        25% {
+          animation-timing-function: $indeterminate-secondary-translate-step-2;
+          transform: translateX(-37.651913%);
+        }
+
+        48.35% {
+          animation-timing-function: $indeterminate-secondary-translate-step-3;
+          transform: translateX(-84.386165%);
+        }
+
+        100% {
+          transform: translateX(-160.277782%);
+        }
+    }
+
     @keyframes indeterminate-secondary-scale {
         0% {
             animation-timing-function: $indeterminate-secondary-scale-step-1;

projects/igniteui-angular/src/lib/test-utils/grid-functions.spec.ts

@@ -738,7 +738,7 @@ export class GridFunctions {
     public static getApplyButtonExcelStyleFiltering(fix: ComponentFixture<any>, menu = null, grid = 'igx-grid') {
         const excelMenu = menu ? menu : GridFunctions.getExcelStyleFilteringComponent(fix, grid);
         const containedButtons = Array.from(excelMenu.querySelectorAll('.igx-button--contained'));
-        const applyButton: any = containedButtons.find((rb: any) => rb.innerText === 'apply');
+        const applyButton: any = containedButtons.find((rb: any) => rb.innerText.toLowerCase() === 'apply');
         return applyButton;
     }
 
@@ -750,7 +750,7 @@ export class GridFunctions {
     public static clickCancelExcelStyleFiltering(fix: ComponentFixture<any>, menu = null) {
         const excelMenu = menu ? menu : GridFunctions.getExcelStyleFilteringComponent(fix);
         const flatButtons = Array.from(excelMenu.querySelectorAll('.igx-button--flat'));
-        const cancelButton: any = flatButtons.find((rb: any) => rb.innerText === 'cancel');
+        const cancelButton: any = flatButtons.find((rb: any) => rb.innerText.toLowerCase() === 'cancel');
         cancelButton.click();
     }
 
@@ -771,7 +771,7 @@ export class GridFunctions {
     public static getApplyExcelStyleCustomFiltering(fix: ComponentFixture<any>): HTMLElement {
         const customFilterMenu = GridFunctions.getExcelStyleCustomFilteringDialog(fix);
         const containedButtons = Array.from(customFilterMenu.querySelectorAll('.igx-button--contained'));
-        const applyButton = containedButtons.find((rb: any) => rb.innerText === 'apply');
+        const applyButton = containedButtons.find((rb: any) => rb.innerText.toLowerCase() === 'apply');
         return applyButton as HTMLElement;
     }
 
@@ -804,7 +804,7 @@ export class GridFunctions {
     public static clickCancelExcelStyleCustomFiltering(fix: ComponentFixture<any>) {
         const customFilterMenu = GridFunctions.getExcelStyleCustomFilteringDialog(fix);
         const flatButtons = Array.from(customFilterMenu.querySelectorAll('.igx-button--flat'));
-        const cancelButton: any = flatButtons.find((rb: any) => rb.innerText === 'cancel');
+        const cancelButton: any = flatButtons.find((rb: any) => rb.innerText.toLowerCase() === 'cancel');
         cancelButton.click();
     }