Merge branch '7.3.x' into select-cust-overlay-settings-mousedown

Author: kdinev

angularDocsPostDeploy.ps1

@@ -0,0 +1,75 @@
+Write-Host "angularDocsRoot value is: " $angularDocsRoot; #angularDocsRoot octo variable
+$isLatest = "VariableIsLatest";
+$tag = "VariableValue";
+$path = $angularDocsRoot;
+$newPath = $path -replace $tagFolder, $tag #tagFolder octo variable
+$angularDocsRootFolder = [System.IO.Directory]::GetParent($angularDocsRoot);
+Write-Host "newPath is:" $newPath;
+
+#######Delete all other folders starting with <AngularMajor>.<Major>########
+#######Since we are going to keep the latest and greatest########
+$lastDot = $tag.LastIndexOf('.');
+$filter = $tag.Substring(0,$lastDot);
+$foldersToDel = Get-ChildItem -Path $angularDocsRootFolder -Directory -Filter $filter*
+Write-Host "Folders to delete: " $foldersToDel
+
+try {
+foreach($f in $foldersToDel){
+    if([System.IO.Directory]::Exists($f.FullName)) 
+        { Write-Host $f.FullName " to be deleted!"
+        Remove-Item $f.FullName -Recurse -Force } }
+    }
+catch { Write-Host "Exception while deleting the old folders" }
+
+New-Item -Path $newPath -ItemType Directory -Force
+Copy-Item -Path $path\* -Destination $newPath -Recurse -Force
+
+###Add metatag inside index.html files' head section
+$indexFiles = Get-ChildItem -Path $newPath -File -Recurse -Filter index.html
+foreach($indexFile in $indexFiles) {
+    $newText = [System.IO.File]::ReadAllText($indexFile.FullName).Replace("</head>", "    <meta name=`"robots`" content=`"noindex,nofollow`">
+</head>");
+    [System.IO.File]::WriteAllText($indexFile.FullName, $newText);
+}
+
+############Update the angular-docs/sass and typescript folders if isLatest flag is true###########
+if($isLatest) {
+    $sassFolder = $path + "\sass";
+    $typeScriptFolder = $path + "\typescript";
+
+    $sassFolderToUpdate = $path + "\..\sass";
+    $typeScriptFolderToUpdate = $path + "\..\typescript";
+    Write-Host "[Latest] sassFolderToUpdate is:" $sassFolderToUpdate;
+    Write-Host "[Latest] typeScriptFolderToUpdate is:" $typeScriptFolderToUpdate;
+
+    #Delete the existing content as octopus option - delete all before deployment
+    try {
+        Remove-Item $sassFolderToUpdate\* -Recurse -Force
+        Remove-Item $typeScriptFolderToUpdate\* -Recurse -Force }
+    catch { Write-Host "Exception while deleting the $sassFolderToUpdate or $typeScriptFolderToUpdate" }
+
+    New-Item -Path $sassFolderToUpdate\latest -ItemType Directory -Force
+    Copy-Item -Path $sassFolder\* -Destination $sassFolderToUpdate\latest -Recurse -Force
+
+    New-Item -Path $typeScriptFolderToUpdate\latest -ItemType Directory -Force
+    Copy-Item -Path $typeScriptFolder\* -Destination $typeScriptFolderToUpdate\latest -Recurse -Force
+}
+
+###########Json file content Update###########
+$filePath = $jsonFile; #jsonFile octo variable
+Write-Host "Check file exists: " ([System.IO.File]::Exists($filePath))
+Write-Host "Check dir exists:" ([System.IO.Directory]::Exists($angularDocsRootFolder));
+
+if([System.IO.File]::Exists($filePath) -and [System.IO.Directory]::Exists($angularDocsRootFolder)) {
+    $folders = Get-ChildItem -Path $angularDocsRootFolder -Directory -Exclude $tagFolder,"sass","typescript";
+    $textToUpdate = "";
+    foreach($item in $folders) {
+        $textToUpdate += '"' + $item.Name + '"'; 
+    }
+    $textToUpdate = "[" +  $textToUpdate.Replace("`"`"","`"`,`"") + "]" ;
+    Write-Host $textToUpdate;
+
+    $content = [System.IO.File]::ReadAllText($filePath);
+    $newContent = $content -replace "\[.*\]", $textToUpdate;
+    [System.IO.File]::WriteAllText($filePath,$newContent);
+}

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-component.scss

@@ -128,6 +128,10 @@
         @extend %grid-row--mrl !optional;
     }
 
