chore(*): fix merge conflicts

viktorkombov · viktorkombov · commit 6fa998515e2a · 2022-01-04T09:13:00.000+02:00
diff --git a/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.ts b/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.ts
@@ -242,7 +242,7 @@ export class IgxTabsComponent extends IgxTabsDirective implements AfterViewInit,
                     break;
                 }
             } else {
-                if (element.offsetWidth + this.getElementOffset(element) >= this.offset) {
+                if (this.getElementOffset(element) >= this.offset) {
                     this.scrollElement(tabsArray[index - 1].headerComponent.nativeElement, scrollNext);
                     break;
                 }

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ export class IgxTabsComponent extends IgxTabsDirective implements AfterViewInit,`
`242`	`242`	`break;`
`243`	`243`	`}`
`244`	`244`	`} else {`
`245`		`- if (element.offsetWidth + this.getElementOffset(element) >= this.offset) {`
	`245`	`+ if (this.getElementOffset(element) >= this.offset) {`
`246`	`246`	`this.scrollElement(tabsArray[index - 1].headerComponent.nativeElement, scrollNext);`
`247`	`247`	`break;`
`248`	`248`	`}`