Skip to content

fix: ensure components work with ES2015 in jit mode#12759

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

Merged
jelbourn merged 1 commit into from
Aug 21, 2018
Merged

fix: ensure components work with ES2015 in jit mode #12759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/lib/expansion/expansion-panel.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
'[class.mat-expansion-panel-spacing]': '_hasSpacing()',
}
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
implements AfterContentInit, OnChanges, OnDestroy {
/** Whether the toggle indicator should be hidden. */
@Input()
Expand Down
4 changes: 3 additions & 1 deletion src/lib/input/autosize.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
* Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
'(input)': '_noopInputHandler()',
},
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
@Input()
get matAutosizeMinRows(): number { return this.minRows; }
set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down
11 changes: 5 additions & 6 deletions src/lib/stepper/step-label.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
* found in the LICENSE file at https://angular.io/license
*/

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
constructor(template: TemplateRef<any>) {
super(template);
}
}
export class MatStepLabel extends _CdkStepLabel {}
8 changes: 6 additions & 2 deletions src/lib/stepper/stepper-button.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
inputs: ['type'],
providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
inputs: ['type'],
providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}
4 changes: 3 additions & 1 deletion src/lib/stepper/stepper.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
/** The list of step headers of the steps in the stepper. */
@ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down
11 changes: 8 additions & 3 deletions src/lib/table/cell.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
* Cell definition for the mat-table.
* Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
selector: '[matCellDef]',
providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
* Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
selector: '[matHeaderCellDef]',
providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
* Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
selector: '[matFooterCellDef]',
providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
* Column definition for the mat-table.
Expand Down
11 changes: 8 additions & 3 deletions src/lib/table/row.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
* Header row definition for the mat-table.
* Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
* Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
* Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down
30 changes: 5 additions & 25 deletions src/lib/table/table.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
* found in the LICENSE file at https://angular.io/license
*/

import {
Attribute,
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
ElementRef,
IterableDiffers,
Optional,
ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
* Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
/** Overrides the sticky CSS class set by the `CdkTable`. */
protected stickyCssClass = 'mat-table-sticky';

// TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
// properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
// fixed bug.
// https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
// https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
constructor(protected _differs: IterableDiffers,
protected _changeDetectorRef: ChangeDetectorRef,
protected _elementRef: ElementRef,
@Attribute('role') role: string,
@Optional() protected readonly _dir: Directionality) {
super(_differs, _changeDetectorRef, _elementRef, role, _dir);
}
}
11 changes: 5 additions & 6 deletions src/lib/tabs/tab-label.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
* found in the LICENSE file at https://angular.io/license
*/

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
super(templateRef, viewContainerRef);
}
}
export class MatTabLabel extends _CdkPortal {}
21 changes: 4 additions & 17 deletions src/lib/tree/node.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/

import {
CdkNestedTreeNode,
CdkTree,
CdkTreeNode,
CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
AfterContentInit,
Attribute,
Expand All@@ -22,11 +17,12 @@ import {
IterableDiffers,
OnDestroy,
QueryList,
TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
],
providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
@Input('matTreeNode') data: T;

// TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
// properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
// fixed bug.
// https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
// https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
constructor(template: TemplateRef<any>) {
super(template);
}
}

/**
Expand Down
22 changes: 5 additions & 17 deletions src/lib/tree/padding.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
* 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
* Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
selector: '[matTreeNodePadding]',
providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

/** The level of depth of the tree node. The padding will be `level * indent` pixels. */
@Input('matTreeNodePadding') level: number;

/** The indent for each level. Default number 40px from material design menu sub-menu spec. */
@Input('matTreeNodePaddingIndent') indent: number;

// TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
// properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
// fixed bug.
// https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
// https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
constructor(_treeNode: CdkTreeNode<T>,
_tree: CdkTree<T>,
_renderer: Renderer2,
_element: ElementRef,
@Optional() _dir: Directionality) {
super(_treeNode, _tree, _renderer, _element, _dir);
}
}
16 changes: 5 additions & 11 deletions src/lib/tree/toggle.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
* found in the LICENSE file at https://angular.io/license
*/

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
* Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
},
providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
@Input('matTreeNodeToggleRecursive') recursive: boolean = false;

// TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
// properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
// fixed bug.
// https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
// https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
super(_tree, _treeNode);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: ensure components work with ES2015 in jit mode by devversion · Pull Request #12759 · angular/components · GitHub
Skip to content
fix: ensure components work with ES2015 in jit mode#12759

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

 Merged

jelbourn
merged 1 commit into

from

Aug 21, 2018
 Merged


fix: ensure components work with ES2015 in jit mode
#12759
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
src/lib/expansion/expansion-panel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
 '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
 }
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
 implements AfterContentInit, OnChanges, OnDestroy {
 /** Whether the toggle indicator should be hidden. */
 @Input()
Expand Down

4 changes: 3 additions & 1 deletion
src/lib/input/autosize.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
 * Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
 '(input)': '_noopInputHandler()',
 },
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
 @Input()
 get matAutosizeMinRows(): number { return this.minRows; }
 set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down

