Merge branch 'master' into mdragnev/fix-12189

Author: mddragnev

.eslintrc.json

@@ -26,7 +26,7 @@
         ],
         "no-unused-vars": "off",
         "@typescript-eslint/no-unused-vars": [
-          "warn",
+          "error",
           {
             "varsIgnorePattern": "_",
             "argsIgnorePattern": "^_"

e2e/cypress/plugins/index.ts

@@ -1,3 +1,3 @@
 // Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
 // For more info, visit https://on.cypress.io/plugins-api
-module.exports = (on, config) => {}
+module.exports = (_on, _config) => {}

package-lock.json

@@ -53,18 +53,18 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.0.0",
-    "@angular/common": "^15.0.0",
-    "@angular/compiler": "^15.0.0",
-    "@angular/core": "^15.0.0",
-    "@angular/forms": "^15.0.0",
-    "@angular/platform-browser": "^15.0.0",
-    "@angular/platform-browser-dynamic": "^15.0.0",
-    "@angular/router": "^15.0.0",
+    "@angular/animations": "^15.1.0",
+    "@angular/common": "^15.1.0",
+    "@angular/compiler": "^15.1.0",
+    "@angular/core": "^15.1.0",
+    "@angular/forms": "^15.1.0",
+    "@angular/platform-browser": "^15.1.0",
+    "@angular/platform-browser-dynamic": "^15.1.0",
+    "@angular/router": "^15.1.0",
     "@igniteui/material-icons-extended": "^2.10.0",
     "@types/hammerjs": "^2.0.40",
     "@types/source-map": "0.5.2",
-    "core-js": "^3.26.1",
+    "core-js": "^3.27.1",
     "fflate": "^0.7.3",
     "hammerjs": "^2.0.8",
     "igniteui-theming": "^1.2.0",
@@ -77,30 +77,30 @@
     "zone.js": "~0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.0.0",
-    "@angular-devkit/schematics": "^15.0.0",
-    "@angular-eslint/builder": "^15.1.0",
-    "@angular-eslint/eslint-plugin": "^15.1.0",
-    "@angular-eslint/eslint-plugin-template": "^15.1.0",
-    "@angular-eslint/schematics": "^15.1.0",
-    "@angular-eslint/template-parser": "^15.1.0",
-    "@angular/cli": "^15.0.0",
-    "@angular/compiler-cli": "^15.0.0",
-    "@angular/language-service": "^15.0.0",
+    "@angular-devkit/build-angular": "^15.1.1",
+    "@angular-devkit/schematics": "^15.1.1",
+    "@angular-eslint/builder": "^15.2.0",
+    "@angular-eslint/eslint-plugin": "^15.2.0",
+    "@angular-eslint/eslint-plugin-template": "^15.2.0",
+    "@angular-eslint/schematics": "^15.2.0",
+    "@angular-eslint/template-parser": "^15.2.0",
+    "@angular/cli": "^15.1.1",
+    "@angular/compiler-cli": "^15.1.0",
+    "@angular/language-service": "^15.1.0",
     "@angularclass/hmr": "^3.0.0",
-    "@cypress/schematic": "^2.3.0",
+    "@cypress/schematic": "^2.4.0",
     "@types/estree": "^1.0.0",
-    "@types/jasmine": "^4.3.0",
+    "@types/jasmine": "^4.3.1",
     "@types/jasminewd2": "^2.0.10",
-    "@types/node": "^18.11.0",
+    "@types/node": "^18.11.18",
     "@types/sass-true": "^6.0.2",
     "@types/webpack-env": "^1.16.3",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
+    "@typescript-eslint/eslint-plugin": "^5.48.1",
+    "@typescript-eslint/parser": "^5.48.1",
     "browser-sync": "^2.27.11",
-    "cypress": "latest",
+    "cypress": "^12.3.0",
     "del": "^6.0.0",
-    "eslint": "^8.28.0",
+    "eslint": "^8.32.0",
     "eslint-plugin-import": "2.25.2",
     "eslint-plugin-jsdoc": "37.9.1",
     "eslint-plugin-prefer-arrow": "1.2.2",
@@ -116,7 +116,7 @@
     "hammer-simulator": "0.0.1",
     "ig-typedoc-theme": "^4.2.0",
     "igniteui-sassdoc-theme": "^1.1.4",
-    "igniteui-webcomponents": "^4.0.0",
+    "igniteui-webcomponents": "^4.1.1",
     "jasmine": "^4.5.0",
     "jasmine-core": "~4.5.0",
     "karma": "^6.3.11",
@@ -125,16 +125,16 @@
     "karma-jasmine": "~5.1.0",
     "karma-parallel": "^0.3.1",
     "karma-spec-reporter": "^0.0.34",
-    "ng-packagr": "^15.0.0",
-    "postcss-scss": "^4.0.3",
+    "ng-packagr": "^15.1.1",
+    "postcss-scss": "^4.0.6",
     "sass": "^1.56.0",
     "sass-true": "^6.0.1",
     "sassdoc": "^2.7.4",
     "sassdoc-plugin-localization": "^1.4.3",
-    "stylelint": "^14.15.0",
+    "stylelint": "^14.16.1",
     "stylelint-scss": "^4.1.0",
     "ts-node": "^10.8.1",
-    "typedoc": "^0.23.21",
+    "typedoc": "^0.23.24",
     "typedoc-plugin-localization": "^2.4.0",
     "typescript": "4.8.4"
   }

package.json

@@ -1,3 +1,3 @@
 // Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
 // For more info, visit https://on.cypress.io/plugins-api
-module.exports = (on, config) => {}
+module.exports = (_on, _config) => {}

projects/igniteui-angular/cypress/plugins/index.ts

@@ -2,6 +2,7 @@ import * as path from 'path';
 
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { ProjectType } from '../../schematics/utils/util';
 
 const version = '15.0.4';
 
@@ -24,18 +25,44 @@ describe(`Update to ${version}`, () => {
         },
         version: 1
     };
+    const configJsonLib = {
+        defaultProject: 'testProj',
+        projects: {
+            testProj: {
+                root: '/',
+                sourceRoot: '/testSrc',
+                prefix: 'lib',
+                projectType: ProjectType.Library,
+                architect: {
+                    build: {
+                      options: {
+                      }
+                    }
+                }
+            }
+        },
+        version: 1
+    };
 
     beforeEach(() => {
         appTree = new UnitTestTree(new EmptyTree());
-        appTree.create('/angular.json', JSON.stringify(configJson));
     });
 
     const migrationName = 'migration-27';
 
     it(`should add igniteui-theming to pacakage json and configure it`, async () => {
+        appTree.create('/angular.json', JSON.stringify(configJson));
         const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
             .toPromise();
 
         expect(JSON.parse(JSON.stringify(tree.readContent('angular.json')))).toContain("stylePreprocessorOptions");
     });
+
+    it(`should not add igniteui-theming to library pacakage json and configure it`, async () => {
+        appTree.create('/angular.json', JSON.stringify(configJsonLib));
+        const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
+            .toPromise();
+
+        expect(JSON.parse(JSON.stringify(tree.readContent('angular.json')))).not.toContain("stylePreprocessorOptions");
+    });
 });

