Merge remote-tracking branch 'remotes/origin/master' into mvenkov/handle_correctly_target_as_point

Author: wnvko

package-lock.json

@@ -52,7 +52,7 @@
     "@angular/platform-browser": "^10.1.0",
     "@angular/platform-browser-dynamic": "^10.1.0",
     "@angular/router": "^10.1.0",
-    "@igniteui/material-icons-extended": "^2.3.0",
+    "@igniteui/material-icons-extended": "^2.4.0",
     "@types/hammerjs": "^2.0.36",
     "@types/source-map": "0.5.2",
     "classlist.js": "^1.1.20150312",

package.json

@@ -12,6 +12,7 @@
       "resize-observer-polyfill",
       "igniteui-trial-watermark",
       "lodash.merge",
-      "uuid"
+      "uuid",
+      "@igniteui/material-icons-extended"
     ]
 }

projects/igniteui-angular/ng-package.json

@@ -14,6 +14,7 @@
       "resize-observer-polyfill",
       "igniteui-trial-watermark",
       "lodash.merge",
-      "uuid"
+      "uuid",
+      "@igniteui/material-icons-extended"
     ]
 }

projects/igniteui-angular/ng-package.prod.json

@@ -73,7 +73,8 @@
         "resize-observer-polyfill": "^1.5.1",
         "igniteui-trial-watermark": "^1.0.3",
         "lodash.merge": "^4.6.2",
