[terra-avatar] Changed fallback to initials from user icon for avatar

packages/terra-avatar/CHANGELOG.md

@@ -3,6 +3,8 @@ ChangeLog
 
 Unreleased
 ----------
+### Breaking Changes
+* Changed the fallback behavior of Avatar. Such that if the image fails to load, the avatar falls back to the initials display instead of default user icon.
 
 2.26.0 - (September 6, 2019)
 ------------------

packages/terra-avatar/docs/avatar.md

@@ -1,6 +1,6 @@
 # Terra Avatar
 
-The `Avatar` variant represents a person - it displays an image or initials in a circular frame. If neither are provided, a fallback user icon displays. This is the default export of the `terra-avatar` package.
+The `Avatar` variant represents a person - it displays an image or initials in a circular frame. If valid image is not provided and initials is provided, then fallback initial displays. If neither are provided, a fallback user icon displays. This is the default export of the `terra-avatar` package.
 
 ## Getting Started
 

packages/terra-avatar/docs/upgrade-guide.md

@@ -1,4 +1,12 @@
 # terra-avatar Upgrade Guide
+## Changes from version 2 to version 3
+
+### Removed
+* Default `user` icon as fallback icon for Avatar
+
+### Added
+* the `initials` as fallback display for Avatar when image fails to load.
+
 ## Changes from version 1 to version 2
 
 ### Props

packages/terra-avatar/src/common/AvatarUtils.jsx