11 changes: 5 additions & 6 deletions
src/lib/stepper/step-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
 selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}
export class MatStepLabel extends _CdkStepLabel {}

8 changes: 6 additions & 2 deletions
src/lib/stepper/stepper-button.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
 selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}

4 changes: 3 additions & 1 deletion
src/lib/stepper/stepper.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
 moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
 selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
 /** The list of step headers of the steps in the stepper. */
 @ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/cell.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
 CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
 * Cell definition for the mat-table.
 * Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
 selector: '[matCellDef]',
 providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
 * Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
 selector: '[matHeaderCellDef]',
 providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
 * Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
 selector: '[matFooterCellDef]',
 providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
 * Column definition for the mat-table.
Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/row.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
 CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
 * Header row definition for the mat-table.
 * Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
 providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
 inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
 * Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
 providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
 inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
 * Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
 providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
 inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down

30 changes: 5 additions & 25 deletions
src/lib/table/table.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 Attribute,
 ChangeDetectionStrategy,
 ChangeDetectorRef,
 Component,
 ElementRef,
 IterableDiffers,
 Optional,
 ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
 * Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
 encapsulation: ViewEncapsulation.None,
 changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
 /** Overrides the sticky CSS class set by the `CdkTable`. */
 protected stickyCssClass = 'mat-table-sticky';

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(protected _differs: IterableDiffers,
 protected _changeDetectorRef: ChangeDetectorRef,
 protected _elementRef: ElementRef,
 @Attribute('role') role: string,
 @Optional() protected readonly _dir: Directionality) {
 super(_differs, _changeDetectorRef, _elementRef, role, _dir);
 }
}

11 changes: 5 additions & 6 deletions
src/lib/tabs/tab-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
 selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
 constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
 super(templateRef, viewContainerRef);
 }
}
export class MatTabLabel extends _CdkPortal {}

21 changes: 4 additions & 17 deletions
src/lib/tree/node.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 CdkNestedTreeNode,
 CdkTree,
 CdkTreeNode,
 CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
 AfterContentInit,
 Attribute,
Expand All@@ -22,11 +17,12 @@ import {
 IterableDiffers,
 OnDestroy,
 QueryList,
 TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
 ],
 providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
 @Input('matTreeNode') data: T;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}

/**
Expand Down

22 changes: 5 additions & 17 deletions
src/lib/tree/padding.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
 * 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
 * Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
 selector: '[matTreeNodePadding]',
 providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

 /** The level of depth of the tree node. The padding will be `level * indent` pixels. */
 @Input('matTreeNodePadding') level: number;

 /** The indent for each level. Default number 40px from material design menu sub-menu spec. */
 @Input('matTreeNodePaddingIndent') indent: number;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_treeNode: CdkTreeNode<T>,
 _tree: CdkTree<T>,
 _renderer: Renderer2,
 _element: ElementRef,
 @Optional() _dir: Directionality) {
 super(_treeNode, _tree, _renderer, _element, _dir);
 }
}

16 changes: 5 additions & 11 deletions
src/lib/tree/toggle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
 * Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
 },
 providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
 @Input('matTreeNodeToggleRecursive') recursive: boolean = false;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
 super(_tree, _treeNode);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: ensure components work with ES2015 in jit mode by devversion · Pull Request #12759 · angular/components · GitHub
Skip to content
fix: ensure components work with ES2015 in jit mode#12759

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

 Merged

jelbourn
merged 1 commit into

from

Aug 21, 2018
 Merged


fix: ensure components work with ES2015 in jit mode
#12759
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
src/lib/expansion/expansion-panel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
 '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
 }
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
 implements AfterContentInit, OnChanges, OnDestroy {
 /** Whether the toggle indicator should be hidden. */
 @Input()
Expand Down

4 changes: 3 additions & 1 deletion
src/lib/input/autosize.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
 * Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
 '(input)': '_noopInputHandler()',
 },
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
 @Input()
 get matAutosizeMinRows(): number { return this.minRows; }
 set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down

11 changes: 5 additions & 6 deletions
src/lib/stepper/step-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
 selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}
export class MatStepLabel extends _CdkStepLabel {}

8 changes: 6 additions & 2 deletions
src/lib/stepper/stepper-button.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
 selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}

4 changes: 3 additions & 1 deletion
src/lib/stepper/stepper.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
 moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
 selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
 /** The list of step headers of the steps in the stepper. */
 @ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/cell.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
 CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
 * Cell definition for the mat-table.
 * Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
 selector: '[matCellDef]',
 providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
 * Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
 selector: '[matHeaderCellDef]',
 providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
 * Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
 selector: '[matFooterCellDef]',
 providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
 * Column definition for the mat-table.
Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/row.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
 CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
 * Header row definition for the mat-table.
 * Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
 providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
 inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
 * Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
 providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
 inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
 * Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
 providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
 inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down

