Merge branch '18.0.x' of https://github.com/IgniteUI/igniteui-angular into ganastasov/fix-14200-18.0

Author: georgianastasov

projects/igniteui-angular/migrations/update-18_0_0/index.spec.ts

@@ -19,7 +19,7 @@ describe(`Update to ${version}`, () => {
                         options: {
                             styles: [
                                 "/testSrc/styles.scss"
-                            ]
+                            ] as (string | object)[]
                         }
                     }
                 }
@@ -450,6 +450,36 @@ describe(`Update to ${version}`, () => {
         );
     });
 
+    it('should add default CSS rule to set all components to their previous Large defaults with complex file ref configs', async () => {
+        const _configJson = JSON.parse(appTree.readContent('/angular.json'));
+        _configJson.projects.testProj.architect.build.options.styles = [{ input: '/testSrc/styles.scss' }];
+        appTree.overwrite('/angular.json', JSON.stringify(_configJson));
+
+        const tree = await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
+        expect(tree.readContent('/testSrc/styles.scss')).toEqual(
+`
+@use "mockStyles.scss";
+@forward something;
+// Specifies large size for all components to match the previous defaults
+// This may not be needed for your project. Please consult https://www.infragistics.com/products/ignite-ui-angular/angular/components/general/update-guide for more details.
+:root {
+    --ig-size: var(--ig-size-large);
+}
+`
+        );
+    });
+
+    it('should not throw when applying default CSS rule with complex file ref configs', async () => {
+        const _configJson = JSON.parse(appTree.readContent('/angular.json'));
+        _configJson.projects.testProj.architect.build.options.styles = [{ notInput: '/testSrc/styles.scss' }];
+        appTree.overwrite('/angular.json', JSON.stringify(_configJson));
+        try {
+            await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
+        } catch (e) {
+            fail(e);
+        }
+    });
+
     it('should rename the $active-item-color property to the $icon-selected-color', async () => {
         appTree.create(
             `/testSrc/appPrefix/component/test.component.scss`,

projects/igniteui-angular/migrations/update-18_0_0/index.ts

@@ -1,5 +1,5 @@
 import { Rule, SchematicContext, SchematicsException, Tree } from "@angular-devkit/schematics";
-import { FileChange, findElementNodes, getAttribute, getSourceOffset, hasAttribute, parseFile } from '../common/util';
+import { FileChange, findElementNodes, getAttribute, getProjects, getSourceOffset, getWorkspace, hasAttribute, parseFile } from '../common/util';
 import { nativeImport } from 'igniteui-angular/migrations/common/import-helper.js';
 import type { Element } from '@angular/compiler';
 import { BoundPropertyObject, InputPropertyType, UpdateChanges } from "../common/UpdateChanges";
@@ -78,16 +78,26 @@ export default (): Rule => async (host: Tree, context: SchematicContext) => {
     });
 
     const updateMainCSSFile = (host: Tree, context: SchematicContext): Tree => {
-        const angularConfigBuffer = host.read('angular.json');
-        if (!angularConfigBuffer) {
+        const workspace = getWorkspace(host);
+        if (!workspace) {
             throw new SchematicsException('Could not find angular.json');
         }
-        const angularConfig = JSON.parse(angularConfigBuffer.toString('utf-8'));
 
-        for (const project of Object.values<any>(angularConfig.projects)) {
+        const projects = getProjects(workspace);
+        for (const project of projects) {
             const srcRoot = project.sourceRoot || project.root || '';
-            const stylesPath = (project.architect?.build?.options?.styles?.filter(s => s.startsWith(srcRoot))[0]) as string;
-           
+            const stylesPath = project.architect?.build?.options?.styles
+                ?.map((s) => {
+                    if (typeof s === 'string') {
+                        return s;
+                    }
+                    // ref - https://angular.dev/reference/configs/workspace-config#styles-and-scripts-configuration
+                    if (s instanceof Object && 'input' in s) {
+                        return s.input as string;
+                    }
+                })
+                .filter((s) => s?.startsWith(srcRoot))[0];
+
             if (!stylesPath) {
                 context.logger.error(`No styles file found in angular.json for project: ${project}`);
             }

projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.spec.ts

@@ -1529,6 +1529,34 @@ describe('IgxSimpleCombo', () => {
             expect(combo.filteredData[0].field).toBe(target.value)
         });
 
+        it('should prevent Enter key default behavior when filtering data', fakeAsync(() => {
+            const keyEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+            const spy = spyOn(keyEvent, 'preventDefault');
+
+            expect(combo.collapsed).toBe(true);
+            expect(combo.selection).toBeUndefined();
+
+            input.triggerEventHandler('focus', {});
+            UIInteractions.simulateTyping('c', input);
+            fixture.detectChanges();
+
+            expect(combo.collapsed).toBe(false);
+
+            combo.handleKeyDown(keyEvent);
+            tick();
+            fixture.detectChanges();
+
+            expect(combo.selection).toBeDefined();
+            expect(combo.collapsed).toBe(true);
+            expect(spy).toHaveBeenCalled();
+
+            combo.handleKeyDown(keyEvent);
+            tick();
+            fixture.detectChanges();
+
+            expect(spy).toHaveBeenCalledTimes(1);
+        }));
+
         it('should emit selectionChanging event when input value changes and input loses focus', () => {
             spyOn(combo.selectionChanging, 'emit').and.callThrough();
             fixture.detectChanges();

projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.ts

@@ -317,10 +317,12 @@ export class IgxSimpleComboComponent extends IgxComboBaseDirective implements Co
             if (filtered === null || filtered === undefined) {
                 return;
             }
-            this.select(this.dropdown.focusedItem.itemID);
-            event.preventDefault();
-            event.stopPropagation();
-            this.close();
+            if (!this.dropdown.collapsed) {
+                this.select(this.dropdown.focusedItem.itemID);
+                event.preventDefault();
+                event.stopPropagation();
+                this.close();
+            }
             // manually trigger text selection as it will not be triggered during editing
             this.textSelection.trigger();
             return;