Merge branch 'master' into simeonoff/merge-sassdocs

kdinev · web-flow · commit 0c7ad506e664 · 2022-11-21T17:01:40.000+02:00
diff --git a/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts b/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts
@@ -134,6 +134,24 @@ export class IgxActionStripComponent extends DisplayDensityBase implements After
         return this._resourceStrings;
     }
 
+    /**
+     * Hide or not the Action Strip based on if it is a menu.
+     * 
+     * @hidden
+     * @internal
+     */
+     public get hideOnRowLeave(): boolean{
+        if(this.menu.items.length === 0){
+            return true;
+        }else if(this.menu.items.length > 0){
+            if(this.menu.collapsed){
+                return true;
+            }else{
+                return false;
+            }
+        }
+    }
+
     /**
      * Reference to the menu
      *
diff --git a/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.spec.ts b/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.spec.ts
@@ -29,7 +29,9 @@ describe('igxGridEditingActions #grid ', () => {
                 IgxActionStripPinEditComponent,
                 IgxActionStripEditMenuComponent,
                 IgxHierarchicalGridActionStripComponent,
-                IgxTreeGridEditActionsComponent
+                IgxTreeGridEditActionsComponent,
+                IgxActionStripOneRowComponent,
+                IgxActionStripMenuOneRowComponent
             ],
             imports: [
                 NoopAnimationsModule,
@@ -153,6 +155,28 @@ describe('igxGridEditingActions #grid ', () => {
 
             expect(grid.rowList.first.data['ID']).toBe('ANATR');
         });
+        it('should not auto-hide on mouse leave of row if action strip is menu', () => {
+            fixture = TestBed.createComponent(IgxActionStripMenuOneRowComponent);
+            fixture.detectChanges();
+            actionStrip = fixture.componentInstance.actionStrip;
+            grid = fixture.componentInstance.grid;
+
+            const row = grid.getRowByIndex(0);
+            row.pin();
+            const rowElem = grid.pinnedRows[0];
+            row.unpin();
+
+            actionStrip.show(row);
+            fixture.detectChanges();
+
+            actionStrip.menu.open();
+            fixture.detectChanges();
+                
+            UIInteractions.simulateMouseEvent('mouseleave', rowElem.element.nativeElement, 0, 200);
+            fixture.detectChanges();
+                
+            expect(actionStrip.hidden).toBeFalse();
+        });
     });
 
     describe('integration with pinning actions ', () => {
@@ -191,6 +215,25 @@ describe('igxGridEditingActions #grid ', () => {
             expect(actionStrip.context).toBe(row);
             expect(actionStrip.hidden).toBeFalse();
         });
+        it('should auto-hide on mouse leave of row.', async () => {
+            fixture = TestBed.createComponent(IgxActionStripOneRowComponent);
+            fixture.detectChanges();
+            actionStrip = fixture.componentInstance.actionStrip;
+            grid = fixture.componentInstance.grid;
+            
+            const row = grid.getRowByIndex(0);
+            row.pin();
+            const rowElem = grid.pinnedRows[0];
+            
+            actionStrip.show(row);
+            fixture.detectChanges();
+
+            expect(actionStrip.hidden).toBeFalse();
+            UIInteractions.simulateMouseEvent('mouseleave', rowElem.element.nativeElement, 0, 200);
+            fixture.detectChanges();
+
+            expect(actionStrip.hidden).toBeTrue();
+        });
         it('should auto-hide on mouse leave of grid.', () => {
             const row = grid.getRowByIndex(0);
             actionStrip.show(row);
@@ -329,6 +372,7 @@ class IgxActionStripTestingComponent implements OnInit {
     public grid: IgxGridComponent;
 
     private data: any[];
+    private dataOneRow: any[];
     private columns: any[];
 
     public ngOnInit() {
@@ -377,6 +421,10 @@ class IgxActionStripTestingComponent implements OnInit {
             { ID: 'FRANS', CompanyName: 'Franchi S.p.A.', ContactName: 'Paolo Accorti', ContactTitle: 'Sales Representative', Address: 'Via Monte Bianco 34', City: 'Torino', Region: null, PostalCode: '10100', Country: 'Italy', Phone: '011-4988260', Fax: '011-4988261' }
         ];
         /* eslint-enable max-len */
+
+        this.dataOneRow = [
+            { ID: 'ALFKI', CompanyName: 'Alfreds Futterkiste', ContactName: 'Maria Anders', ContactTitle: 'Sales Representative', Address: 'Obere Str. 57', City: 'Berlin', Region: null, PostalCode: '12209', Country: 'Germany', Phone: '030-0074321', Fax: '030-0076545' },
+        ];
     }
 }
 
@@ -414,3 +462,38 @@ class IgxActionStripPinEditComponent extends IgxActionStripTestingComponent {
 })
 class IgxActionStripEditMenuComponent extends IgxActionStripTestingComponent {
 }