30 changes: 5 additions & 25 deletions
src/lib/table/table.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 Attribute,
 ChangeDetectionStrategy,
 ChangeDetectorRef,
 Component,
 ElementRef,
 IterableDiffers,
 Optional,
 ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
 * Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
 encapsulation: ViewEncapsulation.None,
 changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
 /** Overrides the sticky CSS class set by the `CdkTable`. */
 protected stickyCssClass = 'mat-table-sticky';

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(protected _differs: IterableDiffers,
 protected _changeDetectorRef: ChangeDetectorRef,
 protected _elementRef: ElementRef,
 @Attribute('role') role: string,
 @Optional() protected readonly _dir: Directionality) {
 super(_differs, _changeDetectorRef, _elementRef, role, _dir);
 }
}

11 changes: 5 additions & 6 deletions
src/lib/tabs/tab-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
 selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
 constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
 super(templateRef, viewContainerRef);
 }
}
export class MatTabLabel extends _CdkPortal {}

21 changes: 4 additions & 17 deletions
src/lib/tree/node.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 CdkNestedTreeNode,
 CdkTree,
 CdkTreeNode,
 CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
 AfterContentInit,
 Attribute,
Expand All@@ -22,11 +17,12 @@ import {
 IterableDiffers,
 OnDestroy,
 QueryList,
 TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
 ],
 providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
 @Input('matTreeNode') data: T;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}

/**
Expand Down

22 changes: 5 additions & 17 deletions
src/lib/tree/padding.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
 * 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
 * Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
 selector: '[matTreeNodePadding]',
 providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

 /** The level of depth of the tree node. The padding will be `level * indent` pixels. */
 @Input('matTreeNodePadding') level: number;

 /** The indent for each level. Default number 40px from material design menu sub-menu spec. */
 @Input('matTreeNodePaddingIndent') indent: number;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_treeNode: CdkTreeNode<T>,
 _tree: CdkTree<T>,
 _renderer: Renderer2,
 _element: ElementRef,
 @Optional() _dir: Directionality) {
 super(_treeNode, _tree, _renderer, _element, _dir);
 }
}

16 changes: 5 additions & 11 deletions
src/lib/tree/toggle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
 * Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
 },
 providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
 @Input('matTreeNodeToggleRecursive') recursive: boolean = false;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
 super(_tree, _treeNode);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: ensure components work with ES2015 in jit mode by devversion · Pull Request #12759 · angular/components · GitHub
Skip to content
fix: ensure components work with ES2015 in jit mode#12759

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

 Merged

jelbourn
merged 1 commit into

from

Aug 21, 2018
 Merged


fix: ensure components work with ES2015 in jit mode
#12759
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
src/lib/expansion/expansion-panel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
 '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
 }
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
 implements AfterContentInit, OnChanges, OnDestroy {
 /** Whether the toggle indicator should be hidden. */
 @Input()
Expand Down

4 changes: 3 additions & 1 deletion
src/lib/input/autosize.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
 * Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
 '(input)': '_noopInputHandler()',
 },
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
 @Input()
 get matAutosizeMinRows(): number { return this.minRows; }
 set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down

11 changes: 5 additions & 6 deletions
src/lib/stepper/step-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
 selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}
export class MatStepLabel extends _CdkStepLabel {}

8 changes: 6 additions & 2 deletions
src/lib/stepper/stepper-button.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
 selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}

4 changes: 3 additions & 1 deletion
src/lib/stepper/stepper.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
 moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
 selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
 /** The list of step headers of the steps in the stepper. */
 @ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/cell.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
 CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
 * Cell definition for the mat-table.
 * Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
 selector: '[matCellDef]',
 providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
 * Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
 selector: '[matHeaderCellDef]',
 providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
 * Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
 selector: '[matFooterCellDef]',
 providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
 * Column definition for the mat-table.
Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/row.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
 CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
 * Header row definition for the mat-table.
 * Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
 providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
 inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
 * Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
 providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
 inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
 * Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
 providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
 inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down

30 changes: 5 additions & 25 deletions
src/lib/table/table.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 Attribute,
 ChangeDetectionStrategy,
 ChangeDetectorRef,
 Component,
 ElementRef,
 IterableDiffers,
 Optional,
 ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
 * Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
 encapsulation: ViewEncapsulation.None,
 changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
 /** Overrides the sticky CSS class set by the `CdkTable`. */
 protected stickyCssClass = 'mat-table-sticky';

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(protected _differs: IterableDiffers,
 protected _changeDetectorRef: ChangeDetectorRef,
 protected _elementRef: ElementRef,
 @Attribute('role') role: string,
 @Optional() protected readonly _dir: Directionality) {
 super(_differs, _changeDetectorRef, _elementRef, role, _dir);
 }
}

11 changes: 5 additions & 6 deletions
src/lib/tabs/tab-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
 selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
 constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
 super(templateRef, viewContainerRef);
 }
}
export class MatTabLabel extends _CdkPortal {}

21 changes: 4 additions & 17 deletions
src/lib/tree/node.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 CdkNestedTreeNode,
 CdkTree,
 CdkTreeNode,
 CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
 AfterContentInit,
 Attribute,
Expand All@@ -22,11 +17,12 @@ import {
 IterableDiffers,
 OnDestroy,
 QueryList,
 TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
 ],
 providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
 @Input('matTreeNode') data: T;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}

