Add latest changes from gitlab-org/gitlab@master

2 files changed, 75 insertions, 14 deletions

diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/constants.js b/app/assets/javascripts/vue_shared/components/blob_viewers/constants.js
index 106dd7a3b97..957e642fcb8 100644
--- a/app/assets/javascripts/vue_shared/components/blob_viewers/constants.js
+++ b/app/assets/javascripts/vue_shared/components/blob_viewers/constants.js
@@ -1 +1,5 @@
 export const HIGHLIGHT_CLASS_NAME = 'hll';
+export const MARKUP_FILE_TYPE = 'markup';
+export const MARKUP_CONTENT_SELECTOR = '.js-markup-content';
+export const ELEMENTS_PER_CHUNK = 20;
+export const CONTENT_LOADED_EVENT = 'richContentLoaded';
diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue
index 11ce6afbb1d..c7b18886cb9 100644
--- a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue
@@ -3,7 +3,14 @@ import SafeHtml from '~/vue_shared/directives/safe_html';
 import { handleBlobRichViewer } from '~/blob/viewer';
 import MarkdownFieldView from '~/vue_shared/components/markdown/field_view.vue';
 import { handleLocationHash } from '~/lib/utils/common_utils';
+import { sanitize } from '~/lib/dompurify';
 import ViewerMixin from './mixins';
+import {
+  MARKUP_FILE_TYPE,
+  MARKUP_CONTENT_SELECTOR,
+  ELEMENTS_PER_CHUNK,
+  CONTENT_LOADED_EVENT,
+} from './constants';
 
 export default {
   components: {
@@ -16,21 +23,75 @@ export default {
   data() {
     return {
       isLoading: true,
+      initialContent: null,
+      remainingContent: [],
     };
   },
+  computed: {
+    rawContent() {
+      return this.initialContent || this.richViewer || this.content;
+    },
+    isMarkup() {
+      return this.type === MARKUP_FILE_TYPE;
+    },
+  },
+  created() {
+    this.optimizeMarkupRendering();
+  },
   mounted() {
-    window.requestIdleCallback(async () => {
+    this.renderRemainingMarkup();
+    handleBlobRichViewer(this.$refs.content, this.type);
+    handleLocationHash();
+  },
+  methods: {
+    optimizeMarkupRendering() {
+      /**
+       * If content is markup we optimize rendering by splitting it into two parts:
+       * - initialContent (top section of the file - is rendered right away)
+       * - remainingContent (remaining content - is rendered over a longer time period)
+       *
+       * This is done so that the browser doesn't render the whole file at once (improves TBT)
+       */
+
+      if (!this.isMarkup) return;
+
+      const tmpWrapper = document.createElement('div');
+      tmpWrapper.innerHTML = sanitize(this.rawContent, this.$options.safeHtmlConfig);
+
+      const fileContent = tmpWrapper.querySelector(MARKUP_CONTENT_SELECTOR);
+      if (!fileContent) return;
+
+      const initialContent = [...fileContent.childNodes].slice(0, ELEMENTS_PER_CHUNK);
+      this.remainingContent = [...fileContent.childNodes].slice(ELEMENTS_PER_CHUNK);
+
+      fileContent.innerHTML = '';
+      fileContent.append(...initialContent);
+      this.initialContent = tmpWrapper.outerHTML;
+    },
+    renderRemainingMarkup() {
       /**
-       * Rendering Markdown usually takes long due to the amount of HTML being parsed.
-       * This ensures that content is loaded only when the browser goes into idle.
+       * Rendering large Markdown files can block the main thread due to the amount of HTML being parsed.
+       * The optimization below ensures that content is rendered over a longer time period instead of all at once.
        * More details here: https://gitlab.com/gitlab-org/gitlab/-/issues/331448
        * */
-      this.isLoading = false;
-      await this.$nextTick();
-      handleBlobRichViewer(this.$refs.content, this.type);
-      handleLocationHash();
-      this.$emit('richContentLoaded');
-    });
+
+      if (!this.isMarkup || !this.remainingContent.length) {
+        this.$emit(CONTENT_LOADED_EVENT);
+        return;
+      }
+
+      const fileContent = this.$refs.content.$el.querySelector(MARKUP_CONTENT_SELECTOR);
+
+      for (let i = 0; i < this.remainingContent.length; i += ELEMENTS_PER_CHUNK) {
+        const nextChunkEnd = i + ELEMENTS_PER_CHUNK;
+        const content = this.remainingContent.slice(i, nextChunkEnd);
+        setTimeout(() => {
+          fileContent.append(...content);
+          if (nextChunkEnd < this.remainingContent.length) return;
+          this.$emit(CONTENT_LOADED_EVENT);
+        }, i);
+      }
+    },
   },
   safeHtmlConfig: {
     ADD_TAGS: ['gl-emoji', 'copy-code'],
@@ -38,9 +99,5 @@ export default {
 };
 </script>
 <template>
-  <markdown-field-view
-    v-if="!isLoading"
-    ref="content"
-    v-safe-html:[$options.safeHtmlConfig]="richViewer || content"
-  />
+  <markdown-field-view ref="content" v-safe-html:[$options.safeHtmlConfig]="rawContent" />
 </template>