@atlaskit/smart-card 45.23.3 → 45.24.0

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

@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useSmartLinkContext } from '@atlaskit/link-provider/context';
 import { useAnalyticsEvents as useAnalyticsEventsNext } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { extractSmartLinkEmbed } from '@atlaskit/link-extractors/extract-smart-link-embed';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
@@ -92,6 +93,10 @@ function Component({
     isPreviewPanelAvailable,
     openPreviewPanel
   } = useSmartLink(id, url, appearance);
+  const {
+    linkNavigation
+  } = useSmartLinkContext();
+  const resolveNavigation = fg('confluence_ep_shim_macro_links_v2') && isFlexibleUi ? linkNavigation : undefined;
   const ari = getObjectAri(state.details);
   const name = getObjectName(state.details);
   const definitionId = getDefinitionId(state.details);
@@ -122,9 +127,11 @@ function Component({
     const preferredUrl = (_getClickUrl = getClickUrl(url, state.details)) !== null && _getClickUrl !== void 0 ? _getClickUrl : url;
     return (_appendCrossProductAn = appendCrossProductAnalyticsParams(preferredUrl)) !== null && _appendCrossProductAn !== void 0 ? _appendCrossProductAn : preferredUrl;
   }, [appendCrossProductAnalyticsParams, state.details, url]);
+  const navigation = useMemo(() => resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl()), [getDestinationUrl, resolveNavigation]);
 
   // Setup UI handlers.
   const handleClickWrapper = useCallback(event => {
+    var _resolveNavigation$ur;
     const isModifierKeyPressed = isSpecialKey(event) || isSpecialClick(event);
     fireEvent('ui.smartLink.clicked', {
       id,
@@ -169,7 +176,7 @@ function Component({
       });
       return;
     }
-    const destinationUrl = getDestinationUrl();
+    const destinationUrl = (_resolveNavigation$ur = resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl()).url) !== null && _resolveNavigation$ur !== void 0 ? _resolveNavigation$ur : getDestinationUrl();
     updateAnchorHref(event, destinationUrl);
 
     // For FlexibleCard, read target from the clicked anchor element (e.g. _blank for links
@@ -177,7 +184,8 @@ function Component({
     const {
       target: anchorTarget
     } = getAnchorAttributesFromEvent(event);
-    const target = isSpecialEvent(event) ? '_blank' : isFlexibleUi ? anchorTarget : '_self';
+    const openInNewTab = resolveNavigation ? event.metaKey || event.ctrlKey || event.shiftKey || event.button === 1 : isSpecialEvent(event);
+    const target = openInNewTab ? '_blank' : isFlexibleUi ? anchorTarget : '_self';
     onClick === null || onClick === void 0 ? void 0 : onClick(event, {
       url,
       destinationUrl
@@ -204,12 +212,13 @@ function Component({
         clickOutcome: target === '_blank' ? 'clickThroughNewTabOrWindow' : 'clickThrough'
       }
     } : undefined);
-  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, getDestinationUrl, onClick, url, state.details, ari, name, fire3PClickEvent, shouldFire3PClickEvent, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, disablePreviewPanel]);
+  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, getDestinationUrl, resolveNavigation, onClick, url, state.details, ari, name, fire3PClickEvent, shouldFire3PClickEvent, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, disablePreviewPanel]);
 
   // Middle-click handler to trigger fire3PClickEvent on middle-clicks.
   // Scope is limited to 3P click analytics.
   const handleFrameAuxClick = useCallback(event => {
-    const destinationUrl = getDestinationUrl();
+    var _resolveNavigation$ur2;
+    const destinationUrl = (_resolveNavigation$ur2 = resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl()).url) !== null && _resolveNavigation$ur2 !== void 0 ? _resolveNavigation$ur2 : getDestinationUrl();
     updateAnchorHref(event, destinationUrl);
 
     // isAuxClick filters Windows right-clicks (button === 2) that also fire onAuxClick.
@@ -218,19 +227,20 @@ function Component({
         isAuxClick: true
       });
     }
-  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent]);
+  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent, resolveNavigation]);
 
   // Right-click handler to trigger fire3PClickEvent on right-clicks.
   // Scope is limited to 3P click analytics.
   const handleFrameContextMenu = useCallback(event => {
-    const destinationUrl = getDestinationUrl();
+    var _resolveNavigation$ur3;
+    const destinationUrl = (_resolveNavigation$ur3 = resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl()).url) !== null && _resolveNavigation$ur3 !== void 0 ? _resolveNavigation$ur3 : getDestinationUrl();
     updateAnchorHref(event, destinationUrl);
     if (shouldFire3PClickEvent) {
       fire3PClickEvent === null || fire3PClickEvent === void 0 ? void 0 : fire3PClickEvent({
         isContextMenu: true
       });
     }
-  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent]);
+  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent, resolveNavigation]);
   const {
     reload
   } = actions;
