Merge branch '9.1.x' into SIvanova/bottom-nav-disabled-tabs-9.1.x-

Author: simeonoff

.github/workflows/npm-publish.yml

@@ -0,0 +1,42 @@
+name: Npm.js deploy
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: 'https://registry.npmjs.org'
+      - run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      - run: echo ${VERSION}
+
+      - run: echo "NG_CLI_ANALYTICS=false" >> $GITHUB_ENV
+      - run: echo "NODE_OPTIONS='--max_old_space_size=4096'" >> $GITHUB_ENV
+      - run: npm ci
+
+      - run: npm run build:lib
+      - run: npm run build:schematics
+      - run: npm run build:migration
+
+      # define npm tag
+      - run: if [[ ${VERSION} == *"alpha"* || ${VERSION} == *"beta"* || ${VERSION} == *"rc"* ]]; then echo "NPM_TAG=next"; else echo "NPM_TAG=latest"; fi >> $GITHUB_ENV
+      - run: echo ${NPM_TAG}
+
+      # copy readme
+      - run: cp ../../README.md README.md
+        working-directory: dist/igniteui-angular
+
+      # create version and publish it to npmjs
+      - run: npm version ${VERSION} --no-git-tag-version --save --verbose
+        working-directory: dist/igniteui-angular
+
+      - run: npm publish --tag ${NPM_TAG}
+        working-directory: dist/igniteui-angular
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.travis.yml

@@ -28,25 +28,25 @@ script:
 - if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi
 - if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
 
-before_deploy:
-- npm run build:schematics
-- npm run build:migration
-# move to dist
-- cd dist/igniteui-angular
-# update package versions
-- npm version "${TRAVIS_TAG}" --no-git-tag-version --save
-- if [[ "${TRAVIS_TAG}" == *"alpha"* || "${TRAVIS_TAG}" == *"beta"* || "${TRAVIS_TAG}" == *"rc"* ]]; then export NPM_TAG="next"; else export NPM_TAG="latest"; fi
+# before_deploy:
+# - npm run build:schematics
+# - npm run build:migration
+# # move to dist
+# - cd dist/igniteui-angular
+# # update package versions
+# - npm version "${TRAVIS_TAG}" --no-git-tag-version --save
+# - if [[ "${TRAVIS_TAG}" == *"alpha"* || "${TRAVIS_TAG}" == *"beta"* || "${TRAVIS_TAG}" == *"rc"* ]]; then export NPM_TAG="next"; else export NPM_TAG="latest"; fi
 
-# copy readme
-- cp ../../README.md README.md
+# # copy readme
+# - cp ../../README.md README.md
 
