@angular/cdk 9.1.1 → 9.2.0

package/bundles/cdk-table.umd.js

@@ -1,8 +1,205 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('tslib'), require('@angular/cdk/bidi'), require('@angular/cdk/coercion'), require('@angular/cdk/collections'), require('@angular/cdk/platform'), require('@angular/common'), require('@angular/core'), require('rxjs'), require('rxjs/operators')) :
-    typeof define === 'function' && define.amd ? define('@angular/cdk/table', ['exports', 'tslib', '@angular/cdk/bidi', '@angular/cdk/coercion', '@angular/cdk/collections', '@angular/cdk/platform', '@angular/common', '@angular/core', 'rxjs', 'rxjs/operators'], factory) :
-    (global = global || self, factory((global.ng = global.ng || {}, global.ng.cdk = global.ng.cdk || {}, global.ng.cdk.table = {}), global.tslib, global.ng.cdk.bidi, global.ng.cdk.coercion, global.ng.cdk.collections, global.ng.cdk.platform, global.ng.common, global.ng.core, global.rxjs, global.rxjs.operators));
-}(this, (function (exports, tslib, bidi, coercion, collections, platform, common, core, rxjs, operators) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/cdk/bidi'), require('@angular/cdk/coercion'), require('@angular/cdk/collections'), require('@angular/cdk/platform'), require('@angular/common'), require('@angular/core'), require('rxjs'), require('rxjs/operators')) :
+    typeof define === 'function' && define.amd ? define('@angular/cdk/table', ['exports', '@angular/cdk/bidi', '@angular/cdk/coercion', '@angular/cdk/collections', '@angular/cdk/platform', '@angular/common', '@angular/core', 'rxjs', 'rxjs/operators'], factory) :
+    (global = global || self, factory((global.ng = global.ng || {}, global.ng.cdk = global.ng.cdk || {}, global.ng.cdk.table = {}), global.ng.cdk.bidi, global.ng.cdk.coercion, global.ng.cdk.collections, global.ng.cdk.platform, global.ng.common, global.ng.core, global.rxjs, global.rxjs.operators));
+}(this, (function (exports, bidi, coercion, collections, platform, common, core, rxjs, operators) { 'use strict';
+
+    /*! *****************************************************************************
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain a copy of the
+    License at http://www.apache.org/licenses/LICENSE-2.0
+
+    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+    MERCHANTABLITY OR NON-INFRINGEMENT.
+
+    See the Apache Version 2.0 License for specific language governing permissions
+    and limitations under the License.
+    ***************************************************************************** */
+    /* global Reflect, Promise */
+
+    var extendStatics = function(d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+
+    function __extends(d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    }
+
+    var __assign = function() {
+        __assign = Object.assign || function __assign(t) {
+            for (var s, i = 1, n = arguments.length; i < n; i++) {
+                s = arguments[i];
+                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+            }
+            return t;
+        };
+        return __assign.apply(this, arguments);
+    };
+
+    function __rest(s, e) {
+        var t = {};
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+            t[p] = s[p];
+        if (s != null && typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+                if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                    t[p[i]] = s[p[i]];
+            }
+        return t;
+    }
+
+    function __decorate(decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    }
+
+    function __param(paramIndex, decorator) {
+        return function (target, key) { decorator(target, key, paramIndex); }
+    }
+
+    function __metadata(metadataKey, metadataValue) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+    }
+
+    function __awaiter(thisArg, _arguments, P, generator) {
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    }
+
+    function __generator(thisArg, body) {
+        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+        function verb(n) { return function (v) { return step([n, v]); }; }
+        function step(op) {
+            if (f) throw new TypeError("Generator is already executing.");
+            while (_) try {
+                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+                if (y = 0, t) op = [op[0] & 2, t.value];
+                switch (op[0]) {
+                    case 0: case 1: t = op; break;
+                    case 4: _.label++; return { value: op[1], done: false };
+                    case 5: _.label++; y = op[1]; op = [0]; continue;
+                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                    default:
+                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                        if (t[2]) _.ops.pop();
+                        _.trys.pop(); continue;
+                }
+                op = body.call(thisArg, _);
+            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+        }
+    }
+
+    function __exportStar(m, exports) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+
+    function __values(o) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+        if (m) return m.call(o);
+        return {
+            next: function () {
+                if (o && i >= o.length) o = void 0;
+                return { value: o && o[i++], done: !o };
+            }
+        };
+    }
+
+    function __read(o, n) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator];
+        if (!m) return o;
+        var i = m.call(o), r, ar = [], e;
+        try {
+            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+        }
+        catch (error) { e = { error: error }; }
+        finally {
+            try {
+                if (r && !r.done && (m = i["return"])) m.call(i);
+            }
+            finally { if (e) throw e.error; }
+        }
+        return ar;
+    }
+
+    function __spread() {
+        for (var ar = [], i = 0; i < arguments.length; i++)
+            ar = ar.concat(__read(arguments[i]));
+        return ar;
+    }
+
+    function __spreadArrays() {
+        for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+        for (var r = Array(s), k = 0, i = 0; i < il; i++)
+            for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+                r[k] = a[j];
+        return r;
+    };
+
+    function __await(v) {
+        return this instanceof __await ? (this.v = v, this) : new __await(v);
+    }
+
+    function __asyncGenerator(thisArg, _arguments, generator) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var g = generator.apply(thisArg, _arguments || []), i, q = [];
+        return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+        function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+        function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+        function fulfill(value) { resume("next", value); }
+        function reject(value) { resume("throw", value); }
+        function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+    }
+
+    function __asyncDelegator(o) {
+        var i, p;
+        return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+    }
+
+    function __asyncValues(o) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var m = o[Symbol.asyncIterator], i;
+        return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+        function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+        function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+    }
+
+    function __makeTemplateObject(cooked, raw) {
+        if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+        return cooked;
+    };
+
+    function __importStar(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+        result.default = mod;
+        return result;
+    }
+
+    function __importDefault(mod) {
+        return (mod && mod.__esModule) ? mod : { default: mod };
+    }
 
     /**
      * @license
@@ -19,13 +216,13 @@
      */
     function mixinHasStickyInput(base) {
         return /** @class */ (function (_super) {
-            tslib.__extends(class_1, _super);
+            __extends(class_1, _super);
             function class_1() {
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                var _this = _super.apply(this, tslib.__spread(args)) || this;
+                var _this = _super.apply(this, __spread(args)) || this;
                 _this._sticky = false;
                 /** Whether the sticky input has changed since it was last checked. */
                 _this._hasStickyChanged = false;
@@ -56,6 +253,21 @@
         }(base));
     }
 
+    /**
+     * @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
+     */
+    /**
+     * Used to provide a table to some of the sub-components without causing a circular dependency.
+     * @docs-private
+     */
+    var CDK_TABLE = new core.InjectionToken('CDK_TABLE');
+    /** Injection token that can be used to specify the text column options. */
+    var TEXT_COLUMN_OPTIONS = new core.InjectionToken('text-column-options');
+
     /**
      * @license
      * Copyright Google LLC All Rights Reserved.
@@ -127,9 +339,10 @@
      * Defines a set of cells available for a table column.
      */
     var CdkColumnDef = /** @class */ (function (_super) {
-        tslib.__extends(CdkColumnDef, _super);
-        function CdkColumnDef() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
+        __extends(CdkColumnDef, _super);
+        function CdkColumnDef(_table) {
+            var _this = _super.call(this) || this;
+            _this._table = _table;
             _this._stickyEnd = false;
             return _this;
         }
@@ -141,11 +354,10 @@
             set: function (name) {
                 // If the directive is set without a name (updated programatically), then this setter will
                 // trigger with an empty string and should not overwrite the programatically set value.
-                if (!name) {
-                    return;
+                if (name) {
+                    this._name = name;
+                    this.cssClassFriendlyName = name.replace(/[^a-z0-9_-]/ig, '-');
                 }
-                this._name = name;
-                this.cssClassFriendlyName = name.replace(/[^a-z0-9_-]/ig, '-');
             },
             enumerable: true,
             configurable: true
@@ -174,6 +386,10 @@
                         providers: [{ provide: 'MAT_SORT_HEADER_COLUMN_DEF', useExisting: CdkColumnDef }],
                     },] }
         ];
