@atlaskit/smart-card 19.1.27 → 19.1.30

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/smart-card
 
+## 19.1.30
+
+### Patch Changes
+
+- [`3a2bc5af606`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3a2bc5af606) - Flexible UI: Add pull request source and target branch element (text)
+  Hover Preview: Update Bitbucket metadata for pull request link
+
+## 19.1.29
+
+### Patch Changes
+
+- [`acfb4cbb01f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/acfb4cbb01f) - set hover card z-index to 511 to go over issue view modal
+
+## 19.1.28
+
+### Patch Changes
+
+- [`455538b6a3f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/455538b6a3f) - use useFeatureFlag hook to get hover preview FF
+
 ## 19.1.27
 
 ### Patch Changes

package/dist/cjs/constants.js

@@ -102,7 +102,7 @@ var SmartLinkWidth;
  * When adding an element...
  * 1) Create base element if it doesn't already exist.
  *    Base element are inside src/view/FlexibleCard/components/elements.
- *    E.g. Badge,DateTime, Icon, Lozenge, etc.
+ *    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)
@@ -143,8 +143,10 @@ exports.ElementName = ElementName;
   ElementName["Provider"] = "Provider";
   ElementName["ReactCount"] = "ReactCount";
   ElementName["Snippet"] = "Snippet";
+  ElementName["SourceBranch"] = "SourceBranch";
   ElementName["State"] = "State";
   ElementName["SubscriberCount"] = "SubscriberCount";
+  ElementName["TargetBranch"] = "TargetBranch";
   ElementName["Title"] = "Title";
   ElementName["ViewCount"] = "ViewCount";
   ElementName["VoteCount"] = "VoteCount";

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

@@ -47,19 +47,21 @@ var extractFlexibleUiContext = function extractFlexibleUiContext(response, rende
     voteCount: (0, _utils.extractVoteCount)(data),
     createdBy: (0, _utils.extractCreatedBy)(data),
     createdOn: (0, _extractDateCreated.extractDateCreated)(data),
+    latestCommit: (0, _latestCommit.extractLatestCommit)(data),
     linkIcon: (0, _icon.extractLinkIcon)(response, renderers),
     modifiedBy: (0, _utils.extractModifiedBy)(data),
     modifiedOn: (0, _extractDateUpdated.extractDateUpdated)(data),
     preview: (0, _extractPreview.default)(data),
     priority: (0, _extractPriority.default)(data),
+    provider: (0, _extractProviderIcon.default)(data),
     programmingLanguage: (0, _utils.extractProgrammingLanguage)(data),
     snippet: (0, _primitives.extractSummary)(data) || undefined,
     // Explicitly set here to remove an empty string
+    sourceBranch: (0, _utils.extractSourceBranch)(data),
     state: (0, _lozenge.extractLozenge)(data),
     subscriberCount: (0, _utils.extractSubscriberCount)(data),
+    targetBranch: (0, _utils.extractTargetBranch)(data),
     title: (0, _primitives.extractTitle)(data) || url,
-    provider: (0, _extractProviderIcon.default)(data),
-    latestCommit: (0, _latestCommit.extractLatestCommit)(data),
     url: url
   };
 };

package/dist/cjs/extractors/flexible/utils.js

@@ -1,12 +1,22 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.extractVoteCount = exports.extractViewCount = exports.extractSubscriberCount = exports.extractReactCount = exports.extractProgrammingLanguage = exports.extractModifiedBy = exports.extractCreatedBy = exports.extractCommentCount = void 0;
+exports.extractVoteCount = exports.extractViewCount = exports.extractTargetBranch = exports.extractSubscriberCount = exports.extractSourceBranch = exports.extractReactCount = exports.extractProgrammingLanguage = exports.extractModifiedBy = exports.extractCreatedBy = exports.extractCommentCount = void 0;
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _person = require("../common/person");
 
+var extractLinkName = function extractLinkName(link) {
+  if (link && (0, _typeof2.default)(link) === 'object' && link['@type'] === 'Link') {
+    return link.name;
+  }
+};
+
 var extractValue = function extractValue(data, key) {
   return data === null || data === void 0 ? void 0 : data[key];
 };