/**
Expand Down

22 changes: 5 additions & 17 deletions
src/lib/tree/padding.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
 * 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
 * Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
 selector: '[matTreeNodePadding]',
 providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

 /** The level of depth of the tree node. The padding will be `level * indent` pixels. */
 @Input('matTreeNodePadding') level: number;

 /** The indent for each level. Default number 40px from material design menu sub-menu spec. */
 @Input('matTreeNodePaddingIndent') indent: number;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_treeNode: CdkTreeNode<T>,
 _tree: CdkTree<T>,
 _renderer: Renderer2,
 _element: ElementRef,
 @Optional() _dir: Directionality) {
 super(_treeNode, _tree, _renderer, _element, _dir);
 }
}

16 changes: 5 additions & 11 deletions
src/lib/tree/toggle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
 * Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
 },
 providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
 @Input('matTreeNodeToggleRecursive') recursive: boolean = false;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
 super(_tree, _treeNode);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: ensure components work with ES2015 in jit mode by devversion · Pull Request #12759 · angular/components · GitHub
Skip to content
fix: ensure components work with ES2015 in jit mode#12759

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

 Merged

jelbourn
merged 1 commit into

from

Aug 21, 2018
 Merged


fix: ensure components work with ES2015 in jit mode
#12759
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
src/lib/expansion/expansion-panel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
 '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
 }
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
 implements AfterContentInit, OnChanges, OnDestroy {
 /** Whether the toggle indicator should be hidden. */
 @Input()
Expand Down

4 changes: 3 additions & 1 deletion
src/lib/input/autosize.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
 * Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
 '(input)': '_noopInputHandler()',
 },
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
 @Input()
 get matAutosizeMinRows(): number { return this.minRows; }
 set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down

11 changes: 5 additions & 6 deletions
src/lib/stepper/step-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
 selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}
export class MatStepLabel extends _CdkStepLabel {}

8 changes: 6 additions & 2 deletions
src/lib/stepper/stepper-button.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
 selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}

4 changes: 3 additions & 1 deletion
src/lib/stepper/stepper.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
 moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
 selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
 /** The list of step headers of the steps in the stepper. */
 @ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/cell.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
 CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
 * Cell definition for the mat-table.
 * Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
 selector: '[matCellDef]',
 providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
 * Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
 selector: '[matHeaderCellDef]',
 providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
 * Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
 selector: '[matFooterCellDef]',
 providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
 * Column definition for the mat-table.
Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/row.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
 CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
 * Header row definition for the mat-table.
 * Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
 providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
 inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
 * Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
 providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
 inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
 * Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
 providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
 inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down

30 changes: 5 additions & 25 deletions
src/lib/table/table.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 Attribute,
 ChangeDetectionStrategy,
 ChangeDetectorRef,
 Component,
 ElementRef,
 IterableDiffers,
 Optional,
 ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
 * Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
 encapsulation: ViewEncapsulation.None,
 changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
 /** Overrides the sticky CSS class set by the `CdkTable`. */
 protected stickyCssClass = 'mat-table-sticky';

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(protected _differs: IterableDiffers,
 protected _changeDetectorRef: ChangeDetectorRef,
 protected _elementRef: ElementRef,
 @Attribute('role') role: string,
 @Optional() protected readonly _dir: Directionality) {
 super(_differs, _changeDetectorRef, _elementRef, role, _dir);
 }
}

11 changes: 5 additions & 6 deletions
src/lib/tabs/tab-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
 selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
 constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
 super(templateRef, viewContainerRef);
 }
}
export class MatTabLabel extends _CdkPortal {}

21 changes: 4 additions & 17 deletions
src/lib/tree/node.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 CdkNestedTreeNode,
 CdkTree,
 CdkTreeNode,
 CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
 AfterContentInit,
 Attribute,
Expand All@@ -22,11 +17,12 @@ import {
 IterableDiffers,
 OnDestroy,
 QueryList,
 TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
 ],
 providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
 @Input('matTreeNode') data: T;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}

/**
Expand Down

22 changes: 5 additions & 17 deletions
src/lib/tree/padding.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
 * 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
 * Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
 selector: '[matTreeNodePadding]',
 providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

 /** The level of depth of the tree node. The padding will be `level * indent` pixels. */
 @Input('matTreeNodePadding') level: number;

 /** The indent for each level. Default number 40px from material design menu sub-menu spec. */
 @Input('matTreeNodePaddingIndent') indent: number;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_treeNode: CdkTreeNode<T>,
 _tree: CdkTree<T>,
 _renderer: Renderer2,
 _element: ElementRef,
 @Optional() _dir: Directionality) {
 super(_treeNode, _tree, _renderer, _element, _dir);
 }
}

16 changes: 5 additions & 11 deletions
src/lib/tree/toggle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
 * Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
 },
 providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
 @Input('matTreeNodeToggleRecursive') recursive: boolean = false;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
 super(_tree, _treeNode);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: ensure components work with ES2015 in jit mode by devversion · Pull Request #12759 · angular/components · GitHub
Skip to content
fix: ensure components work with ES2015 in jit mode#12759

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

 Merged

jelbourn
merged 1 commit into

