cleanup

MichaelJamesParsons · MichaelJamesParsons · commit a69813ba8f76 · 2020-10-22T13:40:32.000-07:00
diff --git a/src/cdk-experimental/table/BUILD.bazel b/src/cdk-experimental/table/BUILD.bazel
@@ -3,12 +3,12 @@ load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite"
 package(default_visibility = ["//visibility:public"])
 
 ng_module(
-    name = "scrollable-table-body",
+    name = "table",
     srcs = glob(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/cdk-experimental/scrollable-table-body",
+    module_name = "@angular/cdk-experimental/table",
     deps = [
         "//src/cdk/table",
         "@npm//@angular/common",
diff --git a/src/cdk-experimental/table/index.ts b/src/cdk-experimental/table/index.ts
diff --git a/src/cdk-experimental/table/public-api.ts b/src/cdk-experimental/table/public-api.ts
diff --git a/src/cdk-experimental/table/scrollable-table-body-layout.spec.ts b/src/cdk-experimental/table/scrollable-table-body-layout.spec.ts
diff --git a/src/cdk-experimental/table/scrollable-table-body-layout.ts b/src/cdk-experimental/table/scrollable-table-body-layout.ts
@@ -12,23 +12,25 @@ import {DOCUMENT} from '@angular/common';
 import {
   _TABLE_LAYOUT_STRATEGY,
   _TableLayoutStrategy,
-  _DefaultTableLayoutStrategy,
+  _StandardTableLayoutStrategy,
 } from '@angular/cdk/table/table-layout-strategy';
 
 /**
  * A {@link _TableLayoutStrategy} that enables scrollable body content for flex tables.
  */
 @Injectable()
 class ScrollableTableBodyLayoutStrategy implements _TableLayoutStrategy {
-  private defaultLayout: _DefaultTableLayoutStrategy;
+  private readonly _document: Document;
+  private defaultLayout: _StandardTableLayoutStrategy;
   private _pendingMaxHeight = 'none';
   private _scrollViewport?: HTMLElement;
   readonly headerCssClass = 'cdk-table-scrollable-table-header';
   readonly bodyCssClass = 'cdk-table-scrollable-table-body';
   readonly footerCssClass = 'cdk-table-scrollable-table-footer';
 
-  constructor(@Inject(DOCUMENT) private readonly _document: any) {
-    this.defaultLayout = new _DefaultTableLayoutStrategy(this._document);
+  constructor(@Inject(DOCUMENT) document: any) {
+    this._document = document;
+    this.defaultLayout = new _StandardTableLayoutStrategy(this._document);
   }
 
   /**
@@ -47,14 +49,14 @@ class ScrollableTableBodyLayoutStrategy implements _TableLayoutStrategy {
   getFlexLayout(table: CdkTable<unknown>): DocumentFragment {
     const documentFragment = this._document.createDocumentFragment();
     const sections = [
-      {selector: this.headerCssClass, outlets: [table._headerRowOutlet]},
-      {selector: this.bodyCssClass, outlets: [table._rowOutlet, table._noDataRowOutlet]},
-      {selector: this.footerCssClass, outlets: [table._footerRowOutlet]},
+      {cssClass: this.headerCssClass, outlets: [table._headerRowOutlet]},
+      {cssClass: this.bodyCssClass, outlets: [table._rowOutlet, table._noDataRowOutlet]},
+      {cssClass: this.footerCssClass, outlets: [table._footerRowOutlet]},
     ];
 
     for (const section of sections) {
       const element = this._document.createElement('div');
-      element.classList.add(section.selector);
+      element.classList.add(section.cssClass);
       for (const outlet of section.outlets) {
         element.appendChild(outlet.elementRef.nativeElement);
       }
@@ -87,7 +89,7 @@ class ScrollableTableBodyLayoutStrategy implements _TableLayoutStrategy {
 
 /** A directive that enables scrollable body content for flex tables. */
 @Directive({
-  selector: 'cdk-table[scrollableBody], mat-table[scrollableBody]',
+  selector: 'cdk-table[scrollableBody]',
   providers: [
     {provide: _TABLE_LAYOUT_STRATEGY, useClass: ScrollableTableBodyLayoutStrategy},
   ]
diff --git a/src/cdk-experimental/table/scrollable-table-body-module.ts b/src/cdk-experimental/table/scrollable-table-body-module.ts
diff --git a/src/cdk/table/table-layout-strategy.ts b/src/cdk/table/table-layout-strategy.ts
@@ -13,17 +13,17 @@ import {DOCUMENT} from '@angular/common';
 /** Interface for a service that constructs the DOM structure for a {@link CdkTable}. */
 export interface _TableLayoutStrategy {
   /** Constructs the DOM structure for a native table. */
-  getNativeLayout(table: CdkTable<any>): DocumentFragment;
+  getNativeLayout(table: CdkTable<unknown>): DocumentFragment;
   /** Constructs the DOM structure for a flex table. */
-  getFlexLayout(table: CdkTable<any>): DocumentFragment;
+  getFlexLayout(table: CdkTable<unknown>): DocumentFragment;
 }
 
 /** Injection token for {@link _TableLayoutStrategy}. */
 export const _TABLE_LAYOUT_STRATEGY =
     new InjectionToken<_TableLayoutStrategy>('_TableLayoutStrategy');
 
 
-export class _DefaultTableLayoutStrategy implements _TableLayoutStrategy {
+export class _StandardTableLayoutStrategy implements _TableLayoutStrategy {
   private readonly _document: Document;
 
   constructor(@Inject(DOCUMENT) document: any) {
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
@@ -80,7 +80,7 @@ import {
 } from './table-errors';
 import {CDK_TABLE} from './tokens';
 import {
-  _DefaultTableLayoutStrategy,
+  _StandardTableLayoutStrategy,
   _TABLE_LAYOUT_STRATEGY,
   _TableLayoutStrategy
 } from './table-layout-strategy';
@@ -1059,7 +1059,7 @@ export class CdkTable<T> implements AfterContentChecked, CollectionViewer, OnDes
   }
 
   private _initTableLayout() {
-    const layoutStrategy = this._layoutStrategy || new _DefaultTableLayoutStrategy(this._document);
+    const layoutStrategy = this._layoutStrategy || new _StandardTableLayoutStrategy(this._document);
     const layout = this._isNativeHtmlTable
         ? layoutStrategy.getNativeLayout(this)
         : layoutStrategy.getFlexLayout(this);
diff --git a/src/components-examples/cdk-experimental/scrollable-table-body/index.ts b/src/components-examples/cdk-experimental/scrollable-table-body/index.ts
@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CdkTableModule} from '@angular/cdk/table';
 import {
   CdkScrollableTableBodyModule,
-} from '@angular/cdk-experimental/scrollable-table-body/scrollable-table-body-module';
+} from '@angular/cdk-experimental/table/scrollable-table-body-module';
 import {
   CdkScrollableTableBodyFlexExample,
 } from './cdk-scrollable-table-body-flex/cdk-scrollable-table-body-flex-example';
diff --git a/src/components-examples/material-experimental/scrollable-table-body/index.ts b/src/components-examples/material-experimental/scrollable-table-body/index.ts
@@ -1,7 +1,7 @@
 import {NgModule} from '@angular/core';
 import {
   CdkScrollableTableBodyModule,
-} from '@angular/cdk-experimental/scrollable-table-body/scrollable-table-body-module';
+} from '@angular/cdk-experimental/table/scrollable-table-body-module';
 import {
   MatScrollableTableBodyFlexExample,
 } from './mat-scrollable-table-body-flex/mat-scrollable-table-body-flex-example';
diff --git a/src/dev-app/scrollable-table-body/BUILD b/src/dev-app/scrollable-table-body/BUILD
@@ -6,8 +6,8 @@ ng_module(
     name = "scrollable-table-body",
     srcs = glob(["**/*.ts"]),
     deps = [
-        "//src/components-examples/cdk-experimental/scrollable-table-body",
-        "//src/components-examples/material-experimental/scrollable-table-body",
+        "//src/components-examples/cdk-experimental/table",
+        "//src/components-examples/material-experimental/table",
         "//src/dev-app/example",
         "@npm//@angular/forms",
         "@npm//@angular/router",
diff --git a/src/material-experimental/table/BUILD.bazel b/src/material-experimental/table/BUILD.bazel
@@ -0,0 +1,18 @@
+load("//tools:defaults.bzl", "ng_module")
+
+package(default_visibility = ["//visibility:public"])
+
+ng_module(
+    name = "table",
+    srcs = glob(
+        ["**/*.ts"],
+        exclude = ["**/*.spec.ts"],
+    ),
+    module_name = "@angular/material-experimental/table",
+    deps = [
+        "//src/mat/table",
+        "@npm//@angular/common",
+        "@npm//@angular/core",
+        "@npm//rxjs",
+    ],
+)
diff --git a/src/material-experimental/table/index.ts b/src/material-experimental/table/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './public-api';
diff --git a/src/material-experimental/table/public-api.ts b/src/material-experimental/table/public-api.ts
@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './scrollable-table-body-layout';
+export * from './scrollable-table-body-module';
diff --git a/src/material-experimental/table/scrollable-table-body-layout.ts b/src/material-experimental/table/scrollable-table-body-layout.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive} from '@angular/core';
+import {
+  _TABLE_LAYOUT_STRATEGY,
+} from '@angular/cdk/table/table-layout-strategy';
+
+/** A directive that enables scrollable body content for flex tables. */
+@Directive({
+  selector: 'mat-table[scrollableBody]',
+  providers: [
+    {provide: _TABLE_LAYOUT_STRATEGY, useClass: ScrollableTableBodyLayoutStrategy},
+  ]
+})
+export class MatScrollableTableBody {
+}
diff --git a/src/material-experimental/table/scrollable-table-body-module.ts b/src/material-experimental/table/scrollable-table-body-module.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgModule} from '@angular/core';
+import {MatScrollableTableBody} from './scrollable-table-body-layout';
+
+export {MatScrollableTableBody};
+
+const EXPORTED_DECLARATIONS = [
+  MatScrollableTableBody,
+];
+
+@NgModule({
+  exports: EXPORTED_DECLARATIONS,
+  declarations: EXPORTED_DECLARATIONS,
+})
+export class MatScrollableTableBodyModule { }
