Skip to content

fix(material/tabs): pagination sometimes incorrectly shown after zoom #23759

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
merged 1 commit into from
Nov 15, 2021
Merged

fix(material/tabs): pagination sometimes incorrectly shown after zoom #23759

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
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-tabs/tab-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
class="mat-mdc-tab-list"
role="tablist"
(cdkObserveContent)="_onContentChanges()">
<div class="mat-mdc-tab-labels">
<div class="mat-mdc-tab-labels" #tabListInner>
<ng-content></ng-content>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/material-experimental/mdc-tabs/tab-header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export class MatTabHeader extends _MatTabHeaderBase implements AfterContentInit
@ContentChildren(MatTabLabelWrapper, {descendants: false}) _items: QueryList<MatTabLabelWrapper>;
@ViewChild('tabListContainer', {static: true}) _tabListContainer: ElementRef;
@ViewChild('tabList', {static: true}) _tabList: ElementRef;
@ViewChild('tabListInner', {static: true}) _tabListInner: ElementRef;
@ViewChild('nextPaginator') _nextPaginator: ElementRef<HTMLElement>;
@ViewChild('previousPaginator') _previousPaginator: ElementRef<HTMLElement>;
_inkBar: MatInkBar;
Expand Down
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-tabs/tab-nav-bar/tab-nav-bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<div class="mat-mdc-tab-link-container" #tabListContainer (keydown)="_handleKeydown($event)">
<div class="mat-mdc-tab-list" #tabList (cdkObserveContent)="_onContentChanges()">
<div class="mat-mdc-tab-links">
<div class="mat-mdc-tab-links" #tabListInner>
<ng-content></ng-content>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/material-experimental/mdc-tabs/tab-nav-bar/tab-nav-bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export class MatTabNav extends _MatTabNavBase implements AfterContentInit {
@ContentChildren(forwardRef(() => MatTabLink), {descendants: true}) _items: QueryList<MatTabLink>;
@ViewChild('tabListContainer', {static: true}) _tabListContainer: ElementRef;
@ViewChild('tabList', {static: true}) _tabList: ElementRef;
@ViewChild('tabListInner', {static: true}) _tabListInner: ElementRef;
@ViewChild('nextPaginator') _nextPaginator: ElementRef<HTMLElement>;
@ViewChild('previousPaginator') _previousPaginator: ElementRef<HTMLElement>;
_inkBar: MatInkBar;
Expand Down
7 changes: 4 additions & 3 deletions src/material/tabs/paginated-tab-header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export abstract class MatPaginatedTabHeader
abstract _inkBar: {hide: () => void; alignToElement: (element: HTMLElement) => void};
abstract _tabListContainer: ElementRef<HTMLElement>;
abstract _tabList: ElementRef<HTMLElement>;
abstract _tabListInner: ElementRef<HTMLElement>;
abstract _nextPaginator: ElementRef<HTMLElement>;
abstract _previousPaginator: ElementRef<HTMLElement>;

Expand Down Expand Up @@ -452,7 +453,7 @@ export abstract class MatPaginatedTabHeader
labelBeforePos = offsetLeft;
labelAfterPos = labelBeforePos + offsetWidth;
} else {
labelAfterPos = this._tabList.nativeElement.offsetWidth - offsetLeft;
labelAfterPos = this._tabListInner.nativeElement.offsetWidth - offsetLeft;
labelBeforePos = labelAfterPos - offsetWidth;
}