from

Aug 21, 2018
 Merged


fix: ensure components work with ES2015 in jit mode
#12759
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
src/lib/expansion/expansion-panel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
 '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
 }
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
 implements AfterContentInit, OnChanges, OnDestroy {
 /** Whether the toggle indicator should be hidden. */
 @Input()
Expand Down

4 changes: 3 additions & 1 deletion
src/lib/input/autosize.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
 * Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
 '(input)': '_noopInputHandler()',
 },
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
 @Input()
 get matAutosizeMinRows(): number { return this.minRows; }
 set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down

11 changes: 5 additions & 6 deletions
src/lib/stepper/step-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
 selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}
export class MatStepLabel extends _CdkStepLabel {}

8 changes: 6 additions & 2 deletions
src/lib/stepper/stepper-button.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
 selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}

4 changes: 3 additions & 1 deletion
src/lib/stepper/stepper.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
 moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
 selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
 /** The list of step headers of the steps in the stepper. */
 @ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/cell.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
 CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
 * Cell definition for the mat-table.
 * Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
 selector: '[matCellDef]',
 providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
 * Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
 selector: '[matHeaderCellDef]',
 providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
 * Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
 selector: '[matFooterCellDef]',
 providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
 * Column definition for the mat-table.
Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/row.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
 CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
 * Header row definition for the mat-table.
 * Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
 providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
 inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
 * Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
 providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
 inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
 * Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
 providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
 inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down

30 changes: 5 additions & 25 deletions
src/lib/table/table.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 Attribute,
 ChangeDetectionStrategy,
 ChangeDetectorRef,
 Component,
 ElementRef,
 IterableDiffers,
 Optional,
 ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
 * Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
 encapsulation: ViewEncapsulation.None,
 changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
 /** Overrides the sticky CSS class set by the `CdkTable`. */
 protected stickyCssClass = 'mat-table-sticky';

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(protected _differs: IterableDiffers,
 protected _changeDetectorRef: ChangeDetectorRef,
 protected _elementRef: ElementRef,
 @Attribute('role') role: string,
 @Optional() protected readonly _dir: Directionality) {
 super(_differs, _changeDetectorRef, _elementRef, role, _dir);
 }
}

11 changes: 5 additions & 6 deletions
src/lib/tabs/tab-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
 selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
 constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
 super(templateRef, viewContainerRef);
 }
}
export class MatTabLabel extends _CdkPortal {}

21 changes: 4 additions & 17 deletions
src/lib/tree/node.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 CdkNestedTreeNode,
 CdkTree,
 CdkTreeNode,
 CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
 AfterContentInit,
 Attribute,
Expand All@@ -22,11 +17,12 @@ import {
 IterableDiffers,
 OnDestroy,
 QueryList,
 TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
 ],
 providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
 @Input('matTreeNode') data: T;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}

/**
Expand Down

22 changes: 5 additions & 17 deletions
src/lib/tree/padding.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
 * 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
 * Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
 selector: '[matTreeNodePadding]',
 providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

 /** The level of depth of the tree node. The padding will be `level * indent` pixels. */
 @Input('matTreeNodePadding') level: number;

 /** The indent for each level. Default number 40px from material design menu sub-menu spec. */
 @Input('matTreeNodePaddingIndent') indent: number;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_treeNode: CdkTreeNode<T>,
 _tree: CdkTree<T>,
 _renderer: Renderer2,
 _element: ElementRef,
 @Optional() _dir: Directionality) {
 super(_treeNode, _tree, _renderer, _element, _dir);
 }
}

16 changes: 5 additions & 11 deletions
src/lib/tree/toggle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
 * Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
 },
 providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
 @Input('matTreeNodeToggleRecursive') recursive: boolean = false;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
 super(_tree, _treeNode);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: ensure components work with ES2015 in jit mode by devversion · Pull Request #12759 · angular/components · GitHub
Skip to content
fix: ensure components work with ES2015 in jit mode#12759

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

 Merged

jelbourn
merged 1 commit into

from

Aug 21, 2018
 Merged


fix: ensure components work with ES2015 in jit mode
#12759
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
src/lib/expansion/expansion-panel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
 '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
 }
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
 implements AfterContentInit, OnChanges, OnDestroy {
 /** Whether the toggle indicator should be hidden. */
 @Input()
Expand Down

4 changes: 3 additions & 1 deletion
src/lib/input/autosize.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
 * Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
 '(input)': '_noopInputHandler()',
 },
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
 @Input()
 get matAutosizeMinRows(): number { return this.minRows; }
 set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down

11 changes: 5 additions & 6 deletions
src/lib/stepper/step-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
 selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}
export class MatStepLabel extends _CdkStepLabel {}

8 changes: 6 additions & 2 deletions
src/lib/stepper/stepper-button.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
 selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}

4 changes: 3 additions & 1 deletion
src/lib/stepper/stepper.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
 moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
 selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
 /** The list of step headers of the steps in the stepper. */
 @ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/cell.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
 CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
 * Cell definition for the mat-table.
 * Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
 selector: '[matCellDef]',
 providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
 * Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
 selector: '[matHeaderCellDef]',
 providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
 * Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
 selector: '[matFooterCellDef]',
 providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
 * Column definition for the mat-table.
Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/row.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
 CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
 * Header row definition for the mat-table.
 * Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
 providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
 inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
 * Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
 providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
 inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
 * Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
 providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
 inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down

