@atlaskit/smart-card 17.2.1 → 17.4.0

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

@@ -3,25 +3,46 @@ import { IconType } from '../../../constants';
 var extractDocumentTypeIcon = function 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/esm/extractors/flexible/icon/extract-file-formatIcon.js

@@ -4,66 +4,111 @@ var extractFileFormatIcon = function 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 @@ var extractFileFormatIcon = function 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 @@ var extractFileFormatIcon = function 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;

package/dist/esm/extractors/flexible/icon/extract-jira-task-icon.js

@@ -5,32 +5,59 @@ var extractJiraTaskIcon = function extractJiraTaskIcon(taskType) {
 
   switch (taskType) {
     case 'JiraBug':
-      return [IconType.Bug, label];
+      return {
+        icon: IconType.Bug,
+        label: label
+      };
 
     case 'JiraChange':
-      return [IconType.Change, label];
+      return {
+        icon: IconType.Change,
+        label: label
+      };
 
     case 'JiraEpic':
-      return [IconType.Epic, label];
+      return {
+        icon: IconType.Epic,
+        label: label
+      };
 
     case 'JiraIncident':
-      return [IconType.Incident, label];
+      return {
+        icon: IconType.Incident,
+        label: label
+      };
 
     case 'JiraProblem':
-      return [IconType.Problem, label];
+      return {
+        icon: IconType.Problem,
+        label: label
+      };
 
     case 'JiraServiceRequest':
-      return [IconType.ServiceRequest, label];
+      return {
+        icon: IconType.ServiceRequest,
+        label: label
+      };
 
     case 'JiraStory':
-      return [IconType.Story, label];
+      return {
+        icon: IconType.Story,
+        label: label
+      };
 
     case 'JiraSubTask':
-      return [IconType.SubTask, label];
+      return {
+        icon: IconType.SubTask,
+        label: label
+      };
 
     case 'JiraTask':
     default:
-      return [IconType.Task, label];
+      return {
+        icon: IconType.Task,
+        label: label
+      };
   }
 };
 

package/dist/esm/extractors/flexible/icon/extract-jsonld-data-icon.js

