Skip to content

Commit 7b48998

Browse files
committed
feat: standalone components, cleanup
1 parent 7084c99 commit 7b48998

File tree

159 files changed

+389
-498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+389
-498
lines changed

projects/coreui-angular/src/lib/accordion/accordion-item/accordion-item.component.spec.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
22
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
3-
4-
import { CollapseModule } from '../../collapse';
53
import { AccordionButtonDirective } from '../accordion-button/accordion-button.directive';
64
import { AccordionService } from '../accordion.service';
75
import { AccordionItemComponent } from './accordion-item.component';
@@ -12,9 +10,8 @@ describe('AccordionItemComponent', () => {
1210

1311
beforeEach(async () => {
1412
await TestBed.configureTestingModule({
15-
declarations: [],
1613
providers: [AccordionService],
17-
imports: [NoopAnimationsModule, AccordionButtonDirective, AccordionItemComponent, CollapseModule]
14+
imports: [NoopAnimationsModule, AccordionButtonDirective, AccordionItemComponent]
1815
})
1916
.compileComponents();
2017
});

projects/coreui-angular/src/lib/accordion/accordion-item/accordion-item.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import {
88
OnInit,
99
QueryList
1010
} from '@angular/core';
11+
import { NgTemplateOutlet } from '@angular/common';
1112
import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
1213

13-
import { CollapseModule } from '../../collapse';
14+
import { CollapseDirective } from '../../collapse';
1415
import { TemplateIdDirective } from '../../shared';
1516
import { AccordionButtonDirective } from '../accordion-button/accordion-button.directive';
1617
import { AccordionService } from '../accordion.service';
17-
import { CommonModule } from '@angular/common';
1818

1919
let nextId = 0;
2020

@@ -24,7 +24,7 @@ let nextId = 0;
2424
styleUrls: ['./accordion-item.component.scss'],
2525
exportAs: 'cAccordionItem',
2626
standalone: true,
27-
imports: [AccordionButtonDirective, CollapseModule, CommonModule]
27+
imports: [AccordionButtonDirective, NgTemplateOutlet, CollapseDirective]
2828
})
2929
export class AccordionItemComponent implements OnInit, OnDestroy, AfterContentInit {
3030

projects/coreui-angular/src/lib/accordion/accordion.module.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
32
import { AccordionComponent } from './accordion/accordion.component';
43
import { AccordionButtonDirective } from './accordion-button/accordion-button.directive';
54
import { AccordionItemComponent } from './accordion-item/accordion-item.component';
65
import { AccordionService } from './accordion.service';
7-
import { CollapseModule } from '../collapse';
8-
import { SharedModule } from '../shared';
96

107
@NgModule({
11-
declarations: [],
128
imports: [
13-
CommonModule,
149
AccordionButtonDirective,
1510
AccordionComponent,
16-
AccordionItemComponent,
17-
CollapseModule,
18-
SharedModule
11+
AccordionItemComponent
1912
],
2013
exports: [
2114
AccordionComponent,

projects/coreui-angular/src/lib/accordion/accordion/accordion.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ describe('AccordionComponent', () => {
88

99
beforeEach(async () => {
1010
await TestBed.configureTestingModule({
11-
imports: [ AccordionComponent ]
11+
imports: [AccordionComponent]
1212
})
13-
.compileComponents();
13+
.compileComponents();
1414
});
1515

1616
beforeEach(() => {

projects/coreui-angular/src/lib/alert/alert.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ng-template [ngIf]="dismissible">
33
<ng-container *ngTemplateOutlet="templates?.alertButtonCloseTemplate || defaultAlertButtonCloseTemplate">
44
</ng-container>
5-
</ng-template>
5+
</ng-template>ś
66
<ng-content></ng-content>
77
</ng-container>
88

projects/coreui-angular/src/lib/alert/alert.component.spec.ts

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ describe('AlertComponent', () => {
99

1010
beforeEach(waitForAsync(() => {
1111
TestBed.configureTestingModule({
12-
declarations: [],
1312
imports: [BrowserAnimationsModule, AlertComponent]
1413
})
1514
.compileComponents();

projects/coreui-angular/src/lib/alert/alert.component.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import {
99
Output,
1010
QueryList
1111
} from '@angular/core';
12-
import { CommonModule } from '@angular/common';
12+
import { NgIf, NgTemplateOutlet } from '@angular/common';
1313
import { animate, AnimationEvent, state, style, transition, trigger } from '@angular/animations';
1414
import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
1515

1616
import { Colors } from '../coreui.types';
1717
import { TemplateIdDirective } from '../shared';
18+
import { ButtonCloseDirective } from '../button';
1819

1920
type AnimateType = ('hide' | 'show');
2021

@@ -24,7 +25,7 @@ type AnimateType = ('hide' | 'show');
2425
styleUrls: ['./alert.component.scss'],
2526
exportAs: 'cAlert',
2627
standalone: true,
27-
imports: [CommonModule],
28+
imports: [NgIf, NgTemplateOutlet, ButtonCloseDirective],
2829
animations: [
2930
trigger('fadeInOut', [
3031
state('show', style({ opacity: 1, height: '*', padding: '*', border: '*', margin: '*' })),
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
32

43
import { AlertComponent } from './alert.component';
54
import { AlertHeadingDirective } from './alert-heading.directive';
65
import { AlertLinkDirective } from './alert-link.directive';
7-
import { ButtonModule } from '../button';
86

97
@NgModule({
108
imports: [
11-
CommonModule,
129
AlertComponent,
1310
AlertHeadingDirective,
14-
AlertLinkDirective,
15-
ButtonModule
11+
AlertLinkDirective
1612
],
1713
exports: [
1814
AlertComponent,
1915
AlertHeadingDirective,
2016
AlertLinkDirective
21-
],
22-
declarations: []
17+
]
2318
})
2419
export class AlertModule {}

projects/coreui-angular/src/lib/avatar/avatar.component.scss

Whitespace-only changes.

projects/coreui-angular/src/lib/avatar/avatar.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ describe('AvatarComponent', () => {
88

99
beforeEach(async () => {
1010
await TestBed.configureTestingModule({
11-
imports: [ AvatarComponent ]
11+
imports: [AvatarComponent]
1212
})
13-
.compileComponents();
13+
.compileComponents();
1414
});
1515

1616
beforeEach(() => {

projects/coreui-angular/src/lib/avatar/avatar.component.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import { Component, HostBinding, Input } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
2+
import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common';
33

44
import { Colors, Shapes, Sizes, TextColors } from '../coreui.types';
55

66
@Component({
77
selector: 'c-avatar',
88
templateUrl: './avatar.component.html',
9-
styleUrls: ['./avatar.component.scss'],
109
standalone: true,
11-
imports: [CommonModule]
10+
imports: [
11+
NgTemplateOutlet,
12+
NgClass,
13+
NgIf
14+
]
1215
})
1316
export class AvatarComponent {
1417
/**

projects/coreui-angular/src/lib/avatar/avatar.module.ts

-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
32
import { AvatarComponent } from './avatar.component';
43

54
@NgModule({
6-
declarations: [],
75
imports: [
8-
CommonModule,
96
AvatarComponent
107
],
118
exports: [

projects/coreui-angular/src/lib/badge/badge.component.html

-1
This file was deleted.

projects/coreui-angular/src/lib/badge/badge.component.scss

-1
This file was deleted.

projects/coreui-angular/src/lib/badge/badge.component.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import { BadgePositions, Colors, Shapes } from '../coreui.types';
33

44
@Component({
55
selector: 'c-badge',
6-
templateUrl: './badge.component.html',
7-
styleUrls: ['./badge.component.scss'],
6+
template: '<ng-content></ng-content>',
87
standalone: true
98
})
109
export class BadgeComponent {
@@ -43,15 +42,15 @@ export class BadgeComponent {
4342
'top-0': this.position?.includes('top'),
4443
'top-100': this.position?.includes('bottom'),
4544
'start-100': this.position?.includes('end'),
46-
'start-0': this.position?.includes('start'),
45+
'start-0': this.position?.includes('start')
4746
};
4847

4948
return Object.assign({
5049
badge: true,
5150
[`bg-${this.color}`]: !!this.color,
5251
[`text-${this.textColor}`]: !!this.textColor,
5352
[`badge-${this.size}`]: !!this.size,
54-
[`${this.shape}`]: !!this.shape,
53+
[`${this.shape}`]: !!this.shape
5554
}, !!this.position ? positionClasses : {}
5655
);
5756
}

projects/coreui-angular/src/lib/badge/badge.module.ts

-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
32
import { BadgeComponent } from './badge.component';
43

54
@NgModule({
6-
declarations: [],
75
imports: [
8-
CommonModule,
96
BadgeComponent
107
],
118
exports: [

projects/coreui-angular/src/lib/breadcrumb/breadcrumb-item/breadcrumb-item.component.spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
22
import { RouterTestingModule } from '@angular/router/testing';
3-
import { SharedModule } from '../../shared';
43
import { BreadcrumbItemComponent } from './breadcrumb-item.component';
54

65
describe('BreadcrumbItemComponent', () => {
@@ -9,7 +8,7 @@ describe('BreadcrumbItemComponent', () => {
98

109
beforeEach(async () => {
1110
await TestBed.configureTestingModule({
12-
imports: [SharedModule, RouterTestingModule, BreadcrumbItemComponent]
11+
imports: [RouterTestingModule, BreadcrumbItemComponent]
1312
})
1413
.compileComponents();
1514
});

projects/coreui-angular/src/lib/breadcrumb/breadcrumb-item/breadcrumb-item.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { Component, HostBinding, Input } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
2+
import { CommonModule, NgIf, NgTemplateOutlet } from '@angular/common';
33
import { RouterModule } from '@angular/router';
44

5-
import { SharedModule } from '../../shared';
5+
import { HtmlAttributesDirective, SharedModule } from '../../shared';
66
import { INavAttributes, INavLinkProps } from './breadcrumb-item';
77

88
@Component({
99
selector: 'c-breadcrumb-item',
1010
templateUrl: './breadcrumb-item.component.html',
1111
styleUrls: ['./breadcrumb-item.component.scss'],
1212
standalone: true,
13-
imports: [SharedModule, RouterModule, CommonModule]
13+
imports: [RouterModule, NgIf, NgTemplateOutlet, HtmlAttributesDirective]
1414
})
1515
export class BreadcrumbItemComponent {
1616

projects/coreui-angular/src/lib/breadcrumb/breadcrumb-router/breadcrumb-router.component.spec.ts

-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2-
import { CommonModule } from '@angular/common';
32
import { RouterTestingModule } from '@angular/router/testing';
43
import { Router } from '@angular/router';
54

65
import { BreadcrumbRouterComponent } from './breadcrumb-router.component';
76
import { BreadcrumbRouterService } from './breadcrumb-router.service';
8-
import { BreadcrumbModule } from '../breadcrumb.module';
97

108
describe('BreadcrumbComponent', () => {
119
let component: BreadcrumbRouterComponent;
@@ -15,12 +13,9 @@ describe('BreadcrumbComponent', () => {
1513
beforeEach(waitForAsync(() => {
1614
TestBed.configureTestingModule({
1715
imports: [
18-
CommonModule,
1916
RouterTestingModule.withRoutes([]),
20-
BreadcrumbModule,
2117
BreadcrumbRouterComponent
2218
],
23-
declarations: [],
2419
providers: [BreadcrumbRouterService]
2520
}).compileComponents();
2621
}));

projects/coreui-angular/src/lib/breadcrumb/breadcrumb-router/breadcrumb-router.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
22
import { Observable, Observer } from 'rxjs';
3-
import { CommonModule } from '@angular/common';
3+
import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
44

55
import { IBreadcrumbItem } from '../breadcrumb-item/breadcrumb-item';
66
import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component';
@@ -12,7 +12,7 @@ import { BreadcrumbItemComponent } from '../breadcrumb-item/breadcrumb-item.comp
1212
templateUrl: './breadcrumb-router.component.html',
1313
styleUrls: ['./breadcrumb-router.component.scss'],
1414
standalone: true,
15-
imports: [CommonModule, BreadcrumbComponent, BreadcrumbItemComponent]
15+
imports: [BreadcrumbComponent, BreadcrumbItemComponent, NgForOf, NgIf, AsyncPipe]
1616
})
1717
export class BreadcrumbRouterComponent implements OnChanges, OnDestroy, OnInit {
1818
constructor(

projects/coreui-angular/src/lib/breadcrumb/breadcrumb-router/breadcrumb-router.service.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('AppBreadcrumbService', () => {
88

99
beforeEach(() => {
1010
TestBed.configureTestingModule({
11-
imports: [RouterTestingModule.withRoutes([])],
11+
imports: [RouterTestingModule.withRoutes([])]
1212
});
1313
service = TestBed.inject(BreadcrumbRouterService);
1414
});
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1-
import { CommonModule } from '@angular/common';
21
import { NgModule } from '@angular/core';
3-
import { RouterModule } from '@angular/router';
42

53
// CoreUI Breadcrumb Component
64
import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
75
import { BreadcrumbItemComponent } from './breadcrumb-item/breadcrumb-item.component';
86
import { BreadcrumbRouterComponent } from './breadcrumb-router/breadcrumb-router.component';
97
import { BreadcrumbRouterService } from './breadcrumb-router/breadcrumb-router.service';
10-
import { SharedModule } from '../shared';
118

129
@NgModule({
1310
imports: [
14-
CommonModule,
15-
RouterModule,
1611
BreadcrumbComponent,
1712
BreadcrumbItemComponent,
18-
BreadcrumbRouterComponent,
19-
SharedModule
13+
BreadcrumbRouterComponent
2014
],
2115
exports: [
2216
BreadcrumbComponent,
2317
BreadcrumbItemComponent,
2418
BreadcrumbRouterComponent
2519
],
26-
declarations: [],
2720
providers: [BreadcrumbRouterService]
2821
})
2922
export class BreadcrumbModule {}

projects/coreui-angular/src/lib/breadcrumb/breadcrumb/breadcrumb.component.html

-2
This file was deleted.

projects/coreui-angular/src/lib/breadcrumb/breadcrumb/breadcrumb.component.scss

Whitespace-only changes.

projects/coreui-angular/src/lib/breadcrumb/breadcrumb/breadcrumb.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ describe('BreadcrumbComponent', () => {
88

99
beforeEach(async () => {
1010
await TestBed.configureTestingModule({
11-
imports: [ BreadcrumbComponent ]
11+
imports: [BreadcrumbComponent]
1212
})
13-
.compileComponents();
13+
.compileComponents();
1414
});
1515

1616
beforeEach(() => {

projects/coreui-angular/src/lib/breadcrumb/breadcrumb/breadcrumb.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import { Component, HostBinding, Input } from '@angular/core';
22

33
@Component({
44
selector: 'c-breadcrumb',
5-
templateUrl: './breadcrumb.component.html',
6-
styleUrls: ['./breadcrumb.component.scss'],
5+
template: '<ng-content></ng-content>',
76
standalone: true
87
})
98
export class BreadcrumbComponent {
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
32
import { ButtonGroupComponent } from './button-group/button-group.component';
43
import { ButtonToolbarComponent } from './button-toolbar/button-toolbar.component';
54

65
@NgModule({
7-
declarations: [],
8-
imports: [CommonModule, ButtonGroupComponent, ButtonToolbarComponent],
6+
imports: [ButtonGroupComponent, ButtonToolbarComponent],
97
exports: [ButtonGroupComponent, ButtonToolbarComponent]
108
})
119
export class ButtonGroupModule {}

0 commit comments

Comments
 (0)