30 changes: 5 additions & 25 deletions
src/lib/table/table.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 Attribute,
 ChangeDetectionStrategy,
 ChangeDetectorRef,
 Component,
 ElementRef,
 IterableDiffers,
 Optional,
 ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
 * Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
 encapsulation: ViewEncapsulation.None,
 changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
 /** Overrides the sticky CSS class set by the `CdkTable`. */
 protected stickyCssClass = 'mat-table-sticky';

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(protected _differs: IterableDiffers,
 protected _changeDetectorRef: ChangeDetectorRef,
 protected _elementRef: ElementRef,
 @Attribute('role') role: string,
 @Optional() protected readonly _dir: Directionality) {
 super(_differs, _changeDetectorRef, _elementRef, role, _dir);
 }
}

11 changes: 5 additions & 6 deletions
src/lib/tabs/tab-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
 selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
 constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
 super(templateRef, viewContainerRef);
 }
}
export class MatTabLabel extends _CdkPortal {}

21 changes: 4 additions & 17 deletions
src/lib/tree/node.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 CdkNestedTreeNode,
 CdkTree,
 CdkTreeNode,
 CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
 AfterContentInit,
 Attribute,
Expand All@@ -22,11 +17,12 @@ import {
 IterableDiffers,
 OnDestroy,
 QueryList,
 TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
 ],
 providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
 @Input('matTreeNode') data: T;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}

/**
Expand Down

22 changes: 5 additions & 17 deletions
src/lib/tree/padding.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
 * 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
 * Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
 selector: '[matTreeNodePadding]',
 providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

 /** The level of depth of the tree node. The padding will be `level * indent` pixels. */
 @Input('matTreeNodePadding') level: number;

 /** The indent for each level. Default number 40px from material design menu sub-menu spec. */
 @Input('matTreeNodePaddingIndent') indent: number;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_treeNode: CdkTreeNode<T>,
 _tree: CdkTree<T>,
 _renderer: Renderer2,
 _element: ElementRef,
 @Optional() _dir: Directionality) {
 super(_treeNode, _tree, _renderer, _element, _dir);
 }
}

16 changes: 5 additions & 11 deletions
src/lib/tree/toggle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
 * Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
 },
 providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
 @Input('matTreeNodeToggleRecursive') recursive: boolean = false;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
 super(_tree, _treeNode);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix: ensure components work with ES2015 in jit mode by devversion · Pull Request #12759 · angular/components · GitHub
Skip to content
fix: ensure components work with ES2015 in jit mode#12759

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

 Merged

jelbourn
merged 1 commit into

from

Aug 21, 2018
 Merged


fix: ensure components work with ES2015 in jit mode
#12759
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
src/lib/expansion/expansion-panel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ import {MatAccordion} from './accordion';
import {matExpansionAnimations} from './expansion-animations';
import {MatExpansionPanelContent} from './expansion-panel-content';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkAccordionItem = CdkAccordionItem;