-deploy:
-  provider: npm
-  tag: "${NPM_TAG}"
-  skip_cleanup: true
-  email: [email protected]
-  api_key:
-    secure: DzxT8e3ryMBPMgx+6toU7+O+1nBLzjCAO4vyDQbze9Fi1jJ23PUUXuG9UmXqnzPUJ64uK4qzi40QiPdk4P0AsOiBr66fQtn02f/Yo1F42r13X9jKuqOdJlRl3dTWPGt5HOBO4YUq6BYA1HAh09/nsgLt670Wk2I8PMNpUiuTFI1F6vhGFsrjEaKbknrZhrQzfAxbTkbZe3RJmrEJQzU5CfFkZzoqsqpS20tFSSNiiPVy6G5OmAMW5f26klq5T0BZ0xBAf2AlXEmGo+LS+65Mbe+yQb1v/IUPk+YY4gwzQQEEh9d+MNU+tMOIVfkqyj5MIdILEIoLMlHKTtaqh8GsxOr2sFw6a4tTKpTqr4yBwuGspa/KjexC/41QVHQjaG0wAekuZluUOL+5I2jYzmVPAFSeiXhor4DFcp+Eh7uwEMaw1paX5DW8UiI8r2FU8RcHE75MN/EOSLE1+9He+RfxnHZW3MyOhOnvZt08+/WoFR6l1OpMM8mVVfHFFVvSk/QVbjFobbvzl5ecNMCS2H8EAJx8mYhwMgTxgf9Sw2AHKh0mgOlRBC9Ox17Hk2VKMcL7sgGY+7btP5mgqW1P/HHxXSAWaqS2e01L+GK5EG618R3Gz+Fphr6ZIyNqQ6BCc1UpJQZFJVVsPAJMMBg7Or5vcYJlxYPXOM5jLm8lzo9hSxA=
-  on:
-    tags: true
-    repo: IgniteUI/igniteui-angular
+# deploy:
+#   provider: npm
+#   tag: "${NPM_TAG}"
+#   skip_cleanup: true
+#   email: [email protected]
+#   api_key:
+#     secure: DzxT8e3ryMBPMgx+6toU7+O+1nBLzjCAO4vyDQbze9Fi1jJ23PUUXuG9UmXqnzPUJ64uK4qzi40QiPdk4P0AsOiBr66fQtn02f/Yo1F42r13X9jKuqOdJlRl3dTWPGt5HOBO4YUq6BYA1HAh09/nsgLt670Wk2I8PMNpUiuTFI1F6vhGFsrjEaKbknrZhrQzfAxbTkbZe3RJmrEJQzU5CfFkZzoqsqpS20tFSSNiiPVy6G5OmAMW5f26klq5T0BZ0xBAf2AlXEmGo+LS+65Mbe+yQb1v/IUPk+YY4gwzQQEEh9d+MNU+tMOIVfkqyj5MIdILEIoLMlHKTtaqh8GsxOr2sFw6a4tTKpTqr4yBwuGspa/KjexC/41QVHQjaG0wAekuZluUOL+5I2jYzmVPAFSeiXhor4DFcp+Eh7uwEMaw1paX5DW8UiI8r2FU8RcHE75MN/EOSLE1+9He+RfxnHZW3MyOhOnvZt08+/WoFR6l1OpMM8mVVfHFFVvSk/QVbjFobbvzl5ecNMCS2H8EAJx8mYhwMgTxgf9Sw2AHKh0mgOlRBC9Ox17Hk2VKMcL7sgGY+7btP5mgqW1P/HHxXSAWaqS2e01L+GK5EG618R3Gz+Fphr6ZIyNqQ6BCc1UpJQZFJVVsPAJMMBg7Or5vcYJlxYPXOM5jLm8lzo9hSxA=
+#   on:
+#     tags: true
+#     repo: IgniteUI/igniteui-angular

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

@@ -230,7 +230,8 @@ export class IgxGridNavigationService {
     }
 
     protected forOfDir(): IgxForOfDirective<any> {
-        const forOfDir = this.grid.dataRowList.length > 0 ? this.grid.dataRowList.first.virtDirRow : this.grid.headerContainer;
+        const forOfDir = this.grid.dataRowList.length > 0 ? this.grid.dataRowList.first.virtDirRow : this.grid.summariesRowList.length ?
+        this.grid.summariesRowList.first.virtDirRow : this.grid.headerContainer;
         return forOfDir as IgxForOfDirective<any>;
     }
 
