Skip to content

Commit

Permalink
[ACS-7388][ADF] Break Toolbar dependency on Material Module (#9486)
Browse files Browse the repository at this point in the history
* [ACS-7388] transform toolbar to standalone

* [ACS-7388] transform toolbar to standalone
  • Loading branch information
tamaragruszka authored Apr 2, 2024
1 parent 3927f09 commit c73fb1b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 30 deletions.
21 changes: 12 additions & 9 deletions lib/core/src/lib/toolbar/toolbar-divider.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@ import { Component, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/

@Component({
selector: 'adf-toolbar-divider',
standalone: true,
template: '<div></div>',
host: { class: 'adf-toolbar-divider' },
styles: [`
.adf-toolbar-divider > div {
height: 24px;
width: 1px;
background: rgba(0, 0, 0, 0.26);
margin-left: 5px;
margin-right: 5px;
}
`],
styles: [
`
.adf-toolbar-divider > div {
height: 24px;
width: 1px;
background: rgba(0, 0, 0, 0.26);
margin-left: 5px;
margin-right: 5px;
}
`
],
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
Expand Down
1 change: 1 addition & 0 deletions lib/core/src/lib/toolbar/toolbar-title.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { Component } from '@angular/core';

@Component({
selector: 'adf-toolbar-title',
standalone: true,
template: '<ng-content></ng-content>',
host: { class: 'adf-toolbar-title' }
})
Expand Down
7 changes: 5 additions & 2 deletions lib/core/src/lib/toolbar/toolbar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,26 @@

import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core';
import { ThemePalette } from '@angular/material/core';
import { MatToolbarModule } from '@angular/material/toolbar';
import { TranslateModule } from '@ngx-translate/core';
import { NgIf } from '@angular/common';

@Component({
selector: 'adf-toolbar',
standalone: true,
templateUrl: './toolbar.component.html',
styleUrls: ['./toolbar.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
imports: [MatToolbarModule, TranslateModule, NgIf],
host: { class: 'adf-toolbar' }
})
export class ToolbarComponent {

/** Toolbar title. */
@Input()
title: string = '';

/** Toolbar color. Can be changed to empty value (default), `primary`, `accent` or `warn`. */
@Input()
color: ThemePalette;

}
21 changes: 2 additions & 19 deletions lib/core/src/lib/toolbar/toolbar.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,13 @@
* limitations under the License.
*/

import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
import { MaterialModule } from '../material.module';

import { ToolbarDividerComponent } from './toolbar-divider.component';
import { ToolbarTitleComponent } from './toolbar-title.component';
import { ToolbarComponent } from './toolbar.component';

@NgModule({
imports: [
CommonModule,
MaterialModule,
TranslateModule
],
declarations: [
ToolbarComponent,
ToolbarTitleComponent,
ToolbarDividerComponent
],
exports: [
ToolbarComponent,
ToolbarTitleComponent,
ToolbarDividerComponent
]
imports: [ToolbarComponent, ToolbarTitleComponent, ToolbarDividerComponent],
exports: [ToolbarComponent, ToolbarTitleComponent, ToolbarDividerComponent]
})
export class ToolbarModule {}

0 comments on commit c73fb1b

Please sign in to comment.