@@ -60,17 +60,33 @@ const getColorVariant = (hashValue) => {
 /**
  * Render placeholder.
  */
-const generateImagePlaceholder = (alt, isAriaHidden, variant) => {
+const generateImagePlaceholder = (avatarParams) => {
+  const {
+    alt, variant, isAriaHidden,
+  } = avatarParams;
   const avatarIconClassNames = cx(['icon', variant]);
-
   return <span className={avatarIconClassNames} role="img" aria-label={alt} alt={alt} aria-hidden={isAriaHidden} />;
 };
 
+/**
+ * Render placeholder.
+ */
+const generateInitials = (avatarParams) => {
+  const {
+    alt, initials, isAriaHidden,
+  } = avatarParams;
+  const avatarTextClassNames = cx('initials');
+  return <span className={avatarTextClassNames} alt={alt} aria-label={alt} aria-hidden={isAriaHidden}>{initials.toUpperCase()}</span>;
+};
+
 /**
  * Render image with placeholder.
  */
-const generateImage = (image, alt, isAriaHidden, variant, handleFallback) => {
-  const icon = generateImagePlaceholder(alt, isAriaHidden, variant);
+const generateImage = (avatarParams) => {
+  const {
+    alt, image, variant, handleFallback,
+  } = avatarParams;
+  const icon = (variant === AVATAR_VARIANTS.USER) ? generateInitials(avatarParams) : generateImagePlaceholder(avatarParams);
   return <TerraImage className={cx('image')} src={image} placeholder={icon} alt={alt} onError={handleFallback} fit="cover" />;
 };
 
@@ -111,6 +127,7 @@ export {
   getColorVariant,
   generateImagePlaceholder,
   generateImage,
+  generateInitials,
   validateColor,
   setColor,
 };

packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarColorVariants.jsx

@@ -8,7 +8,7 @@ const propTypes = { color: PropTypes.string };
 const AvatarColorVariants = ({
   ...props
 }) => (
-  <Avatar alt="User" color={props.color} />
+  <Avatar alt="User" initials="JS" color={props.color} />
 );
 
 AvatarColorVariants.propTypes = propTypes;

packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarImage.jsx

@@ -3,7 +3,7 @@ import Avatar from 'terra-avatar';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
 const AvatarImage = () => (
-  <Avatar image={exampleAvatarImage} alt="Deep Space" />
+  <Avatar image={exampleAvatarImage} initials="JS" alt="Deep Space" />
 );
 
 export default AvatarImage;

packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarIsDeceased.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import Avatar from 'terra-avatar';
 
 const AvatarImage = () => (
-  <Avatar alt="Patient #1" isDeceased />
+  <Avatar alt="Patient #1" isDeceased initials="JS" />
 );
 
 export default AvatarImage;

packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarSize.jsx

@@ -3,7 +3,7 @@ import Avatar from 'terra-avatar';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
 const AvatarSize = () => (
-  <Avatar alt="User" image={exampleAvatarImage} size="2em" />
+  <Avatar alt="User" image={exampleAvatarImage} size="2em" initials="JS" />
 );
 
 export default AvatarSize;

packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarUser.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import Avatar from 'terra-avatar';
 
 const AvatarUser = () => (
-  <Avatar alt="The Last Airbender" />
+  <Avatar alt="The Last Airbender" initials="JS" />
 );
 
 export default AvatarUser;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatar.test.jsx

@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
-export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" />;
+export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" initials="JS" />;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarShortAndWide.test.jsx

@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/200x133.jpg';
 
-export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" />;
+export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" initials="JS" />;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarTallAndNarrow.test.jsx

@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/170x251.jpg';
 
-export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" />;
+export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" initials="JS" />;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageGap.test.jsx

@@ -9,7 +9,7 @@ const cx = classNames.bind(styles);
 export default () => (
   <div>
     <div className={cx('avatar-wrapper')}>
-      <Avatar id="image-avatar" image={exampleAvatarImage} alt="placeholder" />
+      <Avatar id="image-avatar" image={exampleAvatarImage} alt="placeholder" initials="JS" />
     </div>
     <div className={cx('avatar-wrapper')}>
       <Facility id="facility-avatar" alt="facility" />

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/InvalidImageAvatarWithInitials.test.jsx

@@ -0,0 +1,4 @@
+import React from 'react';
+import Avatar from '../../../../index';
+
+export default () => <Avatar image="invalid-image-url" initials="JD" alt="User" id="invalid-image-avatar" />;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedAvatar.test.jsx

@@ -1,4 +1,4 @@
 import React from 'react';
 import Avatar from '../../../../index';
 
-export default () => <Avatar id="is-deceased-avatar" alt="user" isDeceased />;
+export default () => <Avatar id="is-deceased-avatar" alt="user" isDeceased initials="JS" />;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedImageAvatar.test.jsx

@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
-export default () => <Avatar id="is-deceased-image-avatar" alt="user" image={exampleAvatarImage} isDeceased />;
+export default () => <Avatar id="is-deceased-image-avatar" alt="user" image={exampleAvatarImage} isDeceased initials="JS" />;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/TwoInitialsAvatar.test.jsx

@@ -1,4 +1,4 @@
 import React from 'react';
 import Avatar from '../../../../index';
 
-export default () => <Avatar id="two-initials-avatar" initials="JS" alt="user" color="two" />;
+export default () => <Avatar id="two-initials-avatar" initials="JSS" color="two" />;

packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/UserAvatar.test.jsx

@@ -1,4 +1,4 @@
 import React from 'react';
 import Avatar from '../../../../index';
 
-export default () => <Avatar id="user-avatar" alt="user" color="one" />;
+export default () => <Avatar id="user-avatar" alt="user" color="one" initials="JS" />;

packages/terra-avatar/src/variants/Avatar.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames/bind';
 import styles from '../common/Avatar.module.scss';
 import {
-  AVATAR_VARIANTS, generateImagePlaceholder, generateImage, setColor,
+  AVATAR_VARIANTS, generateInitials, generateImage, setColor,
 } from '../common/AvatarUtils';
 
 const cx = classNames.bind(styles);
@@ -30,7 +30,7 @@ const propTypes = {
   /**
    * One or two letters to display.
    */
-  initials: PropTypes.string,
+  initials: PropTypes.string.isRequired,
   /**
    * Whether to hide avatar from the accessibility tree.
    */
@@ -49,7 +49,6 @@ const defaultProps = {
   color: 'auto',
   hashValue: undefined,
   image: undefined,
-  initials: undefined,
   isAriaHidden: false,
   isDeceased: false,
   size: undefined,
@@ -84,14 +83,19 @@ class Avatar extends React.Component {
     } = this.props;
 
     let avatarContent;
+    const avatarParams = {
+      image,
+      alt,
+      isAriaHidden,
+      variant: AVATAR_VARIANTS.USER,
+      handleFallback: this.handleFallback,
+      initials: (initials.length > 2) ? initials.slice(0, 2) : initials,
+    };
 
     if (image) {
-      avatarContent = generateImage(image, alt, isAriaHidden, AVATAR_VARIANTS.USER, this.handleFallback);
-    } else if (initials && (initials.length === 1 || initials.length === 2)) {
-      const avatarTextClassNames = cx('initials');
-      avatarContent = <span className={avatarTextClassNames} alt={alt} aria-label={alt} aria-hidden={isAriaHidden}>{initials.toUpperCase()}</span>;
+      avatarContent = generateImage(avatarParams);
     } else {
-      avatarContent = generateImagePlaceholder(alt, isAriaHidden, AVATAR_VARIANTS.USER);
+      avatarContent = generateInitials(avatarParams);
     }
 
     const attributes = { ...customProps };

packages/terra-avatar/src/variants/Facility.jsx

@@ -73,10 +73,18 @@ class Facility extends React.Component {
 
     let facilityContent;
 
+    const facilityParams = {
+      image,
+      alt,
+      isAriaHidden,
+      variant: AVATAR_VARIANTS.FACILITY,
+      handleFallback: this.handleFallback,
+    };
+
     if (image) {
-      facilityContent = generateImage(image, alt, isAriaHidden, AVATAR_VARIANTS.FACILITY, this.handleFallback);
+      facilityContent = generateImage(facilityParams);
     } else {
-      facilityContent = generateImagePlaceholder(alt, isAriaHidden, AVATAR_VARIANTS.FACILITY);
+      facilityContent = generateImagePlaceholder(facilityParams);
     }
     const attributes = { ...customProps };
     const customStyles = size ? ({ fontSize: size, ...attributes.style }) : attributes.style;

packages/terra-avatar/tests/jest/Avatar.test.jsx

@@ -5,7 +5,7 @@ import exampleProfilePhoto from '../../src/terra-dev-site/assets/150x150.jpg';
 describe('Avatar', () => {
   // Snapshot Tests
   it('should render a default avatar', () => {
-    const avatar = <Avatar alt="user" />;
+    const avatar = <Avatar initials="JS" alt="user" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
@@ -22,26 +22,32 @@ describe('Avatar', () => {
     expect(wrapper).toMatchSnapshot();
   });
 
-  it('should render fallback user avatar when more than two initials are passed in', () => {
+  it('should render two initials avatar when more than two initials are passed in', () => {
     const avatar = <Avatar initials="JJJ" alt="user" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render image avatar when image is passed in', () => {
-    const avatar = <Avatar image={exampleProfilePhoto} alt="placeholder" />;
+    const avatar = <Avatar image={exampleProfilePhoto} alt="placeholder" initials="JS" />;
+    const wrapper = render(avatar);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('should render fallback initials when invalid image is passed in with initials', () => {
+    const avatar = <Avatar image="https://path/to/invalid_image.jpg" initials="JD" alt="placeholder" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
-  it('should render fallback user avatar when invalid image is passed in', () => {
-    const avatar = <Avatar image="https://path/to/invalid_image.jpg" alt="placeholder" />;
+  it('should render fallback user avatar when invalid image is passed in without initials', () => {
+    const avatar = <Avatar image="https://path/to/invalid_image.jpg" alt="placeholder" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with provided size', () => {
-    const avatar = <Avatar alt="user" size="5em" />;
+    const avatar = <Avatar alt="user" size="5em" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
@@ -53,31 +59,31 @@ describe('Avatar', () => {
   });
 
   it('should render an avatar with color variant one', () => {
-    const avatar = <Avatar alt="user" color="one" />;
+    const avatar = <Avatar alt="user" color="one" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with color variant netural', () => {
-    const avatar = <Avatar alt="user" color="neutral" />;
+    const avatar = <Avatar alt="user" color="neutral" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with an automated color variant, based on a hashValue', () => {
-    const avatar = <Avatar alt="user" hashValue="alternative hash" />;
+    const avatar = <Avatar alt="user" hashValue="alternative hash" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an isDeceased avatar', () => {
-    const avatar = <Avatar alt="user" isDeceased />;
+    const avatar = <Avatar alt="user" isDeceased initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with custom props', () => {
-    const avatar = <Avatar alt="user" id="custom props avatar" />;
+    const avatar = <Avatar alt="user" id="custom props avatar" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });