Merge branch 'master' into mpopov/hardcoded-colors

Author: simeonoff

.github/workflows/npm-publish.yml

@@ -35,8 +35,10 @@ jobs:
             if [[ ${VERSION} == *"alpha"* || ${VERSION} == *"beta"* || ${VERSION} == *"rc"* ]]; then echo "NPM_TAG=next"; else echo "NPM_TAG=latest"; fi >> $GITHUB_ENV
             echo ${NPM_TAG}
 
-      - name: Copy readme for igniteui-angular
-        run: cp ../../README.md README.md
+      - name: Copy readme and license for igniteui-angular
+        run: |
+            cp ../../README.md README.md
+            cp ../../LICENSE LICENSE
         working-directory: dist/igniteui-angular
 
       - name: Copy i18n files

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

@@ -234,13 +234,14 @@
         flex-wrap: wrap;
         flex-grow: 1;
         justify-content: flex-end;
+        margin-#{$right}: map.get($grid-toolbar-spacer, 'comfortable');
     }
 
     %igx-grid-toolbar__actions {
         display: flex;
         align-items: center;
         flex-flow: row wrap;
-        margin-#{$left}: map.get($grid-toolbar-spacer, 'comfortable');
+        margin-#{$left}: auto;
 
         > * {
             display: flex;

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

@@ -745,7 +745,7 @@ export class IgxGridExcelStyleFilteringComponent extends BaseFilteringComponent
             case GridColumnDataType.Time:
                 return formatDate(element, format, locale, timezone);
             case GridColumnDataType.Currency:
-                return formatCurrency(element, currencyCode ?? getLocaleCurrencyCode(locale), display, digitsInfo, locale);
+                return formatCurrency(element, currencyCode || getLocaleCurrencyCode(locale), display, digitsInfo, locale);
             case GridColumnDataType.Number:
                 return formatNumber(element, locale, digitsInfo);
             case GridColumnDataType.Percent:

projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar.component.html

@@ -9,10 +9,6 @@
 </ng-template>
 <igx-grid-toolbar-actions *ngIf="!hasActions">
     <igx-grid-toolbar-advanced-filtering *ngIf="grid.allowAdvancedFiltering"></igx-grid-toolbar-advanced-filtering>
-    <igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>
-    <igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
-    <igx-grid-toolbar-exporter (exportStarted)="showProgress = true" (exportEnded)="showProgress = false">
-    </igx-grid-toolbar-exporter>
 </igx-grid-toolbar-actions>
 <ng-container *ngTemplateOutlet="actions"></ng-container>
 

src/app/hierarchical-grid-remote-virtualization/hierarchical-remote.service.ts

@@ -17,7 +17,9 @@ export class HierarchicalRemoteService {
     public url = `https://services.odata.org/V4/Northwind/Northwind.svc/Products`;
     public urlBuilder;
 
-    constructor(private http: HttpClient, private hierarchyPipe: IgxGridHierarchicalPipe) {
+    private hierarchyPipe: IgxGridHierarchicalPipe = null;
+
+    constructor(private http: HttpClient) {
         this._remoteData = new BehaviorSubject([]);
         this.remoteData = this._remoteData.asObservable();
     }
@@ -43,6 +45,7 @@ export class HierarchicalRemoteService {
     }
 
     public getData(virtualizationState: any, grid: IgxHierarchicalGridComponent, cb?: (any) => void) {
+        this.hierarchyPipe = this.hierarchyPipe ?? new IgxGridHierarchicalPipe(grid);
         return this.http.get(this.buildUrl(virtualizationState, grid)).pipe(
             map(response => response),
         )