Skip to content

Commit 5d9693c

Browse files
Merge branch 'master' into ibarakov/fix-6619-9.1.x
2 parents 6eb2433 + f420056 commit 5d9693c

File tree

51 files changed

+1066
-177
lines changed

Some content is hidden

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

51 files changed

+1066
-177
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ All notable changes for each version of this project will be documented in this
88
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
99
- **Behavioral Change** - When a column is sortable sort indicator is always visible. The column is sorted when click on it.
1010

11+
- `IgxInputGroup`
12+
- **Renamed** `supressInputAutofocus` input to `suppressInputAutofocus`
13+
1114
### Themes
1215
- **Breaking Change** Change the default `$legacy-support` value to false in the `igx-theme` function.
1316

projects/igniteui-angular/migrations/migration-collection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@
7070
"version": "9.0.1",
7171
"description": "Updates Ignite UI for Angular from v9.0.0 to v9.0.1",
7272
"factory": "./update-9_0_1"
73+
},
74+
"migration-15": {
75+
"version": "9.1.0",
76+
"description": "Updates Ignite UI for Angular from v9.0.x to v9.1.0",
77+
"factory": "./update-9_1_0"
7378
}
7479
}
7580
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"@scheme": "../../common/schema/binding.schema.json",
3+
"changes": [
4+
{
5+
"name": "supressInputAutofocus",
6+
"replaceWith": "suppressInputAutofocus",
7+
"owner": {
8+
"selector": "igx-input-group",
9+
"type": "component"
10+
}
11+
}
12+
]
13+
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import * as path from 'path';
2+
3+
// tslint:disable:no-implicit-dependencies
4+
import { virtualFs } from '@angular-devkit/core';
5+
import { EmptyTree } from '@angular-devkit/schematics';
6+
// tslint:disable-next-line:no-submodule-imports
7+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
8+
9+
describe('Update 9.1.0', () => {
10+
let appTree: UnitTestTree;
11+
const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
12+
const configJson = {
13+
defaultProject: 'testProj',
14+
projects: {
15+
testProj: {
16+
sourceRoot: '/testSrc'
17+
}
18+
},
19+
schematics: {
20+
'@schematics/angular:component': {
21+
prefix: 'appPrefix'
22+
}
23+
}
24+
};
25+
26+
beforeEach(() => {
27+
appTree = new UnitTestTree(new EmptyTree());
28+
appTree.create('/angular.json', JSON.stringify(configJson));
29+
});
30+
31+
it('should update igx-group supressInputAutofocus to suppressInputAutofocus', done => {
32+
appTree.create(
33+
`/testSrc/appPrefix/component/input.component.html`,
34+
'<igx-input-group [supressInputAutofocus]="true"><input igxInput></igx-input-group>'
35+
);
36+
37+
const tree = schematicRunner.runSchematic('migration-15', {}, appTree);
38+
39+
expect(tree.readContent('/testSrc/appPrefix/component/input.component.html'))
40+
.toEqual('<igx-input-group [suppressInputAutofocus]="true"><input igxInput></igx-input-group>');
41+
42+
done();
43+
});
44+
});
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import {
2+
Rule,
3+
SchematicContext,
4+
Tree
5+
} from '@angular-devkit/schematics';
6+
import { UpdateChanges } from '../common/UpdateChanges';
7+
8+
const version = '9.1.0';
9+
10+
export default function(): Rule {
11+
return (host: Tree, context: SchematicContext) => {
12+
context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
13+
14+
const update = new UpdateChanges(__dirname, host, context);
15+
update.applyChanges();
16+
};
17+
}

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@
358358
@extend %igx-grid__td--editing !optional;
359359
}
360360

361+
@include e(tr, $m: disabled) {
362+
@extend %igx-grid__tr--disabled !optional;
363+
}
364+
361365
@include e(td, $m: number) {
362366
@extend %grid-cell-number !optional;
363367
}
@@ -392,6 +396,10 @@
392396
@extend %grid-cell--pinned--column-selected !optional;
393397
}
394398

399+
@include e(td, $m: pinned-chip) {
400+
@extend %grid-cell--pinned-chip !optional;
401+
}
402+
395403
@include e(td-text) {
396404
@extend %grid-cell-text !optional;
397405
}
@@ -558,6 +566,11 @@
558566
@extend %igx-grid__hierarchical-expander !optional;
559567
}
560568

