Skip to content

Commit 8dec58c

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into dynamic-rm-mch-master
2 parents f23ba64 + 39b9431 commit 8dec58c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+803
-547
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ All notable changes for each version of this project will be documented in this
1212
- You can use this mode to apply directives on the tab items - for example to achieve routing navigation.
1313
- You are allowed to customize tab items with labels, icons and even templates.
1414
- `IgxGrid`
15+
- **Behavioral Change** - paging now includes the group rows in the page size. You may find more information about the change in the [GroupBy Specification](https://github.com/IgniteUI/igniteui-angular/wiki/Group-By-Specification)
1516
- `IgxColumnGroup`
1617
- Re-templating the column group header is now possible using the `headerTemplate` input property or the `igxHeader` directive.
1718
- `igx-grid-footer`
@@ -27,6 +28,8 @@ All notable changes for each version of this project will be documented in this
2728
- Replaces the current paginator in all grids. Can be used as a standalone component.
2829
- `IgxCombo`
2930
- Input `[overlaySettings]` - allows an object of type `OverlaySettings` to be passed. These custom overlay settings control how the drop-down list displays.
31+
- `IgxForOf` now offers usage of local variables `even`, `odd`, `first` and `last` to help with the distinction of the currently iterated element.
32+
3033

3134
## 8.0.2
3235
- `igx-list-theme` now have some new parameters for styling.

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@ You can include Ignite UI for Angular in your project as a dependency using the
181181
`npm install igniteui-angular`
182182

183183
## Contributing
184-
[Coding Guidelines](../../wiki//Coding-guidelines-for-Ignite-UI-for-Angular)
185-
186-
[General Naming Guidelines](../../wiki//General-Naming-Guidelines-for-Ignite-UI-for-Angular)
184+
[General Naming and Coding Guidelines for Ignite UI for Angular](https://github.com/IgniteUI/igniteui-angular/wiki/General-Naming-and-Coding--Guidelines-for-Ignite-UI-for-Angular)
187185

188186
## Demo Apps & Documentation
189187
The [Warehouse Picklist App](https://github.com/IgniteUI/warehouse-js-blocks) demonstrates using several Ignite UI for Angular widgets together to build a modern, mobile app.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<ng-container *ngIf="!isHeader">
2-
<igx-checkbox [checked]="selected" disableRipple="true" [disableTransitions]="disableTransitions" disabled="true" class="igx-combo__checkbox"></igx-checkbox>
2+
<igx-checkbox [checked]="selected" disableRipple="true" [disableTransitions]="disableTransitions" [tabindex]="-1" (click)="disableCheck($event)" class="igx-combo__checkbox"></igx-checkbox>
33
</ng-container>
44
<ng-content></ng-content>

projects/igniteui-angular/src/lib/combo/combo-item.component.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,19 @@ export class IgxComboItemComponent extends IgxDropDownItemComponent implements D
9999
this.comboAPI.set_selected_item(this.itemID, event);
100100
}
101101

102+
/**
103+
* @hidden
104+
* @internal
105+
* The event that is prevented is the click on the checkbox label element.
106+
* That is the only visible element that a user can interact with.
107+
* The click propagates to the host and the preventDefault is to stop it from
108+
* switching focus to the input it's base on.
109+
* The toggle happens in an internal handler in the drop-down on the next task queue cycle.
110+
*/
111+
disableCheck(event: MouseEvent) {
112+
event.preventDefault();
113+
}
114+
102115
ngDoCheck() {
103116
}
104117
}

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const CSS_CLASS_DROPDOWNBUTTON = 'igx-combo__toggle-button';
2929
const CSS_CLASS_CLEARBUTTON = 'igx-combo__clear-button';
3030
const CSS_CLASS_CHECK_GENERAL = 'igx-combo__checkbox';
3131
const CSS_CLASS_CHECKBOX = 'igx-checkbox';
32+
const CSS_CLASS_CHECKBOX_LABEL = 'igx-checkbox__composite';
3233
const CSS_CLASS_CHECKED = 'igx-checkbox--checked';
3334
const CSS_CLASS_TOGGLE = 'igx-toggle';
3435
const CSS_CLASS_SELECTED = 'igx-drop-down__item--selected';
@@ -950,7 +951,7 @@ describe('igxCombo', () => {
950951
}
951952
function clickItemCheckbox(dropdownElement: any, itemIndex: number) {
952953
const dropdownItems = dropdownElement.querySelectorAll('.' + CSS_CLASS_DROPDOWNLISTITEM);
953-
const checkbox = dropdownItems[itemIndex].querySelector('.' + CSS_CLASS_CHECKBOX) as HTMLElement;
954+
const checkbox = dropdownItems[itemIndex].querySelector('.' + CSS_CLASS_CHECKBOX_LABEL) as HTMLElement;
954955
checkbox.click();
955956
}
956957
function verifyItemIsSelected(

projects/igniteui-angular/src/lib/core/grid-selection.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ export class IgxGridCRUDService {
105105
return new IgxRow(cell.id.rowID, cell.rowIndex, cell.rowData);
106106
}
107107

108-
sameRow(rowID): boolean {
109-
return this.row && this.row.id === rowID;
108+
sameRow(rowIndex): boolean {
109+
return this.row && this.row.index === rowIndex;
110110
}
111111

112112
sameCell(cell: IgxCell): boolean {
@@ -175,7 +175,7 @@ export class IgxGridCRUDService {
175175
return;
176176
}
177177

178-
if (this.row && !this.sameRow(this.cell.id.rowID)) {
178+
if (this.row && !this.sameRow(this.cell.rowIndex)) {
179179
this.grid.endEdit(true);
180180
this.cell = this.createCell(cell);
181181
this.beginRowEdit();

projects/igniteui-angular/src/lib/core/styles/base/utilities/_functions.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,12 +349,12 @@
349349
/// // }
350350
/// // otherwise, it will return the value for key 'icon-color' in the '$avatar-theme';
351351
/// @returns {String} - The value of the key in the passed map, or the name of key concatenated with the key name.
352-
@function --var($map, $key) {
352+
@function --var($map, $key, $fallback: '') {
353353
$igx-legacy-support: if(global-variable-exists('igx-legacy-support'), $igx-legacy-support, true);
354354

355355
@if map-has-key($map, $key) {
356356
@if $igx-legacy-support == false {
357-
@return unquote('var(--#{map-get($map, 'name')}-#{$key})');
357+
@return unquote('var(--#{map-get($map, 'name')}-#{$key}, #{$fallback})');
358358
} @else {
359359
@return map-get($map, $key);
360360
}

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/// @param {Map} $schema [$light-schema] - The schema used as basis for styling the component.
1010
///
1111
/// @param {Color} $background-color [null] - The summaries background color is inherited form igx-grid__tfoot
12+
/// @param {Color} $focus-background-color [null] - The background color when a summary item is on focus.
1213
/// @param {Color} $label-color [null] - The summaries label color.
1314
/// @param {Color} $result-color [null] - The summaries value/result color.
1415
/// @param {Color} $border-color [null] - The summaries border color.
@@ -35,6 +36,7 @@
3536
$schema: $light-schema,
3637
3738
$background-color: null,
39+
$focus-background-color: null,
3840
$label-color: null,
3941
$result-color: null,
4042
$border-color: null,
@@ -62,6 +64,7 @@
6264
name: $name,
6365
palette: $palette,
6466
background-color: $background-color,
67+
focus-background-color: $focus-background-color,
6568
label-color: $label-color,
6669
result-color: $result-color,
6770
border-color: $border-color,
@@ -98,12 +101,27 @@
98101
);
99102

100103
%igx-grid-summary {
104+
position: relative;
101105
display: flex;
102106
flex-direction: column;
103107
flex: 1 1 0%;
104108
padding: map-get($summary-padding, 'comfortable');
105-
background: --var($theme, 'background-color');
109+
background: --var($theme, 'background-color', inherit);
106110
overflow: hidden;
111+
outline-style: none;
112+
113+
&::after {
114+
position: absolute;
115+
content: '';
116+
top: 0;
117+
bottom: 0;
118+
left: 0;
119+
right: 0;
120+
}
121+
122+
&:focus::after {
123+
background: --var($theme, 'focus-background-color');
124+
}
107125
}
108126

109127
%igx-grid-summary--cosy {

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,7 @@
343343

344344
@include igx-scope('.igx-typography') {
345345
%item {
346-
@include igx-type-style($type-scale, $item) {
347-
margin: 0;
348-
}
346+
@include igx-type-style($type-scale, $item);
349347
}
350348

351349
%item--header {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_drop-down.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
/// @prop {Map} hover-item-background [igx-color: 'surface', text-contrast: (), rgba: .04] - The drop-down hover item background color.
1717
/// @prop {Map} focused-item-background [igx-color: 'surface', text-contrast: (), rgba: .04] - The drop-down focused item background color.
1818
/// @prop {Map} focused-item-text-color [igx-color: 'surface', text-contrast: (), rgba: .74] - The drop-down focused item text color.
19-
/// @prop {Map} selected-item-background [igx-color: ('secondary', 500)] - The drop-down selected item background color.
20-
/// @prop {Map} selected-item-text-color [igx-contrast-color: ('secondary', 500)] - The drop-down selected item text color.
21-
/// @prop {Map} selected-hover-item-background [igx-color: ('secondary', 300)] - The drop-down selected item hover background color.
22-
/// @prop {Map} selected-hover-item-text-color [igx-contrast-color: ('secondary', 300)] - The drop-down selected item hover text color.
23-
/// @prop {Map} selected-focus-item-background [igx-color: ('secondary', 300)] - The drop-down selected item focus background color.
24-
/// @prop {Map} selected-focus-item-text-color [igx-contrast-color: ('secondary', 300)] - The drop-down selected item focus text color.
19+
/// @prop {Map} selected-item-background [igx-color: ('secondary', 100)] - The drop-down selected item background color.
20+
/// @prop {Map} selected-item-text-color [igx-contrast-color: ('secondary', 100)] - The drop-down selected item text color.
21+
/// @prop {Map} selected-hover-item-background [igx-color: ('secondary', 200)] - The drop-down selected item hover background color.
22+
/// @prop {Map} selected-hover-item-text-color [igx-contrast-color: ('secondary', 200)] - The drop-down selected item hover text color.
23+
/// @prop {Map} selected-focus-item-background [igx-color: ('secondary', 200)] - The drop-down selected item focus background color.
24+
/// @prop {Map} selected-focus-item-text-color [igx-contrast-color: ('secondary', 200)] - The drop-down selected item focus text color.
2525
/// @prop {Color} disabled-item-background [transparent] - The drop-down disabled item background color.
2626
/// @prop {Map} disabled-item-text-color [igx-color: 'surface', text-contrast: (), rgba: .38] - The drop-down disabled item text color.
2727
/// @prop {Number} elevation [8] - The elevation level, between 0-24, to be used for the badge shadow.
@@ -70,27 +70,27 @@ $_light-drop-down: extend(
7070
),
7171

7272
selected-item-background: (
73-
igx-color: ('secondary', 500)
73+
igx-color: ('secondary', 100),
7474
),
7575

7676
selected-item-text-color: (
77-
igx-contrast-color: ('secondary', 500)
77+
igx-contrast-color: ('secondary', 100)
7878
),
7979

8080
selected-hover-item-background: (
81-
igx-color: ('secondary', 300)
81+
igx-color: ('secondary', 200),
8282
),
8383

8484
selected-hover-item-text-color: (
85-
igx-contrast-color: ('secondary', 300)
85+
igx-contrast-color: ('secondary', 200)
8686
),
8787

8888
selected-focus-item-background: (
89-
igx-color: ('secondary', 300)
89+
igx-color: ('secondary', 200),
9090
),
9191

9292
selected-focus-item-text-color: (
93-
igx-contrast-color: ('secondary', 300)
93+
igx-contrast-color: ('secondary', 200)
9494
),
9595

9696
disabled-item-background: transparent,

0 commit comments

Comments
 (0)