Skip to content

Commit 9e432d6

Browse files
authored
Merge branch 'master' into mpopov/outline-button-focus
2 parents 1627972 + 370d2d0 commit 9e432d6

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

.github/workflows/npm-publish.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ jobs:
3535
if [[ ${VERSION} == *"alpha"* || ${VERSION} == *"beta"* || ${VERSION} == *"rc"* ]]; then echo "NPM_TAG=next"; else echo "NPM_TAG=latest"; fi >> $GITHUB_ENV
3636
echo ${NPM_TAG}
3737
38-
- name: Copy readme for igniteui-angular
39-
run: cp ../../README.md README.md
38+
- name: Copy readme and license for igniteui-angular
39+
run: |
40+
cp ../../README.md README.md
41+
cp ../../LICENSE LICENSE
4042
working-directory: dist/igniteui-angular
4143

4244
- name: Copy i18n files

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,15 @@ All notable changes for each version of this project will be documented in this
104104
- `igxGrid`
105105
- Exposed a `groupStrategy` input that functions similarly to `sortStrategy`, allowing customization of the grouping behavior of the grid. Please, refer to the [Group By ](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/groupby) topic for more information.
106106
- `IgxCarousel`
107-
- **Breaking Changes** -The carousel animation type `CarouselAnimationType` is renamed to `HorizontalAnimationType`.
107+
- **Breaking Changes** - The carousel animation type `CarouselAnimationType` is renamed to `HorizontalAnimationType`.
108+
109+
- `Theming`
110+
- **Breaking Change** - Changed CSS palette variables from HEX values to a list of H, S, L comma-separated values, which requires the use of the CSS `hsl` function when accessing these values directly.
111+
```scss
112+
.bozo {
113+
background: hsl(var(--igx-surface-500));
114+
}
115+
```
108116

109117
## 12.2.3
110118

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,14 @@
234234
flex-wrap: wrap;
235235
flex-grow: 1;
236236
justify-content: flex-end;
237+
margin-#{$right}: map.get($grid-toolbar-spacer, 'comfortable');
237238
}
238239

239240
%igx-grid-toolbar__actions {
240241
display: flex;
241242
align-items: center;
242243
flex-flow: row wrap;
243-
margin-#{$left}: map.get($grid-toolbar-spacer, 'comfortable');
244+
margin-#{$left}: auto;
244245

245246
> * {
246247
display: flex;

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<igx-icon *ngIf="expressionUI.expression.condition" family="imx-icons" [name]="getIconName()"></igx-icon>
99
<igx-icon *ngIf="!expressionUI.expression.condition">filter_list</igx-icon>
1010
</igx-prefix>
11-
<igx-select-item *ngFor="let condition of conditions" [value]="condition" [selected]="isConditionSelected(condition)">
11+
<igx-select-item *ngFor="let condition of conditions" [value]="condition" [text]="getConditionFriendlyName(condition)" [selected]="isConditionSelected(condition)">
1212
<igx-icon family="imx-icons" [name]="getCondition(condition).iconName"></igx-icon>
1313
<span>{{translateCondition(condition)}}</span>
1414
</igx-select-item>

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ export class IgxGridExcelStyleFilteringComponent extends BaseFilteringComponent
745745
case GridColumnDataType.Time:
746746
return formatDate(element, format, locale, timezone);
747747
case GridColumnDataType.Currency:
748-
return formatCurrency(element, currencyCode ?? getLocaleCurrencyCode(locale), display, digitsInfo, locale);
748+
return formatCurrency(element, currencyCode || getLocaleCurrencyCode(locale), display, digitsInfo, locale);
749749
case GridColumnDataType.Number:
750750
return formatNumber(element, locale, digitsInfo);
751751
case GridColumnDataType.Percent:

projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar.component.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
</ng-template>
1010
<igx-grid-toolbar-actions *ngIf="!hasActions">
1111
<igx-grid-toolbar-advanced-filtering *ngIf="grid.allowAdvancedFiltering"></igx-grid-toolbar-advanced-filtering>
12-
<igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>
13-
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
14-
<igx-grid-toolbar-exporter (exportStarted)="showProgress = true" (exportEnded)="showProgress = false">
15-
</igx-grid-toolbar-exporter>
1612
</igx-grid-toolbar-actions>
1713
<ng-container *ngTemplateOutlet="actions"></ng-container>
1814

src/app/hierarchical-grid-remote-virtualization/hierarchical-remote.service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ export class HierarchicalRemoteService {
1717
public url = `https://services.odata.org/V4/Northwind/Northwind.svc/Products`;
1818
public urlBuilder;
1919

20-
constructor(private http: HttpClient, private hierarchyPipe: IgxGridHierarchicalPipe) {
20+
private hierarchyPipe: IgxGridHierarchicalPipe = null;
21+
22+
constructor(private http: HttpClient) {
2123
this._remoteData = new BehaviorSubject([]);
2224
this.remoteData = this._remoteData.asObservable();
2325
}
@@ -43,6 +45,7 @@ export class HierarchicalRemoteService {
4345
}
4446

4547
public getData(virtualizationState: any, grid: IgxHierarchicalGridComponent, cb?: (any) => void) {
48+
this.hierarchyPipe = this.hierarchyPipe ?? new IgxGridHierarchicalPipe(grid);
4649
return this.http.get(this.buildUrl(virtualizationState, grid)).pipe(
4750
map(response => response),
4851
)

0 commit comments

Comments
 (0)