Merge pull request #2222 from marxjohnson/MOBILE-3191_integration

jleyva · web-flow · commit dc5f8130ff34 · 2019-12-18T16:38:27.000+01:00
MOBILE-3191 UX: Fix condition for keeping tabs visible on short pages
diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
@@ -443,7 +443,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
             this.calculateSlides();
         }
 
-        if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + this.tabBarHeight) {
+        if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + (this.tabBarHeight - scroll)) {
             // Smooth translation.
             this.topTabsElement.style.transform = 'translateY(-' + scroll + 'px)';
             this.originalTabsContainer.style.transform = 'translateY(-' + scroll + 'px)';

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe`
`443`	`443`	`this.calculateSlides();`
`444`	`444`	`}`
`445`	`445`
`446`		`- if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + this.tabBarHeight) {`
	`446`	`+ if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + (this.tabBarHeight - scroll)) {`
`447`	`447`	`// Smooth translation.`
`448`	`448`	`this.topTabsElement.style.transform = 'translateY(-' + scroll + 'px)';`
`449`	`449`	`this.originalTabsContainer.style.transform = 'translateY(-' + scroll + 'px)';`