diff --git a/apps/demo/src/app/app.module.ts b/apps/demo/src/app/app.module.ts
index 110c77fcaa..2618c56a34 100644
--- a/apps/demo/src/app/app.module.ts
+++ b/apps/demo/src/app/app.module.ts
@@ -6,8 +6,6 @@ import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-import { DaffProgressIndicatorModule } from '@daffodil/design';
-
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { DemoCartRootModule } from './cart/cart-root.module';
@@ -49,7 +47,6 @@ import { environment } from '../environments/environment';
ThankYouModule,
TemplateModule,
NotFoundModule,
- DaffProgressIndicatorModule,
],
providers: [],
bootstrap: [AppComponent],
diff --git a/apps/demo/src/app/routing/indicator/indicator.component.spec.ts b/apps/demo/src/app/routing/indicator/indicator.component.spec.ts
index 75c33798a2..15f20ec74b 100644
--- a/apps/demo/src/app/routing/indicator/indicator.component.spec.ts
+++ b/apps/demo/src/app/routing/indicator/indicator.component.spec.ts
@@ -15,7 +15,7 @@ import {
import { RouterTestingModule } from '@angular/router/testing';
import { Subject } from 'rxjs';
-import { DaffProgressIndicatorModule } from '@daffodil/design';
+import { DaffProgressBarModule } from '@daffodil/design/progress-bar';
import { DemoIndicatorComponent } from './indicator.component';
@@ -34,7 +34,7 @@ describe('DemoIndicatorComponent', () => {
imports:[
NoopAnimationsModule,
RouterTestingModule,
- DaffProgressIndicatorModule,
+ DaffProgressBarModule,
],
declarations: [
DemoIndicatorComponent,
@@ -59,24 +59,24 @@ describe('DemoIndicatorComponent', () => {
});
describe('when the router triggers "NavigationStart"', () => {
- it('should set show to true and show the `daff-progress-indicator', () => {
+ it('should set show to true and show the `daff-progress-bar', () => {
router.events.next(new NavigationStart(1, 'mock'));
fixture.detectChanges();
expect(component.routingPercentage).toEqual(0);
expect(component.show).toBe(true);
- expect(fixture.debugElement.query(By.css('daff-progress-indicator'))).toBeDefined();
+ expect(fixture.debugElement.query(By.css('daff-progress-bar'))).toBeDefined();
});
});
describe('when the router triggers "NavigationEnd"', () => {
- it('should set show to false and hide the `daff-progress-indicator`', () => {
+ it('should set show to false and hide the `daff-progress-bar`', () => {
router.events.next(new NavigationEnd(1, 'mock', 'mock'));
fixture.detectChanges();
expect(component.routingPercentage).toEqual(100);
expect(component.show).toBe(false);
- expect(fixture.debugElement.query(By.css('daff-progress-indicator'))).toBe(null);
+ expect(fixture.debugElement.query(By.css('daff-progress-bar'))).toBe(null);
});
});
});
diff --git a/apps/design-land/src/app/app-routing.module.ts b/apps/design-land/src/app/app-routing.module.ts
index 7dc3974bd7..a0f25cb9a5 100644
--- a/apps/design-land/src/app/app-routing.module.ts
+++ b/apps/design-land/src/app/app-routing.module.ts
@@ -35,7 +35,6 @@ export const appRoutes: Routes = [
{ path: 'notification', loadChildren: () => import('./notification/notification.module').then(m => m.DesignLandNotificationModule) },
{ path: 'paginator', loadChildren: () => import('./paginator/paginator.module').then(m => m.DesignLandPaginatorModule) },
{ path: 'progress-bar', loadChildren: () => import('./progress-bar/progress-bar.module').then(m => m.DesignLandProgressBarModule) },
- { path: 'progress-indicator', loadChildren: () => import('./progress-indicator/progress-indicator.module').then(m => m.DesignLandProgressIndicatorModule) },
{ path: 'qty-dropdown', loadChildren: () => import('./qty-dropdown/qty-dropdown.module').then(m => m.DesignLandQtyDropdownModule) },
{ path: 'quantity-field', loadChildren: () => import('./quantity-field/quantity-field.module').then(m => m.DesignLandQuantityFieldModule) },
{ path: 'sidebar', loadChildren: () => import('./sidebar/sidebar.module').then(m => m.DesignLandSidebarModule) },
diff --git a/apps/design-land/src/app/link-set/link-set.component.html b/apps/design-land/src/app/link-set/link-set.component.html
index d401733cdb..9585716461 100644
--- a/apps/design-land/src/app/link-set/link-set.component.html
+++ b/apps/design-land/src/app/link-set/link-set.component.html
@@ -6,7 +6,6 @@
Default
Button
Link
Loading Icon
- Progress Indicator
Nested Link Sets
diff --git a/apps/design-land/src/app/progress-indicator/progress-indicator-routing.module.ts b/apps/design-land/src/app/progress-indicator/progress-indicator-routing.module.ts
deleted file mode 100644
index 5d44441cce..0000000000
--- a/apps/design-land/src/app/progress-indicator/progress-indicator-routing.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core';
-import {
- Routes,
- RouterModule,
-} from '@angular/router';
-
-import { DesignLandProgressIndicatorComponent } from './progress-indicator.component';
-
-export const progressIndicatorRoutes: Routes = [
- { path: '', component: DesignLandProgressIndicatorComponent },
-];
-
-@NgModule({
- imports: [
- RouterModule.forChild(progressIndicatorRoutes),
- ],
- exports: [
- RouterModule,
- ],
-})
-export class DesignLandProgressIndicatorRoutingModule {}
diff --git a/apps/design-land/src/app/progress-indicator/progress-indicator.component.html b/apps/design-land/src/app/progress-indicator/progress-indicator.component.html
deleted file mode 100644
index 8083e388fd..0000000000
--- a/apps/design-land/src/app/progress-indicator/progress-indicator.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/apps/design-land/src/app/progress-indicator/progress-indicator.component.spec.ts b/apps/design-land/src/app/progress-indicator/progress-indicator.component.spec.ts
deleted file mode 100644
index 08db90e4c9..0000000000
--- a/apps/design-land/src/app/progress-indicator/progress-indicator.component.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {
- waitForAsync,
- ComponentFixture,
- TestBed,
-} from '@angular/core/testing';
-
-import { DesignLandProgressIndicatorComponent } from './progress-indicator.component';
-
-describe('DesignLandProgressIndicatorComponent', () => {
- let component: DesignLandProgressIndicatorComponent;
- let fixture: ComponentFixture;
-
- beforeEach(waitForAsync(() => {
- TestBed.configureTestingModule({
- declarations: [ DesignLandProgressIndicatorComponent ],
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(DesignLandProgressIndicatorComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/apps/design-land/src/app/progress-indicator/progress-indicator.component.ts b/apps/design-land/src/app/progress-indicator/progress-indicator.component.ts
deleted file mode 100644
index 52164a3103..0000000000
--- a/apps/design-land/src/app/progress-indicator/progress-indicator.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'design-land-progress-indicator',
- templateUrl: './progress-indicator.component.html',
-})
-export class DesignLandProgressIndicatorComponent { }
diff --git a/apps/design-land/src/app/progress-indicator/progress-indicator.module.ts b/apps/design-land/src/app/progress-indicator/progress-indicator.module.ts
deleted file mode 100644
index e3c7862751..0000000000
--- a/apps/design-land/src/app/progress-indicator/progress-indicator.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-
-import { DaffProgressIndicatorModule } from '@daffodil/design';
-
-import { DesignLandProgressIndicatorRoutingModule } from './progress-indicator-routing.module';
-import { DesignLandProgressIndicatorComponent } from './progress-indicator.component';
-import { DesignLandExampleViewerModule } from '../core/code-preview/container/example-viewer.module';
-
-@NgModule({
- declarations: [
- DesignLandProgressIndicatorComponent,
- ],
- imports: [
- CommonModule,
- DaffProgressIndicatorModule,
- DesignLandProgressIndicatorRoutingModule,
- DesignLandExampleViewerModule,
- ],
-})
-export class DesignLandProgressIndicatorModule { }
diff --git a/apps/design-land/src/assets/nav.json b/apps/design-land/src/assets/nav.json
index ee1a4d73f5..98ff9b5970 100644
--- a/apps/design-land/src/assets/nav.json
+++ b/apps/design-land/src/assets/nav.json
@@ -87,13 +87,6 @@
"items": [],
"data": {}
},
- {
- "title": "Progress Indicator (Deprecated)",
- "url": "progress-indicator",
- "id": "progress-indicator",
- "items": [],
- "data": {}
- },
{
"title": "Radio",
"url": "radio",
diff --git a/libs/design/README.md b/libs/design/README.md
index aadfb382a1..6e42fbfdfa 100644
--- a/libs/design/README.md
+++ b/libs/design/README.md
@@ -38,7 +38,6 @@ Refer to the [Upgrade Guide](./guides/upgrading.md).
* [Quantity Field](./src/atoms/form/quantity-field/README.md)
* [Image](./src/atoms/image/README.md)
* [Loading Icon](./src/atoms/loading-icon/README.md)
-* [Progress Indicator](./src/atoms/progress-indicator/README.md)
### Molecules
* [Accordion](./src/molecules/accordion/README.md)
diff --git a/libs/design/scss/theme.scss b/libs/design/scss/theme.scss
index a5a362d2cf..de7bbbc53c 100644
--- a/libs/design/scss/theme.scss
+++ b/libs/design/scss/theme.scss
@@ -25,7 +25,6 @@
@use '../src/atoms/form/input/input-theme' as input;
@use '../src/atoms/form/native-select/native-select-theme' as native-select;
@use '../loading-icon/src/loading-icon-theme' as loading-icon;
-@use '../src/atoms/progress-indicator/progress-indicator-theme' as progress-indicator;
@use '../accordion/src/accordion-theme' as accordion;
@use '../callout/src/callout-theme' as callout;
@use '../card/src/card-theme' as card;
@@ -66,7 +65,6 @@
@include input.daff-input-theme($theme);
@include native-select.daff-native-select-theme($theme);
@include loading-icon.daff-loading-icon-theme($theme);
- @include progress-indicator.daff-progress-indicator-theme($theme);
@include progress-bar.daff-progress-bar-theme($theme);
// Molecules
diff --git a/libs/design/src/atoms/progress-indicator/README.md b/libs/design/src/atoms/progress-indicator/README.md
deleted file mode 100644
index 0012a36560..0000000000
--- a/libs/design/src/atoms/progress-indicator/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Progress Indicator
-The progress indicator is used to display a progress through a linear sequence of events.
\ No newline at end of file
diff --git a/libs/design/src/atoms/progress-indicator/animation/progress-indicator-animation.ts b/libs/design/src/atoms/progress-indicator/animation/progress-indicator-animation.ts
deleted file mode 100644
index f2f03b2ede..0000000000
--- a/libs/design/src/atoms/progress-indicator/animation/progress-indicator-animation.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {
- animate,
- state,
- style,
- transition,
- trigger,
- AnimationTriggerMetadata,
-} from '@angular/animations';
-
-export const daffProgressIndicatorAnimation: {
- readonly fill: AnimationTriggerMetadata;
-} = {
- fill: trigger('fill', [
- state('*', style({ width: '{{ percentage }}%' }), { params: { percentage: 0 }}),
- transition('* <=> *', animate(1000)),
- ]),
-};
diff --git a/libs/design/src/atoms/progress-indicator/progress-indicator-theme.scss b/libs/design/src/atoms/progress-indicator/progress-indicator-theme.scss
deleted file mode 100644
index f62dd58e53..0000000000
--- a/libs/design/src/atoms/progress-indicator/progress-indicator-theme.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@use 'sass:map';
-@use '../../../scss/core';
-@use '../../../scss/theming';
-
-@mixin daff-progress-indicator-theme($theme) {
- $primary: map.get($theme, primary);
- $secondary: map.get($theme, secondary);
- $tertiary: map.get($theme, tertiary);
- $base: core.daff-map-deep-get($theme, 'core.base');
- $base-contrast: core.daff-map-deep-get($theme, 'core.base-contrast');
- $white: core.daff-map-deep-get($theme, 'core.white');
- $black: core.daff-map-deep-get($theme, 'core.black');
-
- .daff-progress-indicator {
- $root: &;
- background: rgba($base-contrast, 0.1);
-
- &.daff-primary {
- #{$root}__fill {
- background: theming.daff-color($primary);
- }
- }
-
- &.daff-secondary {
- #{$root}__fill {
- background: theming.daff-color($secondary);
- }
- }
-
- &.daff-tertiary {
- #{$root}__fill {
- background: theming.daff-color($tertiary);
- }
- }
-
- &.daff-theme {
- #{$root}__fill {
- background: $base;
- }
- }
-
- &.daff-theme-contrast {
- #{$root}__fill {
- background: $base-contrast;
- }
- }
-
- &.daff-black {
- #{$root}__fill {
- background: $black;
- }
- }
-
- &.daff-white {
- #{$root}__fill {
- background: $white;
- }
- }
- }
-}
diff --git a/libs/design/src/atoms/progress-indicator/progress-indicator.component.html b/libs/design/src/atoms/progress-indicator/progress-indicator.component.html
deleted file mode 100644
index 4ff85b6324..0000000000
--- a/libs/design/src/atoms/progress-indicator/progress-indicator.component.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/libs/design/src/atoms/progress-indicator/progress-indicator.component.scss b/libs/design/src/atoms/progress-indicator/progress-indicator.component.scss
deleted file mode 100644
index 69a28b324b..0000000000
--- a/libs/design/src/atoms/progress-indicator/progress-indicator.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-:host {
- display: flex;
- height: 3px;
- width: 100%;
-}
diff --git a/libs/design/src/atoms/progress-indicator/progress-indicator.component.spec.ts b/libs/design/src/atoms/progress-indicator/progress-indicator.component.spec.ts
deleted file mode 100644
index 36cc6b3134..0000000000
--- a/libs/design/src/atoms/progress-indicator/progress-indicator.component.spec.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import {
- Component,
- DebugElement,
-} from '@angular/core';
-import {
- waitForAsync,
- ComponentFixture,
- TestBed,
- flush,
- fakeAsync,
-} from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { DaffProgressIndicatorComponent } from './progress-indicator.component';
-import { DaffPalette } from '../../core/colorable/public_api';
-
-@Component({
- template: `
-
-
- `,
-})
-class WrapperComponent {
- color: DaffPalette;
- percentage = 0;
- onComplete(): void {};
-}
-
-describe('@daffodil/design | DaffProgressIndicatorComponent', () => {
- let fixture: ComponentFixture;
- let de: DebugElement;
- let wrapper: WrapperComponent;
- let component: DaffProgressIndicatorComponent;
-
- beforeEach(waitForAsync(() => {
- TestBed.configureTestingModule({
- imports: [
- NoopAnimationsModule,
- ],
- declarations: [
- WrapperComponent,
- DaffProgressIndicatorComponent,
- ],
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(WrapperComponent);
- wrapper = fixture.componentInstance;
- de = fixture.debugElement.query(By.css('daff-progress-indicator'));
- component = de.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-
- describe('', () => {
- it('should add a class of "daff-progress-indicator" to the host element', () => {
- expect(de.classes).toEqual(jasmine.objectContaining({
- 'daff-progress-indicator': true,
- }));
- });
- });
-
- it('should be able to take `percentage` as an input', () =>{
- wrapper.percentage = 20;
- fixture.detectChanges();
-
- expect(component.percentage).toEqual(20);
- });
-
- /**
- * This needs to be in a fakeAsync as there are animationFrames being processed
- */
- it('should emit `finished` when the progress bar is filled and the animation is complete', fakeAsync(() => {
- wrapper.percentage = 100;
- spyOn(wrapper, 'onComplete');
-
- fixture.detectChanges();
- flush();
-
- expect(wrapper.onComplete).toHaveBeenCalledTimes(1);
- }));
-
- it('should be unfilled by default', () => {
- wrapper.percentage = 0;
- fixture.detectChanges();
-
- expect(component.percentage).toEqual(0);
- });
-
- describe('using a colored variant of a progress indicator', () => {
- it('should set a color class on the progress indicator', () => {
- wrapper.color = 'primary';
- fixture.detectChanges();
-
- expect(de.nativeElement.classList.contains('daff-primary')).toEqual(true);
- });
-
- it('should set the default color to primary', () => {
- expect(de.nativeElement.classList.contains('daff-primary')).toEqual(true);
- });
- });
-});
diff --git a/libs/design/src/atoms/progress-indicator/progress-indicator.component.ts b/libs/design/src/atoms/progress-indicator/progress-indicator.component.ts
deleted file mode 100644
index e9da1968b2..0000000000
--- a/libs/design/src/atoms/progress-indicator/progress-indicator.component.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { AnimationEvent } from '@angular/animations';
-import {
- Component,
- Input,
- ChangeDetectionStrategy,
- ElementRef,
- Output,
- EventEmitter,
- Renderer2,
- HostBinding,
-} from '@angular/core';
-
-import { daffProgressIndicatorAnimation } from './animation/progress-indicator-animation';
-import {
- daffColorMixin,
- DaffColorable,
- DaffPalette,
-} from '../../core/colorable/public_api';
-
-/**
- * An _elementRef and an instance of renderer2 are needed for the Colorable mixin
- */
-class DaffProgressIndicatorBase{
- constructor(public _elementRef: ElementRef, public _renderer: Renderer2) {}
-}
-
-const _daffProgressIndicatorBase = daffColorMixin(DaffProgressIndicatorBase, 'primary');
-
-/**
- * @deprecated in v1.0.0
- * Use `DaffProgressBarComponent` instead.
- */
-@Component({
- selector: 'daff-progress-indicator',
- templateUrl: './progress-indicator.component.html',
- styleUrls: ['./progress-indicator.component.scss'],
- changeDetection: ChangeDetectionStrategy.OnPush,
- //todo(damienwebdev): remove once decorators hit stage 3 - https://github.com/microsoft/TypeScript/issues/7342
- // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
- inputs: ['color'],
- animations: [
- daffProgressIndicatorAnimation.fill,
- ],
-})
-export class DaffProgressIndicatorComponent extends _daffProgressIndicatorBase implements DaffColorable {
-
- /**
- * @docs-private
- */
- @HostBinding('class.daff-progress-indicator') class = true;
-
- /**
- * The percentage completion of the progression,
- * expressed as a whole number between 0 and 100.
- *
- */
- // eslint-disable-next-line @typescript-eslint/no-inferrable-types
- @Input() percentage: number = 0;
-
- /**
- * An event that emits each time the progression reaches 100%
- * and the animation is finished
- */
- @Output() finished: EventEmitter = new EventEmitter();
-
-
- /**
- * Calculates when the progress animation is fully completed
- *
- * @param event: AnimationEvent
- */
- onAnimationComplete(event: AnimationEvent): void {
- // @ts-expect-error: @angular/animations typing error on event.toState as string
- // See: https://github.com/angular/angular/issues/26507
- if(event.toState === '100' || event.toState === 100) {
- this.finished.emit();
- }
- }
-
- /**
- * @docs-private
- */
- get fillState(): any {
- return {
- value: this.percentage,
- params: {
- percentage: this.percentage,
- },
- };
- }
-
- constructor(private elementRef: ElementRef, private renderer: Renderer2) {
- super(elementRef, renderer);
- }
-}
diff --git a/libs/design/src/atoms/progress-indicator/progress-indicator.module.ts b/libs/design/src/atoms/progress-indicator/progress-indicator.module.ts
deleted file mode 100644
index f7a2e30e6b..0000000000
--- a/libs/design/src/atoms/progress-indicator/progress-indicator.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-
-import { DaffProgressIndicatorComponent } from './progress-indicator.component';
-
-@NgModule({
- declarations: [DaffProgressIndicatorComponent],
- imports: [
- CommonModule,
- ],
- exports: [DaffProgressIndicatorComponent],
-})
-export class DaffProgressIndicatorModule { }
diff --git a/libs/design/src/atoms/progress-indicator/public_api.ts b/libs/design/src/atoms/progress-indicator/public_api.ts
deleted file mode 100644
index d9e6c1baf4..0000000000
--- a/libs/design/src/atoms/progress-indicator/public_api.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { DaffProgressIndicatorModule } from './progress-indicator.module';
-export * from './progress-indicator.component';
diff --git a/libs/design/src/public_api.ts b/libs/design/src/public_api.ts
index 528ddb9cf4..5df88acc54 100644
--- a/libs/design/src/public_api.ts
+++ b/libs/design/src/public_api.ts
@@ -10,7 +10,6 @@ export * from './atoms/form/input/public_api';
export * from './atoms/form/native-select/public_api';
export * from './atoms/form/checkbox/public_api';
export * from './atoms/form/quantity-field/public_api';
-export * from './atoms/progress-indicator/public_api';
export * from './atoms/form/radio/public_api';
export * from './atoms/form/form-label/public_api';