@@ -363,6 +373,7 @@ function Component({
     return /*#__PURE__*/React.createElement(FlexibleCard, {
       id: id,
       cardState: cardState,
+      navigation: navigation,
       placeholderData: placeholderData,
       onAuthorize: services.length && handleAuthorize || undefined,
       onClick: handleClickWrapper,

package/dist/es2019/view/FlexibleCard/components/actions/automation-action/automation-manual-triggers/manual-triggers-modal/sub-components/header/main.js

@@ -6,7 +6,9 @@ import { defineMessages, useIntl } from 'react-intl';
 import Heading from '@atlaskit/heading/heading';
 import AutomationIcon from '@atlaskit/icon/core/automation';
 import ModalHeader from '@atlaskit/modal-dialog/modal-header';
+import ModalTitle from '@atlaskit/modal-dialog/modal-title';
 import { useModal } from '@atlaskit/modal-dialog/hooks';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box, Inline, Stack } from '@atlaskit/primitives/compiled';
 import { useAutomationMenu } from '../../menu-context/useAutomationMenu';
 const styles = {
@@ -35,28 +37,24 @@ export const AutomationModalHeader = ({
     titleId
   } = useModal();
   const showDescription = initialised && rules.length > 0 && !!modalDescription;
-  return (
-    /*#__PURE__*/
-    // eslint-disable-next-line @atlaskit/design-system/use-modal-title
-    React.createElement(ModalHeader, {
-      hasCloseButton: true
-    }, /*#__PURE__*/React.createElement(Stack, null, /*#__PURE__*/React.createElement(Inline, {
-      alignBlock: "center"
-    }, /*#__PURE__*/React.createElement(Box, {
-      xcss: styles.iconStyle
-      // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-      ,
-      backgroundColor: "color.background.accent.green.subtlest"
-    }, /*#__PURE__*/React.createElement(AutomationIcon, {
-      size: "small",
-      label: formatMessage(i18n.modalHeaderIconLabel),
-      color: "var(--ds-icon-accent-green, #22A06B)",
-      spacing: "compact"
-    })), /*#__PURE__*/React.createElement(Heading, {
-      size: "medium",
-      id: titleId
-    }, modalTitle)), showDescription && /*#__PURE__*/React.createElement(Box, {
-      xcss: styles.modalDescriptionStyle
-    }, modalDescription)))
-  );
+  return /*#__PURE__*/React.createElement(ModalHeader, {
+    hasCloseButton: true
+  }, /*#__PURE__*/React.createElement(Stack, null, /*#__PURE__*/React.createElement(Inline, {
+    alignBlock: "center"
+  }, /*#__PURE__*/React.createElement(Box, {
+    xcss: styles.iconStyle
+    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
+    ,
+    backgroundColor: "color.background.accent.green.subtlest"
+  }, /*#__PURE__*/React.createElement(AutomationIcon, {
+    size: "small",
+    label: formatMessage(i18n.modalHeaderIconLabel),
+    color: "var(--ds-icon-accent-green, #22A06B)",
+    spacing: "compact"
+  })), fg('platform_dst_modal-dialog-use-modal-title') ? /*#__PURE__*/React.createElement(ModalTitle, null, modalTitle) : /*#__PURE__*/React.createElement(Heading, {
+    size: "medium",
+    id: titleId
+  }, modalTitle)), showDescription && /*#__PURE__*/React.createElement(Box, {
+    xcss: styles.modalDescriptionStyle
+  }, modalDescription)));
 };

package/dist/es2019/view/FlexibleCard/components/blocks/title-block/TitleBlock.js

@@ -4,6 +4,7 @@ import "./TitleBlock.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { SmartLinkStatus } from '../../../../../constants';
 import { useMouseDownEvent } from '../../../../../state/analytics/useMouseDownEvent';
 import { useFlexibleCardContext } from '../../../../../state/flexible-ui-context/useFlexibleCardContext';
@@ -62,7 +63,7 @@ export const TitleBlock = ({
   hideIconLoadingSkeleton,
   ...props
 }) => {
-  var _props$size;
+  var _cardContext$navigati, _props$size;
   const cardContext = useFlexibleCardContext();
   const {
     status = SmartLinkStatus.Fallback,
@@ -90,7 +91,7 @@ export const TitleBlock = ({
     hideTooltip: hideTitleTooltip,
     maxLines: maxLines,
     onMouseDown: onMouseDown,
-    target: anchorTarget,
+    target: fg('confluence_ep_shim_macro_links_v2') ? anchorTarget !== null && anchorTarget !== void 0 ? anchorTarget : cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$navigati = cardContext.navigation) === null || _cardContext$navigati === void 0 ? void 0 : _cardContext$navigati.target : anchorTarget,
     theme: ui === null || ui === void 0 ? void 0 : ui.theme,
     anchorRef: anchorRef
   }, overrideText));

package/dist/es2019/view/FlexibleCard/components/container/index.js

@@ -5,8 +5,9 @@ import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { di } from 'react-magnetic-di';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { SmartLinkSize } from '../../../../constants';
-import { useFlexibleUiContext } from '../../../../state/flexible-ui-context/useFlexibleUiContext';
+import { useFlexibleCardContext } from '../../../../state/flexible-ui-context/useFlexibleCardContext';
 import { isFlexibleUiBlock } from '../../../../utils/is-flexible-ui-block';
 import { getChildrenOptions } from './getChildrenOptions';
 import { getFlexibleUiBlock } from './getFlexibleUiBlock';
@@ -24,7 +25,8 @@ const getTitleBlockProps = children => {
     return block.props;
   }
 };
-const getLayeredLink = (testId, context, children, onClick, onAuxClick, onContextMenu, title) => {
+const getLayeredLink = (testId, context, children, onClick, onAuxClick, onContextMenu, title, navigation) => {
+  var _navigation$url;
   const {
     linkTitle,
     url = ''
@@ -40,10 +42,10 @@ const getLayeredLink = (testId, context, children, onClick, onAuxClick, onContex
     onClick: onClick,
     onAuxClick: onAuxClick,
     onContextMenu: onContextMenu,
-    target: target,
+    target: fg('confluence_ep_shim_macro_links_v2') ? target !== null && target !== void 0 ? target : navigation === null || navigation === void 0 ? void 0 : navigation.target : target,
     testId: testId,
     text: title || text || (linkTitle === null || linkTitle === void 0 ? void 0 : linkTitle.text),
-    url: url
+    url: fg('confluence_ep_shim_macro_links_v2') ? (_navigation$url = navigation === null || navigation === void 0 ? void 0 : navigation.url) !== null && _navigation$url !== void 0 ? _navigation$url : url : url
   });
 };
 const baseStyleCommon = null;
@@ -130,7 +132,8 @@ const Container = ({
 }) => {
   const padding = hidePadding ? '0px' : getPadding(size);
   const gap = getGap(size);
-  const context = useFlexibleUiContext();
+  const cardContext = useFlexibleCardContext();
+  const context = cardContext === null || cardContext === void 0 ? void 0 : cardContext.data;
   const {
     previewOnLeft,
     previewOnRight
@@ -149,7 +152,7 @@ const Container = ({
       "--_73mooq": ix(previewOnLeft ? gap : padding),
       "--_12k13bg": ix(previewOnRight ? gap : padding)
     }
-  }, clickableContainer ? getLayeredLink(testId, context, children, onClick, onAuxClick, onContextMenu, title) : null, filterChildren(children, removeBlockRestriction));
+  }, clickableContainer ? getLayeredLink(testId, context, children, onClick, onAuxClick, onContextMenu, title, cardContext === null || cardContext === void 0 ? void 0 : cardContext.navigation) : null, filterChildren(children, removeBlockRestriction));
   if (context !== null && context !== void 0 && context.url && canShowHoverCard) {
     return /*#__PURE__*/React.createElement(HoverCardControl, {
       isHoverPreview: isResolved || hasHoverCardOverride,

package/dist/es2019/view/FlexibleCard/components/elements/title-element/index.js

@@ -1,12 +1,16 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ElementName } from '../../../../../constants';
-import { useFlexibleUiContext } from '../../../../../state/flexible-ui-context/useFlexibleUiContext';
+import { useFlexibleCardContext } from '../../../../../state/flexible-ui-context/useFlexibleCardContext';
 import { BaseLinkElement } from '../common';
 const TitleElement = props => {
-  const context = useFlexibleUiContext();
-  const data = context ? context === null || context === void 0 ? void 0 : context.linkTitle : null;
-  return data ? /*#__PURE__*/React.createElement(BaseLinkElement, _extends({}, data, props, {
+  var _context$data, _context$navigation$u, _context$navigation;
+  const context = useFlexibleCardContext();
+  const data = context === null || context === void 0 ? void 0 : (_context$data = context.data) === null || _context$data === void 0 ? void 0 : _context$data.linkTitle;
+  return data ? /*#__PURE__*/React.createElement(BaseLinkElement, _extends({}, data, {
+    url: fg('confluence_ep_shim_macro_links_v2') ? (_context$navigation$u = context === null || context === void 0 ? void 0 : (_context$navigation = context.navigation) === null || _context$navigation === void 0 ? void 0 : _context$navigation.url) !== null && _context$navigation$u !== void 0 ? _context$navigation$u : data.url : data.url
+  }, props, {
     name: ElementName.Title
   })) : null;
 };

package/dist/es2019/view/FlexibleCard/index.js

@@ -23,6 +23,7 @@ const PENDING_LINK_STATUSES = [SmartLinkStatus.Pending, SmartLinkStatus.Resolvin
  */
 const FlexibleCard = ({
   appearance = 'flexible',
+  navigation,
   cardState,
   children,
   id,
@@ -97,9 +98,10 @@ const FlexibleCard = ({
   }), [aiSummaryConfig, appearance, actionOptions, details, id, isPreviewPanelAvailable, isPreviewRestricted, onAuthorize, onClick, onAuxClick, onContextMenu, openPreviewPanel, origin, placeholderCardState, placeHolderStatus, product, renderers, resolve, rovoConfig, status, transformUrl, url, fireEvent]);
   const flexibleCardContext = useMemo(() => ({
     data: context,
+    navigation: context ? navigation : undefined,
     status: placeHolderStatus !== null && placeHolderStatus !== void 0 ? placeHolderStatus : status,
     ui
-  }), [context, placeHolderStatus, status, ui]);
+  }), [context, placeHolderStatus, status, ui, navigation]);
   const {
     linkTitle
   } = context || {};

package/dist/es2019/view/LinkUrl/index.js

@@ -9,7 +9,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "45.23.2",
+  packageVersion: "45.23.4",
   componentName: 'linkUrl'
 };
 const LinkUrl = ({

package/dist/esm/__tests__/vr-tests/__snapshots__/automation-modal-header/smart-card-automation-modal-header-title--default--platform-dst-modal-dialog-use-modal-title-false.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb149dfd34eb19b5ae45ff98125f78740c88f3a36eb6f298ddf8eb7a348ce88d
+size 9626

package/dist/esm/__tests__/vr-tests/__snapshots__/automation-modal-header/smart-card-automation-modal-header-title--default--platform-dst-modal-dialog-use-modal-title-true.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb149dfd34eb19b5ae45ff98125f78740c88f3a36eb6f298ddf8eb7a348ce88d
+size 9626

package/dist/esm/__tests__/vr-tests/__snapshots__/embedded-card-navigation/embedded-card-navigation-disabled--default.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bf5137534871b7834625122306426b6411c1b247903cc03e4ed869c2d4cc061
+size 3322

package/dist/esm/__tests__/vr-tests/__snapshots__/embedded-card-navigation/embedded-card-navigation-enabled--default.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bf5137534871b7834625122306426b6411c1b247903cc03e4ed869c2d4cc061
+size 3322

package/dist/esm/extractors/action/extract-invoke-preview-action.js

@@ -9,7 +9,7 @@ import { extractSmartLinkEmbed } from '@atlaskit/link-extractors/extract-smart-l
 import { extractSmartLinkProvider } from '@atlaskit/link-extractors/extract-smart-link-provider';
 import { extractSmartLinkTitle } from '@atlaskit/link-extractors/extract-smart-link-title';
 import { extractSmartLinkUrl } from '@atlaskit/link-extractors/extract-smart-link-url';
-import { isWithinPreviewPanelIFrame } from '@atlaskit/linking-common/utils';
+import { isWithinPreviewPanelIFrame } from '@atlaskit/linking-common/utils/is-within-preview-panel-iframe';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ActionName, CardAction } from '../../constants';

package/dist/esm/linkProvider.js

@@ -1,2 +1,2 @@
 /** @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-661 Internal documentation for deprecation (no external access)} */
-export { editorCardProvider, EditorCardProvider } from '@atlaskit/link-provider';
+export { editorCardProvider, EditorCardProvider } from '@atlaskit/link-provider/editor';

package/dist/esm/state/hooks/use-ai-summary/ai-summary-service/index.js

@@ -12,7 +12,7 @@ function _asyncIterator(r) { var n, t, o, e = 2; for ("undefined" != typeof Symb
 function AsyncFromSyncIterator(r) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var n = r.done; return Promise.resolve(r.value).then(function (r) { return { value: r, done: n }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(r) { this.s = r, this.n = r.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, return: function _return(r) { var n = this.s.return; return void 0 === n ? Promise.resolve({ value: r, done: !0 }) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); }, throw: function _throw(r) { var n = this.s.return; return void 0 === n ? Promise.reject(r) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(r); }
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
-import { getBaseUrl } from '@atlaskit/linking-common';
+import { getBaseUrl } from '@atlaskit/linking-common/get-base-url';
 import { readStream } from './readStream';
 import { ChunkProcessingError } from './types';
 import { addPath } from './addPath';

package/dist/esm/state/hooks/use-response/index.js

@@ -3,7 +3,7 @@ import { unstable_batchedUpdates } from 'react-dom';
 import { useSmartLinkContext } from '@atlaskit/link-provider/use-smart-link-context';
 import { ACTION_ERROR, ACTION_ERROR_FALLBACK, ACTION_RELOADING, ACTION_RESOLVED, ACTION_UPDATE_METADATA_STATUS, cardAction } from '@atlaskit/linking-common/actions';
 import { getStatus } from '@atlaskit/linking-common/utils/get-status';
-import { APIError } from '@atlaskit/linking-common';
+import { APIError } from '@atlaskit/linking-common/api-error';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { SmartLinkStatus } from '../../../constants';
 import { getUnauthorizedJsonLd } from '../../../utils/get-unauthorized-json-ld';

package/dist/esm/utils/analytics/analytics.js

@@ -3,7 +3,7 @@ export var ANALYTICS_CHANNEL = 'media';
 export var context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card" || '',
-  packageVersion: "45.23.2" || ''
+  packageVersion: "45.23.4" || ''
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useSmartLinkContext } from '@atlaskit/link-provider/context';
 import { useAnalyticsEvents as useAnalyticsEventsNext } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { extractSmartLinkEmbed } from '@atlaskit/link-extractors/extract-smart-link-embed';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
@@ -93,6 +94,9 @@ function Component(_ref) {
     error = _useSmartLink.error,
     isPreviewPanelAvailable = _useSmartLink.isPreviewPanelAvailable,
     openPreviewPanel = _useSmartLink.openPreviewPanel;
+  var _useSmartLinkContext = useSmartLinkContext(),
+    linkNavigation = _useSmartLinkContext.linkNavigation;
+  var resolveNavigation = fg('confluence_ep_shim_macro_links_v2') && isFlexibleUi ? linkNavigation : undefined;
   var ari = getObjectAri(state.details);
   var name = getObjectName(state.details);
   var definitionId = getDefinitionId(state.details);
@@ -123,9 +127,13 @@ function Component(_ref) {
     var preferredUrl = (_getClickUrl = getClickUrl(url, state.details)) !== null && _getClickUrl !== void 0 ? _getClickUrl : url;
     return (_appendCrossProductAn = appendCrossProductAnalyticsParams(preferredUrl)) !== null && _appendCrossProductAn !== void 0 ? _appendCrossProductAn : preferredUrl;
   }, [appendCrossProductAnalyticsParams, state.details, url]);
+  var navigation = useMemo(function () {
+    return resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl());
+  }, [getDestinationUrl, resolveNavigation]);
 
   // Setup UI handlers.
   var handleClickWrapper = useCallback(function (event) {
+    var _resolveNavigation$ur;
     var isModifierKeyPressed = isSpecialKey(event) || isSpecialClick(event);
     fireEvent('ui.smartLink.clicked', {
       id: id,
@@ -170,14 +178,15 @@ function Component(_ref) {
       });
       return;
     }
-    var destinationUrl = getDestinationUrl();
+    var destinationUrl = (_resolveNavigation$ur = resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl()).url) !== null && _resolveNavigation$ur !== void 0 ? _resolveNavigation$ur : getDestinationUrl();
     updateAnchorHref(event, destinationUrl);
 
     // For FlexibleCard, read target from the clicked anchor element (e.g. _blank for links
     // rendered with explicit target). For classic cards, default to _self
     var _getAnchorAttributesF = getAnchorAttributesFromEvent(event),
       anchorTarget = _getAnchorAttributesF.target;
-    var target = isSpecialEvent(event) ? '_blank' : isFlexibleUi ? anchorTarget : '_self';
+    var openInNewTab = resolveNavigation ? event.metaKey || event.ctrlKey || event.shiftKey || event.button === 1 : isSpecialEvent(event);
+    var target = openInNewTab ? '_blank' : isFlexibleUi ? anchorTarget : '_self';
     onClick === null || onClick === void 0 || onClick(event, {
       url: url,
       destinationUrl: destinationUrl
@@ -204,12 +213,13 @@ function Component(_ref) {
         clickOutcome: target === '_blank' ? 'clickThroughNewTabOrWindow' : 'clickThrough'
       }
     } : undefined);
-  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, getDestinationUrl, onClick, url, state.details, ari, name, fire3PClickEvent, shouldFire3PClickEvent, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, disablePreviewPanel]);
+  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, getDestinationUrl, resolveNavigation, onClick, url, state.details, ari, name, fire3PClickEvent, shouldFire3PClickEvent, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, disablePreviewPanel]);
 
   // Middle-click handler to trigger fire3PClickEvent on middle-clicks.
   // Scope is limited to 3P click analytics.
   var handleFrameAuxClick = useCallback(function (event) {
-    var destinationUrl = getDestinationUrl();
+    var _resolveNavigation$ur2;
+    var destinationUrl = (_resolveNavigation$ur2 = resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl()).url) !== null && _resolveNavigation$ur2 !== void 0 ? _resolveNavigation$ur2 : getDestinationUrl();
     updateAnchorHref(event, destinationUrl);
 
     // isAuxClick filters Windows right-clicks (button === 2) that also fire onAuxClick.
@@ -218,19 +228,20 @@ function Component(_ref) {
         isAuxClick: true
       });
     }
-  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent]);
+  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent, resolveNavigation]);
 
   // Right-click handler to trigger fire3PClickEvent on right-clicks.
   // Scope is limited to 3P click analytics.
   var handleFrameContextMenu = useCallback(function (event) {
-    var destinationUrl = getDestinationUrl();
+    var _resolveNavigation$ur3;
+    var destinationUrl = (_resolveNavigation$ur3 = resolveNavigation === null || resolveNavigation === void 0 ? void 0 : resolveNavigation(getDestinationUrl()).url) !== null && _resolveNavigation$ur3 !== void 0 ? _resolveNavigation$ur3 : getDestinationUrl();
     updateAnchorHref(event, destinationUrl);
     if (shouldFire3PClickEvent) {
       fire3PClickEvent === null || fire3PClickEvent === void 0 || fire3PClickEvent({
         isContextMenu: true
       });
     }
-  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent]);
+  }, [fire3PClickEvent, getDestinationUrl, shouldFire3PClickEvent, resolveNavigation]);
   var reload = actions.reload;
   var handleAuthorize = useCallback(function () {
     return actions.authorize(appearance);
@@ -363,6 +374,7 @@ function Component(_ref) {
     return /*#__PURE__*/React.createElement(FlexibleCard, {
       id: id,
       cardState: cardState,
+      navigation: navigation,
       placeholderData: placeholderData,
       onAuthorize: services.length && handleAuthorize || undefined,
       onClick: handleClickWrapper,

package/dist/esm/view/FlexibleCard/components/actions/automation-action/automation-manual-triggers/manual-triggers-modal/sub-components/header/main.js

@@ -6,7 +6,9 @@ import { defineMessages, useIntl } from 'react-intl';
 import Heading from '@atlaskit/heading/heading';
 import AutomationIcon from '@atlaskit/icon/core/automation';
 import ModalHeader from '@atlaskit/modal-dialog/modal-header';
+import ModalTitle from '@atlaskit/modal-dialog/modal-title';
 import { useModal } from '@atlaskit/modal-dialog/hooks';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box, Inline, Stack } from '@atlaskit/primitives/compiled';
 import { useAutomationMenu } from '../../menu-context/useAutomationMenu';
 var styles = {
@@ -31,28 +33,24 @@ export var AutomationModalHeader = function AutomationModalHeader(_ref) {
   var _useModal = useModal(),
     titleId = _useModal.titleId;
   var showDescription = initialised && rules.length > 0 && !!modalDescription;
-  return (
-    /*#__PURE__*/
-    // eslint-disable-next-line @atlaskit/design-system/use-modal-title
-    React.createElement(ModalHeader, {
-      hasCloseButton: true
-    }, /*#__PURE__*/React.createElement(Stack, null, /*#__PURE__*/React.createElement(Inline, {
-      alignBlock: "center"
-    }, /*#__PURE__*/React.createElement(Box, {
-      xcss: styles.iconStyle
-      // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-      ,
-      backgroundColor: "color.background.accent.green.subtlest"
-    }, /*#__PURE__*/React.createElement(AutomationIcon, {
-      size: "small",
-      label: formatMessage(i18n.modalHeaderIconLabel),
-      color: "var(--ds-icon-accent-green, #22A06B)",
-      spacing: "compact"
-    })), /*#__PURE__*/React.createElement(Heading, {
-      size: "medium",
-      id: titleId
-    }, modalTitle)), showDescription && /*#__PURE__*/React.createElement(Box, {
-      xcss: styles.modalDescriptionStyle
-    }, modalDescription)))
-  );
+  return /*#__PURE__*/React.createElement(ModalHeader, {
+    hasCloseButton: true
+  }, /*#__PURE__*/React.createElement(Stack, null, /*#__PURE__*/React.createElement(Inline, {
+    alignBlock: "center"
+  }, /*#__PURE__*/React.createElement(Box, {
+    xcss: styles.iconStyle
+    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
+    ,
+    backgroundColor: "color.background.accent.green.subtlest"
+  }, /*#__PURE__*/React.createElement(AutomationIcon, {
+    size: "small",
+    label: formatMessage(i18n.modalHeaderIconLabel),
+    color: "var(--ds-icon-accent-green, #22A06B)",
+    spacing: "compact"
+  })), fg('platform_dst_modal-dialog-use-modal-title') ? /*#__PURE__*/React.createElement(ModalTitle, null, modalTitle) : /*#__PURE__*/React.createElement(Heading, {
+    size: "medium",
+    id: titleId
+  }, modalTitle)), showDescription && /*#__PURE__*/React.createElement(Box, {
+    xcss: styles.modalDescriptionStyle
+  }, modalDescription)));
 };

package/dist/esm/view/FlexibleCard/components/blocks/title-block/TitleBlock.js

@@ -7,6 +7,7 @@ import "./TitleBlock.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { SmartLinkStatus } from '../../../../../constants';
 import { useMouseDownEvent } from '../../../../../state/analytics/useMouseDownEvent';
 import { useFlexibleCardContext } from '../../../../../state/flexible-ui-context/useFlexibleCardContext';
@@ -46,7 +47,7 @@ var getTitleBlockViewComponent = function getTitleBlockViewComponent(status) {
  * @see TitleBlockErroredViewNew
  */
 export var TitleBlock = function TitleBlock(_ref) {
-  var _props$size;
+  var _cardContext$navigati, _props$size;
   var _ref$actions = _ref.actions,
     actions = _ref$actions === void 0 ? [] : _ref$actions,
     anchorTarget = _ref.anchorTarget,
@@ -98,7 +99,7 @@ export var TitleBlock = function TitleBlock(_ref) {
     hideTooltip: hideTitleTooltip,
     maxLines: maxLines,
     onMouseDown: onMouseDown,
-    target: anchorTarget,
+    target: fg('confluence_ep_shim_macro_links_v2') ? anchorTarget !== null && anchorTarget !== void 0 ? anchorTarget : cardContext === null || cardContext === void 0 || (_cardContext$navigati = cardContext.navigation) === null || _cardContext$navigati === void 0 ? void 0 : _cardContext$navigati.target : anchorTarget,
     theme: ui === null || ui === void 0 ? void 0 : ui.theme,
     anchorRef: anchorRef
   }, overrideText));

package/dist/esm/view/FlexibleCard/components/container/index.js

@@ -5,8 +5,9 @@ import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { di } from 'react-magnetic-di';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { SmartLinkSize } from '../../../../constants';
-import { useFlexibleUiContext } from '../../../../state/flexible-ui-context/useFlexibleUiContext';
+import { useFlexibleCardContext } from '../../../../state/flexible-ui-context/useFlexibleCardContext';
 import { isFlexibleUiBlock } from '../../../../utils/is-flexible-ui-block';
 import { getChildrenOptions } from './getChildrenOptions';
 import { getFlexibleUiBlock } from './getFlexibleUiBlock';
@@ -30,7 +31,8 @@ var getTitleBlockProps = function getTitleBlockProps(children) {
     return block.props;
   }
 };
-var getLayeredLink = function getLayeredLink(testId, context, children, onClick, onAuxClick, onContextMenu, title) {
+var getLayeredLink = function getLayeredLink(testId, context, children, onClick, onAuxClick, onContextMenu, title, navigation) {
+  var _navigation$url;
   var _ref = context || {},
     linkTitle = _ref.linkTitle,
     _ref$url = _ref.url,
@@ -45,10 +47,10 @@ var getLayeredLink = function getLayeredLink(testId, context, children, onClick,
     onClick: onClick,
     onAuxClick: onAuxClick,
     onContextMenu: onContextMenu,
-    target: target,
+    target: fg('confluence_ep_shim_macro_links_v2') ? target !== null && target !== void 0 ? target : navigation === null || navigation === void 0 ? void 0 : navigation.target : target,
     testId: testId,
     text: title || text || (linkTitle === null || linkTitle === void 0 ? void 0 : linkTitle.text),
-    url: url
+    url: fg('confluence_ep_shim_macro_links_v2') ? (_navigation$url = navigation === null || navigation === void 0 ? void 0 : navigation.url) !== null && _navigation$url !== void 0 ? _navigation$url : url : url
   });
 };
 var baseStyleCommon = null;
@@ -142,7 +144,8 @@ var Container = function Container(_ref3) {
     title = _ref3.title;
   var padding = hidePadding ? '0px' : getPadding(size);
   var gap = getGap(size);
-  var context = useFlexibleUiContext();
+  var cardContext = useFlexibleCardContext();
+  var context = cardContext === null || cardContext === void 0 ? void 0 : cardContext.data;
   var _getChildrenOptions = getChildrenOptions(children, context),
     previewOnLeft = _getChildrenOptions.previewOnLeft,
     previewOnRight = _getChildrenOptions.previewOnRight;
@@ -160,7 +163,7 @@ var Container = function Container(_ref3) {
       "--_73mooq": ix(previewOnLeft ? gap : padding),
       "--_12k13bg": ix(previewOnRight ? gap : padding)
     }
-  }, clickableContainer ? getLayeredLink(testId, context, children, onClick, onAuxClick, onContextMenu, title) : null, filterChildren(children, removeBlockRestriction));
+  }, clickableContainer ? getLayeredLink(testId, context, children, onClick, onAuxClick, onContextMenu, title, cardContext === null || cardContext === void 0 ? void 0 : cardContext.navigation) : null, filterChildren(children, removeBlockRestriction));
   if (context !== null && context !== void 0 && context.url && canShowHoverCard) {
     return /*#__PURE__*/React.createElement(HoverCardControl, {
       isHoverPreview: isResolved || hasHoverCardOverride,

package/dist/esm/view/FlexibleCard/components/elements/title-element/index.js

@@ -1,12 +1,16 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ElementName } from '../../../../../constants';
-import { useFlexibleUiContext } from '../../../../../state/flexible-ui-context/useFlexibleUiContext';
+import { useFlexibleCardContext } from '../../../../../state/flexible-ui-context/useFlexibleCardContext';
 import { BaseLinkElement } from '../common';
 var TitleElement = function TitleElement(props) {
-  var context = useFlexibleUiContext();
-  var data = context ? context === null || context === void 0 ? void 0 : context.linkTitle : null;
-  return data ? /*#__PURE__*/React.createElement(BaseLinkElement, _extends({}, data, props, {
+  var _context$data, _context$navigation$u, _context$navigation;
+  var context = useFlexibleCardContext();
+  var data = context === null || context === void 0 || (_context$data = context.data) === null || _context$data === void 0 ? void 0 : _context$data.linkTitle;
+  return data ? /*#__PURE__*/React.createElement(BaseLinkElement, _extends({}, data, {
+    url: fg('confluence_ep_shim_macro_links_v2') ? (_context$navigation$u = context === null || context === void 0 || (_context$navigation = context.navigation) === null || _context$navigation === void 0 ? void 0 : _context$navigation.url) !== null && _context$navigation$u !== void 0 ? _context$navigation$u : data.url : data.url
+  }, props, {
     name: ElementName.Title
   })) : null;
 };