+
+@Component({
+    template: `
+<igx-grid #grid [data]="dataOneRow" [width]="'800px'" [height]="'500px'"
+    [rowEditable]="true" [primaryKey]="'ID'">
+    <igx-column *ngFor="let c of columns" [sortable]="true" [field]="c.field" [header]="c.field"
+        [width]="c.width" [pinned]='c.pinned' [hidden]='c.hidden'>
+    </igx-column>
+
+    <igx-action-strip #actionStrip>
+        <igx-grid-pinning-actions></igx-grid-pinning-actions>
+        <igx-grid-editing-actions></igx-grid-editing-actions>
+    </igx-action-strip>
+</igx-grid>
+`
+})
+class IgxActionStripOneRowComponent extends IgxActionStripTestingComponent {
+}
+
+@Component({
+    template: `
+<igx-grid #grid [data]="dataOneRow" [width]="'800px'" [height]="'500px'"
+    [rowEditable]="true" [primaryKey]="'ID'">
+    <igx-column *ngFor="let c of columns" [sortable]="true" [field]="c.field" [header]="c.field"
+        [width]="c.width" [pinned]='c.pinned' [hidden]='c.hidden'>
+    </igx-column>
+
+    <igx-action-strip #actionStrip>
+        <igx-grid-editing-actions [asMenuItems]='true'></igx-grid-editing-actions>
+    </igx-action-strip>
+</igx-grid>
+`
+})
+class IgxActionStripMenuOneRowComponent extends IgxActionStripTestingComponent {
+}
diff --git a/projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.spec.ts b/projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.spec.ts
@@ -781,6 +781,14 @@ describe('IgxAutocomplete', () => {
             fixture.detectChanges();
             expect(input.nativeElement.attributes['aria-expanded'].value).toEqual('false');
         }));
