Skip to content

Commit 2604475

Browse files
Angular Material Teamannieyw
authored andcommitted
Project import generated by Copybara.
PiperOrigin-RevId: 364880888
1 parent b8d83cb commit 2604475

File tree

21 files changed

+513
-357
lines changed

21 files changed

+513
-357
lines changed

src/google-maps/google-map/google-map.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ interface GoogleMapsWindow extends Window {
3636
export const DEFAULT_OPTIONS: google.maps.MapOptions = {
3737
center: {lat: 37.421995, lng: -122.084092},
3838
zoom: 17,
39-
// Note: the type conversion here isn't necessary for our CI, but it resolves a g3 failure.
39+
// Note: the type conversion here isn't necessary for our CI, but it resolves
40+
// a g3 failure.
4041
mapTypeId: 'roadmap' as unknown as google.maps.MapTypeId
4142
};
4243

@@ -464,13 +465,14 @@ export class GoogleMap implements OnChanges, OnInit, OnDestroy {
464465
const options = this._options || {};
465466
return {
466467
...options,
467-
// It's important that we set **some** kind of `center` and `zoom`, otherwise
468-
// Google Maps will render a blank rectangle which looks broken.
468+
// It's important that we set **some** kind of `center` and `zoom`,
469+
// otherwise Google Maps will render a blank rectangle which looks broken.
469470
center: this._center || options.center || DEFAULT_OPTIONS.center,
470471
zoom: this._zoom ?? options.zoom ?? DEFAULT_OPTIONS.zoom,
471472
// Passing in an undefined `mapTypeId` seems to break tile loading
472473
// so make sure that we have some kind of default (see #22082).
473-
mapTypeId: this.mapTypeId || options.mapTypeId || DEFAULT_OPTIONS.mapTypeId
474+
mapTypeId:
475+
this.mapTypeId || options.mapTypeId || DEFAULT_OPTIONS.mapTypeId
474476
};
475477
}
476478

src/material-experimental/mdc-button/fab.scss

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
@include mdc-fab.without-ripple($query: mdc-helpers.$mat-base-styles-query);
66

7-
.mat-mdc-fab, .mat-mdc-mini-fab {
7+
.mat-mdc-fab,
8+
.mat-mdc-mini-fab {
89
@include button-base.mat-private-button-interactive();
910
@include button-base.mat-private-button-disabled();
1011

@@ -22,7 +23,8 @@
2223
// However, Angular Material expects a `mat-icon` instead. The following
2324
// mixin will style the icons appropriately.
2425
// stylelint-disable-next-line selector-class-pattern
25-
.mat-icon, .material-icons {
26+
.mat-icon,
27+
.material-icons {
2628
@include mdc-fab.icon_();
2729
}
2830
}
@@ -31,7 +33,8 @@
3133
@include mdc-fab.extended_();
3234

3335
// stylelint-disable-next-line selector-class-pattern
34-
.mat-icon, .material-icons {
36+
.mat-icon,
37+
.material-icons {
3538
@include mdc-fab.extended-icon-padding(
3639
mdc-fab.$extended-icon-padding,
3740
mdc-fab.$extended-label-padding
@@ -42,7 +45,8 @@
4245
// We are checking for the a button class because white this is a FAB it
4346
// uses the same template as button.
4447
// stylelint-disable-next-line selector-class-pattern
45-
.mdc-button__label + .mat-icon, .mdc-button__label + .material-icons {
48+
.mdc-button__label + .mat-icon,
49+
.mdc-button__label + .material-icons {
4650
@include mdc-fab.extended-icon-padding(
4751
mdc-fab.$extended-icon-padding,
4852
mdc-fab.$extended-label-padding,

src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// not work for us since we support arbitrary form field controls which don't necessarily
2626
// use an `input` element. We organize the vertical spacing on the infix container.
2727
.mdc-text-field--no-label:not(.mdc-text-field--textarea)
28-
.mat-mdc-input-element.mdc-text-field__input,
28+
.mat-mdc-input-element.mdc-text-field__input,
2929
.mat-mdc-text-field-wrapper .mat-mdc-input-element {
3030
height: auto;
3131
}
@@ -99,7 +99,9 @@
9999
// example, the outline stroke width changes on focus. Since we updated the label to use a fixed
100100
// position, we don't need the vertical offsetting (that will shift the label incorrectly now).
101101
// Note: Increased specificity needed here since MDC overwrites the padding on `:focus`.
102-
.mat-mdc-form-field .mat-mdc-text-field-wrapper.mdc-text-field .mdc-notched-outline__notch {
102+
.mat-mdc-form-field
103+
.mat-mdc-text-field-wrapper.mdc-text-field
104+
.mdc-notched-outline__notch {
103105
padding-top: 0;
104106
}
105107

src/material-experimental/mdc-form-field/form-field.ts

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,18 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88
import {Directionality} from '@angular/cdk/bidi';
9+
import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
910
import {Platform} from '@angular/cdk/platform';
10-
import {
11-
AfterContentChecked,
12-
AfterContentInit,
13-
AfterViewInit,
14-
ChangeDetectionStrategy,
15-
ChangeDetectorRef,
16-
Component,
17-
ContentChild,
18-
ContentChildren,
19-
ElementRef,
20-
Inject,
21-
InjectionToken,
22-
Input,
23-
NgZone,
24-
OnDestroy,
25-
Optional,
26-
QueryList,
27-
ViewChild,
28-
ViewEncapsulation
29-
} from '@angular/core';
11+
import {DOCUMENT} from '@angular/common';
12+
import {AfterContentChecked, AfterContentInit, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ContentChildren, ElementRef, Inject, InjectionToken, Input, NgZone, OnDestroy, Optional, QueryList, ViewChild, ViewEncapsulation} from '@angular/core';
3013
import {NgControl} from '@angular/forms';
14+
import {getMatFormFieldDuplicatedHintError, getMatFormFieldMissingControlError, MAT_FORM_FIELD, matFormFieldAnimations, MatFormFieldControl,} from '@angular/material/form-field';
3115
import {ThemePalette} from '@angular/material-experimental/mdc-core';
32-
import {
33-
getMatFormFieldDuplicatedHintError,
34-
getMatFormFieldMissingControlError,
35-
MAT_FORM_FIELD,
36-
matFormFieldAnimations,
37-
MatFormFieldControl,
38-
} from '@angular/material/form-field';
3916
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
40-
import {
41-
MDCTextFieldAdapter,
42-
MDCTextFieldFoundation,
43-
numbers as mdcTextFieldNumbers
44-
} from '@material/textfield';
17+
import {MDCTextFieldAdapter, MDCTextFieldFoundation, numbers as mdcTextFieldNumbers} from '@material/textfield';
4518
import {merge, Subject} from 'rxjs';
4619
import {takeUntil} from 'rxjs/operators';
20+
4721
import {MAT_ERROR, MatError} from './directives/error';
4822
import {MatFormFieldFloatingLabel} from './directives/floating-label';
4923
import {MatHint} from './directives/hint';
@@ -52,8 +26,6 @@ import {MatFormFieldLineRipple} from './directives/line-ripple';
5226
import {MatFormFieldNotchedOutline} from './directives/notched-outline';
5327
import {MAT_PREFIX, MatPrefix} from './directives/prefix';
5428
import {MAT_SUFFIX, MatSuffix} from './directives/suffix';
55-
import {DOCUMENT} from '@angular/common';
56-
import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
5729

5830
/** Type for the available floatLabel values. */
5931
export type FloatLabelType = 'always' | 'auto';
@@ -153,7 +125,9 @@ export class MatFormField implements AfterViewInit, OnDestroy, AfterContentCheck
153125

154126
/** Whether the required marker should be hidden. */
155127
@Input()
156-
get hideRequiredMarker(): boolean { return this._hideRequiredMarker; }
128+
get hideRequiredMarker(): boolean {
129+
return this._hideRequiredMarker;
130+
}
157131
set hideRequiredMarker(value: boolean) {
158132
this._hideRequiredMarker = coerceBooleanProperty(value);
159133
}

src/material-experimental/mdc-helpers/_focus-indicators-theme.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@
3434
@mixin theme($theme-or-color) {
3535
@if meta.type-of($theme-or-color) != 'map' {
3636
@include _mat-mdc-strong-focus-indicators-border-color($theme-or-color);
37-
}
38-
@else {
37+
} @else {
3938
$theme: theming.private-legacy-get-theme($theme-or-color);
40-
@include theming.private-check-duplicate-theme-styles($theme,
41-
'mat-mdc-strong-focus-indicators') {
39+
@include theming.private-check-duplicate-theme-styles(
40+
$theme,
41+
'mat-mdc-strong-focus-indicators'
42+
) {
4243
$color: theming.get-color-config($theme);
4344
@if $color != null {
4445
@include color($color);

0 commit comments

Comments
 (0)