From 7a45a4799fad087ab39380728c0f7f5989714a8b Mon Sep 17 00:00:00 2001 From: ViktorSlavov Date: Wed, 6 Nov 2019 18:46:11 +0200 Subject: [PATCH 1/2] fix(progress-bar): revert change to progress-bar styles, #6129 --- .../styles/components/progress/_progress-component.scss | 8 ++++---- .../core/styles/components/progress/_progress-theme.scss | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-component.scss b/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-component.scss index cbddc10ef73..876486a5c40 100644 --- a/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-component.scss +++ b/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-component.scss @@ -113,15 +113,15 @@ @extend %circular-text !optional; } - @include e(text, $m: hidden) { - @extend %circular-text !optional; - } - @include m(indeterminate) { @extend %circular-display--indeterminate !optional; @include e(outer) { @extend %circular-outer--indeterminate !optional; } + + @include e(text) { + @extend %circular-text--hidden !optional; + } } } diff --git a/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss index 2a6e793d516..284d0373462 100644 --- a/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss +++ b/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss @@ -311,6 +311,10 @@ fill: --var($theme, 'text-color'); } + %circular-text--hidden { + visibility: hidden; + } + @include keyframes('indeterminate-accordion') { from { stroke-dashoffset: 578; From 44e8a8628d8917477233f249c337737c953e0f5a Mon Sep 17 00:00:00 2001 From: ViktorSlavov Date: Thu, 7 Nov 2019 09:53:50 +0200 Subject: [PATCH 2/2] test(progress-bar): check for text visibility in indeterminate bar, #6129 --- .../src/lib/progressbar/circularbar.component.spec.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts b/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts index 486ea9a8d06..3a689ffa7ac 100644 --- a/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts +++ b/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts @@ -450,6 +450,9 @@ describe('IgCircularBar', () => { fix.detectChanges(); expect(bar.classList.contains(CIRCULAR_INDETERMINATE_CLASS)).toEqual(true); + + // Expect text in indeterminate bar to be hidden; + expect(getComputedStyle(bar.querySelector('text').firstElementChild).visibility).toEqual('hidden'); }); }); });