+    @include e(tr, $mods: (mrl, edit)) {
+        @extend %grid-row--edit-mrl !optional;
+    }
+
     @include e(summaries) {
         @extend %grid-summaries !optional;
 

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

@@ -608,6 +608,15 @@
         %igx-grid__drag-indicator {
             cursor: default;
         }
+
+        %grid-row--mrl {
+            %igx-grid__hierarchical-expander--header,
+            %igx-grid__header-indentation,
+            %igx-grid__row-indentation,
+            %grid__cbx-selection {
+                border-bottom: --var($theme, 'header-border-width') --var($theme, 'header-border-style') --var($theme, 'header-border-color');
+            }
+        }
     }
 
     %grid-thead--cosy {
@@ -699,7 +708,15 @@
     }
 
     %grid-row--mrl {
-        border-bottom: none !important;
+        &%grid-row {
+            border-bottom-color: transparent;
+        }
+
+        %grid__cbx-selection,
+        %igx-grid__row-indentation,
+        %igx-grid__drag-indicator {
+            border-bottom: 1px solid --var($theme, 'row-border-color');
+        }
     }
 
     %grid-tbody {
@@ -892,6 +909,10 @@
             background: --var($theme, 'edit-mode-color');
         }
 
+        &%grid-row {
+            border-bottom: 1px solid --var($theme, 'edit-mode-color');
+        }
+
         %igx-grid__td--editing {
             border: none;
 
@@ -905,6 +926,13 @@
         }
     }
 
+    %grid-row--edit-mrl {
+        &:first-of-type::after {
+            top: 0;
+            z-index: 5;
+        }
+    }
+
     %igx-grid__tr--edited {
         &::before {
             content: '';

projects/igniteui-angular/src/lib/dialog/dialog.component.ts

@@ -259,8 +259,8 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
     public onRightButtonSelect = new EventEmitter<IDialogEventArgs>();
 
     private _animaitonSettings: PositionSettings = {
-        openAnimation: useAnimation(slideInBottom, {params: {fromPosition: 'translateY(100%)'}}),
-        closeAnimation: useAnimation(slideOutTop, {params: {toPosition: 'translateY(-100%)'}})
+        openAnimation: useAnimation(slideInBottom, { params: { fromPosition: 'translateY(100%)' } }),
+        closeAnimation: useAnimation(slideOutTop, { params: { toPosition: 'translateY(-100%)' } })
     };
 
     private _overlayDefaultSettings: OverlaySettings;
@@ -391,6 +391,9 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
     public open(overlaySettings: OverlaySettings = this._overlayDefaultSettings) {
         this.toggleRef.open(overlaySettings);
         this.onOpen.emit({ dialog: this, event: null });
+        if (!this.leftButtonLabel && !this.rightButtonLabel) {
+            this.toggleRef.element.focus();
+        }
     }
 
     /**

projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.spec.ts

@@ -166,7 +166,11 @@ describe('IgxAutocomplete', () => {
             fixture.detectChanges();
             expect(dropDown.collapsed).toBeFalsy();
 
-            document.body.click();
+            // Click in center of the body.
+            const bodyRect = document.body.getBoundingClientRect();
+            UIInteractions.simulateMouseEvent('click', document.body,
+                                    bodyRect.left + bodyRect.width / 2,
+                                    bodyRect.top + bodyRect.height / 2);
             tick();
             fixture.detectChanges();
             expect(dropDown.collapsed).toBeTruthy();
@@ -833,7 +837,7 @@ describe('IgxAutocomplete', () => {
 });
 
 @Component({
-    template: `<igx-input-group>
+    template: `<igx-input-group style="width: 300px;">
         <igx-prefix igxRipple><igx-icon fontSet="material">home</igx-icon> </igx-prefix>
         <input igxInput name="towns" type="text" [(ngModel)]="townSelected" required
             [igxAutocomplete]='townsPanel'

projects/igniteui-angular/src/lib/directives/filter/filter.directive.ts

@@ -139,11 +139,6 @@ export class IgxFilterPipe implements PipeTransform {
             items = options.items;
         }
 
-        const selectAll = items[0];
-        if (selectAll.isSpecial) {
-            items = items.slice(1, items.length);
-        }
-
         result = items.filter((item: any) => {
             const match = options.matchFn(options.formatter(options.get_value(item, options.key)), options.inputValue);
 
@@ -160,10 +155,6 @@ export class IgxFilterPipe implements PipeTransform {
             return match;
         });
 
-        if (result.length > 0 && selectAll.isSpecial) {
-            result.unshift(selectAll);
-        }
-
         return result;
     }
 }

projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.spec.ts

@@ -609,6 +609,7 @@ export class IgxToggleTestComponent {
 }
 @Component({
     template: `
+    <p>Test</p>
     <button [igxToggleAction]="toggleRef" [overlaySettings]="settings">Open/Close Toggle</button>
     <div igxToggle #toggleRef="toggle">
       <ul>
@@ -618,7 +619,6 @@ export class IgxToggleTestComponent {
         <li>4</li>
       </ul>
     </div>
-    <p>Test</p>
     `
 })
 export class IgxToggleActionTestComponent {

projects/igniteui-angular/src/lib/grids/column.component.ts

@@ -300,7 +300,7 @@ export class IgxColumnComponent implements AfterContentInit {
         const colWidth = this.width;
         const isPercentageWidth = colWidth && typeof colWidth === 'string' && colWidth.indexOf('%') !== -1;
         if (isPercentageWidth) {
-            return parseInt(colWidth, 10) / 100 * this.grid.unpinnedWidth;
+            return parseInt(colWidth, 10) / 100 * (this.grid.calcWidth - this.grid.featureColumnsWidth);
         } else if (!colWidth) {
             // no width
             return this.defaultWidth || this.grid.getPossibleColumnWidth();

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.component.html

@@ -22,7 +22,7 @@
         <igx-list [displayDensity]="displayDensity" [style.height.px]="250">
             <div [style.overflow]="'hidden'" [style.position]="'relative'">
                 <igx-list-item
-                    *igxFor="let item of data | igxFilter: filterOptions; scrollOrientation : 'vertical'; containerSize: '250px'; itemSize: itemSize">
+                    *igxFor="let item of data | excelStyleSearchFilter: searchValue; scrollOrientation : 'vertical'; containerSize: '250px'; itemSize: itemSize">
                     <igx-checkbox
                     [value]="item"
                     tabindex="-1"

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.component.ts

@@ -11,6 +11,7 @@ import { IChangeCheckboxEventArgs } from '../../../checkbox/checkbox.component';
 import { IgxInputDirective } from '../../../directives/input/input.directive';
 import { DisplayDensity } from '../../../core/density';
 import { IgxForOfDirective } from '../../../directives/for-of/for_of.directive';
+import { FilterListItem } from './grid.excel-style-filtering.component';
 
 /**
  * @hidden
@@ -26,7 +27,7 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit {
     public searchValue: any;
 
     @Input()
-    public data: any[];
+    public data: FilterListItem[];
 
     @Input()
     public column: IgxColumnComponent;
@@ -48,13 +49,6 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit {
         });
     }
 
-    get filterOptions() {
-        const fo = new IgxFilterOptions();
-        fo.key = 'value';
-        fo.inputValue = this.searchValue;
-        return fo;
-    }
-
     public clearInput() {
         this.searchValue = null;
     }