@atlaskit/smart-card 17.2.1 → 17.4.0

package/dist/cjs/view/FlexibleCard/components/blocks/utils.js

@@ -7,16 +7,18 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.renderElementItems = exports.renderChildren = exports.renderActionItems = exports.getGapSize = exports.getBaseStyles = void 0;
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+exports.renderElementItems = exports.renderChildren = exports.renderActionItems = exports.getGapSize = exports.getBaseStyles = exports.ElementDisplaySchema = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _core = require("@emotion/core");
@@ -36,12 +38,15 @@ var _elementGroup = _interopRequireDefault(require("./element-group"));
 var _excluded = ["name"],
     _excluded2 = ["name"];
 
-var _templateObject, _templateObject2, _templateObject3;
+var _ElementDisplaySchema, _templateObject, _templateObject2, _templateObject3;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var ElementDisplaySchema = (_ElementDisplaySchema = {}, (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.AuthorGroup, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.CollaboratorGroup, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.CommentCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.CreatedBy, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.CreatedOn, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.LinkIcon, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.ModifiedBy, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.ModifiedOn, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Priority, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.ProgrammingLanguage, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Snippet, ['block']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.State, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.SubscriberCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Title, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Provider, ['inline']), _ElementDisplaySchema);
+exports.ElementDisplaySchema = ElementDisplaySchema;
+
 var getDirectionStyles = function getDirectionStyles(direction) {
   switch (direction) {
     case _constants.SmartLinkDirection.Vertical:
@@ -82,6 +87,16 @@ var isActionGroup = function isActionGroup(node) {
   return /*#__PURE__*/_react.default.isValidElement(node) && node.type === _actionGroup.default;
 };
 
+var isElementDisplayValid = function isElementDisplayValid(name, display) {
+  var _ElementDisplaySchema2, _ElementDisplaySchema3;
+
+  return (_ElementDisplaySchema2 = (_ElementDisplaySchema3 = ElementDisplaySchema[name]) === null || _ElementDisplaySchema3 === void 0 ? void 0 : _ElementDisplaySchema3.includes(display)) !== null && _ElementDisplaySchema2 !== void 0 ? _ElementDisplaySchema2 : false;
+};
+
+var isElementNull = function isElementNull(children) {
+  return Boolean(children.type() === null);
+};
+
 var isElementOrElementGroup = function isElementOrElementGroup(node) {
   return /*#__PURE__*/_react.default.isValidElement(node) && ((0, _flexible.isFlexibleUiElement)(node) || node.type === _elementGroup.default);
 };
@@ -104,15 +119,20 @@ exports.renderChildren = renderChildren;
 
 var renderElementItems = function renderElementItems() {
   var items = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var display = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'inline';
   var elements = items.reduce(function (acc, curr, idx) {
     var name = curr.name,
         props = (0, _objectWithoutProperties2.default)(curr, _excluded);
     var Element = Elements[name];
 
-    if (Element) {
-      return [].concat((0, _toConsumableArray2.default)(acc), [/*#__PURE__*/_react.default.createElement(Element, (0, _extends2.default)({
+    if (Element && isElementDisplayValid(name, display)) {
+      var element = /*#__PURE__*/_react.default.createElement(Element, (0, _extends2.default)({
         key: idx
-      }, props))]);
+      }, props));
+
+      if (!isElementNull(element)) {
+        return [].concat((0, _toConsumableArray2.default)(acc), [element]);
+      }
     }
 
     return acc;

package/dist/cjs/view/FlexibleCard/components/common/atlaskit-icon/index.js

@@ -300,6 +300,8 @@ var AtlaskitIcon = function AtlaskitIcon(_ref3) {
     case _constants.IconType.Jira:
       // Logo component has a different prop set from other icon components
       return /*#__PURE__*/_react.default.createElement(ImportedIcon, {
+        "data-testId": testId // Confluence and Jira imports don't have native testId prop
+        ,
         textColor: _colors.N700,
         iconColor: _colors.B200,
         iconGradientStart: _colors.B400,

package/dist/cjs/view/FlexibleCard/components/elements/avatar-group/index.js

@@ -7,14 +7,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
 var _react = _interopRequireDefault(require("react"));
 
+var _core = require("@emotion/core");
+
 var _avatarGroup = _interopRequireDefault(require("@atlaskit/avatar-group"));
 
 var _constants = require("../../../../../constants");
 
+var _templateObject;
+
 var MAX_COUNT = 4;
 
+var getStyles = function getStyles(size) {
+  switch (size) {
+    case _constants.SmartLinkSize.XLarge:
+    case _constants.SmartLinkSize.Large:
+      // Default AK small size
+      return;
+
+    case _constants.SmartLinkSize.Medium:
+    case _constants.SmartLinkSize.Small:
+    default:
+      return (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n        li {\n          span,\n          svg {\n            max-height: 1.25rem;\n            max-width: 1.25rem;\n          }\n        }\n      "])));
+  }
+};
+
 var AvatarGroup = function AvatarGroup(_ref) {
   var _ref$items = _ref.items,
       items = _ref$items === void 0 ? [] : _ref$items,
@@ -29,13 +49,15 @@ var AvatarGroup = function AvatarGroup(_ref) {
     return null;
   }
 
-  return /*#__PURE__*/_react.default.createElement(_avatarGroup.default, {
+  return (0, _core.jsx)("span", {
+    css: getStyles(size)
+  }, (0, _core.jsx)(_avatarGroup.default, {
     maxCount: maxCount,
     appearance: "stack",
     size: "small",
     data: items,
     testId: testId
-  });
+  }));
 };
 
 var _default = AvatarGroup;

package/dist/cjs/view/FlexibleCard/components/elements/badge/index.js

@@ -34,7 +34,7 @@ var iconStyles = (0, _core.css)(_templateObject2 || (_templateObject2 = (0, _tag
 var labelStyles = (0, _core.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1rem;\n  padding-left: 0.125rem;\n"])), _token.tokens.badgeText);
 var messageMapper = (_messageMapper = {}, (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityBlocker, _messages.messages.priority_blocker), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityCritical, _messages.messages.priority_critical), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityHigh, _messages.messages.priority_high), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityHighest, _messages.messages.priority_highest), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityLow, _messages.messages.priority_low), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityLowest, _messages.messages.priority_lowest), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityMajor, _messages.messages.priority_major), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityMedium, _messages.messages.priority_medium), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityMinor, _messages.messages.priority_minor), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityTrivial, _messages.messages.priority_trivial), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityUndefined, _messages.messages.priority_undefined), _messageMapper);
 
-var getFormattedMessageOrLabel = function getFormattedMessageOrLabel(icon, content) {
+var getFormattedMessageFromIcon = function getFormattedMessageFromIcon(icon) {
   if (icon) {
     var descriptor = messageMapper[icon];
 
@@ -44,8 +44,6 @@ var getFormattedMessageOrLabel = function getFormattedMessageOrLabel(icon, conte
       });
     }
   }
-
-  return content;
 };
 
 var renderAtlaskitIcon = function renderAtlaskitIcon(icon, testId) {
@@ -73,7 +71,7 @@ var Badge = function Badge(_ref) {
       label = _ref.label,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'smart-element-badge' : _ref$testId;
-  var formattedMessageOrLabel = getFormattedMessageOrLabel(icon, label);
+  var formattedMessageOrLabel = getFormattedMessageFromIcon(icon) || label;
   var badgeIcon = renderAtlaskitIcon(icon, testId) || renderImageIcon(url, testId);
 
   if (!formattedMessageOrLabel || !badgeIcon) {

package/dist/cjs/view/FlexibleCard/components/elements/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Title = exports.SubscriberCount = exports.State = exports.ProgrammingLanguage = exports.Priority = exports.ModifiedOn = exports.ModifiedBy = exports.LinkIcon = exports.CreatedOn = exports.CreatedBy = exports.CommentCount = exports.CollaboratorGroup = exports.AuthorGroup = void 0;
+exports.Title = exports.SubscriberCount = exports.State = exports.Snippet = exports.Provider = exports.ProgrammingLanguage = exports.Priority = exports.ModifiedOn = exports.ModifiedBy = exports.LinkIcon = exports.CreatedOn = exports.CreatedBy = exports.CommentCount = exports.CollaboratorGroup = exports.AuthorGroup = void 0;
 
 var _utils = require("./utils");
 
@@ -32,9 +32,13 @@ var Priority = (0, _utils.createElement)(_constants.ElementName.Priority);
 exports.Priority = Priority;
 var ProgrammingLanguage = (0, _utils.createElement)(_constants.ElementName.ProgrammingLanguage);
 exports.ProgrammingLanguage = ProgrammingLanguage;
+var Snippet = (0, _utils.createElement)(_constants.ElementName.Snippet);
+exports.Snippet = Snippet;
 var State = (0, _utils.createElement)(_constants.ElementName.State);
 exports.State = State;
 var SubscriberCount = (0, _utils.createElement)(_constants.ElementName.SubscriberCount);
 exports.SubscriberCount = SubscriberCount;
 var Title = (0, _utils.createElement)(_constants.ElementName.Title);
-exports.Title = Title;
+exports.Title = Title;
+var Provider = (0, _utils.createElement)(_constants.ElementName.Provider);
+exports.Provider = Provider;

package/dist/cjs/view/FlexibleCard/components/elements/text/index.js

@@ -19,10 +19,14 @@ var _token = require("../../../../../utils/token");
 
 var _templateObject;
 
-var styles = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1rem;\n  ", "\n"])), _token.tokens.text, (0, _utils.getTruncateStyles)(1));
+var getStyles = function getStyles(maxLines) {
+  return (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1rem;\n  ", "\n"])), _token.tokens.text, (0, _utils.getTruncateStyles)(maxLines));
+};
 
 var Text = function Text(_ref) {
   var content = _ref.content,
+      _ref$maxLines = _ref.maxLines,
+      maxLines = _ref$maxLines === void 0 ? 1 : _ref$maxLines,
       message = _ref.message,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'smart-element-text' : _ref$testId;
@@ -32,7 +36,7 @@ var Text = function Text(_ref) {
   }
 
   return (0, _core.jsx)("span", {
-    css: styles,
+    css: getStyles(maxLines),
     "data-smart-element-text": true,
     "data-testid": testId
   }, (0, _utils.getFormattedMessage)(message) || content);

package/dist/cjs/view/FlexibleCard/components/elements/utils.js

@@ -63,6 +63,11 @@ var elementMappings = (_elementMappings = {}, (0, _defineProperty2.default)(_ele
   props: {
     icon: _constants.IconType.ProgrammingLanguage
   }
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Snippet, {
+  component: _text.default,
+  props: {
+    maxLines: 3
+  }
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.State, {
   component: _lozenge.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.SubscriberCount, {
@@ -76,6 +81,8 @@ var elementMappings = (_elementMappings = {}, (0, _defineProperty2.default)(_ele
   component: _dateTime.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.ModifiedOn, {
   component: _dateTime.default
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Provider, {
+  component: _badge.default
 }), _elementMappings);
 
 var getContextKey = function getContextKey(name) {
@@ -84,17 +91,6 @@ var getContextKey = function getContextKey(name) {
   return name.length > 0 ? name.charAt(0).toLowerCase() + name.slice(1) : undefined;
 };
 
-var getFormattedMessage = function getFormattedMessage(descriptor, value) {
-  return value ? {
-    message: {
-      descriptor: descriptor,
-      values: {
-        context: value
-      }
-    }
-  } : undefined;
-};
-
 var getData = function getData(elementName, contextKey, context) {
   if (!context) {
     return undefined;
@@ -103,52 +99,81 @@ var getData = function getData(elementName, contextKey, context) {
   var data = context[contextKey];
 
   switch (elementName) {
+    case _constants.ElementName.AuthorGroup:
+    case _constants.ElementName.CollaboratorGroup:
+      return toAvatarGroupProps(data);
+
     case _constants.ElementName.CommentCount:
     case _constants.ElementName.ProgrammingLanguage:
     case _constants.ElementName.SubscriberCount:
-      return {
-        label: data
-      };
-
-    case _constants.ElementName.AuthorGroup:
-      return {
-        items: context.authorGroup
-      };
-
-    case _constants.ElementName.CollaboratorGroup:
-      return {
-        items: context.collaboratorGroup
-      };
+      return toBadgeProps(data);
 
     case _constants.ElementName.CreatedBy:
-      return getFormattedMessage(_messages.messages.created_by, context.createdBy);
+      return toFormattedTextProps(_messages.messages.created_by, context.createdBy);
+
+    case _constants.ElementName.CreatedOn:
+      return toDateTimeProps('created', context.createdOn);
 
     case _constants.ElementName.ModifiedBy:
-      return getFormattedMessage(_messages.messages.modified_by, context.modifiedBy);
+      return toFormattedTextProps(_messages.messages.modified_by, context.modifiedBy);
 
     case _constants.ElementName.ModifiedOn:
-      return context.modifiedOn ? {
-        date: new Date(context.modifiedOn),
-        type: 'modified'
-      } : undefined;
+      return toDateTimeProps('modified', context.modifiedOn);
 
-    case _constants.ElementName.CreatedOn:
-      return context.createdOn ? {
-        date: new Date(context.createdOn),
-        type: 'created'
-      } : undefined;
+    case _constants.ElementName.Snippet:
+      return toTextProps(data);
 
     case _constants.ElementName.Title:
-      return {
-        text: context.title,
-        url: context.url
-      };
+      return toLinkProps(context.title, context.url);
 
     default:
       return data;
   }
 };
 
+var toAvatarGroupProps = function toAvatarGroupProps(items) {
+  return items ? {
+    items: items
+  } : undefined;
+};
+
+var toBadgeProps = function toBadgeProps(label) {
+  return label ? {
+    label: label
+  } : undefined;
+};
+
+var toDateTimeProps = function toDateTimeProps(type, dateString) {
+  return dateString ? {
+    date: new Date(dateString),
+    type: type
+  } : undefined;
+};
+
+var toFormattedTextProps = function toFormattedTextProps(descriptor, context) {
+  return context ? {
+    message: {
+      descriptor: descriptor,
+      values: {
+        context: context
+      }
+    }
+  } : undefined;
+};
+
+var toLinkProps = function toLinkProps(text, url) {
+  return text ? {
+    text: text,
+    url: url
+  } : undefined;
+};
+
+var toTextProps = function toTextProps(content) {
+  return content ? {
+    content: content
+  } : undefined;
+};
+
 var createElement = function createElement(name) {
   var _ref = elementMappings[name] || {},
       BaseElement = _ref.component,

package/dist/es2019/constants.js

@@ -48,7 +48,19 @@ export let SmartLinkTheme;
   SmartLinkTheme["Link"] = "link";
 })(SmartLinkTheme || (SmartLinkTheme = {}));
 
-export let SmartLinkWidth;
+export let SmartLinkWidth; // When adding an element...
+// 1) Create base element if it doesn't already existed.
+//    Base element are inside src/view/FlexibleCard/components/elements.
+//    E.g. Badge,DateTime, Icon, Lozenge, etc.
+// 2) Update FlexibleUiContext with the new prop for data representing
+//    the element, preferably with the same name as the element itself.
+//    (src/state/flexible-ui-context/types.ts)
+// 3) Update Flexible UI extractor (src/extractors/flexible/index.ts)
+// 4) Set base element and data mapping.
+//    (src/view/FlexibleCard/components/elements/utils.tsx)
+// 5) Create element. (src/view/FlexibleCard/components/elements/index.ts)
+// 6) Update element ElementDisplaySchema for inline/block display
+//    (src/view/FlexibleCard/components/blocks/utils.tsx)
 
 (function (SmartLinkWidth) {
   SmartLinkWidth["FitToContent"] = "fit-to-content";
@@ -68,9 +80,11 @@ export let ElementName;
   ElementName["ModifiedOn"] = "ModifiedOn";
   ElementName["Priority"] = "Priority";
   ElementName["ProgrammingLanguage"] = "ProgrammingLanguage";
+  ElementName["Snippet"] = "Snippet";
   ElementName["State"] = "State";
   ElementName["SubscriberCount"] = "SubscriberCount";
   ElementName["Title"] = "Title";
+  ElementName["Provider"] = "Provider";
 })(ElementName || (ElementName = {}));
 
 export let ActionName;

package/dist/es2019/extractors/flexible/icon/extract-document-type-icon.js

@@ -3,25 +3,46 @@ import { IconType } from '../../../constants';
 const extractDocumentTypeIcon = (documentType, label) => {
   switch (documentType) {
     case 'schema:BlogPosting':
-      return [IconType.Blog, label || 'Blog'];
+      return {
+        icon: IconType.Blog,
+        label: label || 'Blog'
+      };
 
     case 'schema:DigitalDocument':
-      return [IconType.File, label || 'File'];
+      return {
+        icon: IconType.File,
+        label: label || 'File'
+      };
 
     case 'schema:TextDigitalDocument':
-      return [IconType.Document, label || 'Document'];
+      return {
+        icon: IconType.Document,
+        label: label || 'Document'
+      };
 
     case 'schema:PresentationDigitalDocument':
-      return [IconType.Presentation, label || 'Presentation'];
+      return {
+        icon: IconType.Presentation,
+        label: label || 'Presentation'
+      };
 
     case 'schema:SpreadsheetDigitalDocument':
-      return [IconType.Spreadsheet, label || 'Spreadsheet'];
+      return {
+        icon: IconType.Spreadsheet,
+        label: label || 'Spreadsheet'
+      };
 
     case 'atlassian:Template':
-      return [IconType.Template, label || 'Template'];
+      return {
+        icon: IconType.Template,
+        label: label || 'Template'
+      };
 
     case 'atlassian:UndefinedLink':
-      return [IconType.Document, label || 'Undefined link'];
+      return {
+        icon: IconType.Document,
+        label: label || 'Undefined link'
+      };
 
     default:
       return undefined;

package/dist/es2019/extractors/flexible/icon/extract-file-formatIcon.js

@@ -4,66 +4,111 @@ const extractFileFormatIcon = fileFormat => {
   switch (fileFormat) {
     // Generic documents
     case 'folder':
-      return [IconType.Folder, 'Folder'];
+      return {
+        icon: IconType.Folder,
+        label: 'Folder'
+      };
 
     case 'text/plain':
     case 'application/vnd.oasis.opendocument.text':
     case 'application/vnd.apple.pages':
-      return [IconType.Document, 'Document'];
+      return {
+        icon: IconType.Document,
+        label: 'Document'
+      };
 
     case 'application/pdf':
-      return [IconType.PDF, 'PDF document'];
+      return {
+        icon: IconType.PDF,
+        label: 'PDF document'
+      };
 
     case 'application/vnd.oasis.opendocument.presentation':
     case 'application/vnd.apple.keynote':
-      return [IconType.Presentation, 'Presentation'];
+      return {
+        icon: IconType.Presentation,
+        label: 'Presentation'
+      };
 
     case 'application/vnd.oasis.opendocument.spreadsheet':
     case 'application/vnd.apple.numbers':
-      return [IconType.Spreadsheet, 'Spreadsheet'];
+      return {
+        icon: IconType.Spreadsheet,
+        label: 'Spreadsheet'
+      };
     // Google Drive
 
     case 'application/vnd.google-apps.document':
-      return [IconType.GoogleDocs, 'Google Docs'];
+      return {
+        icon: IconType.GoogleDocs,
+        label: 'Google Docs'
+      };
 
     case 'application/vnd.google-apps.form':
-      return [IconType.GoogleForms, 'Google Form'];
+      return {
+        icon: IconType.GoogleForms,
+        label: 'Google Form'
+      };
 
     case 'application/vnd.google-apps.spreadsheet':
-      return [IconType.GoogleSheets, 'Google Sheets'];
+      return {
+        icon: IconType.GoogleSheets,
+        label: 'Google Sheets'
+      };
 
     case 'application/vnd.google-apps.presentation':
-      return [IconType.GoogleSlides, 'Google Slides'];
+      return {
+        icon: IconType.GoogleSlides,
+        label: 'Google Slides'
+      };
     // Microsoft
 
     case 'application/vnd.ms-excel':
     case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-      return [IconType.MSExcel, 'Excel spreadsheet'];
+      return {
+        icon: IconType.MSExcel,
+        label: 'Excel spreadsheet'
+      };
 
     case 'application/vnd.ms-powerpoint':
     case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
-      return [IconType.MSPowerpoint, 'PowerPoint presentation'];
+      return {
+        icon: IconType.MSPowerpoint,
+        label: 'PowerPoint presentation'
+      };
 
     case 'application/msword':
     case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-      return [IconType.MSWord, 'Word document'];
+      return {
+        icon: IconType.MSWord,
+        label: 'Word document'
+      };
 
     case 'image/png':
     case 'image/jpeg':
     case 'image/bmp':
     case 'image/webp':
     case 'image/svg+xml':
-      return [IconType.Image, 'Image'];
+      return {
+        icon: IconType.Image,
+        label: 'Image'
+      };
 
     case 'image/gif':
-      return [IconType.GIF, 'GIF'];
+      return {
+        icon: IconType.GIF,
+        label: 'GIF'
+      };
 
     case 'audio/midi':
     case 'audio/mpeg':
     case 'audio/webm':
     case 'audio/ogg':
     case 'audio/wav':
-      return [IconType.Audio, 'Audio'];
+      return {
+        icon: IconType.Audio,
+        label: 'Audio'
+      };
 
     case 'video/mp4':
     case 'video/quicktime':
@@ -72,13 +117,19 @@ const extractFileFormatIcon = fileFormat => {
     case 'video/ogg':
     case 'video/x-ms-wmv':
     case 'video/x-msvideo':
-      return [IconType.Video, 'Video'];
+      return {
+        icon: IconType.Video,
+        label: 'Video'
+      };
     // Others
 
     case 'text/css':
     case 'text/html':
     case 'application/javascript':
-      return [IconType.Code, 'Source Code'];
+      return {
+        icon: IconType.Code,
+        label: 'Source Code'
+      };
 
     case 'application/zip':
     case 'application/x-tar':
@@ -86,19 +137,34 @@ const extractFileFormatIcon = fileFormat => {
     case 'application/x-7z-compressed':
     case 'application/x-apple-diskimage':
     case 'application/vnd.rar':
-      return [IconType.Archive, 'Archive'];
+      return {
+        icon: IconType.Archive,
+        label: 'Archive'
+      };
 
     case 'application/dmg':
-      return [IconType.Executable, 'Executable'];
+      return {
+        icon: IconType.Executable,
+        label: 'Executable'
+      };
 
     case 'application/sketch':
-      return [IconType.Sketch, 'Sketch'];
+      return {
+        icon: IconType.Sketch,
+        label: 'Sketch'
+      };
 
     case 'application/octet-stream':
-      return [IconType.Generic, 'Binary file'];
+      return {
+        icon: IconType.Generic,
+        label: 'Binary file'
+      };
 
     case 'application/invision.prototype':
-      return [IconType.Generic, 'Prototype'];
+      return {
+        icon: IconType.Generic,
+        label: 'Prototype'
+      };
 
     default:
       return undefined;