@@ -324,6 +325,13 @@ export class IgxGridNavigationService {
     }
 
     public performHorizontalScrollToCell(visibleColumnIndex: number, cb?: () => void) {
+        if (this.grid.rowList < 1 && this.grid.summariesRowList.length < 1 && this.grid.hasColumnGroups) {
+            let column = this.grid.getColumnByVisibleIndex(visibleColumnIndex);
+            while (column.parent) {
+                column = column.parent;
+            }
+            visibleColumnIndex = this.forOfDir().igxForOf.indexOf(column);
+        }
         if (!this.shouldPerformHorizontalScroll(visibleColumnIndex)) { return; }
         this.pendingNavigation = true;
         this.grid.parentVirtDir.onChunkLoad
@@ -364,7 +372,7 @@ export class IgxGridNavigationService {
     }
 
     protected findFirstDataRowIndex(): number {
-        return this.grid.dataView.findIndex(rec => !this.grid.isGroupByRecord(rec) && !this.grid.isDetailRecord(rec));
+        return this.grid.dataView.findIndex(rec => !this.grid.isGroupByRecord(rec) && !this.grid.isDetailRecord(rec) && !rec.summaries);
     }
 
     protected findLastDataRowIndex(): number {

projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav-headers.spec.ts

@@ -16,6 +16,7 @@ import {
 import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
 import { DebugElement } from '@angular/core';
 import { GridSelectionMode, FilterMode } from '../common/enums';
+import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition';
 
 const DEBOUNCETIME = 30;
 
@@ -1231,5 +1232,42 @@ describe('IgxGrid - Headers Keyboard navigation #grid', () => {
 
              expect(GridFunctions.getExcelStyleFilteringComponent(fix)).toBeNull();
         });
+
+        it('MCH Grid with no data: should be able to navigate with arrow keys in the headers', () => {
+            grid.filter('Country', 'Bulgaria', IgxStringFilteringOperand.instance().condition('contains'), true);
+            fix.detectChanges();
+
+            expect(grid.rowList.length).toBe(0);
+
+            let header = GridFunctions.getColumnGroupHeaderCell('General Information', fix);
+            UIInteractions.simulateClickAndSelectEvent(header);
+            fix.detectChanges();
+
+            GridFunctions.verifyHeaderIsFocused(header);
+
+            UIInteractions.triggerEventHandlerKeyDown('ArrowRight', gridHeader, false, false, true);
+            fix.detectChanges();
+
+            header = GridFunctions.getColumnGroupHeaderCell('Address Information', fix);
+            GridFunctions.verifyHeaderIsFocused(header);
+
+            UIInteractions.triggerEventHandlerKeyDown('ArrowDown', gridHeader, false, false, false);
+            fix.detectChanges();
+
+            header = GridFunctions.getColumnHeader('Region', fix);
+            GridFunctions.verifyHeaderIsFocused(header.parent);
+
+            UIInteractions.triggerEventHandlerKeyDown('ArrowRight', gridHeader, false, false, false);
+            fix.detectChanges();
+
+            header = GridFunctions.getColumnGroupHeaderCell('Country Information', fix);
+            GridFunctions.verifyHeaderIsFocused(header);
+
+            UIInteractions.triggerEventHandlerKeyDown('ArrowLeft', gridHeader, false, false, true);
+            fix.detectChanges();
+
+            header = GridFunctions.getColumnHeader('CompanyName', fix);
+            GridFunctions.verifyHeaderIsFocused(header.parent);
+        });
     });
 });

projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts

@@ -1759,6 +1759,38 @@ describe('IgxGrid - Summaries #grid', () => {
             expect(GridSummaryFunctions.getAllVisibleSummariesLength(fix)).toEqual(5);
         });
 
+        it('should navigate correctly with Ctrl + ArrowUp/Home when summary position is top', () => {
+            grid.showSummaryOnCollapse = true;
+            fix.detectChanges();
+
+            grid.summaryPosition = 'top';
+            fix.detectChanges();
+
+            fix.detectChanges();
+            let cell = grid.getCellByColumn(6, 'Age');
+            UIInteractions.simulateClickAndSelectEvent(cell);
+            fix.detectChanges();
+
+            expect(cell.selected).toBe(true);
+            UIInteractions.triggerKeyDownEvtUponElem('Home', cell.nativeElement, true, false, false, true);
+            fix.detectChanges();
+
+            cell = grid.getCellByColumn(2, 'ID');
+            expect(cell.selected).toBe(true);
+            expect(cell.active).toBe(true);
+
+            cell = grid.getCellByColumn(6, 'Name');
+            UIInteractions.simulateClickAndSelectEvent(cell);
+            fix.detectChanges();
+
+            UIInteractions.triggerKeyDownEvtUponElem('ArrowUp', cell.nativeElement, true, false, false, true);
+            fix.detectChanges();
+
+            cell = grid.getCellByColumn(2, 'Name');
+            expect(cell.selected).toBe(true);
+            expect(cell.active).toBe(true);
+        });
+
         it('should be able to enable/disable summaries at runtime', () => {
             grid.getColumnByName('Age').hasSummary = false;
             grid.getColumnByName('ParentID').hasSummary = false;