feat(cdk-experiment/selection): Merge to master

yifange · yifange · commit 3b0c3fcf6cc4 · 2020-08-06T21:50:57.000-07:00
diff --git a/src/cdk-experimental/selection/BUILD.bazel b/src/cdk-experimental/selection/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "selection",
     srcs = glob(
diff --git a/src/cdk-experimental/selection/select-all.ts b/src/cdk-experimental/selection/select-all.ts
@@ -67,7 +67,7 @@ export class CdkSelectAll<T> implements OnDestroy, OnInit {
   private readonly _destroyed = new Subject<void>();
 
   constructor(
-      @Optional() private readonly _selection: CdkSelection<T>,
+      @Optional() @Inject(CdkSelection) private readonly _selection: CdkSelection<T>,
       @Optional() @Self() @Inject(NG_VALUE_ACCESSOR) private readonly _controlValueAccessor:
           ControlValueAccessor[]) {}
 
diff --git a/src/cdk-experimental/selection/selection-column.ts b/src/cdk-experimental/selection/selection-column.ts
@@ -17,6 +17,7 @@ import {
   ViewChild,
   ChangeDetectionStrategy,
   ViewEncapsulation,
+  Inject,
 } from '@angular/core';
 
 import {CdkSelection} from './selection';
@@ -71,8 +72,8 @@ export class CdkSelectionColumn<T> implements OnInit, OnDestroy {
   @ViewChild(CdkHeaderCellDef, {static: true}) private readonly _headerCell: CdkHeaderCellDef;
 
   constructor(
-      @Optional() private _table: CdkTable<T>,
-      @Optional() readonly selection: CdkSelection<T>,
+      @Optional() @Inject(CdkTable) private _table: CdkTable<T>,
+      @Optional() @Inject(CdkSelection) readonly selection: CdkSelection<T>,
   ) {}
 
   ngOnInit() {
diff --git a/src/cdk-experimental/selection/selection-set.ts b/src/cdk-experimental/selection/selection-set.ts
@@ -15,8 +15,8 @@ import {Subject} from 'rxjs';
  */
 interface TrackBySelection<T> {
   isSelected(value: SelectableWithIndex<T>): boolean;
-  select(...values: Array<SelectableWithIndex<T>>): void;
-  deselect(...values: Array<SelectableWithIndex<T>>): void;
+  select(...values: SelectableWithIndex<T>[]): void;
+  deselect(...values: SelectableWithIndex<T>[]): void;
   changed: Subject<SelectionChange<T>>;
 }
 
@@ -33,8 +33,8 @@ export interface SelectableWithIndex<T> {
  * Represents the change in the selection set.
  */
 export interface SelectionChange<T> {
-  before: Array<SelectableWithIndex<T>>;
-  after: Array<SelectableWithIndex<T>>;
+  before: SelectableWithIndex<T>[];
+  after: SelectableWithIndex<T>[];
 }
 
 /**
@@ -54,7 +54,7 @@ export class SelectionSet<T> implements TrackBySelection<T> {
     return this._selectionMap.has(this._getTrackedByValue(value));
   }
 
-  select(...selects: Array<SelectableWithIndex<T>>) {
+  select(...selects: SelectableWithIndex<T>[]) {
     if (!this._multiple && selects.length > 1 && isDevMode()) {
       throw Error('SelectionSet: not multiple selection');
     }
@@ -65,7 +65,7 @@ export class SelectionSet<T> implements TrackBySelection<T> {
       this._selectionMap.clear();
     }
 
-    const toSelect: Array<SelectableWithIndex<T>> = [];
+    const toSelect: SelectableWithIndex<T>[] = [];
     for (const select of selects) {
       if (this.isSelected(select)) {
         continue;
@@ -80,13 +80,13 @@ export class SelectionSet<T> implements TrackBySelection<T> {
     this.changed.next({before, after});
   }
 
-  deselect(...selects: Array<SelectableWithIndex<T>>) {
+  deselect(...selects: SelectableWithIndex<T>[]) {
     if (!this._multiple && selects.length > 1 && isDevMode()) {
       throw Error('SelectionSet: not multiple selection');
     }
 
     const before = this._getCurrentSelection();
-    const toDeselect: Array<SelectableWithIndex<T>> = [];
+    const toDeselect: SelectableWithIndex<T>[] = [];
 
     for (const select of selects) {
       if (!this.isSelected(select)) {
@@ -121,7 +121,7 @@ export class SelectionSet<T> implements TrackBySelection<T> {
     return this._trackByFn(select.index!, select.value);
   }
 
-  private _getCurrentSelection(): Array<SelectableWithIndex<T>> {
+  private _getCurrentSelection(): SelectableWithIndex<T>[] {
     return Array.from(this._selectionMap.values());
   }
 }
diff --git a/src/cdk-experimental/selection/selection-toggle.ts b/src/cdk-experimental/selection/selection-toggle.ts
@@ -61,7 +61,7 @@ export class CdkSelectionToggle<T> implements OnDestroy, OnInit {
   private _destroyed = new Subject<void>();
 
   constructor(
-      @Optional() private _selection: CdkSelection<T>,
+      @Optional() @Inject(CdkSelection) private _selection: CdkSelection<T>,
       @Optional() @Self() @Inject(NG_VALUE_ACCESSOR) private _controlValueAccessors:
           ControlValueAccessor[],
   ) {}
diff --git a/src/cdk-experimental/selection/selection.ts b/src/cdk-experimental/selection/selection.ts
@@ -187,7 +187,7 @@ export class CdkSelection<T> implements OnInit, AfterContentChecked, CollectionV
   }
 
   private _selectAll() {
-    const toSelect: Array<SelectableWithIndex<T>> = [];
+    const toSelect: SelectableWithIndex<T>[] = [];
     this._data.forEach((value, index) => {
       toSelect.push({value, index});
     });
@@ -196,7 +196,7 @@ export class CdkSelection<T> implements OnInit, AfterContentChecked, CollectionV
   }
 
   private _clearAll() {
-    const toDeselect: Array<SelectableWithIndex<T>> = [];
+    const toDeselect: SelectableWithIndex<T>[] = [];
     this._data.forEach((value, index) => {
       toDeselect.push({value, index});
     });
diff --git a/src/components-examples/cdk-experimental/selection/BUILD.bazel b/src/components-examples/cdk-experimental/selection/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "selection",
     srcs = glob(["**/*.ts"]),
diff --git a/src/components-examples/material-experimental/selection/BUILD.bazel b/src/components-examples/material-experimental/selection/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "selection",
     srcs = glob(["**/*.ts"]),
diff --git a/src/dev-app/example/example-module.ts b/src/dev-app/example/example-module.ts
@@ -7,7 +7,6 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {ExampleModule as DocsExampleModule} from '@angular/components-examples';
 import {NgModule} from '@angular/core';
 import {MatExpansionModule} from '@angular/material/expansion';
 
diff --git a/src/dev-app/selection/BUILD.bazel b/src/dev-app/selection/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "selection",
     srcs = glob(["**/*.ts"]),
diff --git a/src/material-experimental/selection/BUILD.bazel b/src/material-experimental/selection/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "sass_binary", "sass_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "selection",
     srcs = glob(
diff --git a/src/material-experimental/selection/_selection.scss b/src/material-experimental/selection/_selection.scss
@@ -1,3 +1,8 @@
-@mixin mat-selection-theme($theme) {}
+@import '../../material/core/theming/check-duplicate-styles';
 
-@mixin mat-selection-typography($config) {}
+@mixin mat-selection-theme($theme-or-color-config) {
+  $theme: _mat-legacy-get-theme($theme-or-color-config);
+  @include _mat-check-duplicate-theme-styles($theme, 'mat-selection');
+}
+
+@mixin mat-selection-typography($config-or-theme) {}

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ import {Subject} from 'rxjs';`
`15`	`15`	`*/`
`16`	`16`	`interface TrackBySelection<T> {`
`17`	`17`	`isSelected(value: SelectableWithIndex<T>): boolean;`
`18`		`- select(...values: Array<SelectableWithIndex<T>>): void;`
`19`		`- deselect(...values: Array<SelectableWithIndex<T>>): void;`
	`18`	`+ select(...values: SelectableWithIndex<T>[]): void;`
	`19`	`+ deselect(...values: SelectableWithIndex<T>[]): void;`
`20`	`20`	`changed: Subject<SelectionChange<T>>;`
`21`	`21`	`}`
`22`	`22`
`@@ -33,8 +33,8 @@ export interface SelectableWithIndex<T> {`
`33`	`33`	`* Represents the change in the selection set.`
`34`	`34`	`*/`
`35`	`35`	`export interface SelectionChange<T> {`
`36`		`- before: Array<SelectableWithIndex<T>>;`
`37`		`- after: Array<SelectableWithIndex<T>>;`
	`36`	`+ before: SelectableWithIndex<T>[];`
	`37`	`+ after: SelectableWithIndex<T>[];`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`@@ -54,7 +54,7 @@ export class SelectionSet<T> implements TrackBySelection<T> {`
`54`	`54`	`return this._selectionMap.has(this._getTrackedByValue(value));`
`55`	`55`	`}`
`56`	`56`
`57`		`- select(...selects: Array<SelectableWithIndex<T>>) {`
	`57`	`+ select(...selects: SelectableWithIndex<T>[]) {`
`58`	`58`	`if (!this._multiple && selects.length > 1 && isDevMode()) {`
`59`	`59`	`throw Error('SelectionSet: not multiple selection');`
`60`	`60`	`}`
`@@ -65,7 +65,7 @@ export class SelectionSet<T> implements TrackBySelection<T> {`
`65`	`65`	`this._selectionMap.clear();`
`66`	`66`	`}`
`67`	`67`
`68`		`- const toSelect: Array<SelectableWithIndex<T>> = [];`
	`68`	`+ const toSelect: SelectableWithIndex<T>[] = [];`
`69`	`69`	`for (const select of selects) {`
`70`	`70`	`if (this.isSelected(select)) {`
`71`	`71`	`continue;`
`@@ -80,13 +80,13 @@ export class SelectionSet<T> implements TrackBySelection<T> {`
`80`	`80`	`this.changed.next({before, after});`
`81`	`81`	`}`
`82`	`82`
`83`		`- deselect(...selects: Array<SelectableWithIndex<T>>) {`
	`83`	`+ deselect(...selects: SelectableWithIndex<T>[]) {`
`84`	`84`	`if (!this._multiple && selects.length > 1 && isDevMode()) {`
`85`	`85`	`throw Error('SelectionSet: not multiple selection');`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`const before = this._getCurrentSelection();`
`89`		`- const toDeselect: Array<SelectableWithIndex<T>> = [];`
	`89`	`+ const toDeselect: SelectableWithIndex<T>[] = [];`
`90`	`90`
`91`	`91`	`for (const select of selects) {`
`92`	`92`	`if (!this.isSelected(select)) {`
`@@ -121,7 +121,7 @@ export class SelectionSet<T> implements TrackBySelection<T> {`
`121`	`121`	`return this._trackByFn(select.index!, select.value);`
`122`	`122`	`}`
`123`	`123`
`124`		`- private _getCurrentSelection(): Array<SelectableWithIndex<T>> {`
	`124`	`+ private _getCurrentSelection(): SelectableWithIndex<T>[] {`
`125`	`125`	`return Array.from(this._selectionMap.values());`
`126`	`126`	`}`
`127`	`127`	`}`