1 files changed, 23 insertions, 8 deletions

diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
index dd9a2ebb184..1ac61a3c39b 100644
--- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
+++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
@@ -7,6 +7,7 @@
   Sample configuration:
 
   <user-avatar-image
+    :lazy="true"
     :img-src="userAvatarSrc"
     :img-alt="tooltipText"
     :tooltip-text="tooltipText"
@@ -16,11 +17,17 @@
 */
 
 import defaultAvatarUrl from 'images/no_avatar.png';
+import { placeholderImage } from '../../../lazy_loader';
 import tooltip from '../../directives/tooltip';
 
 export default {
   name: 'UserAvatarImage',
   props: {
+    lazy: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     imgSrc: {
       type: String,
       required: false,
@@ -56,18 +63,21 @@ export default {
     tooltip,
   },
   computed: {
+    // API response sends null when gravatar is disabled and
+    // we provide an empty string when we use it inside user avatar link.
+    // In both cases we should render the defaultAvatarUrl
+    sanitizedSource() {
+      return this.imgSrc === '' || this.imgSrc === null ? defaultAvatarUrl : this.imgSrc;
+    },
+    resultantSrcAttribute() {
+      return this.lazy ? placeholderImage : this.sanitizedSource;
+    },
     tooltipContainer() {
       return this.tooltipText ? 'body' : null;
     },
     avatarSizeClass() {
       return `s${this.size}`;
     },
-    // API response sends null when gravatar is disabled and
-    // we provide an empty string when we use it inside user avatar link.
-    // In both cases we should render the defaultAvatarUrl
-    imageSource() {
-      return this.imgSrc === '' || this.imgSrc === null ? defaultAvatarUrl : this.imgSrc;
-    },
   },
 };
 </script>
@@ -76,11 +86,16 @@ export default {
   <img
     v-tooltip
     class="avatar"
-    :class="[avatarSizeClass, cssClasses]"
-    :src="imageSource"
+    :class="{
+      lazy,
+      [avatarSizeClass]: true,
+      [cssClasses]: true
+    }"
+    :src="resultantSrcAttribute"
     :width="size"
     :height="size"
     :alt="imgAlt"
+    :data-src="sanitizedSource"
     :data-container="tooltipContainer"
     :data-placement="tooltipPlacement"
     :title="tooltipText"