Skip to content

Commit aef4303

Browse files
authored
Merge branch '7.3.x' into select-cust-overlay-settings-mousedown
2 parents 72f8ff3 + aa6e809 commit aef4303

34 files changed

+668
-240
lines changed

angularDocsPostDeploy.ps1

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
Write-Host "angularDocsRoot value is: " $angularDocsRoot; #angularDocsRoot octo variable
2+
$isLatest = "VariableIsLatest";
3+
$tag = "VariableValue";
4+
$path = $angularDocsRoot;
5+
$newPath = $path -replace $tagFolder, $tag #tagFolder octo variable
6+
$angularDocsRootFolder = [System.IO.Directory]::GetParent($angularDocsRoot);
7+
Write-Host "newPath is:" $newPath;
8+
9+
#######Delete all other folders starting with <AngularMajor>.<Major>########
10+
#######Since we are going to keep the latest and greatest########
11+
$lastDot = $tag.LastIndexOf('.');
12+
$filter = $tag.Substring(0,$lastDot);
13+
$foldersToDel = Get-ChildItem -Path $angularDocsRootFolder -Directory -Filter $filter*
14+
Write-Host "Folders to delete: " $foldersToDel
15+
16+
try {
17+
foreach($f in $foldersToDel){
18+
if([System.IO.Directory]::Exists($f.FullName))
19+
{ Write-Host $f.FullName " to be deleted!"
20+
Remove-Item $f.FullName -Recurse -Force } }
21+
}
22+
catch { Write-Host "Exception while deleting the old folders" }
23+
24+
New-Item -Path $newPath -ItemType Directory -Force
25+
Copy-Item -Path $path\* -Destination $newPath -Recurse -Force
26+
27+
###Add metatag inside index.html files' head section
28+
$indexFiles = Get-ChildItem -Path $newPath -File -Recurse -Filter index.html
29+
foreach($indexFile in $indexFiles) {
30+
$newText = [System.IO.File]::ReadAllText($indexFile.FullName).Replace("</head>", " <meta name=`"robots`" content=`"noindex,nofollow`">
31+
</head>");
32+
[System.IO.File]::WriteAllText($indexFile.FullName, $newText);
33+
}
34+
35+
############Update the angular-docs/sass and typescript folders if isLatest flag is true###########
36+
if($isLatest) {
37+
$sassFolder = $path + "\sass";
38+
$typeScriptFolder = $path + "\typescript";
39+
40+
$sassFolderToUpdate = $path + "\..\sass";
41+
$typeScriptFolderToUpdate = $path + "\..\typescript";
42+
Write-Host "[Latest] sassFolderToUpdate is:" $sassFolderToUpdate;
43+
Write-Host "[Latest] typeScriptFolderToUpdate is:" $typeScriptFolderToUpdate;
44+
45+
#Delete the existing content as octopus option - delete all before deployment
46+
try {
47+
Remove-Item $sassFolderToUpdate\* -Recurse -Force
48+
Remove-Item $typeScriptFolderToUpdate\* -Recurse -Force }
49+
catch { Write-Host "Exception while deleting the $sassFolderToUpdate or $typeScriptFolderToUpdate" }
50+
51+
New-Item -Path $sassFolderToUpdate\latest -ItemType Directory -Force
52+
Copy-Item -Path $sassFolder\* -Destination $sassFolderToUpdate\latest -Recurse -Force
53+
54+
New-Item -Path $typeScriptFolderToUpdate\latest -ItemType Directory -Force
55+
Copy-Item -Path $typeScriptFolder\* -Destination $typeScriptFolderToUpdate\latest -Recurse -Force
56+
}
57+
58+
###########Json file content Update###########
59+
$filePath = $jsonFile; #jsonFile octo variable
60+
Write-Host "Check file exists: " ([System.IO.File]::Exists($filePath))
61+
Write-Host "Check dir exists:" ([System.IO.Directory]::Exists($angularDocsRootFolder));
62+
63+
if([System.IO.File]::Exists($filePath) -and [System.IO.Directory]::Exists($angularDocsRootFolder)) {
64+
$folders = Get-ChildItem -Path $angularDocsRootFolder -Directory -Exclude $tagFolder,"sass","typescript";
65+
$textToUpdate = "";
66+
foreach($item in $folders) {
67+
$textToUpdate += '"' + $item.Name + '"';
68+
}
69+
$textToUpdate = "[" + $textToUpdate.Replace("`"`"","`"`,`"") + "]" ;
70+
Write-Host $textToUpdate;
71+
72+
$content = [System.IO.File]::ReadAllText($filePath);
73+
$newContent = $content -replace "\[.*\]", $textToUpdate;
74+
[System.IO.File]::WriteAllText($filePath,$newContent);
75+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@
128128
@extend %grid-row--mrl !optional;
129129
}
130130

131+
@include e(tr, $mods: (mrl, edit)) {
132+
@extend %grid-row--edit-mrl !optional;
133+
}
134+
131135
@include e(summaries) {
132136
@extend %grid-summaries !optional;
133137

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,15 @@
608608
%igx-grid__drag-indicator {
609609
cursor: default;
610610
}
611+
612+
%grid-row--mrl {
613+
%igx-grid__hierarchical-expander--header,
614+
%igx-grid__header-indentation,
615+
%igx-grid__row-indentation,
616+
%grid__cbx-selection {
617+
border-bottom: --var($theme, 'header-border-width') --var($theme, 'header-border-style') --var($theme, 'header-border-color');
618+
}
619+
}
611620
}
612621

613622
%grid-thead--cosy {
@@ -699,7 +708,15 @@
699708
}
700709

701710
%grid-row--mrl {
702-
border-bottom: none !important;
711+
&%grid-row {
712+
border-bottom-color: transparent;
713+
}
714+
715+
%grid__cbx-selection,
716+
%igx-grid__row-indentation,
717+
%igx-grid__drag-indicator {
718+
border-bottom: 1px solid --var($theme, 'row-border-color');
719+
}
703720
}
704721

705722
%grid-tbody {
@@ -892,6 +909,10 @@
892909
background: --var($theme, 'edit-mode-color');
893910
}
894911

912+
&%grid-row {
913+
border-bottom: 1px solid --var($theme, 'edit-mode-color');
914+
}
915+
895916
%igx-grid__td--editing {
896917
border: none;
897918

@@ -905,6 +926,13 @@
905926
}
906927
}
907928

