Skip to content

Commit c9377e5

Browse files
authored
Merge branch '9.1.x' into mpopov/input-placeholder-position
2 parents 18db295 + 1d495d4 commit c9377e5

File tree

17 files changed

+70
-48
lines changed

17 files changed

+70
-48
lines changed

.hooks/scripts/templates/default.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var defaults = {
1111
otherLine: 80,
1212
},
1313
issuePattern: '(#)[0-9]+',
14-
typesWithMandatoryIssue: [ 'feat', 'fix', 'test' ],
14+
typesWithMandatoryIssue: [],
1515
guidelinesUrl: 'https://bit.ly/angular-guidelines',
1616
types: [
1717
'feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'chore', 'build', 'ci', 'revert'
@@ -20,4 +20,4 @@ var defaults = {
2020
oldMessagePath: path.join('.git', 'COMMIT_EDITMSG_OLD')
2121
}
2222

23-
module.exports = defaults;
23+
module.exports = defaults;

.hooks/scripts/utils/issue-validator.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var matchType = require('../common').matchType,
66
module.exports = (lines, options, errors) => {
77
var ticket = new RegExp(options.issuePattern);
88
var whetherIssueIsMandatory = false,
9-
wheterMatchAnyIssueRef = false;
9+
wheterMatchAnyIssueRef = false;
10+
1011

11-
1212
if (matchType(options.typesWithMandatoryIssue, lines[0])) {
1313
whetherIssueIsMandatory = true;
1414
}
@@ -27,7 +27,7 @@ module.exports = (lines, options, errors) => {
2727

2828
if (whetherIssueIsMandatory && !wheterMatchAnyIssueRef) {
2929
errors.push(errorFactory(
30-
`The issue reference for (${options.typesWithMandatoryIssue.join(', ')}) types is mandatory!\n`,
30+
`The issue reference for (${options.typesWithMandatoryIssue.join(', ')}) types is mandatory!\n`,
3131
"Please add at least one related issue. E.g: Closes #31, Closes #45"));
3232
}
33-
}
33+
}

ROADMAP.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,22 @@
22

33
# Current Milestone
44

5-
## Milestone 11 (Due by April 30th, 2020)
5+
## Milestone 12 (Due by August, 2020)
6+
7+
1. Accept ISO 8601 Date-only string as input for igx-calendar and igx-datepicker [#6994](https://github.com/IgniteUI/igniteui-angular/issues/6994)
8+
2. igxCombo has to include caseSensitive property in filter search [#7282](https://github.com/IgniteUI/igniteui-angular/issues/7282)
9+
3. igxCombo default positioning strategy [#7225](https://github.com/IgniteUI/igniteui-angular/issues/7225)
10+
To Be Updated
11+
12+
13+
## Going down the road
14+
15+
1. Tile Manager
16+
2. Visual Cell merging
17+
3. RTL Support across Ignite UI for Angular components
18+
# Previous Milestones
19+
20+
## Milestone 11 (Released June 2nd, 2020)
621

722
1. Dock Manger [#5980](https://github.com/IgniteUI/igniteui-angular/issues/5980)
823
2. Range Date Picker [#5732](https://github.com/IgniteUI/igniteui-angular/issues/5732)
@@ -14,14 +29,9 @@
1429
8. Data Analysis Directive [#1752](https://github.com/IgniteUI/igniteui-angular-samples/issues/1752)
1530
9. Slider does not support RTL [#5212](https://github.com/igniteui/igniteui-angular/issues/5212)
1631
10. Circular Progress Indicator does not support RTL [#5903](https://github.com/igniteui/igniteui-angular/issues/5903)
17-
18-
19-
## Going down the road
20-
21-
1. Tile Manager
22-
2. Visual Cell merging
23-
3. RTL Support across Ignite UI for Angular components
24-
# Previous Milestones
32+
11. Action Strip [#6941](https://github.com/IgniteUI/igniteui-angular/issues/6941)
33+
12. Theme igx-component scrollbars [#6675](https://github.com/IgniteUI/igniteui-angular/issues/6675)
34+
13. Use CSS variables by default [#6803](https://github.com/IgniteUI/igniteui-angular/issues/6675)
2535

2636
## Milestone 10 (Released February 10th, 2020)
2737

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@
108108

109109
%grid-excel-sort {
110110
display: block;
111-
padding: rem(8px) rem(16px);
111+
padding-top: rem(8px);
112+
padding-bottom: rem(8px);
112113

113114
header {
114115
color: igx-color($palette, 'grays', 700);
@@ -245,7 +246,8 @@
245246
}
246247

247248
%grid-excel-sort {
248-
padding: rem(8px);
249+
padding-top: rem(8px);
250+
padding-bottom: rem(8px);
249251
}
250252

251253
%grid-excel-actions {
@@ -277,7 +279,8 @@
277279
}
278280

279281
%grid-excel-sort {
280-
padding: rem(4px);
282+
padding-top: rem(4px);
283+
padding-bottom: rem(4px);
281284

282285
@extend %grid-excel-action--compact;
283286

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,7 @@
970970
}
971971

972972
%grid-tbody-scrollbar {
973+
background: --var($theme, 'content-background');
973974
border-#{$left}: 1px solid igx-color($palette, 'grays', 300);
974975
position: relative;
975976
}

projects/igniteui-angular/src/lib/date-picker/date-picker.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
<input
2525
class="igx-date-picker__input-date"
2626
igxInput
27-
[igxTextSelection]="true"
2827
type="text"
2928
[value]="transformedDate"
3029
[igxMask]="inputMask"
3130
[placeholder]="mask"
31+
[igxTextSelection]="true"
3232
[disabled]="disabled"
3333
[displayValuePipe]="displayValuePipe"
3434
[focusedValuePipe]="inputValuePipe"

projects/igniteui-angular/src/lib/directives/scroll-inertia/scroll_inertia.directive.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ export class IgxScrollInertiaDirective implements OnInit, OnDestroy {
6262
private _nextX;
6363
private _nextY;
6464
private parentElement;
65+
private baseDeltaMultiplier = 1 / 120;
66+
private firefoxDeltaMultiplier = 1 / 30;
6567

6668
ngOnInit(): void {
6769
this._zone.runOutsideAngular(() => {
@@ -106,28 +108,30 @@ export class IgxScrollInertiaDirective implements OnInit, OnDestroy {
106108
if (evt.wheelDeltaX) {
107109
/* Option supported on Chrome, Safari, Opera.
108110
/* 120 is default for mousewheel on these browsers. Other values are for trackpads */
109-
scrollDeltaX = -evt.wheelDeltaX / 120;
111+
scrollDeltaX = -evt.wheelDeltaX * this.baseDeltaMultiplier;
110112

111113
if (-minWheelStep < scrollDeltaX && scrollDeltaX < minWheelStep) {
112114
scrollDeltaX = Math.sign(scrollDeltaX) * minWheelStep;
113115
}
114116
} else if (evt.deltaX) {
115117
/* For other browsers that don't provide wheelDelta, use the deltaY to determine direction and pass default values. */
116-
scrollDeltaX = this.calcAxisCoords(evt.deltaX, -1, 1);
118+
const deltaScaledX = evt.deltaX * (evt.deltaMode === 0 ? this.firefoxDeltaMultiplier : 1);
119+
scrollDeltaX = this.calcAxisCoords(deltaScaledX, -1, 1);
117120
}
118121

119122
/** Get delta for the Y axis */
120123
if (evt.wheelDeltaY) {
121124
/* Option supported on Chrome, Safari, Opera.
122125
/* 120 is default for mousewheel on these browsers. Other values are for trackpads */
123-
scrollDeltaY = -evt.wheelDeltaY / 120;
126+
scrollDeltaY = -evt.wheelDeltaY * this.baseDeltaMultiplier;
124127

125128
if (-minWheelStep < scrollDeltaY && scrollDeltaY < minWheelStep) {
126129
scrollDeltaY = Math.sign(scrollDeltaY) * minWheelStep;
127130
}
128131
} else if (evt.deltaY) {
129132
/* For other browsers that don't provide wheelDelta, use the deltaY to determine direction and pass default values. */
130-
scrollDeltaY = this.calcAxisCoords(evt.deltaY, -1, 1);
133+
const deltaScaledY = evt.deltaY * (evt.deltaMode === 0 ? this.firefoxDeltaMultiplier : 1);
134+
scrollDeltaY = this.calcAxisCoords(deltaScaledY, -1, 1);
131135
}
132136
if (scrollDeltaX && this.IgxScrollInertiaDirection === 'horizontal') {
133137
this._scrollToX(

projects/igniteui-angular/src/lib/drop-down/drop-down-item.base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export class IgxDropDownItemBaseDirective implements DoCheck {
187187
*
188188
* ```html
189189
* <!--set-->
190-
* <igx-dropdown-item *ngFor="let item of items">
190+
* <igx-drop-down-item *ngFor="let item of items">
191191
* <div *ngIf="items.indexOf(item) === 5; then item.isHeader = true">
192192
* {{item.field}}
193193
* </div>

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,8 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
760760
return;
761761
}
762762
if (!isLeftClick(event)) {
763+
event.preventDefault();
764+
this.setActiveNode();
763765
this.selectionService.addKeyboardRange();
764766
this.selectionService.initKeyboardState();
765767
this.selectionService.primaryButton = false;
@@ -844,14 +846,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
844846
*/
845847
public activate(event: FocusEvent | KeyboardEvent) {
846848
const node = this.selectionNode;
847-
848-
if (this.grid.navigation.activeNode) {
849-
Object.assign(this.grid.navigation.activeNode, {row: this.rowIndex, column: this.visibleColumnIndex});
850-
} else {
851-
const layout = this.column.columnLayoutChild ? this.grid.navigation.layout(this.visibleColumnIndex) : null;
852-
this.grid.navigation.activeNode = { row: this.rowIndex, column: this.visibleColumnIndex, layout: layout };
853-
}
854-
849+
this.setActiveNode();
855850
const shouldEmitSelection = !this.selectionService.isActiveNode(node);
856851

857852
if (this.selectionService.primaryButton) {
@@ -916,4 +911,13 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
916911
meta.set('pinned', this.grid.isRecordPinnedByViewIndex(this.row.index));
917912
return meta;
918913
}
914+
915+
private setActiveNode() {
916+
if (this.grid.navigation.activeNode) {
917+
Object.assign(this.grid.navigation.activeNode, {row: this.rowIndex, column: this.visibleColumnIndex});
918+
} else {
919+
const layout = this.column.columnLayoutChild ? this.grid.navigation.layout(this.visibleColumnIndex) : null;
920+
this.grid.navigation.activeNode = { row: this.rowIndex, column: this.visibleColumnIndex, layout: layout };
921+
}
922+
}
919923
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,10 @@ <h4>{{ column.header || column.field }}</h4>
9898
</div>
9999
</header>
100100

101-
<div *ngIf="column.sortable">
102-
<ng-container *ngTemplateOutlet="sortingTemplate"></ng-container>
103-
</div>
104-
105101
<section class="igx-excel-filter__actions">
102+
<div *ngIf="column.sortable">
103+
<ng-container *ngTemplateOutlet="sortingTemplate"></ng-container>
104+
</div>
106105

107106
<div *ngIf="column.movable">
108107
<ng-container *ngTemplateOutlet="movingTemplate"></ng-container>

0 commit comments

Comments
 (0)