Skip to content

Commit 78dacdd

Browse files
authored
Merge branch 'master' into dkamburov/kb-test-pinning
2 parents b74a29a + e036cc0 commit 78dacdd

File tree

129 files changed

+5934
-6862
lines changed

Some content is hidden

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

129 files changed

+5934
-6862
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@ All notable changes for each version of this project will be documented in this
1313

1414
### New Features
1515

16+
- `igxSplitter` component added.
17+
- Allows rendering a vertical or horizontal splitter with multiple splitter panes with templatable content.
18+
Panes can be resized or collapsed/expanded via the UI. Splitter orientation is defined via the `type` input.
19+
20+
```html
21+
<igx-splitter [type]="type">
22+
<igx-splitter-pane>
23+
...
24+
</igx-splitter-pane>
25+
<igx-splitter-pane>
26+
...
27+
</igx-splitter-pane>
28+
</igx-splitter>
29+
```
30+
1631
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
1732
- Added ability to pin rows to top or bottom depending on the new `pinning` input.
1833
And new API methods `pinRow` and `unpinRow`.
@@ -50,6 +65,10 @@ All notable changes for each version of this project will be documented in this
5065
- `IgxToast`:
5166
- Added functionality for displaying various content into the toast component. It also allows users to access toast styles through its host element.
5267

68+
- `IgxDrag`
69+
- New `igxDragIgnore` directive that allows children of the `igxDrag` element to be interactable and receive mouse events. Dragging cannot be performed from those elements that are ignored.
70+
- New `dragDirection` input that can specify only one direction of dragging or both.
71+
5372
### RTL Support
5473
- `igxSlider` have full right-to-left (RTL) support.
5574

ROADMAP.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22

33
# Current Milestone
44

5-
## Milestone 11 (Due by April, 2020)
5+
## Milestone 11 (Due by April 30th, 2020)
66

