Skip to content

Commit f3022c5

Browse files
authored
Merge branch 'master' into pbozhinov/fix-5673-10
2 parents 56194ee + 8f1c49b commit f3022c5

21 files changed

+73
-50
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+
}

CHANGELOG.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
# Ignite UI for Angular Change Log
22

33
All notable changes for each version of this project will be documented in this file.
4+
## 10.0.0
5+
6+
### New Features
7+
8+
- `IgxGrid`
9+
- `showGroupArea` input is added, which can be used to enable/disable the group area row.
10+
11+
## 10.0
12+
13+
### General
14+
- `igx-select`, `igx-combo`, `igx-drop-down`
15+
- **Behavioral Change** - The select, combo, and dropdown items now have display block and text-overflow ellipsis enabled by default.
416

517
## 10.0.0
618

@@ -137,11 +149,11 @@ All notable changes for each version of this project will be documented in this
137149
```typescript
138150
public pinningConfiguration: IPinningConfig = { columns: ColumnPinningPosition.End };
139151
```
140-
- Added new properties for paging:
141-
- `totalRecords` set to alter the pages count based on total remote records. Keep in mind that If you are using paging and all the data is passed to the grid, the value of totalRecords property will be set by default to the length of the provided data source. If totalRecords is set, it will take precedent over the default length based on the data source.
142-
- `pagingMode` - accepts `GridPagingMode` enumeration. If the paging mode is set to remote the grid will not paginate the passed data source, if the paging mode is set to local (which is the default value) the grid will paginate the data source based on the page, perPage and totalRecords values.
152+
- Added new properties for paging:
153+
- `totalRecords` set to alter the pages count based on total remote records. Keep in mind that If you are using paging and all the data is passed to the grid, the value of totalRecords property will be set by default to the length of the provided data source. If totalRecords is set, it will take precedent over the default length based on the data source.
154+
- `pagingMode` - accepts `GridPagingMode` enumeration. If the paging mode is set to remote the grid will not paginate the passed data source, if the paging mode is set to local (which is the default value) the grid will paginate the data source based on the page, perPage and totalRecords values.
143155
- Added functionality for column selection.
144-
- `columnSelection` property has been added. It accepts GridSelection mode enumeration. Grid selection mode could be none, single or multiple.
156+
- `columnSelection` property has been added. It accepts GridSelection mode enumeration. Grid selection mode could be none, single or multiple.
145157
- `selected` property has been added to the IgxColumnComponent; Allows you to set whether the column is selected.
146158
- `selectable` property has been added to the IgxColumnComponent; Allows you to set whether the column is selectable.
147159
- `onColumnSelectionChange` event is added for the `IgxGrid`. It is emitted when the column selection is changed.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<ng-container *ngIf="!isHeader">
22
<igx-checkbox [checked]="selected" disableRipple="true" [disableTransitions]="disableTransitions" [tabindex]="-1" (click)="disableCheck($event)" class="igx-combo__checkbox"></igx-checkbox>
33
</ng-container>
4-
<ng-content></ng-content>
4+
<span class="igx-drop-down__inner"><ng-content></ng-content></span>

projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
@extend %igx-drop-down__item !optional;
2626
}
2727

28+
@include e(inner) {
29+
@extend %igx-drop-down__inner !optional;
30+
}
31+
2832
@include e(item, $m: cosy) {
2933
@extend %igx-drop-down__item--cosy !optional;
3034
}

projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@
271271
}
272272
}
273273

274+
%igx-drop-down__inner {
275+
display: block;
276+
@include ellipsis();
277+
}
278+
274279
%igx-drop-down__item--cosy {
275280
height: map-get($item-height, 'cosy');
276281
padding: map-get($item-padding, 'cosy');

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/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>

0 commit comments

Comments
 (0)