+        it('Should accept Japanese input', fakeAsync(() => {
+            UIInteractions.setInputElementValue(input, '東京', fixture);
+            fixture.detectChanges();
+            tick();
+            UIInteractions.triggerKeyDownEvtUponElem('enter', input.nativeElement, true);
+            fixture.detectChanges();
+            expect(input.value).toBe('東京');
+        }));
     });
     describe('Positioning settings tests', () => {
         it('Panel settings - direction and startPoint: top', fakeAsync(() => {
diff --git a/projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.ts b/projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.ts
@@ -211,6 +211,7 @@ export class IgxAutocompleteDirective extends IgxDropDownItemNavigationDirective
         return 'list';
     }
 
+    protected _composing: boolean;
     protected id: string;
     protected get model() {
         return this.ngModel || this.formControl;
@@ -234,6 +235,20 @@ export class IgxAutocompleteDirective extends IgxDropDownItemNavigationDirective
         this.open();
     }
 
+    /** @hidden @internal */
+    @HostListener('compositionstart')
+    public onCompositionStart(): void {
+        if (!this._composing) {
+            this._composing = true;
+        }
+    }
+
+    /** @hidden @internal */
+    @HostListener('compositionend')
+    public onCompositionEnd(): void {
+        this._composing = false;
+    }
+
     /** @hidden  @internal */
     @HostListener('keydown.ArrowDown', ['$event'])
     @HostListener('keydown.Alt.ArrowDown', ['$event'])
@@ -253,7 +268,7 @@ export class IgxAutocompleteDirective extends IgxDropDownItemNavigationDirective
 
     /** @hidden  @internal */
     public handleKeyDown(event) {
-        if (!this.collapsed) {
+        if (!this.collapsed && !this._composing) {
             switch (event.key.toLowerCase()) {
                 case 'space':
                 case 'spacebar':
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.integration.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.integration.spec.ts
@@ -1,5 +1,5 @@
 import { configureTestSuite } from '../../test-utils/configure-suite';
-import { TestBed, tick, fakeAsync, ComponentFixture } from '@angular/core/testing';
+import { TestBed, tick, fakeAsync, ComponentFixture, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxHierarchicalGridModule } from './public_api';
@@ -32,21 +32,23 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
     const FILTERING_ROW_CLASS = 'igx-grid-filtering-row';
     const FILTERING_CELL_CLASS = 'igx-grid-filtering-cell';
 
-    configureTestSuite((() => {
+    configureTestSuite();
+
+    beforeAll(waitForAsync(() => {
         TestBed.configureTestingModule({
             declarations: [
                 IgxHierarchicalGridTestBaseComponent,
                 IgxHierarchicalGridTestCustomToolbarComponent,
                 IgxHierarchicalGridWithTransactionProviderComponent
             ],
             imports: [
-                NoopAnimationsModule, IgxHierarchicalGridModule, IgxIconModule]
-        });
-    }));
+                NoopAnimationsModule, IgxHierarchicalGridModule, IgxIconModule
+            ]
+        }).compileComponents();
+    }))
 
-    beforeEach(fakeAsync(() => {
+    beforeEach(waitForAsync(() => {
         fixture = TestBed.createComponent(IgxHierarchicalGridTestBaseComponent);
-        tick();
         fixture.detectChanges();
         hierarchicalGrid = fixture.componentInstance.hgrid;
     }));
@@ -894,6 +896,7 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
         const FIXED_ROW_CONTAINER = '.igx-grid__tr--pinned';
         const FIXED_ROW_CONTAINER_TOP = 'igx-grid__tr--pinned-top';
         const FIXED_ROW_CONTAINER_BOTTOM = 'igx-grid__tr--pinned-bottom';
+
         beforeEach(() => {
             hierarchicalGrid.width = '800px';
             hierarchicalGrid.height = '500px';
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.navigation.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.navigation.spec.ts
@@ -23,17 +23,21 @@ describe('IgxHierarchicalGrid Navigation', () => {
     let baseHGridContent: DebugElement;
     configureTestSuite();
 
+    beforeAll(waitForAsync(() => {
+        TestBed.configureTestingModule({
+            declarations: [
+                IgxHierarchicalGridTestBaseComponent,
+                IgxHierarchicalGridTestComplexComponent,
+                IgxHierarchicalGridMultiLayoutComponent,
+                IgxHierarchicalGridSmallerChildComponent
+            ],
+            imports: [
+                NoopAnimationsModule, IgxHierarchicalGridModule
+            ]
+        }).compileComponents();
+    }));
+
     describe('IgxHierarchicalGrid Basic Navigation #hGrid', () => {
-        beforeAll(waitForAsync(() => {
-            TestBed.configureTestingModule({
-                declarations: [
-                    IgxHierarchicalGridTestBaseComponent
-                ],
-                imports: [
-                    NoopAnimationsModule, IgxHierarchicalGridModule
-                ]
-            }).compileComponents();
-        }));
 
         beforeEach(waitForAsync(() => {
             fixture = TestBed.createComponent(IgxHierarchicalGridTestBaseComponent);
@@ -630,16 +634,6 @@ describe('IgxHierarchicalGrid Navigation', () => {
 
 
     describe('IgxHierarchicalGrid Complex Navigation #hGrid', () => {
-        beforeAll(waitForAsync(() => {
-            TestBed.configureTestingModule({
-                declarations: [
-                    IgxHierarchicalGridTestComplexComponent
-                ],
-                imports: [
-                    NoopAnimationsModule, IgxHierarchicalGridModule
-                ]
-            }).compileComponents();
-        }));
 
         beforeEach(waitForAsync(() => {
             fixture = TestBed.createComponent(IgxHierarchicalGridTestComplexComponent);
@@ -753,16 +747,6 @@ describe('IgxHierarchicalGrid Navigation', () => {
     });
 
     describe('IgxHierarchicalGrid sibling row islands Navigation #hGrid', () => {
-        beforeAll(waitForAsync(() => {
-            TestBed.configureTestingModule({
-                declarations: [
-                    IgxHierarchicalGridMultiLayoutComponent
-                ],
-                imports: [
-                    NoopAnimationsModule, IgxHierarchicalGridModule
-                ]
-            }).compileComponents();
-        }));
 
         beforeEach(waitForAsync(() => {
             fixture = TestBed.createComponent(IgxHierarchicalGridMultiLayoutComponent);
@@ -884,16 +868,6 @@ describe('IgxHierarchicalGrid Navigation', () => {
     });
 
     describe('IgxHierarchicalGrid Smaller Child Navigation #hGrid', () => {
-        beforeAll(waitForAsync(() => {
-            TestBed.configureTestingModule({
-                declarations: [
-                    IgxHierarchicalGridSmallerChildComponent
-                ],
-                imports: [
-                    NoopAnimationsModule, IgxHierarchicalGridModule
-                ]
-            }).compileComponents();
-        }));
 
         beforeEach(waitForAsync(() => {
             fixture = TestBed.createComponent(IgxHierarchicalGridSmallerChildComponent);
diff --git a/projects/igniteui-angular/src/lib/grids/row.directive.ts b/projects/igniteui-angular/src/lib/grids/row.directive.ts
@@ -413,6 +413,17 @@ export class IgxRowDirective implements DoCheck, AfterViewInit, OnDestroy {
         }
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    @HostListener('mouseleave')
+    public hideActionStrip() {
+        if (this.grid.actionStrip && this.grid.actionStrip.hideOnRowLeave) {
+            this.grid.actionStrip.hide();
+        }
+    }
+
     /**
      * @hidden
      * @internal
diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-filtering.spec.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-filtering.spec.ts
diff --git a/projects/igniteui-angular/src/lib/tree/tree.spec.ts b/projects/igniteui-angular/src/lib/tree/tree.spec.ts
