Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: replace left-over module imports with standalone equivalents #28200

Merged
merged 3 commits into from
Nov 29, 2023
Merged

refactor: replace left-over module imports with standalone equivalents #28200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb7bf62
refactor(cdk/dialog): replace left-over module imports with standalon…
nikos-moysiadis Nov 28, 2023
0c6993a
refactor(material/dialog): replace left-over module imports with stan…
nikos-moysiadis Nov 28, 2023
22dd6ae
refactor(material/snack-bar): replace left-over module imports with s…
nikos-moysiadis Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cdk/dialog/dialog-container.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<ng-template cdkPortalOutlet></ng-template>
<ng-template cdkPortalOutlet />
3 changes: 1 addition & 2 deletions src/cdk/dialog/dialog-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
CdkPortalOutlet,
ComponentPortal,
DomPortal,
PortalModule,
TemplatePortal,
} from '@angular/cdk/portal';
import {DOCUMENT} from '@angular/common';
Expand Down Expand Up @@ -56,7 +55,7 @@ export function throwDialogContentAlreadyAttachedError() {
// tslint:disable-next-line:validate-decorators
changeDetection: ChangeDetectionStrategy.Default,
standalone: true,
imports: [PortalModule],
imports: [CdkPortalOutlet],
host: {
'class': 'cdk-dialog-container',
'tabindex': '-1',
Expand Down
2 changes: 1 addition & 1 deletion src/material/dialog/dialog-container.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="mdc-dialog__container">
<div class="mat-mdc-dialog-surface mdc-dialog__surface">
<ng-template cdkPortalOutlet></ng-template>
<ng-template cdkPortalOutlet />
</div>
</div>
4 changes: 2 additions & 2 deletions src/material/dialog/dialog-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {MatDialogConfig} from './dialog-config';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {CdkDialogContainer} from '@angular/cdk/dialog';
import {coerceNumberProperty} from '@angular/cdk/coercion';
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
import {CdkPortalOutlet, ComponentPortal} from '@angular/cdk/portal';

/** Event that captures the state of dialog container animations. */
interface LegacyDialogAnimationEvent {
Expand Down Expand Up @@ -57,7 +57,7 @@ export const CLOSE_ANIMATION_DURATION = 75;
// tslint:disable-next-line:validate-decorators
changeDetection: ChangeDetectionStrategy.Default,
standalone: true,
imports: [PortalModule],
imports: [CdkPortalOutlet],
host: {
'class': 'mat-mdc-dialog-container mdc-dialog',
'tabindex': '-1',
Expand Down
5 changes: 2 additions & 3 deletions src/material/snack-bar/simple-snack-bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
*/

import {ChangeDetectionStrategy, Component, Inject, ViewEncapsulation} from '@angular/core';
import {CommonModule} from '@angular/common';
import {MatButtonModule} from '@angular/material/button';
import {MatButton} from '@angular/material/button';
import {MatSnackBarRef} from './snack-bar-ref';
import {MAT_SNACK_BAR_DATA} from './snack-bar-config';
import {MatSnackBarAction, MatSnackBarActions, MatSnackBarLabel} from './snack-bar-content';
Expand All @@ -30,7 +29,7 @@ export interface TextOnlySnackBar {
exportAs: 'matSnackBar',
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [MatButtonModule, MatSnackBarLabel, MatSnackBarActions, MatSnackBarAction, CommonModule],
imports: [MatButton, MatSnackBarLabel, MatSnackBarActions, MatSnackBarAction],
standalone: true,
host: {
'class': 'mat-mdc-simple-snack-bar',
Expand Down
2 changes: 1 addition & 1 deletion src/material/snack-bar/snack-bar-container.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="mat-mdc-snack-bar-label" #label>
<!-- Initialy holds the snack bar content, will be empty after announcing to screen readers. -->
<div aria-hidden="true">
<ng-template cdkPortalOutlet></ng-template>
<ng-template cdkPortalOutlet />
</div>

<!-- Will receive the snack bar content from the non-live div, move will happen a short delay after opening -->
Expand Down
3 changes: 1 addition & 2 deletions src/material/snack-bar/snack-bar-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
CdkPortalOutlet,
ComponentPortal,
DomPortal,
PortalModule,
TemplatePortal,
} from '@angular/cdk/portal';
import {Observable, Subject} from 'rxjs';
Expand Down Expand Up @@ -54,7 +53,7 @@ let uniqueId = 0;
encapsulation: ViewEncapsulation.None,
animations: [matSnackBarAnimations.snackBarState],
standalone: true,
imports: [PortalModule],
imports: [CdkPortalOutlet],
host: {
'class': 'mdc-snackbar mat-mdc-snack-bar-container mdc-snackbar--open',
'[@state]': '_animationState',
Expand Down
Loading