929+
%grid-row--edit-mrl {
930+
&:first-of-type::after {
931+
top: 0;
932+
z-index: 5;
933+
}
934+
}
935+
908936
%igx-grid__tr--edited {
909937
&::before {
910938
content: '';

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
259259
public onRightButtonSelect = new EventEmitter<IDialogEventArgs>();
260260

261261
private _animaitonSettings: PositionSettings = {
262-
openAnimation: useAnimation(slideInBottom, {params: {fromPosition: 'translateY(100%)'}}),
263-
closeAnimation: useAnimation(slideOutTop, {params: {toPosition: 'translateY(-100%)'}})
262+
openAnimation: useAnimation(slideInBottom, { params: { fromPosition: 'translateY(100%)' } }),
263+
closeAnimation: useAnimation(slideOutTop, { params: { toPosition: 'translateY(-100%)' } })
264264
};
265265

266266
private _overlayDefaultSettings: OverlaySettings;
@@ -391,6 +391,9 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
391391
public open(overlaySettings: OverlaySettings = this._overlayDefaultSettings) {
392392
this.toggleRef.open(overlaySettings);
393393
this.onOpen.emit({ dialog: this, event: null });
394+
if (!this.leftButtonLabel && !this.rightButtonLabel) {
395+
this.toggleRef.element.focus();
396+
}
394397
}
395398

396399
/**

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ describe('IgxAutocomplete', () => {
166166
fixture.detectChanges();
167167
expect(dropDown.collapsed).toBeFalsy();
168168

169-
document.body.click();
169+
// Click in center of the body.
170+
const bodyRect = document.body.getBoundingClientRect();
171+
UIInteractions.simulateMouseEvent('click', document.body,
172+
bodyRect.left + bodyRect.width / 2,
173+
bodyRect.top + bodyRect.height / 2);
170174
tick();
171175
fixture.detectChanges();
172176
expect(dropDown.collapsed).toBeTruthy();
@@ -833,7 +837,7 @@ describe('IgxAutocomplete', () => {
833837
});
834838

835839
@Component({
836-
template: `<igx-input-group>
840+
template: `<igx-input-group style="width: 300px;">
837841
<igx-prefix igxRipple><igx-icon fontSet="material">home</igx-icon> </igx-prefix>
838842
<input igxInput name="towns" type="text" [(ngModel)]="townSelected" required
839843
[igxAutocomplete]='townsPanel'

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ export class IgxFilterPipe implements PipeTransform {
139139
items = options.items;
140140
}
141141

142-
const selectAll = items[0];
143-
if (selectAll.isSpecial) {
144-
items = items.slice(1, items.length);
145-
}
146-
147142
result = items.filter((item: any) => {
148143
const match = options.matchFn(options.formatter(options.get_value(item, options.key)), options.inputValue);
149144

@@ -160,10 +155,6 @@ export class IgxFilterPipe implements PipeTransform {
160155
return match;
161156
});
162157

163-
if (result.length > 0 && selectAll.isSpecial) {
164-
result.unshift(selectAll);
165-
}
166-
167158
return result;
168159
}
169160
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ export class IgxToggleTestComponent {
609609
}
610610
@Component({
611611
template: `
612+
<p>Test</p>
612613
<button [igxToggleAction]="toggleRef" [overlaySettings]="settings">Open/Close Toggle</button>
613614
<div igxToggle #toggleRef="toggle">
614615
<ul>
@@ -618,7 +619,6 @@ export class IgxToggleTestComponent {
618619
<li>4</li>
619620
</ul>
620621
</div>
621-
<p>Test</p>
622622
`
623623
})
624624
export class IgxToggleActionTestComponent {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ export class IgxColumnComponent implements AfterContentInit {
300300
const colWidth = this.width;
301301
const isPercentageWidth = colWidth && typeof colWidth === 'string' && colWidth.indexOf('%') !== -1;
302302
if (isPercentageWidth) {
303-
return parseInt(colWidth, 10) / 100 * this.grid.unpinnedWidth;
303+
return parseInt(colWidth, 10) / 100 * (this.grid.calcWidth - this.grid.featureColumnsWidth);
304304
} else if (!colWidth) {
305305
// no width
306306
return this.defaultWidth || this.grid.getPossibleColumnWidth();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<igx-list [displayDensity]="displayDensity" [style.height.px]="250">
2323
<div [style.overflow]="'hidden'" [style.position]="'relative'">
2424
<igx-list-item
25-
*igxFor="let item of data | igxFilter: filterOptions; scrollOrientation : 'vertical'; containerSize: '250px'; itemSize: itemSize">
25+
*igxFor="let item of data | excelStyleSearchFilter: searchValue; scrollOrientation : 'vertical'; containerSize: '250px'; itemSize: itemSize">
2626
<igx-checkbox
2727
[value]="item"
2828
tabindex="-1"

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { IChangeCheckboxEventArgs } from '../../../checkbox/checkbox.component';
1111
import { IgxInputDirective } from '../../../directives/input/input.directive';
1212
import { DisplayDensity } from '../../../core/density';
1313
import { IgxForOfDirective } from '../../../directives/for-of/for_of.directive';
14+
import { FilterListItem } from './grid.excel-style-filtering.component';
1415

1516
/**
1617
* @hidden
@@ -26,7 +27,7 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit {
2627
public searchValue: any;
2728

2829
@Input()
29-
public data: any[];
30+
public data: FilterListItem[];
3031

3132
@Input()
3233
public column: IgxColumnComponent;
@@ -48,13 +49,6 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit {
4849
});
4950
}
5051

51-
get filterOptions() {
52-
const fo = new IgxFilterOptions();
53-
fo.key = 'value';
54-
fo.inputValue = this.searchValue;
55-
return fo;
56-
}
57-
5852
public clearInput() {
5953
this.searchValue = null;
6054
}

0 commit comments

Comments
 (0)