+        /** @nocollapse */
+        CdkColumnDef.ctorParameters = function () { return [
+            { type: undefined, decorators: [{ type: core.Inject, args: [CDK_TABLE,] }, { type: core.Optional }] }
+        ]; };
         CdkColumnDef.propDecorators = {
             name: [{ type: core.Input, args: ['cdkColumnDef',] }],
             stickyEnd: [{ type: core.Input, args: ['stickyEnd',] }],
@@ -193,7 +409,7 @@
     }());
     /** Header cell template container that adds the right classes and role. */
     var CdkHeaderCell = /** @class */ (function (_super) {
-        tslib.__extends(CdkHeaderCell, _super);
+        __extends(CdkHeaderCell, _super);
         function CdkHeaderCell(columnDef, elementRef) {
             return _super.call(this, columnDef, elementRef) || this;
         }
@@ -215,7 +431,7 @@
     }(BaseCdkCell));
     /** Footer cell template container that adds the right classes and role. */
     var CdkFooterCell = /** @class */ (function (_super) {
-        tslib.__extends(CdkFooterCell, _super);
+        __extends(CdkFooterCell, _super);
         function CdkFooterCell(columnDef, elementRef) {
             return _super.call(this, columnDef, elementRef) || this;
         }
@@ -237,7 +453,7 @@
     }(BaseCdkCell));
     /** Cell template container that adds the right classes and role. */
     var CdkCell = /** @class */ (function (_super) {
-        tslib.__extends(CdkCell, _super);
+        __extends(CdkCell, _super);
         function CdkCell(columnDef, elementRef) {
             return _super.call(this, columnDef, elementRef) || this;
         }
@@ -313,7 +529,7 @@
     // Boilerplate for applying mixins to CdkHeaderRowDef.
     /** @docs-private */
     var CdkHeaderRowDefBase = /** @class */ (function (_super) {
-        tslib.__extends(CdkHeaderRowDefBase, _super);
+        __extends(CdkHeaderRowDefBase, _super);
         function CdkHeaderRowDefBase() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
@@ -325,9 +541,11 @@
      * Captures the header row's template and other header properties such as the columns to display.
      */
     var CdkHeaderRowDef = /** @class */ (function (_super) {
-        tslib.__extends(CdkHeaderRowDef, _super);
-        function CdkHeaderRowDef(template, _differs) {
-            return _super.call(this, template, _differs) || this;
+        __extends(CdkHeaderRowDef, _super);
+        function CdkHeaderRowDef(template, _differs, _table) {
+            var _this = _super.call(this, template, _differs) || this;
+            _this._table = _table;
+            return _this;
         }
         // Prerender fails to recognize that ngOnChanges in a part of this class through inheritance.
         // Explicitly define it so that the method is called as part of the Angular lifecycle.
@@ -343,14 +561,15 @@
         /** @nocollapse */
         CdkHeaderRowDef.ctorParameters = function () { return [
             { type: core.TemplateRef },
-            { type: core.IterableDiffers }
+            { type: core.IterableDiffers },
+            { type: undefined, decorators: [{ type: core.Inject, args: [CDK_TABLE,] }, { type: core.Optional }] }
         ]; };
         return CdkHeaderRowDef;
     }(_CdkHeaderRowDefBase));
     // Boilerplate for applying mixins to CdkFooterRowDef.
     /** @docs-private */
     var CdkFooterRowDefBase = /** @class */ (function (_super) {
-        tslib.__extends(CdkFooterRowDefBase, _super);
+        __extends(CdkFooterRowDefBase, _super);
         function CdkFooterRowDefBase() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
@@ -362,9 +581,11 @@
      * Captures the footer row's template and other footer properties such as the columns to display.
      */
     var CdkFooterRowDef = /** @class */ (function (_super) {
-        tslib.__extends(CdkFooterRowDef, _super);
-        function CdkFooterRowDef(template, _differs) {
-            return _super.call(this, template, _differs) || this;
+        __extends(CdkFooterRowDef, _super);
+        function CdkFooterRowDef(template, _differs, _table) {
+            var _this = _super.call(this, template, _differs) || this;
+            _this._table = _table;
+            return _this;
         }
         // Prerender fails to recognize that ngOnChanges in a part of this class through inheritance.
         // Explicitly define it so that the method is called as part of the Angular lifecycle.
@@ -380,7 +601,8 @@
         /** @nocollapse */
         CdkFooterRowDef.ctorParameters = function () { return [
             { type: core.TemplateRef },
-            { type: core.IterableDiffers }
+            { type: core.IterableDiffers },
+            { type: undefined, decorators: [{ type: core.Inject, args: [CDK_TABLE,] }, { type: core.Optional }] }
         ]; };
         return CdkFooterRowDef;
     }(_CdkFooterRowDefBase));
@@ -390,11 +612,13 @@
      * a when predicate that describes when this row should be used.
      */
     var CdkRowDef = /** @class */ (function (_super) {
-        tslib.__extends(CdkRowDef, _super);
+        __extends(CdkRowDef, _super);
         // TODO(andrewseguin): Add an input for providing a switch function to determine
         //   if this template should be used.
-        function CdkRowDef(template, _differs) {
-            return _super.call(this, template, _differs) || this;
+        function CdkRowDef(template, _differs, _table) {
+            var _this = _super.call(this, template, _differs) || this;
+            _this._table = _table;
+            return _this;
         }
         CdkRowDef.decorators = [
             { type: core.Directive, args: [{
@@ -405,7 +629,8 @@
         /** @nocollapse */
         CdkRowDef.ctorParameters = function () { return [
             { type: core.TemplateRef },
-            { type: core.IterableDiffers }
+            { type: core.IterableDiffers },
+            { type: undefined, decorators: [{ type: core.Inject, args: [CDK_TABLE,] }, { type: core.Optional }] }
         ]; };
         return CdkRowDef;
     }(BaseRowDef));
@@ -545,7 +770,7 @@
         StickyStyler.prototype.clearStickyPositioning = function (rows, stickyDirections) {
             var e_1, _a;
             try {
-                for (var rows_1 = tslib.__values(rows), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
+                for (var rows_1 = __values(rows), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
                     var row = rows_1_1.value;
                     // If the row isn't an element (e.g. if it's an `ng-container`),
                     // it won't have inline styles or `children` so we skip it.
@@ -589,7 +814,7 @@
             var endPositions = this._getStickyEndColumnPositions(cellWidths, stickyEndStates);
             var isRtl = this.direction === 'rtl';
             try {
-                for (var rows_2 = tslib.__values(rows), rows_2_1 = rows_2.next(); !rows_2_1.done; rows_2_1 = rows_2.next()) {
+                for (var rows_2 = __values(rows), rows_2_1 = rows_2.next(); !rows_2_1.done; rows_2_1 = rows_2.next()) {
                     var row = rows_2_1.value;
                     for (var i = 0; i < numCells; i++) {
                         var cell = row.children[i];
@@ -679,7 +904,7 @@
         StickyStyler.prototype._removeStickyStyle = function (element, stickyDirections) {
             var e_3, _a;
             try {
-                for (var stickyDirections_1 = tslib.__values(stickyDirections), stickyDirections_1_1 = stickyDirections_1.next(); !stickyDirections_1_1.done; stickyDirections_1_1 = stickyDirections_1.next()) {
+                for (var stickyDirections_1 = __values(stickyDirections), stickyDirections_1_1 = stickyDirections_1.next(); !stickyDirections_1_1.done; stickyDirections_1_1 = stickyDirections_1.next()) {
                     var dir = stickyDirections_1_1.value;
                     element.style[dir] = '';
                 }
@@ -735,7 +960,7 @@
                 // Use `Iterable` instead of `Array` because TypeScript, as of 3.6.3,
                 // loses the array generic type in the `for of`. But we *also* have to use `Array` because
                 // typescript won't iterate over an `Iterable` unless you compile with `--downlevelIteration`
-                for (var _b = tslib.__values(STICKY_DIRECTIONS), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = __values(STICKY_DIRECTIONS), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var dir = _c.value;
                     if (element.style[dir]) {
                         zIndex += zIndexIncrements[dir];
@@ -941,7 +1166,7 @@
      * @docs-private
      */
     var RowViewRef = /** @class */ (function (_super) {
-        tslib.__extends(RowViewRef, _super);
+        __extends(RowViewRef, _super);
         function RowViewRef() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
@@ -1322,7 +1547,7 @@
             var footerRows = this._getRenderedRows(this._footerRowOutlet);
             // Clear the left and right positioning from all columns in the table across all rows since
             // sticky columns span across all table sections (header, data, footer)
-            this._stickyStyler.clearStickyPositioning(tslib.__spread(headerRows, dataRows, footerRows), ['left', 'right']);
+            this._stickyStyler.clearStickyPositioning(__spread(headerRows, dataRows, footerRows), ['left', 'right']);
             // Update the sticky styles for each header row depending on the def's sticky state
             headerRows.forEach(function (headerRow, i) {
                 _this._addStickyColumnStyles([headerRow], _this._headerRowDefs[i]);
@@ -1401,7 +1626,7 @@
         CdkTable.prototype._cacheColumnDefs = function () {
             var _this = this;
             this._columnDefsByName.clear();
-            var columnDefs = mergeQueryListAndSet(this._contentColumnDefs, this._customColumnDefs);
+            var columnDefs = mergeArrayAndSet(this._getOwnDefs(this._contentColumnDefs), this._customColumnDefs);
             columnDefs.forEach(function (columnDef) {
                 if (_this._columnDefsByName.has(columnDef.name)) {
                     throw getTableDuplicateColumnNameError(columnDef.name);
@@ -1411,11 +1636,9 @@
         };
         /** Update the list of all available row definitions that can be used. */
         CdkTable.prototype._cacheRowDefs = function () {
-            this._headerRowDefs =
-                mergeQueryListAndSet(this._contentHeaderRowDefs, this._customHeaderRowDefs);
-            this._footerRowDefs =
-                mergeQueryListAndSet(this._contentFooterRowDefs, this._customFooterRowDefs);
-            this._rowDefs = mergeQueryListAndSet(this._contentRowDefs, this._customRowDefs);
+            this._headerRowDefs = mergeArrayAndSet(this._getOwnDefs(this._contentHeaderRowDefs), this._customHeaderRowDefs);
+            this._footerRowDefs = mergeArrayAndSet(this._getOwnDefs(this._contentFooterRowDefs), this._customFooterRowDefs);
+            this._rowDefs = mergeArrayAndSet(this._getOwnDefs(this._contentRowDefs), this._customRowDefs);
             // After all row definitions are determined, find the row definition to be considered default.
             var defaultRowDefs = this._rowDefs.filter(function (def) { return !def.when; });
             if (!this.multiTemplateDataRows && defaultRowDefs.length > 1) {
@@ -1586,7 +1809,7 @@
             // TODO(andrewseguin): enforce that one outlet was instantiated from createEmbeddedView
             outlet.viewContainer.createEmbeddedView(rowDef.template, context, index);
             try {
-                for (var _b = tslib.__values(this._getCellTemplates(rowDef)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = __values(this._getCellTemplates(rowDef)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var cellTemplate = _c.value;
                     if (CdkCellOutlet.mostRecentCellOutlet) {
                         CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cellTemplate, context);
@@ -1649,7 +1872,7 @@
                 { tag: 'tfoot', outlet: this._footerRowOutlet },
             ];
             try {
-                for (var sections_1 = tslib.__values(sections), sections_1_1 = sections_1.next(); !sections_1_1.done; sections_1_1 = sections_1.next()) {
+                for (var sections_1 = __values(sections), sections_1_1 = sections_1.next(); !sections_1_1.done; sections_1_1 = sections_1.next()) {
                     var section = sections_1_1.value;
                     var element = this._document.createElement(section.tag);
                     element.setAttribute('role', 'rowgroup');
@@ -1716,6 +1939,11 @@
                 _this.updateStickyColumnStyles();
             });
         };
+        /** Filters definitions that belong to this table from a QueryList. */
+        CdkTable.prototype._getOwnDefs = function (items) {
+            var _this = this;
+            return items.filter(function (item) { return !item._table || item._table === _this; });
+        };
         CdkTable.decorators = [
             { type: core.Component, args: [{
                         selector: 'cdk-table, table[cdk-table]',
@@ -1729,7 +1957,8 @@
                         // The view for `MatTable` consists entirely of templates declared in other views. As they are
                         // declared elsewhere, they are checked when their declaration points are checked.
                         // tslint:disable-next-line:validate-decorators
-                        changeDetection: core.ChangeDetectionStrategy.Default
+                        changeDetection: core.ChangeDetectionStrategy.Default,
+                        providers: [{ provide: CDK_TABLE, useExisting: CdkTable }]
                     }] }
         ];
         /** @nocollapse */
@@ -1760,9 +1989,9 @@
         };
         return CdkTable;
     }());
-    /** Utility function that gets a merged list of the entries in a QueryList and values of a Set. */
-    function mergeQueryListAndSet(queryList, set) {
-        return queryList.toArray().concat(Array.from(set));
+    /** Utility function that gets a merged list of the entries in an array and values of a Set. */
+    function mergeArrayAndSet(array, set) {
+        return array.concat(Array.from(set));
     }
 
     /**
@@ -1772,8 +2001,6 @@
      * 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
      */
-    /** Injection token that can be used to specify the text column options. */
-    var TEXT_COLUMN_OPTIONS = new core.InjectionToken('text-column-options');
     /**
      * Column that simply shows text content for the header and row cells. Assumes that the table
      * is using the native table implementation (`<table>`).
@@ -1943,6 +2170,7 @@
     exports.BaseCdkCell = BaseCdkCell;
     exports.BaseRowDef = BaseRowDef;
     exports.CDK_ROW_TEMPLATE = CDK_ROW_TEMPLATE;
+    exports.CDK_TABLE = CDK_TABLE;
     exports.CDK_TABLE_TEMPLATE = CDK_TABLE_TEMPLATE;
     exports.CdkCell = CdkCell;
     exports.CdkCellDef = CdkCellDef;