Skip to content

perf(int-bar): Convert MatInkBarFoundation adapter to class object #19986

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
andrewseguin merged 3 commits into from
Jul 20, 2020
Merged

perf(int-bar): Convert MatInkBarFoundation adapter to class object #19986

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3abfdbe
perf(int-bar): Convert MatInkBarFoundation adapter to class object
ngwattcos Jul 14, 2020
551b1cc
refactor(ink-bar): expose some fields and make public; remove getter …
ngwattcos Jul 17, 2020
2dbbe78
fix(ink-bar): fix build/typing issues in reassigning fields due to re…
ngwattcos Jul 17, 2020
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
61 changes: 34 additions & 27 deletions src/material-experimental/mdc-tabs/ink-bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,30 @@ import {
MDCTabIndicatorFoundation
} from '@material/tab-indicator';

class TabIndicatorAdapter implements MDCTabIndicatorAdapter {
constructor(private readonly _delegate: MatInkBarFoundation) {}

@kseamon kseamon Jul 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As with other PRs, put newlines between methods

addClass(className: string) {
if (!this._delegate._destroyed) {
this._delegate._hostElement.classList.add(className);
}
}
removeClass(className: string) {
if (!this._delegate._destroyed) {
this._delegate._hostElement.classList.remove(className);
}
}
setContentStyleProperty(propName: string, value: string | null) {
this._delegate._inkBarContentElement.style.setProperty(propName, value);
}
computeContentClientRect() {
// `getBoundingClientRect` isn't available on the server.
return this._delegate._destroyed ||
!this._delegate._inkBarContentElement.getBoundingClientRect ? {
width: 0, height: 0, top: 0, left: 0, right: 0, bottom: 0
} : this._delegate._inkBarContentElement.getBoundingClientRect();
}
}

/**
* Item inside a tab header relative to which the ink bar can be aligned.
* @docs-private
Expand Down Expand Up @@ -62,34 +86,15 @@ export class MatInkBar {
* @docs-private
*/
export class MatInkBarFoundation {
private _destroyed: boolean;
readonly _destroyed: boolean;
private _foundation: MDCTabIndicatorFoundation;
private _inkBarElement: HTMLElement;
private _inkBarContentElement: HTMLElement;
readonly _inkBarContentElement: HTMLElement;
private _fitToContent = false;
private _adapter: MDCTabIndicatorAdapter = {
addClass: className => {
if (!this._destroyed) {
this._hostElement.classList.add(className);
}
},
removeClass: className => {
if (!this._destroyed) {
this._hostElement.classList.remove(className);
}
},
setContentStyleProperty: (propName, value) => {
this._inkBarContentElement.style.setProperty(propName, value);
},
computeContentClientRect: () => {
// `getBoundingClientRect` isn't available on the server.
return this._destroyed || !this._inkBarContentElement.getBoundingClientRect ? {
width: 0, height: 0, top: 0, left: 0, right: 0, bottom: 0
} : this._inkBarContentElement.getBoundingClientRect();
}
};
private _adapter: MDCTabIndicatorAdapter;

constructor(private _hostElement: HTMLElement, private _document: Document) {
constructor(readonly _hostElement: HTMLElement, private _document: Document) {
this._adapter = new TabIndicatorAdapter(this);
Comment thread
ngwattcos marked this conversation as resolved.
this._foundation = new MDCSlidingTabIndicatorFoundation(this._adapter);
}

Expand Down Expand Up @@ -120,9 +125,10 @@ export class MatInkBarFoundation {
this._inkBarElement.parentNode.removeChild(this._inkBarElement);
}

this._hostElement = this._inkBarElement = this._inkBarContentElement = null!;
(this as {_hostElement: HTMLElement})._hostElement = this._inkBarElement
= (this as {_inkBarContentElement: HTMLElement})._inkBarContentElement = null!;
this._foundation.destroy();
this._destroyed = true;
(this as {_destroyed: boolean})._destroyed = true;
}

/**
Expand All @@ -148,7 +154,8 @@ export class MatInkBarFoundation {
/** Creates and appends the ink bar element. */
private _createInkBarElement() {
this._inkBarElement = this._document.createElement('span');
this._inkBarContentElement = this._document.createElement('span');
(this as {_inkBarContentElement: HTMLElement})._inkBarContentElement
= this._document.createElement('span');

this._inkBarElement.className = 'mdc-tab-indicator';
this._inkBarContentElement.className = 'mdc-tab-indicator__content' +
Expand Down