Skip to content

Commit 1071213

Browse files
authored
Merge branch 'master' into pbozhinov/fixes-chips-not-being-reordered-ivy
2 parents 39e5d20 + ec5dc08 commit 1071213

File tree

6 files changed

+13
-15
lines changed

6 files changed

+13
-15
lines changed

projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-component.scss

-5
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115

116116
@include e(text, $m: hidden) {
117117
@extend %circular-text !optional;
118-
@extend %circular-text--hidden !optional;
119118
}
120119

121120
@include m(indeterminate) {
@@ -124,9 +123,5 @@
124123
@include e(outer) {
125124
@extend %circular-outer--indeterminate !optional;
126125
}
127-
128-
@include e(text) {
129-
@extend %circular-text--hidden !optional;
130-
}
131126
}
132127
}

projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss

-4
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,6 @@
311311
fill: --var($theme, 'text-color');
312312
}
313313

314-
%circular-text--hidden {
315-
visibility: hidden;
316-
}
317-
318314
@include keyframes('indeterminate-accordion') {
319315
from {
320316
stroke-dashoffset: 578;

projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@
275275
transition: $input-transition;
276276

277277
@include if-ltr() {
278-
transform: translateX(-#{rem($switch-off-offset)});
278+
transform: translateX(#{rem($switch-off-offset)});
279279
}
280280

281281
@include if-rtl() {
282-
transform: translateX(#{rem($switch-off-offset)});
282+
transform: translateX(-#{rem($switch-off-offset)});
283283
}
284284

285285
&:hover {

projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts

+6
Original file line numberDiff line numberDiff line change
@@ -3072,6 +3072,8 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
30723072
grid.navigateTo(10, col.visibleIndex);
30733073
await wait(DEBOUNCETIME);
30743074
fix.detectChanges();
3075+
await wait(DEBOUNCETIME);
3076+
fix.detectChanges();
30753077

30763078
// cell should be at right edge of grid
30773079
cell = grid.getCellByColumn(10, 'City');
@@ -3085,6 +3087,8 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
30853087
grid.navigateTo(10, col.visibleIndex);
30863088
await wait(DEBOUNCETIME);
30873089
fix.detectChanges();
3090+
await wait(DEBOUNCETIME);
3091+
fix.detectChanges();
30883092

30893093
// cell should be at left edge of grid
30903094
cell = grid.getCellByColumn(10, 'CompanyName');
@@ -3099,6 +3103,8 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
30993103
grid.navigateTo(9, col.visibleIndex);
31003104
await wait(DEBOUNCETIME);
31013105
fix.detectChanges();
3106+
await wait(DEBOUNCETIME);
3107+
fix.detectChanges();
31023108

31033109
// cell should be at right edge of grid
31043110
cell = grid.getCellByColumn(9, 'ID');

projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,8 @@ describe('IgCircularBar', () => {
322322

323323
componentInstance.progressbar.textVisibility = false;
324324
fixture.detectChanges();
325-
expect(progressBarElem.children[2].classList.value).toMatch(CIRCULAR_HIDDEN_TEXT_CLASS);
325+
// Text is not rendered
326+
expect(progressBarElem.children[2]).toBeFalsy();
326327
});
327328

328329
it('When indeterminate mode is on value should not be updated', () => {
@@ -375,8 +376,8 @@ describe('IgCircularBar', () => {
375376

376377
componentInstance.progressbar.textVisibility = false;
377378
fixture.detectChanges();
378-
379-
expect(progressBarElem.children[2].classList.value).toMatch(CIRCULAR_HIDDEN_TEXT_CLASS);
379+
// Text is not rendered
380+
expect(progressBarElem.children[2]).toBeFalsy();
380381
}));
381382

382383
it('The max representation should respond correctly to passed maximum value', fakeAsync(() => {

projects/igniteui-angular/src/lib/progressbar/templates/circular-bar.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[attr.aria-valuenow]="value">
88
<circle class="igx-circular-bar__inner" cx="50" cy="50" r="46" />
99
<circle #circle class="igx-circular-bar__outer" cx="50" cy="50" r="46" />
10-
<text [class.igx-circular-bar__text--hidden]="!textVisibility" text-anchor="middle" x="50" y="60">
10+
<text *ngIf="textVisibility" text-anchor="middle" x="50" y="60">
1111
<ng-container *ngTemplateOutlet="textTemplate ? textTemplate.template : defaultTextTemplate; context: context">
1212
</ng-container>
1313
</text>

0 commit comments

Comments
 (0)