@@ -61,8 +71,20 @@ var extractProgrammingLanguage = function extractProgrammingLanguage(data) {
 
 exports.extractProgrammingLanguage = extractProgrammingLanguage;
 
+var extractSourceBranch = function extractSourceBranch(data) {
+  return extractLinkName(data['atlassian:mergeSource']);
+};
+
+exports.extractSourceBranch = extractSourceBranch;
+
 var extractSubscriberCount = function extractSubscriberCount(data) {
   return extractValue(data, 'atlassian:subscriberCount');
 };
 
-exports.extractSubscriberCount = extractSubscriberCount;
+exports.extractSubscriberCount = extractSubscriberCount;
+
+var extractTargetBranch = function extractTargetBranch(data) {
+  return extractLinkName(data['atlassian:mergeDestination']);
+};
+
+exports.extractTargetBranch = extractTargetBranch;

package/dist/cjs/extractors/hover/extractMetadata.js

@@ -19,12 +19,13 @@ var elementNamesToItems = function elementNamesToItems(elementNames) {
 };
 
 var extractMetadata = function extractMetadata(jsonLd) {
-  var _jsonLd$metadata, _metadata$primary, _metadata$secondary;
+  var _jsonLd$metadata, _metadata$primary, _metadata$secondary, _metadata$subtitle;
 
   var metadata = (_jsonLd$metadata = jsonLd.metadata) !== null && _jsonLd$metadata !== void 0 ? _jsonLd$metadata : [];
   return {
     primary: elementNamesToItems((_metadata$primary = metadata.primary) !== null && _metadata$primary !== void 0 ? _metadata$primary : []),
-    secondary: elementNamesToItems((_metadata$secondary = metadata.secondary) !== null && _metadata$secondary !== void 0 ? _metadata$secondary : [])
+    secondary: elementNamesToItems((_metadata$secondary = metadata.secondary) !== null && _metadata$secondary !== void 0 ? _metadata$secondary : []),
+    subtitle: elementNamesToItems((_metadata$subtitle = metadata.subtitle) !== null && _metadata$subtitle !== void 0 ? _metadata$subtitle : [])
   };
 };
 

package/dist/cjs/version.json

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

package/dist/cjs/view/CardWithUrl/component.js

@@ -11,6 +11,8 @@ exports.CardWithUrlContent = CardWithUrlContent;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _linkProvider = require("@atlaskit/link-provider");
+
 var _utils = require("../../utils");
 
 var measure = _interopRequireWildcard(require("../../utils/performance"));
@@ -73,7 +75,13 @@ function CardWithUrlContent(_ref) {
   var services = (0, _helpers.getServices)(state.details);
   var isFlexibleUi = (0, _react.useMemo)(function () {
     return (0, _flexible.isFlexibleUiCard)(children);
-  }, [children]); // Setup UI handlers.
+  }, [children]);
+  var showHoverPreviewFlag = (0, _linkProvider.useFeatureFlag)('showHoverPreview');
+
+  if (showHoverPreview === undefined && showHoverPreviewFlag !== undefined) {
+    showHoverPreview = showHoverPreviewFlag;
+  } // Setup UI handlers.
+
 
   var handleClick = (0, _react.useCallback)(function (event) {
     var clickUrl = (0, _helpers.getClickUrl)(url, state.details);

package/dist/cjs/view/FlexibleCard/components/blocks/block/index.js

@@ -20,7 +20,7 @@ var _utils = require("../utils");
 var _templateObject;
 
 var getBlockStyles = function getBlockStyles(direction, size) {
-  return (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  justify-content: flex-start;\n  [data-separator] + [data-separator]:before {\n    content: '\u2022';\n    margin-right: ", "rem;\n  }\n"])), (0, _utils.getBaseStyles)(direction, size), (0, _utils.getGapSize)(size));
+  return (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  justify-content: flex-start;\n  [data-separator] + [data-separator]:before {\n    content: '\u2022';\n    margin-right: ", "rem;\n  }\n  // Pull request elements: source branch \u2192 target branch\n  [data-smart-element='", "']\n    + [data-smart-element='", "']:before {\n    content: '\u2192';\n  }\n  // Pull request elements: target branch \u2190 source branch\n  [data-smart-element='", "']\n    + [data-smart-element='", "']:before {\n    content: '\u2190';\n  }\n"])), (0, _utils.getBaseStyles)(direction, size), (0, _utils.getGapSize)(size), _constants.ElementName.SourceBranch, _constants.ElementName.TargetBranch, _constants.ElementName.TargetBranch, _constants.ElementName.SourceBranch);
 };
 /**
  * A block represents a collection of elements and actions that are arranged

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

@@ -48,7 +48,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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) { (0, _defineProperty2.default)(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; }
 
-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.ViewCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.ReactCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.VoteCount, ['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.Preview, ['block']), (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']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.LatestCommit, ['inline']), _ElementDisplaySchema);
+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.ViewCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.ReactCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.VoteCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.CreatedBy, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.CreatedOn, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.LatestCommit, ['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.Preview, ['block']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Priority, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.ProgrammingLanguage, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Provider, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Snippet, ['block']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.SourceBranch, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.State, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.SubscriberCount, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.TargetBranch, ['inline']), (0, _defineProperty2.default)(_ElementDisplaySchema, _constants.ElementName.Title, ['inline']), _ElementDisplaySchema);
 exports.ElementDisplaySchema = ElementDisplaySchema;
 
 var getDirectionStyles = function getDirectionStyles(direction) {

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

@@ -50,6 +50,7 @@ var AvatarGroup = function AvatarGroup(_ref) {
       items = _ref$items === void 0 ? [] : _ref$items,
       _ref$maxCount = _ref.maxCount,
       maxCount = _ref$maxCount === void 0 ? MAX_COUNT : _ref$maxCount,
+      name = _ref.name,
       overrideCss = _ref.overrideCss,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? _constants.SmartLinkSize.Medium : _ref$size,
@@ -63,6 +64,7 @@ var AvatarGroup = function AvatarGroup(_ref) {
   return (0, _core.jsx)("span", {
     css: [getStyles(size), overrideCss],
     "data-fit-to-content": true,
+    "data-smart-element": name,
     "data-smart-element-avatar-group": true,
     "data-testid": testId
   }, (0, _core.jsx)(_avatarGroup.default, {

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

@@ -82,6 +82,7 @@ var renderImageIcon = function renderImageIcon(url, testId) {
 var Badge = function Badge(_ref) {
   var icon = _ref.icon,
       label = _ref.label,
+      name = _ref.name,
       overrideCss = _ref.overrideCss,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'smart-element-badge' : _ref$testId,
@@ -96,6 +97,7 @@ var Badge = function Badge(_ref) {
   return (0, _core.jsx)("span", {
     css: [badgeStyles, overrideCss],
     "data-fit-to-content": true,
+    "data-smart-element": name,
     "data-smart-element-badge": true,
     "data-testid": testId
   }, (0, _core.jsx)("span", {

package/dist/cjs/view/FlexibleCard/components/elements/date-time/index.js

@@ -48,6 +48,7 @@ var typeToDescriptorMap = {
 
 var DateTime = function DateTime(_ref) {
   var date = _ref.date,
+      name = _ref.name,
       overrideCss = _ref.overrideCss,
       type = _ref.type,
       _ref$testId = _ref.testId,
@@ -87,6 +88,7 @@ var DateTime = function DateTime(_ref) {
   return (0, _core.jsx)("span", {
     css: [styles, overrideCss],
     "data-separator": true,
+    "data-smart-element": name,
     "data-smart-element-date-time": true,
     "data-testid": testId
   }, text ? "".concat(text, " ").concat(context) : (0, _core.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, typeToDescriptorMap[type][typeVariant], {

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

@@ -88,6 +88,7 @@ var Icon = function Icon(_ref) {
   var icon = _ref.icon,
       _ref$label = _ref.label,
       label = _ref$label === void 0 ? 'Link' : _ref$label,
+      name = _ref.name,
       _ref$position = _ref.position,
       position = _ref$position === void 0 ? _constants.SmartLinkPosition.Top : _ref$position,
       overrideCss = _ref.overrideCss,
@@ -107,6 +108,7 @@ var Icon = function Icon(_ref) {
   return (0, _core.jsx)("div", {
     css: [styles, renderStyles, overrideCss],
     "data-fit-to-content": true,
+    "data-smart-element": name,
     "data-smart-element-icon": true,
     "data-testid": testId
   }, element);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VoteCount = exports.ViewCount = exports.Title = exports.SubscriberCount = exports.State = exports.Snippet = exports.ReactCount = exports.Provider = exports.ProgrammingLanguage = exports.Priority = exports.Preview = exports.ModifiedOn = exports.ModifiedBy = exports.LinkIcon = exports.LatestCommit = exports.CreatedOn = exports.CreatedBy = exports.CommentCount = exports.CollaboratorGroup = exports.AuthorGroup = void 0;
+exports.VoteCount = exports.ViewCount = exports.Title = exports.TargetBranch = exports.SubscriberCount = exports.State = exports.SourceBranch = exports.Snippet = exports.ReactCount = exports.Provider = exports.ProgrammingLanguage = exports.Priority = exports.Preview = exports.ModifiedOn = exports.ModifiedBy = exports.LinkIcon = exports.LatestCommit = exports.CreatedOn = exports.CreatedBy = exports.CommentCount = exports.CollaboratorGroup = exports.AuthorGroup = void 0;
 
 var _utils = require("./utils");
 
@@ -115,12 +115,19 @@ var ReactCount = (0, _utils.createElement)(_constants.ElementName.ReactCount);
 
 exports.ReactCount = ReactCount;
 var Snippet = (0, _utils.createElement)(_constants.ElementName.Snippet);
+/**
+ * Creates a SourceBranch Text element using the data from sourceBranch in the Flexible UI Context.
+ * @see Text
+ */
+
+exports.Snippet = Snippet;
+var SourceBranch = (0, _utils.createElement)(_constants.ElementName.SourceBranch);
 /**
  * Creates a State Lozenge element using the data from State in the Flexible UI Context.
  * @see Lozenge
  */
 
-exports.Snippet = Snippet;
+exports.SourceBranch = SourceBranch;
 var State = (0, _utils.createElement)(_constants.ElementName.State);
 /**
  * Creates a SubscriberCount Badge element using the data from SubscriberCount in the Flexible UI Context.
@@ -129,13 +136,20 @@ var State = (0, _utils.createElement)(_constants.ElementName.State);
 
 exports.State = State;
 var SubscriberCount = (0, _utils.createElement)(_constants.ElementName.SubscriberCount);
+/**
+ * Creates a TargetBranch Text element using the data from targetBranch in the Flexible UI Context.
+ * @see Text
+ */
+
+exports.SubscriberCount = SubscriberCount;
+var TargetBranch = (0, _utils.createElement)(_constants.ElementName.TargetBranch);
 /**
  * Creates a Title Link element using the data from Title in the Flexible UI Context.
  * This represents the main link text within the Smart Link.
  * @see Link
  */
 
-exports.SubscriberCount = SubscriberCount;
+exports.TargetBranch = TargetBranch;
 var Title = (0, _utils.createElement)(_constants.ElementName.Title);
 /**
  * Creates a ViewCount Badge element using the data from ViewCount in the Flexible UI Context.

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

@@ -82,6 +82,7 @@ var Link = function Link(_ref) {
   var hideTooltip = _ref.hideTooltip,
       _ref$maxLines = _ref.maxLines,
       maxLines = _ref$maxLines === void 0 ? DEFAULT_MAX_LINES : _ref$maxLines,
+      name = _ref.name,
       overrideCss = _ref.overrideCss,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? _constants.SmartLinkSize.Medium : _ref$size,
@@ -98,6 +99,7 @@ var Link = function Link(_ref) {
   }, [text]);
   var anchor = (0, _core.jsx)("a", {
     css: [getAnchorStyles(size, theme, getMaxLines(maxLines), hasSpace), overrideCss],
+    "data-smart-element": name,
     "data-smart-element-link": true,
     "data-testid": testId,
     onClick: onClick,

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

@@ -28,6 +28,7 @@ var styles = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTem
 var Lozenge = function Lozenge(_ref) {
   var _ref$appearance = _ref.appearance,
       appearance = _ref$appearance === void 0 ? 'default' : _ref$appearance,
+      name = _ref.name,
       overrideCss = _ref.overrideCss,
       text = _ref.text,
       _ref$testId = _ref.testId,
@@ -40,6 +41,7 @@ var Lozenge = function Lozenge(_ref) {
   return (0, _core.jsx)("span", {
     css: [styles, overrideCss],
     "data-fit-to-content": true,
+    "data-smart-element": name,
     "data-smart-element-lozenge": true,
     "data-testid": testId
   }, (0, _core.jsx)(_lozenge.default, {

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

@@ -36,7 +36,8 @@ var styles = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTem
  */
 
 var Media = function Media(_ref) {
-  var overrideCss = _ref.overrideCss,
+  var name = _ref.name,
+      overrideCss = _ref.overrideCss,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'smart-element-media' : _ref$testId,
       type = _ref.type,
@@ -48,6 +49,7 @@ var Media = function Media(_ref) {
 
   return (0, _core.jsx)("div", {
     css: [styles, overrideCss],
+    "data-smart-element": name,
     "data-smart-element-media": true,
     "data-testid": testId
   }, (0, _core.jsx)(_imageIcon.default, {

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

@@ -35,6 +35,7 @@ var Text = function Text(_ref) {
       _ref$maxLines = _ref.maxLines,
       maxLines = _ref$maxLines === void 0 ? 1 : _ref$maxLines,
       message = _ref.message,
+      name = _ref.name,
       overrideCss = _ref.overrideCss,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'smart-element-text' : _ref$testId;
@@ -46,6 +47,7 @@ var Text = function Text(_ref) {
   return (0, _core.jsx)("span", {
     css: [getStyles(maxLines), overrideCss],
     "data-separator": true,
+    "data-smart-element": name,
     "data-smart-element-text": true,
     "data-testid": testId
   }, (0, _utils.getFormattedMessage)(message) || content);

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

@@ -76,10 +76,19 @@ var elementMappings = (_elementMappings = {}, (0, _defineProperty2.default)(_ele
   }
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.CreatedBy, {
   component: _text.default
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.CreatedOn, {
+  component: _dateTime.default
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.LatestCommit, {
+  component: _badge.default,
+  props: {
+    icon: _constants.IconType.Commit
+  }
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.LinkIcon, {
   component: _icon.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.ModifiedBy, {
   component: _text.default
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.ModifiedOn, {
+  component: _dateTime.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Preview, {
   component: _media.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Priority, {
@@ -89,12 +98,16 @@ var elementMappings = (_elementMappings = {}, (0, _defineProperty2.default)(_ele
   props: {
     icon: _constants.IconType.ProgrammingLanguage
   }
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Provider, {
+  component: _badge.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Snippet, {
   component: _text.default,
   props: {
     maxLines: SNIPPET_DEFAULT_MAX_LINES,
     overrideCss: (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n        color: ", ";\n      "])), _token.tokens.snippet)
   }
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.SourceBranch, {
+  component: _text.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.State, {
   component: _lozenge.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.SubscriberCount, {
@@ -102,19 +115,10 @@ var elementMappings = (_elementMappings = {}, (0, _defineProperty2.default)(_ele
   props: {
     icon: _constants.IconType.Subscriber
   }
+}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.TargetBranch, {
+  component: _text.default
 }), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Title, {
   component: _link.default
-}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.CreatedOn, {
-  component: _dateTime.default
-}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.ModifiedOn, {
-  component: _dateTime.default
-}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.Provider, {
-  component: _badge.default
-}), (0, _defineProperty2.default)(_elementMappings, _constants.ElementName.LatestCommit, {
-  component: _badge.default,
-  props: {
-    icon: _constants.IconType.Commit
-  }
 }), _elementMappings);
 
 var getContextKey = function getContextKey(name) {
@@ -157,6 +161,8 @@ var getData = function getData(elementName, contextKey, context) {
       return toDateTimeProps('modified', context.modifiedOn);
 
     case _constants.ElementName.Snippet:
+    case _constants.ElementName.SourceBranch:
+    case _constants.ElementName.TargetBranch:
       return toTextProps(data);
 
     case _constants.ElementName.Title:
@@ -224,7 +230,9 @@ var createElement = function createElement(name) {
   return function (overrides) {
     var context = (0, _react.useContext)(_flexibleUiContext.FlexibleUiContext);
     var data = getData(name, contextKey, context);
-    return data ? /*#__PURE__*/_react.default.createElement(BaseElement, (0, _extends2.default)({}, props, data, overrides)) : null;
+    return data ? /*#__PURE__*/_react.default.createElement(BaseElement, (0, _extends2.default)({}, props, data, overrides, {
+      name: name
+    })) : null;
   };
 };
 

package/dist/cjs/view/HoverCard/components/hover-card-content.js

@@ -31,6 +31,8 @@ var _helpers = require("../../../state/helpers");
 
 var _styled = require("../styled");
 
+var _extractType = require("../../../extractors/common/primitives/extractType");
+
 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; }
@@ -99,13 +101,16 @@ var HoverCardContent = function HoverCardContent(_ref) {
   }, [url, analytics]);
   var footerActions = (0, _react.useMemo)(function () {
     return toFooterActions(cardActions);
-  }, [cardActions]); //TODO: EDM-3224 deleted simulated and use real JsonLd
+  }, [cardActions]);
+  var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
+  var types = data ? (0, _extractType.extractType)(data) : undefined; //TODO: EDM-3224 deleted simulated and use real JsonLd
 
-  var _extractMetadata = (0, _extractMetadata2.extractMetadata)((0, _utils.getSimulatedMetadata)(extensionKey)),
+  var _extractMetadata = (0, _extractMetadata2.extractMetadata)((0, _utils.getSimulatedMetadata)(extensionKey, types)),
       primary = _extractMetadata.primary,
-      secondary = _extractMetadata.secondary;
+      secondary = _extractMetadata.secondary,
+      subtitle = _extractMetadata.subtitle;
 
-  var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
+  var titleMaxLines = subtitle && subtitle.length > 0 ? 1 : 2;
   var body = data && (0, _extractPreview.default)(data) ? /*#__PURE__*/_react.default.createElement(_blocks.PreviewBlock, null) : /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, null);
   return /*#__PURE__*/_react.default.createElement(_FlexibleCard.default, {
     cardState: cardState,
@@ -116,9 +121,11 @@ var HoverCardContent = function HoverCardContent(_ref) {
     url: url
   }, /*#__PURE__*/_react.default.createElement(_blocks.TitleBlock, {
     actions: titleActions,
+    maxLines: titleMaxLines,
     overrideCss: _styled.titleBlockCss,
     size: _constants.SmartLinkSize.Large,
-    position: _constants.SmartLinkPosition.Center
+    position: _constants.SmartLinkPosition.Center,
+    subtitle: subtitle
   }), /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, {
     primary: primary,
     secondary: secondary,

package/dist/cjs/view/HoverCard/index.js

@@ -127,7 +127,7 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
         onMouseLeave: initHideCard
       }), children);
     },
-    zIndex: 501 // Temporary fix for Confluence inline comment on editor mod has z-index of 500
+    zIndex: 511 // Temporary fix for Confluence inline comment on editor mod has z-index of 500, Jira issue view has z-index of 510
 
   });
 };

package/dist/cjs/view/HoverCard/styled.js

@@ -13,13 +13,16 @@ var _core = require("@emotion/core");
 
 var _index = require("../../index");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
-var HoverCardContainer = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: none;\n  border-width: 0;\n  box-sizing: border-box;\n  width: 24rem;\n  padding: 1rem;\n\n  .", " {\n    display: none;\n  }\n"])), _index.loadingPlaceholderClassName);
+var blockGap = '0.5rem';
+var elementGap = '0.5rem';
+var separatorCss = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  [data-separator] + [data-separator]:before {\n    margin-right: ", ";\n  }\n"])), elementGap);
+var HoverCardContainer = (0, _core.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  background: none;\n  border-width: 0;\n  box-sizing: border-box;\n  width: 24rem;\n  padding: 1rem;\n\n  .", " {\n    display: none;\n  }\n"])), _index.loadingPlaceholderClassName);
 exports.HoverCardContainer = HoverCardContainer;
-var titleBlockCss = (0, _core.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  gap: 0.5rem;\n"])));
+var titleBlockCss = (0, _core.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  gap: ", ";\n\n  ", "\n\n  // title and subtitle element group\n  [data-smart-element-group] {\n    // gap between title and subtitle\n    gap: 0.06rem;\n\n    /* subtitle element group */\n    > [data-smart-element-group] {\n      > span {\n        margin-right: ", ";\n      }\n    }\n  }\n"])), blockGap, separatorCss, elementGap);
 exports.titleBlockCss = titleBlockCss;
-var metadataBlockCss = (0, _core.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  gap: 0px;\n\n  /* primary element group */\n  [data-smart-element-group]:first-of-type {\n    flex-grow: 7;\n    /* horizontal spacing between elements in group */\n    > span {\n      margin-right: 0.5rem;\n    }\n  }\n  /* secondary element group */\n  [data-smart-element-group]:last-of-type {\n    flex-grow: 3;\n    /* horizontal spacing between elements in group */\n    > span {\n      margin-left: 0.5rem;\n    }\n  }\n"])));
+var metadataBlockCss = (0, _core.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  gap: 0px;\n\n  /* primary element group */\n  [data-smart-element-group]:nth-of-type(1) {\n    flex-grow: 7;\n\n    // a separator between text-based element\n    ", "\n\n    /* horizontal spacing between elements in group */\n    > span {\n      margin-right: ", ";\n    }\n  }\n  /* secondary element group */\n  [data-smart-element-group]:nth-of-type(2) {\n    flex-grow: 3;\n    /* horizontal spacing between elements in group */\n    > span {\n      margin-left: ", ";\n    }\n  }\n"])), separatorCss, elementGap, elementGap);
 exports.metadataBlockCss = metadataBlockCss;
-var footerBlockCss = (0, _core.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  padding-top: 0.25rem;\n"])));
+var footerBlockCss = (0, _core.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  padding-top: 0.25rem;\n"])));
 exports.footerBlockCss = footerBlockCss;

package/dist/cjs/view/HoverCard/utils.js

@@ -12,13 +12,35 @@ exports.HOVER_CARD_ANALYTICS_DISPLAY = HOVER_CARD_ANALYTICS_DISPLAY;
 
 var getSimulatedMetadata = function getSimulatedMetadata() {
   var extensionKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var types = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
 
   switch (extensionKey) {
+    case 'bitbucket-object-provider':
+    case 'native-bitbucket-object-provider':
+      if (types.includes('atlassian:SourceCodePullRequest')) {
+        return {
+          metadata: {
+            primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.ModifiedOn, _constants.ElementName.SubscriberCount, _constants.ElementName.State],
+            secondary: [],
+            subtitle: [_constants.ElementName.SourceBranch, _constants.ElementName.TargetBranch]
+          }
+        };
+      }
+
+      return {
+        metadata: {
+          primary: [_constants.ElementName.ModifiedOn, _constants.ElementName.CreatedBy],
+          secondary: [],
+          subtitle: []
+        }
+      };
+
     case 'confluence-object-provider':
       return {
         metadata: {
           primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.CreatedBy],
-          secondary: [_constants.ElementName.CommentCount, _constants.ElementName.ReactCount]
+          secondary: [_constants.ElementName.CommentCount, _constants.ElementName.ReactCount],
+          subtitle: []
         }
       };
 
@@ -26,7 +48,8 @@ var getSimulatedMetadata = function getSimulatedMetadata() {
       return {
         metadata: {
           primary: [_constants.ElementName.AuthorGroup, _constants.ElementName.State, _constants.ElementName.Priority],
-          secondary: []
+          secondary: [],
+          subtitle: []
         }
       };
 
@@ -34,7 +57,8 @@ var getSimulatedMetadata = function getSimulatedMetadata() {
       return {
         metadata: {
           primary: [_constants.ElementName.ModifiedOn, _constants.ElementName.CreatedBy],
-          secondary: []
+          secondary: [],
+          subtitle: []
         }
       };
   }

package/dist/es2019/constants.js

@@ -83,7 +83,7 @@ export let SmartLinkWidth;
  * When adding an element...
  * 1) Create base element if it doesn't already exist.
  *    Base element are inside src/view/FlexibleCard/components/elements.
- *    E.g. Badge,DateTime, Icon, Lozenge, etc.
+ *    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)
@@ -120,8 +120,10 @@ export let ElementName;
   ElementName["Provider"] = "Provider";
   ElementName["ReactCount"] = "ReactCount";
   ElementName["Snippet"] = "Snippet";
+  ElementName["SourceBranch"] = "SourceBranch";
   ElementName["State"] = "State";
   ElementName["SubscriberCount"] = "SubscriberCount";
+  ElementName["TargetBranch"] = "TargetBranch";
   ElementName["Title"] = "Title";
   ElementName["ViewCount"] = "ViewCount";
   ElementName["VoteCount"] = "VoteCount";