569+
@include e(hierarchical-expander, $m: empty) {
570+
@extend %igx-grid__hierarchical-expander !optional;
571+
@extend %igx-grid__hierarchical-expander--empty !optional;
572+
}
573+
561574
@include e(hierarchical-expander, $m: header) {
562575
@extend %igx-grid__hierarchical-expander--header !optional;
563576
}
@@ -673,6 +686,11 @@
673686
@extend %igx-grid__hierarchical-expander--cosy !optional;
674687
}
675688

689+
@include e(hierarchical-expander, $m: empty) {
690+
@extend %igx-grid__hierarchical-expander--cosy !optional;
691+
@extend %igx-grid__hierarchical-expander--empty !optional;
692+
}
693+
676694
@include e(hierarchical-expander, $m: push) {
677695
@extend %igx-grid__hierarchical-expander--push--cosy !optional;
678696
}
@@ -688,6 +706,10 @@
688706
@extend %igx-grid__tree-cell-cosy--padding-level-#{$i} !optional;
689707
}
690708
}
709+
710+
@include e(td, $m: pinned-chip) {
711+
@extend %grid-cell--pinned-chip--cosy !optional;
712+
}
691713
}
692714

693715
@include m(compact) {
@@ -772,6 +794,11 @@
772794
@include e(hierarchical-expander) {
773795
@extend %igx-grid__hierarchical-expander--compact !optional;
774796
}
797+
798+
@include e(hierarchical-expander, $m: empty) {
799+
@extend %igx-grid__hierarchical-expander--compact !optional;
800+
@extend %igx-grid__hierarchical-expander--empty !optional;
801+
}
775802

776803
@include e(hierarchical-expander, $m: push) {
777804
@extend %igx-grid__hierarchical-expander--push--compact !optional;
@@ -788,6 +815,10 @@
788815
@extend %igx-grid__tree-cell-compact--padding-level-#{$i} !optional;
789816
}
790817
}
818+
819+
@include e(td, $m: pinned-chip) {
820+
@extend %grid-cell--pinned-chip--compact !optional;
821+
}
791822
}
792823

793824
@include _excel-filtering-partial();

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
/// @param {Color} $cell-selected-background [null] - The selected cell background color.
5050
/// @param {Color} $cell-selected-text-color [null] - The selected cell text color.
5151
/// @param {Color} $cell-editing-background [null] - The background color of the cell being edited.
52-
/// @param {Color} $cell-edited-value-color [null] - The text color of a sell that has been edited.
52+
/// @param {Color} $cell-edited-value-color [null] - The text color of a cell that has been edited.
53+
/// @param {Color} $cell-disabled-color [null] - The text color of a disabled cell.
5354
///
5455
/// @param {Color} $edit-mode-color [null] - The color applied around the row when in editing mode.
5556
/// @param {Color} $edited-row-indicator [null] - The color applied to the edited row indicator line.
@@ -160,6 +161,7 @@
160161
$cell-selected-text-color: null,
161162
$cell-editing-background: null,
162163
$cell-edited-value-color: null,
164+
$cell-disabled-color: null,
163165
164166
$edit-mode-color: null,
165167
$edited-row-indicator: null,
@@ -505,6 +507,8 @@
505507
edited-row-indicator: $edited-row-indicator,
506508
cell-edited-value-color: $cell-edited-value-color,
507509

510+
cell-disabled-color: $cell-disabled-color,
511+
508512
resize-line-color: $resize-line-color,
509513

510514
drop-indicator-color: $drop-indicator-color,
@@ -1352,6 +1356,12 @@
13521356
}
13531357
}
13541358

1359+
%igx-grid__tr--disabled {
1360+
%grid-cell-text {
1361+
color: --var($theme, 'cell-disabled-color');
1362+
}
1363+
}
1364+
13551365
%igx-grid__td--editing {
13561366
background: --var($theme, 'cell-editing-background') !important;
13571367
box-shadow: inset 0 0 0 rem(2px) --var($theme, 'edit-mode-color');
@@ -1407,6 +1417,17 @@
14071417
}
14081418
}
14091419