projects/igniteui-angular/migrations/update-15_0_4/index.spec.ts

@@ -1,7 +1,7 @@
 import { workspaces } from '@angular-devkit/core';
 import { SchematicContext, Rule, Tree } from '@angular-devkit/schematics';
 import { Options } from '../interfaces/options';
-import { createHost } from './util';
+import { createHost, ProjectType } from './util';
 
 export enum PackageTarget {
     DEV = 'devDependencies',
@@ -158,8 +158,10 @@ const addHammerToConfig =
     };
 
 export const includeStylePreprocessorOptions = async (workspaceHost: workspaces.WorkspaceHost, workspace: workspaces.WorkspaceDefinition, context: SchematicContext, tree: Tree): Promise<void> => {
-    await Promise.all(Array.from(workspace.projects.values()).map(async (project) => {
+    await Promise.all(Array.from(workspace.projects.values()).map(async (project: workspaces.ProjectDefinition) => {
+        if (project.extensions['projectType'] === ProjectType.Library) return;
         await addStylePreprocessorOptions(project, tree, "build", context);
+        await addStylePreprocessorOptions(project, tree, "server", context);
         await addStylePreprocessorOptions(project, tree, "test", context);
     }));
 

projects/igniteui-angular/schematics/utils/dependency-handler.ts

@@ -2,12 +2,13 @@ import { IgxActionStripComponent } from './action-strip.component';
 import { Component, ViewChild, ElementRef, ViewContainerRef } from '@angular/core';
 import { configureTestSuite } from '../test-utils/configure-suite';
 import { IgxIconModule } from '../icon/public_api';
-import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { wait } from '../test-utils/ui-interactions.spec';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxToggleModule } from '../directives/toggle/toggle.directive';
 import { IgxActionStripModule } from './action-strip.module';
+import { IgxDropDownModule } from '../drop-down/public_api';
 
 const ACTION_STRIP_CONTAINER_CSS = 'igx-action-strip__actions';
 const DROP_DOWN_LIST = 'igx-drop-down__list';
@@ -20,33 +21,38 @@ describe('igxActionStrip', () => {
     let innerContainer: ViewContainerRef;
 
     describe('Unit tests: ', () => {
-        const mockViewContainerRef = jasmine.createSpyObj('ViewContainerRef', ['element']);
-        const mockRenderer2 = jasmine.createSpyObj('Renderer2', ['appendChild', 'removeChild']);
-        const mockContext = jasmine.createSpyObj('context', ['element']);
-        const mockDisplayDensity = jasmine.createSpyObj('IDisplayDensityOptions', ['displayDensity']);
-        const cdr = jasmine.createSpyObj('ChangeDetectorRef', ['detectChanges']);
-
-        it('should properly get/set hidden', () => {
-            actionStrip = new IgxActionStripComponent(mockViewContainerRef, mockRenderer2, mockDisplayDensity, cdr);
-            expect(actionStrip.hidden).toBeFalsy();
-            actionStrip.hidden = true;
-            expect(actionStrip.hidden).toBeTruthy();
+
+        configureTestSuite(() => {
+            return TestBed.configureTestingModule({
+                declarations: [
+                    IgxActionStripComponent
+                ],
+                imports: [
+                    NoopAnimationsModule,
+                    IgxDropDownModule
+                ]
+            });
         });
 
         it('should properly show and hide using API', () => {
-            actionStrip = new IgxActionStripComponent(mockViewContainerRef, mockRenderer2, mockDisplayDensity, cdr);
-            actionStrip.show(mockContext);
+            fixture = TestBed.createComponent(IgxActionStripComponent);
+            actionStrip = fixture.componentInstance as IgxActionStripComponent;
+            fixture.detectChanges();
+
+            const el = document.createElement('div');
+            fixture.debugElement.nativeElement.appendChild(el);
+            actionStrip.show(el);
             expect(actionStrip.hidden).toBeFalsy();
-            expect(actionStrip.context).toBe(mockContext);
+            expect(actionStrip.context).toBe(el);
             actionStrip.hide();
             expect(actionStrip.hidden).toBeTruthy();
+            fixture.debugElement.nativeElement.removeChild(el);
         });
     });
 
     describe('Initialization and rendering tests: ', () => {
-        configureTestSuite();
-        beforeAll(waitForAsync(() => {
-            TestBed.configureTestingModule({
+        configureTestSuite(() => {
+            return TestBed.configureTestingModule({
                 declarations: [
                     IgxActionStripTestingComponent
                 ],
@@ -56,16 +62,18 @@ describe('igxActionStrip', () => {
                     NoopAnimationsModule,
                     IgxToggleModule
                 ]
-            }).compileComponents();
-        }));
-        beforeEach(fakeAsync(() => {
+            })
+        });
+
+        beforeEach(() => {
             fixture = TestBed.createComponent(IgxActionStripTestingComponent);
             fixture.detectChanges();
             actionStrip = fixture.componentInstance.actionStrip;
             actionStripElement = fixture.componentInstance.actionStripElement;
             parentContainer = fixture.componentInstance.parentContainer;
             innerContainer = fixture.componentInstance.innerContainer;
-        }));
+        });
+
         it('should be overlapping its parent container when no context is applied', () => {
             const parentBoundingRect = parentContainer.nativeElement.getBoundingClientRect();
             const actionStripBoundingRect = actionStripElement.nativeElement.getBoundingClientRect();
@@ -102,9 +110,8 @@ describe('igxActionStrip', () => {
     });
 
     describe('render content as menu', () => {
-        configureTestSuite();
-        beforeAll(waitForAsync(() => {
-            TestBed.configureTestingModule({
+        configureTestSuite(() => {
+            return TestBed.configureTestingModule({
                 declarations: [
                     IgxActionStripMenuTestingComponent,
                     IgxActionStripCombinedMenuTestingComponent
@@ -115,8 +122,8 @@ describe('igxActionStrip', () => {
                     NoopAnimationsModule,
                     IgxToggleModule
                 ]
-            }).compileComponents();
-        }));
+            });
+        });
 
         it('should render tree-dot button which toggles the content as menu', () => {
             fixture = TestBed.createComponent(IgxActionStripMenuTestingComponent);

projects/igniteui-angular/src/lib/action-strip/action-strip.component.spec.ts

@@ -177,7 +177,7 @@ export class IgxSelectionAPIService {
      * @param componentID ID of the component, which we add new items to.
      * @param itemIDs Array of IDs of the items to add to component selection.
      */
-    public deselect_items(componentID: string, itemID: any[], clearSelection?: boolean) {
+    public deselect_items(componentID: string, itemID: any[], _clearSelection?: boolean) {
         this.set(componentID, this.delete_items(componentID, itemID));
     }
 

projects/igniteui-angular/src/lib/core/selection.ts

@@ -127,7 +127,7 @@ export class HammerGesturesManager {
      * @param element The DOM element used to create the manager on.
      */
     public getManagerForElement(element: EventTarget): HammerManager {
-        const result =  this._hammerManagers.filter((value, index, array) => value.element === element);
+        const result =  this._hammerManagers.filter(value => value.element === element);
         return result.length ? result[0].manager : null;
     }