Merge branch '56327-improve-localtimeago-rendering' into 'master'

Improve localTimeAgo rendering

Closes #56327

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

2 files changed, 74 insertions, 58 deletions

diff --git a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
index 561188c1e8f..80aec84f574 100644
--- a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
@@ -141,7 +141,7 @@ export default {
                   <time-ago
                     v-if="version.created_at"
                     :time="version.created_at"
-                    class="js-timeago js-timeago-render"
+                    class="js-timeago"
                   />
                 </small>
               </div>
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index 01dbbb9dd16..d3fe8f77bd4 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -87,44 +87,67 @@ let timeagoInstance;
  */
 export const getTimeago = () => {
   if (!timeagoInstance) {
-    const localeRemaining = (number, index) =>
-      [
-        [s__('Timeago|just now'), s__('Timeago|right now')],
-        [s__('Timeago|%s seconds ago'), s__('Timeago|%s seconds remaining')],
-        [s__('Timeago|1 minute ago'), s__('Timeago|1 minute remaining')],
-        [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
-        [s__('Timeago|1 hour ago'), s__('Timeago|1 hour remaining')],
-        [s__('Timeago|%s hours ago'), s__('Timeago|%s hours remaining')],
-        [s__('Timeago|1 day ago'), s__('Timeago|1 day remaining')],
-        [s__('Timeago|%s days ago'), s__('Timeago|%s days remaining')],
-        [s__('Timeago|1 week ago'), s__('Timeago|1 week remaining')],
-        [s__('Timeago|%s weeks ago'), s__('Timeago|%s weeks remaining')],
-        [s__('Timeago|1 month ago'), s__('Timeago|1 month remaining')],
-        [s__('Timeago|%s months ago'), s__('Timeago|%s months remaining')],
-        [s__('Timeago|1 year ago'), s__('Timeago|1 year remaining')],
-        [s__('Timeago|%s years ago'), s__('Timeago|%s years remaining')],
-      ][index];
-
-    const locale = (number, index) =>
-      [
-        [s__('Timeago|just now'), s__('Timeago|right now')],
-        [s__('Timeago|%s seconds ago'), s__('Timeago|in %s seconds')],
-        [s__('Timeago|1 minute ago'), s__('Timeago|in 1 minute')],
-        [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
-        [s__('Timeago|1 hour ago'), s__('Timeago|in 1 hour')],
-        [s__('Timeago|%s hours ago'), s__('Timeago|in %s hours')],
-        [s__('Timeago|1 day ago'), s__('Timeago|in 1 day')],
-        [s__('Timeago|%s days ago'), s__('Timeago|in %s days')],
-        [s__('Timeago|1 week ago'), s__('Timeago|in 1 week')],
-        [s__('Timeago|%s weeks ago'), s__('Timeago|in %s weeks')],
-        [s__('Timeago|1 month ago'), s__('Timeago|in 1 month')],
-        [s__('Timeago|%s months ago'), s__('Timeago|in %s months')],
-        [s__('Timeago|1 year ago'), s__('Timeago|in 1 year')],
-        [s__('Timeago|%s years ago'), s__('Timeago|in %s years')],
-      ][index];
-
-    timeago.register(timeagoLanguageCode, locale);
-    timeago.register(`${timeagoLanguageCode}-remaining`, localeRemaining);
+    const memoizedLocaleRemaining = () => {
+      const cache = [];
+
+      const timeAgoLocaleRemaining = [
+        () => [s__('Timeago|just now'), s__('Timeago|right now')],
+        () => [s__('Timeago|%s seconds ago'), s__('Timeago|%s seconds remaining')],
+        () => [s__('Timeago|1 minute ago'), s__('Timeago|1 minute remaining')],
+        () => [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
+        () => [s__('Timeago|1 hour ago'), s__('Timeago|1 hour remaining')],
+        () => [s__('Timeago|%s hours ago'), s__('Timeago|%s hours remaining')],
+        () => [s__('Timeago|1 day ago'), s__('Timeago|1 day remaining')],
+        () => [s__('Timeago|%s days ago'), s__('Timeago|%s days remaining')],
+        () => [s__('Timeago|1 week ago'), s__('Timeago|1 week remaining')],
+        () => [s__('Timeago|%s weeks ago'), s__('Timeago|%s weeks remaining')],
+        () => [s__('Timeago|1 month ago'), s__('Timeago|1 month remaining')],
+        () => [s__('Timeago|%s months ago'), s__('Timeago|%s months remaining')],
+        () => [s__('Timeago|1 year ago'), s__('Timeago|1 year remaining')],
+        () => [s__('Timeago|%s years ago'), s__('Timeago|%s years remaining')],
+      ];
+
+      return (number, index) => {
+        if (cache[index]) {
+          return cache[index];
+        }
+        cache[index] = timeAgoLocaleRemaining[index] && timeAgoLocaleRemaining[index]();
+        return cache[index];
+      };
+    };
+
+    const memoizedLocale = () => {
+      const cache = [];
+
+      const timeAgoLocale = [
+        () => [s__('Timeago|just now'), s__('Timeago|right now')],
+        () => [s__('Timeago|%s seconds ago'), s__('Timeago|in %s seconds')],
+        () => [s__('Timeago|1 minute ago'), s__('Timeago|in 1 minute')],
+        () => [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
+        () => [s__('Timeago|1 hour ago'), s__('Timeago|in 1 hour')],
+        () => [s__('Timeago|%s hours ago'), s__('Timeago|in %s hours')],
+        () => [s__('Timeago|1 day ago'), s__('Timeago|in 1 day')],
+        () => [s__('Timeago|%s days ago'), s__('Timeago|in %s days')],
+        () => [s__('Timeago|1 week ago'), s__('Timeago|in 1 week')],
+        () => [s__('Timeago|%s weeks ago'), s__('Timeago|in %s weeks')],
+        () => [s__('Timeago|1 month ago'), s__('Timeago|in 1 month')],
+        () => [s__('Timeago|%s months ago'), s__('Timeago|in %s months')],
+        () => [s__('Timeago|1 year ago'), s__('Timeago|in 1 year')],
+        () => [s__('Timeago|%s years ago'), s__('Timeago|in %s years')],
+      ];
+
+      return (number, index) => {
+        if (cache[index]) {
+          return cache[index];
+        }
+        cache[index] = timeAgoLocale[index] && timeAgoLocale[index]();
+        return cache[index];
+      };
+    };
+
+    timeago.register(timeagoLanguageCode, memoizedLocale());
+    timeago.register(`${timeagoLanguageCode}-remaining`, memoizedLocaleRemaining());
+
     timeagoInstance = timeago();
   }
 
@@ -132,35 +155,28 @@ export const getTimeago = () => {
 };
 
 /**
- * For the given element, renders a timeago instance.
- * @param {jQuery} $els
- */
-export const renderTimeago = $els => {
-  const timeagoEls = $els || document.querySelectorAll('.js-timeago-render');
-
-  // timeago.js sets timeouts internally for each timeago value to be updated in real time
-  getTimeago().render(timeagoEls, timeagoLanguageCode);
-};
-
-/**
  * For the given elements, sets a tooltip with a formatted date.
- * @param {jQuery}
+ * @param {JQuery} $timeagoEls
  * @param {Boolean} setTimeago
  */
 export const localTimeAgo = ($timeagoEls, setTimeago = true) => {
-  $timeagoEls.each((i, el) => {
-    if (setTimeago) {
+  getTimeago().render($timeagoEls, timeagoLanguageCode);
+
+  if (!setTimeago) {
+    return;
+  }
+
+  function addTimeAgoTooltip() {
+    $timeagoEls.each((i, el) => {
       // Recreate with custom template
       $(el).tooltip({
         template:
           '<div class="tooltip local-timeago" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',
       });
-    }
-
-    el.classList.add('js-timeago-render');
-  });
+    });
+  }
 
-  renderTimeago($timeagoEls);
+  requestIdleCallback(addTimeAgoTooltip);
 };
 
 /**