-        "uuid": "^8.3.0"
+        "uuid": "^8.3.0",
+        "@igniteui/material-icons-extended": "^2.4.0"
     },
     "peerDependencies": {
         "@angular/common": "^10.0.0",

projects/igniteui-angular/package.json

@@ -31,12 +31,13 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
         { name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
         { name: 'lodash.merge', target: PackageTarget.NONE },
         { name: 'uuid', target: PackageTarget.NONE },
+        { name: 'web-animations-js', target: PackageTarget.REGULAR },
+        { name: '@igniteui/material-icons-extended', target: PackageTarget.REGULAR },
         // peerDependencies
         { name: '@angular/forms', target: PackageTarget.NONE },
         { name: '@angular/common', target: PackageTarget.NONE },
         { name: '@angular/core', target: PackageTarget.NONE },
         { name: '@angular/animations', target: PackageTarget.NONE },
-        { name: 'web-animations-js', target: PackageTarget.REGULAR },
         // igxDevDependencies
         { name: '@igniteui/angular-schematics', target: PackageTarget.DEV }
 ];

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

@@ -147,6 +147,13 @@ export class IgxActionStripComponent extends DisplayDensityBase implements After
     @ContentChildren(IgxGridActionsBaseDirective)
     public actionButtons: QueryList<IgxGridActionsBaseDirective>;
 
+    /**
+     * Getter for menu overlay settings
+     * @hidden
+     * @internal
+     */
+    public menuOverlaySettings: OverlaySettings  = { scrollStrategy: new CloseScrollStrategy() };
+
     /**
      * Menu Items list.
      * @hidden
@@ -243,15 +250,6 @@ export class IgxActionStripComponent extends DisplayDensityBase implements After
         }
     }
 
-    /**
-     * Getter for menu overlay settings
-     * @hidden
-     * @internal
-     */
-    get menuOverlaySettings (): OverlaySettings {
-        return { scrollStrategy: new CloseScrollStrategy() };
-    }
-
     /**
      * Close the menu if opened
      * @hidden

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

@@ -3,7 +3,7 @@ import { IgxGridActionButtonComponent } from './grid-action-button.component';
 import { Directive, Inject, Input, AfterViewInit, QueryList, ViewChildren,
      OnInit, IterableDiffers, IterableChangeRecord, OnDestroy } from '@angular/core';
 import { IgxActionStripComponent } from '../action-strip.component';
-import { IgxRowDirective } from '../../grids/public_api';
+import { IgxRowDirective } from '../../grids/row.directive';
 import { IgxIconService } from '../../icon/icon.service';
 import { Subject } from 'rxjs';
 

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-actions-base.directive.ts

@@ -7,6 +7,9 @@ import { IgxGridModule, IgxGridComponent } from '../../grids/grid/public_api';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { IgxActionStripModule } from '../action-strip.module';
+import { UIInteractions } from '../../test-utils/ui-interactions.spec';
+import { IgxHierarchicalGridActionStripComponent } from '../../test-utils/hierarchical-grid-components.spec';
+import { IgxHierarchicalRowComponent, IgxHierarchicalGridComponent, IgxHierarchicalGridModule } from '../../grids/hierarchical-grid/public_api';
 
 describe('igxGridEditingActions #grid ', () => {
     let fixture;
@@ -18,12 +21,14 @@ describe('igxGridEditingActions #grid ', () => {
             declarations: [
                 IgxActionStripTestingComponent,
                 IgxActionStripPinEditComponent,
-                IgxActionStripEditMenuComponent
+                IgxActionStripEditMenuComponent,
+                IgxHierarchicalGridActionStripComponent
             ],
             imports: [
                 NoopAnimationsModule,
                 IgxActionStripModule,
                 IgxGridModule,
+                IgxHierarchicalGridModule,
                 IgxIconModule
             ]
         }).compileComponents();
@@ -114,6 +119,94 @@ describe('igxGridEditingActions #grid ', () => {
             expect(pinningIcons[0].nativeElement.className.indexOf('igx-button--disabled') === -1).toBeTruthy();
         });
     });
+
+    describe('auto show/hide', () => {
+        beforeEach(fakeAsync(/** height/width setter rAF */() => {
+            fixture = TestBed.createComponent(IgxActionStripPinEditComponent);
+            fixture.detectChanges();
+            actionStrip = fixture.componentInstance.actionStrip;
+            grid = fixture.componentInstance.grid;
+        }));
+        it('should auto-show on mouse over of row.', () => {
+            const row = grid.getRowByIndex(0);
+            const rowElem = row.nativeElement;
+            UIInteractions.simulateMouseEvent('mouseover', rowElem, 0, 0);
+            fixture.detectChanges();
+
+            expect(actionStrip.context).toBe(row);
+            expect(actionStrip.hidden).toBeFalse();
+        });
+        it('should auto-hide on mouse leave of grid.', () => {
+            const row = grid.getRowByIndex(0);
+            actionStrip.show(row);
+            fixture.detectChanges();
+
+            expect(actionStrip.hidden).toBeFalse();
+            UIInteractions.simulateMouseEvent('mouseleave', grid.nativeElement, 0, 0);
+            fixture.detectChanges();
+
+            expect(actionStrip.hidden).toBeTrue();
+        });
+    });
+
+    describe('auto show/hide in HierarchicalGrid', () => {
+        let actionStripRoot, actionStripChild, hierarchicalGrid: IgxHierarchicalGridComponent;
+        beforeEach(fakeAsync(/** height/width setter rAF */() => {
+            fixture = TestBed.createComponent(IgxHierarchicalGridActionStripComponent);
+            fixture.detectChanges();
+            actionStripRoot = fixture.componentInstance.actionStripRoot;
+            actionStripChild = fixture.componentInstance.actionStripChild;
+            hierarchicalGrid = fixture.componentInstance.hgrid;
+        }));
+
+        it('should auto-show root actionStrip on mouse over of root row.', () => {
+            const row = hierarchicalGrid.getRowByIndex(0);
+            const rowElem = row.nativeElement;
+            UIInteractions.simulateMouseEvent('mouseover', rowElem, 0, 0);
+            fixture.detectChanges();
+
+            expect(actionStripRoot.context).toBe(row);
+            expect(actionStripRoot.hidden).toBeFalse();
+            expect(actionStripChild.context).toBeUndefined();
+        });
+
+        it('should auto-show row island actionStrip on mouse over of child row.', () => {
+            const row = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
+            row.toggle();
+            fixture.detectChanges();
+
+            const childGrid = hierarchicalGrid.hgridAPI.getChildGrids(false)[1];
+
+            const childRow = childGrid.getRowByIndex(0);
+            const rowElem = childRow.nativeElement;
+            UIInteractions.simulateMouseEvent('mouseover', rowElem, 0, 0);
+            fixture.detectChanges();
+
+            expect(actionStripChild.context).toBe(childRow);
+            expect(actionStripChild.hidden).toBeFalse();
+
+            expect(actionStripRoot.context).toBeUndefined();
+        });
+
+        it('should auto-hide all actionStrip on mouse leave of root grid.', () => {
+            const row = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
+            row.toggle();
+            fixture.detectChanges();
+
+            const childGrid = hierarchicalGrid.hgridAPI.getChildGrids(false)[0];
+            const childRow = childGrid.getRowByIndex(0);
+
+            actionStripRoot.show(row);
+            actionStripChild.show(childRow);
+            fixture.detectChanges();
+
+            UIInteractions.simulateMouseEvent('mouseleave', hierarchicalGrid.nativeElement, 0, 0);
+            fixture.detectChanges();
+
+            expect(actionStripRoot.hidden).toBeTrue();
+            expect(actionStripChild.hidden).toBeTrue();
+        });
+    });
 });
 
 @Component({

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

@@ -40,7 +40,7 @@
             (keydown)="handleKeyDown($event)" (focus)="dropdown.onBlur($event)" [attr.placeholder]="searchPlaceholder"
             aria-autocomplete="both" [attr.aria-owns]="dropdown.id" [attr.aria-labelledby]="ariaLabelledBy" />
         <igx-suffix *ngIf="showSearchCaseIcon">
-            <igx-icon fontSet="case-sensitive" name="case-sensitive" [isActive]="filteringOptions.caseSensitive"
+            <igx-icon fontSet="imx-icons" name="case-sensitive" [isActive]="filteringOptions.caseSensitive"
                 (click)="toggleCaseSensitive()">
             </igx-icon>
         </igx-suffix>