/** MatExpansionPanel's states. */
export type MatExpansionPanelState = 'expanded' | 'collapsed';
Expand DownExpand Up@@ -70,7 +72,7 @@ let uniqueId = 0;
 '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
 }
})
export class MatExpansionPanel extends CdkAccordionItem
export class MatExpansionPanel extends _CdkAccordionItem
 implements AfterContentInit, OnChanges, OnDestroy {
 /** Whether the toggle indicator should be hidden. */
 @Input()
Expand Down

4 changes: 3 additions & 1 deletion
src/lib/input/autosize.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {Directive, Input} from '@angular/core';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkTextareaAutosize = CdkTextareaAutosize;

/**
 * Directive to automatically resize a textarea to fit its content.
Expand All@@ -27,7 +29,7 @@ import {Directive, Input} from '@angular/core';
 '(input)': '_noopInputHandler()',
 },
})
export class MatTextareaAutosize extends CdkTextareaAutosize {
export class MatTextareaAutosize extends _CdkTextareaAutosize {
 @Input()
 get matAutosizeMinRows(): number { return this.minRows; }
 set matAutosizeMinRows(value: number) { this.minRows = value; }
Expand Down

11 changes: 5 additions & 6 deletions
src/lib/stepper/step-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkStepLabel} from '@angular/cdk/stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepLabel = CdkStepLabel;

@Directive({
 selector: '[matStepLabel]',
})
export class MatStepLabel extends CdkStepLabel {
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}
export class MatStepLabel extends _CdkStepLabel {}

8 changes: 6 additions & 2 deletions
src/lib/stepper/stepper-button.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ import {Directive} from '@angular/core';
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
import {MatStepper} from './stepper';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepperNext = CdkStepperNext;
export const _CdkStepperPrevious = CdkStepperPrevious;

/** Button that moves to the next step in a stepper workflow. */
@Directive({
 selector: 'button[matStepperNext]',
Expand All@@ -20,7 +24,7 @@ import {MatStepper} from './stepper';
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperNext extends CdkStepperNext {}
export class MatStepperNext extends _CdkStepperNext {}

/** Button that moves to the previous step in a stepper workflow. */
@Directive({
Expand All@@ -32,4 +36,4 @@ export class MatStepperNext extends CdkStepperNext {}
 inputs: ['type'],
 providers: [{provide: CdkStepper, useExisting: MatStepper}]
})
export class MatStepperPrevious extends CdkStepperPrevious {}
export class MatStepperPrevious extends _CdkStepperPrevious {}

4 changes: 3 additions & 1 deletion
src/lib/stepper/stepper.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ import {takeUntil} from 'rxjs/operators';
import {matStepperAnimations} from './stepper-animations';
import {MatStepperIcon, MatStepperIconContext} from './stepper-icon';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkStepper = CdkStepper;

@Component({
 moduleId: module.id,
Expand DownExpand Up@@ -72,7 +74,7 @@ export class MatStep extends CdkStep implements ErrorStateMatcher {
@Directive({
 selector: '[matStepper]'
})
export class MatStepper extends CdkStepper implements AfterContentInit {
export class MatStepper extends _CdkStepper implements AfterContentInit {
 /** The list of step headers of the steps in the stepper. */
 @ViewChildren(MatStepHeader) _stepHeader: QueryList<MatStepHeader>;

Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/cell.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ import {
 CdkHeaderCellDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkCellDef = CdkCellDef;
export const _CdkHeaderCellDef = CdkHeaderCellDef;
export const _CdkFooterCellDef = CdkFooterCellDef;

/**
 * Cell definition for the mat-table.
 * Captures the template of a column's data row cell as well as cell-specific properties.
Expand All@@ -23,7 +28,7 @@ import {
 selector: '[matCellDef]',
 providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
})
export class MatCellDef extends CdkCellDef {}
export class MatCellDef extends _CdkCellDef {}

/**
 * Header cell definition for the mat-table.
Expand All@@ -33,7 +38,7 @@ export class MatCellDef extends CdkCellDef {}
 selector: '[matHeaderCellDef]',
 providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
})
export class MatHeaderCellDef extends CdkHeaderCellDef {}
export class MatHeaderCellDef extends _CdkHeaderCellDef {}

/**
 * Footer cell definition for the mat-table.
Expand All@@ -43,7 +48,7 @@ export class MatHeaderCellDef extends CdkHeaderCellDef {}
 selector: '[matFooterCellDef]',
 providers: [{provide: CdkFooterCellDef, useExisting: MatFooterCellDef}]
})
export class MatFooterCellDef extends CdkFooterCellDef {}
export class MatFooterCellDef extends _CdkFooterCellDef {}

/**
 * Column definition for the mat-table.
Expand Down

11 changes: 8 additions & 3 deletions
src/lib/table/row.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@ import {
 CdkRowDef,
} from '@angular/cdk/table';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkHeaderRowDef = CdkHeaderRowDef;
export const _CdkFooterRowDef = CdkFooterRowDef;
export const _CdkRowDef = CdkRowDef;

/**
 * Header row definition for the mat-table.
 * Captures the header row's template and other header properties such as the columns to display.
Expand All@@ -29,7 +34,7 @@ import {
 providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
 inputs: ['columns: matHeaderRowDef', 'sticky: matHeaderRowDefSticky'],
})
export class MatHeaderRowDef extends CdkHeaderRowDef {}
export class MatHeaderRowDef extends _CdkHeaderRowDef {}

/**
 * Footer row definition for the mat-table.
Expand All@@ -40,7 +45,7 @@ export class MatHeaderRowDef extends CdkHeaderRowDef {}
 providers: [{provide: CdkFooterRowDef, useExisting: MatFooterRowDef}],
 inputs: ['columns: matFooterRowDef', 'sticky: matFooterRowDefSticky'],
})
export class MatFooterRowDef extends CdkFooterRowDef {}
export class MatFooterRowDef extends _CdkFooterRowDef {}

/**
 * Data row definition for the mat-table.
Expand All@@ -52,7 +57,7 @@ export class MatFooterRowDef extends CdkFooterRowDef {}
 providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
 inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
})
export class MatRowDef<T> extends CdkRowDef<T> {}
export class MatRowDef<T> extends _CdkRowDef<T> {}

/** Footer template container that contains the cell outlet. Adds the right class and role. */
@Component({
Expand Down

30 changes: 5 additions & 25 deletions
src/lib/table/table.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 Attribute,
 ChangeDetectionStrategy,
 ChangeDetectorRef,
 Component,
 ElementRef,
 IterableDiffers,
 Optional,
 ViewEncapsulation
} from '@angular/core';
import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
import {Directionality} from '@angular/cdk/bidi';
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTable = CdkTable;

/**
 * Wrapper for the CdkTable with Material design styles.
Expand All@@ -34,20 +27,7 @@ import {Directionality} from '@angular/cdk/bidi';
 encapsulation: ViewEncapsulation.None,
 changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MatTable<T> extends CdkTable<T> {
export class MatTable<T> extends _CdkTable<T> {
 /** Overrides the sticky CSS class set by the `CdkTable`. */
 protected stickyCssClass = 'mat-table-sticky';

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(protected _differs: IterableDiffers,
 protected _changeDetectorRef: ChangeDetectorRef,
 protected _elementRef: ElementRef,
 @Attribute('role') role: string,
 @Optional() protected readonly _dir: Directionality) {
 super(_differs, _changeDetectorRef, _elementRef, role, _dir);
 }
}

11 changes: 5 additions & 6 deletions
src/lib/tabs/tab-label.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,15 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
import {Directive} from '@angular/core';
import {CdkPortal} from '@angular/cdk/portal';

// TODO(devversion): Workaround for https://github.com/angular/material2/issues/12760
export const _CdkPortal = CdkPortal;

/** Used to flag tab labels for use with the portal directive */
@Directive({
 selector: '[mat-tab-label], [matTabLabel]',
})
export class MatTabLabel extends CdkPortal {
 constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
 super(templateRef, viewContainerRef);
 }
}
export class MatTabLabel extends _CdkPortal {}

21 changes: 4 additions & 17 deletions
src/lib/tree/node.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {
 CdkNestedTreeNode,
 CdkTree,
 CdkTreeNode,
 CdkTreeNodeDef,
} from '@angular/cdk/tree';
import {CdkNestedTreeNode, CdkTree, CdkTreeNode, CdkTreeNodeDef} from '@angular/cdk/tree';
import {
 AfterContentInit,
 Attribute,
Expand All@@ -22,11 +17,12 @@ import {
 IterableDiffers,
 OnDestroy,
 QueryList,
 TemplateRef,
} from '@angular/core';
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
import {MatTreeNodeOutlet} from './outlet';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeDef = CdkTreeNodeDef;

export const _MatTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkTreeNode));
export const _MatNestedTreeNodeMixinBase = mixinTabIndex(mixinDisabled(CdkNestedTreeNode));
Expand DownExpand Up@@ -69,17 +65,8 @@ export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
 ],
 providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}]
})
export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
export class MatTreeNodeDef<T> extends _CdkTreeNodeDef<T> {
 @Input('matTreeNode') data: T;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(template: TemplateRef<any>) {
 super(template);
 }
}

/**
Expand Down

22 changes: 5 additions & 17 deletions
src/lib/tree/padding.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@
 * 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 {CdkTreeNodePadding, CdkTreeNode, CdkTree} from '@angular/cdk/tree';
import {Directionality} from '@angular/cdk/bidi';
import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
import {CdkTreeNodePadding} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodePadding = CdkTreeNodePadding;

/**
 * Wrapper for the CdkTree padding with Material design styles.
Expand All@@ -17,24 +18,11 @@ import {Directive, Input, Optional, Renderer2, ElementRef} from '@angular/core';
 selector: '[matTreeNodePadding]',
 providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}]
})
export class MatTreeNodePadding<T> extends CdkTreeNodePadding<T> {
export class MatTreeNodePadding<T> extends _CdkTreeNodePadding<T> {

 /** The level of depth of the tree node. The padding will be `level * indent` pixels. */
 @Input('matTreeNodePadding') level: number;

 /** The indent for each level. Default number 40px from material design menu sub-menu spec. */
 @Input('matTreeNodePaddingIndent') indent: number;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_treeNode: CdkTreeNode<T>,
 _tree: CdkTree<T>,
 _renderer: Renderer2,
 _element: ElementRef,
 @Optional() _dir: Directionality) {
 super(_treeNode, _tree, _renderer, _element, _dir);
 }
}

