Skip to content

Commit f81d19f

Browse files
ViktorSlavovViktorSlavov
committed
Merge remote-tracking branch 'remotes/origin/master' into vslavov/input-group-disabled
# Conflicts: # projects/igniteui-angular/migrations/update-12_0_0/index.spec.ts
2 parents 49bc092 + 408d294 commit f81d19f

File tree

26 files changed

+432
-356
lines changed

26 files changed

+432
-356
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
78
{
89
"type": "node",
910
"request": "launch",
@@ -12,7 +13,7 @@
1213
"-r",
1314
"ts-node/register",
1415
"./node_modules/jasmine/bin/jasmine.js",
15-
"./projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts"
16+
"./projects/igniteui-angular/migrations/**/*.spec.ts"
1617
],
1718
"env": {
1819
"TS_NODE_PROJECT": "projects/igniteui-angular/migrations/tsconfig.json"

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ All notable changes for each version of this project will be documented in this
148148
- `IgxLinearProgressBarComponent`
149149
- **Breaking Change** - The following outputs are renamed:
150150
- `onProgressChanged` to `progressChanged`
151+
- `IgxToast`
152+
- **Breaking Change** - The following deprecated methods and outputs have been removed
153+
- Outputs `showing`, `shown`, `hiding`, `hidden`. Use `onOpening`, `onOpened`, `onClosing`, `onClosed` instead.
154+
- Methods `show`, `hide`. Use `open`, `close` instead.
155+
- `IgxSnackbar`
156+
- **Breaking Change** - The following deprecated methods have been removed
157+
- `show`, `hide`. Use `open`, `close` instead.
151158

152159

153160
### New Features

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
![Node.js CI](https://github.com/IgniteUI/igniteui-angular/workflows/Node.js%20CI/badge.svg)
44
[![Build Status](https://dev.azure.com/IgniteUI/igniteui-angular/_apis/build/status/IgniteUI.igniteui-angular)](https://dev.azure.com/IgniteUI/igniteui-angular/_build/latest?definitionId=3)
5-
[![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular)
65
[![Coverage Status](https://coveralls.io/repos/github/IgniteUI/igniteui-angular/badge.svg?branch=master)](https://coveralls.io/github/IgniteUI/igniteui-angular?branch=master)
76
[![npm version](https://badge.fury.io/js/igniteui-angular.svg)](https://badge.fury.io/js/igniteui-angular)
87

‎ROADMAP.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
2. **[DONE]** Themes: Scope custom CSS props to component selectors [#8868](https://github.com/IgniteUI/igniteui-angular/issues/8868)
99
3. **[DONE]** Switch thumb templatable and add indeterminate state [#8949](https://github.com/IgniteUI/igniteui-angular/issues/8949)
1010
4. **[DONE]** IgxDateTimeEditor should support spin delta [#7169](https://github.com/IgniteUI/igniteui-angular/issues/7169)
11-
5. Expose a column input for passing additional data/state in the template contexts of the column [#9020](https://github.com/IgniteUI/igniteui-angular/issues/9020)
11+
5. **[DONE]** Expose a column input for passing additional data/state in the template contexts of the column [#9020](https://github.com/IgniteUI/igniteui-angular/issues/9020)
1212
6. **[DONE]** Export Hierarchical Grid to Excel [#5848](https://github.com/IgniteUI/igniteui-angular/issues/5848)
13-
7. Tree component [#7475](https://github.com/IgniteUI/igniteui-angular/issues/7475)
14-
8. IgxDatePicker refactoring [#6483](https://github.com/IgniteUI/igniteui-angular/issues/6483)
15-
9. IgxTimePicker refactoring [#6482](https://github.com/IgniteUI/igniteui-angular/issues/6482)
13+
7. **[DONE]** Tree component [#7475](https://github.com/IgniteUI/igniteui-angular/issues/7475)
14+
8. **[DONE]** IgxDatePicker refactoring [#6483](https://github.com/IgniteUI/igniteui-angular/issues/6483)
15+
9. **[DONE]** IgxTimePicker refactoring [#6482](https://github.com/IgniteUI/igniteui-angular/issues/6482)
1616
10. **[DONE]** Tabs and Bottom Nav Components Refactoring [#8793](https://github.com/IgniteUI/igniteui-angular/issues/8793)
17-
11. Datetime and Time column types [#7678](https://github.com/IgniteUI/igniteui-angular/issues/7678)
17+
11. **[DONE]** Datetime and Time column types [#7678](https://github.com/IgniteUI/igniteui-angular/issues/7678)
1818
12. **[DONE]** Add detach method to IgxOverlay [#6063](https://github.com/IgniteUI/igniteui-angular/issues/6063)
1919
13. **[DONE]** Accept ISO 8601 Date-only string as input for IgxDateTimeEditorDirective [#6994](https://github.com/IgniteUI/igniteui-angular/issues/6994)
2020

@@ -27,7 +27,7 @@
2727

2828
# Previous Milestone
2929

30-
## Milestone 15 (Due by February, 2021)
30+
## Milestone 15 (Released February 17th, 2021)
3131

3232
1. **[DONE]** Filters should support filtering by formatted value [#8009](https://github.com/IgniteUI/igniteui-angular/issues/8009)
3333
2. **[DONE]** Support changing theme dynamically on Input Group [#8619](https://github.com/IgniteUI/igniteui-angular/issues/8619)
@@ -72,7 +72,7 @@
7272
16. **[DONE]** Allow setting of the name of the worksheet in exported workbook in IgxExcelExporter [#7396](https://github.com/IgniteUI/igniteui-angular/issues/7396)
7373
17. **[DONE]** Enhance behavior of the Select All checkbox in Excel Style Filtering [#6617](https://github.com/IgniteUI/igniteui-angular/issues/6617)
7474

75-
## Milestone 12 (Due by August 17th, 2020)
75+
## Milestone 12 (Released August 19th, 2020)
7676

7777
1. **[DONE]** igx-grid improve IGridEditEventArgs [#4965](https://github.com/IgniteUI/igniteui-angular/issues/4965)
7878
2. **[DONE]** igxCombo has to include caseSensitive property in filter search [#7282](https://github.com/IgniteUI/igniteui-angular/issues/7282)

‎projects/igniteui-angular/migrations/update-12_0_0/changes/members.json‎

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,62 @@
595595
"definedIn": [
596596
"IgxRangePickerComponent"
597597
]
598+
},
599+
{
600+
"member": "showing",
601+
"replaceWith": "onOpening",
602+
"definedIn": [
603+
"IgxToastComponent"
604+
]
605+
},
606+
{
607+
"member": "shown",
608+
"replaceWith": "onOpened",
609+
"definedIn": [
610+
"IgxToastComponent"
611+
]
612+
},
613+
{
614+
"member": "hiding",
615+
"replaceWith": "onClosing",
616+
"definedIn": [
617+
"IgxToastComponent"
618+
]
619+
},
620+
{
621+
"member": "hidden",
622+
"replaceWith": "onClosed",
623+
"definedIn": [
624+
"IgxToastComponent"
625+
]
626+
},
627+
{
628+
"member": "show",
629+
"replaceWith": "open",
630+
"definedIn": [
631+
"IgxToastComponent"
632+
]
633+
},
634+
{
635+
"member": "hide",
636+
"replaceWith": "close",
637+
"definedIn": [
638+
"IgxToastComponent"
639+
]
640+
},
641+
{
642+
"member": "show",
643+
"replaceWith": "open",
644+
"definedIn": [
645+
"IgxSnackbarComponent"
646+
]
647+
},
648+
{
649+
"member": "hide",
650+
"replaceWith": "close",
651+
"definedIn": [
652+
"IgxSnackbarComponent"
653+
]
598654
}
599655
]
600-
}
656+
}

‎projects/igniteui-angular/migrations/update-12_0_0/changes/outputs.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,38 @@
12001200
"selector": "igx-date-range-picker",
12011201
"type": "component"
12021202
}
1203+
},
1204+
{
1205+
"name": "showing",
1206+
"replaceWith": "onOpening",
1207+
"owner": {
1208+
"selector": "igx-toast",
1209+
"type": "component"
1210+
}
1211+
},
1212+
{
1213+
"name": "shown",
1214+
"replaceWith": "onOpened",
1215+
"owner": {
1216+
"selector": "igx-toast",
1217+
"type": "component"
1218+
}
1219+
},
1220+
{
1221+
"name": "hiding",
1222+
"replaceWith": "onClosing",
1223+
"owner": {
1224+
"selector": "igx-toast",
1225+
"type": "component"
1226+
}
1227+
},
1228+
{
1229+
"name": "hidden",
1230+
"replaceWith": "onClosed",
1231+
"owner": {
1232+
"selector": "igx-toast",
1233+
"type": "component"
1234+
}
12031235
}
12041236
]
12051237
}

‎projects/igniteui-angular/migrations/update-12_0_0/index.spec.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,6 +1575,68 @@ export class HGridMultiRowDragComponent {
15751575
}`);
15761576
});
15771577

1578+
it('should replace output names in toast', async () => {
1579+
appTree.create(
1580+
`/testSrc/appPrefix/component/test.component.html`,
1581+
`
1582+
<igx-toast (showing)="method()" (shown)="method()" (hiding)="method()" (hidden)="method()"></igx-toast>
1583+
`
1584+
);
1585+
1586+
const tree = await schematicRunner
1587+
.runSchematicAsync(migrationName, {}, appTree)
1588+
.toPromise();
1589+
1590+
expect(
1591+
tree.readContent('/testSrc/appPrefix/component/test.component.html')
1592+
).toEqual(
1593+
`
1594+
<igx-toast (onOpening)="method()" (onOpened)="method()" (onClosing)="method()" (onClosed)="method()"></igx-toast>
1595+
`
1596+
);
1597+
});
1598+
1599+
it('Should update toast output subscriptions', async () => {
1600+
pending('set up tests for migrations through lang service');
1601+
appTree.create(
1602+
'/testSrc/appPrefix/component/toast.component.ts', `
1603+
import { IgxToastComponent } from 'igniteui-angular';
1604+
import { Component, OnInit, ViewChild } from '@angular/core';
1605+
export class SimpleComponent {
1606+
@ViewChild('toast', { static: true })
1607+
public toast: IgxToastComponent;
1608+
1609+
public ngOnInit() {
1610+
this.toast.showing.subscribe();
1611+
this.toast.shown.subscribe();
1612+
this.toast.hiding.subscribe();
1613+
this.toast.hidden.subscribe();
1614+
this.toast.show();
1615+
this.toast.hide();
1616+
}
1617+
}`);
1618+
const tree = await schematicRunner.runSchematicAsync('migration-20', {}, appTree)
1619+
.toPromise();
1620+
1621+
expect(tree.readContent('/testSrc/appPrefix/component/toast.component.ts'))
1622+
.toEqual(`
1623+
import { IgxToastComponent } from 'igniteui-angular';
1624+
import { Component, OnInit, ViewChild } from '@angular/core';
1625+
export class SimpleComponent {
1626+
@ViewChild('toast', { static: true })
1627+
public toast: IgxToastComponent;
1628+
1629+
public ngOnInit() {
1630+
this.toast.onOpening.subscribe();
1631+
this.toast.onOpened.subscribe();
1632+
this.toast.onClosing.subscribe();
1633+
this.toast.onClosed.subscribe();
1634+
this.toast.open();
1635+
this.toast.close();
1636+
}
1637+
}`);
1638+
});
1639+
15781640
it('Should move input-group disabled property to input child', async () => {
15791641
appTree.create(
15801642
`/testSrc/appPrefix/component/test.component.html`,

‎projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
}
128128

129129
%igx-avatar--rounded {
130-
--border-radius: 44px;
130+
--igx-avatar-border-radius: 44px;
131131
border-radius: --var(('border-radius': 44px), 'border-radius');
132132
}
133133

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

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,11 @@
925925
}
926926

927927
%cal-value--inactive--single--hover {
928-
color: --var($theme, 'inactive-text-color');
928+
@if $bootstrap-theme {
929+
color: --var($theme, 'date-selected-text-color');
930+
} @else {
931+
color: --var($theme, 'inactive-text-color');
932+
}
929933
}
930934

931935
%cal-value--special {
@@ -1024,35 +1028,25 @@
10241028
}
10251029

10261030
%cal-value--range%cal-value--inactive%cal-value--selected {
1027-
background: transparent !important;
1028-
10291031
%cal-value-content {
1030-
color: --var($theme, 'date-disabled-text-color');
1031-
background: transparent !important;
1032+
color: --var($theme, 'date-selected-text-color');
1033+
}
1034+
1035+
&:focus,
1036+
&:hover {
1037+
%cal-value-content {
1038+
color: --var($theme, 'date-selected-text-color');
1039+
}
10321040
}
10331041
}
10341042

10351043
%cal-value--range%cal-value--inactive%cal-value--selected%cal-value--single {
1036-
background: transparent !important;
1037-
10381044
%cal-value-content {
10391045
color: --var($theme, 'date-selected-text-color');
10401046
background: --var($theme, 'date-selected-background') !important;
10411047
}
10421048
}
10431049

1044-
%cal-value--inactive%cal-value--selected%cal-value--first {
1045-
&::after {
1046-
background: transparent !important;
1047-
}
1048-
}
1049-
1050-
%cal-value--inactive%cal-value--selected%cal-value--last {
1051-
&::before {
1052-
background: transparent !important;
1053-
}
1054-
}
1055-
10561050
%cal-value--first {
10571051
position: relative;
10581052
background: transparent;

‎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
@@ -1210,6 +1210,7 @@
12101210

12111211
%igx-grid__tr--inner {
12121212
display: flex;
1213+
background: inherit;
12131214
}
12141215

12151216
%igx-grid__tr--add-animate {

0 commit comments

Comments
 (0)