Expand Down Expand Up @@ -481,7 +482,7 @@ export abstract class MatPaginatedTabHeader
this._showPaginationControls = false;
} else {
const isEnabled =
this._tabList.nativeElement.scrollWidth > this._elementRef.nativeElement.offsetWidth;
this._tabListInner.nativeElement.scrollWidth > this._elementRef.nativeElement.offsetWidth;

if (!isEnabled) {
this.scrollDistance = 0;
Expand Down Expand Up @@ -523,7 +524,7 @@ export abstract class MatPaginatedTabHeader
* should be called sparingly.
*/
_getMaxScrollDistance(): number {
const lengthOfTabList = this._tabList.nativeElement.scrollWidth;
const lengthOfTabList = this._tabListInner.nativeElement.scrollWidth;
const viewLength = this._tabListContainer.nativeElement.offsetWidth;
return lengthOfTabList - viewLength || 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/material/tabs/tab-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
[class._mat-animation-noopable]="_animationMode === 'NoopAnimations'"
role="tablist"
(cdkObserveContent)="_onContentChanges()">
<div class="mat-tab-labels">
<div class="mat-tab-labels" #tabListInner>
<ng-content></ng-content>
</div>
<mat-ink-bar></mat-ink-bar>
Expand Down
1 change: 1 addition & 0 deletions src/material/tabs/tab-header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export class MatTabHeader extends _MatTabHeaderBase {
@ViewChild(MatInkBar, {static: true}) _inkBar: MatInkBar;
@ViewChild('tabListContainer', {static: true}) _tabListContainer: ElementRef;
@ViewChild('tabList', {static: true}) _tabList: ElementRef;
@ViewChild('tabListInner', {static: true}) _tabListInner: ElementRef;
@ViewChild('nextPaginator') _nextPaginator: ElementRef<HTMLElement>;
@ViewChild('previousPaginator') _previousPaginator: ElementRef<HTMLElement>;

Expand Down
2 changes: 1 addition & 1 deletion src/material/tabs/tab-nav-bar/tab-nav-bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[class._mat-animation-noopable]="_animationMode === 'NoopAnimations'"
#tabList
(cdkObserveContent)="_onContentChanges()">
<div class="mat-tab-links">
<div class="mat-tab-links" #tabListInner>
<ng-content></ng-content>
</div>
<mat-ink-bar></mat-ink-bar>
Expand Down
1 change: 1 addition & 0 deletions src/material/tabs/tab-nav-bar/tab-nav-bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export class MatTabNav extends _MatTabNavBase {
@ViewChild(MatInkBar, {static: true}) _inkBar: MatInkBar;
@ViewChild('tabListContainer', {static: true}) _tabListContainer: ElementRef;
@ViewChild('tabList', {static: true}) _tabList: ElementRef;
@ViewChild('tabListInner', {static: true}) _tabListInner: ElementRef;
@ViewChild('nextPaginator') _nextPaginator: ElementRef<HTMLElement>;
@ViewChild('previousPaginator') _previousPaginator: ElementRef<HTMLElement>;

Expand Down
4 changes: 4 additions & 0 deletions tools/public_api_guard/material/tabs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ export class MatTabHeader extends _MatTabHeaderBase {
// (undocumented)
_tabListContainer: ElementRef;
// (undocumented)
_tabListInner: ElementRef;
// (undocumented)
static ɵcmp: i0.ɵɵComponentDeclaration<MatTabHeader, "mat-tab-header", never, { "selectedIndex": "selectedIndex"; }, { "selectFocusedIndex": "selectFocusedIndex"; "indexFocused": "indexFocused"; }, ["_items"], ["*"]>;
// (undocumented)
static ɵfac: i0.ɵɵFactoryDeclaration<MatTabHeader, [null, null, null, { optional: true; }, null, null, { optional: true; }]>;
Expand Down Expand Up @@ -406,6 +408,8 @@ export class MatTabNav extends _MatTabNavBase {
// (undocumented)
_tabListContainer: ElementRef;
// (undocumented)
_tabListInner: ElementRef;
// (undocumented)
static ɵcmp: i0.ɵɵComponentDeclaration<MatTabNav, "[mat-tab-nav-bar]", ["matTabNavBar", "matTabNav"], { "color": "color"; }, {}, ["_items"], ["*"]>;
// (undocumented)
static ɵfac: i0.ɵɵFactoryDeclaration<MatTabNav, [null, { optional: true; }, null, null, null, null, { optional: true; }]>;
Expand Down