77
1. Dock Manger [#5980](https://github.com/IgniteUI/igniteui-angular/issues/5980)
88
2. Range Date Picker [#5732](https://github.com/IgniteUI/igniteui-angular/issues/5732)
9-
3. RTL Support across Ignite UI for Angular components [#5958](https://github.com/IgniteUI/igniteui-angular/issues/5958)
9+
3. Keyboard Navigation Enhancement [#6755](https://github.com/IgniteUI/igniteui-angular/issues/6755)
1010
4. Column freezing/Pinning on the right (igx-grid) [#5879](https://github.com/IgniteUI/igniteui-angular/issues/5879)
1111
5. Column Selection for IgxGrid [#6578](https://github.com/IgniteUI/igniteui-angular/issues/6578)
12-
6. Splitter IgxGrid [#6639](https://github.com/IgniteUI/igniteui-angular/issues/6639)
12+
6. Splitter [#6639](https://github.com/IgniteUI/igniteui-angular/issues/6639)
1313
7. Row Pinning IgxGrid [#6640](https://github.com/IgniteUI/igniteui-angular/issues/6640)
1414
8. Data Analysis Directive [#1752](https://github.com/IgniteUI/igniteui-angular-samples/issues/1752)
15+
9. Slider does not support RTL [#5212](https://github.com/igniteui/igniteui-angular/issues/5212)
16+
10. Circular Progress Indicator does not support RTL [#5903](https://github.com/igniteui/igniteui-angular/issues/5903)
1517

1618

1719
## Going down the road
1820

1921
1. Tile Manager
2022
2. Visual Cell merging
21-
23+
3. RTL Support across Ignite UI for Angular components
2224
# Previous Milestones
2325

2426
## Milestone 10 (Released February 10th, 2020)

projects/igniteui-angular/src/lib/chips/chip.component.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
[attr.tabindex]="chipTabindex"
33
(keydown)="onChipKeyDown($event)"
44
[igxDrag]="{chip: this}"
5-
[hideBaseOnDrag]="hideBaseOnDrag"
5+
[style.visibility]='hideBaseElement ? "hidden" : "visible"'
66
[ghostClass]="ghostClass"
77
(dragStart)="onChipDragStart($event)"
8+
(ghostCreate)="onChipGhostCreate()"
9+
(ghostDestroy)="onChipGhostDestroy()"
810
(dragEnd)="onChipDragEnd()"
911
(transitioned)="onChipMoveEnd($event)"
1012
(dragClick)="onChipDragClicked($event)"

projects/igniteui-angular/src/lib/chips/chip.component.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,12 @@ export class IgxChipComponent extends DisplayDensityBase {
437437
return !this.disabled ? 0 : '';
438438
}
439439

440+
/**
441+
* @hidden
442+
* @internal
443+
*/
444+
public hideBaseElement = false;
445+
440446
protected _selected = false;
441447
protected _selectedItemClass = 'igx-chip__item--selected';
442448
protected _movedWhileRemoving = false;
@@ -624,6 +630,22 @@ export class IgxChipComponent extends DisplayDensityBase {
624630
}
625631
}
626632

633+
/**
634+
* @hidden
635+
* @internal
636+
*/
637+
public onChipGhostCreate() {
638+
this.hideBaseElement = this.hideBaseOnDrag;
639+
}
640+
641+
/**
642+
* @hidden
643+
* @internal
644+
*/
645+
public onChipGhostDestroy() {
646+
this.hideBaseElement = false;
647+
}
648+
627649
/**
628650
* @hidden
629651
* @internal

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
&:hover,
178178
&:focus {
179179
@extend %cal-value--month-hover !optional;
180+
@extend %cal-value--month-current !optional;
180181
}
181182
}
182183

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@
743743
}
744744

745745
%cal-value--month-current {
746-
color: --var($theme, 'month-current-text-color') ;
746+
color: --var($theme, 'month-current-text-color');
747747
}
748748

749749
%cal-value--inactive {

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

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
/// @param {String} $header-border-width [null] - The border width used for header borders.
1818
/// @param {String} $header-border-style [null] - The border style used for header borders.
1919
/// @param {Color} $header-border-color [null] - The color used for header borders.
20+
/// @param {Color} $header-selected-background [null] - The table header background color when selected (ex. column selection).
21+
/// @param {Color} $header-selected-text-color [null] - The table header text color when selected (ex. column selection).
2022
///
2123
/// @param {Color} $sorted-header-icon-color [null] - The sort icon color when sorted.
2224
/// @param {color} $sortable-header-icon-hover-color [null] - The icon color on hover in grid header when the column is sortable.
@@ -126,6 +128,9 @@
126128
$header-border-style: null,
127129
$header-border-color: null,
128130
131+
$header-selected-background: null,
132+
$header-selected-text-color: null,
133+
129134
$sorted-header-icon-color: null,
130135
131136
$content-background: null,
@@ -230,7 +235,22 @@
230235

231236
$tree-selected-filtered-row-text-color: rgba(text-contrast(map-get($theme, 'row-selected-background')), .5);
232237
$tree-selected-filtered-cell-text-color: rgba(text-contrast(map-get($theme, 'cell-selected-background')), .5);
233-
$row-selected-cell-background: darken-color(map-get($theme, 'row-selected-background'), 8%);
238+
239+
$rs-bg: if(
240+
$row-selected-background,
241+
$row-selected-background,
242+
map-get($theme, 'row-selected-background')
243+
);
244+
245+
$row-selected-cell-background: null;
246+
247+
@if type-of($rs-bg) == 'color' {
248+
@if luminance($rs-bg) < .5 {
249+
$row-selected-cell-background: lighten-color($rs-bg, 8%);
250+
} @else {
251+
$row-selected-cell-background: darken-color($rs-bg, 8%);
252+
}
253+
}
234254

235255
@if not($ghost-header-icon-color) and $ghost-header-background {
236256
@if type-of($ghost-header-background) == 'color' {
@@ -250,6 +270,10 @@
250270
$header-text-color: text-contrast($header-background);
251271
}
252272

273+
@if not($header-selected-text-color) and $header-selected-background {
274+
$header-selected-text-color: text-contrast($header-selected-background);
275+
}
276+
253277
@if not($header-border-color) and $header-background {
254278
@if type-of($header-background) == 'color' {
255279
$header-border-color: rgba(text-contrast($header-background), .24);
@@ -442,6 +466,8 @@
442466

443467
header-background: $header-background,
444468
header-text-color: $header-text-color,
469+
header-selected-background: $header-selected-background,
470+
header-selected-text-color: $header-selected-text-color,
445471
header-border-width: $header-border-width,
446472
header-border-style: $header-border-style,
447473
header-border-color: $header-border-color,
@@ -979,6 +1005,15 @@
9791005
&:hover {
9801006
background: --var($theme, 'row-hover-background');
9811007
color: --var($theme, 'row-hover-text-color');
1008+
1009+
%grid-cell--column-selected {
1010+
background: --var($theme, 'row-selected-hover-background');
1011+
}
1012+
1013+
%grid-cell--cross-selected {
1014+
color: --var($theme, 'row-selected-text-color');
1015+
background: --var($theme, 'row-selected-cell-background');
1016+
}
9821017
}
9831018

9841019
&%igx-grid__tr--ghost {
@@ -1059,6 +1094,11 @@
10591094
&:hover {
10601095
background: --var($theme, 'row-selected-hover-background');
10611096
color: --var($theme, 'row-selected-text-color');
1097+
1098+
%grid-cell--column-selected {
1099+
color: --var($theme, 'row-selected-text-color');
1100+
background: --var($theme, 'row-selected-hover-background');
1101+
}
10621102
}
10631103

10641104
%igx-grid__tree-grouping-indicator {
@@ -1289,14 +1329,10 @@
12891329
%grid-cell--column-selected {
12901330
color: --var($theme, 'row-selected-text-color');
12911331
background: --var($theme, 'row-selected-background');
1292-
1293-
&:hover {
1294-
background: --var($theme, 'row-selected-hover-background');
1295-
color: --var($theme, 'row-selected-text-color');
1296-
}
12971332
}
12981333

12991334
%grid-cell--cross-selected {
1335+
color: --var($theme, 'row-selected-text-color');
13001336
background: --var($theme, 'row-selected-cell-background');
13011337
}
13021338

@@ -1472,14 +1508,14 @@
14721508
}
14731509

14741510
%igx-grid__th--selectable {
1475-
color: --var($theme, 'row-selected-text-color');
1476-
background: --var($theme, 'row-selected-background');
1511+
color: --var($theme, 'header-selected-text-color');
1512+
background: --var($theme, 'header-selected-background');
14771513
opacity: .7;
14781514
}
14791515

14801516
%igx-grid__th--selected {
1481-
color: --var($theme, 'row-selected-text-color');
1482-
background: --var($theme, 'row-selected-cell-background');
1517+
color: --var($theme, 'header-selected-text-color');
1518+
background: --var($theme, 'header-selected-background');
14831519
}
14841520

14851521
%igx-grid__th--sortable {
@@ -2208,8 +2244,8 @@
22082244
}
22092245

22102246
%igx-grid__filtering-cell--selected {
2211-
color: --var($theme, 'row-selected-text-color');
2212-
background: --var($theme, 'row-selected-cell-background');
2247+
color: --var($theme, 'header-selected-text-color');
2248+
background: --var($theme, 'header-selected-background');
22132249
}
22142250

22152251
%igx-grid__filtering-cell-indicator {
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/// @group components
2+
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
3+
/// @author <a href="https://github.com/simeonoff" target="_blank">Maya Kirova</a>
4+
/// @requires {mixin} bem-block
5+
/// @requires {mixin} bem-elem
6+
/// @requires {mixin} bem-mod
7+
////
8+
9+
@include b(igx-splitter) {
10+
// Register the component in the component registry
11+
$this: str-slice(bem--selector-to-string(&), 2, -1);
12+
@include register-component($this);
13+
14+
@include b(#{$this}-bar) {
15+
@extend %igx-splitter-bar !optional;
16+
17+
@include e(handle) {
18+
@extend %igx-splitter-handle !optional;
19+
@extend %igx-splitter-handle--horizontal !optional;
20+
}
21+
22+
@include e(expander, 'start') {
23+
@extend %igx-splitter-expander !optional;
24+
@extend %igx-splitter-expander--start !optional;
25+
}
26+
27+
@include e(expander, 'end') {
28+
@extend %igx-splitter-expander !optional;
29+
@extend %igx-splitter-expander--end !optional;
30+
}
31+
32+
@include m('vertical') {
33+
@extend %igx-splitter-bar--vertical !optional;
34+
35+
@include e(handle) {
36+
@extend %igx-splitter-handle !optional;
37+
@extend %igx-splitter-handle--vertical !optional;
38+
}
39+
40+
@include e(expander, 'start') {
41+
@extend %igx-splitter-expander !optional;
42+
@extend %igx-splitter-expander--start-vertical !optional;
43+
}
44+
45+
@include e(expander, 'end') {
46+
@extend %igx-splitter-expander !optional;
47+
@extend %igx-splitter-expander--end-vertical !optional;
48+
}
49+
}
50+
}
51+
}
52+

0 commit comments

Comments
 (0)