1420+
%grid-cell--pinned-chip {
1421+
margin-#{$right}: rem(12px);
1422+
}
1423+
1424+
%grid-cell--pinned-chip--cosy {
1425+
margin-#{$right}: rem(8px);
1426+
}
1427+
1428+
%grid-cell--pinned-chip--compact {
1429+
margin-#{$right}: rem(4px);
1430+
}
14101431

14111432
%grid-cell-header {
14121433
flex-flow: row nowrap;
@@ -2495,6 +2516,11 @@
24952516
@include if-rtl() {
24962517
transform: scaleX(-1);
24972518
}
2519+
2520+
&--empty {
2521+
cursor: default;
2522+
pointer-events: none;
2523+
}
24982524
}
24992525

25002526
%igx-grid__hierarchical-expander--cosy {

projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
$this: str-slice(bem--selector-to-string(&), 2, -1);
1212
@include register-component($this);
1313

14+
@include b(#{$this}-bar-host) {
15+
&:focus {
16+
@extend %igx-splitter-bar--focus !optional;
17+
}
18+
}
19+
1420
@include b(#{$this}-bar) {
1521
@extend %igx-splitter-bar !optional;
1622

projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-theme.scss

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
////
22
/// @group themes
3+
/// @access public
4+
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
5+
///
6+
/// @param {Map} $palette [$default-palette] - The palette used as basis for styling the component.
7+
/// @param {Map} $schema [$light-schema] - The schema used as basis for styling the component.
8+
/// @param {Map} $elevations [$elevations] - The elevations (shadows) map to be used.
9+
///
10+
/// @param {color} $bar-color [null] - The background color of the bar.
11+
/// @param {color} $handle-color [null] - The color for the bar drag handle.
12+
/// @param {color} $expander-color [null] - The color for the arrow expander's.
13+
/// @param {number} $border-radius [null] - the border radios of the splitter bar drag handle
14+
/// @param {color} $focus-color [null] - The color used for focused splitter bar.
15+
/// @param {number} $size [null] - The size of the splitter, its width for vertical and height for horizontal splitter.
16+
///
317
@function igx-splitter-theme(
418
$palette: $default-palette,
519
$schema: $light-schema,
@@ -9,6 +23,7 @@
923
$handle-color: null,
1024
$expander-color: null,
1125
$border-radius: null,
26+
$focus-color: null,
1227
$size: null
1328
) {
1429
$name: 'igx-splitter';
@@ -41,6 +56,7 @@
4156
handle-color: $handle-color,
4257
expander-color: $expander-color,
4358
border-radius: $border-radius-handle,
59+
focus-color: $focus-color,
4460
size: $size
4561
));
4662
}
@@ -98,6 +114,12 @@
98114
}
99115
}
100116

117+
%igx-splitter-bar--focus {
118+
// Remove the default browser outline styles
119+
outline: transparent solid 1px;
120+
box-shadow: inset 0 0 0 1px --var($theme, 'focus-color');
121+
}
122+
101123
%igx-splitter-bar--vertical {
102124
flex-direction: column;
103125
height: 100%;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
/// @prop {Map} edit-mode-color [igx-color: ('secondary', 500)] - The text color in edit mode.
4848
/// @prop {Map} edited-row-indicator [igx-color: ('grays', 400)] - The indicator's color of edited row.
4949
/// @prop {Map} cell-edited-value-color [igx-color: ('grays', 600)] - The color of cell edited value.
50+
/// @prop {Map} cell-disabled-color [igx-color: ('grays', 500)] - The text color of a disabled cell.
5051
/// @prop {Map} resize-line-color [igx-color: ('secondary', 500)] - The table header resize line color.
5152
/// @prop {Map} drop-indicator-color [igx-color: ('secondary', 500)] - The color of the drop indicator.
5253
/// @prop {Map} grouparea-background [igx-color: ('grays', 100), hexrgba: #fff] - The grid group area background color.
@@ -233,6 +234,10 @@ $_light-grid: extend(
233234
igx-color: ('grays', 600)
234235
),
235236

237+
cell-disabled-color: (
238+
igx-color: ('grays', 500)
239+
),
240+
236241
resize-line-color: (
237242
igx-color: ('secondary', 500)
238243
),

0 commit comments

Comments
 (0)