16 changes: 5 additions & 11 deletions
src/lib/tree/toggle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,11 @@
 * found in the LICENSE file at https://angular.io/license
 */

import {CdkTreeNodeToggle} from '@angular/cdk/tree';
import {Directive, Input} from '@angular/core';
import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';

// TODO(devversion): workaround for https://github.com/angular/material2/issues/12760
export const _CdkTreeNodeToggle = CdkTreeNodeToggle;

/**
 * Wrapper for the CdkTree's toggle with Material design styles.
Expand All@@ -19,15 +22,6 @@ import {CdkTreeNodeToggle, CdkTree, CdkTreeNode} from '@angular/cdk/tree';
 },
 providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}]
})
export class MatTreeNodeToggle<T> extends CdkTreeNodeToggle<T> {
export class MatTreeNodeToggle<T> extends _CdkTreeNodeToggle<T> {
 @Input('matTreeNodeToggleRecursive') recursive: boolean = false;

 // TODO(andrewseguin): Remove this explicitly set constructor when the compiler knows how to
 // properly build the es6 version of the class. Currently sets ctorParameters to empty due to a
 // fixed bug.
 // https://github.com/angular/tsickle/pull/760 - tsickle PR that fixed this
 // https://github.com/angular/angular/pull/23531 - updates compiler-cli to fixed version
 constructor(_tree: CdkTree<T>, _treeNode: CdkTreeNode<T>) {
 super(_tree, _treeNode);
 }
}
Loading