@@ -15,7 +15,10 @@ var extractTask = function extractTask(data, label) {
       url = _ref.icon;
 
   var taskType = id === null || id === void 0 ? void 0 : id.split('#').pop();
-  var taskIcon = url ? [undefined, label, url] : undefined;
+  var taskIcon = url ? {
+    label: label,
+    url: url
+  } : undefined;
   return {
     taskType: taskType,
     taskIcon: taskIcon
@@ -47,7 +50,7 @@ var extractJsonldDataIcon = function extractJsonldDataIcon(data) {
   var type = extractType(data);
   var urlIcon = extractUrlIcon(data.icon, label);
   var provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
-  var providerIcon = extractProviderIcon(provider, generator === null || generator === void 0 ? void 0 : generator.icon, label);
+  var providerIcon = extractProviderIcon(data);
 
   switch (type) {
     case 'Document':
@@ -76,25 +79,46 @@ var extractJsonldDataIcon = function extractJsonldDataIcon(data) {
             taskType = _extractTask.taskType,
             taskIcon = _extractTask.taskIcon;
 
-        return taskType === 'JiraCustomTaskType' ? taskIcon || urlIcon || providerIcon || [IconType.Task, taskLabel] : extractJiraTaskIcon(taskType, taskLabel);
+        return taskType === 'JiraCustomTaskType' ? taskIcon || urlIcon || providerIcon || {
+          icon: IconType.Task,
+          label: taskLabel
+        } : extractJiraTaskIcon(taskType, taskLabel);
       }
 
-      return [IconType.Task, taskLabel];
+      return {
+        icon: IconType.Task,
+        label: taskLabel
+      };
 
     case 'atlassian:Project':
-      return urlIcon || [IconType.Project, label || 'Project'];
+      return urlIcon || {
+        icon: IconType.Project,
+        label: label || 'Project'
+      };
 
     case 'atlassian:SourceCodeCommit':
-      return [IconType.Commit, label || 'Commit'];
+      return {
+        icon: IconType.Commit,
+        label: label || 'Commit'
+      };
 
     case 'atlassian:SourceCodePullRequest':
-      return [IconType.PullRequest, label || 'Pull request'];
+      return {
+        icon: IconType.PullRequest,
+        label: label || 'Pull request'
+      };
 
     case 'atlassian:SourceCodeReference':
-      return [IconType.Branch, label || 'Reference'];
+      return {
+        icon: IconType.Branch,
+        label: label || 'Reference'
+      };
 
     case 'atlassian:SourceCodeRepository':
-      return [IconType.Repo, label || 'Repository'];
+      return {
+        icon: IconType.Repo,
+        label: label || 'Repository'
+      };
 
     default:
       return providerIcon;

package/dist/esm/extractors/flexible/icon/extract-provider-icon.js

@@ -1,14 +1,30 @@
 import { CONFLUENCE_GENERATOR_ID, JIRA_GENERATOR_ID } from '../../constants';
 import { IconType } from '../../../constants';
 import extractUrlIcon from './extract-url-icon';
+import { extractTitle } from '../../common/primitives';
+
+var extractProviderIcon = function extractProviderIcon(data) {
+  if (!data) {
+    return undefined;
+  }
+
+  var generator = data.generator;
+  var provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
+  var icon = generator === null || generator === void 0 ? void 0 : generator.icon;
+  var label = (generator === null || generator === void 0 ? void 0 : generator.name) || extractTitle(data);
 
-var extractProviderIcon = function extractProviderIcon(provider, icon, label) {
   if (provider === CONFLUENCE_GENERATOR_ID) {
-    return [IconType.Confluence, label || 'Confluence'];
+    return {
+      icon: IconType.Confluence,
+      label: label || 'Confluence'
+    };
   }
 
   if (provider === JIRA_GENERATOR_ID) {
-    return [IconType.Jira, label || 'Jira'];
+    return {
+      icon: IconType.Jira,
+      label: label || 'Jira'
+    };
   }
 
   return extractUrlIcon(icon, label);

package/dist/esm/extractors/flexible/icon/extract-url-icon.js

@@ -2,7 +2,10 @@ import { extractUrlFromIconJsonLd } from '../../common/utils';
 
 var extractUrlIcon = function extractUrlIcon(icon, label) {
   var url = icon && extractUrlFromIconJsonLd(icon);
-  return url ? [undefined, label, url] : undefined;
+  return url ? {
+    label: label,
+    url: url
+  } : undefined;
 };
 
 export default extractUrlIcon;

package/dist/esm/extractors/flexible/icon/index.js

@@ -1,36 +1,28 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import extractJsonldDataIcon from './extract-jsonld-data-icon';
 import extractProviderIcon from './extract-provider-icon';
 import { IconType, SmartLinkStatus } from '../../../constants';
 import extractIconRenderer from './extract-icon-renderer';
 export var extractLinkIcon = function extractLinkIcon(response, renderers) {
   var data = response.data;
-
-  var _ref = extractJsonldDataIcon(data) || [],
-      _ref2 = _slicedToArray(_ref, 3),
-      icon = _ref2[0],
-      label = _ref2[1],
-      url = _ref2[2];
-
   var render = extractIconRenderer(data, renderers);
-  return {
-    icon: icon,
-    label: label,
-    render: render,
-    url: url
-  };
+  return _objectSpread(_objectSpread({}, extractJsonldDataIcon(data)), {}, {
+    render: render
+  });
 };
 export var extractErrorIcon = function extractErrorIcon(response, status) {
   // Try to get provider icon first.
   if (response) {
     var data = response.data;
-    var generator = data.generator;
-    var provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
 
-    var _ref3 = extractProviderIcon(provider, generator === null || generator === void 0 ? void 0 : generator.icon) || [],
-        _ref4 = _slicedToArray(_ref3, 3),
-        icon = _ref4[0],
-        url = _ref4[2];
+    var _ref = extractProviderIcon(data) || {},
+        icon = _ref.icon,
+        url = _ref.url;
 
     if (icon || url) {
       return {

package/dist/esm/extractors/flexible/index.js

@@ -1,4 +1,4 @@
-import { extractLink, extractTitle } from '../common/primitives';
+import { extractLink, extractSummary, extractTitle } from '../common/primitives';
 import { extractLozenge } from '../common/lozenge';
 import { extractLinkIcon } from './icon';
 import { extractCommentCount, extractCreatedBy, extractModifiedBy, extractProgrammingLanguage, extractSubscriberCount } from './utils';
@@ -7,6 +7,7 @@ import { extractPersonsUpdatedBy } from './collaboratorGroup';
 import { extractDateUpdated } from '../common/date/extractDateUpdated';
 import { extractDateCreated } from '../common/date/extractDateCreated';
 import extractPriority from './extract-priority';
+import extractProviderIcon from './icon/extract-provider-icon';
 
 var extractFlexibleUiContext = function extractFlexibleUiContext(response, renderers) {
   if (!response) {
@@ -26,9 +27,12 @@ var extractFlexibleUiContext = function extractFlexibleUiContext(response, rende
     modifiedOn: extractDateUpdated(data),
     priority: extractPriority(data),
     programmingLanguage: extractProgrammingLanguage(data),
+    snippet: extractSummary(data) || undefined,
+    // Explicitly set here to remove an empty string
     state: extractLozenge(data),
     subscriberCount: extractSubscriberCount(data),
     title: extractTitle(data) || url,
+    provider: extractProviderIcon(data),
     url: url
   };
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "17.2.1",
+	"version": "17.4.0",
 	"sideEffects": false
 }

package/dist/esm/view/FlexibleCard/components/blocks/metadata-block/index.js

@@ -19,18 +19,32 @@ var getElementGroupStyles = function getElementGroupStyles(size, maxLines) {
   // MetadataBlock allows metadata elements to be displayed in
   // multiple lines, with maximum of 2 lines.
   // a) We need the height of the line to be equal on both left and right
-  //    sides so they line up nicely. 1.75 is the The maximum height of
-  //    all elements in specific size. This height belongs to AvatarGroup.
+  //    sides so they line up nicely.
   // b) There is no way to truncate non-text elements nicely. Here
   //    it's fix max height of the element group so that anything that is
   //    overflown will not be visible.
-  var lineHeight = 1.75;
+  var lineHeight = getLineHeight(size);
   var gap = getGapSize(size);
   var gapHeight = gap * (maxLines - 1);
   var height = lineHeight * maxLines + gapHeight;
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    flex-wrap: wrap;\n    line-height: ", "rem;\n    max-height: ", "rem;\n    > span,\n    > div {\n      min-height: ", "rem;\n      max-height: ", "rem;\n      line-height: ", "rem;\n    }\n  "])), lineHeight, height, lineHeight, lineHeight, lineHeight);
 };
 
+var getLineHeight = function getLineHeight(size) {
+  // The maximum height of all elements in specific size.
+  // These heights belongs to AvatarGroup.
+  switch (size) {
+    case SmartLinkSize.XLarge:
+    case SmartLinkSize.Large:
+      return 1.75;
+
+    case SmartLinkSize.Medium:
+    case SmartLinkSize.Small:
+    default:
+      return 1.5;
+  }
+};
+
 var getMaxLines = function getMaxLines(maxLines) {
   if (maxLines > MAXIMUM_MAX_LINES) {
     return DEFAULT_MAX_LINES;

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

@@ -1,20 +1,23 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["name"],
     _excluded2 = ["name"];
 
-var _templateObject, _templateObject2, _templateObject3;
+var _ElementDisplaySchema, _templateObject, _templateObject2, _templateObject3;
 
 import React from 'react';
 import { css } from '@emotion/core';
-import { SmartLinkDirection, SmartLinkSize } from '../../../../constants';
+import { ElementName, SmartLinkDirection, SmartLinkSize } from '../../../../constants';
 import * as Elements from '../elements';
 import * as Actions from '../actions';
 import { isFlexibleUiElement } from '../../../../utils/flexible';
 import ActionGroup from './action-group';
-import ElementGroup from './element-group';
+import ElementGroup from './element-group'; // Determine whether the element can be display as inline/block.
+
+export var ElementDisplaySchema = (_ElementDisplaySchema = {}, _defineProperty(_ElementDisplaySchema, ElementName.AuthorGroup, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.CollaboratorGroup, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.CommentCount, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.CreatedBy, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.CreatedOn, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.LinkIcon, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.ModifiedBy, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.ModifiedOn, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.Priority, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.ProgrammingLanguage, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.Snippet, ['block']), _defineProperty(_ElementDisplaySchema, ElementName.State, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.SubscriberCount, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.Title, ['inline']), _defineProperty(_ElementDisplaySchema, ElementName.Provider, ['inline']), _ElementDisplaySchema);
 
 var getDirectionStyles = function getDirectionStyles(direction) {
   switch (direction) {
@@ -51,6 +54,16 @@ var isActionGroup = function isActionGroup(node) {
   return /*#__PURE__*/React.isValidElement(node) && node.type === ActionGroup;
 };
 
+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.isValidElement(node) && (isFlexibleUiElement(node) || node.type === ElementGroup);
 };
@@ -70,16 +83,21 @@ export var renderChildren = function renderChildren(children, size) {
 };
 export 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 = _objectWithoutProperties(curr, _excluded);
 
     var Element = Elements[name];
 
-    if (Element) {
-      return [].concat(_toConsumableArray(acc), [/*#__PURE__*/React.createElement(Element, _extends({
+    if (Element && isElementDisplayValid(name, display)) {
+      var element = /*#__PURE__*/React.createElement(Element, _extends({
         key: idx
-      }, props))]);
+      }, props));
+
+      if (!isElementNull(element)) {
+        return [].concat(_toConsumableArray(acc), [element]);
+      }
     }
 
     return acc;

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

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