Merge branch '47661-merge-request-box-disappearing-on-chrome' into 'master'

Replace deprecated bs.affix in merge request tabs with sticky polyfill

Closes #47661

See merge request gitlab-org/gitlab-ce!20269

app/assets/javascripts/merge_request_tabs.js

@@ -16,6 +16,7 @@ import Diff from './diff';
 import { localTimeAgo } from './lib/utils/datetime_utility';
 import syntaxHighlight from './syntax_highlight';
 import Notes from './notes';
+import { polyfillSticky } from './lib/utils/sticky';
 /* eslint-disable max-len */
 // MergeRequestTabs
@@ -426,7 +427,6 @@ export default class MergeRequestTabs {
   initAffix() {
     const $tabs = $('.js-tabs-affix');
-    const $fixedNav = $('.navbar-gitlab');
     // Screen space on small screens is usually very sparse
     // So we dont affix the tabs on these
@@ -439,21 +439,6 @@ export default class MergeRequestTabs {
     */
     if ($tabs.css('position') !== 'static') return;
-    const $diffTabs = $('#diff-notes-app');
-
-    $tabs
-      .off('affix.bs.affix affix-top.bs.affix')
-      .affix({
-        offset: {
-          top: () => $diffTabs.offset().top - $tabs.height() - $fixedNav.height(),
-        },
-      })
-      .on('affix.bs.affix', () => $diffTabs.css({ marginTop: $tabs.height() }))
-      .on('affix-top.bs.affix', () => $diffTabs.css({ marginTop: '' }));
-
-    // Fix bug when reloading the page already scrolling
-    if ($tabs.hasClass('affix')) {
-      $tabs.trigger('affix.bs.affix');
-    }
+    polyfillSticky($tabs);
   }
 }

changelogs/unreleased/47661-merge-request-box-disappearing-on-chrome.yml

+---
+title: Replace deprecated bs.affix in merge request tabs with sticky polyfill
+merge_request:
+author:
+type: fixed